Ticket #19315: faq_admin_and_contrib_admin_doc.diff

docs/faq/admin.txt

@@ -11 +11 @@
 * Set the :setting:`SESSION_COOKIE_DOMAIN` setting in your admin config
   file to match your domain. For example, if you're going to
   "http://www.example.com/admin/" in your browser, in
-  "myproject.settings" you should set ``SESSION_COOKIE_DOMAIN = 'www.example.com'``.
+  "myproject.settings" you should set :setting:`SESSION_COOKIE_DOMAIN` = 'www.example.com'.
 
 * Some browsers (Firefox?) don't like to accept cookies from domains that
   don't have dots in them. If you're running the admin site on "localhost"
@@ -23 +23 @@
 -----------------------------------------------------------------------------------------------------------------------------------------------------------
 
 If you're sure your username and password are correct, make sure your user
-account has ``is_active`` and ``is_staff`` set to True. The admin site only
+account has :attr:`~django.contrib.auth.models.User.is_active` and :attr:`~django.contrib.auth.models.User.is_staff` set to True. The admin site only
 allows access to users with those two fields both set to True.
 
 How can I prevent the cache middleware from caching the admin site?
@@ -64 +64 @@
 Django won't bother displaying the filter for a ``ManyToManyField`` if there
 are fewer than two related objects.
 
-For example, if your ``list_filter`` includes ``sites``, and there's only one
+For example, if your
+:attr:`~django.contrib.admin.ModelAdmin.list_filter` includes 
+:doc:`sites </ref/contrib/sites>`, and there's only one
 site in your database, it won't display a "Site" filter. In that case,
 filtering by site would be meaningless.
 
@@ -85 +87 @@
 
 You've got several options. If you want to piggyback on top of an add/change
 form that Django automatically generates, you can attach arbitrary JavaScript
-modules to the page via the model's ``class Admin`` ``js`` parameter. That
+modules to the page via the model's 
+:ref:`class Admin js<modeladmin-media-definitions>` parameter. That
 parameter is a list of URLs, as strings, pointing to JavaScript modules that
 will be included within the admin form via a ``<script>`` tag.
 

docs/ref/contrib/admin/index.txt

@@ -1377 +1377 @@
 rendering. For more details, see the
 :doc:`TemplateResponse documentation </ref/template-response>`.
 
+.. _modeladmin-media-definitions:
+
 ``ModelAdmin`` media definitions
 --------------------------------