summaryrefslogtreecommitdiff
path: root/docs/ref
diff options
context:
space:
mode:
authorDominic Rodger <dominicrodger+github@gmail.com>2013-08-05 17:23:26 +0100
committerBaptiste Mispelon <bmispelon@gmail.com>2013-11-18 16:03:00 +0100
commita9c50fccf295d3ff8915588cd6442f1c70f1af9a (patch)
tree2b5a712b68e4b97d2edca6163b844087d42775f1 /docs/ref
parent2b03d53438e7d54f754c58d8f148254a7a73ef5c (diff)
[1.6.x] Fixed #20852 - Fixed incorrectly generated left quotes in docs.
Sphinx generates left single quotes for apostrophes after code markup, when right single quotes are required. The easiest way to fix this is just by inserting the unicode character for a right single quote. Instances of the problem were found by looking for ">&#8216;" in the generated HTML. Backport of c33d1ca1d98003de29cdecb6080b52c5c52139bd from master.
Diffstat (limited to 'docs/ref')
-rw-r--r--docs/ref/class-based-views/mixins-date-based.txt2
-rw-r--r--docs/ref/contrib/admin/index.txt2
-rw-r--r--docs/ref/contrib/auth.txt2
-rw-r--r--docs/ref/contrib/comments/moderation.txt2
-rw-r--r--docs/ref/django-admin.txt2
-rw-r--r--docs/ref/models/options.txt2
-rw-r--r--docs/ref/settings.txt4
-rw-r--r--docs/ref/templates/api.txt2
8 files changed, 9 insertions, 9 deletions
diff --git a/docs/ref/class-based-views/mixins-date-based.txt b/docs/ref/class-based-views/mixins-date-based.txt
index 7003adfa06..f62a3b272d 100644
--- a/docs/ref/class-based-views/mixins-date-based.txt
+++ b/docs/ref/class-based-views/mixins-date-based.txt
@@ -230,7 +230,7 @@ DateMixin
.. attribute:: date_field
The name of the ``DateField`` or ``DateTimeField`` in the
- ``QuerySet``'s model that the date-based archive should use to
+ ``QuerySet``’s model that the date-based archive should use to
determine the list of objects to display on the page.
When :doc:`time zone support </topics/i18n/timezones>` is enabled and
diff --git a/docs/ref/contrib/admin/index.txt b/docs/ref/contrib/admin/index.txt
index f2d3824140..b6e7a58807 100644
--- a/docs/ref/contrib/admin/index.txt
+++ b/docs/ref/contrib/admin/index.txt
@@ -1590,7 +1590,7 @@ in your own admin JavaScript without including a second copy, you can use the
The embedded jQuery has been upgraded from 1.4.2 to 1.9.1.
The :class:`ModelAdmin` class requires jQuery by default, so there is no need
-to add jQuery to your ``ModelAdmin``'s list of media resources unless you have
+to add jQuery to your ``ModelAdmin``’s list of media resources unless you have
a specifc need. For example, if you require the jQuery library to be in the
global namespace (for example when using third-party jQuery plugins) or if you
need a newer version of jQuery, you will have to include your own copy.
diff --git a/docs/ref/contrib/auth.txt b/docs/ref/contrib/auth.txt
index 545263445a..2fd5b0794f 100644
--- a/docs/ref/contrib/auth.txt
+++ b/docs/ref/contrib/auth.txt
@@ -259,7 +259,7 @@ Manager methods
be called.
The ``extra_fields`` keyword arguments are passed through to the
- :class:`~django.contrib.auth.models.User`'s ``__init__`` method to
+ :class:`~django.contrib.auth.models.User`’s ``__init__`` method to
allow setting arbitrary fields on a :ref:`custom User model
<auth-custom-user>`.
diff --git a/docs/ref/contrib/comments/moderation.txt b/docs/ref/contrib/comments/moderation.txt
index 796e257200..5f0badfadb 100644
--- a/docs/ref/contrib/comments/moderation.txt
+++ b/docs/ref/contrib/comments/moderation.txt
@@ -54,7 +54,7 @@ following model, which would represent entries in a Weblog::
Now, suppose that we want the following steps to be applied whenever a
new comment is posted on an ``Entry``:
-1. If the ``Entry``'s ``enable_comments`` field is ``False``, the
+1. If the ``Entry``’s ``enable_comments`` field is ``False``, the
comment will simply be disallowed (i.e., immediately deleted).
2. If the ``enable_comments`` field is ``True``, the comment will be
diff --git a/docs/ref/django-admin.txt b/docs/ref/django-admin.txt
index dc45bbff21..b85f5454b1 100644
--- a/docs/ref/django-admin.txt
+++ b/docs/ref/django-admin.txt
@@ -572,7 +572,7 @@ several lines in language files.
.. django-admin-option:: --no-location
-Use the ``--no-location`` option to not write '``#: filename:line``'
+Use the ``--no-location`` option to not write '``#: filename:line``’
comment lines in language files. Note that using this option makes it harder
for technically skilled translators to understand each message's context.
diff --git a/docs/ref/models/options.txt b/docs/ref/models/options.txt
index fd78638898..6b9ed4aef2 100644
--- a/docs/ref/models/options.txt
+++ b/docs/ref/models/options.txt
@@ -97,7 +97,7 @@ Django quotes column and table names behind the scenes.
The name of an orderable field in the model, typically a :class:`DateField`,
:class:`DateTimeField`, or :class:`IntegerField`. This specifies the default
- field to use in your model :class:`Manager`'s
+ field to use in your model :class:`Manager`’s
:meth:`~django.db.models.query.QuerySet.latest` and
:meth:`~django.db.models.query.QuerySet.earliest` methods.
diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt
index d327013cac..b4c85967c2 100644
--- a/docs/ref/settings.txt
+++ b/docs/ref/settings.txt
@@ -1752,7 +1752,7 @@ Default::
A tuple of template loader classes, specified as strings. Each ``Loader`` class
knows how to import templates from a particular source. Optionally, a tuple can be
-used instead of a string. The first item in the tuple should be the ``Loader``'s
+used instead of a string. The first item in the tuple should be the ``Loader``’s
module, subsequent items are passed to the ``Loader`` during initialization. See
:doc:`/ref/templates/api`.
@@ -2528,7 +2528,7 @@ files</howto/static-files/index>` for more details about usage.
your static files from their permanent locations into one directory for
ease of deployment; it is **not** a place to store your static files
permanently. You should do that in directories that will be found by
- :doc:`staticfiles</ref/contrib/staticfiles>`'s
+ :doc:`staticfiles</ref/contrib/staticfiles>`’s
:setting:`finders<STATICFILES_FINDERS>`, which by default, are
``'static/'`` app sub-directories and any directories you include in
:setting:`STATICFILES_DIRS`).
diff --git a/docs/ref/templates/api.txt b/docs/ref/templates/api.txt
index 6a9efc0811..669016ae00 100644
--- a/docs/ref/templates/api.txt
+++ b/docs/ref/templates/api.txt
@@ -683,7 +683,7 @@ class. Here are the template loaders that come with Django:
with your own ``admin/base_site.html`` in ``myproject.polls``. You must
then make sure that your ``myproject.polls`` comes *before*
``django.contrib.admin`` in :setting:`INSTALLED_APPS`, otherwise
- ``django.contrib.admin``'s will be loaded first and yours will be ignored.
+ ``django.contrib.admin``’s will be loaded first and yours will be ignored.
Note that the loader performs an optimization when it is first imported:
it caches a list of which :setting:`INSTALLED_APPS` packages have a