summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorKarl Berry <karl@gnu.org>2007-04-28 17:45:50 +0000
committerKarl Berry <karl@gnu.org>2007-04-28 17:45:50 +0000
commitc6d20d9ad6a89d1f4622d7654210d922d77e6bd6 (patch)
treef920d310b9986d4e9beafca19e5b69b47de8b136 /man
parent46062b5605d7ccf81e001a5fd6f22085eac513fb (diff)
downloademacs-c6d20d9ad6a89d1f4622d7654210d922d77e6bd6.tar.gz
propagate changes from trunk
Diffstat (limited to 'man')
-rw-r--r--man/ChangeLog7
-rw-r--r--man/emacs.texi8
2 files changed, 11 insertions, 4 deletions
diff --git a/man/ChangeLog b/man/ChangeLog
index 9593fbdf13d..f70919a0287 100644
--- 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 f0ea4b81430..a4aa5f6c538 100644
--- 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.