Update requirements

[pve-docs.git] / sysadmin.adoc

diff --git a/sysadmin.adoc b/sysadmin.adoc
index 6ac46625dce0104df06dab5efac2fdc261dd2210..09e34484c134d3a6125124d4f2bd46e34f6af795 100644 (file)
--- a/sysadmin.adoc
+++ b/sysadmin.adoc
@@ -1,11 +1,12 @@
 Host System Administration
 ==========================
+include::attributes.txt[]
 
 {pve} is based on the famous https://www.debian.org/[Debian] Linux
 distribution. That means that you have access to the whole world of
 Debian packages, and the base system is well documented. The
 https://debian-handbook.info/download/stable/debian-handbook.pdf[Debian
-Administrator\'s Handbook] is available online, and provide a
+Administrator\'s Handbook] is available online, and provides a
 comprehensive introduction to the Debian operating system (see
 xref:Hertzog13[]).
 
@@ -43,7 +44,9 @@ Minimum requirements, for evaluation
 
 * CPU: 64bit (Intel EMT64 or AMD64)
 
-* RAM: 1 GB RAM
+* Intel VT/AMD-V capable CPU/Mainboard for KVM Full Virtualization support
+
+* RAM: 1 GB RAM, plus additional RAM used for guests
 
 * Hard drive
 
@@ -54,49 +57,60 @@ Recommended system requirements
 
 * CPU: 64bit (Intel EMT64 or AMD64), Multi core CPU recommended
 
-* RAM: 8 GB is good, more is better
+* Intel VT/AMD-V capable CPU/Mainboard for KVM Full Virtualization support
+
+* RAM: 8 GB RAM, plus additional RAM used for guests
 
-* Hardware RAID with batteries protected write cache (BBU) or flash
+* Hardware RAID with batteries protected write cache (``BBU'') or flash
  based protection
 
 * Fast hard drives, best results with 15k rpm SAS, Raid10
 
-* At least two NIC´s, depending on the used storage technology you need more
+* At least two NICs, depending on the used storage technology you need more
 
+ifdef::wiki[]
 
-include::getting-help.adoc[]
+See Also
+--------
 
-include::pve-package-repos.adoc[]
+* link:/wiki/Getting_Help[Getting Help]
 
-include::pve-installation.adoc[]
+* link:/wiki/Package_Repositories[Package Repositories]
 
-include::system-software-updates.adoc[]
+* link:/wiki/Installation[Installation]
+
+* link:/wiki/Network_Configuration[Network Configuration] 
+
+* link:/wiki/System_Software_Updates[System Software Updates]
+
+* link:/wiki/Logical_Volume_Manager_(LVM)[Logical Volume Manager (LVM)]
+
+* link:/wiki/ZFS_on_Linux[ZFS on Linux]
 
+endif::wiki[]
 
-Network Configuration
----------------------
 
-Basic network setup.
+ifndef::wiki[]
 
-image::images/cluster-nwdiag.svg[{pve} Cluster Network]
+include::getting-help.adoc[]
 
-image::images/node-nwdiag.svg[{pve} Default Network Setup]
+include::pve-package-repos.adoc[]
 
+include::pve-installation.adoc[]
 
-Local Storage
--------------
+include::system-software-updates.adoc[]
 
-Logical Volume Manager (LVM)
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+include::pve-network.adoc[]
 
-TODO: info about LVM.
+include::local-lvm.adoc[]
 
+include::local-zfs.adoc[]
 
-ZFS on Linux
-~~~~~~~~~~~~
+endif::wiki[]
 
-TODO: info about ZFS.
 
+////
+TODO:
 
 Working with 'systemd'
 ----------------------
@@ -106,9 +120,4 @@ Journal and syslog
 
 TODO: explain persistent journal...
 
-
-
-
-
-
-
+////