Merge from trunk.

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

diff --git a/doc/misc/newsticker.texi b/doc/misc/newsticker.texi
index 657c891dd63e82277082cf529e94536620fdcddc..c7d82245973b17f513a756d5a7c90e6340b963a8 100644 (file)
--- a/doc/misc/newsticker.texi
+++ b/doc/misc/newsticker.texi
@@ -13,12 +13,12 @@
 This manual is for Newsticker (version @value{VERSION}, @value{UPDATED}).
 
 @noindent
-Copyright @copyright{} 2004, 2005, 2006, 2007, 2008
+Copyright @copyright{} 2004-2011
 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 the Front-Cover texts being ``A GNU Manual'',
 and with the Back-Cover Texts as in (a) below.  A copy of the license
@@ -30,9 +30,9 @@ developing GNU and promoting software freedom.''
 @end quotation
 @end copying
 
-@dircategory Emacs
+@dircategory Emacs network features
 @direntry
-* Newsticker: (newsticker). A Newsticker for Emacs.
+* Newsticker: (newsticker).     A Newsticker for Emacs.
 @end direntry
 
 @titlepage
@@ -51,6 +51,9 @@ developing GNU and promoting software freedom.''
 @ifnottex
 @node Top
 @top Newsticker
+
+@insertcopying 
+
 @end ifnottex
 
 @menu
@@ -312,7 +315,3 @@ Byte-compiling newsticker.el is recommended.
 @bye
 
 
-
-@ignore
-   arch-tag: 7a4de539-117c-4658-b799-0b9e3d0ccec0
-@end ignore