aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorEric S. Raymond2014-10-25 15:23:20 -0400
committerEric S. Raymond2014-10-25 15:23:20 -0400
commit65e2cdadaf7f7212b67c52c3ef0bf49fe9f7ee01 (patch)
treeeddb2017137200d5b33dbcc6b1c4f308cdb2e9d9 /doc
parent5862e22c4ae74a8575c7a54777246f72c6733296 (diff)
downloademacs-65e2cdadaf7f7212b67c52c3ef0bf49fe9f7ee01.tar.gz
emacs-65e2cdadaf7f7212b67c52c3ef0bf49fe9f7ee01.zip
Neutralize language specific to a repository type.
Diffstat (limited to 'doc')
-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 @@
12014-10-25 Eric S. Raymond <esr@thyrsus.com>
2
3 * gnus-coding.txt: Neutralized language specific to a repository type.
4
12014-10-20 Glenn Morris <rgm@gnu.org> 52014-10-20 Glenn Morris <rgm@gnu.org>
2 6
3 * Merge in all changes up to 24.4 release. 7 * 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
313new @file{encrypt.el}), you should probably make the change in the Emacs 313new @file{encrypt.el}), you should probably make the change in the Emacs
314tree, and it will show up in the Gnus tree a few days later. 314tree, and it will show up in the Gnus tree a few days later.
315 315
316If you don't have Emacs bzr access (or it's inconvenient), you can 316If you don't have Emacs repository access (or it's inconvenient), you
317change such a file in the v5-10 branch, and it should propagate to Emacs 317can change such a file in the v5-10 branch, and it should propagate to
318bzr---however, it will get some extra scrutiny (by Miles) to see if the 318the Emacs repository---however, it will get some extra scrutiny (by
319changes are possibly controversial and need discussion on the mailing 319Miles) to see if the changes are possibly controversial and need
320list. Many changes are obvious bug-fixes however, so often there won't 320discussion on the mailing list. Many changes are obvious bug-fixes
321be any problem. 321however, so often there won't be any problem.
322 322
323@item 323@item
324If it's to a Gnus file, and it's important enough that it should be part 324If it's to a Gnus file, and it's important enough that it should be part
325of Emacs and the v5-10 branch, then you can make the change on the v5-10 325of Emacs and the v5-10 branch, then you can make the change on the v5-10
326branch, and it will go into Emacs bzr and the Gnus git trunk (a few days 326branch, and it will go into Emacs and the Gnus git trunk (a few days
327later). The most prominent examples for such changes are bug-fixed 327later). The most prominent examples for such changes are bug-fixed
328including improvements on the documentation. 328including improvements on the documentation.
329 329