[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 57abaae: net/ldap.el (ldap-search-internal): Fix do
From: |
Thomas Fitzsimmons |
Subject: |
[Emacs-diffs] master 57abaae: net/ldap.el (ldap-search-internal): Fix docstring |
Date: |
Fri, 06 Feb 2015 05:59:40 +0000 |
branch: master
commit 57abaae56a4a1549f6a154fecad16f47fc0bba9e
Author: Thomas Fitzsimmons <address@hidden>
Commit: Thomas Fitzsimmons <address@hidden>
net/ldap.el (ldap-search-internal): Fix docstring
---
lisp/ChangeLog | 4 ++++
lisp/net/ldap.el | 4 ++--
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b60e410..31f10d3 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2015-02-06 Thomas Fitzsimmons <address@hidden>
+
+ * net/ldap.el (ldap-search-internal): Fix docstring.
+
2015-02-06 Lars Ingebrigtsen <address@hidden>
* subr.el (define-error): The error conditions may be constant
diff --git a/lisp/net/ldap.el b/lisp/net/ldap.el
index a77fc3c..1df975a 100644
--- a/lisp/net/ldap.el
+++ b/lisp/net/ldap.el
@@ -546,8 +546,8 @@ not their associated values.
`auth' is one of the symbols `simple', `krbv41' or `krbv42'.
`base' is the base for the search as described in RFC 1779.
`scope' is one of the three symbols `sub', `base' or `one'.
- `binddn' is the distinguished name of the user to bind as (in RFC 1779
syntax).
- `auth' is one of the symbols `simple', `krbv41' or `krbv42'
+ `binddn' is the distinguished name of the user to bind as (in
+RFC 1779 syntax).
`passwd' is the password to use for simple authentication.
`deref' is one of the symbols `never', `always', `search' or `find'.
`timelimit' is the timeout limit for the connection in seconds.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 57abaae: net/ldap.el (ldap-search-internal): Fix docstring,
Thomas Fitzsimmons <=