* INSTALL.BZR: Rename from INSTALL.CVS, edit to talk about Bazaar.

* INSTALL, autogen.sh, configure.in, configure: Adjust accordingly.

6 files changed, 33 insertions, 43 deletions

diff --git a/ChangeLog b/ChangeLog
index c3016c91658..026cac38b67 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-12-27  Karl Fogel  <kfogel@red-bean>
+
+	* INSTALL.BZR: Rename from INSTALL.CVS; edit to talk about Bazaar.
+	* INSTALL, autogen.sh, configure.in, configure: Adjust accordingly.
+
 2009-12-17  Glenn Morris  <rgm@gnu.org>
 
 	* .dir-locals.el (bug-reference-url-format): Change to debbugs.gnu.org.
diff --git a/INSTALL b/INSTALL
index b71929c250d..71bb666eeb2 100644
--- a/INSTALL
+++ b/INSTALL
@@ -7,8 +7,8 @@ See the end of the file for license conditions.
 This file contains general information.  For more specific information
 for the Windows, GNUstep/Mac OS X, and MS-DOS ports, also see the files
 nt/INSTALL nextstep/INSTALL, and msdos/INSTALL.  For information
-specific to building from a CVS checkout (rather than a release), see
-the file INSTALL.CVS.
+specific to building from a Bazaar checkout (rather than a release), see
+the file INSTALL.BZR.
 
 
 BASIC INSTALLATION
diff --git a/INSTALL.CVS b/INSTALL.BZR
index cf33143b4e0..2ff6ca8c4a7 100644
--- a/INSTALL.CVS
+++ b/INSTALL.BZR
@@ -3,7 +3,7 @@ Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
 See the end of the file for license conditions.
 
 
-	      Building and Installing Emacs from CVS
+	      Building and Installing Emacs from Bazaar
 
 If this is the first time you go through it, you'll need to configure
 before bootstrapping:
@@ -11,15 +11,15 @@ before bootstrapping:
   $ ./configure
 
 Some of the files that are included in the Emacs tarball, such as
-byte-compiled Lisp files, are not stored in the CVS repository.
-Therefore, to build from CVS you must run "make bootstrap"
-instead of just "make":
+byte-compiled Lisp files, are not stored in Bazaar.  Therefore, to
+build from Bazaar you must run "make bootstrap" instead of just "make":
 
   $ cvs update -dP
   $ make bootstrap
 
-Normally, it is not necessary to use "make bootstrap" after every CVS
-update.  "make" should work in 90% of the cases and be much quicker.
+Normally, it is not necessary to use "make bootstrap" after every
+update from Bazaar.  "make" should work in 90% of the cases and be
+much quicker.
 
   $ make
 
@@ -33,10 +33,11 @@ updated to reflect new autoloaded functions.  If you see errors (rather
 than warnings) about undefined lisp functions during compilation, that
 may be the reason.  Another symptom may be an error saying that
 "loaddefs.el" could not be found; this is due to a change in the way
