28 files changed, 81 insertions, 68 deletions

diff --git a/doc/misc/efaq-w32.texi b/doc/misc/efaq-w32.texi
index 0e846b2cadc..d9b0dd1e201 100644
--- a/doc/misc/efaq-w32.texi
+++ b/doc/misc/efaq-w32.texi
@@ -166,7 +166,7 @@ Pre-compiled versions are distributed from
 Emacs binaries are distributed as zip files, digitally
 signed by the developer who built them.  Generally most users will
 want the file @file{emacs-@value{EMACSVER}-bin-i386.zip}, which
-contains everything you need to get started. 
+contains everything you need to get started.
 
 @cindex where to get sources
 @cindex Emacs source code
@@ -290,7 +290,7 @@ Windows ports of the command line gzip and tar tools from multiple sources.
 
 The command to unpack a source distribution from the command line is:
 @example
-tar xzf emacs-@value{EMACSVER}.tar.gz 
+tar xzf emacs-@value{EMACSVER}.tar.gz
 @end example
 
 If this does not work with the versions of tar and gzip that you have,
@@ -577,9 +577,9 @@ Message-ID: <fawg21mm4hm.fsf@@mordor.rsn.hp.com>
 Subject: Re: Re[2]: problem with caps/ctrl swap on NT 4.0
 @end ignore
 @example
-It's a binary value that lets you map keystrokes in the low-level keyboard 
-drivers in NT.  As a result you don't have to worry about applications 
-bypassing mappings that you've done at a higher level (i.e. it just works). 
+It's a binary value that lets you map keystrokes in the low-level keyboard
+drivers in NT.  As a result you don't have to worry about applications
+bypassing mappings that you've done at a higher level (i.e. it just works).
 
 Here's the format of the value:
 
@@ -591,11 +591,11 @@ Here's the format of the value:
 	DWORD:	mapping n
 	DWORD:	0x00000000	terminating null DWORD
 
-Each mapping DWORD  has two parts: the input scancode, and an output 
-scancode.  To map scancode 0x1d (left control) to scancode 0x3a (caps 
-lock), you want a value of 0x003a001d.  Note that this does not swap the 
-keys.  Using just this mapping value, both the left control and the caps 
-lock key will behave as caps-lock.  To swap, you also need to map 0x3a to 
+Each mapping DWORD  has two parts: the input scancode, and an output
+scancode.  To map scancode 0x1d (left control) to scancode 0x3a (caps
+lock), you want a value of 0x003a001d.  Note that this does not swap the
+keys.  Using just this mapping value, both the left control and the caps
+lock key will behave as caps-lock.  To swap, you also need to map 0x3a to
 0x1d, using 0x001d003a.
 
 This registry value is system wide, and can't be made user-specific.  It
@@ -1357,7 +1357,7 @@ you can use @code{setbuf} and @code{setvbuf} to manipulate
 the buffering semantics.
 
 Some programs handle this by having an explicit flag to control their
-buffering behaviour, typically @option{-i} for interactive.  Other
+buffering behavior, typically @option{-i} for interactive.  Other
 programs manage to detect that they are running under Emacs, by
 using @samp{getenv("emacs")} internally.
 
@@ -1430,7 +1430,7 @@ this discussion} for more details.
 You can start an interactive shell in Emacs by typing @kbd{M-x shell}.
 Emacs uses the @env{SHELL} environment variable to determine which
 program to use as the shell.  To instruct Emacs to use a non-default
-shell, you can either set this environment variable, or customize 
+shell, you can either set this environment variable, or customize
 @code{explicit-shell-file-name}.  You can also customize
 @code{shell-file-name} to change the shell that will be used by
 subprocesses that are started with @code{shell-command} and
diff --git a/doc/misc/eshell.texi b/doc/misc/eshell.texi
index 38c17c36f5a..74d859588dc 100644
--- a/doc/misc/eshell.texi
+++ b/doc/misc/eshell.texi
@@ -281,7 +281,7 @@ sudo is an alias, defined as "*sudo $*"
 If you would prefer to use the built-in commands instead of the external
 commands, set @code{eshell-prefer-lisp-functions} to @code{t}.
 
