# HG changeset patch
# User Seve Ferrer <seve@delape.net>
# Date 1601300040 -7200
# Node ID b79904446d9e4489f71398731da3d4563b20a675
# Parent  308b92b07da655827e1c44f5893602fd4062bbfe# Parent  a2d5834d4a9e96749775cfe95872667466b24dca
Update local repository

diff -r 308b92b07da6 -r b79904446d9e mod_conversejs/mod_conversejs.lua
--- a/mod_conversejs/mod_conversejs.lua	Mon Sep 28 15:30:22 2020 +0200
+++ b/mod_conversejs/mod_conversejs.lua	Mon Sep 28 15:34:00 2020 +0200
@@ -92,6 +92,7 @@
 		domain_placeholder = module.host;
 		allow_registration = allow_registration;
 		registration_domain = allow_registration and module.host or nil;
+		assets_path = cdn_url..version.."/dist/";
 		view_mode = "fullscreen";
 	};
 
diff -r 308b92b07da6 -r b79904446d9e mod_firewall/README.markdown
--- a/mod_firewall/README.markdown	Mon Sep 28 15:30:22 2020 +0200
+++ b/mod_firewall/README.markdown	Mon Sep 28 15:34:00 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: