Merge from trunkpending

1 files changed, 9 insertions, 2 deletions

diff --git a/doc/misc/remember.texi b/doc/misc/remember.texi
index e67d6155bbe..1dd7d1b6153 100644
--- a/doc/misc/remember.texi
+++ b/doc/misc/remember.texi
@@ -8,7 +8,7 @@
 @copying
 This manual is for Remember Mode, version 1.9
 
-Copyright @copyright{} 2001, 2004-2005, 2007-2011
+Copyright @copyright{} 2001, 2004-2005, 2007-2012
 Free Software Foundation, Inc.
 
 @quotation
@@ -389,8 +389,15 @@ The default priority for remembered mail messages.
 @section Saving to an Org Mode file
 @cindex org mode, integration
 
+@ignore
+From org.texi:
+Up to version 6.36 Org used a special setup
+for @file{remember.el}.  @file{org-remember.el} is still part of Org mode for
+backward compatibility with existing setups.  You can find the documentation
+for org-remember at @url{http://orgmode.org/org-remember.pdf}.
+@end ignore
 For instructions on how to integrate Remember with Org Mode,
-consult @ref{Remember, , , org}.
+consult @ref{Capture, , , org}.
 
 @node GNU Free Documentation License, Concept Index, Backends, Top
 @appendix GNU Free Documentation License