aboutsummaryrefslogtreecommitdiffstats
path: root/CONTRIBUTE
diff options
context:
space:
mode:
authorjave2014-12-31 12:24:10 +0100
committerjave2014-12-31 12:24:10 +0100
commitbaba9e039136e183e055169ddd7ca1e983fc734f (patch)
tree9168fb077980351a25ea3a112f2abd105a11099a /CONTRIBUTE
parent4105b6a93047045553e10795742a808b805c85b7 (diff)
parent25346768fac53687c97c213fb99ff18fa805b073 (diff)
downloademacs-baba9e039136e183e055169ddd7ca1e983fc734f.tar.gz
emacs-baba9e039136e183e055169ddd7ca1e983fc734f.zip
merge upstream
Diffstat (limited to 'CONTRIBUTE')
-rw-r--r--CONTRIBUTE4
1 files changed, 2 insertions, 2 deletions
diff --git a/CONTRIBUTE b/CONTRIBUTE
index 3bc49cf3ea3..0e019d31597 100644
--- a/CONTRIBUTE
+++ b/CONTRIBUTE
@@ -57,7 +57,7 @@ following modifications:
57 the rationale for a change; that can be done in the commit message 57 the rationale for a change; that can be done in the commit message
58 between the summary line and the file entries. 58 between the summary line and the file entries.
59 59
60** Changelog notes 60** ChangeLog notes
61 61
62- Emacs generally follows the GNU coding standards when it comes to 62- Emacs generally follows the GNU coding standards when it comes to
63 ChangeLogs: 63 ChangeLogs:
@@ -67,7 +67,7 @@ following modifications:
67 now), because `...' is so widely used elsewhere in Emacs. 67 now), because `...' is so widely used elsewhere in Emacs.
68 68
69- Some of the rules in the GNU coding standards section 5.2 69- Some of the rules in the GNU coding standards section 5.2
70 "Commenting Your Work" also apply to Changelog entries: they must be 70 "Commenting Your Work" also apply to ChangeLog entries: they must be
71 in English, and be complete sentences starting with a capital and 71 in English, and be complete sentences starting with a capital and
72 ending with a period (except the summary line should not end in a 72 ending with a period (except the summary line should not end in a
73 period). 73 period).