bump version to 6.0-2

[pmg-docs.git] / pmg-admin-guide.adoc

diff --git a/pmg-admin-guide.adoc b/pmg-admin-guide.adoc
index a72fca16955749cb43819d4ae60bc53522fae99d..4dfed131729cb3ffaccf44bbf28a91ded08b2391 100644 (file)
--- a/pmg-admin-guide.adoc
+++ b/pmg-admin-guide.adoc
@@ -27,28 +27,17 @@ include::pmg-installation.adoc[]
 
 include::pmgconfig.adoc[]
 
+include::pmg-mail-filter.adoc[]
+
+include::pmg-administration.adoc[]
+
 include::pmgbackup.adoc[]
 
+include::pmgcm.adoc[]
 
 // Return to normal title levels.
 :leveloffset: 0
 
-TODO
-----
-// FIXME
-
-[[nmap]]
-nmap
-
-[[create_bootable_usb]]
-create_bootable_usb
-
-[[mail_server_config]]
-mail_server_config
-
-[[fitering_outgoing_mail]]
-fitering_outgoing_mail
-
 
 Important Service Daemons
 -------------------------
@@ -90,6 +79,14 @@ include::pmgreport.adoc[]
 
 include::pmgupgrade.adoc[]
 
+:leveloffset: 1
+
+include::nmap.adoc[]
+
+:leveloffset: 0
+
+
+
 
 :leveloffset: 1
 
@@ -97,6 +94,9 @@ include::pmg-bibliography.adoc[]
 
 :leveloffset: 0
 
+[appendix]
+include::pmg-ssl-certificate.adoc[]
+
 
 [appendix]
 Command Line Interface
@@ -108,6 +108,12 @@ Command Line Interface
 include::pmgbackup.1-synopsis.adoc[]
 
 
+*pmgcm* - Proxmox Mail Gateway Cluster Management Toolkit
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+include::pmgcm.1-synopsis.adoc[]
+
+
 *pmgsh* - API Shell
 ~~~~~~~~~~~~~~~~~~~
 
@@ -185,6 +191,10 @@ include::pmg.conf.adoc[]
 
 include::cluster.conf.adoc[]
 
+include::user.conf.adoc[]
+
+include::ldap.conf.adoc[]
+
 :leveloffset: 0
 
 :leveloffset: 1