diff options
Diffstat (limited to 'doc/emacs')
| -rw-r--r-- | doc/emacs/ChangeLog | 6 | ||||
| -rw-r--r-- | doc/emacs/custom.texi | 2 | ||||
| -rw-r--r-- | doc/emacs/display.texi | 2 | ||||
| -rw-r--r-- | doc/emacs/emacs.texi | 4 | ||||
| -rw-r--r-- | doc/emacs/files.texi | 2 | ||||
| -rw-r--r-- | doc/emacs/msdog-xtra.texi | 2 | ||||
| -rw-r--r-- | doc/emacs/msdog.texi | 2 | ||||
| -rw-r--r-- | doc/emacs/vc-xtra.texi | 4 |
8 files changed, 15 insertions, 9 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 2f4653540e2..f097bb5cd34 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,3 +1,9 @@ +2012-02-28 Glenn Morris <rgm@gnu.org> + + * custom.texi, display.texi, emacs.texi, files.texi: + * msdog-xtra.texi, msdog.texi, vc-xtra.texi: + Standardize possessive apostrophe usage. + 2012-02-25 Jan Djärv <jan.h.d@swipnet.se> * macos.texi (Mac / GNUstep Customization): Remove text about diff --git a/doc/emacs/custom.texi b/doc/emacs/custom.texi index b2215c19e75..82a7a02a9ac 100644 --- a/doc/emacs/custom.texi +++ b/doc/emacs/custom.texi @@ -567,7 +567,7 @@ directory specified by the variable @code{custom-theme-directory} (which defaults to @file{~/.emacs.d/}), and a directory named @file{etc/themes} in your Emacs installation (see the variable @code{data-directory}). The latter contains several Custom themes -which are distributed with Emacs, which customize Emacs' faces to fit +which are distributed with Emacs, which customize Emacs's faces to fit various color schemes. (Note, however, that Custom themes need not be restricted to this purpose; they can be used to customize variables too). diff --git a/doc/emacs/display.texi b/doc/emacs/display.texi index d86e0049fb5..54dbc0a78e1 100644 --- a/doc/emacs/display.texi +++ b/doc/emacs/display.texi @@ -22,7 +22,7 @@ the text is displayed. * Follow Mode:: Follow mode lets two windows scroll as one. * Faces:: How to change the display style using faces. * Colors:: Specifying colors for faces. -* Standard Faces:: Emacs' predefined faces. +* Standard Faces:: The main predefined faces. * Text Scale:: Increasing or decreasing text size in a buffer. * Font Lock:: Minor mode for syntactic highlighting using faces. * Highlight Interactively:: Tell Emacs what text to highlight. diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi index ef438cd3067..be8137aae30 100644 --- a/doc/emacs/emacs.texi +++ b/doc/emacs/emacs.texi @@ -163,7 +163,7 @@ Major Structures of Emacs * International:: Using non-@acronym{ASCII} character sets. Advanced Features -* Modes:: Major and minor modes alter Emacs' basic behavior. +* Modes:: Major and minor modes alter Emacs's basic behavior. * Indentation:: Editing the white space at the beginnings of lines. * Text:: Commands and modes for editing human languages. * Programs:: Commands and modes for editing programs. @@ -337,7 +337,7 @@ Controlling the Display * Follow Mode:: Follow mode lets two windows scroll as one. * Faces:: How to change the display style using faces. * Colors:: Specifying colors for faces. -* Standard Faces:: Emacs' predefined faces. +* Standard Faces:: The main predefined faces. * Text Scale:: Increasing or decreasing text size in a buffer. * Font Lock:: Minor mode for syntactic highlighting using faces. * Highlight Interactively:: Tell Emacs what text to highlight. diff --git a/doc/emacs/files.texi b/doc/emacs/files.texi index 3adc735154b..0d38728f7cf 100644 --- a/doc/emacs/files.texi +++ b/doc/emacs/files.texi @@ -288,7 +288,7 @@ see @ref{Drag and Drop}, and @ref{Misc Dired Features}. Each time you visit a file, Emacs automatically scans its contents to detect what character encoding and end-of-line convention it uses, -and converts these to Emacs' internal encoding and end-of-line +and converts these to Emacs's internal encoding and end-of-line convention within the buffer. When you save the buffer, Emacs performs the inverse conversion, writing the file to disk with its original encoding and end-of-line convention. @xref{Coding Systems}. diff --git a/doc/emacs/msdog-xtra.texi b/doc/emacs/msdog-xtra.texi index 509b9de754d..2191d799a2b 100644 --- a/doc/emacs/msdog-xtra.texi +++ b/doc/emacs/msdog-xtra.texi @@ -33,7 +33,7 @@ you use an Emacs that was built for MS-DOS. @ifnottex @xref{Text and Binary}, for information @end ifnottex -about Emacs' special handling of text files under MS-DOS (and Windows). +about Emacs's special handling of text files under MS-DOS (and Windows). @menu * Keyboard: MS-DOS Keyboard. Keyboard conventions on MS-DOS. diff --git a/doc/emacs/msdog.texi b/doc/emacs/msdog.texi index 93bc5f0e4b1..2dcc1fa42f8 100644 --- a/doc/emacs/msdog.texi +++ b/doc/emacs/msdog.texi @@ -574,7 +574,7 @@ then change their minds; if this has the effect of bringing up the Windows menu, it alters the meaning of subsequent commands. Many users find this frustrating. - You can re-enable Windows' default handling of tapping the @key{ALT} + You can re-enable Windows's default handling of tapping the @key{ALT} key by setting @code{w32-pass-alt-to-system} to a non-@code{nil} value. diff --git a/doc/emacs/vc-xtra.texi b/doc/emacs/vc-xtra.texi index 51137a273d3..f04f939cced 100644 --- a/doc/emacs/vc-xtra.texi +++ b/doc/emacs/vc-xtra.texi @@ -1,5 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 2004-2012 Free Software Foundation, Inc. +@c Copyright (C) 2004-2012 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @c @c This file is included in emacs-xtra.texi when producing the printed @@ -8,7 +8,7 @@ @node Advanced VC Usage @section Advanced VC Usage - Commonly used features of Emacs' version control (VC) support are + Commonly used features of Emacs's version control (VC) support are described in the main Emacs manual (@pxref{Version Control,,,emacs, the Emacs Manual}). This chapter describes more advanced VC usage. |