6 files changed, 96 insertions, 1 deletions

diff --git a/admin/ChangeLog b/admin/ChangeLog
index cbcd698e8b1..e9c6c74e163 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,20 @@
+2013-08-15  Glenn Morris  <rgm@gnu.org>
+
+        * make-tarball.txt: Mention generating pdfs in etc/refcards.
+
+2013-08-15  Xue Fuqiao  <xfq.free@gmail.com>
+
+        * notes/hydra: More information about Hydra.
+
+2013-08-10  Xue Fuqiao  <xfq.free@gmail.com>
+
+        * notes/hydra: New file.
+
+2013-08-04  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Fix some minor races in hosts lacking mkostemp (Bug#15015).
+        * merge-gnulib (GNULIB_MODULES): Add mkostemp.
+
 2013-07-12  Glenn Morris  <rgm@gnu.org>
 
         * admin.el (manual-style-string): Use non-abbreviated url.
diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE
index 53186b21688..c578d3d37e1 100644
--- a/admin/FOR-RELEASE
+++ b/admin/FOR-RELEASE
@@ -3,6 +3,10 @@ Tasks needed before the next release.
 * TO BE DONE SHORTLY BEFORE RELEASE
 
 ** Manuals
+Check for node names using problematic characters:
+  find doc -name '*.texi' -exec grep '^@node[^,]*[:.()]' {} +
+Sadly makeinfo does not warn about such characters.
+
 Check cross-references between the manuals (eg from emacs to elisp)
 are correct.  You can use something like the following in the info
 directory in the Emacs build tree:
diff --git a/admin/cus-test.el b/admin/cus-test.el
index 6b8ec9abe02..54d26cc11d6 100644
--- a/admin/cus-test.el
+++ b/admin/cus-test.el
@@ -202,6 +202,8 @@ The detected problematic options are stored in `cus-test-errors'."
 
            ;; Check the values
            (mapc (lambda (value)
+                   ;; TODO for booleans, check for values that can be
+                   ;; evaluated and are not t or nil.  Usually a bug.
                    (unless (widget-apply conv :match value)
                      (setq mismatch 'mismatch)))
                  values)
diff --git a/admin/make-tarball.txt b/admin/make-tarball.txt
index 005c6694228..fc7f81f0c28 100644
--- a/admin/make-tarball.txt
+++ b/admin/make-tarball.txt
@@ -61,6 +61,9 @@ General steps (for each step, check for possible errors):
 5.   autoreconf -i -I m4 --force
      make bootstrap
 
+     make -C etc/refcards
+     make -C etc/refcards clean
+
 6.  Copy lisp/loaddefs.el to lisp/ldefs-boot.el.
 
     Commit etc/AUTHORS, lisp/ldefs-boot.el, and the files changed
@@ -144,6 +147,8 @@ General steps (for each step, check for possible errors):
     Download them and check the signatures.  Check they build.
 
 12. For a pretest, announce it on emacs-devel and info-gnu-emacs@gnu.org.
+    Probably should also include the platform-testers list:
+    https://lists.gnu.org/mailman/listinfo/platform-testers
     For a release, also announce it on info-gnu@gnu.org.  (Probably
     bcc the info- addresses to make it less likely that people will
     followup on those lists.)
diff --git a/admin/merge-gnulib b/admin/merge-gnulib
index 82e0cd77fca..97126704d10 100755
--- a/admin/merge-gnulib
+++ b/admin/merge-gnulib
@@ -32,7 +32,7 @@ GNULIB_MODULES='
   fcntl fcntl-h fdatasync fdopendir filemode fstatat fsync
   getloadavg getopt-gnu gettime gettimeofday
   intprops largefile lstat
-  manywarnings memrchr mktime
+  manywarnings memrchr mkostemp mktime
   pipe2 pselect pthread_sigmask putenv qacl readlink readlinkat
   sig2str socklen stat-time stdalign stdarg stdbool stdio
   strftime strtoimax strtoumax symlink sys_stat
diff --git a/admin/notes/hydra b/admin/notes/hydra
new file mode 100644
index 00000000000..068bc70ee9c
--- /dev/null
+++ b/admin/notes/hydra
@@ -0,0 +1,67 @@
+-*- outline -*-
+
+Copyright (C) 2013 Free Software Foundation, Inc.
+See the end of the file for license conditions.
+
+NOTES FOR EMACS CONTINUOUS BUILD ON HYDRA
+
+A continuous build for Emacs trunk can be found at
+http://hydra.nixos.org/jobset/gnu/emacs-trunk
+
+* It builds (and runs ERT tests) on these platforms:
+i686-cygwin
+i686-freebsd
+i686-linux
+x86_64-darwin
+x86_64-linux
+
+* Mail notifications
+In addition to the web interface, Hydra can send notifications by
+email when the build status of a project changes—e.g., from
+`SUCCEEDED' to `FAILED'.  It sends notifications about build status in
+Emacs trunk to emacs-buildstatus@gnu.org.
+
+If you want to receive these notifications, please subscribe at
+http://lists.gnu.org/mailman/listinfo/emacs-buildstatus
+
+* The Emacs jobset consists of the following jobs:
+
+** The `tarball' job
+which gets the source tree as input, and is just a `make dist' after
+some autoconf/-make or bootstrap script.
+
+** The `build' job
+which gets the result of the tarball job as input, together with
+system identifier, this job basically does a normal make and make install.
+
+** The 'coverage' job
+is now running `make check'.
+
+* Nix expressions
+The recipe for GNU Emacs are available via Git:
+http://git.savannah.gnu.org/cgit/hydra-recipes.git/tree/emacs
+
+To modify the build job, email the patch to hydra-users@gnu.org.  The
+build recipes are written in the Nix language.
+
+* Other Information
+For a list of other GNU packages that have a continuous build on
+Hydra, see http://hydra.nixos.org/project/gnu
+
+See http://www.gnu.org/software/devel.html#Hydra for more information.
+
+
+This file is part of GNU Emacs.
+
+GNU Emacs is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+GNU Emacs is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.