Prefer typical American spelling for "acknowledgment".

admin/notes/bugtracker

@@ -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 acknowledgement 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

+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

@@ -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?
-* Acknowledgements::        The authors, editors, and sponsors of this manual.
+* Acknowledgments::         The authors, editors, and sponsors of this manual.
 
 Conventions
 

doc/lispref/intro.texi

@@ -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?
-* Acknowledgements::    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 Acknowledgements
-@section Acknowledgements
+@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

 ARPA
 Abbrev
-Acknowledgements
 Alan
 Arnold
 Autoloading

doc/man/emacs.1

@@ -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 acknowledgements, see the GNU Emacs manual.
+For detailed credits and acknowledgments, see the GNU Emacs manual.
 .
 .
 .

doc/misc/ChangeLog

+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

@@ -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
 

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

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

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
 

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
 

leim/SKK-DIC/SKK-JISYO.L

@@ -34,7 +34,7 @@
 ;; the Free Software Foundation Inc., 59 Temple Place - Suite 330,
 ;; Boston, MA 02111-1307, USA.
 ;;
-;; ACKNOWLEDGEMENT
+;; ACKNOWLEDGMENT
 ;;
 ;; この辞書は、SKK 原作者の佐藤雅彦先生が、第 1 版作成のために東北大学
 ;; 電気通信研究所佐藤研究室 (当時) の学生さん達とともに scratch から作

leim/ja-dic/ja-dic.el

@@ -47,7 +47,7 @@
 ;; the Free Software Foundation Inc., 59 Temple Place - Suite 330,
 ;; Boston, MA 02111-1307, USA.
 ;;
-;; ACKNOWLEDGEMENT
+;; ACKNOWLEDGMENT
 ;;
 ;; この辞書は、SKK 原作者の佐藤雅彦先生が、第 1 版作成のために東北大学
 ;; 電気通信研究所佐藤研究室 (当時) の学生さん達とともに scratch から作

lisp/ChangeLog

+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

@@ -228,7 +228,7 @@
 ;; superior to that of the LISPM version.
 ;;
 ;;-----------------------------------------------
-;; Acknowledgements
+;; 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

@@ -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/>.
 
-;;; Acknowledgements
+;;; 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

