Merge latest fix to xg_event_is_for_menubar.

[gnu-emacs] / doc / misc / pgg.texi

diff --git a/doc/misc/pgg.texi b/doc/misc/pgg.texi
index ca29e2184e546c6e898cb777454717f4bf1970ea..640dfd8f749e0e1cfa994506d98446ffea3521c9 100644 (file)
--- a/doc/misc/pgg.texi
+++ b/doc/misc/pgg.texi
@@ -1,34 +1,35 @@
 \input texinfo                  @c -*-texinfo-*-
-
 @setfilename ../../info/pgg
+@settitle PGG @value{VERSION}
 
 @set VERSION 0.1
 
-
 @copying
-This file describes PGG, an Emacs interface to various PGP implementations.
+This file describes PGG @value{VERSION}, an Emacs interface to various
+PGP implementations.
 
-Copyright @copyright{} 2001, 2003, 2004, 2005, 2006, 2007  Free Software
-Foundation, Inc.
+Copyright @copyright{} 2001, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+2010  Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.2 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
-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.''
+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.''
+
+(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.''
 @end quotation
 @end copying
 
 @dircategory Emacs
 @direntry
-* PGG: (pgg).   Emacs interface to various PGP implementations.
+* PGG: (pgg).                   Emacs interface to various PGP implementations.
 @end direntry
 
-@settitle PGG @value{VERSION}
-
-
 @titlepage
 @title PGG
 
@@ -38,14 +39,20 @@ Free Documentation License.''
 @vskip 0pt plus 1filll
 @insertcopying
 @end titlepage
-@page
+
+@contents
 
 @node Top
 @top PGG
-This manual describes PGG.  PGG is an interface library between Emacs
+
+PGG is an interface library between Emacs
 and various tools for secure communication.  PGG also provides a simple
 user interface to encrypt, decrypt, sign, and verify MIME messages.
 
+@ifnottex
+@insertcopying 
+@end ifnottex
+
 @menu
 * Overview::                    What PGG is.
 * Prerequisites::               Complicated stuff you may have to do.
@@ -126,7 +133,7 @@ list autoload setting for desired functions as follows.
 * User Commands::               
 * Selecting an implementation::  
 * Caching passphrase::          
-* Default user identity::      
+* Default user identity::       
 @end menu
 
 @node User Commands
@@ -345,11 +352,11 @@ singleton object wrapped with the luna object system.
 Since PGG was designed for accessing and developing PGP functionality,
 the architecture had to be designed not just for interoperability but
 also for extensiblity.  In this chapter we explore the architecture
-while finding out how to write the PGG backend.
+while finding out how to write the PGG back end.
 
 @menu
 * Initializing::                
-* Backend methods::             
+* Back end methods::             
 * Getting output::              
 @end menu
 
@@ -369,16 +376,16 @@ variable @code{pgg-scheme-gpg-instance} and will be reused from now on.
 (defun pgg-make-scheme-gpg ()
   (or pgg-scheme-gpg-instance
       (setq pgg-scheme-gpg-instance
-           (luna-make-entity 'pgg-scheme-gpg))))
+            (luna-make-entity 'pgg-scheme-gpg))))
 @end lisp
 
 The name of the function must follow the
-regulation---@code{pgg-make-scheme-} follows the backend name.
+regulation---@code{pgg-make-scheme-} follows the back end name.
 
-@node Backend methods
-@section Backend methods
+@node Back end methods
+@section Back end methods
 
-In each backend, these methods must be present.  The output of these
+In each back end, these methods must be present.  The output of these
 methods is stored in special buffers (@ref{Getting output}), so that
 these methods must tell the status of the execution.
 
@@ -435,7 +442,7 @@ On success, it returns @code{t}, otherwise @code{nil}.
 @node Getting output
 @section Getting output
 
-The output of the backend methods (@ref{Backend methods}) is stored in
+The output of the back end methods (@ref{Back end methods}) is stored in
 special buffers, so that these methods must tell the status of the
 execution.
 
@@ -487,8 +494,6 @@ If non-@code{nil}, don't check the checksum of the packets.
 @unnumbered Variable Index
 @printindex vr
 
-@summarycontents
-@contents
 @bye
 
 @c End: