X-Git-Url: https://git.proxmox.com/?p=pve-docs.git;a=blobdiff_plain;f=sysadmin.adoc;h=204cc644c7ceae04cce8a87ce3672626a0ee626e;hp=483dcf092fc76147a4be7af3a580a0ffa2a3b72d;hb=783763951da6e8b8df7610352cf2a5e2c6ab76e4;hpb=b7c3af6a8efa52bd80ce37d573849e32fdb09e57

diff --git a/sysadmin.adoc b/sysadmin.adoc
index 483dcf0..204cc64 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,49 +57,58 @@ 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)]
 
-image::images/cluster-nwdiag.svg[{pve} Cluster Network]
+* link:/wiki/ZFS_on_Linux[ZFS on Linux]
 
-image::images/node-nwdiag.svg[{pve} Default Network Setup]
+endif::wiki[]
 
 
-Local Storage
--------------
+ifndef::wiki[]
 
-Logical Volume Manager (LVM)
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+include::pve-package-repos.adoc[]
+
+include::pve-installation.adoc[]
 
-TODO: info about LVM.
+include::system-software-updates.adoc[]
 
+include::pve-network.adoc[]
 
-ZFS on Linux
-~~~~~~~~~~~~
+include::local-lvm.adoc[]
 
-TODO: info about ZFS.
+include::local-zfs.adoc[]
 
+endif::wiki[]
+
+
+////
+TODO:
 
 Working with 'systemd'
 ----------------------
@@ -107,9 +118,4 @@ Journal and syslog
 
 TODO: explain persistent journal...
 
-
-
-
-
-
-
+////