Permalink
Browse files

Use American English for "behavior" in docs.

Prompted by plaes on #pocoo, mitsuhiko confirmed to use American English.
  • Loading branch information...
1 parent 10c34e6 commit a3cb2a33829ee517530d30cd920e5d652b358086 @rduplain rduplain committed Apr 19, 2012
Showing with 18 additions and 18 deletions.
  1. +4 −4 CHANGES
  2. +1 −1 docs/design.rst
  3. +2 −2 docs/extensiondev.rst
  4. +1 −1 docs/htmlfaq.rst
  5. +1 −1 docs/patterns/jquery.rst
  6. +1 −1 docs/patterns/mongokit.rst
  7. +1 −1 docs/quickstart.rst
  8. +1 −1 docs/templating.rst
  9. +1 −1 flask/app.py
  10. +5 −5 flask/helpers.py
View
@@ -153,7 +153,7 @@ Released on June 28th 2011, codename Grappa
- 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
@@ -163,7 +163,7 @@ Released on June 28th 2011, codename Grappa
- 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
@@ -281,14 +281,14 @@ Released on July 6th 2010, codename Calvados
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.
View
@@ -48,7 +48,7 @@ allocated will be freed again.
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.
View
@@ -40,7 +40,7 @@ that it works with multiple Flask application instances at once. This is
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
@@ -145,7 +145,7 @@ initialization functions:
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.
View
@@ -52,7 +52,7 @@ Development of the HTML5 specification was started in 2004 under the name
"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
View
@@ -153,7 +153,7 @@ explanation of the little bit of code above:
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
@@ -17,7 +17,7 @@ here:
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::
View
@@ -166,7 +166,7 @@ The following converters exist:
`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
View
@@ -63,7 +63,7 @@ by default:
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
View
@@ -1360,7 +1360,7 @@ def try_trigger_before_first_request_functions(self):
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
"""
View
@@ -60,7 +60,7 @@ def _assert_have_json():
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('/'):
@@ -121,7 +121,7 @@ def get_current_user():
.. 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
@@ -387,7 +387,7 @@ def send_file(filename_or_fp, mimetype=None, as_attachment=False,
.. 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
@@ -422,7 +422,7 @@ def send_file(filename_or_fp, mimetype=None, as_attachment=False,
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):
@@ -433,7 +433,7 @@ def send_file(filename_or_fp, mimetype=None, as_attachment=False,
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)

0 comments on commit a3cb2a3

Please sign in to comment.