-Some of the built-in commands have different behaviour from their
+Some of the built-in commands have different behavior from their
 external counterparts, and some have no external counterpart.  Most of
 these will print a usage message when given the @code{--help} option.
 
@@ -627,7 +627,7 @@ from Bash can still use Bash-style globbing, as there are no
 incompatibilities.  Most globbing is pattern-based expansion, but there
 is also predicate-based expansion.  See
 @ref{Filename Generation, , , zsh, The Z Shell Manual}
-for full syntax.  To customize the syntax and behaviour of globbing in
+for full syntax.  To customize the syntax and behavior of globbing in
 Eshell see the Customize@footnote{@xref{Easy Customization, , , emacs,
 The GNU Emacs Manual}.}
 groups ``eshell-glob'' and ``eshell-pred''.
diff --git a/doc/misc/htmlfontify.texi b/doc/misc/htmlfontify.texi
index 18e7c34a73c..3124a281676 100644
--- a/doc/misc/htmlfontify.texi
+++ b/doc/misc/htmlfontify.texi
@@ -57,7 +57,7 @@ modify this GNU manual.''
 @menu
 * Introduction::                   About Htmlfontify.
 * Usage & Examples::               How to use Htmlfontify.
-* Customization::                  Fine-tuning Htmlfontify's behaviour.
+* Customization::                  Fine-tuning Htmlfontify's behavior.
 * Requirements::                   External programs used by Htmlfontify.
 * GNU Free Documentation License:: The license for this documentation.
 * Index::                          Index of contents.
