diff options
| author | Joakim Verona | 2015-02-08 21:55:28 +0100 |
|---|---|---|
| committer | Joakim Verona | 2015-02-08 21:55:28 +0100 |
| commit | 5e1d5ef39ca0d2fbff26d659f2ec6ce863b14529 (patch) | |
| tree | 860e0d53399626aee6249ebb5f972879f403b228 /lisp/net/ldap.el | |
| parent | 148262ce3db990ed16989341345e232570b3a338 (diff) | |
| parent | 7d631aa0ffab875e4979727f632703ad5b4100a2 (diff) | |
| download | emacs-xwidget.tar.gz emacs-xwidget.zip | |
merge masterxwidget
Diffstat (limited to 'lisp/net/ldap.el')
| -rw-r--r-- | lisp/net/ldap.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/net/ldap.el b/lisp/net/ldap.el index a77fc3c6514..1df975af3d9 100644 --- a/lisp/net/ldap.el +++ b/lisp/net/ldap.el | |||
| @@ -546,8 +546,8 @@ not their associated values. | |||
| 546 | `auth' is one of the symbols `simple', `krbv41' or `krbv42'. | 546 | `auth' is one of the symbols `simple', `krbv41' or `krbv42'. |
| 547 | `base' is the base for the search as described in RFC 1779. | 547 | `base' is the base for the search as described in RFC 1779. |
| 548 | `scope' is one of the three symbols `sub', `base' or `one'. | 548 | `scope' is one of the three symbols `sub', `base' or `one'. |
| 549 | `binddn' is the distinguished name of the user to bind as (in RFC 1779 syntax). | 549 | `binddn' is the distinguished name of the user to bind as (in |
| 550 | `auth' is one of the symbols `simple', `krbv41' or `krbv42' | 550 | RFC 1779 syntax). |
| 551 | `passwd' is the password to use for simple authentication. | 551 | `passwd' is the password to use for simple authentication. |
| 552 | `deref' is one of the symbols `never', `always', `search' or `find'. | 552 | `deref' is one of the symbols `never', `always', `search' or `find'. |
| 553 | `timelimit' is the timeout limit for the connection in seconds. | 553 | `timelimit' is the timeout limit for the connection in seconds. |