diff options
Diffstat (limited to 'doc/emacs')
| -rw-r--r-- | doc/emacs/ChangeLog | 19 | ||||
| -rw-r--r-- | doc/emacs/ack.texi | 6 | ||||
| -rw-r--r-- | doc/emacs/custom.texi | 2 | ||||
| -rw-r--r-- | doc/emacs/dired.texi | 4 | ||||
| -rw-r--r-- | doc/emacs/display.texi | 2 | ||||
| -rw-r--r-- | doc/emacs/emacs.texi | 14 | ||||
| -rw-r--r-- | doc/emacs/emacsver.texi | 2 | ||||
| -rw-r--r-- | doc/emacs/files.texi | 2 | ||||
| -rw-r--r-- | doc/emacs/help.texi | 2 | ||||
| -rw-r--r-- | doc/emacs/macos.texi | 12 | ||||
| -rw-r--r-- | doc/emacs/msdog-xtra.texi | 2 | ||||
| -rw-r--r-- | doc/emacs/msdog.texi | 2 | ||||
| -rw-r--r-- | doc/emacs/text.texi | 2 | ||||
| -rw-r--r-- | doc/emacs/vc-xtra.texi | 4 |
14 files changed, 41 insertions, 34 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 3d3c8f003cb..5be02a39742 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,3 +1,22 @@ +2012-02-29 Glenn Morris <rgm@gnu.org> + + * ack.texi (Acknowledgments): Use @Tex{} in more places. + + * emacs.texi, help.texi, text.texi: Use "" quotes in menus. + + * dired.texi, emacs.texi: Use @code{} in menus when appropriate. + +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 + ns-find-file and ns-drag-file (Bug#5855, Bug#10050). + 2012-02-25 Dani Moncayo <dmoncayo@gmail.com> (tiny change) * buffers.texi (Select Buffer): Mention that saving in a new file diff --git a/doc/emacs/ack.texi b/doc/emacs/ack.texi index 0a14f5119d1..be01b05fe19 100644 --- a/doc/emacs/ack.texi +++ b/doc/emacs/ack.texi @@ -553,7 +553,7 @@ for the Transport Layer Security protocol. @item Arne Jørgensen wrote @file{latexenc.el}, a package to -automatically guess the correct coding system in LaTeX files. +automatically guess the correct coding system in La@TeX{} files. @item Alexandre Julliard wrote @file{vc-git.el}, support for the Git version @@ -571,7 +571,7 @@ control system. Henry Kautz wrote @file{bib-mode.el}, a mode for maintaining bibliography databases compatible with @code{refer} (the @code{troff} version) and @code{lookbib}, and @file{refbib.el}, a package to convert -those databases to the format used by the LaTeX text formatting package. +those databases to the format used by the La@TeX{} text formatting package. @item Taichi Kawabata added support for Devanagari script and the Indian @@ -832,7 +832,7 @@ a directory-level front end to the CVS version control system; text; @file{smerge-mode.el}, a minor mode for resolving @code{diff3} conflicts; @file{diff-mode.el}, a mode for viewing and editing context diffs; @file{css-mode.el} for Cascading Style Sheets; -@file{bibtex-style.el} for BibTeX Style files; @file{mpc.el}, a +@file{bibtex-style.el} for Bib@TeX{} Style files; @file{mpc.el}, a client for the ``Music Player Daemon''; @file{smie.el}, a generic indentation engine; and @file{pcase.el}, implementing ML-style pattern matching. He integrated the lexical binding code in Emacs 24. 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/dired.texi b/doc/emacs/dired.texi index cce440f2bdb..e048237a4e2 100644 --- a/doc/emacs/dired.texi +++ b/doc/emacs/dired.texi @@ -40,7 +40,7 @@ you to operate on the listed files. @xref{Directories}. either one file or several files. * Shell Commands in Dired:: Running a shell command on the marked files. * Transforming File Names:: Using patterns to rename multiple files. -* Comparison in Dired:: Running `diff' by way of Dired. +* Comparison in Dired:: Running @code{diff} by way of Dired. * Subdirectories in Dired:: Adding subdirectories to the Dired buffer. @ifnottex * Subdir Switches:: Subdirectory switches in Dired. @@ -48,7 +48,7 @@ you to operate on the listed files. @xref{Directories}. * Subdirectory Motion:: Moving across subdirectories, and up and down. * Hiding Subdirectories:: Making subdirectories visible or invisible. * Updating: Dired Updating. Discarding lines for files of no interest. -* Find: Dired and Find. Using `find' to choose the files for Dired. +* Find: Dired and Find. Using @code{find} to choose the files for Dired. * Wdired:: Operating on files by editing the Dired buffer. * Image-Dired:: Viewing image thumbnails in Dired. * Misc: Misc Dired Features. Various other features. 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..152fa73edea 100644 --- a/doc/emacs/emacs.texi +++ b/doc/emacs/emacs.texi @@ -159,11 +159,11 @@ Major Structures of Emacs * Files:: All about handling files. * Buffers:: Multiple buffers; editing several files at once. * Windows:: Viewing multiple pieces of text in one frame. -* Frames:: Using multiple ``windows'' on your display. +* Frames:: Using multiple "windows" on your display. * 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. @@ -273,7 +273,7 @@ Help * Language Help:: Help relating to international language support. * Misc Help:: Other help commands. * Help Files:: Commands to display auxiliary help files. -* Help Echo:: Help on active text and tooltips (`balloon help'). +* Help Echo:: Help on active text and tooltips ("balloon help"). The Mark and the Region @@ -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. @@ -568,7 +568,7 @@ Commands for Human Languages * TeX Mode:: Editing TeX and LaTeX files. * HTML Mode:: Editing HTML and SGML files. * Nroff Mode:: Editing input to the nroff formatter. -* Enriched Text:: Editing text ``enriched'' with fonts, colors, etc. +* Enriched Text:: Editing text "enriched" with fonts, colors, etc. * Text Based Tables:: Commands for editing text-based tables. * Two-Column:: Splitting text columns into separate windows. @@ -882,7 +882,7 @@ Dired, the Directory Editor either one file or several files. * Shell Commands in Dired:: Running a shell command on the marked files. * Transforming File Names:: Using patterns to rename multiple files. -* Comparison in Dired:: Running `diff' by way of Dired. +* Comparison in Dired:: Running @code{diff} by way of Dired. * Subdirectories in Dired:: Adding subdirectories to the Dired buffer. @ifnottex * Subdir Switches:: Subdirectory switches in Dired. @@ -890,7 +890,7 @@ Dired, the Directory Editor * Subdirectory Motion:: Moving across subdirectories, and up and down. * Hiding Subdirectories:: Making subdirectories visible or invisible. * Dired Updating:: Discarding lines for files of no interest. -* Dired and Find:: Using `find' to choose the files for Dired. +* Dired and Find:: Using @code{find} to choose the files for Dired. * Wdired:: Operating on files by editing the Dired buffer. * Image-Dired:: Viewing image thumbnails in Dired. * Misc Dired Features:: Various other features. diff --git a/doc/emacs/emacsver.texi b/doc/emacs/emacsver.texi index d85e6c7fdee..48a0b2256a5 100644 --- a/doc/emacs/emacsver.texi +++ b/doc/emacs/emacsver.texi @@ -1,4 +1,4 @@ @c It would be nicer to generate this using configure and @version@. @c However, that would mean emacsver.texi would always be newer @c then the info files in release tarfiles. -@set EMACSVER 24.0.93 +@set EMACSVER 24.0.94 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/help.texi b/doc/emacs/help.texi index ed08aca5080..05a3e546322 100644 --- a/doc/emacs/help.texi +++ b/doc/emacs/help.texi @@ -71,7 +71,7 @@ meanings for it, but they all support @key{F1} for help.) * Language Help:: Help relating to international language support. * Misc Help:: Other help commands. * Help Files:: Commands to display auxiliary help files. -* Help Echo:: Help on active text and tooltips (`balloon help'). +* Help Echo:: Help on active text and tooltips ("balloon help"). @end menu @iftex diff --git a/doc/emacs/macos.texi b/doc/emacs/macos.texi index fb70a462bd1..10293fe7747 100644 --- a/doc/emacs/macos.texi +++ b/doc/emacs/macos.texi @@ -113,18 +113,6 @@ close the altered one. Useful in this context is the listing of all faces obtained by @kbd{M-x list-faces-display}. -@subsection Open files by dragging to an Emacs window - -The default behavior when a user drags files from another application -into an Emacs frame is to insert the contents of all the dragged files -into the current buffer. To remap the @code{ns-drag-file} event to -open the dragged files in the current frame use the following line: - -@lisp -(define-key global-map [ns-drag-file] 'ns-find-file) -@end lisp - - @subsection Customization options specific to Mac OS / GNUstep The following customization options are specific to the Nextstep port. 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/text.texi b/doc/emacs/text.texi index 5753c256c5d..5363da7d649 100644 --- a/doc/emacs/text.texi +++ b/doc/emacs/text.texi @@ -77,7 +77,7 @@ for editing such pictures. * TeX Mode:: Editing TeX and LaTeX files. * HTML Mode:: Editing HTML and SGML files. * Nroff Mode:: Editing input to the nroff formatter. -* Enriched Text:: Editing text ``enriched'' with fonts, colors, etc. +* Enriched Text:: Editing text "enriched" with fonts, colors, etc. * Text Based Tables:: Commands for editing text-based tables. * Two-Column:: Splitting text columns into separate windows. @end menu 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. |