Merge from emacs-24; up to 2012-12-29T06:14:00Z!cyd@gnu.org

[bpt/emacs.git] / doc / misc / pgg.texi

diff --git a/doc/misc/pgg.texi b/doc/misc/pgg.texi
index 9cb7a63..a18a22e 100644 (file)
--- a/doc/misc/pgg.texi
+++ b/doc/misc/pgg.texi
@@ -3,15 +3,15 @@
 @include gnus-overrides.texi
 
 @setfilename ../../info/pgg
-@settitle PGG @value{VERSION}
 
 @set VERSION 0.1
+@settitle PGG @value{VERSION}
 
 @copying
 This file describes PGG @value{VERSION}, an Emacs interface to various
 PGP implementations.
 
-Copyright @copyright{} 2001, 2003-2011  Free Software Foundation, Inc.
+Copyright @copyright{} 2001, 2003--2013 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -22,8 +22,7 @@ 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.''
+modify this GNU manual.''
 @end quotation
 @end copying
 
@@ -57,18 +56,18 @@ and various tools for secure communication.  PGG also provides a simple
 user interface to encrypt, decrypt, sign, and verify MIME messages.
 
 @ifnottex
-@insertcopying 
+@insertcopying
 @end ifnottex
 
 @menu
 * Overview::                    What PGG is.
 * Prerequisites::               Complicated stuff you may have to do.
 * How to use::                  Getting started quickly.
-* Architecture::                
-* Parsing OpenPGP packets::     
+* Architecture::
+* Parsing OpenPGP packets::
 * GNU Free Documentation License:: The license for this documentation.
-* Function Index::              
-* Variable Index::              
+* Function Index::
+* Variable Index::
 @end menu
 
 @node Overview
@@ -89,12 +88,12 @@ PGG requires at least one implementation of privacy guard system.
 This document assumes that you have already obtained and installed them
 and that you are familiar with its basic functions.
 
-By default, PGG uses GnuPG.  If you are new to such a system, I
+By default, PGG uses GnuPG@.  If you are new to such a system, I
 recommend that you should look over the GNU Privacy Handbook (GPH)
 which is available at @uref{http://www.gnupg.org/documentation/}.
 
 When using GnuPG, we recommend the use of the @code{gpg-agent}
-program, which is distributed with versions 2.0 and later of GnuPG.
+program, which is distributed with versions 2.0 and later of GnuPG@.
 This is a daemon to manage private keys independently from any
 protocol, and provides the most secure way to input and cache your
 passphrases (@pxref{Caching passphrase}).  By default, PGG will
@@ -137,10 +136,10 @@ list autoload setting for desired functions as follows.
 @end lisp
 
 @menu
-* User Commands::               
-* Selecting an implementation::  
-* Caching passphrase::          
-* Default user identity::       
+* User Commands::
+* Selecting an implementation::
+* Caching passphrase::
+* Default user identity::
 @end menu
 
 @node User Commands
@@ -358,13 +357,13 @@ 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
+also for extensibility.  In this chapter we explore the architecture
 while finding out how to write the PGG back end.
 
 @menu
-* Initializing::                
-* Back end methods::             
-* Getting output::              
+* Initializing::
+* Back end methods::
+* Getting output::
 @end menu
 
 @node Initializing