[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master ed1480b: Merge from origin/emacs-27
From: |
Glenn Morris |
Subject: |
master ed1480b: Merge from origin/emacs-27 |
Date: |
Sun, 25 Jul 2021 10:57:28 -0400 (EDT) |
branch: master
commit ed1480b1d9b6fc0265197d9c1f2976296fa91129
Merge: df7bb79 d0625dc
Author: Glenn Morris <rgm@gnu.org>
Commit: Glenn Morris <rgm@gnu.org>
Merge from origin/emacs-27
d0625dc553 (origin/emacs-27) ; One more change in back.texi.
06d0a66e57 ; Yet another last-minute change in Emacs manual for printing
---
doc/emacs/back.texi | 11 +++++++----
doc/emacs/book-spine.texi | 2 +-
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/doc/emacs/back.texi b/doc/emacs/back.texi
index ae0121e..dc4e218 100644
--- a/doc/emacs/back.texi
+++ b/doc/emacs/back.texi
@@ -48,6 +48,7 @@ The ability to:
Create @strong{PostScript output} from plain-text files (special
editing modes for @LaTeX{} and @TeX{} are included).
+
@item
@strong{Compile} and @strong{debug} from inside Emacs.
@@ -67,7 +68,7 @@ Enjoy the use of extensive @strong{merge} and @strong{diff}
functions.
@item
Take advantage of built-in support for many @strong{version control
-systems}, including Git, Mercurial, Bazaar, Subversion, and CVS.
+systems,} including Git, Mercurial, Bazaar, Subversion, and CVS.
@item
And much more!
@@ -82,8 +83,8 @@ useful to expert users. It also includes appendices with
specific
material about X and GTK resources, and with details for users of
macOS and Microsoft Windows.
-And when you tire of all the work you can accomplish with it, Emacs
-contains games to play.
+And when you tire of all the work you can accomplish with Emacs, enjoy
+the games that come with it.
@strong{About the original and principal author:}
@@ -92,8 +93,10 @@ Emacs in 1984/85. He has received the ACM Grace Hopper
Award, a
MacArthur Foundation fellowship, the Electronic Frontier Foundation's
Pioneer award, the Takeda Award for Social/Economic Betterment, and
the ACM Software and System Award, as well as several doctorates
-honoris causa.
+@emph{honoris causa.}
@end quotation
@hfil
@bye
+
++++++++++++++++++++++++++++++++++++++++++++++++++++++++
diff --git a/doc/emacs/book-spine.texi b/doc/emacs/book-spine.texi
index 20e23ca..9634cce 100644
--- a/doc/emacs/book-spine.texi
+++ b/doc/emacs/book-spine.texi
@@ -13,7 +13,7 @@
@center @titlefont{GNU Emacs Manual}
@sp 5
-@center @value{EDITION} edition, for Emacs Version @value{EMACSVER}
+@center @value{EDITION} edition, for Emacs version @value{EMACSVER}
@sp 5
@center by Richard M.@: Stallman et al.