propagate changes from trunk

diff --git a/lispref/ChangeLog b/lispref/ChangeLog
index d0a9707..4af3c16 100644 (file)
--- a/lispref/ChangeLog
+++ b/lispref/ChangeLog
@@ -1,3 +1,8 @@
+2007-04-28  Karl Berry  <karl@gnu.org>
+
+       * elisp.texi: Improve line breaks on copyright page,
+       similar layout to emacs manual, 8.5x11 by default.
+
 2007-04-24  Richard Stallman  <rms@gnu.org>
 
        * text.texi (Special Properties): Add xref to Overlay Properties.

diff --git a/lispref/elisp.texi b/lispref/elisp.texi
index 76f92f9..f0339aa 100644 (file)
--- a/lispref/elisp.texi
+++ b/lispref/elisp.texi
@@ -14,8 +14,10 @@
 * Elisp: (elisp).       The Emacs Lisp Reference Manual.
 @end direntry
 
-@c for full 8.5x11, comment this out.
-@set smallbook
+@c in general, keep the following line commented out, unless doing a
+@c copy of this manual that will be published.  the manual should go
+@c onto the distribution in the full, 8.5 x 11" size.
+@c set smallbook
 
 @ifset smallbook
 @smallbook
@@ -41,8 +43,8 @@
 @c @syncodeindex tp fn
 
 @copying
-This is edition @value{VERSION} of the GNU Emacs Lisp
-Reference Manual, corresponding to Emacs version @value{EMACSVER}.
+This is edition @value{VERSION} of the GNU Emacs Lisp Reference Manual,@*
+corresponding to Emacs version @value{EMACSVER}.
 
 Copyright @copyright{} 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998,
 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007  Free Software
@@ -74,14 +76,14 @@ Software Foundation raise funds for GNU development.''
 @vskip 0pt plus 1filll
 @insertcopying
 
-@sp 1
+@sp 2
 Published by the Free Software Foundation @*
 51 Franklin St, Fifth Floor @*
 Boston, MA 02110-1301 @*
 USA @*
 ISBN 1-882114-74-4
 
-@sp 1
+@sp 2
 Cover art by Etienne Suvasa.
 @end titlepage
 

diff --git a/man/ChangeLog b/man/ChangeLog
index 9593fbd..f70919a 100644 (file)
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,10 @@
+2007-04-28  Karl Berry  <karl@gnu.org>
+
+       * emacs.texi: Improve line breaks on copyright page,
+       similar layout to lispref, 8.5x11 by default.
+
+       * dired.texi (Image-Dired): Improve line break, fix typo.
+
 2007-04-27  J.D. Smith  <jdsmith@as.arizona.edu>
 
        * idlwave.texi: Minor updates for IDLWAVE 6.1.

diff --git a/man/emacs.texi b/man/emacs.texi
index f0ea4b8..a4aa5f6 100644 (file)
--- a/man/emacs.texi
+++ b/man/emacs.texi
@@ -8,7 +8,7 @@
 @set EMACSVER  22.0.99
 
 @copying
-This is the @value{EDITION} edition of the @cite{GNU Emacs Manual},
+This is the @value{EDITION} edition of the @cite{GNU Emacs Manual},@*
 updated for Emacs version @value{EMACSVER}.
 
 Copyright @copyright{} 1985, 1986, 1987, 1993, 1994, 1995, 1996, 1997,
@@ -39,7 +39,7 @@ Software Foundation raise funds for GNU development.''
 @c in general, keep the following line commented out, unless doing a
 @c copy of this manual that will be published.  the manual should go
 @c onto the distribution in the full, 8.5 x 11" size.
-@set smallbook
+@c set smallbook
 
 @ifset smallbook
 @smallbook
@@ -76,10 +76,10 @@ Software Foundation raise funds for GNU development.''
 @insertcopying
 
 @sp 2
-ISBN 1-882114-86-8*
 Published by the Free Software Foundation @*
 51 Franklin Street, Fifth Floor @*
-Boston, MA 02110-1301 USA
+Boston, MA 02110-1301 USA @*
+ISBN 1-882114-86-8
 
 @sp 2
 Cover art by Etienne Suvasa.