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.

22 files changed, 94 insertions, 73 deletions

diff --git a/ChangeLog b/ChangeLog
index f9b676cea88..cc49e183b46 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-10-31  Eric S. Raymond  <esr@thyrsus.com>
+
+	* autogen.sh: Neutralize language specific to a repository type.
+
 2014-10-23  Paul Eggert  <eggert@cs.ucla.edu>
 
 	* Makefile.in (${srcdir}/info/dir): Make sure info directory exists.
diff --git a/admin/check-doc-strings b/admin/check-doc-strings
index a0b5acb623f..13e8b0cd8e7 100755
--- a/admin/check-doc-strings
+++ b/admin/check-doc-strings
@@ -18,7 +18,7 @@ formal parameters, docstrings, and lispref texi.
 This program is in the public domain.\n";
 
 die $usage if @ARGV;
-die $usage unless -r "src/alloc.c" && -d ".bzr" && -d "lisp";
+die $usage unless -r "src/alloc.c" && -d "lisp";
 
 my %texi_funtype;
 my %texi_arglist;
diff --git a/admin/notes/BRANCH b/admin/notes/BRANCH
deleted file mode 100644
index 9f09135f206..00000000000
--- a/admin/notes/BRANCH
+++ /dev/null
@@ -1,32 +0,0 @@
-You can view the available Emacs branches at
-
-http://bzr.savannah.gnu.org/r/emacs/
-
-Development normally takes places on the trunk.
-Sometimes specialized features are developed on separate branches
-before possibly being merged to the trunk.
-
-Development is discussed on the emacs-devel mailing list.
-
-Sometime before the release of a new major version of Emacs (eg 23.2),
-a "feature freeze" is imposed on the trunk.  No new features may be
-added after this point.  This is usually some months before the release.
-
-Shortly before the release, a release branch is created, and the
-trunk is then free for development.
-For example, "emacs-23" for Emacs 23.2 and later, "EMACS_23_1_RC" for
-23.1, "EMACS_22_BASE" for 22.x, and "EMACS_21_1_RC" for 21.x.
-
-Consult emacs-devel for exactly what kinds of changes are allowed
-on what branch at any time.
-
-If you are looking at this file in a branch other than the trunk,
-there may be some branch-specific documentation below this line.
-________________________________________________________________________
-
-* elpa
-
-  This branch does not contain a copy of Emacs, but of the Emacs Lisp
-  package archive (elpa.gnu.org).  See admin/notes/elpa for further
-  explanation, and the README file in the branch for usage
-  instructions.
diff --git a/admin/notes/copyright b/admin/notes/copyright
index a54bcb6108b..74aa73b0394 100644
--- a/admin/notes/copyright
+++ b/admin/notes/copyright
@@ -24,7 +24,7 @@ the file.
 
 2. When installing code written by someone else, the ChangeLog entry
 should be in the name of the author of the code, not the person who
-installs it.  Also use bzr commit's "--author" option.
+installs it.  Also use commit's "--author" option.
 Do not install any of your own changes in the same commit.
 
 3. With images, add the legal info to a README file in the directory
@@ -493,10 +493,10 @@ system)
     obviously good):
 
 
-Is it OK to just `bzr remove' a file for legal reasons, or is
-something more drastic needed? A removed file is still available from
-the repository, if suitable options are applied. (This issue obviously
-does not affect a release).
+Is it OK to just remove a file for legal reasons, or is something more
+drastic (excision from the entire repository history) needed? A
+removed file is still available from the repository, if suitable
+options are applied. (This issue obviously does not affect a release).
   rms: will ask lawyer
 
 
diff --git a/admin/notes/hydra b/admin/notes/hydra
index 3b6bc87a2f6..ce2047480d2 100644
--- a/admin/notes/hydra
+++ b/admin/notes/hydra
@@ -26,7 +26,7 @@ http://lists.gnu.org/mailman/listinfo/emacs-buildstatus
 * The Emacs jobset consists of the following jobs:
 
 ** The `tarball' job
-which gets a checkout from bzr, and does a bootstrap followed
+which gets a checkout from the repository, and does a bootstrap followed
 by running make-dist to create a tarball.  If this job fails, all the
 others will too (because they use the tarball as input).
 