@@ -103,8 +103,8 @@
 ;;  (require 'viper)
 ;;
 
-;;; Acknowledgements:
-;;  -----------------
+;;; 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

@@ -156,7 +156,7 @@
 ;;  opposite situation to occur, that `hippie-expand' misses some
 ;;  suggestion because it thinks it has already tried it.
 ;;
-;;  Acknowledgement
+;;  Acknowledgment
 ;;
 ;;  I want to thank Mikael Djurfeldt in discussions with whom the idea
 ;;  of this function took form.

lisp/ido.el

@@ -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.
 
-;;; Acknowledgements
+;;; 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

lisp/iswitchb.el

@@ -233,7 +233,7 @@
 
 ;;; TODO
 
-;;; Acknowledgements
+;;; Acknowledgments
 
 ;; Thanks to Jari Aalto <jari.aalto@poboxes.com> for help with the
 ;; first version of this package, iswitch-buffer.  Thanks also to many

lisp/mail/emacsbug.el

@@ -212,7 +212,7 @@ Prompts for bug subject.  Leaves you in a mail buffer."
 
 	(insert ".  Please check that
 the From: line contains a valid email address.  After a delay of up
-to one day, you should receive an acknowledgement at that address.
+to one day, you should receive an acknowledgment at that address.
 
 Please write in English if possible, as the Emacs maintainers
 usually do not have translators for other languages.\n\n")))

lisp/mail/mspools.el

@@ -83,7 +83,7 @@
 ;; Useful settings for VM
 ;; vm-auto-get-new-mail should be t (the default).
 
-;; Acknowledgements
+;; Acknowledgments
 ;; Thanks to jond@mitre.org (Jonathan Doughty) for help with code for
 ;; setting up vm-spool-files.
 

lisp/mail/rfc2368.el

@@ -33,7 +33,7 @@
 ;;
 ;;   this is intended as a replacement for mailto.el
 ;;
-;; acknowledgements:
+;; acknowledgments:
 ;;
 ;;   the functions that deal w/ unhexifying in this file were basically
 ;; taken from w3 -- i hope to replace them w/ something else soon OR

lisp/progmodes/cmacexp.el

@@ -80,7 +80,7 @@
 ;;   making comments visible in the expansion.
 ;; - All work is done in core memory, no need for temporary files.
 
-;; ACKNOWLEDGEMENTS ==================================================
+;; ACKNOWLEDGMENTS ===================================================
 
 ;; A lot of thanks to Don Maszle who did a great work of testing, bug
 ;; reporting and suggestion of new features.  This work has been

lisp/progmodes/ebnf-yac.el

@@ -73,8 +73,8 @@
 ;; example: this_is_a_valid.name, Another_EXAMPLE, mIxEd.CaSe.
 ;;
 ;;
-;; Acknowledgements
-;; ----------------
+;; Acknowledgments
+;; ---------------
 ;;
 ;; Thanks to Matthew K. Junker <junker@alum.mit.edu> for the suggestion to deal
 ;; with %right, %left and %prec pragmas.  His suggestion was extended to deal

lisp/progmodes/ebnf2ps.el

@@ -1128,8 +1128,8 @@ Please send all bug fixes and enhancements to
 ;; . Optimizations...
 ;;
 ;;
-;; Acknowledgements
-;; ----------------
+;; Acknowledgments
+;; ---------------
 ;;
 ;; Thanks to Eli Zaretskii <eliz@gnu.org> for some doc fixes.
 ;;

lisp/progmodes/vhdl-mode.el

@@ -102,7 +102,7 @@
 ;; VHDL Mode distribution.
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Acknowledgements
+;; Acknowledgments
 
 ;; Electrification ideas by Bob Pack <rlpst@cislabs.pitt.edu>
 ;; and Steve Grout.
@@ -4499,7 +4499,7 @@ Usage:
     (mra) architecture is selected.  If another architecture is desired, it
     can be marked as most-recently-analyzed (speedbar menu) before
     generating the configuration.
- 
+
       Note: Configurations of subcomponents (i.e. hierarchical configuration
     declarations) are currently not considered when displaying
     configurations in speedbar.
@@ -6979,7 +6979,7 @@ is not moved."
 		     (save-excursion
 		       (goto-char new)
 		       (eq new (progn (back-to-indentation) (point)))))
-		(setq placeholder new)))	
+		(setq placeholder new)))
 	  (vhdl-add-syntax 'statement-cont placeholder)
 	  (if begin-after-ip
 	      (vhdl-add-syntax 'block-open)))

lisp/vc/add-log.el

@@ -223,13 +223,15 @@ Note: The search is conducted only within 10%, at the beginning of the file."
 (define-obsolete-face-alias 'change-log-function-face
   'change-log-function "22.1")
 
-(defface change-log-acknowledgement
+(defface change-log-acknowledgment
   '((t (:inherit font-lock-comment-face)))
   "Face for highlighting acknowledgments."
   :version "21.1"
   :group 'change-log)
+(define-obsolete-face-alias 'change-log-acknowledgement
+  'change-log-acknowledgment "24.2")
 (define-obsolete-face-alias 'change-log-acknowledgement-face
-  'change-log-acknowledgement "22.1")
+  'change-log-acknowledgment "22.1")
 
 (defconst change-log-file-names-re "^\\( +\\|\t\\)\\* \\([^ ,:([\n]+\\)")
 (defconst change-log-start-entry-re "^\\sw.........[0-9:+ ]*")
@@ -271,14 +273,14 @@ Note: The search is conducted only within 10%, at the beginning of the file."
     ;; Function of change.
     ("<\\([^>\n]+\\)>\\(:\\| (\\)" (1 'change-log-function))
     ;;
-    ;; Acknowledgements.
+    ;; Acknowledgments.
     ;; Don't include plain "From" because that is vague;
     ;; we want to encourage people to say something more specific.
     ;; Note that the FSF does not use "Patches by"; our convention
     ;; is to put the name of the author of the changes at the top
     ;; of the change log entry.
     ("\\(^\\( +\\|\t\\)\\|  \\)\\(Thanks to\\|Patch\\(es\\)? by\\|Report\\(ed by\\| from\\)\\|Suggest\\(ed by\\|ion from\\)\\)"
-     3 'change-log-acknowledgement))
+     3 'change-log-acknowledgment))
   "Additional expressions to highlight in Change Log mode.")
 
 (defun change-log-search-file-name (where)

lisp/vc/ediff.el

@@ -101,7 +101,7 @@
 ;;  and on any buffer.
 
 
-;;; Acknowledgements:
+;;; Acknowledgments:
 
 ;; Ediff was inspired by Dale R. Worley's <drw@math.mit.edu> emerge.el.
 ;; Ediff would not have been possible without the help and encouragement of

lisp/vc/vc-git.el

@@ -772,7 +772,7 @@ for the --graph option."
 	   (list (cons (nth 1 vc-git-root-log-format)
 		       (nth 2 vc-git-root-log-format)))
 	 (append
-	  `((,log-view-message-re (1 'change-log-acknowledgement)))
+	  `((,log-view-message-re (1 'change-log-acknowledgment)))
 	  ;; Handle the case:
 	  ;; user: foo@bar
 	  '(("^Author:[ \t]+\\([A-Za-z0-9_.+-]+@[A-Za-z0-9_.-]+\\)"
@@ -788,8 +788,8 @@ for the --graph option."
 	     (1 'change-log-name)
 	     (2 'change-log-email))
 	    ("^Merge: \\([0-9a-z]+\\) \\([0-9a-z]+\\)"
-	     (1 'change-log-acknowledgement)
-	     (2 'change-log-acknowledgement))
+	     (1 'change-log-acknowledgment)
+	     (2 'change-log-acknowledgment))
 	    ("^Date:   \\(.+\\)" (1 'change-log-date))
 	    ("^summary:[ \t]+\\(.+\\)" (1 'log-view-message)))))))
 

lisp/whitespace.el

@@ -309,8 +309,8 @@
 ;;				buffer is visited or written.
 ;;
 ;;
-;; Acknowledgements
-;; ----------------
+;; Acknowledgments
+;; ---------------
 ;;
 ;; Thanks to felix (EmacsWiki) for keeping highlight when switching between
 ;; major modes on a file.

lisp/windmove.el

@@ -118,7 +118,7 @@
 ;;     (setq windmove-window-distance-delta 2)
 ;;
 
-;; Acknowledgements:
+;; Acknowledgments:
 ;;
 ;; Special thanks to Julian Assange (proff@iq.org), whose
 ;; change-windows-intuitively.el predates Windmove, and provided the

lisp/woman.el

@@ -368,8 +368,8 @@
 ;; http://cm.bell-labs.com/7thEdMan/
 
 
-;; Acknowledgements
-;; ================
+;; Acknowledgments
+;; ===============
 
 ;; For Heather, Kathryn and Madelyn, the women in my life
 ;; (although they will probably never use it)!