From: Dietmar Maurer Date: Wed, 5 Oct 2016 07:21:24 +0000 (+0200) Subject: move 'Installation' into its own chapter X-Git-Url: https://git.proxmox.com/?p=pve-docs.git;a=commitdiff_plain;h=6b5fc47ba210e7a7ec7fd555cc2f963d4f7f9ad3 move 'Installation' into its own chapter --- diff --git a/Makefile b/Makefile index 94bf67c..ccd6473 100644 --- 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 603dfec..0e23371 100644 --- 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 d7b18c2..93b204c 100644 --- 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 b49b866..75dd987 100644 --- 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 229650b..13c949d 100644 --- 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[]