aboutsummaryrefslogtreecommitdiffstats
path: root/admin/notes/copyright
diff options
context:
space:
mode:
authorPaul Eggert2014-11-19 11:29:40 -0800
committerPaul Eggert2014-11-19 11:37:56 -0800
commitcd2e816cd3ebf562c680ed15b53cf2a88a01f14f (patch)
tree40bb4e3db8a0cc25ca29a80a984bcb6b37d49699 /admin/notes/copyright
parentff953bc93bb41ef573cd6962424ece340ad5a394 (diff)
downloademacs-cd2e816cd3ebf562c680ed15b53cf2a88a01f14f.tar.gz
emacs-cd2e816cd3ebf562c680ed15b53cf2a88a01f14f.zip
Lessen focus on ChangeLog files, as opposed to change log entries.
This is in preparation for generating the former automatically from the latter. * admin/notes/bugtracker, admin/notes/copyright, admin/notes/newfile: ChangeLog -> change log * admin/notes/changelogs: Remove, merging old contents to ... * admin/notes/repo: ... here. * doc/emacs/maintaining.texi (Change Log): Mention that ChangeLog files may be copied to or from a version control system. * doc/emacs/trouble.texi (Sending Patches): Point to the commit messages. * doc/lispref/intro.texi (Acknowledgments): ChangeLog file -> change log entries. * doc/lispref/tips.texi (Library Headers): Emacs uses a version control system. * etc/CONTRIBUTE: Give advice about git commit messages and how to generate proposed patches containing them.
Diffstat (limited to 'admin/notes/copyright')
-rw-r--r--admin/notes/copyright6
1 files changed, 3 insertions, 3 deletions
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
22assignment. If adding a whole file adjust the copyright statements in 22assignment. If adding a whole file adjust the copyright statements in
23the file. 23the file.
24 24
252. When installing code written by someone else, the ChangeLog entry 252. When installing code written by someone else, the commit
26should be in the name of the author of the code, not the person who 26should be in the name of the author of the code, not the person who
27installs it. Also use commit's "--author" option. 27installs it. Also use commit's "--author" option.
28Do not install any of your own changes in the same commit. 28Do 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
115report!). 115report!).
116 116
117Note that it seems painfully clear that one cannot rely on commit logs, 117Note that it seems painfully clear that one cannot rely on commit logs,
118or even ChangeLogs, for older changes. People often installed changes 118or even change log entries, for older changes. People often installed
119from others, without recording the true authorship. 119changes from others, without recording the true authorship.
120 120
121[For reference, most of these points were established via email with 121[For reference, most of these points were established via email with
122rms, 2007/1, "Copyright years". 122rms, 2007/1, "Copyright years".