Merge from trunk.

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

diff --git a/doc/misc/pgg.texi b/doc/misc/pgg.texi
index 640dfd8f749e0e1cfa994506d98446ffea3521c9..9cb7a637a05f2bbac3f92dd398eb1bbe749cfc68 100644 (file)
--- a/doc/misc/pgg.texi
+++ b/doc/misc/pgg.texi
@@ -1,4 +1,7 @@
 \input texinfo                  @c -*-texinfo-*-
+
+@include gnus-overrides.texi
+
 @setfilename ../../info/pgg
 @settitle PGG @value{VERSION}
 
@@ -8,8 +11,7 @@
 This file describes PGG @value{VERSION}, an Emacs interface to various
 PGP implementations.
 
-Copyright @copyright{} 2001, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-2010  Free Software Foundation, Inc.
+Copyright @copyright{} 2001, 2003-2011  Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -25,13 +27,18 @@ developing GNU and promoting software freedom.''
 @end quotation
 @end copying
 
-@dircategory Emacs
+@dircategory Emacs network features
 @direntry
 * PGG: (pgg).                   Emacs interface to various PGP implementations.
 @end direntry
 
 @titlepage
+@ifset WEBHACKDEVEL
+@title PGG (DEVELOPMENT VERSION)
+@end ifset
+@ifclear WEBHACKDEVEL
 @title PGG
+@end ifclear
 
 @author by Daiki Ueno
 @page
@@ -497,7 +504,3 @@ If non-@code{nil}, don't check the checksum of the packets.
 @bye
 
 @c End:
-
-@ignore
-   arch-tag: 0c205838-34b9-41a5-b9d7-49ae57ccac85
-@end ignore