From fa3ed6e1341f7c8b468e2267b3fafddeb58cdac2 Mon Sep 17 00:00:00 2001
From: Jeremy Dunck <jdunck@gmail.com>
Date: Fri, 23 Mar 2007 16:35:57 +0000
Subject: gis: Merged revisions 4669-4785 via svnmerge from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@4786 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
 docs/model-api.txt | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'docs/model-api.txt')

diff --git a/docs/model-api.txt b/docs/model-api.txt
index 1e7f69903d..26686b02fe 100644
--- a/docs/model-api.txt
+++ b/docs/model-api.txt
@@ -1216,6 +1216,10 @@ screen via ``<script src="">`` tags. This can be used to tweak a given type of
 admin page in JavaScript or to provide "quick links" to fill in default values
 for certain fields.
 
+If you use relative URLs -- URLs that don't start with ``http://`` or ``/`` --
+then the admin site will automatically prefix these links with
+``settings.ADMIN_MEDIA_PREFIX``.
+
 ``list_display``
 ----------------
 
-- 
cgit v1.3