Remove mention of `require' in ediff.texi

That's not pertinent in the installed Emacs.

Fixes: debbugs:9016

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index ff5831c..a977b9d 100644 (file)
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-07  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * ediff.texi (Major Entry Points): Remove mention of `require',
+       since that's not pertinent in the installed Emacs (bug#9016).
+
 2011-07-05  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * gnus.texi (Expiring Mail): Document gnus-auto-expirable-marks.

diff --git a/doc/misc/ediff.texi b/doc/misc/ediff.texi
index 3ba0796..20c2ed9 100644 (file)
--- a/doc/misc/ediff.texi
+++ b/doc/misc/ediff.texi
@@ -334,18 +334,6 @@ Brings up Ediff session registry.  This feature enables you to quickly find
 and restart active Ediff sessions.
 @end table
 
-@noindent
-If you want Ediff to be loaded from the very beginning of your Emacs
-session, you should put this line in your @file{~/.emacs} file:
-
-@example
-(require 'ediff)
-@end example
-
-@noindent
-Otherwise, Ediff will be loaded automatically when you use one of the
-above functions, either directly or through the menus.
-
 When the above functions are invoked, the user is prompted for all the
 necessary information---typically the files or buffers to compare, merge, or
 patch.  Ediff tries to be smart about these prompts.  For instance, in