summaryrefslogtreecommitdiff
path: root/docs/ref/contrib/admin
diff options
context:
space:
mode:
authorJames Bennett <james@b-list.org>2013-06-20 01:51:20 -0500
committerTim Graham <timograham@gmail.com>2013-07-08 14:09:02 -0400
commitb2afe396635e2de5b3a917a61350cd96fbde9ab7 (patch)
tree707ec3e7f9392652f086a76f01dfb1258a2ce125 /docs/ref/contrib/admin
parent730069197fd29d7b055a260a1344802b16415fb4 (diff)
[1.6.x] Fixed #19695 -- Retitle "Form Media" to "Form Assets".
Backport of c0f03175ce from master
Diffstat (limited to 'docs/ref/contrib/admin')
-rw-r--r--docs/ref/contrib/admin/index.txt10
1 files changed, 5 insertions, 5 deletions
diff --git a/docs/ref/contrib/admin/index.txt b/docs/ref/contrib/admin/index.txt
index a22a51e8fb..e5e9428805 100644
--- a/docs/ref/contrib/admin/index.txt
+++ b/docs/ref/contrib/admin/index.txt
@@ -1554,13 +1554,13 @@ instances which allow you to easily customize the response data before
rendering. For more details, see the :doc:`TemplateResponse documentation
</ref/template-response>`.
-.. _modeladmin-media-definitions:
+.. _modeladmin-asset-definitions:
-``ModelAdmin`` media definitions
+``ModelAdmin`` asset definitions
--------------------------------
There are times where you would like add a bit of CSS and/or JavaScript to
-the add/change views. This can be accomplished by using a Media inner class
+the add/change views. This can be accomplished by using a ``Media`` inner class
on your ``ModelAdmin``::
class ArticleAdmin(admin.ModelAdmin):
@@ -1572,8 +1572,8 @@ on your ``ModelAdmin``::
The :doc:`staticfiles app </ref/contrib/staticfiles>` prepends
:setting:`STATIC_URL` (or :setting:`MEDIA_URL` if :setting:`STATIC_URL` is
-``None``) to any media paths. The same rules apply as :ref:`regular media
-definitions on forms <form-media-paths>`.
+``None``) to any asset paths. The same rules apply as :ref:`regular asset
+definitions on forms <form-asset-paths>`.
jQuery
~~~~~~