summaryrefslogtreecommitdiff
path: root/docs/topics
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/topics
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/topics')
-rw-r--r--docs/topics/class-based-views/mixins.txt2
-rw-r--r--docs/topics/db/managers.txt4
-rw-r--r--docs/topics/db/queries.txt2
-rw-r--r--docs/topics/db/tablespaces.txt2
-rw-r--r--docs/topics/forms/modelforms.txt4
5 files changed, 7 insertions, 7 deletions
diff --git a/docs/topics/class-based-views/mixins.txt b/docs/topics/class-based-views/mixins.txt
index 96b5e9f498..2132b4ffa3 100644
--- a/docs/topics/class-based-views/mixins.txt
+++ b/docs/topics/class-based-views/mixins.txt
@@ -288,7 +288,7 @@ object. In order to do this, we need to have two different querysets:
``Book`` queryset for use by :class:`~django.views.generic.list.ListView`
Since we have access to the ``Publisher`` whose books we want to list, we
- simply override ``get_queryset()`` and use the ``Publisher``'s
+ simply override ``get_queryset()`` and use the ``Publisher``’s
:ref:`reverse foreign key manager<backwards-related-objects>`.
``Publisher`` queryset for use in :meth:`~django.views.generic.detail.SingleObjectMixin.get_object()`
diff --git a/docs/topics/db/managers.txt b/docs/topics/db/managers.txt
index b940b09d33..93602d7666 100644
--- a/docs/topics/db/managers.txt
+++ b/docs/topics/db/managers.txt
@@ -100,7 +100,7 @@ access ``self.model`` to get the model class to which they're attached.
Modifying initial Manager QuerySets
-----------------------------------
-A ``Manager``'s base ``QuerySet`` returns all objects in the system. For
+A ``Manager``’s base ``QuerySet`` returns all objects in the system. For
example, using this model::
from django.db import models
@@ -111,7 +111,7 @@ example, using this model::
...the statement ``Book.objects.all()`` will return all books in the database.
-You can override a ``Manager``\'s base ``QuerySet`` by overriding the
+You can override a ``Manager``’s base ``QuerySet`` by overriding the
``Manager.get_queryset()`` method. ``get_queryset()`` should return a
``QuerySet`` with the properties you require.
diff --git a/docs/topics/db/queries.txt b/docs/topics/db/queries.txt
index f6ae90062b..b4cc8e2955 100644
--- a/docs/topics/db/queries.txt
+++ b/docs/topics/db/queries.txt
@@ -724,7 +724,7 @@ efficient code.
In a newly created :class:`~django.db.models.query.QuerySet`, the cache is
empty. The first time a :class:`~django.db.models.query.QuerySet` is evaluated
-- and, hence, a database query happens -- Django saves the query results in
-the :class:`~django.db.models.query.QuerySet`\'s cache and returns the results
+the :class:`~django.db.models.query.QuerySet`’s cache and returns the results
that have been explicitly requested (e.g., the next element, if the
:class:`~django.db.models.query.QuerySet` is being iterated over). Subsequent
evaluations of the :class:`~django.db.models.query.QuerySet` reuse the cached
diff --git a/docs/topics/db/tablespaces.txt b/docs/topics/db/tablespaces.txt
index 8bf1d07bca..115887f512 100644
--- a/docs/topics/db/tablespaces.txt
+++ b/docs/topics/db/tablespaces.txt
@@ -30,7 +30,7 @@ Declaring tablespaces for indexes
---------------------------------
You can pass the :attr:`~django.db.models.Field.db_tablespace` option to a
-``Field`` constructor to specify an alternate tablespace for the ``Field``'s
+``Field`` constructor to specify an alternate tablespace for the ``Field``’s
column index. If no index would be created for the column, the option is
ignored.
diff --git a/docs/topics/forms/modelforms.txt b/docs/topics/forms/modelforms.txt
index 543a5e11ba..8be945d690 100644
--- a/docs/topics/forms/modelforms.txt
+++ b/docs/topics/forms/modelforms.txt
@@ -392,7 +392,7 @@ these security concerns do not apply to you:
model = Author
fields = '__all__'
-2. Set the ``exclude`` attribute of the ``ModelForm``'s inner ``Meta`` class to
+2. Set the ``exclude`` attribute of the ``ModelForm``’s inner ``Meta`` class to
a list of fields to be excluded from the form.
For example::
@@ -768,7 +768,7 @@ Specifying widgets to use in the form with ``widgets``
.. versionadded:: 1.6
Using the ``widgets`` parameter, you can specify a dictionary of values to
-customize the ``ModelForm``'s widget class for a particular field. This
+customize the ``ModelForm``’s widget class for a particular field. This
works the same way as the ``widgets`` dictionary on the inner ``Meta``
class of a ``ModelForm`` works::