diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2012-07-24 22:48:19 -0700 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2012-07-24 22:48:19 -0700 |
commit | 09ae5da1b8bc7e8195a4a252b532ac33e5723f93 (patch) | |
tree | 22de6cabc07e193045ba4daa99db185b68f5b5a8 /doc/misc | |
parent | 04e9897cf70e46c703b1412d022511e80314a720 (diff) | |
download | emacs-09ae5da1b8bc7e8195a4a252b532ac33e5723f93.tar.gz |
Prefer typical American spelling for "acknowledgment".
Diffstat (limited to 'doc/misc')
-rw-r--r-- | doc/misc/ChangeLog | 9 | ||||
-rw-r--r-- | doc/misc/calc.texi | 26 | ||||
-rw-r--r-- | doc/misc/idlwave.texi | 12 | ||||
-rw-r--r-- | doc/misc/sc.texi | 2 | ||||
-rw-r--r-- | doc/misc/ses.texi | 10 | ||||
-rw-r--r-- | doc/misc/woman.texi | 12 |
6 files changed, 40 insertions, 31 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 87a8fcb0e8b..58bce13ba9d 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,12 @@ +2012-07-25 Paul Eggert <eggert@cs.ucla.edu> + + Prefer typical American spelling for "acknowledgment". + * calc.texi (History and Acknowledgments): Rename from + History and Acknowledgements. + * idlwave.texi (Acknowledgments): + * ses.texi (Acknowledgments): + * woman.texi (Acknowledgments): Rename from Acknowledgements. + 2012-07-09 Paul Eggert <eggert@cs.ucla.edu> Rename configure.in to configure.ac (Bug#11603). diff --git a/doc/misc/calc.texi b/doc/misc/calc.texi index 61ca34b8d2f..fe11cedce5d 100644 --- a/doc/misc/calc.texi +++ b/doc/misc/calc.texi @@ -218,7 +218,7 @@ and what are the various ways that it can be used. * Notations Used in This Manual:: * Demonstration of Calc:: * Using Calc:: -* History and Acknowledgements:: +* History and Acknowledgments:: @end menu @node What is Calc, About This Manual, Getting Started, Getting Started @@ -582,7 +582,7 @@ about the @w{@kbd{t N}} command, @kbd{h f sqrt @key{RET}} to read about the Press @key{DEL} repeatedly to remove any leftover results from the stack. To exit from Calc, press @kbd{q} or @kbd{C-x * c} again. -@node Using Calc, History and Acknowledgements, Demonstration of Calc, Getting Started +@node Using Calc, History and Acknowledgments, Demonstration of Calc, Getting Started @section Using Calc @noindent @@ -1148,8 +1148,8 @@ and record them as the current keyboard macro. its initial state: Empty stack, and initial mode settings. @end table -@node History and Acknowledgements, , Using Calc, Getting Started -@section History and Acknowledgements +@node History and Acknowledgments, , Using Calc, Getting Started +@section History and Acknowledgments @noindent Calc was originally started as a two-week project to occupy a lull @@ -27779,7 +27779,7 @@ acres per meter-second.) Remainder units are expressed in terms of input units. If you want to disallow using inconsistent units, you can set the customizable variable -@code{calc-ensure-consistent-units} to @code{t} (@pxref{Customizing Calc}). In this case, +@code{calc-ensure-consistent-units} to @code{t} (@pxref{Customizing Calc}). In this case, if you request units which are inconsistent with the original units, you will be warned about it and no conversion will occur. @@ -35597,15 +35597,15 @@ of @code{calc-multiplication-has-precedence} is @code{t}. @end defvar @defvar calc-ensure-consistent-units -When converting units, the variable @code{calc-ensure-consistent-units} -determines whether or not the target units need to be consistent with the +When converting units, the variable @code{calc-ensure-consistent-units} +determines whether or not the target units need to be consistent with the original units. If @code{calc-ensure-consistent-units} is @code{nil}, then -the target units don't need to have the same dimensions as the original units; -for example, converting @samp{100 ft/s} to @samp{m} will produce @samp{30.48 m/s}. -If @code{calc-ensure-consistent-units} is non-@code{nil}, then the target units -need to have the same dimensions as the original units; for example, converting -@samp{100 ft/s} to @samp{m} will result in an error, since @samp{ft/s} and @samp{m} -have different dimensions. The default value of @code{calc-ensure-consistent-units} +the target units don't need to have the same dimensions as the original units; +for example, converting @samp{100 ft/s} to @samp{m} will produce @samp{30.48 m/s}. +If @code{calc-ensure-consistent-units} is non-@code{nil}, then the target units +need to have the same dimensions as the original units; for example, converting +@samp{100 ft/s} to @samp{m} will result in an error, since @samp{ft/s} and @samp{m} +have different dimensions. The default value of @code{calc-ensure-consistent-units} is @code{nil}. @end defvar diff --git a/doc/misc/idlwave.texi b/doc/misc/idlwave.texi index 736c6ce7f91..030653bbe6d 100644 --- a/doc/misc/idlwave.texi +++ b/doc/misc/idlwave.texi @@ -71,7 +71,7 @@ Interactive Data Language (IDL), and running IDL as an inferior shell. * Getting Started:: Tutorial * The IDLWAVE Major Mode:: The mode for editing IDL programs * The IDLWAVE Shell:: The mode for running IDL as an inferior program -* Acknowledgements:: Who did what +* Acknowledgments:: Who did what * Sources of Routine Info:: How does IDLWAVE know about routine XYZ * HTML Help Browser Tips:: * Configuration Examples:: The user is king @@ -2361,7 +2361,7 @@ Normal hook. Executed when a buffer is put into @code{idlwave-mode}. Normal hook. Executed when @file{idlwave.el} is loaded. @end defopt -@node The IDLWAVE Shell, Acknowledgements, The IDLWAVE Major Mode, Top +@node The IDLWAVE Shell, Acknowledgments, The IDLWAVE Major Mode, Top @chapter The IDLWAVE Shell @cindex IDLWAVE shell @cindex Major mode, @code{idlwave-shell-mode} @@ -3273,9 +3273,9 @@ examine command strings to send, after all instances of @code{___} (three underscores) are replaced by the indicated expression. @end defopt -@node Acknowledgements, Sources of Routine Info, The IDLWAVE Shell, Top -@chapter Acknowledgements -@cindex Acknowledgements +@node Acknowledgments, Sources of Routine Info, The IDLWAVE Shell, Top +@chapter Acknowledgments +@cindex Acknowledgments @cindex Maintainer, of IDLWAVE @cindex Authors, of IDLWAVE @cindex Contributors, to IDLWAVE @@ -3352,7 +3352,7 @@ scripts and documentation to interface with the IDL Assistant. @noindent Thanks to everyone! -@node Sources of Routine Info, HTML Help Browser Tips, Acknowledgements, Top +@node Sources of Routine Info, HTML Help Browser Tips, Acknowledgments, Top @appendix Sources of Routine Info @cindex Sources of routine information diff --git a/doc/misc/sc.texi b/doc/misc/sc.texi index 6be385aeba9..a2fe0f68a74 100644 --- a/doc/misc/sc.texi +++ b/doc/misc/sc.texi @@ -221,7 +221,7 @@ for more details.@refill @cindex nested citations @cindex citation -A @dfn{citation} is the acknowledgement of the original author of a mail +A @dfn{citation} is the acknowledgment of the original author of a mail message in the body of the reply. There are two basic citation styles which Supercite supports. The first, called @dfn{nested citations} is an anonymous form of citation; in other words, an indication is made diff --git a/doc/misc/ses.texi b/doc/misc/ses.texi index 8cd2ee813ec..a70bb9c407e 100644 --- a/doc/misc/ses.texi +++ b/doc/misc/ses.texi @@ -71,7 +71,7 @@ To report bugs, send email to @email{jyavner@@member.fsf.org}. * Advanced Features:: Want to know more? * For Gurus:: Want to know @emph{even more}? * Index:: Concept, Function and Variable Index -* Acknowledgements:: Acknowledgements +* Acknowledgments:: Acknowledgments * GNU Free Documentation License:: The license for this documentation. @end menu @@ -927,15 +927,15 @@ cell. @end table @c =================================================================== -@node Index, Acknowledgements, For Gurus, Top +@node Index, Acknowledgments, For Gurus, Top @unnumbered Index @printindex cp @c =================================================================== -@node Acknowledgements, GNU Free Documentation License, Index, Top -@chapter Acknowledgements +@node Acknowledgments, GNU Free Documentation License, Index, Top +@chapter Acknowledgments Coding by: @quotation @@ -976,7 +976,7 @@ Jean-Philippe Theberge @email{jphil@@acs.pagesjaunes.fr} @c =================================================================== -@node GNU Free Documentation License, , Acknowledgements, Top +@node GNU Free Documentation License, , Acknowledgments, Top @appendix GNU Free Documentation License @include doclicense.texi diff --git a/doc/misc/woman.texi b/doc/misc/woman.texi index b8b15a13c76..7f72b5faafb 100644 --- a/doc/misc/woman.texi +++ b/doc/misc/woman.texi @@ -94,7 +94,7 @@ Mile End Road, London E1 4NS, UK * Log:: The *WoMan-Log* Buffer * Technical:: Technical Details * Bugs:: Reporting Bugs -* Acknowledgements:: Acknowledgements +* Acknowledgments:: Acknowledgments * GNU Free Documentation License:: The license for this documentation. * Command Index:: Command Index * Variable Index:: Variable Index @@ -1306,7 +1306,7 @@ is output. @c =================================================================== -@node Bugs, Acknowledgements, Technical, Top +@node Bugs, Acknowledgments, Technical, Top @comment node-name, next, previous, up @chapter Reporting Bugs @cindex reporting bugs @@ -1331,10 +1331,10 @@ man source file from, but do not send it unless asked to send it. @c =================================================================== -@node Acknowledgements, GNU Free Documentation License, Bugs, Top +@node Acknowledgments, GNU Free Documentation License, Bugs, Top @comment node-name, next, previous, up -@chapter Acknowledgements -@cindex acknowledgements +@chapter Acknowledgments +@cindex acknowledgments For Heather, Kathryn and Madelyn, the women in my life (although they will probably never use it)! @@ -1388,7 +1388,7 @@ Eli Zaretskii, @email{eliz@@is.elta.co.il} @page -@node GNU Free Documentation License, Command Index, Acknowledgements, Top +@node GNU Free Documentation License, Command Index, Acknowledgments, Top @appendix GNU Free Documentation License @include doclicense.texi |