# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1536399458 -7200
# Node ID f69233c3e0c0fdbb4ce733502f10f6cdc8d94112
# Parent  2c62fda477a5135c470fd3bf41aeb1f5e232f732# Parent  65dd8ebbd82cb2213195037bb0afa23eeb90a5ea
merge

diff -r 65dd8ebbd82c -r f69233c3e0c0 mod_auth_dovecot/README.markdown
--- a/mod_auth_dovecot/README.markdown	Fri Sep 07 20:25:07 2018 -0400
+++ b/mod_auth_dovecot/README.markdown	Sat Sep 08 11:37:38 2018 +0200
@@ -32,14 +32,16 @@
 the *socket listen* section of /etc/dovecot/dovecot.conf, and match the
 socket path in Prosody's dovecot\_auth\_socket setting.
 
-    socket listen {
-      ...
-      client {
-        path = /var/spool/prosody/private/auth-client
-          mode = 0660
-          user = prosody
-          group = prosody
-      }
+    service auth {
+        socket listen {
+            client {
+                path = /var/spool/prosody/private/auth-client
+                    mode = 0660
+                    user = prosody
+                    group = prosody
+            }
+        }
+    }
 
 Make sure the socket directories exist and are owned by the Prosody
 user.
diff -r 65dd8ebbd82c -r f69233c3e0c0 mod_muc_badge/README.markdown
--- a/mod_muc_badge/README.markdown	Fri Sep 07 20:25:07 2018 -0400
+++ b/mod_muc_badge/README.markdown	Sat Sep 08 11:37:38 2018 +0200
@@ -20,7 +20,6 @@
 
   Option             Type     Default
   ------------------ -------- --------------------------
-  `badge_label`      string   `"Chatroom"`
   `badge_count`      string   `"%d online"`
   `badge_template`   string   A SVG image (see source)