diff options
| author | Tim Graham <timograham@gmail.com> | 2014-02-28 21:03:46 -0500 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2014-02-28 21:03:46 -0500 |
| commit | 1f5f015c32550c1424dd7804e8ee4717bcc5b9b7 (patch) | |
| tree | b789093482facf62b5e78d793817ca2687286992 /docs/ref | |
| parent | 8137215973c8cf97f58f244021b1a4e75923ade8 (diff) | |
Fixed spelling mistakes in docs.
Diffstat (limited to 'docs/ref')
| -rw-r--r-- | docs/ref/applications.txt | 2 | ||||
| -rw-r--r-- | docs/ref/contrib/gis/geoip.txt | 4 | ||||
| -rw-r--r-- | docs/ref/contrib/sites.txt | 2 | ||||
| -rw-r--r-- | docs/ref/databases.txt | 2 | ||||
| -rw-r--r-- | docs/ref/django-admin.txt | 2 | ||||
| -rw-r--r-- | docs/ref/migration-operations.txt | 4 | ||||
| -rw-r--r-- | docs/ref/models/instances.txt | 2 | ||||
| -rw-r--r-- | docs/ref/models/querysets.txt | 2 | ||||
| -rw-r--r-- | docs/ref/settings.txt | 2 | ||||
| -rw-r--r-- | docs/ref/utils.txt | 2 |
10 files changed, 12 insertions, 12 deletions
diff --git a/docs/ref/applications.txt b/docs/ref/applications.txt index b31f00337c..b29d21ac3b 100644 --- a/docs/ref/applications.txt +++ b/docs/ref/applications.txt @@ -157,7 +157,7 @@ Configurable attributes Short name for the application, e.g. ``'admin'`` - This attribute allows relabelling an application when two applications + This attribute allows relabeling an application when two applications have conflicting labels. It defaults to the last component of ``name``. It should be a valid Python identifier. diff --git a/docs/ref/contrib/gis/geoip.txt b/docs/ref/contrib/gis/geoip.txt index b6aca6b211..ec83a45aab 100644 --- a/docs/ref/contrib/gis/geoip.txt +++ b/docs/ref/contrib/gis/geoip.txt @@ -11,7 +11,7 @@ The :class:`GeoIP` object is a ctypes wrapper for the `MaxMind GeoIP C API`__. [#]_ In order to perform IP-based geolocation, the :class:`GeoIP` object requires -the GeoIP C libary and either the GeoIP `Country`__ or `City`__ +the GeoIP C library and either the GeoIP `Country`__ or `City`__ datasets in binary format (the CSV files will not work!). These datasets may be `downloaded from MaxMind`__. Grab the ``GeoLiteCountry/GeoIP.dat.gz`` and ``GeoLiteCity.dat.gz`` files and unzip them in a directory corresponding to what @@ -96,7 +96,7 @@ Defaults to ``'GeoLiteCity.dat'``. The ``GeoIP`` object does not require any parameters to use the default settings. However, at the very least the :setting:`GEOIP_PATH` setting should be set with the path of the location of your GeoIP data sets. The -following intialization keywords may be used to customize any of the +following initialization keywords may be used to customize any of the defaults. =================== ======================================================= diff --git a/docs/ref/contrib/sites.txt b/docs/ref/contrib/sites.txt index 36426af5a8..e9dd1134c2 100644 --- a/docs/ref/contrib/sites.txt +++ b/docs/ref/contrib/sites.txt @@ -173,7 +173,7 @@ readers sign up to get notifications when news happens. It's pretty basic: A reader signs up on a Web form and immediately gets an email saying, "Thanks for your subscription." -It'd be inefficient and redundant to implement this signup-processing code +It'd be inefficient and redundant to implement this sign up processing code twice, so the sites use the same code behind the scenes. But the "thank you for signing up" notice needs to be different for each site. By using :class:`~django.contrib.sites.models.Site` diff --git a/docs/ref/databases.txt b/docs/ref/databases.txt index 33f47914c2..7802ee1073 100644 --- a/docs/ref/databases.txt +++ b/docs/ref/databases.txt @@ -554,7 +554,7 @@ are passed into the query. So the :lookup:`iexact` filter will behave exactly the same as the :lookup:`exact` filter in these cases. Some possible workarounds for this are `documented at sqlite.org`_, but they -aren't utilised by the default SQLite backend in Django, as incorporating them +aren't utilized by the default SQLite backend in Django, as incorporating them would be fairly difficult to do robustly. Thus, Django exposes the default SQLite behavior and you should be aware of this when doing case-insensitive or substring filtering. diff --git a/docs/ref/django-admin.txt b/docs/ref/django-admin.txt index 724be51837..853f64b936 100644 --- a/docs/ref/django-admin.txt +++ b/docs/ref/django-admin.txt @@ -784,7 +784,7 @@ Write stderr to the *FILE* file. ``umask=UMASK`` -Umask to use when daemonizing. The value is interpeted as an octal number +Umask to use when daemonizing. The value is interpreted as an octal number (default value is ``022``). Example usage:: diff --git a/docs/ref/migration-operations.txt b/docs/ref/migration-operations.txt index cb77d7d93f..cad46f2d01 100644 --- a/docs/ref/migration-operations.txt +++ b/docs/ref/migration-operations.txt @@ -12,7 +12,7 @@ your migrations; that's why they're declarative, as it means Django can easily load them all into memory and run through them without touching the database to work out what your project should look like. -There are also more specialised Operation objects which are for things like +There are also more specialized Operation objects which are for things like :ref:`data migrations <data-migrations>` and for advanced manual database manipulation. You can also write your own Operation classes if you want to encapsulate a custom change you commonly make. @@ -221,7 +221,7 @@ SeparateDatabaseAndState SeparateDatabaseAndState(database_operations=None, state_operations=None) -A highly specalist operation that let you mix and match the database +A highly specialist operation that let you mix and match the database (schema-changing) and state (autodetector-powering) aspects of operations. It accepts two list of operations, and when asked to apply state will use the diff --git a/docs/ref/models/instances.txt b/docs/ref/models/instances.txt index 2371fd3c8a..21bcba4636 100644 --- a/docs/ref/models/instances.txt +++ b/docs/ref/models/instances.txt @@ -610,7 +610,7 @@ in ``get_absolute_url()`` and have all your other code call that one place. .. note:: The string you return from ``get_absolute_url()`` **must** contain only - ASCII characters (required by the URI specfication, :rfc:`2396`) and be + ASCII characters (required by the URI specification, :rfc:`2396`) and be URL-encoded, if necessary. Code and templates calling ``get_absolute_url()`` should be able to use the diff --git a/docs/ref/models/querysets.txt b/docs/ref/models/querysets.txt index 339b5e18fe..a160587953 100644 --- a/docs/ref/models/querysets.txt +++ b/docs/ref/models/querysets.txt @@ -2045,7 +2045,7 @@ Case-insensitive exact match. .. versionchanged:: 1.7 - If the value provided for comparision is ``None``, it will be interpreted + If the value provided for comparison is ``None``, it will be interpreted as an SQL ``NULL`` (see :lookup:`isnull` for more details). Example:: diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt index ebac2a8898..508ad4b56f 100644 --- a/docs/ref/settings.txt +++ b/docs/ref/settings.txt @@ -1800,7 +1800,7 @@ SILENCED_SYSTEM_CHECKS Default: ``[]`` -A list of identifers of messages generated by the system check framework +A list of identifiers of messages generated by the system check framework (i.e. ``["models.W001"]``) that you wish to permanently acknowledge and ignore. Silenced warnings will no longer be output to the console; silenced errors will still be printed, but will not prevent management commands from running. diff --git a/docs/ref/utils.txt b/docs/ref/utils.txt index 15242f030f..9e5bd41b67 100644 --- a/docs/ref/utils.txt +++ b/docs/ref/utils.txt @@ -900,7 +900,7 @@ For a complete discussion on the usage of the following see the :func:`django.utils.translation.activate` to fetch the translation object for a given language, installing it as the translation object for the current thread and reinstall the previous active language on exit. - Optionally it can simply deinstall the temporary translation on exit with + Optionally it can simply uninstall the temporary translation on exit with :func:`django.utils.translation.deactivate` if the deactivate argument is True. If you pass None as the language argument, a NullTranslations() instance is installed while the context is active. |
