merge from trunk

1 files changed, 34 insertions, 0 deletions

diff --git a/admin/ChangeLog b/admin/ChangeLog
index 6a636091a7c..25ce7c0f9e4 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,37 @@
+2013-03-16  Glenn Morris  <rgm@gnu.org>
+
+        * admin.el (manual-pdf, manual-dvi): Pass -I to texi2pdf, texi2dvi.
+
+2013-03-16  Glenn Morris  <rgm@gnu.org>
+
+        * admin.el (manual-html-mono, manual-html-node): Add -DWWW_GNU_ORG.
+
+2013-03-13  Paul Eggert  <eggert@cs.ucla.edu>
+
+        File synchronization fixes (Bug#13944).
+        * CPP-DEFINES (BSD_SYSTEM, HAVE_FSYNC): Remove.
+        * merge-gnulib (GNULIB_MODULES): Add fsync, fdatasync.
+
+2013-03-11  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * notes/unicode: Improve notes about Emacs source file encoding.
+
+2013-03-11  Glenn Morris  <rgm@gnu.org>
+
+        * admin.el (make-manuals): Add emacs-lisp-intro and some more
+        doc/misc manuals.
+        (manual-html-mono, manual-html-node, manual-txt):
+        Pass -I to makeinfo.
+
+2013-03-10  Glenn Morris  <rgm@gnu.org>
+
+        * admin.el (add-release-logs): Use UTC for release date.
+
+2013-03-09  Glenn Morris  <rgm@gnu.org>
+
+        * admin.el (add-release-logs): Provide interactive defaults.
+        Allow specification of the release date.  Don't exclude gnus/.
+
 2013-03-05  Paul Eggert  <eggert@cs.ucla.edu>
 
         * notes/unicode: Add notes about Emacs source file encoding.