[1.6.x] Fixed some intersphinx references.

Backport of babbf18999 from master

3 files changed, 6 insertions, 6 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 43cfd77bc1..81ef757a74 100644
--- a/docs/topics/http/sessions.txt
+++ b/docs/topics/http/sessions.txt
@@ -285,7 +285,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 15c07ccbf0..f1a5f3c140 100644
--- a/docs/topics/python3.txt
+++ b/docs/topics/python3.txt
@@ -78,8 +78,8 @@ wherever possible and avoid the ``b`` prefixes.
 String handling
 ---------------
 
-Python 2's :func:`unicode` type was renamed :func:`str` in Python 3,
-:func:`str` was renamed ``bytes()``, and :func:`basestring` disappeared.
+Python 2's :func:`unicode` type was renamed ``str()`` in Python 3,
+``str()`` was renamed ``bytes()``, and :func:`basestring` disappeared.
 six_ provides :ref:`tools <string-handling-with-six>` to deal with these
 changes.
 
@@ -138,7 +138,7 @@ In Python 2, the object model specifies :meth:`~object.__str__` and
 :meth:`~object.__unicode__` methods. If these methods exist, they must return
 ``str`` (bytes) and ``unicode`` (text) respectively.
 
-The ``print`` statement and the :func:`str` built-in call
+The ``print`` statement and the :class:`str` built-in call
 :meth:`~object.__str__` to determine the human-readable representation of an
 object. The :func:`unicode` built-in calls :meth:`~object.__unicode__` if it
 exists, and otherwise falls back to :meth:`~object.__str__` and decodes the
@@ -233,7 +233,7 @@ In order to enable the same behavior in Python 2, every module must import
     my_bytestring = b"This is a bytestring"
 
 If you need a byte string literal under Python 2 and a unicode string literal
-under Python 3, use the :func:`str` builtin::
+under Python 3, use the :class:`str` builtin::
 
     str('my string')