Merge from emacs-24; up to 2014-06-02T11:35:40Z!michael.albinus@gmx.de

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

diff --git a/doc/misc/pgg.texi b/doc/misc/pgg.texi
index 5aa9b1eb230794356a42358c38cd7165f91aaac7..53c66c8fb34d010b73ccedbd68f204b3fd06a5ea 100644 (file)
--- a/doc/misc/pgg.texi
+++ b/doc/misc/pgg.texi
@@ -3,27 +3,28 @@
 @include gnus-overrides.texi
 
 @setfilename ../../info/pgg
-@settitle PGG @value{VERSION}
 
 @set VERSION 0.1
+@settitle PGG @value{VERSION}
+
+@documentencoding UTF-8
 
 @copying
 This file describes PGG @value{VERSION}, an Emacs interface to various
 PGP implementations.
 
-Copyright @copyright{} 2001, 2003-2012  Free Software Foundation, Inc.
+Copyright @copyright{} 2001, 2003--2014 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.3 or
 any later version published by the Free Software Foundation; with no
-Invariant Sections, with the Front-Cover texts being ``A GNU Manual,''
+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.''
+modify this GNU manual.''
 @end quotation
 @end copying
 
@@ -55,6 +56,8 @@ developing GNU and promoting software freedom.''
 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.
+This package is obsolete; for new code we recommend EasyPG instead.
+@xref{Top,, EasyPG, epa, EasyPG Assistant User's Manual}.
 
 @ifnottex
 @insertcopying
@@ -79,6 +82,9 @@ communication.  Even though Mailcrypt has similar feature, it does not
 deal with detached PGP messages, normally used in PGP/MIME
 infrastructure.  This was the main reason why I wrote the new library.
 
+Note that the PGG library is now obsolete, replaced by EasyPG.
+@xref{Top,, EasyPG, epa, EasyPG Assistant User's Manual}.
+
 PGP/MIME is an application of MIME Object Security Services (RFC1848).
 The standard is documented in RFC2015.
 
@@ -89,12 +95,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