# HG changeset patch # User Karl Berry # Date 1176325072 0 # Node ID 4805684e0b00389071556b902b512ccd69cf0992 # Parent 3cd624b32df12854ff4dc190df65657e9969c155 wording for 8.5x11 diff -r 3cd624b32df1 -r 4805684e0b00 man/ChangeLog --- a/man/ChangeLog Wed Apr 11 20:06:57 2007 +0000 +++ b/man/ChangeLog Wed Apr 11 20:57:52 2007 +0000 @@ -1,3 +1,25 @@ +2007-04-11 Karl Berry + + * gnu.texi (Top), + * macos.texi (Mac Font Specs), + * anti.texi (Antinews), + * xresources.texi (Resources), + * misc.texi (Emulation), + * calendar.texi (Daylight Saving), + * dired.texi (Dired and Find), + * rmail.texi (Remote Mailboxes), + * sending.texi (Mail Headers), + * programs.texi (Which Function), + * files.texi (Recover), + * buffers.texi (Uniquify), + * frames.texi (Wheeled Mice), + * killing.texi (Rectangles): Wording to improve breaks in + 8.5x11 format. + * mule.texi (Language Environments): \hbadness=10000 since there's + no way to reword. + * emacs.texi (smallbook): new @set to more easily switch between + smallbook and 8.5x11. + 2007-04-11 Richard Stallman * files.texi (File Conveniences): Add xref to Tumme. diff -r 3cd624b32df1 -r 4805684e0b00 man/anti.texi --- a/man/anti.texi Wed Apr 11 20:06:57 2007 +0000 +++ b/man/anti.texi Wed Apr 11 20:57:52 2007 +0000 @@ -53,9 +53,9 @@ been removed. @item -The command line options @samp{--color}, @samp{--fullwidth}, -@samp{--fullheight}, @samp{--fullscreen}, @samp{--no-blinking-cursor}, -@samp{--no-desktop}, and @samp{-Q} have also been removed. +These command line options have also been removed: @samp{--color}, +@samp{--fullwidth}, @samp{--fullheight}, @samp{--fullscreen}, +@samp{--no-blinking-cursor}, @samp{--no-desktop}, and @samp{-Q}. @item The @samp{--geometry} option applies only to the initial frame, and diff -r 3cd624b32df1 -r 4805684e0b00 man/buffers.texi --- a/man/buffers.texi Wed Apr 11 20:06:57 2007 +0000 +++ b/man/buffers.texi Wed Apr 11 20:57:52 2007 +0000 @@ -573,14 +573,14 @@ buffer name. To select one, customize the variable @code{uniquify-buffer-name-style} (@pxref{Easy Customization}). - For instance, the @code{forward} naming method puts part of the -directory name at the beginning of the buffer name; using this method, -buffers visiting @file{/u/rms/tmp/Makefile} and + To begin with, the @code{forward} naming method includes part of the +file's directory name at the beginning of the buffer name; using this +method, buffers visiting the files @file{/u/rms/tmp/Makefile} and @file{/usr/projects/zaphod/Makefile} would be named @samp{tmp/Makefile} and @samp{zaphod/Makefile}, respectively (instead of @samp{Makefile} and @samp{Makefile<2>}). - By contrast, the @code{post-forward} naming method would call the + In contrast, the @code{post-forward} naming method would call the buffers @samp{Makefile|tmp} and @samp{Makefile|zaphod}, and the @code{reverse} naming method would call them @samp{Makefile\tmp} and @samp{Makefile\zaphod}. The nontrivial difference between diff -r 3cd624b32df1 -r 4805684e0b00 man/calendar.texi --- a/man/calendar.texi Wed Apr 11 20:06:57 2007 +0000 +++ b/man/calendar.texi Wed Apr 11 20:57:52 2007 +0000 @@ -1614,11 +1614,12 @@ @c @vindex calendar-daylight-savings-starts-time too long! @vindex calendar-daylight-savings-ends-time - The two variables @code{calendar-daylight-savings-starts-time} and -@code{calendar-daylight-savings-ends-time} specify the number of minutes -after midnight local time when the transition to and from daylight -saving time should occur. For Cambridge, Massachusetts both variables' -values are 120. + Finally, the two variables +@code{calendar-daylight-savings-starts-time} and +@code{calendar-daylight-savings-ends-time} specify the number of +minutes after midnight local time when the transition to and from +daylight saving time should occur. For Cambridge, Massachusetts both +variables' values are 120. @node Time Intervals @section Summing Time Intervals diff -r 3cd624b32df1 -r 4805684e0b00 man/dired.texi --- a/man/dired.texi Wed Apr 11 20:06:57 2007 +0000 +++ b/man/dired.texi Wed Apr 11 20:57:52 2007 +0000 @@ -1132,9 +1132,9 @@ @findex locate-with-filter @cindex file database (locate) @vindex locate-command - @kbd{M-x locate} provides a similar interface to the @code{locate} -program. @kbd{M-x locate-with-filter} is similar, but keeps only files -whose names match a given regular expression. + The command @kbd{M-x locate} provides a similar interface to the +@code{locate} program. @kbd{M-x locate-with-filter} is similar, but +keeps only files whose names match a given regular expression. These buffers don't work entirely like ordinary Dired buffers: file operations work, but do not always automatically update the buffer. diff -r 3cd624b32df1 -r 4805684e0b00 man/emacs.texi --- a/man/emacs.texi Wed Apr 11 20:06:57 2007 +0000 +++ b/man/emacs.texi Wed Apr 11 20:57:52 2007 +0000 @@ -39,15 +39,20 @@ @c in general, keep the following line commented out, unless doing a @c copy of this manual that will be published. the manual should go @c onto the distribution in the full, 8.5 x 11" size. +@set smallbook +@ifset smallbook @smallbook +@end ifset @c per rms and peterb, use 10pt fonts for the main text, mostly to @c save on paper cost. Also do not declare @setchapternewpage odd. @c Do this inside @tex for now, so current makeinfo does not complain. @tex +@ifset smallbook @fonttextsize 10 -\global\hbadness=6000 % don't worry about not-too-underfull boxes +@end ifset +\global\hbadness=6666 % don't worry about not-too-underfull boxes @end tex @defcodeindex op diff -r 3cd624b32df1 -r 4805684e0b00 man/files.texi --- a/man/files.texi Wed Apr 11 20:06:57 2007 +0000 +++ b/man/files.texi Wed Apr 11 20:57:52 2007 +0000 @@ -1153,13 +1153,14 @@ this---saving them---updates the files themselves. @vindex auto-save-list-file-prefix - Emacs records interrupted sessions for later recovery in files named + Emacs records information about interrupted sessions for later +recovery in files named @file{~/.emacs.d/auto-save-list/.saves-@var{pid}-@var{hostname}}. All -of this name except @file{@var{pid}-@var{hostname}} comes from the -value of @code{auto-save-list-file-prefix}. You can record sessions -in a different place by customizing that variable. If you set -@code{auto-save-list-file-prefix} to @code{nil} in your @file{.emacs} -file, sessions are not recorded for recovery. +of this name except the @file{@var{pid}-@var{hostname}} part comes +from the value of @code{auto-save-list-file-prefix}. You can record +sessions in a different place by customizing that variable. If you +set @code{auto-save-list-file-prefix} to @code{nil} in your +@file{.emacs} file, sessions are not recorded for recovery. @node File Aliases @section File Name Aliases diff -r 3cd624b32df1 -r 4805684e0b00 man/frames.texi --- a/man/frames.texi Wed Apr 11 20:06:57 2007 +0000 +++ b/man/frames.texi Wed Apr 11 20:57:52 2007 +0000 @@ -874,7 +874,7 @@ @vindex mouse-wheel-follow-mouse @vindex mouse-wheel-scroll-amount @vindex mouse-wheel-progressive-speed - The variables @code{mouse-wheel-follow-mouse} and + The two variables @code{mouse-wheel-follow-mouse} and @code{mouse-wheel-scroll-amount} determine where and by how much buffers are scrolled. The variable @code{mouse-wheel-progressive-speed} determines whether the scroll diff -r 3cd624b32df1 -r 4805684e0b00 man/gnu.texi --- a/man/gnu.texi Wed Apr 11 20:06:57 2007 +0000 +++ b/man/gnu.texi Wed Apr 11 20:57:52 2007 +0000 @@ -41,10 +41,9 @@ that different wording could help avoid. Footnotes added in 1993 help clarify these points. -For up-to-date information about the available GNU software, please -see @uref{http://www.gnu.org}. For software tasks to work on, see -@uref{http://savannah.gnu.org/projects/tasklist}. For other ways to -contribute, see @uref{http://www.gnu.org/help}. +For up-to-date information about available GNU software, please see +our web site, @uref{http://www.gnu.org}. For software tasks and other +ways to contribute, see @uref{http://www.gnu.org/help}. @end quotation @unnumberedsec What's GNU? Gnu's Not Unix! @@ -503,10 +502,11 @@ employ programmers. People with new ideas could distribute programs as -freeware@footnote{Subsequently we have learned to distinguish between -"free software" and "freeware". The term "freeware" means software -you are free to redistribute, but usually you are not free to study -and change the source code, so most of it is not free software. See +freeware@footnote{Subsequently we have discovered the need to +distinguish between ``free software'' and ``freeware''. The term +``freeware'' means software you are free to redistribute, but usually +you are not free to study and change the source code, so most of it is +not free software. See @uref{http://www.gnu.org/philosophy/words-to-avoid.html} for more explanation.}, asking for donations from satisfied users, or selling hand-holding services. I have met people who are already working this diff -r 3cd624b32df1 -r 4805684e0b00 man/killing.texi --- a/man/killing.texi Wed Apr 11 20:06:57 2007 +0000 +++ b/man/killing.texi Wed Apr 11 20:57:52 2007 +0000 @@ -551,13 +551,13 @@ (@code{open-rectangle}). This pushes the previous contents of the region-rectangle rightward. @item C-x r c -Clear the region-rectangle by replacing its contents with spaces +Clear the region-rectangle by replacing all of its contents with spaces (@code{clear-rectangle}). @item M-x delete-whitespace-rectangle Delete whitespace in each of the lines on the specified rectangle, starting from the left edge column of the rectangle. @item C-x r t @var{string} @key{RET} -Replace rectangle contents with @var{string} on each line. +Replace rectangle contents with @var{string} on each line (@code{string-rectangle}). @item M-x string-insert-rectangle @key{RET} @var{string} @key{RET} Insert @var{string} on each line of the rectangle. diff -r 3cd624b32df1 -r 4805684e0b00 man/macos.texi --- a/man/macos.texi Wed Apr 11 20:06:57 2007 +0000 +++ b/man/macos.texi Wed Apr 11 20:57:52 2007 +0000 @@ -319,8 +319,9 @@ -apple-monaco-medium-r-normal--12-*-*-*-*-*-iso10646-1 @end example -Note that it must be specified in a format containing 14 @samp{-}s -(e.g., not by @samp{-apple-monaco-medium-r-normal--12-*-iso10646-1}), +Note that these names must be specified using a format containing all +14 @samp{-}s (not by +@samp{-apple-monaco-medium-r-normal--12-*-iso10646-1}, for instance), because every @acronym{ATSUI}-compatible font is a scalable one. QuickDraw Text fonts have maker name @code{apple} and various charset @@ -340,7 +341,7 @@ Native Apple Traditional Chinese, Simplified Chinese, Japanese, Korean, Central European, Cyrillic, Symbol, and Dingbats fonts have -charsets @samp{big5-0}, @samp{gb2312.1980-0}, +the charsets @samp{big5-0}, @samp{gb2312.1980-0}, @samp{jisx0208.1983-sjis} and @samp{jisx0201.1976-0}, @samp{ksc5601.1989-0}, @samp{mac-centraleurroman}, @samp{mac-cyrillic}, @samp{mac-symbol}, and @samp{mac-dingbats}, diff -r 3cd624b32df1 -r 4805684e0b00 man/misc.texi --- a/man/misc.texi Wed Apr 11 20:06:57 2007 +0000 +++ b/man/misc.texi Wed Apr 11 20:57:52 2007 +0000 @@ -2177,8 +2177,9 @@ @item EDT (DEC VMS editor) @findex edt-emulation-on @findex edt-emulation-off -Turn on EDT emulation with @kbd{M-x edt-emulation-on}. @kbd{M-x -edt-emulation-off} restores normal Emacs command bindings. +Turn on EDT emulation with the command @kbd{M-x edt-emulation-on}, +while @kbd{M-x edt-emulation-off} restores normal Emacs command +bindings. Most of the EDT emulation commands are keypad keys, and most standard Emacs key bindings are still available. The EDT emulation rebindings diff -r 3cd624b32df1 -r 4805684e0b00 man/mule.texi --- a/man/mule.texi Wed Apr 11 20:06:57 2007 +0000 +++ b/man/mule.texi Wed Apr 11 20:57:52 2007 +0000 @@ -261,6 +261,9 @@ characters and files encoded in UTF-8), Ukrainian, Vietnamese, Welsh, and Windows-1255 (for a setup which prefers Cyrillic characters and files encoded in Windows-1255). +@tex +\hbadness=10000\par % just avoid underfull hbox warning +@end tex @end quotation @cindex fonts for various scripts diff -r 3cd624b32df1 -r 4805684e0b00 man/programs.texi --- a/man/programs.texi Wed Apr 11 20:06:57 2007 +0000 +++ b/man/programs.texi Wed Apr 11 20:57:52 2007 +0000 @@ -338,13 +338,13 @@ @findex which-function-mode @vindex which-func-modes - To enable (or disable) Which Function mode, use the command @kbd{M-x -which-function-mode}. This command is global; it applies to all -buffers, both existing ones and those yet to be created. However, it -takes effect only in certain major modes, those listed in the value of -@code{which-func-modes}. If the value is @code{t}, then Which Function -mode applies to all major modes that know how to support it---in other -words, all the major modes that support Imenu. + To either enable or disable Which Function mode, use the command +@kbd{M-x which-function-mode}. This command is global; it applies to +all buffers, both existing ones and those yet to be created. However, +it takes effect only in certain major modes, those listed in the value +of @code{which-func-modes}. If the value is @code{t}, then Which +Function mode applies to all major modes that know how to support +it---in other words, all the major modes that support Imenu. @node Program Indent @section Indentation for Programs diff -r 3cd624b32df1 -r 4805684e0b00 man/rmail.texi --- a/man/rmail.texi Wed Apr 11 20:06:57 2007 +0000 +++ b/man/rmail.texi Wed Apr 11 20:57:52 2007 +0000 @@ -1382,9 +1382,10 @@ Otherwise, Rmail assumes no password is required. @end enumerate - For compatibility with previous versions, @code{rmail-pop-password} -and @code{rmail-pop-password-required} may be used instead of -@code{rmail-remote-password} and @code{rmail-remote-password-required}. + For compatibility with previous versions, the variables +@code{rmail-pop-password} and @code{rmail-pop-password-required} may +be used instead of @code{rmail-remote-password} and +@code{rmail-remote-password-required}. @vindex rmail-movemail-flags If you need to pass additional command-line flags to @code{movemail}, diff -r 3cd624b32df1 -r 4805684e0b00 man/sending.texi --- a/man/sending.texi Wed Apr 11 20:06:57 2007 +0000 +++ b/man/sending.texi Wed Apr 11 20:57:52 2007 +0000 @@ -240,11 +240,11 @@ @item nil Use just the email address, as in @samp{king@@grassland.com}. @item parens -Use both email address and full name, as in @samp{king@@grassland.com (Elvis -Parsley)}. +Use both email address and full name, as in:@* +@samp{king@@grassland.com (Elvis Parsley)}. @item angles -Use both email address and full name, as in @samp{Elvis Parsley -}. +Use both email address and full name, as in:@* +@samp{Elvis Parsley }. @item system-default Allow the system to insert the @samp{From} field. @end table diff -r 3cd624b32df1 -r 4805684e0b00 man/xresources.texi --- a/man/xresources.texi Wed Apr 11 20:06:57 2007 +0000 +++ b/man/xresources.texi Wed Apr 11 20:57:52 2007 +0000 @@ -58,14 +58,15 @@ (optionally even for all programs). @cindex Registry (MS-Windows) - MS-Windows systems don't support @file{~/.Xdefaults} files, but -Emacs compiled for Windows looks for X resources in the Windows -Registry, under the key @samp{HKEY_CURRENT_USER\SOFTWARE\GNU\Emacs} -and then under the key @samp{HKEY_LOCAL_MACHINE\SOFTWARE\GNU\Emacs}. -The menu and scroll bars are native widgets on MS-Windows, so they are -only customizable via the system-wide settings in the Display Control -Panel. You can also set resources using the @samp{-xrm} command line -option (see below.) + MS-Windows systems do not support @file{~/.Xdefaults} files, so +instead Emacs compiled for Windows looks for X resources in the +Windows Registry, first under the key +@samp{HKEY_CURRENT_USER\SOFTWARE\GNU\Emacs} and then under the key +@samp{HKEY_LOCAL_MACHINE\SOFTWARE\GNU\Emacs}. The menu and scroll +bars are native widgets on MS-Windows, so they are only customizable +via the system-wide settings in the Display Control Panel. You can +also set resources using the @samp{-xrm} command line option (see +below.) @iftex Applications such as Emacs look for resources with specific names