[Emacs-diffs] /srv/bzr/emacs/trunk r105020: Remove mention of `require' in ediff.texi

[Lars Magne Ingebrigtsen]

------------------------------------------------------------
revno: 105020
fixes bug(s): http://debbugs.gnu.org/9016
committer: Lars Magne Ingebrigtsen <address@hidden>
branch nick: trunk
timestamp: Thu 2011-07-07 18:38:27 +0200
message:
  Remove mention of `require' in ediff.texi
  
  That's not pertinent in the installed Emacs.
modified:
  doc/misc/ChangeLog
  doc/misc/ediff.texi

=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog        2011-07-05 22:49:25 +0000
+++ b/doc/misc/ChangeLog        2011-07-07 16:38:27 +0000
@@ -1,3 +1,8 @@
+2011-07-07  Lars Magne Ingebrigtsen  <address@hidden>
+
+       * 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  <address@hidden>
 
        * gnus.texi (Expiring Mail): Document gnus-auto-expirable-marks.

=== modified file 'doc/misc/ediff.texi'
--- a/doc/misc/ediff.texi       2011-02-19 19:40:59 +0000
+++ b/doc/misc/ediff.texi       2011-07-07 16:38:27 +0000
@@ -334,18 +334,6 @@
 and restart active Ediff sessions.
 @end table
 
address@hidden
-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:
-
address@hidden
-(require 'ediff)
address@hidden example
-
address@hidden
-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