From 9eb25ee858d889a0fb45b4b10fbacb6002aae7ee Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sat, 28 Apr 2012 00:45:03 -0700 Subject: [PATCH] Reword some doc/emacs to remove/reduce some overly long/short lines. * xresources.texi (Resources): * mule.texi (Language Environments): * misc.texi (Amusements): * maintaining.texi (VC Change Log): * frames.texi (Fonts): * custom.texi (Specifying File Variables, Minibuffer Maps): * cmdargs.texi (Initial Options): * building.texi (Flymake): Reword to remove/reduce some overly long/short lines. --- doc/emacs/ChangeLog | 12 ++++++++++++ doc/emacs/building.texi | 10 +++++----- doc/emacs/cmdargs.texi | 2 +- doc/emacs/custom.texi | 8 ++++---- doc/emacs/frames.texi | 4 ++-- doc/emacs/maintaining.texi | 2 +- doc/emacs/misc.texi | 4 ++-- doc/emacs/mule.texi | 2 +- doc/emacs/xresources.texi | 2 +- 9 files changed, 29 insertions(+), 17 deletions(-) diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 32a5e43b41b..91f50958920 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,3 +1,15 @@ +2012-04-28 Glenn Morris + + * xresources.texi (Resources): + * mule.texi (Language Environments): + * misc.texi (Amusements): + * maintaining.texi (VC Change Log): + * frames.texi (Fonts): + * custom.texi (Specifying File Variables, Minibuffer Maps): + * cmdargs.texi (Initial Options): + * building.texi (Flymake): + Reword to remove/reduce some overly long/short lines. + 2012-04-27 Glenn Morris * emacs.texi: Some fixes for detailed menu. diff --git a/doc/emacs/building.texi b/doc/emacs/building.texi index 4b92376b8a9..999afa7df2c 100644 --- a/doc/emacs/building.texi +++ b/doc/emacs/building.texi @@ -426,11 +426,11 @@ syntax checking tool used depends on the language; for example, for C/C++ files this is usually the C compiler. Flymake can also use build tools such as @code{make} for checking complicated projects. - To enable Flymake mode, type @kbd{M-x flymake-mode}. You can go to -the errors found by Flymake mode with @kbd{M-x -flymake-goto-next-error} and @kbd{M-x flymake-goto-prev-error}. To -display any error messages associated with the current line, use -@kbd{M-x flymake-display-err-menu-for-current-line}. + To enable Flymake mode, type @kbd{M-x flymake-mode}. You can jump to +the errors that it finds by using @kbd{M-x +flymake-goto-next-error} and @kbd{M-x flymake-goto-prev-error}. +Use the command @kbd{M-x flymake-display-err-menu-for-current-line} +to display any error messages associated with the current line. For more details about using Flymake, @ifnottex diff --git a/doc/emacs/cmdargs.texi b/doc/emacs/cmdargs.texi index 222aa0f8434..c387b99915f 100644 --- a/doc/emacs/cmdargs.texi +++ b/doc/emacs/cmdargs.texi @@ -308,7 +308,7 @@ in your initialization file (@pxref{Entering Emacs}). @opindex -Q @itemx --quick @opindex --quick -Start emacs with minimum customizations, similar to using @samp{-q}, +Start emacs with minimum customizations. This is similar to using @samp{-q}, @samp{--no-site-file}, @samp{--no-site-lisp}, and @samp{--no-splash} together. This also stops Emacs from processing X resources by setting @code{inhibit-x-resources} to @code{t} (@pxref{Resources}). diff --git a/doc/emacs/custom.texi b/doc/emacs/custom.texi index cfd45de6aca..bf2602f8f08 100644 --- a/doc/emacs/custom.texi +++ b/doc/emacs/custom.texi @@ -1054,8 +1054,8 @@ pair with a colon and semicolon. The special variable/value pair @findex add-file-local-variable-prop-line @findex delete-file-local-variable-prop-line @findex copy-dir-locals-to-file-locals-prop-line - Instead of adding variable/value pairs by hand, you can use the -command @kbd{M-x add-file-local-variable-prop-line}. This prompts for + You can use the command @kbd{M-x add-file-local-variable-prop-line} +instead of adding entries by hand. It prompts for a variable and value, and adds them to the first line in the appropriate way. @kbd{M-x delete-file-local-variable-prop-line} prompts for a variable, and deletes its entry from the line. @kbd{M-x @@ -1522,7 +1522,7 @@ circumstances. @vindex minibuffer-local-completion-map @vindex minibuffer-local-must-match-map @vindex minibuffer-local-filename-completion-map -@vindex minibuffer-local-must-match-filename-map +@vindex minibuffer-local-filename-must-match-map The minibuffer has its own set of local keymaps; they contain various completion and exit commands. @@ -1539,7 +1539,7 @@ just like @key{RET}. for cautious completion. @item @code{minibuffer-local-filename-completion-map} and -@code{minibuffer-local-must-match-filename-map} are like the two +@code{minibuffer-local-filename-must-match-map} are like the two previous ones, but they are specifically for file name completion. They do not bind @key{SPC}. @end itemize diff --git a/doc/emacs/frames.texi b/doc/emacs/frames.texi index 9e9909e8bca..7b912ec9722 100644 --- a/doc/emacs/frames.texi +++ b/doc/emacs/frames.texi @@ -666,8 +666,8 @@ The font slant---normally @samp{r} (roman), @samp{i} (italic), Some font names support other values. @item widthtype The font width---normally @samp{normal}, @samp{condensed}, -@samp{extended}, or @samp{semicondensed} (some font names support -other values). +@samp{semicondensed}, or @samp{extended}. Some font names support +other values. @item style An optional additional style name. Usually it is empty---most XLFDs have two hyphens in a row at this point. diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi index 9d56b3bdc6e..72583f25c8b 100644 --- a/doc/emacs/maintaining.texi +++ b/doc/emacs/maintaining.texi @@ -893,7 +893,7 @@ Display the change history for the current repository (@code{vc-print-root-log}). @item C-x v I -Display the changes that will be received with a pull operation +Display the changes that a pull operation will retrieve (@code{vc-log-incoming}). @item C-x v O diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi index b91763116b8..ecbcda1ce8a 100644 --- a/doc/emacs/misc.texi +++ b/doc/emacs/misc.texi @@ -2481,8 +2481,8 @@ find the one you select (@code{ffap-menu}). @findex animate-birthday-present @cindex animate - The @code{animate} package makes text dance. For an example, try -@kbd{M-x animate-birthday-present}. + The @code{animate} package makes text dance (e.g. try +@kbd{M-x animate-birthday-present}). @findex blackbox @findex mpuz diff --git a/doc/emacs/mule.texi b/doc/emacs/mule.texi index 9c1d908f882..cffcb7573ff 100644 --- a/doc/emacs/mule.texi +++ b/doc/emacs/mule.texi @@ -350,7 +350,7 @@ to the Emacs session. The supported language environments @cindex Euro sign @cindex UTF-8 @quotation -ASCII, Belarusian, Bengali, Brazilian Portuguese, Bulgarian, +ASCII, Belarusian, Bengali, Brazilian Portuguese, Bulgarian, Cham, Chinese-BIG5, Chinese-CNS, Chinese-EUC-TW, Chinese-GB, Chinese-GBK, Chinese-GB18030, Croatian, Cyrillic-ALT, Cyrillic-ISO, Cyrillic-KOI8, Czech, Devanagari, Dutch, English, Esperanto, Ethiopic, French, diff --git a/doc/emacs/xresources.texi b/doc/emacs/xresources.texi index 66281d6dbbb..b99c98d84e0 100644 --- a/doc/emacs/xresources.texi +++ b/doc/emacs/xresources.texi @@ -47,7 +47,7 @@ its own list of resources; to update it, use the command @command{xrdb}---for instance, @samp{xrdb ~/.Xdefaults}. @cindex registry, setting resources (MS-Windows) - (MS-Windows systems do not support X resource files; on Windows, + (MS-Windows systems do not support X resource files; on such systems, Emacs looks for X resources in the Windows Registry, first under the key @samp{HKEY_CURRENT_USER\SOFTWARE\GNU\Emacs}, which affects only the current user and override the system-wide settings, and then under -- 2.39.5