move 'Installation' into its own chapter

diff --git a/Makefile b/Makefile
index 94bf67c07009954f21e981d8edde4e4e6498da77..ccd647374f798ca2166727b6f4326ed808b71911 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -18,6 +18,7 @@ DOC_DEB=${DOC_PACKAGE}_${DOCRELEASE}-${PKGREL}_all.deb
 MEDIAWIKI_DEB=${MEDIAWIKI_PACKAGE}_${DOCRELEASE}-${PKGREL}_all.deb
 
 CHAPTER_LIST=          \
+       pve-installation        \
        sysadmin        \
        pvecm           \
        pmxcfs          \
@@ -99,11 +100,13 @@ GEN_SCRIPTS=                                       \
        gen-pve-firewall-rules-opts.pl          \
        gen-pve-firewall-vm-opts.pl
 
+INSTALLATION_SOURCES=                          \
+       pve-installation.adoc
+
 SYSADMIN_PARTS=                                        \
        getting-help                            \
        pve-network                             \
        pve-package-repos                       \
-       pve-installation                        \
        system-software-updates                 \
        local-lvm                               \
        local-zfs
@@ -123,6 +126,7 @@ PVE_ADMIN_GUIDE_SOURCES=                    \
        ${SYSADMIN_SOURCES}                     \
        pve-admin-guide.adoc                    \
        pve-intro.adoc                          \
+       ${INSTALLATION_SOURCES}                 \
        pmxcfs.adoc                             \
        pmxcfs.8-cli.adoc                       \
        pve-faq.adoc                            \

diff --git a/index.adoc b/index.adoc
index 603dfeca0414b3e45f67bb62161f0a19fc2a924e..0e2337102efdabb84e0fae4d447650825ebe84e0 100644 (file)
--- a/index.adoc
+++ b/index.adoc
@@ -23,6 +23,7 @@ Individual Chapters
 [width="100%",options="header"]
 |===========================================================
 |Title                                |Download link
+|Installation                        |link:chapter-pve-installation.html[]
 |Host System Administration           |link:chapter-sysadmin.html[]
 |Cluster Manager                      |link:chapter-pvecm.html[]
 |Proxmox Cluster File System (pmxcfs) |link:chapter-pmxcfs.html[]

diff --git a/pve-admin-guide.adoc b/pve-admin-guide.adoc
index d7b18c294b073d2d34477c51d11cf3f36e31dfee..93b204c88a5b48b45371ea3cce717c178ca5b950 100644 (file)
--- a/pve-admin-guide.adoc
+++ b/pve-admin-guide.adoc
@@ -19,6 +19,8 @@ include::attributes.txt[]
 
 include::pve-intro.adoc[]
 
+include::pve-installation.adoc[]
+
 include::sysadmin.adoc[]
 
 include::pvecm.adoc[]

diff --git a/pve-installation.adoc b/pve-installation.adoc
index b49b866900d5e6c072883db4984eff1c26841baa..75dd9874eb27d0cc52018e6ade83205ab6f9be17 100644 (file)
--- a/pve-installation.adoc
+++ b/pve-installation.adoc
@@ -1,5 +1,5 @@
 Installing Proxmox VE
----------------------
+=====================
 include::attributes.txt[]
 
 {pve} ships as a set of Debian packages, so you can simply install it
@@ -26,7 +26,7 @@ within a few minutes, including the following:
 
 
 Using the {pve} Installation CD-ROM
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-----------------------------------
 
 This is the preferred and recommended installation method.
 
@@ -97,7 +97,7 @@ defined during the installation process.
 
 [[advanced_lvm_options]]
 Advanced LVM Configuration Options
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 The installer creates a Volume Group (VG) called `pve`, and additional
 Logical Volumes (LVs) called `root`, `data` and `swap`. The size of
@@ -133,7 +133,7 @@ required for lvmthin snapshots).
 
 
 ZFS Performance Tips
-^^^^^^^^^^^^^^^^^^^^
+~~~~~~~~~~~~~~~~~~~~
 
 ZFS uses a lot of memory, so it is best to add additional RAM if you
 want to use ZFS. A good calculation is 4GB plus 1GB RAM for each TB
@@ -149,14 +149,14 @@ installation using the following command:
 ifdef::wiki[]
 
 link:/wiki/Install_Proxmox_VE_on_Debian_Jessie[Install Proxmox VE on Debian Jessie]
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-----------------------------------------------------------------------------------
 
 endif::wiki[]
 
 ifndef::wiki[]
 
 Install {pve} on Debian
-~~~~~~~~~~~~~~~~~~~~~~~
+-----------------------
 
 {pve} ships as a set of Debian packages, so you can simply install it
 on top of a normal Debian installation. After configuring the
@@ -177,7 +177,7 @@ endif::wiki[]
 ifdef::wiki[]
 
 Video Tutorials
-~~~~~~~~~~~~~~~
+---------------
 
 * List of all official tutorials on our
   http://www.youtube.com/proxmoxve[Proxmox VE YouTube Channel]
@@ -188,7 +188,7 @@ Video Tutorials
 
 
 See Also
-~~~~~~~~
+--------
 
 * link:/wiki/Package_Repositories[Package Repositories]
 

diff --git a/sysadmin.adoc b/sysadmin.adoc
index 229650be7b7dd71a3f0db3fffb934879b0454b26..13c949d92a383ff5f2a18e718edb703fb4a44f93 100644 (file)
--- a/sysadmin.adoc
+++ b/sysadmin.adoc
@@ -75,8 +75,6 @@ See Also
 
 * link:/wiki/Package_Repositories[Package Repositories]
 
-* link:/wiki/Installation[Installation]
-
 * link:/wiki/Network_Configuration[Network Configuration] 
 
 * link:/wiki/System_Software_Updates[System Software Updates]
@@ -92,8 +90,6 @@ ifndef::wiki[]
 
 include::pve-package-repos.adoc[]
 
-include::pve-installation.adoc[]
-
 include::system-software-updates.adoc[]
 
 include::pve-network.adoc[]