X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=pve-installation.adoc;h=d24d7670653c6d625e933b30e2ac3fa458798c97;hb=cef5157681b047ab4e38ed5a0f90647fc8fa95ba;hp=065c686f6995f9918febad804d584e440f0c6141;hpb=d7495642819a70f532cfd5bbbb4dbad4929cec53;p=pve-docs.git

diff --git a/pve-installation.adoc b/pve-installation.adoc
index 065c686..d24d767 100644
--- a/pve-installation.adoc
+++ b/pve-installation.adoc
@@ -1,6 +1,12 @@
 Installing Proxmox VE
----------------------
+=====================
 include::attributes.txt[]
+ifndef::manvolnum[]
+:pve-toplevel:
+endif::manvolnum[]
+ifdef::wiki[]
+:title: Installation
+endif::wiki[]
 
 {pve} ships as a set of Debian packages, so you can simply install it
 on top of a normal Debian installation, or download the installation
@@ -24,9 +30,15 @@ within a few minutes, including the following:
 * Complete toolset
 * Web based management interface
 
+ifndef::wiki[]
+
+include::pve-system-requirements.adoc[]
+
+endif::wiki[]
+
 
 Using the {pve} Installation CD-ROM
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-----------------------------------
 
 This is the preferred and recommended installation method.
 
@@ -74,9 +86,9 @@ ZFS supports several software RAID levels, so this is specially useful
 if you do not have a hardware RAID controller. The `Options` button
 lets you select the ZFS RAID level, and you can choose disks there.
 
-The next pages just asks for basic configuration options like time
+The next pages just ask for basic configuration options like time
 zone and keyboard layout. You also need to specify your email address
-and select a superuser password.
+and superuser (root) password (must have at least 5 characters).
 
 The last step is the network configuration. Please note that you can
 use either IPv4 or IPv6 here, but not both. If you want to configure a
@@ -88,8 +100,7 @@ then reboot the server.
 
 Further configuration is done via the Proxmox web interface. Just
 point your browser to the IP address given during installation
-(https://youripaddress:8006). {pve} is tested for IE9, Firefox 10
-and higher, and Google Chrome.
+(https://youripaddress:8006).
 
 NOTE: Default login is "root" (realm 'PAM') and the root password is
 defined during the installation process.
@@ -97,7 +108,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
@@ -121,8 +132,7 @@ system.
 
 `maxvz`::
 
-Define the size of the `data` volume, which is mounted at
-`/var/lib/vz`.
+Define the size of the `data` volume.
 
 `minfree`::
 
@@ -134,10 +144,11 @@ required for lvmthin snapshots).
 
 
 ZFS Performance Tips
-^^^^^^^^^^^^^^^^^^^^
+~~~~~~~~~~~~~~~~~~~~
 
-ZFS uses a lot of memory, so it is best to add additional 8-16GB RAM
-if you want to use ZFS.
+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
+RAW disk space.
 
 ZFS also provides the feature to use a fast SSD drive as write cache. The
 write cache is called the ZFS Intent Log (ZIL). You can add that after
@@ -149,17 +160,20 @@ installation using the following command:
 ifdef::wiki[]
 
 link:/wiki/Install_Proxmox_VE_on_Debian_Jessie[Install Proxmox VE on Debian Jessie]
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-----------------------------------------------------------------------------------
+
+link:/wiki/Install_from_USB_Stick[Install from USB Stick]
+---------------------------------------------------------
 
 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
+on top of a normal Debian installation. After configuring the
 repositories, you need to run:
 
 [source,bash]
@@ -168,16 +182,17 @@ apt-get update
 apt-get install proxmox-ve
 ----
 
-You can find a detailed step by step howto on the {pve}
-http://pve.proxmox.com/wiki/Install_Proxmox_VE_on_Debian_Jessie[wiki].
+You can find a detailed step by step howto on the
+{webwiki-url}Install_Proxmox_VE_on_Debian_Jessie[wiki].
 
-endif::wiki[]
+include::pve-usbstick.adoc[]
 
+endif::wiki[]
 
 ifdef::wiki[]
 
 Video Tutorials
-~~~~~~~~~~~~~~~
+---------------
 
 * List of all official tutorials on our
   http://www.youtube.com/proxmoxve[Proxmox VE YouTube Channel]
@@ -188,7 +203,9 @@ Video Tutorials
 
 
 See Also
-~~~~~~~~
+--------
+
+* link:/wiki/System_Requirements[System Requirements]
 
 * link:/wiki/Package_Repositories[Package Repositories]
 
@@ -199,4 +216,3 @@ See Also
 * link:/wiki/Installation:_Tips_and_Tricks[Installation: Tips and Tricks]
 
 endif::wiki[]
-