X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Fsasl.el;h=7f864390a52ffdac9b4d701ececf40c5312b0ffe;hb=b2d105db1597d0954f8a6b3522329682527b9fff;hp=4b6616d33034c920469d8567f40c0f2ef9331db1;hpb=6d3039252bb175eba53a2028cbf3c0e90112388d;p=gnus

diff --git a/lisp/sasl.el b/lisp/sasl.el
index 4b6616d33..7f864390a 100644
--- a/lisp/sasl.el
+++ b/lisp/sasl.el
@@ -1,16 +1,16 @@
 ;;; sasl.el --- SASL client framework
 
-;; Copyright (C) 2000, 2007, 2008  Free Software Foundation, Inc.
+;; Copyright (C) 2000, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
 
 ;; Author: Daiki Ueno <ueno@unixuser.org>
 ;; Keywords: SASL
 
 ;; This file is part of GNU Emacs.
 
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,9 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -88,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)
@@ -105,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)
@@ -123,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
@@ -149,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)))
@@ -269,5 +267,4 @@ It contain at least 64 bits of entropy."
 
 (provide 'sasl)
 
-;; arch-tag: 8b3326fa-4978-4fda-93e2-cb2c6255f887
 ;;; sasl.el ends here