Commit 93cffc3b authored by Tim Graham's avatar Tim Graham
Browse files

Added missing markup to docs.

parent 0df59bc2
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -222,9 +222,9 @@ parameters:
* :attr:`~django.db.models.Field.db_tablespace`: Only for index creation, if the
  backend supports :doc:`tablespaces </topics/db/tablespaces>`. You can usually
  ignore this option.
* ``auto_created``: True if the field was
  automatically created, as for the `OneToOneField` used by model
  inheritance. For advanced use only.
* ``auto_created``: ``True`` if the field was automatically created, as for the
  :class:`~django.db.models.OneToOneField` used by model inheritance. For
  advanced use only.

All of the options without an explanation in the above list have the same
meaning they do for normal Django fields. See the :doc:`field documentation
+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ See the :doc:`Django 1.3 release notes</releases/1.3>` for more details on
these changes.

* Starting Django without a :setting:`SECRET_KEY` will result in an exception
  rather than a `DeprecationWarning`. (This is accelerated from the usual
  rather than a ``DeprecationWarning``. (This is accelerated from the usual
  deprecation path; see the :doc:`Django 1.4 release notes</releases/1.4>`.)

* The ``mod_python`` request handler will be removed. The ``mod_wsgi``
+2 −2
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ with::
        url(r'^admin/', include(admin.site.urls)),
    )

You have now wired an `index` view into the URLconf. Go to
You have now wired an ``index`` view into the URLconf. Go to
http://localhost:8000/polls/ in your browser, and you should see the text
"*Hello, world. You're at the poll index.*", which you defined in the
``index`` view.
@@ -119,7 +119,7 @@ At this point, it's worth reviewing what these arguments are for.
:func:`~django.conf.urls.url` argument: regex
---------------------------------------------

The term `regex` is a commonly used short form meaning `regular expression`,
The term "regex" is a commonly used short form meaning "regular expression",
which is a syntax for matching patterns in strings, or in this case, url
patterns. Django starts at the first regular expression and makes its way down
the list,  comparing the requested URL against each regular expression until it
+8 −8
Original line number Diff line number Diff line
@@ -35,8 +35,8 @@ YearMixin
        Tries the following sources, in order:

        * The value of the :attr:`YearMixin.year` attribute.
        * The value of the `year` argument captured in the URL pattern.
        * The value of the `year` GET query argument.
        * The value of the ``year`` argument captured in the URL pattern.
        * The value of the ``year`` ``GET`` query argument.

        Raises a 404 if no valid year specification can be found.

@@ -87,8 +87,8 @@ MonthMixin
        Tries the following sources, in order:

        * The value of the :attr:`MonthMixin.month` attribute.
        * The value of the `month` argument captured in the URL pattern.
        * The value of the `month` GET query argument.
        * The value of the ``month`` argument captured in the URL pattern.
        * The value of the ``month`` ``GET`` query argument.

        Raises a 404 if no valid month specification can be found.

@@ -139,8 +139,8 @@ DayMixin
        Tries the following sources, in order:

        * The value of the :attr:`DayMixin.day` attribute.
        * The value of the `day` argument captured in the URL pattern.
        * The value of the `day` GET query argument.
        * The value of the ``day`` argument captured in the URL pattern.
        * The value of the ``day`` ``GET`` query argument.

        Raises a 404 if no valid day specification can be found.

@@ -192,8 +192,8 @@ WeekMixin
        Tries the following sources, in order:

        * The value of the :attr:`WeekMixin.week` attribute.
        * The value of the `week` argument captured in the URL pattern
        * The value of the `week` GET query argument.
        * The value of the ``week`` argument captured in the URL pattern
        * The value of the ``week`` ``GET`` query argument.

        Raises a 404 if no valid week specification can be found.

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ SingleObjectMixin
        this view will display. By default, :meth:`get_queryset` returns the
        value of the :attr:`queryset` attribute if it is set, otherwise
        it constructs a :class:`~django.db.models.query.QuerySet` by calling
        the `all()` method on the :attr:`model` attribute's default manager.
        the ``all()`` method on the :attr:`model` attribute's default manager.

    .. method:: get_context_object_name(obj)

Loading