aboutsummaryrefslogtreecommitdiffstats
path: root/doc/misc
diff options
context:
space:
mode:
authorEric S. Raymond2014-10-31 11:03:23 +0200
committerEli Zaretskii2014-10-31 11:03:23 +0200
commitcac77f92e3861e81d5fe96b4b857fd9d243032e2 (patch)
treea8a9ae3aebf4c4c2be2957a06a76730b31a879bd /doc/misc
parent792faabe7a17a8f2fc2dd21076b69de2fc3edb65 (diff)
downloademacs-cac77f92e3861e81d5fe96b4b857fd9d243032e2.tar.gz
emacs-cac77f92e3861e81d5fe96b4b857fd9d243032e2.zip
Backport changes in preparation for git migration from trunk.
admin: Changes in several documents. autogen.sh: Neutralize language specific to a repository type. doc/misc/efaq-w32.texi: Neutralized language specific to a repository type. doc/misc/gnus-coding.txt: Neutralized language specific to a repository type. lisp/Makefile.in: Change some production names so they're neutral about the repository type.
Diffstat (limited to 'doc/misc')
-rw-r--r--doc/misc/ChangeLog6
-rw-r--r--doc/misc/efaq-w32.texi6
-rw-r--r--doc/misc/efaq.texi6
-rw-r--r--doc/misc/gnus-coding.texi14
4 files changed, 18 insertions, 14 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index e4a7e1f93ce..a9a5550a85e 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,9 @@
12014-10-31 Eric S. Raymond <esr@thyrsus.com>
2
3 * efaq-w32.texi: Neutralized language specific to a repository type.
4
5 * gnus-coding.txt: Neutralized language specific to a repository type.
6
12014-10-30 Glenn Morris <rgm@gnu.org> 72014-10-30 Glenn Morris <rgm@gnu.org>
2 8
3 * efaq.texi (Gnus does not work with NNTP): Remove; ancient. 9 * efaq.texi (Gnus does not work with NNTP): Remove; ancient.
diff --git a/doc/misc/efaq-w32.texi b/doc/misc/efaq-w32.texi
index c59f7547d8d..13627eb6b69 100644
--- a/doc/misc/efaq-w32.texi
+++ b/doc/misc/efaq-w32.texi
@@ -176,7 +176,7 @@ The latest source is available from
176distributed as a compressed tar file, digitally signed by the maintainer 176distributed as a compressed tar file, digitally signed by the maintainer
177who made the release. 177who made the release.
178 178
179@cindex Bzr, getting Emacs 179@cindex getting Emacs
180@cindex latest development version of Emacs 180@cindex latest development version of Emacs
181@cindex Emacs Development 181@cindex Emacs Development
182The development version of Emacs is available from 182The development version of Emacs is available from
@@ -199,8 +199,8 @@ of GNU @command{rm} and @command{cp}, as the Windows native
199equivalents are not consistent between versions. GNU texinfo will be 199equivalents are not consistent between versions. GNU texinfo will be
200required to build the manuals. @xref{Other useful ports}. 200required to build the manuals. @xref{Other useful ports}.
201 201
202After unpacking the source, or checking out of Bzr, be sure to read the 202After unpacking the source, or checking out of the repository, be sure
203instructions in @file{nt/README} and @file{nt/INSTALL}. 203to read the instructions in @file{nt/README} and @file{nt/INSTALL}.
204 204
205@node Debugging 205@node Debugging
206@section How do I use a debugger on Emacs? 206@section How do I use a debugger on Emacs?
diff --git a/doc/misc/efaq.texi b/doc/misc/efaq.texi
index 9c9b5a770a9..89f277be492 100644
--- a/doc/misc/efaq.texi
+++ b/doc/misc/efaq.texi
@@ -986,10 +986,8 @@ version; three components indicate a development
986version (e.g., @samp{23.0.50} is what will eventually become @samp{23.1}). 986version (e.g., @samp{23.0.50} is what will eventually become @samp{23.1}).
987 987
988Emacs is under active development, hosted at 988Emacs is under active development, hosted at
989@uref{http://savannah.gnu.org/projects/emacs/, Savannah}. The source 989@uref{http://savannah.gnu.org/projects/emacs/, Savannah}.
990code can be retrieved anonymously following the 990Follow the instructions given there to clone the project repository.
991@uref{http://savannah.gnu.org/bzr/?group=emacs, instructions}.
992The repository is GNU Bazaar.
993 991
994Because Emacs undergoes many changes before a release, the version 992Because Emacs undergoes many changes before a release, the version
995number of a development version is not especially meaningful. It is 993number of a development version is not especially meaningful. It is
diff --git a/doc/misc/gnus-coding.texi b/doc/misc/gnus-coding.texi
index 44cc29b9c39..e955b14e2ac 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