*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index 2bf1024844b430ca16c2e2d3071ca7fd65402fc5..e2f103f8169475bf0e4f14601b0035807d163deb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-05-06  Eli Zaretskii  <eliz@gnu.org>
+
+       * Makefile.in (INFO_FILES): Remove emacs-xtra.
+
+       * info/dir: Remove the Emacs-Xtra entry.
+
 2006-04-20 Ramprasad B <ramprasad_i82@yahoo.com>
 
        * Copyright (sources/emacs): updated copyright year(s)

diff --git a/lispref/ChangeLog b/lispref/ChangeLog
index ff1edfb375ab701443c11aa732bc3b45a995a5fa..99f2c9ab4f911530739f88df6a1538210bcc9421 100644 (file)
--- a/lispref/ChangeLog
+++ b/lispref/ChangeLog
@@ -1,5 +1,9 @@
 2006-05-06  Eli Zaretskii  <eliz@gnu.org>
 
+       * hooks.texi (Standard Hooks): Replace inforef to emacs-xtra by
+       conditional xref's to either emacs or emacs-xtra, depending on
+       @iftex/@ifnottex.
+
        * minibuf.texi (Minibuffer History): Document add-to-history.
 
 2006-05-05  Eli Zaretskii  <eliz@gnu.org>

diff --git a/man/ChangeLog b/man/ChangeLog
index 38a1d9c5121ddd4ffeff2c35670d222aca6a7504..a50fa9e15da46b780f1d502b841e38b845649744 100644 (file)
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,5 +1,90 @@
 2006-05-06  Eli Zaretskii  <eliz@gnu.org>
 
+       The following changes merge the emacs-xtra manual into the main
+       manual, but only for on-line version of the manual.
+       
+       * Makefile.in (INFO_TARGETS): Remove ../info/emacs-xtra.
+       (EMACS_XTRA): New variable, lists the new *-xtra.texi files.
+       (EMACSSOURCES): Use EMACS_XTRA.
+       (../info/emacs-xtra): Remove.
+       (emacs-xtra.dvi): Add EMACS_XTRA to prerequisites.
+
+       * makefile.w32-in (INFO_TARGETS): Remove $(infodir)/emacs-xtra.
+       (EMACS_XTRA): New variable, lists the new *-xtra.texi files.
+       (EMACSSOURCES): Use EMACS_XTRA.
+       ($(infodir)/emacs-xtra): Remove.
+       (emacs-xtra.dvi): Add EMACS_XTRA to prerequisites.
+
+       * trouble.texi (Quitting): 
+       * text.texi (Text): 
+       * programs.texi (Program Modes): 
+       * msdog.texi (Microsoft Windows): 
+       * frames.texi (Frames): 
+       * files.texi (Backup, Version Control, VC Concepts)
+       (Types of Log File, Advanced C-x v v, Log Buffer, Old Versions)
+       (Registering, VC Status, VC Undo, Multi-User Branching)
+       (Comparing Files): 
+       * calendar.texi (Calendar/Diary, Holidays, Displaying the Diary)
+       (Displaying the Diary, Special Diary Entries, Importing Diary): 
+       * buffers.texi (Several Buffers): Replace inforef to emacs-xtra by
+       conditional xref's, depending on @iftex/@ifnottex.
+
+       * msdog.texi (Microsoft Windows) [ifnottex]: Add menu entry for
+       "MS-DOS".  @include msdog-xtra.texi.
+
+       * programs.texi (Programs) [ifnottex]: Add menu entry for "Fortran".
+       <Top Level> [ifnottex]: @include fortran-xtra.texi.
+
+       * files.texi (Secondary VC Commands) [ifnottex]: Add menu entries
+       for vc-xtra.texi subsections.
+       (VC Undo) [ifnottex]: @include vc1-xtra.texi and @lowersections it.
+       (Multi-User Branching) [ifnottex]: @include vc2-xtra.texi.
+
+       * sending.texi (Sending Mail): A @node line without explicit Prev,
+       Next, and Up links.
+
+       * abbrevs.texi (Abbrevs): A @node line without explicit Prev,
+       Next, and Up links.
+
+       * emacs.texi (Top) [ifnottex]: Add menu entries for "Picture Mode"
+       and its sections.  @include picture-xtra.texi
+
+       * maintaining.texi (Maintaining) [ifnottex]: Add menu entry for
+       "Emerge".
+       (List Tags) [ifnottex]: @include emerge-xtra.texi.
+
+       * cal-xtra.texi (Daylight Savings): Remove this node: it is an
+       exact duplicate of its name-sake in calendar.texi.
+
+       * calendar.texi (Calendar/Diary) [ifnottex]: Add menu item for
+       "Advanced Calendar/Diary Usage".
+       (Time Intervals) [ifnottex]: @include cal-xtra.texi.
+
+       * dired.texi (Subdirectories in Dired) [ifnottex]: @include
+       dired-xtra.texi.
+       (Dired) [ifnottex]: Add menu entry for "Subdir Switches".
+
+       * files.texi (Reverting) [ifnottex]: @include arevert-xtra.texi.
+       (Files) [ifnottex]: Add menu entry for Autorevert.
+
+       * emacs-xtra.texi (Introduction): Reword to make consistent with
+       printed version only.
+       <Top level>: Remove the body of all chapters and move them to the
+       new *-xtra.texi files.  Use @raisesections and @lowersections to
+       convert sections to chapters etc.
+
+       * msdog-xtra.texi: 
+       * fortran-xtra.texi: 
+       * vc-xtra.texi: 
+       * vc1-xtra.texi: 
+       * vc2-xtra.texi: 
+       * emerge-xtra.texi: 
+       * cal-xtra.texi: 
+       * dired-xtra.texi: 
+       * arevert-xtra.texi: New files, with text from respective chapters
+       of emacs-xtra.texi.  Convert each @chapter into @section, @section
+       into @subsection, etc.
+
        * emacs-xtra.texi (MS-DOS): Renamed from "MS-DOG".  All references
        updated.