Fix typos.

* lisp/net/sasl.el (sasl-client-set-property, sasl-make-mechanism)
  (sasl-find-mechanism, sasl-next-step):
* lisp/net/sasl-ntlm.el (sasl-ntlm-steps, sasl-ntlm-request)
  (sasl-ntlm-response): Fix typos in docstrings.
* doc/misc/sasl.texi (Mechanisms): Fix typos.

6 files changed, 28 insertions, 17 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 8278166f0a..19e3ffc060 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,7 @@
+2008-06-28  Juanma Barranquero  <[email protected]>
+
+	* sasl.texi (Mechanisms): Fix typos.
+
 2008-06-24  Jay Belanger  <[email protected]>
 
 	* calc.texi (Killing from the stack): Mention using normal Emacs
@@ -5,8 +9,8 @@
 
 2008-06-21  Michael Albinus  <[email protected]>
 
-	* tramp.texi (Password handling): Renamed from "Password
-	caching".  Add `auth-source' mechanism.
+	* tramp.texi (Password handling): Renamed from "Password caching".
+	Add `auth-source' mechanism.
 	(Connection caching): Tramp reopens the connection automatically,
 	when the operating system on the remote host has been changed.
 
diff --git a/doc/misc/sasl.texi b/doc/misc/sasl.texi
index 7f274f68ee..62de76c677 100644
--- a/doc/misc/sasl.texi
+++ b/doc/misc/sasl.texi
@@ -124,9 +124,9 @@ A list of mechanism names.
 
 @defun sasl-find-mechanism mechanisms
 
-Retrieve an apropriate mechanism.
+Retrieve an appropriate mechanism.
 This function compares @var{mechanisms} and @code{sasl-mechanisms} then
-returns apropriate @code{sasl-mechanism} object.
+returns appropriate @code{sasl-mechanism} object.
 
 @example
 (let ((sasl-mechanisms '("CRAM-MD5" "DIGEST-MD5")))
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 852eed7804..3d35061a06 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2008-06-28  Juanma Barranquero  <[email protected]>
+
+	* net/sasl.el (sasl-client-set-property, sasl-make-mechanism)
+	(sasl-find-mechanism, sasl-next-step):
+	* net/sasl-ntlm.el (sasl-ntlm-steps, sasl-ntlm-request)
+	(sasl-ntlm-response): Fix typos in docstrings.
+
 2008-06-28  robert marshall  <[email protected]>  (tiny change)
 
 	* international/mule-cmds.el (view-hello-file): Doc fix.
@@ -109,7 +116,7 @@
 	* international/mule-cmds.el (encode-coding-char): Fix for ASCII
 	characters.
 
-	* composite.el (terminal-composition-base-character-p): New funciton.
+	* composite.el (terminal-composition-base-character-p): New function.
 	(terminal-composition-function):
 	Use terminal-composition-base-character-p.  Include the base character
 	in the composition.
diff --git a/lisp/ChangeLog.7 b/lisp/ChangeLog.7
index 85881594f1..64289cedf5 100644
--- a/lisp/ChangeLog.7
+++ b/lisp/ChangeLog.7
@@ -1680,7 +1680,7 @@
 	(isearch-hangul-switch-symbol-ksc, isearch-hangul-switch-hanja):
 	New functions.
 	(korean-key-bindings): Renamed from exit-korean-environment-data.
-	Initialized apropriately.
+	Initialized appropriately.
 	(setup-korean-environment): Setup key bindings according to
 	korean-key-bindings.
 	(exit-korean-environment): Revert key bindings only if the current
@@ -7157,7 +7157,7 @@
 	(select-safe-coding-system): New function.
 	(set-language-info): New optional args DESCRIBE-MAP and SETUP-MAP.
 	(set-language-info-alist): New optionla arg PARENTS.  Call
-	set-language-info with apropriate DESCRIBE-MAP and SETUP-MAP args.
+	set-language-info with appropriate DESCRIBE-MAP and SETUP-MAP args.
 	(set-language-environment-coding-systems): New function.
 
 	* international/mule-conf.el: Adjusted for the change of the
diff --git a/lisp/net/sasl-ntlm.el b/lisp/net/sasl-ntlm.el
index 41a1fdb186..7b8af9c78a 100644
--- a/lisp/net/sasl-ntlm.el
+++ b/lisp/net/sasl-ntlm.el
@@ -36,12 +36,12 @@
   '(ignore				;nothing to do before making
     sasl-ntlm-request			;authentication request
     sasl-ntlm-response)			;response to challenge
-  "A list of functions to be called in sequnece for the NTLM
-authentication steps.  Ther are called by 'sasl-next-step.")
+  "A list of functions to be called in sequence for the NTLM
+authentication steps.  They are called by `sasl-next-step'.")
 
 (defun sasl-ntlm-request (client step)
   "SASL step function to generate a NTLM authentication request to the server.
-Called from 'sasl-next-step.
+Called from `sasl-next-step'.
 CLIENT is a vector [mechanism user service server sasl-client-properties]
 STEP is a vector [<previous step function> <result of previous step function>]"
   (let ((user (sasl-client-name client)))
@@ -49,7 +49,7 @@ STEP is a vector [<previous step function> <result of previous step function>]"
 
 (defun sasl-ntlm-response (client step)
   "SASL step function to generate a NTLM response against the server
-challenge stored in the 2nd element of STEP.  Called from 'sasl-next-step."
+challenge stored in the 2nd element of STEP.  Called from `sasl-next-step'."
   (let* ((user (sasl-client-name client))
 	 (passphrase
 	  (sasl-read-passphrase (format "NTLM passphrase for %s: " user)))
diff --git a/lisp/net/sasl.el b/lisp/net/sasl.el
index 23d8e62275..6616bffc34 100644
--- a/lisp/net/sasl.el
+++ b/lisp/net/sasl.el
@@ -86,7 +86,7 @@ The second argument PLIST is the new property list."
   (setplist (aref client 4) plist))
 
 (defun sasl-client-set-property (client property value)
-  "Add the given property/value to CLIENT."
+  "Add the given PROPERTY/VALUE to CLIENT."
   (put (aref client 4) property value))
 
 (defun sasl-client-property (client property)
@@ -103,7 +103,7 @@ The second argument PLIST is the new property list."
 (defun sasl-make-mechanism (name steps)
   "Make an authentication mechanism.
 NAME is a IANA registered SASL mechanism name.
-STEPS is list of continuation function."
+STEPS is list of continuation functions."
   (vector name
 	  (mapcar
 	   (lambda (step)
@@ -121,7 +121,7 @@ STEPS is list of continuation function."
   (aref mechanism 1))
 
 (defun sasl-find-mechanism (mechanisms)
-  "Retrieve an apropriate mechanism object from MECHANISMS hints."
+  "Retrieve an appropriate mechanism object from MECHANISMS hints."
   (let* ((sasl-mechanisms sasl-mechanisms)
 	 (mechanism
 	  (catch 'done
@@ -147,9 +147,9 @@ STEPS is list of continuation function."
 
 (defun sasl-next-step (client step)
   "Evaluate the challenge and prepare an appropriate next response.
-The data type of the value and optional 2nd argument STEP is nil or
-opaque authentication step which holds the reference to the next action
-and the current challenge.  At the first time STEP should be set to nil."
+The data type of the value and 2nd argument STEP is nil or opaque
+authentication step which holds the reference to the next action and
+the current challenge.  At the first time STEP should be set to nil."
   (let* ((steps
 	  (sasl-mechanism-steps
 	   (sasl-client-mechanism client)))