X-Git-Url: https://git.proxmox.com/?p=pve-docs.git;a=blobdiff_plain;f=pve-admin-guide.adoc;h=5cb85bbbedd8d5c545d27b5d028bd7879884317f;hp=809d37c8b46d6875a47253cd760b6af353070d45;hb=f00afaef559beefc56c8eed970c5b8ef2a550ada;hpb=6b295b6e254909b5b68b3f56e667311a24ef9dce

diff --git a/pve-admin-guide.adoc b/pve-admin-guide.adoc
index 809d37c..5cb85bb 100644
--- a/pve-admin-guide.adoc
+++ b/pve-admin-guide.adoc
@@ -1,19 +1,32 @@
+ifdef::pvelogo[]
+image:./images/proxmox-logo.svg[] pass:[<br>] Proxmox VE Administration Guide
+=============================================================================
+endif::pvelogo[]
+ifndef::pvelogo[]
 Proxmox VE Administration Guide
 ===============================
-include::attributes.txt[]
+endif::pvelogo[]
 :doctype:   book
+:title: Proxmox VE Administration Guide
 :toc:
 :numbered:
 :data-uri:
 :icons:
+ifndef::wiki[]
+ifndef::manvolnum[]
+:pve-toplevel:
 
 // Push titles down one level.
 :leveloffset: 1
 
 include::pve-intro.adoc[]
 
+include::pve-installation.adoc[]
+
 include::sysadmin.adoc[]
 
+include::pve-gui.adoc[]
+
 include::pvecm.adoc[]
 
 include::pmxcfs.adoc[]
@@ -22,12 +35,12 @@ include::pvesm.adoc[]
 
 include::qm.adoc[]
 
+include::pct.adoc[]
+
 include::pve-firewall.adoc[]
 
 include::pveum.adoc[]
 
-include::pct.adoc[]
-
 include::ha-manager.adoc[]
 
 include::vzdump.adoc[]
@@ -41,16 +54,34 @@ Important Service Daemons
 :leveloffset: 2
 include::pvedaemon.adoc[]
 
+include::pveproxy.adoc[]
 
 include::pvestatd.adoc[]
 
+include::spiceproxy.adoc[]
+
 :leveloffset: 0
 
 
+Useful Command Line Tools
+-------------------------
+
+:leveloffset: 2
+include::pveceph.adoc[]
+
+include::pvesubscription.adoc[]
+
+include::pveperf.adoc[]
+
+
+:leveloffset: 1
+
 include::pve-faq.adoc[]
 
 include::pve-bibliography.adoc[]
 
+:leveloffset: 0
+
 [appendix]
 Command Line Interface
 ----------------------
@@ -63,6 +94,30 @@ include::pvesm.1-synopsis.adoc[]
 
 :leveloffset: 0
 
+*pvesubscription* - {pve} Subscription Manager
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+:leveloffset: 1
+include::pvesubscription.1-synopsis.adoc[]
+
+:leveloffset: 0
+
+*pveperf* - {pve} Benchmark Script
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+:leveloffset: 1
+include::pveperf.1-synopsis.adoc[]
+
+:leveloffset: 0
+
+*pveceph* - Manage CEPH Services on {pve} Nodes
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+:leveloffset: 1
+include::pveceph.1-synopsis.adoc[]
+
+:leveloffset: 0
+
 *qm* - Qemu/KVM Virtual Machine Manager
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -71,7 +126,7 @@ include::qm.1-synopsis.adoc[]
 
 :leveloffset: 0
 
-*qmrestore* - Restore QemuServer 'vzdump' Backups
+*qmrestore* - Restore QemuServer `vzdump` Backups
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 :leveloffset: 1
@@ -120,8 +175,8 @@ include::vzdump.1-synopsis.adoc[]
 
 :leveloffset: 0
 
-*ha-manager* - Proxmox VE HA Manager
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+*ha-manager* - {pve} HA Manager
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 :leveloffset: 1
 include::ha-manager.1-synopsis.adoc[]
@@ -134,7 +189,7 @@ Service Daemons
 ---------------
 
 *pve-firewall* - {pve} Firewall Daemon
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 :leveloffset: 1
 include::pve-firewall.8-synopsis.adoc[]
@@ -142,13 +197,22 @@ include::pve-firewall.8-synopsis.adoc[]
 :leveloffset: 0
 
 *pvedaemon* - {pve} API Daemon
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 :leveloffset: 1
 include::pvedaemon.8-synopsis.adoc[]
 
 :leveloffset: 0
 
+*pveproxy* - {pve} API Proxy Daemon
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+:leveloffset: 1
+
+include::pveproxy.8-synopsis.adoc[]
+
+:leveloffset: 0
+
 *pvestatd* - {pve} Status Daemon
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -157,15 +221,24 @@ include::pvestatd.8-synopsis.adoc[]
 
 :leveloffset: 0
 
+*spiceproxy* - SPICE Proxy Service
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+:leveloffset: 1
+
+include::spiceproxy.8-synopsis.adoc[]
+
+:leveloffset: 0
+
 *pmxcfs* - Proxmox Cluster File System
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 :leveloffset: 1
-include::pmxcfs.8-cli.adoc[]
+include::pmxcfs.8-synopsis.adoc[]
 
 :leveloffset: 0
 
-*pve-ha-crm* - Cluster Ressource Manager Daemon
+*pve-ha-crm* - Cluster Resource Manager Daemon
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 :leveloffset: 1
@@ -173,7 +246,7 @@ include::pve-ha-crm.8-synopsis.adoc[]
 
 :leveloffset: 0
 
-*pve-ha-lrm* - Local Ressource Manager Daemon
+*pve-ha-lrm* - Local Resource Manager Daemon
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 :leveloffset: 1
@@ -189,10 +262,6 @@ Configuration Files
 :leveloffset: 2
 include::datacenter.cfg.adoc[]
 
-include::qm.conf.adoc[]
-
-include::pct.conf.adoc[]
-
 :leveloffset: 0
 
 [appendix]
@@ -208,3 +277,5 @@ include::GFDL.adoc[]
 
 :leveloffset: 0
 
+endif::manvolnum[]
+endif::wiki[]