@@ -820,7 +820,7 @@ which @emph{didn't} clash with @var{class} was returned.  In versions
 from 0.18 onwards, each font attribute list is scored, and the
 non-conflicting list with the highest score is returned.  (A specification
 with a class of @code{t} is considered to match any class you specify.
-This matches Emacs's behaviour when deciding on which face attributes to
+This matches Emacs's behavior when deciding on which face attributes to
 use, to the best of my understanding ).
 
 If @var{class} is nil, then you just get get whatever
diff --git a/doc/misc/org.texi b/doc/misc/org.texi
index be028e3d1e9..f9426aa7981 100644
--- a/doc/misc/org.texi
+++ b/doc/misc/org.texi
@@ -9952,7 +9952,7 @@ processed normally.
 
 Contents of the included file will belong to the same structure (headline,
 item) containing the @code{INCLUDE} keyword.  In particular, headlines within
-the file will become children of the current section.  That behaviour can be
+the file will become children of the current section.  That behavior can be
 changed by providing an additional keyword parameter, @code{:minlevel}.  In
 that case, all headlines in the included file will be shifted so the one with
 the lowest level reaches that specified level.  For example, to make a file
@@ -10398,7 +10398,7 @@ can be reached by calling the dispatcher with a double @kbd{C-u} prefix
 argument, or with @kbd{&} key from the dispatcher.
 
 @vindex org-export-in-background
-To make this behaviour the default, customize the variable
+To make this behavior the default, customize the variable
 @code{org-export-in-background}.
 
 @item C-b
@@ -13073,7 +13073,7 @@ channel."
 The @code{my-ascii-src-block} function looks at the attribute above the
 element.  If it isn't true, it gives hand to the @code{ascii} back-end.
 Otherwise, it creates a box around the code, leaving room for the language.
-A new back-end is then created.  It only changes its behaviour when
+A new back-end is then created.  It only changes its behavior when
 translating @code{src-block} type element.  Now, all it takes to use the new
 back-end is calling the following from an Org buffer:
 
@@ -14102,7 +14102,7 @@ looked up with inheritance, regardless of the value of
 outermost call or source block.@footnote{The deprecated syntax for default
 header argument properties, using the name of the header argument as a
 property name directly, evaluates the property as seen by the corresponding
-source block definition.  This behaviour has been kept for backwards
+source block definition.  This behavior has been kept for backwards
 compatibility.}
 
 In the following example the value of
diff --git a/doc/misc/sem-user.texi b/doc/misc/sem-user.texi
index 8604d095763..b8625932f7c 100644
--- a/doc/misc/sem-user.texi
+++ b/doc/misc/sem-user.texi
@@ -983,7 +983,7 @@ If your symbol should be in the scope, but you cannot find it, then
 you may have found a language support bug in the local-variable
 parser, or using statement parser.
 
-Calling @kbd{M-x bovinte} should force a reset on the scope in case
+Calling @kbd{M-x bovinate} should force a reset on the scope in case
 there is merely some bad state.
 
 @example
@@ -1014,7 +1014,7 @@ fully qualified names.  You can examine the typecache with
 @kbd{M-x semanticdb-typecache-dump}.
 
 If your data types are not in the typecache, there may be some parsing
-error or other bug.  Calling @kbd{M-x bovinte} should force a reset on
+error or other bug.  Calling @kbd{M-x bovinate} should force a reset on
 the typecache in case there is merely some bad state.
 
 @example
diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index 21891df25e9..9506c8f49c1 100644
--- a/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@ -2744,7 +2744,7 @@ You will see the buffer @file{*Async Shell Command*}, containing the
 continuous output of the @command{tail} command.
 
 @ifset emacs
-A similar behaviour can be reached by @kbd{M-x auto-revert-tail-mode},
+A similar behavior can be reached by @kbd{M-x auto-revert-tail-mode},
 if available.
 @end ifset
 
diff --git a/etc/NEWS b/etc/NEWS
index 44764f3cde0..8a379495670 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -455,7 +455,7 @@ Pairing/skipping only kicks in when that help the balance of
 parentheses and quotes, i.e. the buffer should end up at least as
 balanced as before.
 
-You can further control this behaviour by adjusting the predicates
+You can further control this behavior by adjusting the predicates
 stored in `electric-pair-inhibit-predicate' and
 `electric-pair-skip-self'.
 
@@ -481,7 +481,7 @@ whitespace. See also the variable
 *** New variables control the pairing in strings and comments.
 
 You can customize `electric-pair-text-pairs' and
-`electric-pair-text-syntax-table' to tweak pairing behaviour inside
+`electric-pair-text-syntax-table' to tweak pairing behavior inside
 strings and comments.
 
 ** EPA
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index bc1161f169d..5f80ccdd60b 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,10 @@
+2014-01-05  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Spelling fixes.
+	* Makefile.in (regex.o): Remove reference to no-longer-used macros
+	CONFIG_BROKETS and INHIBIT_STRING_HEADER.  "BROKETS" was a
+	misspelling anyway....
+
 2013-12-14  Paul Eggert  <eggert@cs.ucla.edu>
 
 	Use bool for boolean, focusing on headers.
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index 91a8e74819f..56cdc09e0fe 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -315,8 +315,7 @@ test-distrib${EXEEXT}: ${srcdir}/test-distrib.c
 	cd ../lib && $(MAKE) libgnu.a
 
 regex.o: $(srcdir)/../src/regex.c $(srcdir)/../src/regex.h $(config_h)
-	${CC} -c ${CPP_CFLAGS} -DCONFIG_BROKETS -DINHIBIT_STRING_HEADER \
-	  ${srcdir}/../src/regex.c
+	${CC} -c ${CPP_CFLAGS} ${srcdir}/../src/regex.c
 
 etags${EXEEXT}: ${srcdir}/etags.c regex.o $(NTLIB) $(config_h)
 	$(CC) ${ALL_CFLAGS} -DEMACS_NAME="\"GNU Emacs\"" \
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c76eaceba78..c398a34f93b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -131,7 +131,7 @@
 	* shell.el (shell-dynamic-complete-command): Doc fix.
 	(shell--command-completion-data): Shell completion now matches
 	executable filenames from the current buffer's directory, on
-	systems in which this behaviour is the default (windows-nt, ms-dos).
+	systems in which this behavior is the default (windows-nt, ms-dos).
 
 2013-12-27  Lars Ingebrigtsen  <larsi@gnus.org>
 
diff --git a/lisp/delsel.el b/lisp/delsel.el
index 966661c3abb..fdf00236235 100644
--- a/lisp/delsel.el
+++ b/lisp/delsel.el
@@ -49,7 +49,7 @@
 ;;      The normal case: delete the active region prior to executing
 ;;      the command which will insert replacement text.
 ;;  <function>
-;;      For commands which need to dynamically determine this behaviour.
+;;      For commands which need to dynamically determine this behavior.
 ;;      The function should return one of the above values or nil.
 
 ;;; Code:
@@ -99,7 +99,7 @@ If KILLP in not-nil, the active region is killed instead of deleted."
      The normal case: delete the active region prior to executing
      the command which will insert replacement text.
  FUNCTION
-     For commands which need to dynamically determine this behaviour.
+     For commands which need to dynamically determine this behavior.
      FUNCTION should take no argument and return one of the above values or nil."
   (condition-case data
       (cond ((eq type 'kill)
diff --git a/lisp/elec-pair.el b/lisp/elec-pair.el
index 21c944e4997..a2d637e2aea 100644
--- a/lisp/elec-pair.el
+++ b/lisp/elec-pair.el
@@ -169,7 +169,7 @@ be considered.")
 (defun electric-pair-backward-delete-char (n &optional killflag untabify)
   "Delete characters backward, and maybe also two adjacent paired delimiters.
 
-Remaining behaviour is given by `backward-delete-char' or, if UNTABIFY is
+Remaining behavior is given by `backward-delete-char' or, if UNTABIFY is
 non-nil, `backward-delete-char-untabify'."
   (interactive "*p\nP")
   (let* ((prev (char-before))
@@ -191,7 +191,7 @@ non-nil, `backward-delete-char-untabify'."
 (defun electric-pair-backward-delete-char-untabify (n &optional killflag)
   "Delete characters backward, and maybe also two adjacent paired delimiters.
 
-Remaining behaviour is given by `backward-delete-char-untabify'."
+Remaining behavior is given by `backward-delete-char-untabify'."
   (interactive "*p\nP")
   (electric-pair-backward-delete-char n killflag t))
 
diff --git a/lisp/erc/erc-lang.el b/lisp/erc/erc-lang.el
index b8ad7244929..32e2f1d84c7 100644
--- a/lisp/erc/erc-lang.el
+++ b/lisp/erc/erc-lang.el
@@ -32,6 +32,9 @@
 
 (require 'erc)
 
+;; FIXME: It's ISO 639-1, not ISO 638.  ISO 638 is for paper, board and pulps.
+;; The Lisp variable should be renamed.
+
 (defvar iso-638-languages
   '(("aa" . "Afar")
     ("ab" . "Abkhazian")
@@ -42,7 +45,7 @@
     ("ay" . "Aymara")
     ("az" . "Azerbaijani")
     ("ba" . "Bashkir")
-    ("be" . "Byelorussian")
+    ("be" . "Belarusian")
     ("bg" . "Bulgarian")
     ("bh" . "Bihari")
     ("bi" . "Bislama")
diff --git a/lisp/gnus/pop3.el b/lisp/gnus/pop3.el
index abef3981764..1c6636a3065 100644
--- a/lisp/gnus/pop3.el
+++ b/lisp/gnus/pop3.el
@@ -107,7 +107,7 @@ days since you first checked new mails.  If this is nil, mails will be
 deleted on the server right after fetching.
 
 Gnus users should use the `:leave' keyword in a mail source to direct
-the behaviour per server, rather than directly modifying this value.
+the behavior per server, rather than directly modifying this value.
 
 Note that POP servers maintain no state information between sessions,
 so what the client believes is there and what is actually there may
diff --git a/lisp/htmlfontify.el b/lisp/htmlfontify.el
index 31f70653ff8..9fef6155705 100644
--- a/lisp/htmlfontify.el
+++ b/lisp/htmlfontify.el
@@ -1619,7 +1619,7 @@ span also begins a invisible portion of text.
 
 An implementation can use TEXT-BLOCK, TEXT-ID,
 TEXT-BEGINS-BLOCK-P to implement fold/unfold-on-mouse-click like
-behaviour.
+behavior.
 
 The default handler is `hfy-begin-span'.")
 
diff --git a/lisp/language/cyril-util.el b/lisp/language/cyril-util.el
index f55c5d08513..241cd84fcab 100644
--- a/lisp/language/cyril-util.el
+++ b/lisp/language/cyril-util.el
@@ -41,7 +41,7 @@
 ;; Written by Valery Alexeev <valery@math.uga.edu>.
 
 (defvar cyrillic-language-alist
-      (list '("Belorussian") '("Bulgarian") '("Macedonian")
+      (list '("Belarusian") '("Bulgarian") '("Macedonian")
 	    '("Russian") '("Serbo-Croatian") '("Ukrainian"))
       "List of known cyrillic languages.")
 
diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index 65404a7af18..87280e57b36 100644
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -1714,7 +1714,7 @@
 	* org.el (org-previous-line-empty-p): New parameter to allow
 	checking next line.  Add a docstring.
 	(org-insert-heading): Handle two universal prefix arguments as
-	advertized in the docstring.  Don't insert new lines when
+	advertised in the docstring.  Don't insert new lines when
 	creating a heading after the first heading in the current
 	subtree.
 	(org-insert-heading-respect-content): New optional argument
@@ -3522,7 +3522,7 @@
 	parsing.
 
 	* org.el (org-adaptive-fill-function): Do not handle
-	`adaptive-fill-regexp' in comments as the behaviour is not
+	`adaptive-fill-regexp' in comments as the behavior is not
 	satisfying.
 
 	* org-list.el (org-list-struct-apply-struct): Do not move item's
@@ -3677,7 +3677,7 @@
 	"wrong-type-argument" error in template insertion.
 
 	* org.el (org-fill-paragraph): Use empty commented lines as
-	separators when filling comments.  This mimics default behaviour
+	separators when filling comments.  This mimics default behavior
 	from "newcomment.el", which is not used in Org.
 
 	* ox-html.el (org-html-link): Add image attributes to "img" tag,
@@ -3984,7 +3984,7 @@
 	* ox.el (org-export-with-timestamps): Only applies to isolated
 	timestamps, i.e. timestamps in a paragraph containing only
 	timestamps and empty strings.
-	(org-export--skip-p): Skip timestamps according to new behaviour.
+	(org-export--skip-p): Skip timestamps according to new behavior.
 
 	* ox-latex.el (org-latex--script-size): Handle consecutive
 	alterning sub and superscript.
@@ -4313,7 +4313,7 @@
 	* ox.el (org-export-as): Store export options in :export-options
 	porperty within communication channel.
 
-	* ox-latex.el (org-latex-item): Fix wrong behaviour when a counter
+	* ox-latex.el (org-latex-item): Fix wrong behavior when a counter
 	is set in an ordered list while its parent is not ordered.
 
 	* ox.el (org-export-format-code-default): Handle empty source
@@ -4942,7 +4942,7 @@
 	timestamps ranges with repeaters.
 
 	* org.el (org-edit-special): Rewrite `org-edit-special' using Org
-	Elements tools.  Behaviour should be unchanged.
+	Elements tools.  Behavior should be unchanged.
 
 	* org-element.el (org-element-context): Add an optional argument
 	so that (org-element-context) and (org-element-context
@@ -6383,7 +6383,7 @@
 	* org.el: Make `org-closest-date' aware of hours repeaters.
 
 	* org.el (org-end-of-line): Do not call `end-of-visual-line' when
-	moving to the end of line.  Also improve behaviour on elements that
+	moving to the end of line.  Also improve behavior on elements that
 	can be hidden.
 
 	* org.el (org-sparse-tree): Allow to call `org-show-todo-tree'
@@ -10565,7 +10565,7 @@
 2012-04-01  Nicolas Goaziou  <n.goaziou@gmail.com>
 
 	* org.el (org-beginning-of-line, org-end-of-line): Fix special C-a
-	and C-e behaviour with visual lines.
+	and C-e behavior with visual lines.
 
 2012-04-01  Eric Schulte  <eric.schulte@gmx.com>
 
@@ -11105,7 +11105,7 @@
 
 	* ob-emacs-lisp.el: A comment on the last line of an emacs-lisp
 	code block would cause an error when the block is was executed.
-	This fix cures this behaviour.
+	This fix cures this behavior.
 
 2012-04-01  Eric Schulte  <eric.schulte@gmx.com>
 
@@ -12994,7 +12994,7 @@
 2012-01-03  Nicolas Goaziou  <n.goaziou@gmail.com>
 
 	* org-list.el (org-list-separating-blank-lines-number):
-	The behaviour of `org-back-over-empty-lines' depends on the
+	The behavior of `org-back-over-empty-lines' depends on the
 	associated value of `headline' in
 	`org-blank-before-new-entry', which is out of context in a
 	list.
diff --git a/lisp/org/org-ctags.el b/lisp/org/org-ctags.el
index 41775bdab6d..faf543be1b5 100644
--- a/lisp/org/org-ctags.el
+++ b/lisp/org/org-ctags.el
@@ -63,19 +63,19 @@
 ;; with the same name as the link; then, if unsuccessful, ask the user if
 ;; he/she wants to rebuild the 'TAGS' database and try again; then ask if
 ;; the user wishes to append 'tag' as a new toplevel heading at the end of
-;; the buffer; and finally, defer to org's default behaviour which is to
+;; the buffer; and finally, defer to org's default behavior which is to
 ;; search the entire text of the current buffer for 'tag'.
 ;;
-;; This behaviour can be modified by changing the value of
+;; This behavior can be modified by changing the value of
 ;; ORG-CTAGS-OPEN-LINK-FUNCTIONS. For example I have the following in my
-;; .emacs, which describes the same behaviour as the above paragraph with
+;; .emacs, which describes the same behavior as the above paragraph with
 ;; one difference:
 ;;
 ;; (setq org-ctags-open-link-functions
 ;;       '(org-ctags-find-tag
 ;;         org-ctags-ask-rebuild-tags-file-then-find-tag
 ;;         org-ctags-ask-append-topic
-;;         org-ctags-fail-silently))  ; <-- prevents org default behaviour
+;;         org-ctags-fail-silently))  ; <-- prevents org default behavior
 ;;
 ;;
 ;; Usage
diff --git a/lisp/org/ox-html.el b/lisp/org/ox-html.el
index 8df3ff9265e..45a20ddb826 100644
--- a/lisp/org/ox-html.el
+++ b/lisp/org/ox-html.el
@@ -580,7 +580,7 @@ The function must accept two parameters:
 The function should return the string to be exported.
 
 For example, the variable could be set to the following function
-in order to mimic default behaviour:
+in order to mimic default behavior:
 
 The default value simply returns the value of CONTENTS."
   :group 'org-export-html
diff --git a/lisp/org/ox-latex.el b/lisp/org/ox-latex.el
index 8294938477f..9fc1031d391 100644
--- a/lisp/org/ox-latex.el
+++ b/lisp/org/ox-latex.el
@@ -589,7 +589,7 @@ The function must accept six parameters:
 The function should return the string to be exported.
 
 For example, the variable could be set to the following function
-in order to mimic default behaviour:
+in order to mimic default behavior:
 
 \(defun org-latex-format-inlinetask \(todo type priority name tags contents\)
 \"Format an inline task element for LaTeX export.\"
diff --git a/lisp/org/ox-publish.el b/lisp/org/ox-publish.el
index 20d5272831d..16189ecba54 100644
--- a/lisp/org/ox-publish.el
+++ b/lisp/org/ox-publish.el
@@ -228,7 +228,7 @@ If you create a site-map file, adjust the sorting like this:
   `:sitemap-sort-files'
 
     The site map is normally sorted alphabetically.  You can
-    change this behaviour setting this to `anti-chronologically',
+    change this behavior setting this to `anti-chronologically',
     `chronologically', or nil.
 
   `:sitemap-ignore-case'
diff --git a/lisp/org/ox-texinfo.el b/lisp/org/ox-texinfo.el
index a55f298ddc3..93279f3291e 100644
--- a/lisp/org/ox-texinfo.el
+++ b/lisp/org/ox-texinfo.el
@@ -348,7 +348,7 @@ The function must accept six parameters:
 The function should return the string to be exported.
 
 For example, the variable could be set to the following function
-in order to mimic default behaviour:
+in order to mimic default behavior:
 
 \(defun org-texinfo-format-inlinetask \(todo type priority name tags contents\)
 \"Format an inline task element for Texinfo export.\"
diff --git a/lisp/org/ox.el b/lisp/org/ox.el
index 1887382de8c..3f24801f10b 100644
--- a/lisp/org/ox.el
+++ b/lisp/org/ox.el
@@ -143,7 +143,7 @@
   "Alist between export properties and ways to set them.
 
 The CAR of the alist is the property name, and the CDR is a list
-like (KEYWORD OPTION DEFAULT BEHAVIOUR) where:
+like (KEYWORD OPTION DEFAULT BEHAVIOR) where:
 
 KEYWORD is a string representing a buffer keyword, or nil.  Each
   property defined this way can also be set, during subtree
@@ -152,7 +152,7 @@ KEYWORD is a string representing a buffer keyword, or nil.  Each
   property).
 OPTION is a string that could be found in an #+OPTIONS: line.
 DEFAULT is the default value for the property.
-BEHAVIOUR determines how Org should handle multiple keywords for
+BEHAVIOR determines how Org should handle multiple keywords for
   the same property.  It is a symbol among:
   nil       Keep old value and discard the new one.
   t         Replace old value with the new one.
@@ -493,7 +493,7 @@ t           Allow export of math snippets."
   "The last level which is still exported as a headline.
 
 Inferior levels will usually produce itemize or enumerate lists
-when exported, but back-end behaviour may differ.
+when exported, but back-end behavior may differ.
 
 This option can also be set with the OPTIONS keyword,
 e.g. \"H:2\"."
@@ -1649,7 +1649,7 @@ for export.  Return options as a plist."
 			  ((member keyword org-element-document-properties)
 			   (org-element-parse-secondary-string
 			    value (org-element-restriction 'keyword)))
-			  ;; If BEHAVIOUR is `split' expected value is
+			  ;; If BEHAVIOR is `split' expected value is
 			  ;; a list of strings, not a string.
 			  ((eq (nth 4 option) 'split) (org-split-string value))
 			  (t value)))))))))
@@ -1726,13 +1726,13 @@ Assume buffer is in Org mode.  Narrowing, if any, is ignored."
 		      (t
 		       ;; Options in `org-export-options-alist'.
 		       (dolist (property (funcall find-properties key))
-			 (let ((behaviour (nth 4 (assq property options))))
+			 (let ((behavior (nth 4 (assq property options))))
 			   (setq plist
 				 (plist-put
 				  plist property
 				  ;; Handle value depending on specified
-				  ;; BEHAVIOUR.
-				  (case behaviour
+				  ;; BEHAVIOR.
+				  (case behavior
 				    (space
 				     (if (not (plist-get plist property))
 					 (org-trim val)
diff --git a/lisp/textmodes/reftex-index.el b/lisp/textmodes/reftex-index.el
index 9d96f8a7242..4a329b9999e 100644
--- a/lisp/textmodes/reftex-index.el
+++ b/lisp/textmodes/reftex-index.el
@@ -896,7 +896,7 @@ When index is restricted, select the previous section as restriction criterion."
   ;; If FINAL is t, stay there
   ;; If FINAL is 'hide, hide the *Index* window.
   ;; Otherwise, move cursor back into *Index* window.
-  ;; NO-REVISIT means don't visit files, just use live biffers.
+  ;; NO-REVISIT means don't visit files, just use live buffers.
 
   (let* ((data (get-text-property (point) :data))
          (index-window (selected-window))
diff --git a/lisp/url/url-queue.el b/lisp/url/url-queue.el
index 8ba721a96d5..87469b91032 100644
--- a/lisp/url/url-queue.el
+++ b/lisp/url/url-queue.el
@@ -69,7 +69,7 @@ The variable `url-queue-timeout' sets a timeout."
 				      :inhibit-cookiesp inhibit-cookies))))
   (url-queue-setup-runners))
 
