summaryrefslogtreecommitdiff
path: root/doc/en
diff options
context:
space:
mode:
authormathieui <mathieui@mathieui.net>2013-03-04 00:23:58 +0100
committermathieui <mathieui@mathieui.net>2013-03-04 00:23:58 +0100
commit1e9e2112f73fc3f2e6552158e57d6a623749eb75 (patch)
treea1ce204099f06fcf69a9a66710e9e0eb3890763e /doc/en
parent4be111b63ebf8ba0be6b12b3e370deaf5a45180f (diff)
downloadpoezio-1e9e2112f73fc3f2e6552158e57d6a623749eb75.tar.gz
poezio-1e9e2112f73fc3f2e6552158e57d6a623749eb75.tar.bz2
poezio-1e9e2112f73fc3f2e6552158e57d6a623749eb75.tar.xz
poezio-1e9e2112f73fc3f2e6552158e57d6a623749eb75.zip
Fix #2126 (per-server configuration sections)
(also move replace_key_with_bound() to core.py, to prevent having common.py depending of config.py)
Diffstat (limited to 'doc/en')
-rw-r--r--doc/en/configure.txt9
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
-------------
============================================