summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorHavoc Pennington <hp@redhat.com>2003-04-05 20:38:01 +0000
committerHavoc Pennington <hp@redhat.com>2003-04-05 20:38:01 +0000
commit2f3fbd451d2bed1737052c672974e3dc31ad015f (patch)
tree0550a62ece5f6fab6919a68744902a141d293451 /doc
parent6164a2e5f4ce528d902c8b55d4779204e91269ab (diff)
2003-04-05 Havoc Pennington <hp@pobox.com>
* doc/config-file.txt (Elements): fix docs of <auth> to reflect reality; in fact multiple mechanisms are allowed. * dbus/dbus-internals.c (_dbus_real_assert) (_dbus_real_assert_not_reached): move guts of _dbus_assert() and _dbus_assert_not_reached() into functions, so that they don't show up in basic block counts for test coverage, and don't use up as much disk space. Does mean slower execution speed though, so assumes --disable-asserts is the normal production case.
Diffstat (limited to 'doc')
-rw-r--r--doc/config-file.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/config-file.txt b/doc/config-file.txt
index 8c2152b5..897c2380 100644
--- a/doc/config-file.txt
+++ b/doc/config-file.txt
@@ -89,7 +89,7 @@ Elements:
Lists permitted authorization mechanisms. If this element doesn't
exist, then all known mechanisms are allowed. If there are
- multiple <auth> elements, the last one wins (they are not merged).
+ multiple <auth> elements, all the listed mechanisms are allowed.
The order in which mechanisms are listed is not meaningful.
Example: <auth>EXTERNAL</auth>