summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric S. Raymond <esr@thyrsus.com>2014-10-25 15:23:20 -0400
committerEric S. Raymond <esr@thyrsus.com>2014-10-25 15:23:20 -0400
commit65e2cdadaf7f7212b67c52c3ef0bf49fe9f7ee01 (patch)
treeeddb2017137200d5b33dbcc6b1c4f308cdb2e9d9
parent5862e22c4ae74a8575c7a54777246f72c6733296 (diff)
downloademacs-65e2cdadaf7f7212b67c52c3ef0bf49fe9f7ee01.tar.gz
Neutralize language specific to a repository type.
-rw-r--r--doc/misc/ChangeLog4
-rw-r--r--doc/misc/gnus-coding.texi14
2 files changed, 11 insertions, 7 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index a8fccd391d8..82cb20d7105 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,7 @@
+2014-10-25 Eric S. Raymond <esr@thyrsus.com>
+
+ * gnus-coding.txt: Neutralized language specific to a repository type.
+
2014-10-20 Glenn Morris <rgm@gnu.org>
* Merge in all changes up to 24.4 release.
diff --git a/doc/misc/gnus-coding.texi b/doc/misc/gnus-coding.texi
index 0b2b063275d..adbdd689b44 100644
--- a/doc/misc/gnus-coding.texi
+++ b/doc/misc/gnus-coding.texi
@@ -313,17 +313,17 @@ If it's a file which is thought of as being outside of Gnus (e.g., the
new @file{encrypt.el}), you should probably make the change in the Emacs
tree, and it will show up in the Gnus tree a few days later.
-If you don't have Emacs bzr access (or it's inconvenient), you can
-change such a file in the v5-10 branch, and it should propagate to Emacs
-bzr---however, it will get some extra scrutiny (by Miles) to see if the
-changes are possibly controversial and need discussion on the mailing
-list. Many changes are obvious bug-fixes however, so often there won't
-be any problem.
+If you don't have Emacs repository access (or it's inconvenient), you
+can change such a file in the v5-10 branch, and it should propagate to
+the Emacs repository---however, it will get some extra scrutiny (by
+Miles) to see if the changes are possibly controversial and need
+discussion on the mailing list. Many changes are obvious bug-fixes
+however, so often there won't be any problem.
@item
If it's to a Gnus file, and it's important enough that it should be part
of Emacs and the v5-10 branch, then you can make the change on the v5-10
-branch, and it will go into Emacs bzr and the Gnus git trunk (a few days
+branch, and it will go into Emacs and the Gnus git trunk (a few days
later). The most prominent examples for such changes are bug-fixed
including improvements on the documentation.