Merge from emacs--devo--0

[gnus] / texi / sasl.texi

diff --git a/texi/sasl.texi b/texi/sasl.texi
index 57391e9..1d15eed 100644 (file)
--- a/texi/sasl.texi
+++ b/texi/sasl.texi
@@ -11,18 +11,31 @@
 
 @settitle Emacs SASL Library @value{VERSION}
 
 
 @settitle Emacs SASL Library @value{VERSION}
 

-@ifinfo
+@copying

 This file describes the Emacs SASL library.
 
 This file describes the Emacs SASL library.
 

-Copyright (C) 2000 Daiki Ueno.
+Copyright @copyright{} 2000, 2004, 2005, 2006, 2007, 2008, 2009
+Free Software Foundation, Inc.

 
 

+@quotation

 Permission is granted to copy, distribute and/or modify this document
 Permission is granted to copy, distribute and/or modify this document

-under the terms of the GNU Free Documentation License, Version 1.1 or
+under the terms of the GNU Free Documentation License, Version 1.3 or

 any later version published by the Free Software Foundation; with no
 any later version published by the Free Software Foundation; with no

-Invariant Sections, with no Front-Cover Texts, and with no Back-Cover
-Texts.  A copy of the license is included in the section entitled "GNU
-Free Documentation License".
-@end ifinfo
+Invariant Sections, with the Front-Cover texts being ``A GNU Manual,''
+and with the Back-Cover Texts as in (a) below.  A copy of the license
+is included in the section entitled ``GNU Free Documentation License''
+in the Emacs manual.
+
+(a) The FSF's Back-Cover Text is: ``You have the freedom to copy and
+modify this GNU manual.  Buying copies from the FSF supports it in
+developing GNU and promoting software freedom.''
+
+This document is part of a collection distributed under the GNU Free
+Documentation License.  If you want to distribute this document
+separately from the collection, you can do so by adding a copy of the
+license to the document, as described in section 6 of the license.
+@end quotation
+@end copying

 
 @tex
 
 
 @tex
 


@@ -33,14 +46,7 @@ Free Documentation License".
 @page
 
 @vskip 0pt plus 1filll
 @page
 
 @vskip 0pt plus 1filll

-Copyright @copyright{} 2000 Daiki Ueno.
-
-Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.1 or
-any later version published by the Free Software Foundation; with no
-Invariant Sections, with no Front-Cover Texts, and with no Back-Cover
-Texts.  A copy of the license is included in the section entitled "GNU
-Free Documentation License".
+@insertcopying

 @end titlepage
 @page
 
 @end titlepage
 @page
 


@@ -57,7 +63,7 @@ applications using different protocols.
 * Overview::                    What Emacs SASL library is.
 * How to use::                  Adding authentication support to your applications.
 * Data types::                  
 * Overview::                    What Emacs SASL library is.
 * How to use::                  Adding authentication support to your applications.
 * Data types::                  

-* Backend drivers::             Writing your own drivers.
+* Back end drivers::             Writing your own drivers.

 * Index::                       
 * Function Index::              
 * Variable Index::              
 * Index::                       
 * Function Index::              
 * Variable Index::              


@@ -72,9 +78,9 @@ adding authentication support to various application protocols.
 
 The toplevel interface of this library is inspired by Java @sc{sasl}
 Application Program Interface.  It defines an abstraction over a series
 
 The toplevel interface of this library is inspired by Java @sc{sasl}
 Application Program Interface.  It defines an abstraction over a series

-of authentication mechanism drivers (@ref{Backend drivers}).
+of authentication mechanism drivers (@ref{Back end drivers}).

 
 

-Backend drivers are designed to be close as possible to the
+Back end drivers are designed to be close as possible to the

 authentication mechanism.  You can access the additional configuration
 information anywhere from the implementation.
 
 authentication mechanism.  You can access the additional configuration
 information anywhere from the implementation.
 


@@ -118,9 +124,9 @@ A list of mechanism names.
 
 @defun sasl-find-mechanism mechanisms
 
 
 @defun sasl-find-mechanism mechanisms
 

-Retrieve an apropriate mechanism.
+Retrieve an appropriate mechanism.

 This function compares @var{mechanisms} and @code{sasl-mechanisms} then
 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")))
 
 @example
 (let ((sasl-mechanisms '("CRAM-MD5" "DIGEST-MD5")))


@@ -133,7 +139,7 @@ returns apropriate @code{sasl-mechanism} object.
 Return name of mechanism, a string.
 @end defun
 
 Return name of mechanism, a string.
 @end defun
 

-If you want to write an authentication mechanism driver (@ref{Backend
+If you want to write an authentication mechanism driver (@ref{Back end

 drivers}), use @code{sasl-make-mechanism} and modify
 @code{sasl-mechanisms} and @code{sasl-mechanism-alist} correctly.
 
 drivers}), use @code{sasl-make-mechanism} and modify
 @code{sasl-mechanisms} and @code{sasl-mechanism-alist} correctly.
 


@@ -241,8 +247,8 @@ Perform the authentication step.
 At the first time @var{step} should be set to @code{nil}.
 @end defun
 
 At the first time @var{step} should be set to @code{nil}.
 @end defun
 

-@node Backend drivers
-@chapter Backend drivers
+@node Back end drivers
+@chapter Back end drivers

 
 (Not yet written).
 
 
 (Not yet written).