Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
09ae5da1
Commit
09ae5da1
authored
Jul 24, 2012
by
Paul Eggert
Browse files
Prefer typical American spelling for "acknowledgment".
parent
04e9897c
Changes
34
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
65 additions
and
46 deletions
+65
-46
admin/notes/bugtracker
admin/notes/bugtracker
+1
-1
doc/lispref/ChangeLog
doc/lispref/ChangeLog
+5
-0
doc/lispref/elisp.texi
doc/lispref/elisp.texi
+1
-1
doc/lispref/intro.texi
doc/lispref/intro.texi
+3
-3
doc/lispref/spellfile
doc/lispref/spellfile
+0
-1
doc/man/emacs.1
doc/man/emacs.1
+1
-1
doc/misc/ChangeLog
doc/misc/ChangeLog
+9
-0
doc/misc/calc.texi
doc/misc/calc.texi
+13
-13
doc/misc/idlwave.texi
doc/misc/idlwave.texi
+6
-6
doc/misc/sc.texi
doc/misc/sc.texi
+1
-1
doc/misc/ses.texi
doc/misc/ses.texi
+5
-5
doc/misc/woman.texi
doc/misc/woman.texi
+6
-6
leim/SKK-DIC/SKK-JISYO.L
leim/SKK-DIC/SKK-JISYO.L
+1
-1
leim/ja-dic/ja-dic.el
leim/ja-dic/ja-dic.el
+1
-1
lisp/ChangeLog
lisp/ChangeLog
+6
-0
lisp/completion.el
lisp/completion.el
+1
-1
lisp/emulation/cua-rect.el
lisp/emulation/cua-rect.el
+1
-1
lisp/emulation/viper.el
lisp/emulation/viper.el
+2
-2
lisp/hippie-exp.el
lisp/hippie-exp.el
+1
-1
lisp/ido.el
lisp/ido.el
+1
-1
No files found.
admin/notes/bugtracker
View file @
09ae5da1
...
...
@@ -125,7 +125,7 @@ Resent-CC: maintainer email address, plus any X-Debbugs-CC: entries
The "maintainer email address" is "bug-gnu-emacs@gnu.org" in most cases.
** To not get acknowledg
e
ment mail from the tracker,
** To not get acknowledgment mail from the tracker,
add an "X-Debbugs-No-Ack:" header (with any value). If you use Gnus,
you can add an element to gnus-posting-styles to do this automatically, eg:
...
...
doc/lispref/ChangeLog
View file @
09ae5da1
2012-07-25 Paul Eggert <eggert@cs.ucla.edu>
Prefer typical American spelling for "acknowledgment".
* intro.texi (Acknowledgments): Rename from Acknowledgements.
2012-07-21 Eli Zaretskii <eliz@gnu.org>
* commands.texi (Special Events): Mention language-change event.
...
...
doc/lispref/elisp.texi
View file @
09ae5da1
...
...
@@ -254,7 +254,7 @@ Introduction
* Lisp History:: Emacs Lisp is descended from Maclisp.
* Conventions:: How the manual is formatted.
* Version Info:: Which Emacs version is running?
* Acknowledg
e
ments:: The authors, editors, and sponsors of this manual.
* Acknowledgments::
The authors, editors, and sponsors of this manual.
Conventions
...
...
doc/lispref/intro.texi
View file @
09ae5da1
...
...
@@ -44,7 +44,7 @@ corresponding to Emacs version @value{EMACSVER}.
* Lisp History:: Emacs Lisp is descended from Maclisp.
* Conventions:: How the manual is formatted.
* Version Info:: Which Emacs version is running?
* Acknowledg
e
ments:: The authors, editors, and sponsors of this manual.
* Acknowledgments::
The authors, editors, and sponsors of this manual.
@end menu
@node Caveats
...
...
@@ -523,8 +523,8 @@ The minor version number of Emacs, as an integer. For Emacs version
23.1, the value is 1.
@end defvar
@node Acknowledg
e
ments
@section Acknowledg
e
ments
@node Acknowledgments
@section Acknowledgments
This manual was originally written by Robert Krawitz, Bil Lewis, Dan
LaLiberte, Richard@tie{}M. Stallman and Chris Welty, the volunteers of
...
...
doc/lispref/spellfile
View file @
09ae5da1
ARPA
Abbrev
Acknowledgements
Alan
Arnold
Autoloading
...
...
doc/man/emacs.1
View file @
09ae5da1
...
...
@@ -634,7 +634,7 @@ Everyone will be free to use, copy, study and change the GNU system.
.SH AUTHORS
.I Emacs
was written by Richard Stallman and the Free Software Foundation.
For detailed credits and acknowledg
e
ments, see the GNU Emacs manual.
For detailed credits and acknowledgments, see the GNU Emacs manual.
.
.
.
...
...
doc/misc/ChangeLog
View file @
09ae5da1
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).
...
...
doc/misc/calc.texi
View file @
09ae5da1
...
...
@@ -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 Acknowledg
e
ments::
* 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 Acknowledg
e
ments, 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 Acknowledg
e
ments, , Using Calc, Getting Started
@section History and Acknowledg
e
ments
@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
doc/misc/idlwave.texi
View file @
09ae5da1
...
...
@@ -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
* Acknowledg
e
ments:: 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, Acknowledg
e
ments, 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 Acknowledg
e
ments, Sources of Routine Info, The IDLWAVE Shell, Top
@chapter Acknowledg
e
ments
@cindex Acknowledg
e
ments
@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, Acknowledg
e
ments, Top
@node Sources of Routine Info, HTML Help Browser Tips, Acknowledgments, Top
@appendix Sources of Routine Info
@cindex Sources of routine information
...
...
doc/misc/sc.texi
View file @
09ae5da1
...
...
@@ -221,7 +221,7 @@ for more details.@refill
@cindex nested citations
@cindex citation
A @dfn
{
citation
}
is the acknowledg
e
ment 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
...
...
doc/misc/ses.texi
View file @
09ae5da1
...
...
@@ -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
* Acknowledg
e
ments:: Acknowledg
e
ments
* Acknowledgments::
Acknowledgments
* GNU Free Documentation License:: The license for this documentation.
@end menu
...
...
@@ -927,15 +927,15 @@ cell.
@end table
@c ===================================================================
@node Index, Acknowledg
e
ments, For Gurus, Top
@node Index, Acknowledgments, For Gurus, Top
@unnumbered Index
@printindex cp
@c ===================================================================
@node Acknowledg
e
ments, GNU Free Documentation License, Index, Top
@chapter Acknowledg
e
ments
@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, , Acknowledg
e
ments, Top
@node GNU Free Documentation License, , Acknowledgments, Top
@appendix GNU Free Documentation License
@include doclicense.texi
...
...
doc/misc/woman.texi
View file @
09ae5da1
...
...
@@ -94,7 +94,7 @@ Mile End Road, London E1 4NS, UK
* Log:: The *WoMan-Log* Buffer
* Technical:: Technical Details
* Bugs:: Reporting Bugs
* Acknowledg
e
ments:: Acknowledg
e
ments
* 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, Acknowledg
e
ments, 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 Acknowledg
e
ments, GNU Free Documentation License, Bugs, Top
@node Acknowledgments, GNU Free Documentation License, Bugs, Top
@comment node
-
name, next, previous, up
@chapter Acknowledg
e
ments
@cindex acknowledg
e
ments
@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, Acknowledg
e
ments, Top
@node GNU Free Documentation License, Command Index, Acknowledgments, Top
@appendix GNU Free Documentation License
@include doclicense.texi
...
...
leim/SKK-DIC/SKK-JISYO.L
View file @
09ae5da1
...
...
@@ -34,7 +34,7 @@
;; the Free Software Foundation Inc., 59 Temple Place - Suite 330,
;; Boston, MA 02111-1307, USA.
;;
;; ACKNOWLEDG
E
MENT
;; ACKNOWLEDGMENT
;;
;; この辞書は、SKK 原作者の佐藤雅彦先生が、第 1 版作成のために東北大学
;; 電気通信研究所佐藤研究室 (当時) の学生さん達とともに scratch から作
leim/ja-dic/ja-dic.el
View file @
09ae5da1
...
...
@@ -47,7 +47,7 @@
;; the Free Software Foundation Inc., 59 Temple Place - Suite 330,
;; Boston, MA 02111-1307, USA.
;;
;; ACKNOWLEDG
E
MENT
;; ACKNOWLEDGMENT
;;
;; この辞書は、SKK 原作者の佐藤雅彦先生が、第 1 版作成のために東北大学
;; 電気通信研究所佐藤研究室 (当時) の学生さん達とともに scratch から作
lisp/ChangeLog
View file @
09ae5da1
2012-07-25 Paul Eggert <eggert@cs.ucla.edu>
Prefer typical American spelling for "acknowledgment".
* vc/add-log.el (change-log-acknowledgment): Rename from
change-log-acknowledgement, with an alias for the old name.
2012-07-25 Jay Belanger <jay.p.belanger@gmail.com>
* calc-alg.el (math-simplify-divide): Don't cross multiply
...
...
lisp/completion.el
View file @
09ae5da1
...
...
@@ -228,7 +228,7 @@
;; superior to that of the LISPM version.
;;
;;-----------------------------------------------
;; Acknowledg
e
ments
;; Acknowledgments
;;-----------------------------------------------
;; Cliff Lasser (cal@think.com), Kevin Herbert (kph@cisco.com),
;; eero@media-lab, kgk@cs.brown.edu, jla@ai.mit.edu,
...
...
lisp/emulation/cua-rect.el
View file @
09ae5da1
...
...
@@ -21,7 +21,7 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
;;; Acknowledg
e
ments
;;; Acknowledgments
;; The rectangle handling and display code borrows from the standard
;; GNU emacs rect.el package and the rect-mark.el package by Rick
...
...
lisp/emulation/viper.el
View file @
09ae5da1
...
...
@@ -103,8 +103,8 @@
;; (require 'viper)
;;
;;; Acknowledg
e
ments:
;; ----------------
-
;;; Acknowledgments:
;; ----------------
;; Bug reports and ideas contributed by many users have helped
;; improve Viper and the various versions of VIP.
;; See the on-line manual for a complete list of contributors.
...
...
lisp/hippie-exp.el
View file @
09ae5da1
...
...
@@ -156,7 +156,7 @@
;; opposite situation to occur, that `hippie-expand' misses some
;; suggestion because it thinks it has already tried it.
;;
;; Acknowledg
e
ment
;; Acknowledgment
;;
;; I want to thank Mikael Djurfeldt in discussions with whom the idea
;; of this function took form.
...
...
lisp/ido.el
View file @
09ae5da1
...
...
@@ -279,7 +279,7 @@
;; can be used by other packages to read a buffer name, a file name,
;; or a directory name in the `ido' way.
;;; Acknowledg
e
ments
;;; Acknowledgments
;; Infinite amounts of gratitude goes to Stephen Eglen <stephen@cns.ed.ac.uk>
;; who wrote iswitch-buffer mode - from which I ripped off 99% of the code
...
...
Prev
1
2
Next
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment