# ChangeLog fixes, backported

diff --git a/admin/ChangeLog b/admin/ChangeLog
index f5490013544accebe3a751b1671c84ab356855b3..88d996532e04f3679deba06ce8b4508c616e8d35 100644 (file)
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -19,7 +19,7 @@
 
 2014-11-17  Oscar Fuentes  <ofv@wanadoo.es>
 
-       * admin/CPP-DEFINES: Mention MINGW_W64.
+       * CPP-DEFINES: Mention MINGW_W64.
 
 2014-11-15  Glenn Morris  <rgm@gnu.org>
 
@@ -29,9 +29,10 @@
 
 2014-11-11  Eric S. Raymond  <esr@thyrsus.com>
 
-       * make-tarball.txt, update-copyright, admin/notes/bugtracker,
-       admin/notes/tags, admin/update-copyright, admin/update_autogen:
-       admin/repo.notes: git transition.
+       * make-tarball.txt, notes/bugtracker, notes/repo, notes/tags:
+       Git transition.
+       * update-copyright: Use git ls-files.
+       * update_autogen: Remove some bzr conditionals.
 
 2014-11-09  Eli Zaretskii  <eliz@gnu.org>
 
@@ -52,8 +53,8 @@
 
 2014-10-31  Eric S. Raymond  <esr@thyrsus.com>
 
-       * notes/bzr: Renamed to notes/repo, reorganized to separate
-       VCS-dependent from VCS-independent stuff.  Added guidance about
+       * notes/bzr: Rename to notes/repo, reorganize to separate
+       VCS-dependent from VCS-independent stuff.  Add guidance about
        commit-comment format under DVCSes.
 
        * notes/BRANCH: Merged into notes/repo.

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 58b5d1d281c280fdc4938a9bf93ec86ff279d44f..71469b5180818d988a8319330ce77f52dc3c6631 100644 (file)
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -41,9 +41,8 @@
 
 2014-10-31  Eric S. Raymond  <esr@thyrsus.com>
 
-       * efaq-w32.texi: Neutralized language specific to a repository type.
-
-       * gnus-coding.txt: Neutralized language specific to a repository type.
+       * efaq-w32.texi, gnus-coding.texi:
+       Neutralize language specific to a repository type.
 
 2014-10-30  Glenn Morris  <rgm@gnu.org>