Haraka 3.1.0 → 3.1.2

package/docs/plugins/aliases.md

@@ -1,7 +1,7 @@
 # aliases
 
 This plugin allows one to configure aliases that may perform an action or
-change the RCPT address in a number of ways.  All aliases are specified in
+change the RCPT address in a number of ways. All aliases are specified in
 a JSON formatted configuration file, and must have at very least an action.
 Any syntax error found in the JSON format config file will stop the server
 from running.
@@ -9,137 +9,137 @@ from running.
 IMPORTANT: this plugin must appear in `config/plugins` before other plugins
 that run on hook_rcpt
 
-WARNING: DO NOT USE THIS PLUGIN WITH queue/smtp\_proxy.
+WARNING: DO NOT USE THIS PLUGIN WITH queue/smtp_proxy.
 
 ## Configuration
 
-* aliases
+- aliases
 
-    JSON formatted configuration file that must contain, at very least, a key
-    to match against RCPT address, and a value that is an associative array
-    with an "action" : "<action>" key, value pair.  An example:
+  JSON formatted configuration file that must contain, at very least, a key
+  to match against RCPT address, and a value that is an associative array
+  with an "action" : "<action>" key, value pair. An example:
 
-        { "test1" : { "action" : "drop" } } 
+        { "test1" : { "action" : "drop" } }
 
-    In the above example the "test1" alias will drop any message that matches
-    test1, or test1-* or test1+* (wildcard '-' or '+', see below).  Actions
-    may in turn have 0 or more options listed with them like so:
+  In the above example the "test1" alias will drop any message that matches
+  test1, or test1-_ or test1+_ (wildcard '-' or '+', see below). Actions
+  may in turn have 0 or more options listed with them like so:
 
         { "test3" : { "action" : "alias", "to" : "test3-works" } }
 
-    In the above example the "test3" alias has an action of "alias", and
-    a required "to" field.  If this "to" field were missing the alias would
-    fail to run, and an error would be printed in the logs.
-    
-    Now aliases of 'user', '@host' and 'user@host' possible:
-    
+  In the above example the "test3" alias has an action of "alias", and
+  a required "to" field. If this "to" field were missing the alias would
+  fail to run, and an error would be printed in the logs.
+
+  Now aliases of 'user', '@host' and 'user@host' possible:
+
         { "demo" : { "action" : "drop" } }
         or
-        { "@example.com" : { "action" : "drop" } } 
+        { "@example.com" : { "action" : "drop" } }
         or
-        { "demo@example.com" : { "action" : "drop" } } 
+        { "demo@example.com" : { "action" : "drop" } }
 