diff --git a/admin/notes/bzr b/admin/notes/repo
index a1ef8f64133..c398d3a4ae2 100644
--- a/admin/notes/bzr
+++ b/admin/notes/repo
@@ -1,6 +1,39 @@
-NOTES ON COMMITTING TO EMACS'S BAZAAR REPO    -*- outline -*-
+NOTES ON COMMITTING TO EMACS'S REPOSITORY    -*- outline -*-
+
+* Commit to the right branch
+
+You can view the available Emacs branches at
+
+http://bzr.savannah.gnu.org/r/emacs/
+
+Development normally takes places on the trunk.
+Sometimes specialized features are developed on separate branches
+before possibly being merged to the trunk.
+
+Development is discussed on the emacs-devel mailing list.
+
+Sometime before the release of a new major version of Emacs
+a "feature freeze" is imposed on the trunk.  No new features may be
+added after this point.  This is usually some months before the release.
+
+Shortly before the release, a release branch is created, and the
+trunk is then free for development.
+
+For example, "emacs-23" for Emacs 23.2 and later, "EMACS_23_1_RC" for
+23.1, "EMACS_22_BASE" for 22.x, and "EMACS_21_1_RC" for 21.x.
+
+Consult emacs-devel for exactly what kinds of changes are allowed
+on what branch at any time.
+
+** elpa
+
+This branch does not contain a copy of Emacs, but of the Emacs Lisp
+package archive (elpa.gnu.org).  See admin/notes/elpa for further
+explanation, and the README file in the branch for usage
+instructions.
 
 * Install changes only on one branch, let them get merged elsewhere if needed.
+
 In particular, install bug-fixes only on the release branch (if there
 is one) and let them get synced to the trunk; do not install them by
 hand on the trunk as well.  E.g. if there is an active "emacs-24" branch
@@ -19,6 +52,7 @@ and branch yourself (when committing the branch change, indicate
 in the commit log that it should not be merged to the trunk; see below).
 
 * Backporting a bug-fix from the trunk to a branch (e.g. "emacs-24").
