diff options
Diffstat (limited to '')
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | doc/guide.html | 15 | ||||
| -rw-r--r-- | doc/guide.tex | 15 |
3 files changed, 18 insertions, 16 deletions
@@ -1,3 +1,7 @@ +2006-10-27 Mickael Remond <mickael.remond@process-one.net> + + * src/guide.tex: Fixed typos. + 2006-10-25 Mickael Remond <mickael.remond@process-one.net> * src/ejabberd_rdbms.erl: It is now possible to use ldap or internal diff --git a/doc/guide.html b/doc/guide.html index df389668..33108e83 100644 --- a/doc/guide.html +++ b/doc/guide.html @@ -2762,16 +2762,15 @@ In this first situation, search results are limited to twenty items, <TT>ejabberd</TT> can map LDAP attributes to vCard fields. This behaviour is implemented in the <TT>mod_vcard_ldap</TT> module. This module does not depend on the -authentication method (see <A HREF="#sec:ldapauth">4.5.2</A>). The <TT>mod_vcard_ldap</TT> module -has its own optional parameters. The first group of parameters has the same +authentication method (see <A HREF="#sec:ldapauth">4.5.2</A>). The <TT>mod_vcard_ldap</TT> 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: <TT>ldap_servers</TT>, <TT>ldap_port</TT>, <TT>ldap_rootdn</TT>, -<TT>ldap_password</TT>, <TT>ldap_base</TT>, <TT>ldap_uidattr</TT>, -<TT>ldap_uidattr_format</TT> and <TT>ldap_filter</TT>. See -section <A HREF="#sec:ldapauth">4.5.2</A> for detailed information about these options. If one -of these options is not set, <TT>ejabberd</TT> will look for the top-level option with -the same name. The second group of parameters consists of the following -<TT>mod_vcard_ldap</TT>-specific options: +<TT>ldap_password</TT>, <TT>ldap_base</TT>, <TT>ldap_uids</TT>, and +<TT>ldap_filter</TT>. See section <A HREF="#sec:ldapauth">4.5.2</A> for detailed information +about these options. If one of these options is not set, <TT>ejabberd</TT> will look +for the top-level option with the same name. The second group of parameters +consists of the following <TT>mod_vcard_ldap</TT>-specific options: <DL CLASS="description" COMPACT=compact><DT CLASS="dt-description"> <B><TT>hosts</TT></B><DD CLASS="dd-description"> This option defines the hostnames of the diff --git a/doc/guide.tex b/doc/guide.tex index 3207b8be..a114019a 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} |