-    Aliases may also be exploded to multiple recipients:
+  Aliases may also be exploded to multiple recipients:
 
         { "sales@example.com": { "action: "alias", "to": ["alice@example.com", "bob@example.com"] } }
 
-    * wildcard notation
+  - wildcard notation
 
-        In an effort to match some of the functionality of other alias parsers
-        we've allowed wildcard matching of the alias against the right most
-        string of a RCPT address.  The characters '-' and '+' are commonly used
-        for subaddressing and this plugin has built-in support to alias the
-        "user" part of the email address.
+    In an effort to match some of the functionality of other alias parsers
+    we've allowed wildcard matching of the alias against the right most
+    string of a RCPT address. The characters '-' and '+' are commonly used
+    for subaddressing and this plugin has built-in support to alias the
+    "user" part of the email address.
 
-        That is, if our address were test2-testing@example.com (or
-        test2+testing@example.com), the below alias would match:
+    That is, if our address were test2-testing@example.com (or
+    test2+testing@example.com), the below alias would match:
 
-            { "test2" : { "action" : "drop" } }
+          { "test2" : { "action" : "drop" } }
 
-        The larger, and more specific alias, should always match first when
-        using wildcard '-' notation.  So if the above RCPT were put up against
-        this alias config, it would not drop, but rather map to another
-        address:
+    The larger, and more specific alias, should always match first when
+    using wildcard '-' notation. So if the above RCPT were put up against
+    this alias config, it would not drop, but rather map to another
+    address:
 
-            {
-                "test2" : { "action" : "drop" },
-                "test2-testing" : { "action" : "alias", "to" : "test@foo.com" }
-            }
+          {
+              "test2" : { "action" : "drop" },
+              "test2-testing" : { "action" : "alias", "to" : "test@foo.com" }
+          }
 
-    * chaining and circuits
+  - chaining and circuits
 
-        In short, we do not allow chaining of aliases at this time.  As a
-        side-effect, we enjoy protections against alias circuits.
+    In short, we do not allow chaining of aliases at this time. As a
+    side-effect, we enjoy protections against alias circuits.
 
-    * optional one line formatting
+  - optional one line formatting
 
-        Any valid JSON will due, however, please consider keeping each alias
-        on its own line so that others that wish to grep the aliases file
-        have an easier time finding the full configuration for an alias.
+    Any valid JSON will due, however, please consider keeping each alias
+    on its own line so that others that wish to grep the aliases file
+    have an easier time finding the full configuration for an alias.
 
-    * nondeterministic duplicate matches
+  - nondeterministic duplicate matches
 
-        This plugin was written with speed in mind.  That means every lookup
-        hashes into the alias file for its match.  While the act of doing so
-        is fast, it does mean that any duplicate alias entries will match
-        nondeterministically.  That is, we cannot predict what will happen
-        here:
+    This plugin was written with speed in mind. That means every lookup
+    hashes into the alias file for its match. While the act of doing so
+    is fast, it does mean that any duplicate alias entries will match
+    nondeterministically. That is, we cannot predict what will happen
+    here:
 
-            {
-                "coinflip" : { "action" : "alias", "to" : "heads@coin.com" },
-                "coinflip" : { "action" : "alias", "to" : "tails@coin.com" }
-            }
+          {
+              "coinflip" : { "action" : "alias", "to" : "heads@coin.com" },
+              "coinflip" : { "action" : "alias", "to" : "tails@coin.com" }
+          }
 
-        Truth be told, one result will likely always be chosen over the other,
-        so this is not exactly a coinflip.  We simply cannot say what the
-        language implementation will do here, it could change tomorrow.
+    Truth be told, one result will likely always be chosen over the other,
+    so this is not exactly a coinflip. We simply cannot say what the
+    language implementation will do here, it could change tomorrow.
 
-* action (required)
+- action (required)
 
-    The following is a list of supported actions, and the options they require.
+  The following is a list of supported actions, and the options they require.
 
-    * drop
+  - drop
 
-        This action simply drops a message, while pretending everything was
-        okay to the sender.  This acts much like an alias to /dev/null in
-        other servers.
+    This action simply drops a message, while pretending everything was
+    okay to the sender. This acts much like an alias to /dev/null in
+    other servers.
 
-    * alias
+  - alias
 
-        This action will map the alias key to the address specified in the
-        "to" option.  A note about matching in addition to the note
-        about wildcard '-' above.  When we match an alias, we store the
-        hostname of the match for a shortcut substitution syntax later. 
+    This action will map the alias key to the address specified in the
+    "to" option. A note about matching in addition to the note
+    about wildcard '-' above. When we match an alias, we store the
+    hostname of the match for a shortcut substitution syntax later.
 
-        * to (required)
+    - to (required)
 
-            This option is the full address, or local part at matched hostname
-            that the RCPT address will be re-written to.  For an example of
-            an alias to a full address consider the following: 
+      This option is the full address, or local part at matched hostname
+      that the RCPT address will be re-written to. For an example of
+      an alias to a full address consider the following:
 
-                { "test5" : { "action" : "alias", "to" : "test5@foo.com" } }
+            { "test5" : { "action" : "alias", "to" : "test5@foo.com" } }
 
-            This will map RCPT matches for "test5" to "test5-works@foo.com".
-            This would map "test5@somedomain.com" to "test5-works@foo.com"
-            every time.  Now compare this notation with its shortcut
-            counterpart, best used when the "to" address is at the same
-            domain as the match:
+      This will map RCPT matches for "test5" to "test5-works@foo.com".
+      This would map "test5@somedomain.com" to "test5-works@foo.com"
+      every time. Now compare this notation with its shortcut
+      counterpart, best used when the "to" address is at the same
+      domain as the match:
 
-                { "test4" : { "action" : "alias", "to" : "test4" } }
+            { "test4" : { "action" : "alias", "to" : "test4" } }
 
-            Clearly, this notation is more compact, but what does it do.  Well,
-            mail to "test4-foo@anydomain.com" will map to "test4@anydomain.com".
-            One can see the clear benefit of using this notation with lots of
-            aliases on a single domain that map to other local parts at the
-            same domain.
+      Clearly, this notation is more compact, but what does it do. Well,
+      mail to "test4-foo@anydomain.com" will map to "test4@anydomain.com".
+      One can see the clear benefit of using this notation with lots of
+      aliases on a single domain that map to other local parts at the
+      same domain.
 
 ### Example Configuration
 
 {
-    "test1" : { "action" : "drop" },
-    "test2" : { "action" : "drop" },
-    "test3" : { "action" : "alias", "to" : "test3-works" },
-    "test4" : { "action" : "alias", "to" : "test4" },
-    "test5" : { "action" : "alias", "to" : "test5-works@success.com" },
-    "test6" : { "action" : "alias", "to" : "test6-works@success.com" }
+"test1" : { "action" : "drop" },
+"test2" : { "action" : "drop" },
+"test3" : { "action" : "alias", "to" : "test3-works" },
+"test4" : { "action" : "alias", "to" : "test4" },
+"test5" : { "action" : "alias", "to" : "test5-works@success.com" },
+"test6" : { "action" : "alias", "to" : "test6-works@success.com" }
 }

package/docs/plugins/auth/auth_bridge.md

@@ -1,5 +1,4 @@
-auth/auth\_bridge
-===============
+# auth/auth_bridge
 
 This plugin allows you to authenticate users to remote SMTP servers
 bridging the original user and password to the remote server,
@@ -13,8 +12,7 @@ the domain is the configuration file. This plugins simply takes
 the original user and password and tries to authenticate it in the
 remote SMTP server.
 
-Configuration
--------------
+## Configuration
 
 Configuration is stored in `config/smtp_bridge.ini` and uses the INI
 style formatting.
@@ -26,11 +24,11 @@ The configuration of this plugin is simple:
     #auth_type=
     #priority=10
 
-* host: the host where you will be authenticating and posting,
-for example `smtp.host.tld`. This is the only setting required.
+- host: the host where you will be authenticating and posting,
+  for example `smtp.host.tld`. This is the only setting required.
 
 If needed you can also set
 
-* port: default to empty and Haraka will use 25.
+- port: default to empty and Haraka will use 25.
 
 The options `auth_type` and `priority` will be used by `queue/smtp_bridge`

package/docs/plugins/auth/auth_ldap.md

@@ -1,44 +1,41 @@
-auth/auth\_ldap
-==============
+# auth/auth_ldap
 
 The `auth/auth_ldap` plugin uses an LDAP bind to authenticate a user. Currently
-only one server and multiple DNs can be configured. If any of the DN binds succeed, 
-the user is authenticated. 
+only one server and multiple DNs can be configured. If any of the DN binds succeed,
+the user is authenticated.
 
-Configuration
--------------
+## Configuration
 
 Configuration is stored in `config/auth_ldap.ini` and uses the INI
-style formatting. 
+style formatting.
 
 Only the `LOGIN` authentication method is supported assuming that passwords in the
 LDAP database are not stored in cleartext (which would allow for CRAM-MD5). Note
 that this means passwords will be sent in the clear to the LDAP server unless
-an `ldaps://` conection is used. 
+an `ldaps://` conection is used.
 
 Current configuration options in `[core]` are:
 
     server - the url of the LDAP server (ldap:// or ldaps://)
     timeout - time in miliseconds to wait for the server resonse before giving up
     rejectUnauthorized - boolean (true or false) as to whether to reject connections
-        not verified against a CA. Meaning, a "false" allows non-verified.  
+        not verified against a CA. Meaning, a "false" allows non-verified.
 
 Example:
 
     [core]
     server=ldaps://ldap.opoet.com
     timeout=5000
-    rejectUnauthorized=false  
+    rejectUnauthorized=false
 
 The `[dns]` section (that is plural DN and not domain name system), is a list of DNs to use
-to bind. The `%u` in the strings is substituted with the user name used in the SMTP 
+to bind. The `%u` in the strings is substituted with the user name used in the SMTP
 authentication. Note that the keys have no meaning and the DNs are tried in series until
 the first successful bind. The LDAP RFC does not allow for parallel binds on a connection,
-so it is suggested that the most commonly used DN be placed earlier in the list. 
+so it is suggested that the most commonly used DN be placed earlier in the list.
 
 Example:
 
     [dns]
     dn1=uid=%u,ou=Users,dc=opoet,dc=com
-    dn2=uid=%u,ou=people,dc=opoet,dc=com 
-
+    dn2=uid=%u,ou=people,dc=opoet,dc=com

package/docs/plugins/auth/auth_proxy.md

@@ -1,29 +1,27 @@
-auth/auth\_proxy
-===============
+# auth/auth_proxy
 
 This plugin allows you to authenticate users by domain to remote SMTP servers
 and proxy the result back to authenticate the client.
 
-For this to work - the AUTH username *must* be in user@domain.com format
+For this to work - the AUTH username _must_ be in user@domain.com format
 regardless as to whether the remote SMTP server requires it in this format.
-The domain part of the username is used to look-up which SMTP servers should 
+The domain part of the username is used to look-up which SMTP servers should
 be used to authenticate users for that domain.
 When sending the AUTH credentials to the remote server, this plugin will try
-and send the full username e.g. user@domain.com first and if this fails it 
+and send the full username e.g. user@domain.com first and if this fails it
 will then strip the @domain.com part and just send the unqualified username.
 
 Due to the way this plugin works - it can only support PLAIN and LOGIN
 authentication methods and for this reason it requires that STARTTLS be
 used via the tls plugin before it will advertise AUTH capabilities by the
-EHLO command.  When connecting to the remote SMTP systems it will always
-attempt STARTTLS if it is offered, but it does *not* require it, so caution
+EHLO command. When connecting to the remote SMTP systems it will always
+attempt STARTTLS if it is offered, but it does _not_ require it, so caution
 should be exercised.
 
-Configuration
--------------
+## Configuration
 
 Configuration is stored in `config/auth_proxy.ini` and uses the INI
-style formatting. 
+style formatting.
 
 The configuration of this plugin is simple:
 
@@ -31,8 +29,8 @@ The configuration of this plugin is simple:
     domain.com = server1.domain.com:587 server2.domain.com
 
 Where domain.com is the domain-part of the username equals a list of hosts
-that should be consulted in host:port format.  The :port is optional and will
-default to 25.  The list of hosts can be space, semi-colon or comma separated.
+that should be consulted in host:port format. The :port is optional and will
+default to 25. The list of hosts can be space, semi-colon or comma separated.
 
 If more than host is specified, then subsequent hosts will only be tested if
 there is some sort of error e.g. timeout, connection or protocol error.

package/docs/plugins/auth/auth_vpopmaild.md

@@ -1,4 +1,4 @@
-# auth/auth\_vpopmaild
+# auth/auth_vpopmaild
 
 The `auth/vpopmaild` plugin allows SMTP users to authenticate against a vpopmaild daemon.
 
@@ -8,14 +8,13 @@ The configuration file is stored in `config/auth_vpopmaild.ini`.
 
 ### settings
 
-* host: The host/IP that vpopmaild is listening on (default: localhost).
+- host: The host/IP that vpopmaild is listening on (default: localhost).
 
-* port: The TCP port that vpopmaild is listening on (default: 89).
+- port: The TCP port that vpopmaild is listening on (default: 89).
 
-* sysadmin: A colon separated username:password of a vpopmail user with SYSADMIN privileges (see vpopmail/bin/vmoduser -S). This is **only** necessary to support CRAM-MD5 which requires access to the clear text password. On new installs, it's best not to use CRAM-MD5, as it requires storing clear text passwords. Legacy clients with MUAs configured to authenticate with CRAM-MD5 will need this enabled.
-
-* constrain_sender: (default: true). For outbound messages (due to successful AUTH), constrain the envelope sender (MAIL FROM) to the same domain as the authenticated user. This setting, combined with `rate_rcpt_sender` in the [limit](https://github.com/haraka/haraka-plugin-limit) plugin can dramatically reduce the amount of backscatter and spam sent when an email account is compromised.
+- sysadmin: A colon separated username:password of a vpopmail user with SYSADMIN privileges (see vpopmail/bin/vmoduser -S). This is **only** necessary to support CRAM-MD5 which requires access to the clear text password. On new installs, it's best not to use CRAM-MD5, as it requires storing clear text passwords. Legacy clients with MUAs configured to authenticate with CRAM-MD5 will need this enabled.
 
+- constrain_sender: (default: true). For outbound messages (due to successful AUTH), constrain the envelope sender (MAIL FROM) to the same domain as the authenticated user. This setting, combined with `rate_rcpt_sender` in the [limit](https://github.com/haraka/haraka-plugin-limit) plugin can dramatically reduce the amount of backscatter and spam sent when an email account is compromised.
 
 ### Per-domain Configuration
 

package/docs/plugins/auth/flat_file.md

@@ -1,4 +1,4 @@
-# auth/flat\_file
+# auth/flat_file
 
 The `auth/flat_file` plugin allows you to create a file containing username and password combinations, and have relaying users authenticate from that file.
 
@@ -6,18 +6,18 @@ Note that passwords are stored in clear-text, so this may not be a great idea fo
 
 **Security** - it is recommended to switch to [auth-encfile][url-authencflat] to protect your user credentials.
 
-**IMPORANT NOTE** - this plugin requires that STARTTLS be used via the tls plugin before it will advertise AUTH capabilities by the EHLO command.  Localhost and IPs in RFC1918 ranges 
+**IMPORANT NOTE** - this plugin requires that STARTTLS be used via the tls plugin before it will advertise AUTH capabilities by the EHLO command. Localhost and IPs in RFC1918 ranges
 are exempt from this rule.
 
 ## Configuration
 
 Configuration is stored in `config/auth_flat_file.ini`.
 
-* [core]methods
+- [core]methods
 
 Authentication methods are listed in the `[core]methods` parameter. Authentification methods are comma separated. Currently supported methods are: `CRAM-MD5`, `PLAIN` and `LOGIN`. The `PLAIN` and `LOGIN` methods are insecure and require TLS to be enabled.
 
-* [core]constrain_sender: (default: true). For outbound messages (due to successful AUTH), constrain the envelope sender (MAIL FROM) to the same domain as the authenticated user. This setting, combined with `rate_rcpt_sender` in the [limit](https://github.com/haraka/haraka-plugin-limit) plugin can dramatically reduce the amount of backscatter and spam sent when an email account is compromised.
+- [core]constrain_sender: (default: true). For outbound messages (due to successful AUTH), constrain the envelope sender (MAIL FROM) to the same domain as the authenticated user. This setting, combined with `rate_rcpt_sender` in the [limit](https://github.com/haraka/haraka-plugin-limit) plugin can dramatically reduce the amount of backscatter and spam sent when an email account is compromised.
 
 Example:
 

package/docs/plugins/block_me.md

@@ -1,4 +1,4 @@
-# block\_me
+# block_me
 
 This plugin allows you to configure an address which mail sent to will be
 parsed for a From: address in the body of the message, and will add that
@@ -11,8 +11,8 @@ Note that this is a system-wide block, and not per-user. Be careful with this.
 
 ## Configuration
 
-* `config/block_me.recipient` - a file containing the address to email to
+- `config/block_me.recipient` - a file containing the address to email to
   get something blocked. For example: **spam@domain.com**.
 
-* `config/block_me.senders` - a file containing a list of email addresses
+- `config/block_me.senders` - a file containing a list of email addresses
   that are allowed to email the dropbox.

package/docs/plugins/data.signatures.md

@@ -6,7 +6,6 @@ matching these signatures will be blocked.
 
 ## Configuration
 
-* data.signatures
+- data.signatures
 
   This file contains a list of strings (one per line) that will be matched.
-

package/docs/plugins/delay_deny.md

@@ -1,12 +1,12 @@
-# delay\_deny
+# delay_deny
 
 Delays all pre-DATA 'deny' results until the recipients are sent
-and all post-DATA commands until all hook\_data\_post plugins have run.
+and all post-DATA commands until all hook_data_post plugins have run.
 This allows relays and authenticated users to bypass pre-DATA rejections.
 
 ## Configuration
 
-Configuration options are in config/delay\_deny.ini.
+Configuration options are in config/delay_deny.ini.
 
 This plugin operates in one of two modes: included and excluded.
 
@@ -21,4 +21,3 @@ can immediately reject connections.
 A comma or semicolon separated list of denials that are to be excluded.
 Excluded plugins that are not bypassed and can still immediately reject
 connections.
-

package/docs/plugins/max_unrecognized_commands.md

@@ -1,4 +1,4 @@
-# max\_unrecognized\_commands
+# max_unrecognized_commands
 
 This plugin places a maximum limit on the number of unrecognized commands
 allowed before recognising that the connection is bad.
@@ -6,15 +6,15 @@ allowed before recognising that the connection is bad.
 If the limit is reached the connecting client is sent an error message and
 immediately (and rudely - technically an RFC violation) disconnected.
 
-**IMPORTANT**: 
+**IMPORTANT**:
 This plugin should be listed near the bottom of `config/plugins` so that it
 runs after any plugins that use the unrecognized_command hook to implement
-other SMTP verbs and extensions (such as the auth/* plugins), otherwise
+other SMTP verbs and extensions (such as the auth/\* plugins), otherwise
 commands valid for these plugins will be counted as unknown by this plugin.
 
 ## Configuration
 
-* max\_unrecognized\_commands
+- max_unrecognized_commands
 
   Specifies the number of unrecognized commands to allow before disconnecting.
   Default: 10.

package/docs/plugins/prevent_credential_leaks.md

@@ -1,4 +1,4 @@
-# prevent\_credential\_leaks
+# prevent_credential_leaks
 
 This plugin prevents an authenticated user (via SMTP AUTH) from sending
 their username and password out in a message (e.g. like replying to a
@@ -7,16 +7,16 @@ phish).
 If their username and password are detected inside the message body, then
 the message is rejected with the message:
 
-`````
+```
 Credential leak detected: never give out your username/password to anyone!
-`````
+```
 
 Note that if the username is qualified e.g. user@domain.com - then the
-plugin will search for both `user` and `user@domain.com` for maximum 
+plugin will search for both `user` and `user@domain.com` for maximum
 effectiveness.
 
 ## Configuration
 
-No configuration is required.  Simply add the plugin to your `config/plugins`
-file.  It should be added before any other plugins that run on hook_data_post
+No configuration is required. Simply add the plugin to your `config/plugins`
+file. It should be added before any other plugins that run on hook_data_post
 for maximum efficiency.

package/docs/plugins/process_title.md

@@ -1,4 +1,4 @@
-# process\_title
+# process_title
 
 This plugin causes the process title seen by the UNIX 'ps' command to
 be modified from this:
@@ -10,31 +10,31 @@ node haraka.js -c /etc/haraka
 to this:
 
 ```
-Haraka (master) cn=11148 cc=1082 cps=21/25.24/79 rcpts=144950/1.84 rps=518/328.18/586 msgs=78815/7.07 mps=302/178.44/329 out=0/0/0 respawn=0 
- \_ Haraka (worker) cn=1646 cc=140 cps=5/3.73/17 rcpts=20310/1.86 rps=75/46.04/102 msgs=10938/6.65 mps=42/24.8/56 out=0/0/0 
- \_ Haraka (worker) cn=1563 cc=168 cps=3/3.54/18 rcpts=19844/1.87 rps=78/45/96 msgs=10627/6.8 mps=49/24.1/53 out=0/0/0 
- \_ Haraka (worker) cn=1852 cc=172 cps=3/4.2/16 rcpts=26278/2.03 rps=93/59.56/114 msgs=12938/6.99 mps=40/29.33/65 out=0/0/0 
- \_ Haraka (worker) cn=1704 cc=187 cps=5/3.86/14 rcpts=23688/1.84 rps=93/53.7/125 msgs=12886/7.56 mps=64/29.21/66 out=0/0/0 
- \_ Haraka (worker) cn=2296 cc=218 cps=2/5.2/20 rcpts=29300/1.78 rps=117/66.4/125 msgs=16489/7.18 mps=40/37.37/66 out=0/0/0 
- \_ Haraka (worker) cn=2091 cc=195 cps=4/4.74/16 rcpts=25646/1.71 rps=84/58.12/117 msgs=14982/7.16 mps=52/33.95/66 out=0/0/0 
+Haraka (master) cn=11148 cc=1082 cps=21/25.24/79 rcpts=144950/1.84 rps=518/328.18/586 msgs=78815/7.07 mps=302/178.44/329 out=0/0/0 respawn=0
+ \_ Haraka (worker) cn=1646 cc=140 cps=5/3.73/17 rcpts=20310/1.86 rps=75/46.04/102 msgs=10938/6.65 mps=42/24.8/56 out=0/0/0
+ \_ Haraka (worker) cn=1563 cc=168 cps=3/3.54/18 rcpts=19844/1.87 rps=78/45/96 msgs=10627/6.8 mps=49/24.1/53 out=0/0/0
+ \_ Haraka (worker) cn=1852 cc=172 cps=3/4.2/16 rcpts=26278/2.03 rps=93/59.56/114 msgs=12938/6.99 mps=40/29.33/65 out=0/0/0
+ \_ Haraka (worker) cn=1704 cc=187 cps=5/3.86/14 rcpts=23688/1.84 rps=93/53.7/125 msgs=12886/7.56 mps=64/29.21/66 out=0/0/0
+ \_ Haraka (worker) cn=2296 cc=218 cps=2/5.2/20 rcpts=29300/1.78 rps=117/66.4/125 msgs=16489/7.18 mps=40/37.37/66 out=0/0/0
+ \_ Haraka (worker) cn=2091 cc=195 cps=4/4.74/16 rcpts=25646/1.71 rps=84/58.12/117 msgs=14982/7.16 mps=52/33.95/66 out=0/0/0
 ```
 
 where:
 
-* cn = Total number of connections
-* cc = Total number of concurrent connections
-* cps = Number of connections in the last second / average / maximum
-* rcpts = Total number of recipients / Average number of recipients per message
-* rps = Number of recipients in the last second / average / maximum
-* msgs = Total number of messages / Average number messages per connection
-* mps = Number of messages in the last second / average / maximum
-* out = Mails being processed / Mails waiting to be processed / Mails in temp fail state
-* respawn = Number of worker processes respawned (only under cluster)
+- cn = Total number of connections
+- cc = Total number of concurrent connections
+- cps = Number of connections in the last second / average / maximum
+- rcpts = Total number of recipients / Average number of recipients per message
+- rps = Number of recipients in the last second / average / maximum
+- msgs = Total number of messages / Average number messages per connection
+- mps = Number of messages in the last second / average / maximum
+- out = Mails being processed / Mails waiting to be processed / Mails in temp fail state
+- respawn = Number of worker processes respawned (only under cluster)
 
 If 'cluster' is used then the master process will show the total
 across all workers, with the exception of outbound stats.
 
-All of the counts shown are since the process started, so if a 
+All of the counts shown are since the process started, so if a
 worker has been re-started then the counts may not add up.
 
 Note: this plugin will only work on node >= 0.8 and should be

package/docs/plugins/queue/deliver.md

@@ -1,4 +1,3 @@
-queue/deliver
-=============
+# queue/deliver
 
-This plugin is now redundant. Outbound delivery is now built into Haraka.
+This plugin is now redundant. Outbound delivery is now built into Haraka.

package/docs/plugins/queue/discard.md

@@ -2,13 +2,13 @@
 
 This plugin will discard a message by pretending that the message was queued.
 
-It is designed to be used by other plugins which request the message be 
+It is designed to be used by other plugins which request the message be
 discard by setting a connection or transaction note that this plugin
 checks.
 
 It uses the 'queue' hook, so it runs after all the plugins that hook on `data_post`.
 
-If you use the 'quarantine' plug-in then this plugin should run *after* it.
+If you use the 'quarantine' plug-in then this plugin should run _after_ it.
 
 USE THIS PLUGIN WITH CARE!
 
@@ -22,11 +22,11 @@ other queue plugins that perform actual deliveries.
 Set
 
 ```javascript
-connection.notes.discard = [ 1 | true ];
+connection.notes.discard = [1 | true]
 ```
 
 or
 
 ```javascript
-connection.transaction.notes.discard = [ 1 | true ];
+connection.transaction.notes.discard = [1 | true]
 ```

package/docs/plugins/queue/lmtp.md

@@ -1,5 +1,4 @@
-queue/lmtp
-========
+# queue/lmtp
 
 This plugin delivers inbound mail via LMTP.
 
@@ -23,4 +22,3 @@ port=2400
 ; Using unix domain sockets
 path = /tmp/blah_com_socket
 ```
-