summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2013-09-06 16:15:35 -0400
committerTim Graham <timograham@gmail.com>2013-09-06 16:15:35 -0400
commit5ca290f5db3a5f735cdbdc7130c044192beb7f66 (patch)
treeb7832bb382a91d4a49fcbb21e210548d3c96e515
parentdb3de528071ac66903f82c2fe5b34db4a5281f5b (diff)
Fixed some sphinx errors and added some links.
-rw-r--r--docs/ref/contrib/admin/index.txt12
-rw-r--r--docs/releases/1.7.txt6
2 files changed, 13 insertions, 5 deletions
diff --git a/docs/ref/contrib/admin/index.txt b/docs/ref/contrib/admin/index.txt
index aecf2e8067..24fdc9d539 100644
--- a/docs/ref/contrib/admin/index.txt
+++ b/docs/ref/contrib/admin/index.txt
@@ -2175,17 +2175,23 @@ Templates can override or extend base admin templates as described in
`Overriding Admin Templates`_.
.. attribute:: AdminSite.site_header
-.. versionadded:: 1.7
+
+ .. versionadded:: 1.7
+
The text to put at the top of each admin page, as an ``<h1>`` (a string).
By default, this is "Django administration".
.. attribute:: AdminSite.site_title
-.. versionadded:: 1.7
+
+ .. versionadded:: 1.7
+
The text to put at the end of each admin page's ``<title>`` (a string). By
default, this is "Django site admin".
.. attribute:: AdminSite.index_title
-.. versionadded:: 1.7
+
+ .. versionadded:: 1.7
+
The text to put at the top of the admin index page (a string). By default,
this is "Site administration".
diff --git a/docs/releases/1.7.txt b/docs/releases/1.7.txt
index 605ea4d5a0..4177b464d6 100644
--- a/docs/releases/1.7.txt
+++ b/docs/releases/1.7.txt
@@ -111,8 +111,10 @@ Minor features
:mod:`django.contrib.admin`
^^^^^^^^^^^^^^^^^^^^^^^^^^^
-* You can now implement ``site_header``, ``site_title`` and ``index_title``
- attributes on a custom ``AdminSite`` in order to easily change the admin
+* You can now implement :attr:`~django.contrib.admin.AdminSite.site_header`,
+ :attr:`~django.contrib.admin.AdminSite.site_title`, and
+ :attr:`~django.contrib.admin.AdminSite.index_title` attributes on a custom
+ :class:`~django.contrib.admin.AdminSite` in order to easily change the admin
site's page title and header text. No more needing to override templates!
* Buttons in :mod:`django.contrib.admin` now use the ``border-radius`` CSS