bump version to 5.1-5

[pmg-docs.git] / pmg-administration.adoc

diff --git a/pmg-administration.adoc b/pmg-administration.adoc
index 020558670c26d34d3878db93d6a06dff647f154c..1018db4941a8fc39905950906668ce741a9188f2 100644 (file)
--- a/pmg-administration.adoc
+++ b/pmg-administration.adoc
@@ -71,17 +71,30 @@ Quarantine
 Spam
 ~~~~
 
-DODO
+image::images/screenshot/pmg-gui-spam-quarantine.png[]
+
+This panel lets you inspect the mail quarantine. Emails can be safely
+previewed and if desired, delivered to the original user.
+
+The email preview on the web interface is very secure as malicious
+code (attacking your operating system or email client) is removed by
+Proxmox.
+
 
 Virus
 ~~~~~
 
-TODO
+Allows administrators to inspect quarantined virus mails.
 
+
+[[pmg_userblackwhitelist]]
 User White- and Blacklist
 ~~~~~~~~~~~~~~~~~~~~~~~~~
 
-TODO
+This is mostly useful to debug or verify white- and blacklist user
+settings. The administrator should not change these values because
+users can manage this themselves.
+
 
 [[pmg_tracking_center]]
 Tracking Center
@@ -119,6 +132,32 @@ specific text in the logs ('Filter' entry).
 
 NOTE: Search is faster if you use a short time interval.
 
+The 'Status' field summarize what happens with an email. {pmg} is a
+mail proxy, meaning that the proxy receives mails from outside,
+process it and finally sends the result to the receiver.
+
+The first phase is receiving the mail. The proxy may reject the mail
+early, or instead accepts the mail and feeds it into the filter. The filter
+rules can block or accept the mail.
+
+In the second phase, accepted mails need to be delivered to the
+receiver, and this action may also fail or succeed. The status
+combines the result from the first and second phase:
+
+[options="header",cols="2s,1d,5d"]
+|====
+|Status |Phase |Description
+|rejected             |1 | Email rejected (e.g. sender IP is listed on a IP blacklist)
+|greylisted           |1 | Email temporarily rejected by greylisting
+|queued/deferred      |1 | Internal Email was queued, still trying to deliver
+|queued/bounced       |1 | Internal Email was queued but not accepted by the target email server (e. g. user unknown)
+|quarantine           |1 | Email was moved to quanantine
+|blocked              |1 | Email was blocked by filter rules
+|accepted/deferred    |2 | Email accepted, still trying to deliver
+|accepted/bounced     |2 | Email accepted but not accepted by the target email server (e. g. user unknown)
+|accepted/delivered   |2 | Email accepted and deliverd
+|====
+
 
 Postfix Queue Administration
 ----------------------------