diff options
| author | Glenn Morris <rgm@gnu.org> | 2021-07-25 07:57:23 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2021-07-25 07:57:23 -0700 |
| commit | ed1480b1d9b6fc0265197d9c1f2976296fa91129 (patch) | |
| tree | 2af9169d7ba5d14c786a5582f38c15ffd5432795 /doc | |
| parent | df7bb79f3862e64739147fc1fc3c3e9af268d046 (diff) | |
| parent | d0625dc5530dbaec847c5973a0851b635c03e0fa (diff) | |
| download | emacs-ed1480b1d9b6fc0265197d9c1f2976296fa91129.tar.gz | |
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
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/emacs/back.texi | 11 | ||||
| -rw-r--r-- | 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 ae0121e1a88..dc4e218d378 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 20e23ca2bf8..9634cceedaf 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. |