pve-docs-mediawiki-import: fix syntax error

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

diff --git a/pve-installation.adoc b/pve-installation.adoc
index b49b866900d5e6c072883db4984eff1c26841baa..7f5bcae02d6d965453bbe6bbb29f49d5824c575d 100644 (file)
--- a/pve-installation.adoc
+++ b/pve-installation.adoc
@@ -1,5 +1,5 @@
 Installing Proxmox VE
 Installing Proxmox VE

----------------------
+=====================

 include::attributes.txt[]
 
 {pve} ships as a set of Debian packages, so you can simply install it
 include::attributes.txt[]
 
 {pve} ships as a set of Debian packages, so you can simply install it


@@ -24,9 +24,15 @@ within a few minutes, including the following:
 * Complete toolset
 * Web based management interface
 
 * Complete toolset
 * Web based management interface
 

+ifndef::wiki[]
+
+include::pve-system-requirements.adoc[]
+
+endif::wiki[]
+

 
 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.
 


@@ -88,8 +94,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
 
 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.
 
 NOTE: Default login is "root" (realm 'PAM') and the root password is
 defined during the installation process.


@@ -97,7 +102,7 @@ defined during the installation process.
 
 [[advanced_lvm_options]]
 Advanced LVM Configuration Options
 
 [[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
 
 The installer creates a Volume Group (VG) called `pve`, and additional
 Logical Volumes (LVs) called `root`, `data` and `swap`. The size of


@@ -133,7 +138,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
 want to use ZFS. A good calculation is 4GB plus 1GB RAM for each TB
 
 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 +154,17 @@ installation using the following command:
 ifdef::wiki[]
 
 link:/wiki/Install_Proxmox_VE_on_Debian_Jessie[Install Proxmox VE on Debian Jessie]
 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
 
 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
 
 {pve} ships as a set of Debian packages, so you can simply install it
 on top of a normal Debian installation. After configuring the


@@ -171,13 +179,14 @@ apt-get install proxmox-ve
 You can find a detailed step by step howto on the
 {webwiki-url}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
 
 ifdef::wiki[]
 
 Video Tutorials

-~~~~~~~~~~~~~~~
+---------------

 
 * List of all official tutorials on our
   http://www.youtube.com/proxmoxve[Proxmox VE YouTube Channel]
 
 * List of all official tutorials on our
   http://www.youtube.com/proxmoxve[Proxmox VE YouTube Channel]


@@ -188,7 +197,9 @@ Video Tutorials
 
 
 See Also
 
 
 See Also

-~~~~~~~~
+--------
+
+* link:/wiki/System_Requirements[System Requirements]

 
 * link:/wiki/Package_Repositories[Package Repositories]
 
 
 * link:/wiki/Package_Repositories[Package Repositories]