Merge remember-diary.el into remember.el

2 files changed, 6 insertions, 1 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 6bd7de9102c..02e39fe8171 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-05  Michael Olson  <mwolson@gnu.org>
+
+        * remember.texi (Diary): Remove "require" line for remember-diary.el.
+        Update documentation for `remember-diary-file'.
+
 2007-12-04  Michael Albinus  <michael.albinus@gmx.de>
 
         * dbus.texi (Signals): Precise `dbus-register-signal'.
diff --git a/doc/misc/remember.texi b/doc/misc/remember.texi
index 41d1777bf5a..d93774c5850 100644
--- a/doc/misc/remember.texi
+++ b/doc/misc/remember.texi
@@ -350,7 +350,6 @@ The text used to begin each remember item.
 @subheading Insinuation
 
 @lisp
-(require 'remember-diary)
 (add-to-list 'remember-handler-functions 'remember-diary-extract-entries)
 @end lisp
 
@@ -358,6 +357,7 @@ The text used to begin each remember item.
 
 @defopt remember-diary-file
 File for extracted diary entries.
+If this is nil, then @code{diary-file} will be used instead."
 @end defopt
 
 @node Mailbox, Org, Diary, Backends