diff --git a/ChangeLog b/ChangeLog index 912aff1a5..2ee7a3716 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2006-10-27 Mickael Remond + + * src/guide.tex: Fixed typos. + 2006-10-25 Mickael Remond * src/ejabberd_rdbms.erl: It is now possible to use ldap or internal diff --git a/doc/guide.html b/doc/guide.html index df3896689..33108e837 100644 --- a/doc/guide.html +++ b/doc/guide.html @@ -2762,16 +2762,15 @@ In this first situation, search results are limited to twenty items, ejabberd can map LDAP attributes to vCard fields. This behaviour is implemented in the mod_vcard_ldap module. This module does not depend on the -authentication method (see 4.5.2). The mod_vcard_ldap module -has its own optional parameters. The first group of parameters has the same +authentication method (see 4.5.2). The mod_vcard_ldap module has +its own optional parameters. The first group of parameters has the same meaning as the top-level LDAP parameters to set the authentication method: ldap_servers, ldap_port, ldap_rootdn, -ldap_password, ldap_base, ldap_uidattr, -ldap_uidattr_format and ldap_filter. See -section 4.5.2 for detailed information about these options. If one -of these options is not set, ejabberd will look for the top-level option with -the same name. The second group of parameters consists of the following -mod_vcard_ldap-specific options: +ldap_password, ldap_base, ldap_uids, and +ldap_filter. See section 4.5.2 for detailed information +about these options. If one of these options is not set, ejabberd will look +for the top-level option with the same name. The second group of parameters +consists of the following mod_vcard_ldap-specific options:
hosts
This option defines the hostnames of the diff --git a/doc/guide.tex b/doc/guide.tex index 3207b8bee..a114019ab 100644 --- a/doc/guide.tex +++ b/doc/guide.tex @@ -2479,16 +2479,15 @@ Examples: \ejabberd{} can map LDAP attributes to vCard fields. This behaviour is implemented in the \modvcardldap{} module. This module does not depend on the -authentication method (see~\ref{sec:ldapauth}). The \modvcardldap{} module -has its own optional parameters. The first group of parameters has the same +authentication method (see~\ref{sec:ldapauth}). The \modvcardldap{} module has +its own optional parameters. The first group of parameters has the same meaning as the top-level LDAP parameters to set the authentication method: \option{ldap\_servers}, \option{ldap\_port}, \option{ldap\_rootdn}, -\option{ldap\_password}, \option{ldap\_base}, \option{ldap\_uidattr}, -\option{ldap\_uidattr\_format} and \option{ldap\_filter}. See -section~\ref{sec:ldapauth} for detailed information about these options. If one -of these options is not set, \ejabberd{} will look for the top-level option with -the same name. The second group of parameters consists of the following -\modvcardldap{}-specific options: +\option{ldap\_password}, \option{ldap\_base}, \option{ldap\_uids}, and +\option{ldap\_filter}. See section~\ref{sec:ldapauth} for detailed information +about these options. If one of these options is not set, \ejabberd{} will look +for the top-level option with the same name. The second group of parameters +consists of the following \modvcardldap{}-specific options: \begin{description} \hostitem{vjud}