Skip to content

Commit a3cb2a3

Browse files
committed
Use American English for "behavior" in docs.
Prompted by plaes on #pocoo, mitsuhiko confirmed to use American English.
1 parent 10c34e6 commit a3cb2a3

File tree

10 files changed

+18
-18
lines changed

10 files changed

+18
-18
lines changed

CHANGES

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ Released on June 28th 2011, codename Grappa
153153

154154
- Added :meth:`~flask.Flask.make_default_options_response`
155155
which can be used by subclasses to alter the default
156-
behaviour for `OPTIONS` responses.
156+
behavior for `OPTIONS` responses.
157157
- Unbound locals now raise a proper :exc:`RuntimeError` instead
158158
of an :exc:`AttributeError`.
159159
- Mimetype guessing and etag support based on file objects is now
@@ -163,7 +163,7 @@ Released on June 28th 2011, codename Grappa
163163
- Static file handling for modules now requires the name of the
164164
static folder to be supplied explicitly. The previous autodetection
165165
was not reliable and caused issues on Google's App Engine. Until
166-
1.0 the old behaviour will continue to work but issue dependency
166+
1.0 the old behavior will continue to work but issue dependency
167167
warnings.
168168
- fixed a problem for Flask to run on jython.
169169
- added a `PROPAGATE_EXCEPTIONS` configuration variable that can be
@@ -281,14 +281,14 @@ Released on July 6th 2010, codename Calvados
281281
the session cookie cross-subdomain wide.
282282
- autoescaping is no longer active for all templates. Instead it
283283
is only active for ``.html``, ``.htm``, ``.xml`` and ``.xhtml``.
284-
Inside templates this behaviour can be changed with the
284+
Inside templates this behavior can be changed with the
285285
``autoescape`` tag.
286286
- refactored Flask internally. It now consists of more than a
287287
single file.
288288
- :func:`flask.send_file` now emits etags and has the ability to
289289
do conditional responses builtin.
290290
- (temporarily) dropped support for zipped applications. This was a
291-
rarely used feature and led to some confusing behaviour.
291+
rarely used feature and led to some confusing behavior.
292292
- added support for per-package template and static-file directories.
293293
- removed support for `create_jinja_loader` which is no longer used
294294
in 0.5 due to the improved module support.

docs/design.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ allocated will be freed again.
4848

4949
Another thing that becomes possible when you have an explicit object lying
5050
around in your code is that you can subclass the base class
51-
(:class:`~flask.Flask`) to alter specific behaviour. This would not be
51+
(:class:`~flask.Flask`) to alter specific behavior. This would not be
5252
possible without hacks if the object were created ahead of time for you
5353
based on a class that is not exposed to you.
5454

docs/extensiondev.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ that it works with multiple Flask application instances at once. This is
4040
a requirement because many people will use patterns like the
4141
:ref:`app-factories` pattern to create their application as needed to aid
4242
unittests and to support multiple configurations. Because of that it is
43-
crucial that your application supports that kind of behaviour.
43+
crucial that your application supports that kind of behavior.
4444

4545
Most importantly the extension must be shipped with a `setup.py` file and
4646
registered on PyPI. Also the development checkout link should work so
@@ -145,7 +145,7 @@ initialization functions:
145145
classes:
146146

147147
Classes work mostly like initialization functions but can later be
148-
used to further change the behaviour. For an example look at how the
148+
used to further change the behavior. For an example look at how the
149149
`OAuth extension`_ works: there is an `OAuth` object that provides
150150
some helper functions like `OAuth.remote_app` to create a reference to
151151
a remote application that uses OAuth.

docs/htmlfaq.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ Development of the HTML5 specification was started in 2004 under the name
5252
"Web Applications 1.0" by the Web Hypertext Application Technology Working
5353
Group, or WHATWG (which was formed by the major browser vendors Apple,
5454
Mozilla, and Opera) with the goal of writing a new and improved HTML
55-
specification, based on existing browser behaviour instead of unrealistic
55+
specification, based on existing browser behavior instead of unrealistic
5656
and backwards-incompatible specifications.
5757

5858
For example, in HTML4 ``<title/Hello/`` theoretically parses exactly the

