merge from trunk

3 files changed, 51 insertions, 3 deletions

diff --git a/admin/ChangeLog b/admin/ChangeLog
index ac6031fa205..8fdfe3965b1 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,9 +1,12 @@
+2013-06-13  Glenn Morris  <rgm@gnu.org>
+
+        * admin.el (manual-style-string): Use new file manual.css.
+
 2013-06-02  Eric Ludlam <zappo@gnu.org>
 
         * grammars/srecode-template.wy (variable): Accept a single number
         as a variable value.  Allows the 'priority' to be set to a number.
-        (wisent-srecode-template-lexer): Move number up so it can be
-        created.
+        (wisent-srecode-template-lexer): Move number up so it can be created.
 
 2013-05-16  Glenn Morris  <rgm@gnu.org>
 
diff --git a/admin/admin.el b/admin/admin.el
index cb7eaead27f..8366207f5b0 100644
--- a/admin/admin.el
+++ b/admin/admin.el
@@ -271,7 +271,7 @@ Root must be the root of an Emacs source tree."
 <meta name=\"DC.title\" content=\"gnu.org\">\n\n")
 
 (defconst manual-style-string "<style type=\"text/css\">
-@import url('/style.css');\n</style>\n")
+@import url('/s/emacs/manual.css');\n</style>\n")
 
 (defun manual-misc-html (name root html-node-dir html-mono-dir)
   (let ((texi (expand-file-name (format "doc/misc/%s.texi" name) root)))
diff --git a/admin/notes/bzr b/admin/notes/bzr
index f35ff95f9d6..8f7d0d94fa8 100644
--- a/admin/notes/bzr
+++ b/admin/notes/bzr
@@ -316,3 +316,48 @@ When finished, use
   bzr bisect reset
 
 or simply delete the entire branch if you created it just for this.
+
+* Commit emails
+
+** Old method: bzr-hookless-email
+https://launchpad.net/bzr-hookless-email
+
+Runs hourly via cron.  Must ask Savannah admins to enable/disable it
+for each branch.  Stores the last revision that it mailed as
+last_revision_mailed in branch.conf on the server.  Breaks with bzr 2.6:
+
+http://lists.gnu.org/archive/html/savannah-hackers-public/2013-05/msg00000.html
+
+Fix from https://bugs.launchpad.net/bzr-hookless-email/+bug/988195
+only partially works.  Breaks again on every merge commit:
+
+https://lists.ubuntu.com/archives/bazaar/2013q2/075520.html
+http://lists.gnu.org/archive/html/savannah-hackers-public/2013-05/msg00024.html
+
+You can force it to skip the merge commit by changing the value for
+last_revision_mailed, eg:
+
+bzr config last_revision_mailed=xfq.free@gmail.com-20130603233720-u1aumaxvf3o0rlai -d bzr+ssh://USERNAME@bzr.savannah.gnu.org/emacs/trunk/
+
+** New method: bzr-email plugin
+https://launchpad.net/bzr-email
+http://lists.gnu.org/archive/html/savannah-hackers-public/2013-06/msg00007.html
+
+Runs on commit.  Projects can enable it themselves by using `bzr
+config' to set post_commit_to option for a branch.  See `bzr help email'
+(if you have the plugin installed) for other options.
+
+Note: if you have the bzr-email plugin installed locally, then when
+you commit to the Emacs repository it will also try to send a commit
+email from your local machine.  If your machine is not configured to
+send external mail, this will just fail.  In any case, you may prefer
+to either remove the plugin from your machine, or disable it for Emacs
+branches.  You can do this either by editing branch.conf in your Emacs
+branches, to override the server setting (untested; not sure this
+works), or by adding an entry to ~/.bazaar/locations.conf:
+
+  [bzr+ssh://USERNAME@bzr.savannah.gnu.org/emacs/*/]
+  post_commit_to = ""
+
+You have to use locations.conf rather than bazaar.conf because the
+latter has a lower priority than branch.conf.