From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Mon, 26 Oct 2015 09:26:25 +0000 (+0000)
Subject: Update documentation
X-Git-Tag: 1.0.7~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b3c76ba413fe3ca41018a2a828194614b7bcb7a9;p=thirdparty%2Frspamd.git

Update documentation
---

diff --git a/doc/markdown/configuration/options.md b/doc/markdown/configuration/options.md
index b503b98f3d..661b5ad6e1 100644
--- a/doc/markdown/configuration/options.md
+++ b/doc/markdown/configuration/options.md
@@ -49,6 +49,7 @@ symbol).
 * `control_socket`: path/bind credits for the control socket
 * `classify_headers`: list of headers that are processed by statistics
 * `history_rows`: number of rows in the recent history roll table
+* `explicit_modules`: always load modules from the list even if they have no according configuration section in the file
 
 ## DNS options
 
diff --git a/doc/markdown/configuration/settings.md b/doc/markdown/configuration/settings.md
index fa0e079337..7856921293 100644
--- a/doc/markdown/configuration/settings.md
+++ b/doc/markdown/configuration/settings.md
@@ -48,6 +48,10 @@ settings {
 				"add header" = 5.0; # Please mention a space instead of underscore
 			}
 		}
+		# Always add these symbols when settings rule has matched
+		symbols [
+			"symbol2", "symbol4"
+		]
 	}
 	whitelist {
 		priority = low;
@@ -69,6 +73,7 @@ So each setting has the following attributes:
 - `apply` - list of applied rules, identified by metric name (e.g. `default`)
 	+ `symbol` - modify weight of a symbol
 	+ `actions` - section of modified actions
+- `symbols` - add symbols from the list if a rule has matched
 
 Match section performs `AND` operation on different matches, for example, if you have
 `from` and `rcpt` in the same rule, then rule matches only when `from` `AND` `rcpt` match.