aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Fitzsimmons2015-02-06 00:29:46 -0500
committerThomas Fitzsimmons2015-02-06 00:51:45 -0500
commit57abaae56a4a1549f6a154fecad16f47fc0bba9e (patch)
treef658e090cefb70e50f686f33699d4486766754bd
parent3fc745d5de3ef7825345132dbcd20784e5cab0e3 (diff)
downloademacs-57abaae56a4a1549f6a154fecad16f47fc0bba9e.tar.gz
emacs-57abaae56a4a1549f6a154fecad16f47fc0bba9e.zip
net/ldap.el (ldap-search-internal): Fix docstring
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/net/ldap.el4
2 files changed, 6 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b60e410f96e..31f10d3c91d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12015-02-06 Thomas Fitzsimmons <fitzsim@fitzsim.org>
2
3 * net/ldap.el (ldap-search-internal): Fix docstring.
4
12015-02-06 Lars Ingebrigtsen <larsi@gnus.org> 52015-02-06 Lars Ingebrigtsen <larsi@gnus.org>
2 6
3 * subr.el (define-error): The error conditions may be constant 7 * subr.el (define-error): The error conditions may be constant
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' 550RFC 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.