diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | INSTALL | 2 | ||||
-rw-r--r-- | configure.ac | 6 | ||||
-rw-r--r-- | etc/CONTRIBUTE | 2 | ||||
-rw-r--r-- | nt/INSTALL | 17 |
5 files changed, 20 insertions, 13 deletions
diff --git a/ChangeLog b/ChangeLog index e2ceaf23ff4..021f0e05473 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2014-01-09 Eric S. Raymond <esr@thyrsus.com> + + * INSTALL, configure.ac, etc/CONTRIBUTE, nt/INSTALL: Remove + unnecessarily specific references to Bazaar that could better + simply be to the repository. + 2014-01-08 Eric S. Raymond <esr@thyrsus.com> * INSTALL.BZR: Renamed to INSTALL.REPO @@ -7,7 +7,7 @@ See the end of the file for license conditions. This file contains general information on building GNU Emacs. For more information specific to the MS-Windows, GNUstep/Mac OS X, and MS-DOS ports, also read the files nt/INSTALL, nextstep/INSTALL, and -msdos/INSTALL. For information about building from a Bazaar checkout +msdos/INSTALL. For information about building from a repository checkout (rather than a release), also read the file INSTALL.REPO. diff --git a/configure.ac b/configure.ac index 14b88943ea4..b3d28d1d720 100644 --- a/configure.ac +++ b/configure.ac @@ -1025,11 +1025,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 Bazaar checkout on the other hand, the manuals are not included. -## So makeinfo is a requirement to build from Bazaar, and configure +## In a repository checkout on the other hand, the manuals are not included. +## So makeinfo is a requirement to build from the repository, 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 Bazaar checkout. +## with pre-built manuals, from a repository checkout. HAVE_MAKEINFO=yes if test "$MAKEINFO" = "no"; then diff --git a/etc/CONTRIBUTE b/etc/CONTRIBUTE index bbabeb3de05..cba833cf584 100644 --- a/etc/CONTRIBUTE +++ b/etc/CONTRIBUTE @@ -159,7 +159,7 @@ included in Emacs. ** Write access to the Emacs repository. Once you become a frequent contributor to Emacs, we can consider -giving you write access to the Bazaar repository. +giving you write access to the version-control repository. ** Emacs Mailing lists. diff --git a/nt/INSTALL b/nt/INSTALL index 8fcd780df8b..088c5f9bc0d 100644 --- a/nt/INSTALL +++ b/nt/INSTALL @@ -122,7 +122,7 @@ Windows 9X as well). optional libraries near the end of this document, before you start the build. Also, consider installing additional MinGW packages that are required/recommended, especially if you are building from the - Bazaar repository, as described in the next section. + repository, as described in the next section. ** Installing MinGW and MSYS manually @@ -166,7 +166,7 @@ Windows 9X as well). been warned! Additional MinGW packages are required/recommended, especially if - you are building from the Bazaar repository: + you are building from the repository: . Texinfo (needed to produce the Info manuals when building from bzr, and for "make install") @@ -218,9 +218,9 @@ Windows 9X as well). - mktemp These should only be needed if you intend to build development - versions of Emacs from the Bazaar repository. + versions of Emacs from the repository. - . Additional packages (needed only if building from the Bazaar + . Additional packages (needed only if building from the repository): Automake and Autoconf. They are available from here: @@ -279,7 +279,7 @@ Windows 9X as well). If you are building a release or pretest tarball, skip this section, because the configure script is already present in the tarball. - To build a development snapshot from the Emacs Bazaar repository, + To build a development snapshot from the Emacs repository, you will first need to generate the configure script and a few other auto-generated files. @@ -449,7 +449,7 @@ Windows 9X as well). * Make targets The following make targets may be used by users building the source - distribution, or users who have checked out of Bazaar after + distribution, or users who have checked out of the repository after an initial bootstrapping. make @@ -471,7 +471,8 @@ Windows 9X as well). necessary to run the configure script followed by "make", in order to rebuild. - The following targets are intended only for use with the Bazaar sources. + The following targets are intended only for use with the repository + sources. make bootstrap Removes all the auto-generated files and all the *.elc byte-compiled @@ -481,7 +482,7 @@ Windows 9X as well). make maintainer-clean Removes everything that can be recreated, including compiled Lisp - files, to get back to the state of a fresh Bazaar tree. After make + files, to get back to the state of a fresh repository tree. After make maintainer-clean, it is necessary to run configure and "make" or "make bootstrap" to rebuild. Occasionally it may be necessary to run this target after an update. |