Merge from emacs-23; up to 2010-06-15T03:34:12Z!rgm@gnu.org.

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

diff --git a/doc/misc/remember.texi b/doc/misc/remember.texi
index d653339ce6a19b98eb826135d13408081eb232c9..e67d6155bbe0d3c6e1a079a29f2bff20e83a2a7e 100644 (file)
--- a/doc/misc/remember.texi
+++ b/doc/misc/remember.texi
@@ -2,31 +2,34 @@
 @c %**start of header
 @setfilename ../../info/remember
 @settitle Remember Manual
-@c %**end of header
-
-@dircategory Emacs
-@direntry
-* Remember: (remember). Simple information manager for Emacs
-@end direntry
-
 @syncodeindex fn cp
+@c %**end of header
 
 @copying
 This manual is for Remember Mode, version 1.9
 
-Copyright @copyright{} 2001, 2004, 2005, 2007, 2008
+Copyright @copyright{} 2001, 2004-2005, 2007-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 any later version published by the Free Software Foundation;
-with no Invariant Sections, no Front-Cover Texts, and no Back-Cover
-Texts.  A copy of the license is included in the section entitled ``GNU
-Free Documentation License''.
+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
+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 misc features
+@direntry
+* Remember: (remember).         Simple information manager for Emacs.
+@end direntry
+
 @titlepage
 @title Guide to Remember Mode
 @subtitle a simple information manager
@@ -39,7 +42,6 @@ Free Documentation License''.
 @insertcopying
 @end titlepage
 
-@c So the toc is printed at the start
 @contents
 
 @ifnottex
@@ -401,7 +403,3 @@ consult @ref{Remember, , , org}.
 @printindex cp
 
 @bye
-
-@ignore
-   arch-tag: 5b980db0-20cc-4167-b845-52dc11d53b9f
-@end ignore