]> git.proxmox.com Git - pve-docs.git/commitdiff
add configuration options to manual pages
authorDietmar Maurer <dietmar@proxmox.com>
Thu, 19 May 2016 14:36:13 +0000 (16:36 +0200)
committerDietmar Maurer <dietmar@proxmox.com>
Thu, 19 May 2016 14:37:05 +0000 (16:37 +0200)
pct.adoc
pve-admin-guide.adoc
qm.adoc

index 96490864aa1709f12cd259b43e54ba556afb2689..dc9f446a6962a1618d90f7a888fbf4ece8c809d1 100644 (file)
--- a/pct.adoc
+++ b/pct.adoc
@@ -246,6 +246,11 @@ Alpine:: test /etc/alpine-release
 NOTE: Container start fails if the configured 'ostype' differs from the auto
 detected type.
 
+Options
+~~~~~~~
+
+include::pct.conf.5-opts.adoc[]
+
 
 Container Images
 ----------------
index e4be8d73e207b41943cb6610ca01a1ca6520a497..1f98eed18d7163378e93282b71dc421e92921388 100644 (file)
@@ -239,10 +239,6 @@ Configuration Files
 :leveloffset: 2
 include::datacenter.cfg.adoc[]
 
-include::qm.conf.adoc[]
-
-include::pct.conf.adoc[]
-
 :leveloffset: 0
 
 [appendix]
diff --git a/qm.adoc b/qm.adoc
index fdb255279ae44c2a95dadd4b241fd255b8fbb3d2..14de2d14ce63bcfc38a35158fd3da5e89f0f2ff7 100644 (file)
--- a/qm.adoc
+++ b/qm.adoc
@@ -38,13 +38,14 @@ All configuration files consists of lines in the form
 
  PARAMETER: value
 
-See 'man vm.conf' for a complete list of options.
-
 Configuration files are stored inside the Proxmox cluster file
 system, and can be access at '/etc/pve/qemu-server/<VMID>.conf'.
 
-The default for the `keyboard` option is read from
-'/etc/pve/datacenter.conf'.
+Options
+~~~~~~~
+
+include::qm.conf.5-opts.adoc[]
+
 
 Locks
 -----