docs/patterns/jquery.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ explanation of the little bit of code above:
153153
2. ``$('selector')`` selects an element and lets you operate on it.
154154
3. ``element.bind('event', func)`` specifies a function that should run
155155
when the user clicked on the element. If that function returns
156-
`false`, the default behaviour will not kick in (in this case, navigate
156+
`false`, the default behavior will not kick in (in this case, navigate
157157
to the `#` URL).
158158
4. ``$.getJSON(url, data, func)`` sends a `GET` request to `url` and will
159159
send the contents of the `data` object as query parameters. Once the

docs/patterns/mongokit.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ here:
1717
Declarative
1818
-----------
1919

20-
The default behaviour of MongoKit is the declarative one that is based on
20+
The default behavior of MongoKit is the declarative one that is based on
2121
common ideas from Django or the SQLAlchemy declarative extension.
2222

2323
Here an example `app.py` module for your application::

docs/quickstart.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ The following converters exist:
166166
`path` like the default but also accepts slashes
167167
=========== ===========================================
168168

169-
.. admonition:: Unique URLs / Redirection Behaviour
169+
.. admonition:: Unique URLs / Redirection Behavior
170170

171171
Flask's URL rules are based on Werkzeug's routing module. The idea
172172
behind that module is to ensure beautiful and unique URLs based on

docs/templating.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ by default:
6363

6464
The :func:`flask.get_flashed_messages` function.
6565

66-
.. admonition:: The Jinja Context Behaviour
66+
.. admonition:: The Jinja Context Behavior
6767

6868
These variables are added to the context of variables, they are not
6969
global variables. The difference is that by default these will not

flask/app.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1360,7 +1360,7 @@ def try_trigger_before_first_request_functions(self):
13601360
def make_default_options_response(self):
13611361
"""This method is called to create the default `OPTIONS` response.
13621362
This can be changed through subclassing to change the default
1363-
behaviour of `OPTIONS` responses.
1363+
behavior of `OPTIONS` responses.
13641364
13651365
.. versionadded:: 0.7
13661366
"""

flask/helpers.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ def _assert_have_json():
6060
raise RuntimeError('simplejson not installed')
6161

6262

63-
# figure out if simplejson escapes slashes. This behaviour was changed
63+
# figure out if simplejson escapes slashes. This behavior was changed
6464
# from one version to another without reason.
6565
if not json_available or '\\/' not in json.dumps('/'):
6666

@@ -121,7 +121,7 @@ def get_current_user():
121121
122122
.. versionadded:: 0.9
123123
If the ``padded`` argument is true, the JSON object will be padded
124-
for JSONP calls and the response mimetype will be changed to
124+
for JSONP calls and the response mimetype will be changed to
125125
``application/javascript``. By default, the request arguments ``callback``
126126
and ``jsonp`` will be used as the name for the callback function.
127127
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,
387387
388388
.. versionadded:: 0.5
389389
The `add_etags`, `cache_timeout` and `conditional` parameters were
390-
added. The default behaviour is now to attach etags.
390+
added. The default behavior is now to attach etags.
391391
392392
.. versionchanged:: 0.7
393393
mimetype guessing and etag support for file objects was
@@ -422,7 +422,7 @@ def send_file(filename_or_fp, mimetype=None, as_attachment=False,
422422
file = filename_or_fp
423423
filename = getattr(file, 'name', None)
424424

425-
# XXX: this behaviour is now deprecated because it was unreliable.
425+
# XXX: this behavior is now deprecated because it was unreliable.
426426
# removed in Flask 1.0
427427
if not attachment_filename and not mimetype \
428428
and isinstance(filename, basestring):
@@ -433,7 +433,7 @@ def send_file(filename_or_fp, mimetype=None, as_attachment=False,
433433
if add_etags:
434434
warn(DeprecationWarning('In future flask releases etags will no '
435435
'longer be generated for file objects passed to the send_file '
436-
'function because this behaviour was unreliable. Pass '
436+
'function because this behavior was unreliable. Pass '
437437
'filenames instead if possible, otherwise attach an etag '
438438
'yourself based on another value'), stacklevel=2)
439439

0 commit comments

Comments
 (0)