aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBadlop <badlop@process-one.net>2007-11-27 14:45:30 +0000
committerBadlop <badlop@process-one.net>2007-11-27 14:45:30 +0000
commite000cbb03437932b0fb25ee24a1396871c23e2d9 (patch)
tree2dcbb27ba7e8926dd54adcee2dd7ec1abf6f262c
parent* src/mod_vcard.erl: Ensure mod_vcard to respect FORM_TYPE registry (EJAB-328). (diff)
* doc/guide.tex: Added clarification about LDAP default port
(thanks to Christophe Romain). SVN Revision: 991
-rw-r--r--ChangeLog9
-rw-r--r--doc/guide.tex6
2 files changed, 12 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index b219e3ca6..2c3085126 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,16 @@
2007-11-27 Badlop <badlop@process-one.net>
- * src/mod_vcard.erl: Ensure mod_vcard to respect FORM_TYPE registry (EJAB-328).
+ * doc/guide.tex: Added clarification about LDAP default port
+ (thanks to Christophe Romain).
+
+ * src/mod_vcard.erl: Ensure mod_vcard to respect FORM_TYPE
+ registry (EJAB-328).
* src/mod_vcard_ldap.erl: Likewise.
* src/mod_vcard_odbc.erl: Likewise.
* doc/guide.tex: Updated documentation.
- * src/mod_muc/mod_muc_room.erl: Don't show the room name as the room description (EJAB-382).
+ * src/mod_muc/mod_muc_room.erl: Don't show the room name as
+ the room description (EJAB-382).
2007-11-26 Badlop <badlop@process-one.net>
diff --git a/doc/guide.tex b/doc/guide.tex
index f9a7a65b3..6d8d82930 100644
--- a/doc/guide.tex
+++ b/doc/guide.tex
@@ -1504,7 +1504,11 @@ Parameters:
\titem{ldap\_server} \ind{options!ldap\_server}IP address or dns name of your
LDAP server. This option is required.
\titem{ldap\_port} \ind{options!ldap\_port}Port to connect to your LDAP server.
- The default value is~389.
+ The initial default value is~389, so it is used when nothing is set into the
+configuration file.
+If you configure a value, it is stored in ejabberd's database.
+Then, if you remove that value from the configuration file,
+the value previously stored in the database will be used instead of the default 389.
\titem{ldap\_rootdn} \ind{options!ldap\_rootdn}Bind DN. The default value
is~\term{""} which means `anonymous connection'.
\titem{ldap\_password} \ind{options!ldap\_password}Bind password. The default