X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=pve-admin-guide.adoc;h=b32b55b3192e09cc9b4e3fcf9eeef08c7b10435d;hb=0593681f9ded237059d64a7914fee7d5f5fcdb2b;hp=3482f0a8cc8bcc6f64d64eb86233f6e424bc44e7;hpb=15d7842ca3a9bc0695ccfabd5e12c7c910061a4b;p=pve-docs.git

diff --git a/pve-admin-guide.adoc b/pve-admin-guide.adoc
index 3482f0a..b32b55b 100644
--- a/pve-admin-guide.adoc
+++ b/pve-admin-guide.adoc
@@ -1,33 +1,52 @@
+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
-:toc:
+:title: Proxmox VE Administration Guide
+:toc2:
 :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[]
 
 include::pvesm.adoc[]
 
+include::pveceph.adoc[]
+
+include::pvesr.adoc[]
+
 include::qm.adoc[]
 
+include::pct.adoc[]
+
+include::pvesdn.adoc[]
+
 include::pve-firewall.adoc[]
 
 include::pveum.adoc[]
 
-include::pct.adoc[]
-
 include::ha-manager.adoc[]
 
 include::vzdump.adoc[]
@@ -45,17 +64,41 @@ include::pveproxy.adoc[]
 
 include::pvestatd.adoc[]
 
+include::spiceproxy.adoc[]
+
 :leveloffset: 0
 
 
+Useful Command Line Tools
+-------------------------
+
+:leveloffset: 2
+
+include::pvesubscription.adoc[]
+
+include::pveperf.adoc[]
+
+include::pvesh.adoc[]
+
+:leveloffset: 1
+
 include::pve-faq.adoc[]
 
 include::pve-bibliography.adoc[]
 
+:leveloffset: 0
+
 [appendix]
 Command Line Interface
 ----------------------
 
+:leveloffset: 1
+
+include::output-format.adoc[]
+
+:leveloffset: 0
+
+
 *pvesm* - {pve} Storage Manager
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -64,6 +107,46 @@ 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
+
+*pvenode* - {pve} Node Management
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+:leveloffset: 1
+include::pvenode.1-synopsis.adoc[]
+
+:leveloffset: 0
+
+*pvesh* - Shell interface for the {pve} API
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+:leveloffset: 1
+include::pvesh.1-synopsis.adoc[]
+
+:leveloffset: 0
+
 *qm* - Qemu/KVM Virtual Machine Manager
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -72,7 +155,7 @@ include::qm.1-synopsis.adoc[]
 
 :leveloffset: 0
 
-*qmrestore* - Restore QemuServer 'vzdump' Backups
+*qmrestore* - Restore QemuServer `vzdump` Backups
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 :leveloffset: 1
@@ -104,6 +187,14 @@ include::pvecm.1-synopsis.adoc[]
 
 :leveloffset: 0
 
+*pvesr* - {pve} Storage Replication
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+:leveloffset: 1
+include::pvesr.1-synopsis.adoc[]
+
+:leveloffset: 0
+
 
 *pveum* - {pve} User Manager
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -121,8 +212,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[]
@@ -149,6 +240,7 @@ include::pve-firewall.8-synopsis.adoc[]
 include::pvedaemon.8-synopsis.adoc[]
 
 :leveloffset: 0
+
 *pveproxy* - {pve} API Proxy Daemon
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -166,15 +258,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
@@ -182,7 +283,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
@@ -198,10 +299,6 @@ Configuration Files
 :leveloffset: 2
 include::datacenter.cfg.adoc[]
 
-include::qm.conf.adoc[]
-
-include::pct.conf.adoc[]
-
 :leveloffset: 0
 
 [appendix]
@@ -210,6 +307,9 @@ Firewall Macro Definitions
 
 include::pve-firewall-macros.adoc[]
 
+:leveloffset: 1
+[appendix]
+include::markdown-primer.adoc[]
 
 :leveloffset: 1
 [appendix]
@@ -217,3 +317,5 @@ include::GFDL.adoc[]
 
 :leveloffset: 0
 
+endif::manvolnum[]
+endif::wiki[]