summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2014-10-16 20:00:17 -0400
committerTim Graham <timograham@gmail.com>2014-10-16 20:02:23 -0400
commit0569e0dd74566603029dde791ed31436d42862b4 (patch)
treebeb4a2bdf479714e492a57386355c2140e4b1278 /docs
parenta1a54b00d289579af9ff50dee46db12bae775f01 (diff)
[1.7.x] Fixed some intersphinx references.
Backport of babbf18999 from master
Diffstat (limited to 'docs')
-rw-r--r--docs/glossary.txt2
-rw-r--r--docs/topics/http/sessions.txt2
-rw-r--r--docs/topics/python3.txt2
3 files changed, 3 insertions, 3 deletions
diff --git a/docs/glossary.txt b/docs/glossary.txt
index 0195b9d4c8..abb0a277a6 100644
--- a/docs/glossary.txt
+++ b/docs/glossary.txt
@@ -46,7 +46,7 @@ Glossary
version 2.2. This is a neat way to implement attributes whose usage
resembles attribute access, but whose implementation uses method calls.
- See :func:`property`.
+ See :class:`property`.
queryset
An object representing some set of rows to be fetched from the database.
diff --git a/docs/topics/http/sessions.txt b/docs/topics/http/sessions.txt
index 4da64a1800..3783b90101 100644
--- a/docs/topics/http/sessions.txt
+++ b/docs/topics/http/sessions.txt
@@ -286,7 +286,7 @@ You can edit it multiple times.
- ``modification``: last modification of the session, as a
:class:`~datetime.datetime` object. Defaults to the current time.
- ``expiry``: expiry information for the session, as a
- :class:`~datetime.datetime` object, an :func:`int` (in seconds), or
+ :class:`~datetime.datetime` object, an :class:`int` (in seconds), or
``None``. Defaults to the value stored in the session by
:meth:`set_expiry`, if there is one, or ``None``.
diff --git a/docs/topics/python3.txt b/docs/topics/python3.txt
index 9daba275c6..7769fe8537 100644
--- a/docs/topics/python3.txt
+++ b/docs/topics/python3.txt
@@ -79,7 +79,7 @@ String handling
---------------
Python 2's `unicode`_ type was renamed :class:`str` in Python 3,
-``str()`` was renamed :func:`bytes`, and `basestring`_ disappeared.
+``str()`` was renamed :class:`bytes`, and `basestring`_ disappeared.
six_ provides :ref:`tools <string-handling-with-six>` to deal with these
changes.