X-Git-Url: https://git.proxmox.com/?p=pve-docs.git;a=blobdiff_plain;f=sysadmin.adoc;h=09e34484c134d3a6125124d4f2bd46e34f6af795;hp=61b33a3063444942960c641cb0f7fa28448ab5e8;hb=7e71ae2e8de9acf9342cb193629b97f58ec9d2b0;hpb=2ce0ca781f16c36308c434d42091bd453615bef7

diff --git a/sysadmin.adoc b/sysadmin.adoc
index 61b33a3..09e3448 100644
--- a/sysadmin.adoc
+++ b/sysadmin.adoc
@@ -6,7 +6,7 @@ include::attributes.txt[]
 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[]).
 
@@ -44,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
 
@@ -55,58 +57,67 @@ 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] 
 
-Network Configuration
----------------------
+* link:/wiki/System_Software_Updates[System Software Updates]
 
-Basic network setup.
+* link:/wiki/Logical_Volume_Manager_(LVM)[Logical Volume Manager (LVM)]
 
+* link:/wiki/ZFS_on_Linux[ZFS on Linux]
 
+endif::wiki[]
 
-Local Storage
--------------
 
-Logical Volume Manager (LVM)
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ifndef::wiki[]
 
-TODO: info about LVM.
+include::getting-help.adoc[]
 
+include::pve-package-repos.adoc[]
 
-ZFS on Linux
-~~~~~~~~~~~~
+include::pve-installation.adoc[]
 
-TODO: info about ZFS.
+include::system-software-updates.adoc[]
 
+include::pve-network.adoc[]
 
-Working with 'systemd'
-----------------------
+include::local-lvm.adoc[]
 
-Journal and syslog
-~~~~~~~~~~~~~~~~~~
-
-TODO: explain persistent journal...
+include::local-zfs.adoc[]
 
+endif::wiki[]
 
 
+////
+TODO:
 
+Working with 'systemd'
+----------------------
 
+Journal and syslog
+~~~~~~~~~~~~~~~~~~
 
+TODO: explain persistent journal...
 
+////