Merge from emacs-24; up to 2014-06-06T02:22:40Z!monnier@iro.umontreal.ca

2 files changed, 7 insertions, 2 deletions

diff --git a/admin/ChangeLog b/admin/ChangeLog
index 02d8dc08eac..dc128325523 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,8 @@
+2014-06-21  Stephen Berman  <Stephen.Berman@gmx.net>
+
+        * notes/elpa: Use "git" instead of "bzr" in the name of machine to
+        clone the repository from.
+
 2014-06-13  Glenn Morris  <rgm@gnu.org>
 
         * unidata/Makefile.in (${DSTDIR}/charprop.el):
diff --git a/admin/notes/elpa b/admin/notes/elpa
index 469a0ca8bd1..39226044a91 100644
--- a/admin/notes/elpa
+++ b/admin/notes/elpa
@@ -3,9 +3,9 @@ NOTES ON THE EMACS PACKAGE ARCHIVE
 The GNU Emacs package archive, at elpa.gnu.org, is managed using a Git
 repository named "elpa", hosted on Savannah.  To check it out:
 
-  git clone git://bzr.sv.gnu.org/emacs/elpa
+  git clone git://git.sv.gnu.org/emacs/elpa
   cd elpa
-  git remote set-url --push origin git+ssh://bzr.sv.gnu.org/srv/git/emacs/elpa
+  git remote set-url --push origin git+ssh://git.sv.gnu.org/srv/git/emacs/elpa
   [create task branch for edits, etc.]
 
 Changes to this branch propagate to elpa.gnu.org via a "deployment" script run