Fix #2126 (per-server configuration sections)

(also move replace_key_with_bound() to core.py, to prevent having
common.py depending of config.py)

1 files changed, 9 insertions, 0 deletions

diff --git a/doc/en/configure.txt b/doc/en/configure.txt
index d4f385af..716d97a3 100644
--- a/doc/en/configure.txt
+++ b/doc/en/configure.txt
@@ -483,6 +483,13 @@ after a JID. These option will apply only for the given JID. For example
 if an option appears in a section named [user@example.com], it will
 apply only for the conversations with user@example.com.
 
+If an option appears in a section named [@example.com], it will apply
+for all the conversations with people @example.com, except when the option
+is already defined in a [user@example.com] section.
+
+The priority of settings is thus like this:
+user@example.com > @example.com > Poezio (more specific to less specific)
+
 Note that some of these options can also appear in the global section,
 they will be used as a fallback value when no JID-specific option is
 found.
@@ -495,6 +502,8 @@ found.
 foo = false
 [user@example.com]
 foo = true
+[@example.com]
+bar = false
 -------------
 ============================================