-;; To ensure asynch behaviour, we start the required number of queue
+;; To ensure asynch behavior, we start the required number of queue
 ;; runners from `run-with-idle-timer'.  So we're basically going
 ;; through the queue in two ways: 1) synchronously when a program
 ;; calls `url-queue-retrieve' (which will then start the required
diff --git a/src/ChangeLog b/src/ChangeLog
index 42f79d2ae46..a6c308771c2 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
 2014-01-05  Paul Eggert  <eggert@cs.ucla.edu>
 
+	Spelling fixes.
+	* nsterm.h (updateCollectionBehavior): Rename from
+	updateCollectionBehaviour.  All uses changed.
+
 	Port to GNU/Linux with recent grsecurity/PaX patches (Bug#16343).
 	* Makefile.in (SETFATTR): New macro.
 	(temacs$(EXEEXT)): Use it.
diff --git a/src/nsterm.h b/src/nsterm.h
index bf1a2e24b41..796d6ef8ca0 100644
--- a/src/nsterm.h
+++ b/src/nsterm.h
@@ -183,7 +183,7 @@ typedef float EmacsCGFloat;
 - (BOOL) fsIsNative;
 - (BOOL) isFullscreen;
 #ifdef HAVE_NATIVE_FS
-- (void) updateCollectionBehaviour;
+- (void) updateCollectionBehavior;
 #endif
 
 #ifdef NS_IMPL_GNUSTEP
diff --git a/src/nsterm.m b/src/nsterm.m
index 0097b5b30e4..eefaea8888f 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -3497,7 +3497,7 @@ check_native_fs ()
       if (FRAME_NS_P (f))
         {
           EmacsView *view = FRAME_NS_VIEW (f);
-          [view updateCollectionBehaviour];
+          [view updateCollectionBehavior];
         }
     }
 }
@@ -6317,7 +6317,7 @@ if (cols > 0 && rows > 0)
   [self setFSValue: fs_before_fs];
   fs_before_fs = -1;
 #ifdef HAVE_NATIVE_FS
-  [self updateCollectionBehaviour];
+  [self updateCollectionBehavior];
 #endif
   if (FRAME_EXTERNAL_TOOL_BAR (emacsframe))
     {
@@ -6349,7 +6349,7 @@ if (cols > 0 && rows > 0)
 }
 
 #ifdef HAVE_NATIVE_FS
-- (void)updateCollectionBehaviour
+- (void)updateCollectionBehavior
 {
   if (! [self isFullscreen])
     {
@@ -7647,7 +7647,7 @@ Default is t for OSX >= 10.7, nil otherwise. */);
 
   DEFVAR_BOOL ("ns-use-srgb-colorspace", ns_use_srgb_colorspace,
      doc: /*Non-nil means to use sRGB colorspace on OSX >= 10.7.
-Note that this does not apply to images.            
+Note that this does not apply to images.
 This variable is ignored on OSX < 10.7 and GNUStep.  Default is t. */);
   ns_use_srgb_colorspace = YES;