add and use wiki and forum macros

[pve-docs.git] / pve-installation.adoc

diff --git a/pve-installation.adoc b/pve-installation.adoc
index e389d1187f51013ca9e475efffb71d94bde151fe..b49b866900d5e6c072883db4984eff1c26841baa 100644 (file)
--- a/pve-installation.adoc
+++ b/pve-installation.adoc
@@ -52,14 +52,14 @@ general use.
 Rescue Boot::
 
 This option allows you to boot an existing installation. It searches
-all attached hard disks, and if it finds an existing installation,
+all attached hard disks and, if it finds an existing installation,
 boots directly into that disk using the existing Linux kernel. This
 can be useful if there are problems with the boot block (grub), or the
 BIOS is unable to read the boot block from the disk.
 
 Test Memory::
 
-Runs `memtest86+`. This is useful to check if your memory if
+Runs `memtest86+`. This is useful to check if your memory is
 functional and error free.
 
 You normally select *Install Proxmox VE* to start the installation.
@@ -74,9 +74,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
@@ -91,6 +91,9 @@ 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.
 
+NOTE: Default login is "root" (realm 'PAM') and the root password is
+defined during the installation process.
+
 
 [[advanced_lvm_options]]
 Advanced LVM Configuration Options
@@ -118,8 +121,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`::
 
@@ -133,8 +135,9 @@ 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
@@ -156,7 +159,7 @@ 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]
@@ -165,24 +168,12 @@ 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[]
 
 
-{pve} Web Interface
-~~~~~~~~~~~~~~~~~~~
-
-After installation, further configuration is done via the {pve} web
-interface. Just point your browser to the IP address given during
-installation ('https://youripaddress:8006'). Proxmox VE is tested for
-IE9, Firefox 10 and higher, Google Chrome (latest).
-
-NOTE: Default login is "root" (realm 'PAM') and the root password is
-defined during the installation process.
-
-
 ifdef::wiki[]
 
 Video Tutorials
@@ -208,4 +199,3 @@ See Also
 * link:/wiki/Installation:_Tips_and_Tricks[Installation: Tips and Tricks]
 
 endif::wiki[]
-