Merge branch 'trunk' into xwidget

Conflicts:
	src/window.c

1 files changed, 16 insertions, 3 deletions

diff --git a/admin/ChangeLog b/admin/ChangeLog
index 8fdfe3965b1..8746657517e 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,8 +1,21 @@
+2013-06-29  Glenn Morris  <rgm@gnu.org>
+
+        * admin.el (make-manuals): Don't bother with txt or dvi any more.
+        (manual-txt): Remove.
+        (manual-pdf): Doc fix.
+        (manual-ps): Rename from manual-dvi.
+        (manual-pdf, manual-ps): Work in the directory with the texi file,
+        so that TeX intermediate files go there rather than to PWD.
+
+2013-06-15  Xue Fuqiao  <xfq.free@gmail.com>
+
+        * notes/changelogs: Mention trivial changes in Change Log.
+
 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>
+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.
@@ -154,7 +167,7 @@
 
 2012-12-14  Paul Eggert  <eggert@cs.ucla.edu>
 
-        Fix permissions bugs with setgid directories etc. (Bug#13125)
+        Fix permissions bugs with setgid directories etc.  (Bug#13125)
         * CPP-DEFINES (BSD4_2): Remove.
 
 2012-12-08  Paul Eggert  <eggert@cs.ucla.edu>
@@ -286,7 +299,7 @@
 
         * grammars/grammar.wy (semantic-grammar-lexer): Remove, since it
         was copied to grammar.el.  New %provide token to generate prefix
-        which conforms with Emacs conventions.  Remove lexer definition,
+        which conforms with Emacs conventions.  Remove lexer definition,
         which is now in grammar.el.
 
 2012-09-27  Glenn Morris  <rgm@gnu.org>