add pveperf section and man page

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

diff --git a/pve-installation.adoc b/pve-installation.adoc
index 8321992550b7d5e161cd1b13107241e9406a6f66..7f5bcae02d6d965453bbe6bbb29f49d5824c575d 100644 (file)
--- a/pve-installation.adoc
+++ b/pve-installation.adoc
@@ -24,6 +24,12 @@ 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
 -----------------------------------


@@ -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.


@@ -194,6 +199,8 @@ Video Tutorials
 See Also
 --------
 
 See Also
 --------
 

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

 * link:/wiki/Package_Repositories[Package Repositories]
 
 * link:/wiki/Host_System_Administration[Host System Administration]
 * link:/wiki/Package_Repositories[Package Repositories]
 
 * link:/wiki/Host_System_Administration[Host System Administration]