diff options
Diffstat (limited to 'docs/internals')
| -rw-r--r-- | docs/internals/contributing.txt | 2 | ||||
| -rw-r--r-- | docs/internals/deprecation.txt | 6 | ||||
| -rw-r--r-- | docs/internals/svn.txt | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/docs/internals/contributing.txt b/docs/internals/contributing.txt index 33ee50a7b4..220ed5db61 100644 --- a/docs/internals/contributing.txt +++ b/docs/internals/contributing.txt @@ -472,7 +472,7 @@ to do: * Then, click the "Join this Team" button to become a member of this team. Every team has at least one coordinator who is responsible to review your membership request. You can of course also contact the team - coordinator to clarify procedual problems and handle the actual + coordinator to clarify procedural problems and handle the actual translation process. * Once you are a member of a team choose the translation resource you diff --git a/docs/internals/deprecation.txt b/docs/internals/deprecation.txt index 72152544f0..66866c2a30 100644 --- a/docs/internals/deprecation.txt +++ b/docs/internals/deprecation.txt @@ -20,7 +20,7 @@ their deprecation, as per the :ref:`Django deprecation policy * 1.4 * ``CsrfResponseMiddleware``. This has been deprecated since the 1.2 - release, in favour of the template tag method for inserting the CSRF + release, in favor of the template tag method for inserting the CSRF token. ``CsrfMiddleware``, which combines ``CsrfResponseMiddleware`` and ``CsrfViewMiddleware``, is also deprecated. @@ -126,7 +126,7 @@ their deprecation, as per the :ref:`Django deprecation policy * The undocumented function :func:`django.contrib.formtools.utils.security_hash` - is deprecated, in favour of :func:`django.contrib.formtools.utils.form_hmac` + is deprecated, in favor of :func:`django.contrib.formtools.utils.form_hmac` * The function-based generic views have been deprecated in favor of their class-based cousins. The following modules @@ -158,7 +158,7 @@ their deprecation, as per the :ref:`Django deprecation policy a :class:`~django.contrib.gis.geos.GEOSException` when called on a geometry with no SRID value. - * :class:`~django.http.CompatCookie` will be removed in favour of + * :class:`~django.http.CompatCookie` will be removed in favor of :class:`~django.http.SimpleCookie`. * :class:`django.core.context_processors.PermWrapper` and diff --git a/docs/internals/svn.txt b/docs/internals/svn.txt index 9efbe28913..58cabd1ba0 100644 --- a/docs/internals/svn.txt +++ b/docs/internals/svn.txt @@ -199,7 +199,7 @@ branch ``django/branches/releases/1.0.X`` was created to receive bug fixes, and shortly after the release of Django 1.1 the branch ``django/branches/releases/1.1.X`` was created. -Prior to the Django 1.0 release, these branches were maintaind within +Prior to the Django 1.0 release, these branches were maintained within the top-level ``django/branches`` directory, and so the following branches exist there and provided support for older Django releases: |