+
 Indicate in the commit log that there is no need to merge the commit
 to the trunk.  Anything that matches `bzrmerge-skip-regexp' will do;
 eg start the commit message with "Backport:".  This is helpful for the
@@ -27,6 +61,7 @@ person merging the release branch to the trunk.
 http://lists.gnu.org/archive/html/emacs-devel/2010-05/msg00262.html
 
 * Installing changes from your personal branches.
+
 If your branch has only a single commit, or many different real
 commits, it is fine to do a merge.  If your branch has only a very
 small number of "real" commits, but several "merge from trunks", it is
@@ -47,6 +82,7 @@ yet another fun excursion into the exciting world of version control.
 http://lists.gnu.org/archive/html/emacs-devel/2010-04/msg00086.html
 
 * Installing changes from gnulib
+
 Some of the files in Emacs are copied from gnulib.  To synchronize
 these files from the version of gnulib that you have checked out into
 a sibling directory of your branch, type "admin/merge-gnulib"; this
diff --git a/admin/notes/years b/admin/notes/years
index 342fe9e2307..c0db1854e30 100644
--- a/admin/notes/years
+++ b/admin/notes/years
@@ -2,7 +2,7 @@ HOW TO MAINTAIN COPYRIGHT YEARS FOR GNU EMACS
 
 Maintaining copyright years is now very simple: every time a new year
 rolls around, add that year to every FSF (and AIST) copyright notice.
-Do this by running the 'admin/update-copyright' script on a fresh bzr
+Do this by running the 'admin/update-copyright' script on a fresh repo
 checkout.  Inspect the results for plausibility, then commit them.
 
 There's no need to worry about whether an individual file has changed
diff --git a/admin/update-copyright b/admin/update-copyright
index 2b33506f9c1..ce58168684e 100755
--- a/admin/update-copyright
+++ b/admin/update-copyright
@@ -45,14 +45,15 @@ sed 's/\\def\\year[{][0-9]*[}]/\\def\\year{'"$UPDATE_COPYRIGHT_YEAR"'}'/g \
 } &&
 rm $emacsver.aux &&
 
-bzr_files=$(bzr ls -RV --kind file) &&
+# FIXME: command will soon need to be replaced with "git ls-files"
+repo_files=$(bzr ls -RV --kind file) &&
 
 # Do not update the copyright of files that have one or more of the
 # following problems:
 # . They are license files, maintained by the FSF, with their own dates.
 # . Their format cannot withstand changing the contents of copyright strings.
 
-updatable_files=$(find $bzr_files \
+updatable_files=$(find $repo_files \
   ! -name COPYING \
   ! -name doclicense.texi \
   ! -name gpl.texi \
diff --git a/autogen.sh b/autogen.sh
index 6b7c647c4c5..bc8a73db6bd 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-### autogen.sh - tool to help build Emacs from a bzr checkout
+### autogen.sh - tool to help build Emacs from a repository checkout
 
 ## Copyright (C) 2011-2014 Free Software Foundation, Inc.
 
@@ -23,8 +23,8 @@
 
 ### Commentary:
 
-## The Emacs bzr repository does not include the configure script
-## (and associated helpers).  The first time you fetch Emacs from bzr,
+## The Emacs repository does not include the configure script (and
+## associated helpers).  The first time you fetch Emacs from the repo,
 ## run this script to generate the necessary files.
 ## For more details, see the file INSTALL.REPO.
 
@@ -143,7 +143,7 @@ if [ x"$missing" != x ]; then
 
     cat <<EOF
 
-Building Emacs from Bzr requires the following specialized programs:
+Building Emacs from the repository requires the following specialized programs:
 EOF
 
     for prog in $progs; do
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 @@
+2014-10-31  Eric S. Raymond  <esr@thyrsus.com>
+
+	* efaq-w32.texi: Neutralized language specific to a repository type.
+
+	* gnus-coding.txt: Neutralized language specific to a repository type.
+
 2014-10-30  Glenn Morris  <rgm@gnu.org>
 
 	* 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
 distributed as a compressed tar file, digitally signed by the maintainer
 who made the release.
 
-@cindex Bzr, getting Emacs
+@cindex getting Emacs
 @cindex latest development version of Emacs
 @cindex Emacs Development
 The development version of Emacs is available from
@@ -199,8 +199,8 @@ of GNU @command{rm} and @command{cp}, as the Windows native
 equivalents are not consistent between versions.  GNU texinfo will be
 required to build the manuals.  @xref{Other useful ports}.
 
-After unpacking the source, or checking out of Bzr, be sure to read the
-instructions in @file{nt/README} and @file{nt/INSTALL}.
+After unpacking the source, or checking out of the repository, be sure
+to read the instructions in @file{nt/README} and @file{nt/INSTALL}.
 
 @node Debugging
 @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
 version (e.g., @samp{23.0.50} is what will eventually become @samp{23.1}).
 
 Emacs is under active development, hosted at
-@uref{http://savannah.gnu.org/projects/emacs/, Savannah}.  The source
-code can be retrieved anonymously following the
-@uref{http://savannah.gnu.org/bzr/?group=emacs, instructions}.
-The repository is GNU Bazaar.
+@uref{http://savannah.gnu.org/projects/emacs/, Savannah}.
+Follow the instructions given there to clone the project repository.
 
 Because Emacs undergoes many changes before a release, the version
 number 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
 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.
 
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bed0928f68f..d0bdb2a1dc9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-10-31  Eric S. Raymond  <esr@thyrsus.com>
+
+	* Makefile.in: Change some production names so they're neutral
+	about the repository type.
+
 2014-10-30  Kim F. Storm  <storm@cua.dk>
 
 	Restore cua-delete-copy-to-register-0 and M-v command (bug#18886).
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index 5e42cd16bfc..d90ced0cdcb 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -206,18 +206,18 @@ update-subdirs: doit
 	   $(srcdir)/../build-aux/update-subdirs $$file; \
 	done;
 
-.PHONY: updates bzr-update update-authors
+.PHONY: updates repo-update update-authors
 
 # Some modes of make-dist use this.
 updates: update-subdirs autoloads finder-data custom-deps
 
-# This is useful after "bzr up"; but it doesn't do anything that a
+# This is useful after a repostiory fetch; but it doesn't do anything that a
 # plain "make" at top-level doesn't.
 # The only difference between this and this directory's "all" rule
 # is that this runs "autoloads" as well (because it uses "compile"
 # rather than "compile-main").  In a bootstrap, $(lisp) in src/Makefile
 # triggers this directory's autoloads rule.
-bzr-update: compile finder-data custom-deps
+repo-update: compile finder-data custom-deps
 
 # Update the AUTHORS file.
 
diff --git a/lisp/makefile.w32-in b/lisp/makefile.w32-in
index cb2a1b4e4bb..08a4219ee6b 100644
--- a/lisp/makefile.w32-in
+++ b/lisp/makefile.w32-in
@@ -257,11 +257,11 @@ update-subdirs-SH: doit
 
 updates: $(lisp)/subdirs.el autoloads mh-autoloads finder-data custom-deps
 
-# This is useful after "bzr up".
-bzr-update: recompile autoloads finder-data custom-deps
+# This is useful after a repository fetch.
+repo-update: recompile autoloads finder-data custom-deps
 
 # For backwards compatibility:
-cvs-update: bzr-update
+cvs-update: repo-update
 
 # Update the AUTHORS file.
 
diff --git a/lisp/man.el b/lisp/man.el
index 7a095981ebd..ee78423a270 100644
--- a/lisp/man.el
+++ b/lisp/man.el
@@ -840,7 +840,7 @@ foo[, bar [, ...]] [other stuff] (sec) - description
 foo(sec)[, bar(sec) [, ...]] [other stuff] - description
 
 For more details and some regression tests, please see
-test/automated/man-tests.el in the emacs bzr repository."
+test/automated/man-tests.el in the emacs repository."
   (goto-char (point-min))
   ;; See man-tests for data about which systems use which format (hopefully we
   ;; will be able to simplify the code if/when some of those formats aren't
diff --git a/nt/ChangeLog b/nt/ChangeLog
index ff9b588ecf0..5ffab4d0151 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,7 @@
+2014-10-31  Eric S. Raymond  <esr@thyrsus.com>
+
+	* Neutralize language specific to a repository type.
+
 2014-10-26  Dani Moncayo <dmoncayo@gmail.com>
 
 	* README.W32 (Preliminaries): Don't assume that this file is at
diff --git a/nt/INSTALL b/nt/INSTALL
index f43912f6a1f..350b1f53310 100644
--- a/nt/INSTALL
+++ b/nt/INSTALL
@@ -169,7 +169,7 @@ Windows 9X as well).
   you are building from the repository:
 
    . Texinfo (needed to produce the Info manuals when building from
-     bzr/git, and for "make install")
+     the repository, and for "make install")
 
      Available from http://sourceforge.net/projects/ezwinports/files/.
 
diff --git a/nt/INSTALL.OLD b/nt/INSTALL.OLD
index 6e6de220487..a7ce57cc369 100644
--- a/nt/INSTALL.OLD
+++ b/nt/INSTALL.OLD
@@ -126,7 +126,7 @@
     http://sourceforge.net/projects/ezwinports/files/
 
   In addition to this file, if you build a development snapshot, you
-  should also read INSTALL.BZR in the parent directory.
+  should also read INSTALL.REPO in the parent directory.
 
 * Supported development environments
 
@@ -575,7 +575,7 @@
 * Creating binary distributions
 
   Binary distributions (full and barebin distributions) can be
-  automatically built and packaged from source tarballs or a bzr
+  automatically built and packaged from source tarballs or a repository
   checkout.
 
   When building Emacs binary distributions, the --distfiles argument
diff --git a/nt/zipdist.bat b/nt/zipdist.bat
index 216949aaddd..d5359c8be5e 100644
--- a/nt/zipdist.bat
+++ b/nt/zipdist.bat
@@ -36,7 +36,7 @@ goto EXIT
 

 rem Build and verify the binary distribution

 :ZIP_DIST

-7z a -bd -tZIP -mx=9 -x!.bzrignore -x!.gitignore -xr!emacs.mdp -xr!*.pdb -xr!*.opt -xr!*~ -xr!CVS -xr!.arch-inventory emacs-%EMACS_VER%-bin-i386.zip %TMP_DIST_DIR%

+7z a -bd -tZIP -mx=9 -x!.gitignore -xr!emacs.mdp -xr!*.pdb -xr!*.opt -xr!*~ -xr!CVS -xr!.arch-inventory emacs-%EMACS_VER%-bin-i386.zip %TMP_DIST_DIR%

 7z t emacs-%EMACS_VER%-bin-i386.zip

 goto EXIT

 

diff --git a/test/automated/thingatpt.el b/test/automated/thingatpt.el
index fe82fca4ff7..74240f80b87 100644
--- a/test/automated/thingatpt.el
+++ b/test/automated/thingatpt.el
@@ -26,7 +26,6 @@
     ("http://2.gnu.org" 6 url "http://2.gnu.org")
     ("http://3.gnu.org" 19 url "http://3.gnu.org")
     ("https://4.gnu.org" 1  url "https://4.gnu.org")
-    ("bzr://savannah.gnu.org" 1 url "bzr://savannah.gnu.org")
     ("A geo URI (geo:3.14159,-2.71828)." 12 url "geo:3.14159,-2.71828")
     ("Visit http://5.gnu.org now." 5 url nil)
     ("Visit http://6.gnu.org now." 7 url "http://6.gnu.org")