From 98de90d3d81f5db9e969e70b8ce3f0e368726208 Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Sat, 9 Nov 2013 10:17:17 -0500 Subject: [PATCH] Fixed spelling of compatibility. --- django/template/base.py | 2 +- docs/internals/contributing/writing-code/coding-style.txt | 2 +- docs/internals/deprecation.txt | 2 +- docs/ref/signals.txt | 4 ++-- docs/releases/1.5.5.txt | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/django/template/base.py b/django/template/base.py index 83d7403ac71..fd87b33c5da 100644 --- a/django/template/base.py +++ b/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, diff --git a/docs/internals/contributing/writing-code/coding-style.txt b/docs/internals/contributing/writing-code/coding-style.txt index 3d087b43c23..afcf9c072cb 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 eb7df979dec..f2e2c4c2f77 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 fa7548f679c..051f1fa9153 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 ebd3dc73d18..a1f5ca45def 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).