aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
authorGlenn Morris <[email protected]>2014-06-21 12:45:59 -0700
committerGlenn Morris <[email protected]>2014-06-21 12:45:59 -0700
commitc400516ab1d827d08225ffb3e1bc1969c73cc45e (patch)
treeb16343b9e11c916c96b12ab56b6024cad91d3aff /admin
parent539ad293eb36b4cf458cbdb5a6b37f5cd1bb68a1 (diff)
parent8047f439ec7d0bbe0085800a13bee8da883ae4dd (diff)
Merge from emacs-24; up to 2014-06-06T02:22:[email protected]
Diffstat (limited to 'admin')
-rw-r--r--admin/ChangeLog5
-rw-r--r--admin/notes/elpa4
2 files changed, 7 insertions, 2 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog
index 02d8dc08ea..dc12832552 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,8 @@
+2014-06-21 Stephen Berman <[email protected]>
+
+ * notes/elpa: Use "git" instead of "bzr" in the name of machine to
+ clone the repository from.
+
2014-06-13 Glenn Morris <[email protected]>
* unidata/Makefile.in (${DSTDIR}/charprop.el):
diff --git a/admin/notes/elpa b/admin/notes/elpa
index 469a0ca8bd..39226044a9 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