admin/notes/elpa: Make Bzr checkout directions more explicit.

diff --git a/admin/notes/elpa b/admin/notes/elpa
index cbea8cc1dfafaf8deb52b89e7b4d3a269954e698..db14456fe32df7727a40a27b7eb690a1a70d3d95 100644 (file)
--- a/admin/notes/elpa
+++ b/admin/notes/elpa
@@ -1,24 +1,24 @@
 NOTES ON THE EMACS PACKAGE ARCHIVE
 
-The GNU Emacs package archive, at elpa.gnu.org, is managed using Bzr.
-The Bzr branch is hosted on Savannah, and you can check it out with
+The GNU Emacs package archive, at elpa.gnu.org, is managed using a Bzr
+branch named "elpa", hosted on Savannah.  To check it out:
 
   bzr branch bzr+ssh://USER@bzr.savannah.gnu.org/emacs/elpa elpa
+  cd elpa
+  echo "public_branch = bzr+ssh://USER@bzr.savannah.gnu.org/emacs/elpa" >> .bzr/branch/branch.conf
+  bzr bind bzr+ssh://USERNAME@bzr.savannah.gnu.org/emacs/elpa
+  [create task branch for edits, etc.]
 
-Changes made to this branch propagate to elpa.gnu.org as follows.
+Changes to this branch propagate to elpa.gnu.org in a semi-manual way.
 There exists a copy of the elpa branch on that machine.  Someone with
-access must log in, pull the latest changes from Savannah, and run a
-"deployment" script that generates the content at the web-visible
-location http://elpa.gnu.org/packages.
+access logs in, pulls the latest changes from Savannah, and runs a
+"deployment" script.  This script (which is itself kept in the Bzr
+branch) generates the content visible at http://elpa.gnu.org/packages.
 
-The reason things are set up this way, instead of using the package
-upload utilities in package-x.el, is so that Emacs hackers can easily
-edit the contents of the Savannah "elpa" branch, with the aid of
-version control.  (For instance, multi-file packages are stored on the
-Bzr branch in source form, not as tarfiles.)  Because deployment is a
-semi-manual process, this allows us some flexibility in making changes
-to the branch on Savannah.  Furthermore, one can use the elpa branch
-to deploy a "local" copy of the package archive, for testing.
+The reason we set things up this way, instead of using the package
+upload commands in package-x.el, is to let Emacs hackers conveniently
+edit the contents of the "elpa" branch.  (In particular, multi-file
+packages are stored on the branch in source form, not as tarfiles.)
 
-For details on how to use the elpa branch, see that README file in
-that branch.
+It is easy to use the elpa branch to deploy a "local" copy of the
+package archive.  For details, see the README file in the elpa branch.