fix lintian warning in pmg-docs-apache

[pmg-docs.git] / pmg-planning-deployment.adoc

diff --git a/pmg-planning-deployment.adoc b/pmg-planning-deployment.adoc
index de78a35b67a717b7f66a435d4918f53f2c4cf546..366a65917f4f97f9b0ba500aa142bd7c4f8e3486 100644 (file)
--- a/pmg-planning-deployment.adoc
+++ b/pmg-planning-deployment.adoc
@@ -8,14 +8,14 @@ Easy integration into existing e-mail server architecture
 In this sample configuration, your e-mail traffic (SMTP) arrives on
 the firewall and will be directly forwarded to your e-mail server.
 
-image::images/infrasturcture_without_proxmox_big.jpg[]
+image::images/2018_IT_infrastructure_without_Proxmox_Mail_Gateway_final_1024.png[]
 
 By using the {pmg}, all your e-mail traffic is forwarded to the
 Proxmox Mail Gateway, which filters the whole e-mail traffic and
 removes unwanted e-mails. You can manage incoming and outgoing mail
 traffic.
 
-image::images/infrasturcture_with_proxmox_big.jpg[]
+image::images/2018_IT_infrastructure_with_Proxmox_Mail_Gateway_final_1024.png[]
 
 
 Filtering outgoing e-mails
@@ -26,8 +26,8 @@ that {pmg} is designed to scan both incoming and outgoing
 e-mails. This has two major advantages:
 
 . {pmg} is able to detect viruses sent from an internal host. In many
-countries you are liable for not sending viruses to other
-people. {pmg} outgoing e-mail scanning feature is an additional
+countries you are liable for sending viruses to other
+people. The {pmg} outgoing e-mail scanning feature is an additional
 protection to avoid that.
 
 . {pmg} can gather statistics about outgoing e-mails too. Statistics
@@ -35,15 +35,14 @@ about incoming e-mails looks nice, but they are quite
 useless. Consider two users, user-1 receives 10 e-mails from news
 portals and wrote 1 e-mail to a person you never heard from. While
 user-2 receives 5 e-mails from a customer and sent 5 e-mails
-back. Which user do you consider more active? I am sure its user-2,
+back. Which user do you consider more active? I am sure it's user-2,
 because he communicates with your customers. {pmg} advanced address
-statistics can show you this important information. Solution which
+statistics can show you this important information. A solution which
 does not scan outgoing e-mail cannot do that.
 
 To enable outgoing e-mail filtering you just need to send all outgoing
 e-mails through your {png} (usually by specifying Proxmox as
-"smarthost" on your e-mail server - see
-xref:mail_server_config[Example mail server configuration].
+"smarthost" on your e-mail server.
 
 [[firewall_settings]]
 Firewall settings
@@ -82,8 +81,8 @@ section xref:nmap[port scans]).
 System Requirements
 -------------------
 
-{pmg} needs dedicated server hardware but can also run inside a
-virtual machine on any of the following plattforms:
+The {pmg} can run on dedicated server hardware or inside a virtual machine on
+any of the following plattforms:
 
 * Proxmox VE (KVM)
 
@@ -95,7 +94,11 @@ virtual machine on any of the following plattforms:
 
 * Virtual box™
 
-* Citrix XenServer™
+* Citrix Hypervisor™ (former XenServer™)
+
+* LXC container
+
+* and others supporting Debian Linux as guest OS
 
 Please see http://www.proxmox.com for details.
 
@@ -112,28 +115,28 @@ Minimum System Requirements
 
 * bootable CD-ROM-drive or USB boot support
 
-* 1024x768 capable VGA/Monitor for Installer
+* Monitor with a resolution of 1024x768 for the installation
 
-* Hard disk 8 GB - ATA/SATA/SCSI/NVME
+* Hard disk with at least 8 GB of disk space
 
-* Ethernet Network interface card
+* Ethernet network interface card
 
 
 Recommended System Requirements
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-* Multicore CPU: 64bit (Intel EMT64 or AMD64)
+* Multicore CPU: 64bit (Intel EMT64 or AMD64), +
+  for use as virtual machine activate Intel VT/AMD-V CPU flag
 
 * 4 GB RAM
 
 * bootable CD-ROM-drive or USB boot support
 
-* 1024x768 capable VGA/Monitor for Installer
-
-* 1 GBps Ethernet Network interface card
+* Monitor with a resolution of 1024x768 for the installation
 
-* Hardware RAID1 or RAID10, Raid Controllers need write cache with
-  batteries backup module for best performance
+* 1 Gbps Ethernet network interface card
 
-* Enterprise class SSD with power loss protection (e.g. Intel SSD DC
-  35xx/36xx/37xx)
+* Storage: at least 8 GB free disk space, best setup with redundancy,
+  use hardware RAID controller with battery backed write cache (``BBU'') or
+  ZFS. ZFS is not compatible with a hardware RAID controller. For best
+  performance use Enterprise class SSD with power loss protection.