-loaddefs.el was handled in CVS, and should only happen once, for users
-that are updating old CVS trees.  Finally, sometimes there can be build
-failures related to *loaddefs.el (e.g. "required feature `esh-groups'
-was not provided").  In that case, follow the instructions below.
+loaddefs.el was handled in version control, and should only happen
+once, for users that are updating old sources.  Finally, sometimes
+there can be build failures related to *loaddefs.el (e.g. "required
+feature `esh-groups' was not provided").  In that case, follow the
+instructions below.
 
 To update loaddefs.el (and similar files), do:
 
@@ -52,42 +53,26 @@ platform-specific configuration scripts (nt/configure.bat, config.bat,
 etc.) before "make bootstrap" or "make"; the rest of the procedure is
 applicable to those systems as well.
 
-Questions, requests, and bug reports about the CVS versions of Emacs
+Questions, requests, and bug reports about the Bazaar versions of Emacs
 should be sent to emacs-pretest-bug@gnu.org rather than gnu.emacs.help
 or gnu.emacs.bug.  Ideally, use M-x report-emacs-bug RET which will
 send it to the proper place.
 
-Because the CVS version of Emacs is a work in progress, it will
+Because the Bazaar version of Emacs is a work in progress, it will
 sometimes fail to build.  Please wait a day or so (and check the bug
 and development mailing list archives) before reporting such problems.
 In most cases, the problem is known about and is just waiting for
 someone to fix it.
 
 
-Note on using SSH to access the CVS repository from inside Emacs
-----------------------------------------------------------------
+Note on accessing the Bazaar repository
+---------------------------------------
 
-Write access to the CVS repository requires using SSH v2.
+Write access to the Bazaar repository is currently done via Bazaar's
+sftp:// protocol; see http://www.emacswiki.org/emacs/BzrForEmacsDevs.
+We plan to offer bzr+ssh:// access later.  More discussion about that
+is at https://savannah.gnu.org/support/?107077.
 
-If you execute cvs commands inside Emacs, specifically if you use
-pcl-cvs, output from CVS may be lost due to a problem in the
-interface between ssh, cvs, and libc.  Corrupted checkins are
-also known to have happened.
-
-To fix the problem, save the following script into a file, make it
-executable, and set CVS_RSH to the file name of the script:
-
-#!/bin/bash
-exec 2> >(exec cat >&2 2>/dev/null)
-exec ssh "$@"
-
-This may be combined with the following entry in ~/.ssh/config to
-simplify accessing the CVS repository:
-
-Host subversions.gnu.org
-     Protocol 2
-     ForwardX11 no
-     User YOUR_USERID
 
 
 This file is part of GNU Emacs.
diff --git a/autogen.sh b/autogen.sh
index 0fe7ef32fc2..6eb8f982081 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-echo "Please read INSTALL.CVS for instructions on how to build Emacs from CVS."
+echo "Please read INSTALL.BZR for instructions on how to build Emacs from Bazaar."
 
 # Exit with failure, since people may have generic build scripts that
 # try things like "autogen.sh && ./configure && make".
diff --git a/configure b/configure
index 8372aab03c3..2a6aeb52b9d 100755
--- a/configure
+++ b/configure
@@ -5604,11 +5604,11 @@ fi
 ## pre-built, and not deleted by the normal clean rules.  makeinfo is
 ## therefore in the category of "special tools" not normally required, which
 ## configure does not have to check for (eg autoconf itself).
-## In a CVS checkout on the other hand, the manuals are not included.
-## So makeinfo is a requirement to build from CVS, and configure
+## In a Bazaar checkout on the other hand, the manuals are not included.
+## So makeinfo is a requirement to build from Bazaar, and configure
 ## should test for it as it does for any other build requirement.
 ## We use the presence of $srcdir/info/emacs to distinguish a release,
-## with pre-built manuals, from a CVS checkout.
+## with pre-built manuals, from a Bazaar checkout.
 if test "$MAKEINFO" = "no"; then
   if test "x${with_makeinfo}" = "xno"; then
     MAKEINFO=off
diff --git a/configure.in b/configure.in
index 32208c76170..c04df296158 100644
--- a/configure.in
+++ b/configure.in
@@ -799,11 +799,11 @@ fi
 ## pre-built, and not deleted by the normal clean rules.  makeinfo is
 ## therefore in the category of "special tools" not normally required, which
 ## configure does not have to check for (eg autoconf itself).
-## In a CVS checkout on the other hand, the manuals are not included.
-## So makeinfo is a requirement to build from CVS, and configure
+## In a Bazaar checkout on the other hand, the manuals are not included.
+## So makeinfo is a requirement to build from Bazaar, and configure
 ## should test for it as it does for any other build requirement.
 ## We use the presence of $srcdir/info/emacs to distinguish a release,
-## with pre-built manuals, from a CVS checkout.
+## with pre-built manuals, from a Bazaar checkout.
 if test "$MAKEINFO" = "no"; then
   if test "x${with_makeinfo}" = "xno"; then
     MAKEINFO=off