summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2013-11-09 10:17:17 -0500
committerTim Graham <timograham@gmail.com>2013-11-09 10:17:17 -0500
commit98de90d3d81f5db9e969e70b8ce3f0e368726208 (patch)
tree087668c3fb0bc8f8720a5a9b0d89041bf616c477 /docs
parentd15985d81ff1c3b353a48a87189b7847798214c0 (diff)
Fixed spelling of compatibility.
Diffstat (limited to 'docs')
-rw-r--r--docs/internals/contributing/writing-code/coding-style.txt2
-rw-r--r--docs/internals/deprecation.txt2
-rw-r--r--docs/ref/signals.txt4
-rw-r--r--docs/releases/1.5.5.txt2
4 files changed, 5 insertions, 5 deletions
diff --git a/docs/internals/contributing/writing-code/coding-style.txt b/docs/internals/contributing/writing-code/coding-style.txt
index 3d087b43c2..afcf9c072c 100644
--- a/docs/internals/contributing/writing-code/coding-style.txt
+++ b/docs/internals/contributing/writing-code/coding-style.txt
@@ -198,7 +198,7 @@ Miscellaneous
* Remove ``import`` statements that are no longer used when you change code.
`flake8`_ will identify these imports for you. If an unused import needs to
- remain for backwards-compatability, mark the end of of with ``# NOQA`` to
+ remain for backwards-compatibility, mark the end of of with ``# NOQA`` to
silence the flake8 warning.
* Systematically remove all trailing whitespaces from your code as those
diff --git a/docs/internals/deprecation.txt b/docs/internals/deprecation.txt
index eb7df979de..f2e2c4c2f7 100644
--- a/docs/internals/deprecation.txt
+++ b/docs/internals/deprecation.txt
@@ -451,7 +451,7 @@ these changes.
* Instances of ``util.py`` in the Django codebase have been renamed to
``utils.py`` in an effort to unify all util and utils references.
- The modules that provided backwards compatability will be removed:
+ The modules that provided backwards compatibility will be removed:
* ``django.contrib.admin.util``
* ``django.contrib.gis.db.backends.util``
diff --git a/docs/ref/signals.txt b/docs/ref/signals.txt
index fa7548f679..051f1fa915 100644
--- a/docs/ref/signals.txt
+++ b/docs/ref/signals.txt
@@ -410,7 +410,7 @@ pre_syncdb
This signal has been renamed to :data:`~django.db.models.signals.pre_migrate`.
Alias of :data:`django.db.models.signals.pre_migrate`. As long as this alias
-is present, for backwards-compatability this signal has an extra argument it sends:
+is present, for backwards-compatibility this signal has an extra argument it sends:
``create_models``
A list of the model classes from any app which :djadmin:`migrate` is
@@ -484,7 +484,7 @@ post_syncdb
This signal has been renamed to :data:`~django.db.models.signals.post_migrate`.
Alias of :data:`django.db.models.signals.post_migrate`. As long as this alias
-is present, for backwards-compatability this signal has an extra argument it sends:
+is present, for backwards-compatibility this signal has an extra argument it sends:
``created_models``
A list of the model classes from any app which :djadmin:`migrate` has
diff --git a/docs/releases/1.5.5.txt b/docs/releases/1.5.5.txt
index ebd3dc73d1..a1f5ca45de 100644
--- a/docs/releases/1.5.5.txt
+++ b/docs/releases/1.5.5.txt
@@ -25,7 +25,7 @@ Bugfixes
========
* Fixed a data corruption bug with ``datetime_safe.datetime.combine`` (#21256).
-* Fixed a Python 3 incompatability in ``django.utils.text.unescape_entities()``
+* Fixed a Python 3 incompatibility in ``django.utils.text.unescape_entities()``
(#21185).
* Fixed a couple data corruption issues with ``QuerySet`` edge cases under
Oracle and MySQL (#21203, #21126).