move 'Installation' into its own chapter

This commit is contained in:
Dietmar Maurer 2016-10-05 09:21:24 +02:00
parent e1d065e026
commit 6b5fc47ba2
5 changed files with 16 additions and 13 deletions

View File

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

View File

@ -23,6 +23,7 @@ Individual Chapters
[width="100%",options="header"] [width="100%",options="header"]
|=========================================================== |===========================================================
|Title |Download link |Title |Download link
|Installation |link:chapter-pve-installation.html[]
|Host System Administration |link:chapter-sysadmin.html[] |Host System Administration |link:chapter-sysadmin.html[]
|Cluster Manager |link:chapter-pvecm.html[] |Cluster Manager |link:chapter-pvecm.html[]
|Proxmox Cluster File System (pmxcfs) |link:chapter-pmxcfs.html[] |Proxmox Cluster File System (pmxcfs) |link:chapter-pmxcfs.html[]

View File

@ -19,6 +19,8 @@ include::attributes.txt[]
include::pve-intro.adoc[] include::pve-intro.adoc[]
include::pve-installation.adoc[]
include::sysadmin.adoc[] include::sysadmin.adoc[]
include::pvecm.adoc[] include::pvecm.adoc[]

View File

@ -1,5 +1,5 @@
Installing Proxmox VE Installing Proxmox VE
--------------------- =====================
include::attributes.txt[] include::attributes.txt[]
{pve} ships as a set of Debian packages, so you can simply install it {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 Using the {pve} Installation CD-ROM
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -----------------------------------
This is the preferred and recommended installation method. This is the preferred and recommended installation method.
@ -97,7 +97,7 @@ defined during the installation process.
[[advanced_lvm_options]] [[advanced_lvm_options]]
Advanced LVM Configuration Options Advanced LVM Configuration Options
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The installer creates a Volume Group (VG) called `pve`, and additional The installer creates a Volume Group (VG) called `pve`, and additional
Logical Volumes (LVs) called `root`, `data` and `swap`. The size of Logical Volumes (LVs) called `root`, `data` and `swap`. The size of
@ -133,7 +133,7 @@ required for lvmthin snapshots).
ZFS Performance Tips ZFS Performance Tips
^^^^^^^^^^^^^^^^^^^^ ~~~~~~~~~~~~~~~~~~~~
ZFS uses a lot of memory, so it is best to add additional RAM if you 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 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[] ifdef::wiki[]
link:/wiki/Install_Proxmox_VE_on_Debian_Jessie[Install Proxmox VE on Debian Jessie] link:/wiki/Install_Proxmox_VE_on_Debian_Jessie[Install Proxmox VE on Debian Jessie]
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -----------------------------------------------------------------------------------
endif::wiki[] endif::wiki[]
ifndef::wiki[] ifndef::wiki[]
Install {pve} on Debian Install {pve} on Debian
~~~~~~~~~~~~~~~~~~~~~~~ -----------------------
{pve} ships as a set of Debian packages, so you can simply install it {pve} ships as a set of Debian packages, so you can simply install it
on top of a normal Debian installation. After configuring the on top of a normal Debian installation. After configuring the
@ -177,7 +177,7 @@ endif::wiki[]
ifdef::wiki[] ifdef::wiki[]
Video Tutorials Video Tutorials
~~~~~~~~~~~~~~~ ---------------
* List of all official tutorials on our * List of all official tutorials on our
http://www.youtube.com/proxmoxve[Proxmox VE YouTube Channel] http://www.youtube.com/proxmoxve[Proxmox VE YouTube Channel]
@ -188,7 +188,7 @@ Video Tutorials
See Also See Also
~~~~~~~~ --------
* link:/wiki/Package_Repositories[Package Repositories] * link:/wiki/Package_Repositories[Package Repositories]

View File

@ -75,8 +75,6 @@ See Also
* link:/wiki/Package_Repositories[Package Repositories] * link:/wiki/Package_Repositories[Package Repositories]
* link:/wiki/Installation[Installation]
* link:/wiki/Network_Configuration[Network Configuration] * link:/wiki/Network_Configuration[Network Configuration]
* link:/wiki/System_Software_Updates[System Software Updates] * link:/wiki/System_Software_Updates[System Software Updates]
@ -92,8 +90,6 @@ ifndef::wiki[]
include::pve-package-repos.adoc[] include::pve-package-repos.adoc[]
include::pve-installation.adoc[]
include::system-software-updates.adoc[] include::system-software-updates.adoc[]
include::pve-network.adoc[] include::pve-network.adoc[]