X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=pve-admin-guide.adoc;h=eaa260913c57e2f3c5d304a11cd1697b580d59e4;hb=b35285a8d6b89b252ab92d8d2240d905c8cb47b7;hp=d7b18c294b073d2d34477c51d11cf3f36e31dfee;hpb=683e3b937747119dd9bc7347d22dfc46edba8147;p=pve-docs.git

diff --git a/pve-admin-guide.adoc b/pve-admin-guide.adoc
index d7b18c2..eaa2609 100644
--- a/pve-admin-guide.adoc
+++ b/pve-admin-guide.adoc
@@ -6,31 +6,43 @@ ifndef::pvelogo[]
 Proxmox VE Administration Guide
 ===============================
 endif::pvelogo[]
-include::attributes.txt[]
 :doctype:   book
 :title: Proxmox VE Administration Guide
-:toc:
+: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[]
@@ -54,6 +66,8 @@ include::pvestatd.adoc[]
 
 include::spiceproxy.adoc[]
 
+include::pvescheduler.adoc[]
+
 :leveloffset: 0
 
 
@@ -61,10 +75,12 @@ Useful Command Line Tools
 -------------------------
 
 :leveloffset: 2
-include::pveceph.adoc[]
 
 include::pvesubscription.adoc[]
 
+include::pveperf.adoc[]
+
+include::pvesh.adoc[]
 
 :leveloffset: 1
 
@@ -78,6 +94,13 @@ include::pve-bibliography.adoc[]
 Command Line Interface
 ----------------------
 
+:leveloffset: 1
+
+include::output-format.adoc[]
+
+:leveloffset: 0
+
+
 *pvesm* - {pve} Storage Manager
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -94,6 +117,14 @@ 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
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -102,7 +133,23 @@ include::pveceph.1-synopsis.adoc[]
 
 :leveloffset: 0
 
-*qm* - Qemu/KVM Virtual Machine Manager
+*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
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 :leveloffset: 1
@@ -142,6 +189,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
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -218,7 +273,7 @@ include::spiceproxy.8-synopsis.adoc[]
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 :leveloffset: 1
-include::pmxcfs.8-cli.adoc[]
+include::pmxcfs.8-synopsis.adoc[]
 
 :leveloffset: 0
 
@@ -238,6 +293,13 @@ include::pve-ha-lrm.8-synopsis.adoc[]
 
 :leveloffset: 0
 
+*pvescheduler* - {pve} Scheduler Daemon
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+:leveloffset: 1
+include::pvescheduler.8-synopsis.adoc[]
+
+:leveloffset: 0
 
 [appendix]
 Configuration Files
@@ -248,12 +310,24 @@ include::datacenter.cfg.adoc[]
 
 :leveloffset: 0
 
+[appendix]
+Calendar Events
+---------------
+
+:leveloffset: 1
+include::calendar-events.adoc[]
+
+:leveloffset: 0
+
 [appendix]
 Firewall Macro Definitions
 --------------------------
 
 include::pve-firewall-macros.adoc[]
 
+:leveloffset: 1
+[appendix]
+include::markdown-primer.adoc[]
 
 :leveloffset: 1
 [appendix]
@@ -261,3 +335,5 @@ include::GFDL.adoc[]
 
 :leveloffset: 0
 
+endif::manvolnum[]
+endif::wiki[]