summaryrefslogtreecommitdiff
path: root/docs/howto/deployment
diff options
context:
space:
mode:
authorJulien Phalip <jphalip@gmail.com>2011-10-03 08:06:01 +0000
committerJulien Phalip <jphalip@gmail.com>2011-10-03 08:06:01 +0000
commitc2b9f6496e59c9268fb265ea80df8c8d7ec88034 (patch)
tree94e8c615e5ee9294ca5f5acc1aebcb0935b11bd2 /docs/howto/deployment
parent0d9b6a5bc43c06716212bd3f847460ce985381aa (diff)
Added some sphinx cross-reference links to the built-in template tags and filters in multiple areas of the documentation. Also fixed a few minor inconsistencies and did a little PEP8 cleanup while I was at it.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16922 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs/howto/deployment')
-rw-r--r--docs/howto/deployment/fastcgi.txt9
1 files changed, 5 insertions, 4 deletions
diff --git a/docs/howto/deployment/fastcgi.txt b/docs/howto/deployment/fastcgi.txt
index 427aed7a2f..1f769cbb27 100644
--- a/docs/howto/deployment/fastcgi.txt
+++ b/docs/howto/deployment/fastcgi.txt
@@ -110,7 +110,7 @@ Running a threaded server on a TCP port::
Running a preforked server on a Unix domain socket::
./manage.py runfcgi method=prefork socket=/home/user/mysite.sock pidfile=django.pid
-
+
.. admonition:: Socket security
Django's default umask requires that the webserver and the Django fastcgi
@@ -223,7 +223,8 @@ This is probably the most common case, if you're using Django's admin site:
.. _mod_rewrite: http://httpd.apache.org/docs/2.0/mod/mod_rewrite.html
Django will automatically use the pre-rewrite version of the URL when
-constructing URLs with the ``{% url %}`` template tag (and similar methods).
+constructing URLs with the :ttag:`{% url %}<url>` template tag (and similar
+methods).
Using mod_fcgid as alternative to mod_fastcgi
----------------------------------------------
@@ -409,8 +410,8 @@ Because many of these fastcgi-based solutions require rewriting the URL at
some point inside the Web server, the path information that Django sees may not
resemble the original URL that was passed in. This is a problem if the Django
application is being served from under a particular prefix and you want your
-URLs from the ``{% url %}`` tag to look like the prefix, rather than the
-rewritten version, which might contain, for example, ``mysite.fcgi``.
+URLs from the :ttag:`{% url %}<url>` tag to look like the prefix, rather than
+the rewritten version, which might contain, for example, ``mysite.fcgi``.
Django makes a good attempt to work out what the real script name prefix
should be. In particular, if the Web server sets the ``SCRIPT_URL`` (specific