Browse Source

Fixed spelling of compatibility.

Tim Graham 11 years ago
parent
commit
98de90d3d8

+ 1 - 1
django/template/base.py

@@ -6,7 +6,7 @@ from importlib import import_module
 from inspect import getargspec, getcallargs
 
 from django.conf import settings
-from django.template.context import (BaseContext, Context, RequestContext,  # NOQA: imported for backwards compatability
+from django.template.context import (BaseContext, Context, RequestContext,  # NOQA: imported for backwards compatibility
     ContextPopException)
 from django.utils.itercompat import is_iterable
 from django.utils.text import (smart_split, unescape_string_literal,

+ 1 - 1
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

+ 1 - 1
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``

+ 2 - 2
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

+ 1 - 1
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).