diff --git a/docs/glossary.txt b/docs/glossary.txt index 8899ae744d..3a4ad6fed3 100644 --- a/docs/glossary.txt +++ b/docs/glossary.txt @@ -50,7 +50,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 b97dc1bc79..32d26f003c 100644 --- a/docs/topics/http/sessions.txt +++ b/docs/topics/http/sessions.txt @@ -291,7 +291,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 ` to deal with these changes.