diff --git a/django/utils/cache.py b/django/utils/cache.py index 375c34d7ad..f74056cafa 100644 --- a/django/utils/cache.py +++ b/django/utils/cache.py @@ -168,7 +168,7 @@ def _i18n_cache_key_suffix(request, cache_key): cache_key += '.%s' % getattr(request, 'LANGUAGE_CODE', get_language()) if settings.USE_TZ: # The datetime module doesn't restrict the output of tzname(). - # Windows is known to use non-standard, locale-dependant names. + # Windows is known to use non-standard, locale-dependent names. # User-defined tzinfo classes may return absolutely anything. # Hence this paranoid conversion to create a valid cache key. tz_name = force_text(get_current_timezone_name(), errors='ignore') diff --git a/django/utils/feedgenerator.py b/django/utils/feedgenerator.py index 01217d5bb5..a5bdec22ee 100644 --- a/django/utils/feedgenerator.py +++ b/django/utils/feedgenerator.py @@ -33,7 +33,7 @@ from django.utils.six.moves.urllib.parse import urlparse from django.utils.timezone import is_aware def rfc2822_date(date): - # We can't use strftime() because it produces locale-dependant results, so + # We can't use strftime() because it produces locale-dependent results, so # we have to map english month and day names manually months = ('Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec',) days = ('Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun') diff --git a/docs/ref/templates/builtins.txt b/docs/ref/templates/builtins.txt index 3896f80e77..48412239ad 100644 --- a/docs/ref/templates/builtins.txt +++ b/docs/ref/templates/builtins.txt @@ -2028,7 +2028,7 @@ Formats a time according to the given format. Given format can be the predefined one :setting:`TIME_FORMAT`, or a custom format, same as the :tfilter:`date` filter. Note that the predefined format -is locale-dependant. +is locale-dependent. For example:: diff --git a/docs/topics/i18n/translation.txt b/docs/topics/i18n/translation.txt index 08e87b1425..41887d16ba 100644 --- a/docs/topics/i18n/translation.txt +++ b/docs/topics/i18n/translation.txt @@ -991,8 +991,8 @@ for a given version of a site — it's a good candidate for caching. Server-side caching will reduce CPU load. It's easily implemented with the :func:`~django.views.decorators.cache.cache_page` decorator. To trigger cache -invalidation when your translations change, provide a version-dependant key -prefix, as shown in the example below, or map the view at a version-dependant +invalidation when your translations change, provide a version-dependent key +prefix, as shown in the example below, or map the view at a version-dependent URL. .. code-block:: python