5 files changed, 34 insertions, 36 deletions

diff --git a/admin/notes/bugtracker b/admin/notes/bugtracker
index 3d9df200f44..fd7bd08091a 100644
--- a/admin/notes/bugtracker
+++ b/admin/notes/bugtracker
@@ -463,10 +463,10 @@ time, rather than by increasing bug number
 
 "raw" = ?
 
-** ChangeLog issues
+** Change log issues
 
 *** When you fix a bug, it can be helpful to put the bug number in the
-ChangeLog entry, for example:
+change log entry, for example:
 
    * foo.el (foofunc): Fix the `foo' case.  (Bug#123)
 
@@ -475,7 +475,7 @@ obvious fix (e.g. a typo), there's no need to clutter the log with the
 bug number.
 
 Similarly, when you close a bug, it can be helpful to include the
-relevant ChangeLog entry in the message to the bug tracker, so people
+relevant change log entry in the message to the bug tracker, so people
 can see exactly what the fix was.
 
 *** bug-reference-mode
diff --git a/admin/notes/changelogs b/admin/notes/changelogs
deleted file mode 100644
index 1025cfc217f..00000000000
--- a/admin/notes/changelogs
+++ /dev/null
@@ -1,23 +0,0 @@
-If installing changes written by someone else, make the ChangeLog
-entry in their name, not yours.
-
-
-http://lists.gnu.org/archive/html/emacs-devel/2007-09/msg00793.html
-  There is no need to make change log entries for files such as NEWS,
-  MAINTAINERS, and FOR-RELEASE.
-"There is no need" means you don't have to, but you can if you want to.
-
-
-http://lists.gnu.org/archive/html/emacs-devel/2006-12/msg01135.html
-  There is no need to indicate regeneration of files such as configure
-  in ChangeLog.
-
-
-http://lists.gnu.org/archive/html/emacs-devel/2008-11/msg00940.html
-Preferred form for several entries with the same content:
-
-   * help.el (view-lossage):
-   * kmacro.el (kmacro-edit-lossage):
-   * edmacro.el (edit-kbd-macro): Fix docstring, lossage is now 300 keys.
-
-(Rather than anything involving "ditto" and suchlike.)
diff --git a/admin/notes/copyright b/admin/notes/copyright
index 74aa73b0394..c5452c38037 100644
--- a/admin/notes/copyright
+++ b/admin/notes/copyright
@@ -22,7 +22,7 @@ author to make a non-trivial total. If so, make sure they have an
 assignment. If adding a whole file adjust the copyright statements in
 the file.
 
-2. When installing code written by someone else, the ChangeLog entry
+2. When installing code written by someone else, the commit
 should be in the name of the author of the code, not the person who
 installs it.  Also use commit's "--author" option.
 Do not install any of your own changes in the same commit.
@@ -115,8 +115,8 @@ else it is possible the file should not be in Emacs at all (please
 report!).
 
 Note that it seems painfully clear that one cannot rely on commit logs,
-or even ChangeLogs, for older changes. People often installed changes
-from others, without recording the true authorship.
+or even change log entries, for older changes. People often installed
+changes from others, without recording the true authorship.
 
 [For reference, most of these points were established via email with
 rms, 2007/1, "Copyright years".
diff --git a/admin/notes/newfile b/admin/notes/newfile
index 0b66b8054bb..a682fec72d5 100644
--- a/admin/notes/newfile
+++ b/admin/notes/newfile
@@ -15,7 +15,7 @@ output under the headings "The following files are not valid DOS file
 names:" and "The following resolve to the same DOS file names:" should
 not include any files that end up in the release tarball.
 
-** Make the ChangeLog entry in the name of the author(s), not your own name.
+** Commit in the name of the author(s), not your own name.
 
 ** If appropriate, check that the file compiles OK and that Emacs
 builds fine with it.  Address any compilation warnings.
diff --git a/admin/notes/repo b/admin/notes/repo
index ded10324f63..46a9e08c698 100644
--- a/admin/notes/repo
+++ b/admin/notes/repo
@@ -1,9 +1,16 @@
 NOTES ON COMMITTING TO EMACS'S REPOSITORY    -*- outline -*-
 
-* Use DVCS commenting conventions
+* Commit metainformation
 
-Commits should follow the conventions used in all modern distributed
-version-control systems. That is, they should consist of
+** Commit in the author's name
+
+If installing changes written by someone else, commit them in their
+name, not yours.
+
+** Commit message format
+
+Commit messages should follow the conventions used in all modern
+distributed version-control systems. That is, they should consist of
 
 - A self-contained topic line, preferably no more than 75 chars long.
 
@@ -15,6 +22,21 @@ version-control systems. That is, they should consist of
   files, just copy the entries you made in them to the commit message
   after the blank line.)
 
+- Preferred form for several entries with the same content:
+
+   * help.el (view-lossage):
+   * kmacro.el (kmacro-edit-lossage):
+   * edmacro.el (edit-kbd-macro): Fix docstring, lossage is now 300 keys.
+
+  (Rather than anything involving "ditto" and suchlike.)
+
+** Unnecessary metainformation
+
+There is no need to make separate change log entries for files such as
+NEWS, MAINTAINERS, and FOR-RELEASE, or to indicate regeneration of
+files such as 'configure'.  "There is no need" means you don't have
+to, but you can if you want to.
+
 * Commit to the right branch
 
 Development normally takes places on the trunk.
@@ -112,9 +134,9 @@ http://lists.gnu.org/archive/html/emacs-devel/2010-05/msg00262.html
 
 [The section on git merge procedure has not yet been written]
 
-Inspect the ChangeLog entries (e.g. in case too many entries have been
+Inspect the change log entries (e.g. in case too many entries have been
 included or whitespace between entries needs fixing). If someone made
-multiple ChangeLog entries on different days in the branch, you may
+multiple change log entries on different days in the branch, you may
 wish to collapse them all to a single entry for that author in the
 trunk (because in the trunk they all appear under the same date).
 Obviously, if there are multiple changes to the same file by different
@@ -166,4 +188,3 @@ again.
 
 This is a semi-automated way to find the revision that introduced a bug.
 Browse `git help bisect' for technical instructions.
-