Spelling fixes.

* lib-src/Makefile.in (regex.o): Remove reference to no-longer-used macros
CONFIG_BROKETS and INHIBIT_STRING_HEADER.  "BROKETS" was a
misspelling anyway....
* src/nsterm.h (updateCollectionBehavior): Rename from
updateCollectionBehaviour.  All uses changed.

6 files changed, 23 insertions, 23 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