add section about container images/templates

diff --git a/Makefile b/Makefile
index 30eb5db034241f6b43b652a6ac513622f373e185..719ac07c442732587b28f83ed9d7d2ac95baadd4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -6,6 +6,7 @@ VZDUMP_SOURCES=attributes.txt vzdump.adoc vzdump.1-synopsis.adoc
 PVEFW_SOURCES=attributes.txt pve-firewall.adoc pve-firewall.8-synopsis.adoc
 QM_SOURCES=attributes.txt qm.adoc qm.1-synopsis.adoc
 PCT_SOURCES=attributes.txt pct.adoc pct.1-synopsis.adoc
+PVEAM_SOURCES=attributes.txt pveam.adoc pveam.1-synopsis.adoc
 HA_SOURCES=attributes.txt ha-manager.1-synopsis.adoc ha-manager.adoc
 
 SYSADMIN_SOURCES=                      \
@@ -23,6 +24,7 @@ PVE_ADMIN_GUIDE_SOURCES=              \
        pve-faq.adoc                    \
        ${QM_SOURCES}                   \
        ${PCT_SOURCES}                  \
+       ${PVEAM_SOURCES}                \
        ${PVEFW_SOURCES}                \
        ${PVEUM_SOURCES}                \
        ${PVESM_SOURCES}                \
@@ -73,7 +75,7 @@ all: pve-admin-guide.html
 
 index.html: index.adoc ${PVE_ADMIN_GUIDE_SOURCES}
        $(MAKE) NOVIEW=1 pve-admin-guide.pdf pve-admin-guide.html pve-admin-guide.epub
-       $(MAKE) NOVIEW=1 qm.1.html pct.1.html pvesm.1.html pveum.1.html vzdump.1.html pve-firewall.8.html ha-manager.1.html
+       $(MAKE) NOVIEW=1 qm.1.html pct.1.html pveam.1.html pvesm.1.html pveum.1.html vzdump.1.html pve-firewall.8.html ha-manager.1.html
        asciidoc -a "date=$(shell date)" -a "revnumber=${RELEASE}" index.adoc 
        $(BROWSER) index.html &
 

diff --git a/index.adoc b/index.adoc
index e20aa9145b298c43878b879064fd8747b4aa2632..8a2484b0fc52beb67d31f4503c00773354373210 100644 (file)
--- a/index.adoc
+++ b/index.adoc
@@ -23,6 +23,7 @@ include::attributes.txt[]
 | Command name |Download link
 | qm           | link:qm.1.html[qm.1]
 | pct          | link:pct.1.html[pct.1]
+| pveam        | link:pveam.1.html[pveam.1]
 | pvesm        | link:pvesm.1.html[pvesm.1]
 | pveum        | link:pveum.1.html[pveum.1]
 | vzdump       | link:vzdump.1.html[vzdump.1]

diff --git a/pct.adoc b/pct.adoc
index 925294e94f7b3aa90faf6711497b6d05c7930d3f..77c33e1d42c89a6d4915c636492a084922fc48cd 100644 (file)
--- a/pct.adoc
+++ b/pct.adoc
@@ -225,6 +225,25 @@ Alpine:: test /etc/alpine-release
 NOTE: Container start fails is configured 'ostype' differs from auto
 detected type.
 
+
+Container Images
+----------------
+
+Container Images, somtimes also referred as "templates" or
+"appliances", are 'tar' archives which contains everything to run a
+container. You can think of it as a tidy container backup. Like most
+modern container toolkits, 'pct' uses those images when you create a
+new container, for example:
+
+ pct create 999 local:vztmpl/debian-8.0-standard_8.0-1_amd64.tar.gz
+
+Proxmox itself ships a set of basic templates for most common
+operating systems, and you can download them using the 'pveam' (short
+for {pve} Appliance Manager) command line utility. You can also
+download https://www.turnkeylinux.org/[TurnKey Linux] containers using
+that tool (or the graphical user interface).
+
+
 Container Storage
 -----------------
 

diff --git a/pve-admin-guide.adoc b/pve-admin-guide.adoc
index 37f5218a906895d09f2d2bd8192c7a785601027a..bd30eb4df1dd6229a5a5e0baa905cbf4006ad67f 100644 (file)
--- a/pve-admin-guide.adoc
+++ b/pve-admin-guide.adoc
@@ -63,6 +63,14 @@ include::pct.1-synopsis.adoc[]
 
 :leveloffset: 0
 
+*pveam* -  {pve} Appliance Manager
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+:leveloffset: 1
+include::pveam.1-synopsis.adoc[]
+
+:leveloffset: 0
+
 *pveum* - {pve} User Manager
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

diff --git a/pveam.adoc b/pveam.adoc
new file mode 100644 (file)
index 0000000..b0782c1
--- /dev/null
+++ b/pveam.adoc
@@ -0,0 +1,32 @@
+ifdef::manvolnum[]
+PVE({manvolnum})
+================
+include::attributes.txt[]
+
+NAME
+----
+
+pveam - {pve} Appliance Manager
+
+
+SYNOPSYS
+--------
+
+include::pveam.1-synopsis.adoc[]
+
+DESCRIPTION
+-----------
+endif::manvolnum[]
+
+ifndef::manvolnum[]
+Container Images
+================
+include::attributes.txt[]
+endif::manvolnum[]
+
+Command line tool to manage comtainer images. See 'man pct' for usage
+examples.
+
+ifdef::manvolnum[]
+include::pve-copyright.adoc[]
+endif::manvolnum[]