Commits

Ron DuPlain committed a3cb2a3

Use American English for "behavior" in docs.

Prompted by plaes on #pocoo, mitsuhiko confirmed to use American English.

Comments (0)

Files changed (10)

 
 - Added :meth:`~flask.Flask.make_default_options_response`
   which can be used by subclasses to alter the default
-  behaviour for `OPTIONS` responses.
+  behavior for `OPTIONS` responses.
 - Unbound locals now raise a proper :exc:`RuntimeError` instead
   of an :exc:`AttributeError`.
 - Mimetype guessing and etag support based on file objects is now
 - Static file handling for modules now requires the name of the
   static folder to be supplied explicitly.  The previous autodetection
   was not reliable and caused issues on Google's App Engine.  Until
-  1.0 the old behaviour will continue to work but issue dependency
+  1.0 the old behavior will continue to work but issue dependency
   warnings.
 - fixed a problem for Flask to run on jython.
 - added a `PROPAGATE_EXCEPTIONS` configuration variable that can be
   the session cookie cross-subdomain wide.
 - autoescaping is no longer active for all templates.  Instead it
   is only active for ``.html``, ``.htm``, ``.xml`` and ``.xhtml``.
-  Inside templates this behaviour can be changed with the
+  Inside templates this behavior can be changed with the
   ``autoescape`` tag.
 - refactored Flask internally.  It now consists of more than a
   single file.
 - :func:`flask.send_file` now emits etags and has the ability to
   do conditional responses builtin.
 - (temporarily) dropped support for zipped applications.  This was a
-  rarely used feature and led to some confusing behaviour.
+  rarely used feature and led to some confusing behavior.
 - added support for per-package template and static-file directories.
 - removed support for `create_jinja_loader` which is no longer used
   in 0.5 due to the improved module support.
 
 Another thing that becomes possible when you have an explicit object lying
 around in your code is that you can subclass the base class
-(:class:`~flask.Flask`) to alter specific behaviour.  This would not be
+(:class:`~flask.Flask`) to alter specific behavior.  This would not be
 possible without hacks if the object were created ahead of time for you
 based on a class that is not exposed to you.
 

docs/extensiondev.rst

 a requirement because many people will use patterns like the
 :ref:`app-factories` pattern to create their application as needed to aid
 unittests and to support multiple configurations.  Because of that it is
-crucial that your application supports that kind of behaviour.
+crucial that your application supports that kind of behavior.
 
 Most importantly the extension must be shipped with a `setup.py` file and
 registered on PyPI.  Also the development checkout link should work so
 classes:
 
     Classes work mostly like initialization functions but can later be
-    used to further change the behaviour.  For an example look at how the
+    used to further change the behavior.  For an example look at how the
     `OAuth extension`_ works: there is an `OAuth` object that provides
     some helper functions like `OAuth.remote_app` to create a reference to
     a remote application that uses OAuth.
 "Web Applications 1.0" by the Web Hypertext Application Technology Working
 Group, or WHATWG (which was formed by the major browser vendors Apple,
 Mozilla, and Opera) with the goal of writing a new and improved HTML
-specification, based on existing browser behaviour instead of unrealistic
+specification, based on existing browser behavior instead of unrealistic
 and backwards-incompatible specifications.
 
 For example, in HTML4 ``<title/Hello/`` theoretically parses exactly the

docs/patterns/jquery.rst

 2. ``$('selector')`` selects an element and lets you operate on it.
 3. ``element.bind('event', func)`` specifies a function that should run
    when the user clicked on the element.  If that function returns
-   `false`, the default behaviour will not kick in (in this case, navigate
+   `false`, the default behavior will not kick in (in this case, navigate
    to the `#` URL).
 4. ``$.getJSON(url, data, func)`` sends a `GET` request to `url` and will
    send the contents of the `data` object as query parameters.  Once the

docs/patterns/mongokit.rst

 Declarative
 -----------
 
-The default behaviour of MongoKit is the declarative one that is based on
+The default behavior of MongoKit is the declarative one that is based on
 common ideas from Django or the SQLAlchemy declarative extension.
 
 Here an example `app.py` module for your application::
 `path`      like the default but also accepts slashes
 =========== ===========================================
 
-.. admonition:: Unique URLs / Redirection Behaviour
+.. admonition:: Unique URLs / Redirection Behavior
 
    Flask's URL rules are based on Werkzeug's routing module.  The idea
    behind that module is to ensure beautiful and unique URLs based on
 
    The :func:`flask.get_flashed_messages` function.
 
-.. admonition:: The Jinja Context Behaviour
+.. admonition:: The Jinja Context Behavior
 
    These variables are added to the context of variables, they are not
    global variables.  The difference is that by default these will not
     def make_default_options_response(self):
         """This method is called to create the default `OPTIONS` response.
         This can be changed through subclassing to change the default
-        behaviour of `OPTIONS` responses.
+        behavior of `OPTIONS` responses.
 
         .. versionadded:: 0.7
         """
         raise RuntimeError('simplejson not installed')
 
 
-# figure out if simplejson escapes slashes.  This behaviour was changed
+# figure out if simplejson escapes slashes.  This behavior was changed
 # from one version to another without reason.
 if not json_available or '\\/' not in json.dumps('/'):
 
 
     .. versionadded:: 0.9
         If the ``padded`` argument is true, the JSON object will be padded
-        for JSONP calls and the response mimetype will be changed to 
+        for JSONP calls and the response mimetype will be changed to
         ``application/javascript``. By default, the request arguments ``callback``
         and ``jsonp`` will be used as the name for the callback function.
         This will work with jQuery and most other JavaScript libraries
 
     .. versionadded:: 0.5
        The `add_etags`, `cache_timeout` and `conditional` parameters were
-       added.  The default behaviour is now to attach etags.
+       added.  The default behavior is now to attach etags.
 
     .. versionchanged:: 0.7
        mimetype guessing and etag support for file objects was
         file = filename_or_fp
         filename = getattr(file, 'name', None)
 
-        # XXX: this behaviour is now deprecated because it was unreliable.
+        # XXX: this behavior is now deprecated because it was unreliable.
         # removed in Flask 1.0
         if not attachment_filename and not mimetype \
            and isinstance(filename, basestring):
         if add_etags:
             warn(DeprecationWarning('In future flask releases etags will no '
                 'longer be generated for file objects passed to the send_file '
-                'function because this behaviour was unreliable.  Pass '
+                'function because this behavior was unreliable.  Pass '
                 'filenames instead if possible, otherwise attach an etag '
                 'yourself based on another value'), stacklevel=2)