4 files changed, 39 insertions, 1 deletions

diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE
index 3fbf0f68c4e..dcf1f761888 100644
--- a/admin/FOR-RELEASE
+++ b/admin/FOR-RELEASE
@@ -184,7 +184,7 @@ arevert-xtra.texi
 basic.texi        -- cyd
 buffers.texi
 building.texi
-calendar.texi
+calendar.texi     -- rgm
 cal-xtra.texi
 cmdargs.texi
 commands.texi     -- cyd
diff --git a/admin/notes/bugtracker b/admin/notes/bugtracker
index 071eb208287..acce14496f1 100644
--- a/admin/notes/bugtracker
+++ b/admin/notes/bugtracker
@@ -97,6 +97,13 @@ listed is the master.  E.g.:
 
 forcemerge 123 124 125 ...
 
+*** To unmerge bugs:
+To disconnect a bug from all bugs it is merged with:
+
+unmerge 123
+
+This command accepts only one bug number.
+
 *** To set severity:
 severity 123 critical|grave|serious|important|normal|minor|wishlist
 
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index ce20a6e7d79..e74b7516e37 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,27 @@
+2008-08-26  Glenn Morris  <rgm@gnu.org>
+
+        * cal-xtra.texi (Non-Gregorian Diary Entries): New name for
+        node "Hebrew/Islamic Entries".
+
+        * calendar.texi (Specified Dates): Fix names of iso functions.
+        (General Calendar): There may not be another window.
+        (Writing Calendar Files, Holidays): Tweak intro.
+        (Holidays): Mention Baha'i and Chinese holidays.
+        (Sunrise/Sunset): Add M-x calendar-sunrise-sunset-month.
+        (Lunar Phases): Remove incorrect reference to calendar-time-zone.
+        (To Other Calendar): Add calendar-print-other-dates.
+        Refer to "graphic display" rather than "X.
+        (From Other Calendar): Add calendar-bahai-goto-date.  Fix reference.
+        (Displaying the Diary): Fix whitespace after reference.
+        Fix `diary-number-of-entries' reference.
+        (Date Formats): Explicitly mention that day names can be abbreviated.
+        (Adding to Diary): Add some references to other sections.
+        (Special Diary Entries): Fix reference.
+        (Appointments): Simplify appt-message-warning-time entry.
+        Clarify where times must be.
+        (Importing Diary): Comment out icalendar paragraph that does not apply.
+        (Time Intervals): Simplify entry for timeclock-ask-before-exiting.
+
 2008-08-23  Glenn Morris  <rgm@gnu.org>
 
         * fortran-xtra.texi (Fortran): Change description of free form and
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index eb66d56e6e7..70c2cd94e30 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2008-08-26  Glenn Morris  <rgm@gnu.org>
+
+        * progmodes/gud.el (tramp-file-name-localname)
+        (tramp-dissect-file-name): Declare,
+
+        * term/pc-win.el (msdos-setup-keyboard): Fix declaration.
+
 2008-08-25  Eli Zaretskii  <eliz@gnu.org>
 
         * bindings.el (mode-line-frame-control): New function, caters to