diff options
| author | Paul Eggert | 2012-07-24 22:48:19 -0700 |
|---|---|---|
| committer | Paul Eggert | 2012-07-24 22:48:19 -0700 |
| commit | 09ae5da1b8bc7e8195a4a252b532ac33e5723f93 (patch) | |
| tree | 22de6cabc07e193045ba4daa99db185b68f5b5a8 /doc/misc | |
| parent | 04e9897cf70e46c703b1412d022511e80314a720 (diff) | |
| download | emacs-09ae5da1b8bc7e8195a4a252b532ac33e5723f93.tar.gz emacs-09ae5da1b8bc7e8195a4a252b532ac33e5723f93.zip | |
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 @@ | |||
| 1 | 2012-07-25 Paul Eggert <eggert@cs.ucla.edu> | ||
| 2 | |||
| 3 | Prefer typical American spelling for "acknowledgment". | ||
| 4 | * calc.texi (History and Acknowledgments): Rename from | ||
| 5 | History and Acknowledgements. | ||
| 6 | * idlwave.texi (Acknowledgments): | ||
| 7 | * ses.texi (Acknowledgments): | ||
| 8 | * woman.texi (Acknowledgments): Rename from Acknowledgements. | ||
| 9 | |||
| 1 | 2012-07-09 Paul Eggert <eggert@cs.ucla.edu> | 10 | 2012-07-09 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 11 | ||
| 3 | Rename configure.in to configure.ac (Bug#11603). | 12 | 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. | |||
| 218 | * Notations Used in This Manual:: | 218 | * Notations Used in This Manual:: |
| 219 | * Demonstration of Calc:: | 219 | * Demonstration of Calc:: |
| 220 | * Using Calc:: | 220 | * Using Calc:: |
| 221 | * History and Acknowledgements:: | 221 | * History and Acknowledgments:: |
| 222 | @end menu | 222 | @end menu |
| 223 | 223 | ||
| 224 | @node What is Calc, About This Manual, Getting Started, Getting Started | 224 | @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 | |||
| 582 | Press @key{DEL} repeatedly to remove any leftover results from the stack. | 582 | Press @key{DEL} repeatedly to remove any leftover results from the stack. |
| 583 | To exit from Calc, press @kbd{q} or @kbd{C-x * c} again. | 583 | To exit from Calc, press @kbd{q} or @kbd{C-x * c} again. |
| 584 | 584 | ||
| 585 | @node Using Calc, History and Acknowledgements, Demonstration of Calc, Getting Started | 585 | @node Using Calc, History and Acknowledgments, Demonstration of Calc, Getting Started |
| 586 | @section Using Calc | 586 | @section Using Calc |
| 587 | 587 | ||
| 588 | @noindent | 588 | @noindent |
| @@ -1148,8 +1148,8 @@ and record them as the current keyboard macro. | |||
| 1148 | its initial state: Empty stack, and initial mode settings. | 1148 | its initial state: Empty stack, and initial mode settings. |
| 1149 | @end table | 1149 | @end table |
| 1150 | 1150 | ||
| 1151 | @node History and Acknowledgements, , Using Calc, Getting Started | 1151 | @node History and Acknowledgments, , Using Calc, Getting Started |
| 1152 | @section History and Acknowledgements | 1152 | @section History and Acknowledgments |
| 1153 | 1153 | ||
| 1154 | @noindent | 1154 | @noindent |
| 1155 | Calc was originally started as a two-week project to occupy a lull | 1155 | 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 | |||
| 27779 | input units. | 27779 | input units. |
| 27780 | 27780 | ||
| 27781 | If you want to disallow using inconsistent units, you can set the customizable variable | 27781 | If you want to disallow using inconsistent units, you can set the customizable variable |
| 27782 | @code{calc-ensure-consistent-units} to @code{t} (@pxref{Customizing Calc}). In this case, | 27782 | @code{calc-ensure-consistent-units} to @code{t} (@pxref{Customizing Calc}). In this case, |
| 27783 | if you request units which are inconsistent with the original units, you will be warned about | 27783 | if you request units which are inconsistent with the original units, you will be warned about |
| 27784 | it and no conversion will occur. | 27784 | it and no conversion will occur. |
| 27785 | 27785 | ||
| @@ -35597,15 +35597,15 @@ of @code{calc-multiplication-has-precedence} is @code{t}. | |||
| 35597 | @end defvar | 35597 | @end defvar |
| 35598 | 35598 | ||
| 35599 | @defvar calc-ensure-consistent-units | 35599 | @defvar calc-ensure-consistent-units |
| 35600 | When converting units, the variable @code{calc-ensure-consistent-units} | 35600 | When converting units, the variable @code{calc-ensure-consistent-units} |
| 35601 | determines whether or not the target units need to be consistent with the | 35601 | determines whether or not the target units need to be consistent with the |
| 35602 | original units. If @code{calc-ensure-consistent-units} is @code{nil}, then | 35602 | original units. If @code{calc-ensure-consistent-units} is @code{nil}, then |
| 35603 | the target units don't need to have the same dimensions as the original units; | 35603 | the target units don't need to have the same dimensions as the original units; |
| 35604 | for example, converting @samp{100 ft/s} to @samp{m} will produce @samp{30.48 m/s}. | 35604 | for example, converting @samp{100 ft/s} to @samp{m} will produce @samp{30.48 m/s}. |
| 35605 | If @code{calc-ensure-consistent-units} is non-@code{nil}, then the target units | 35605 | If @code{calc-ensure-consistent-units} is non-@code{nil}, then the target units |
| 35606 | need to have the same dimensions as the original units; for example, converting | 35606 | need to have the same dimensions as the original units; for example, converting |
| 35607 | @samp{100 ft/s} to @samp{m} will result in an error, since @samp{ft/s} and @samp{m} | 35607 | @samp{100 ft/s} to @samp{m} will result in an error, since @samp{ft/s} and @samp{m} |
| 35608 | have different dimensions. The default value of @code{calc-ensure-consistent-units} | 35608 | have different dimensions. The default value of @code{calc-ensure-consistent-units} |
| 35609 | is @code{nil}. | 35609 | is @code{nil}. |
| 35610 | @end defvar | 35610 | @end defvar |
| 35611 | 35611 | ||
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. | |||
| 71 | * Getting Started:: Tutorial | 71 | * Getting Started:: Tutorial |
| 72 | * The IDLWAVE Major Mode:: The mode for editing IDL programs | 72 | * The IDLWAVE Major Mode:: The mode for editing IDL programs |
| 73 | * The IDLWAVE Shell:: The mode for running IDL as an inferior program | 73 | * The IDLWAVE Shell:: The mode for running IDL as an inferior program |
| 74 | * Acknowledgements:: Who did what | 74 | * Acknowledgments:: Who did what |
| 75 | * Sources of Routine Info:: How does IDLWAVE know about routine XYZ | 75 | * Sources of Routine Info:: How does IDLWAVE know about routine XYZ |
| 76 | * HTML Help Browser Tips:: | 76 | * HTML Help Browser Tips:: |
| 77 | * Configuration Examples:: The user is king | 77 | * Configuration Examples:: The user is king |
| @@ -2361,7 +2361,7 @@ Normal hook. Executed when a buffer is put into @code{idlwave-mode}. | |||
| 2361 | Normal hook. Executed when @file{idlwave.el} is loaded. | 2361 | Normal hook. Executed when @file{idlwave.el} is loaded. |
| 2362 | @end defopt | 2362 | @end defopt |
| 2363 | 2363 | ||
| 2364 | @node The IDLWAVE Shell, Acknowledgements, The IDLWAVE Major Mode, Top | 2364 | @node The IDLWAVE Shell, Acknowledgments, The IDLWAVE Major Mode, Top |
| 2365 | @chapter The IDLWAVE Shell | 2365 | @chapter The IDLWAVE Shell |
| 2366 | @cindex IDLWAVE shell | 2366 | @cindex IDLWAVE shell |
| 2367 | @cindex Major mode, @code{idlwave-shell-mode} | 2367 | @cindex Major mode, @code{idlwave-shell-mode} |
| @@ -3273,9 +3273,9 @@ examine command strings to send, after all instances of @code{___} | |||
| 3273 | (three underscores) are replaced by the indicated expression. | 3273 | (three underscores) are replaced by the indicated expression. |
| 3274 | @end defopt | 3274 | @end defopt |
| 3275 | 3275 | ||
| 3276 | @node Acknowledgements, Sources of Routine Info, The IDLWAVE Shell, Top | 3276 | @node Acknowledgments, Sources of Routine Info, The IDLWAVE Shell, Top |
| 3277 | @chapter Acknowledgements | 3277 | @chapter Acknowledgments |
| 3278 | @cindex Acknowledgements | 3278 | @cindex Acknowledgments |
| 3279 | @cindex Maintainer, of IDLWAVE | 3279 | @cindex Maintainer, of IDLWAVE |
| 3280 | @cindex Authors, of IDLWAVE | 3280 | @cindex Authors, of IDLWAVE |
| 3281 | @cindex Contributors, to IDLWAVE | 3281 | @cindex Contributors, to IDLWAVE |
| @@ -3352,7 +3352,7 @@ scripts and documentation to interface with the IDL Assistant. | |||
| 3352 | @noindent | 3352 | @noindent |
| 3353 | Thanks to everyone! | 3353 | Thanks to everyone! |
| 3354 | 3354 | ||
| 3355 | @node Sources of Routine Info, HTML Help Browser Tips, Acknowledgements, Top | 3355 | @node Sources of Routine Info, HTML Help Browser Tips, Acknowledgments, Top |
| 3356 | @appendix Sources of Routine Info | 3356 | @appendix Sources of Routine Info |
| 3357 | 3357 | ||
| 3358 | @cindex Sources of routine information | 3358 | @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 | |||
| 221 | @cindex nested citations | 221 | @cindex nested citations |
| 222 | @cindex citation | 222 | @cindex citation |
| 223 | 223 | ||
| 224 | A @dfn{citation} is the acknowledgement of the original author of a mail | 224 | A @dfn{citation} is the acknowledgment of the original author of a mail |
| 225 | message in the body of the reply. There are two basic citation styles | 225 | message in the body of the reply. There are two basic citation styles |
| 226 | which Supercite supports. The first, called @dfn{nested citations} is | 226 | which Supercite supports. The first, called @dfn{nested citations} is |
| 227 | an anonymous form of citation; in other words, an indication is made | 227 | 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}. | |||
| 71 | * Advanced Features:: Want to know more? | 71 | * Advanced Features:: Want to know more? |
| 72 | * For Gurus:: Want to know @emph{even more}? | 72 | * For Gurus:: Want to know @emph{even more}? |
| 73 | * Index:: Concept, Function and Variable Index | 73 | * Index:: Concept, Function and Variable Index |
| 74 | * Acknowledgements:: Acknowledgements | 74 | * Acknowledgments:: Acknowledgments |
| 75 | * GNU Free Documentation License:: The license for this documentation. | 75 | * GNU Free Documentation License:: The license for this documentation. |
| 76 | @end menu | 76 | @end menu |
| 77 | 77 | ||
| @@ -927,15 +927,15 @@ cell. | |||
| 927 | @end table | 927 | @end table |
| 928 | 928 | ||
| 929 | @c =================================================================== | 929 | @c =================================================================== |
| 930 | @node Index, Acknowledgements, For Gurus, Top | 930 | @node Index, Acknowledgments, For Gurus, Top |
| 931 | @unnumbered Index | 931 | @unnumbered Index |
| 932 | 932 | ||
| 933 | @printindex cp | 933 | @printindex cp |
| 934 | 934 | ||
| 935 | @c =================================================================== | 935 | @c =================================================================== |
| 936 | 936 | ||
| 937 | @node Acknowledgements, GNU Free Documentation License, Index, Top | 937 | @node Acknowledgments, GNU Free Documentation License, Index, Top |
| 938 | @chapter Acknowledgements | 938 | @chapter Acknowledgments |
| 939 | 939 | ||
| 940 | Coding by: | 940 | Coding by: |
| 941 | @quotation | 941 | @quotation |
| @@ -976,7 +976,7 @@ Jean-Philippe Theberge @email{jphil@@acs.pagesjaunes.fr} | |||
| 976 | 976 | ||
| 977 | @c =================================================================== | 977 | @c =================================================================== |
| 978 | 978 | ||
| 979 | @node GNU Free Documentation License, , Acknowledgements, Top | 979 | @node GNU Free Documentation License, , Acknowledgments, Top |
| 980 | @appendix GNU Free Documentation License | 980 | @appendix GNU Free Documentation License |
| 981 | @include doclicense.texi | 981 | @include doclicense.texi |
| 982 | 982 | ||
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 | |||
| 94 | * Log:: The *WoMan-Log* Buffer | 94 | * Log:: The *WoMan-Log* Buffer |
| 95 | * Technical:: Technical Details | 95 | * Technical:: Technical Details |
| 96 | * Bugs:: Reporting Bugs | 96 | * Bugs:: Reporting Bugs |
| 97 | * Acknowledgements:: Acknowledgements | 97 | * Acknowledgments:: Acknowledgments |
| 98 | * GNU Free Documentation License:: The license for this documentation. | 98 | * GNU Free Documentation License:: The license for this documentation. |
| 99 | * Command Index:: Command Index | 99 | * Command Index:: Command Index |
| 100 | * Variable Index:: Variable Index | 100 | * Variable Index:: Variable Index |
| @@ -1306,7 +1306,7 @@ is output. | |||
| 1306 | 1306 | ||
| 1307 | @c =================================================================== | 1307 | @c =================================================================== |
| 1308 | 1308 | ||
| 1309 | @node Bugs, Acknowledgements, Technical, Top | 1309 | @node Bugs, Acknowledgments, Technical, Top |
| 1310 | @comment node-name, next, previous, up | 1310 | @comment node-name, next, previous, up |
| 1311 | @chapter Reporting Bugs | 1311 | @chapter Reporting Bugs |
| 1312 | @cindex reporting bugs | 1312 | @cindex reporting bugs |
| @@ -1331,10 +1331,10 @@ man source file from, but do not send it unless asked to send it. | |||
| 1331 | 1331 | ||
| 1332 | @c =================================================================== | 1332 | @c =================================================================== |
| 1333 | 1333 | ||
| 1334 | @node Acknowledgements, GNU Free Documentation License, Bugs, Top | 1334 | @node Acknowledgments, GNU Free Documentation License, Bugs, Top |
| 1335 | @comment node-name, next, previous, up | 1335 | @comment node-name, next, previous, up |
| 1336 | @chapter Acknowledgements | 1336 | @chapter Acknowledgments |
| 1337 | @cindex acknowledgements | 1337 | @cindex acknowledgments |
| 1338 | 1338 | ||
| 1339 | For Heather, Kathryn and Madelyn, the women in my life (although they | 1339 | For Heather, Kathryn and Madelyn, the women in my life (although they |
| 1340 | will probably never use it)! | 1340 | will probably never use it)! |
| @@ -1388,7 +1388,7 @@ Eli Zaretskii, @email{eliz@@is.elta.co.il} | |||
| 1388 | @page | 1388 | @page |
| 1389 | 1389 | ||
| 1390 | 1390 | ||
| 1391 | @node GNU Free Documentation License, Command Index, Acknowledgements, Top | 1391 | @node GNU Free Documentation License, Command Index, Acknowledgments, Top |
| 1392 | @appendix GNU Free Documentation License | 1392 | @appendix GNU Free Documentation License |
| 1393 | @include doclicense.texi | 1393 | @include doclicense.texi |
| 1394 | 1394 | ||