# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1601124308 -7200
# Node ID a2d5834d4a9e96749775cfe95872667466b24dca
# Parent  4ee2a90d38183f32b048357afb2792d862a1f78e# Parent  87daef9ed4e7213cf89b58046a4cd1d91adbdb18
Merge

diff -r 4ee2a90d3818 -r a2d5834d4a9e mod_firewall/README.markdown
--- a/mod_firewall/README.markdown	Sat Sep 26 00:22:57 2020 +0200
+++ b/mod_firewall/README.markdown	Sat Sep 26 14:45:08 2020 +0200
@@ -68,6 +68,12 @@
 If multiple files are specified and they both add rules to the same chains,
 each file's rules will be processed in order, but the order of files is undefined.
 
+Reloading Prosody's configuration also reloads firewall rules.
+
+Make sure that `firewall_scripts` is in the global section of the configuration file
+and not below a virtual host or a component - unless you want per-vhost
+firewall rules.
+
 Conditions
 ----------
 
@@ -587,8 +593,9 @@
   --------------- ------------------------------------------------------------------------------------------------------------------------
   `LOG=message`   Logs the given message to Prosody's log file. Optionally prefix it with a log level in square brackets, e.g. `[debug]`
 
-You can include expressions in log messages, using `$(...)` syntax. For example, to log the stanza that matched the rule, you can use $(stanza),
-or to log just the top tag of the stanza, use $(stanza:top_tag()).
+You can include expressions in log messages, using `$(...)` syntax. For example, to log the stanza that matched the rule, you can use `$(stanza)`,
+or to log just the top tag of the stanza, use `$(stanza:top_tag())`.
+To fetch the sender JID, use `$(stanza.attr.from)`.
 
 Example: