summaryrefslogtreecommitdiff
path: root/docs/howto/deployment/modpython.txt
diff options
context:
space:
mode:
authorJacob Kaplan-Moss <jacob@jacobian.org>2009-04-01 00:08:34 +0000
committerJacob Kaplan-Moss <jacob@jacobian.org>2009-04-01 00:08:34 +0000
commita9017a1e5ab1a4092a76545b91bc834891e85d9f (patch)
tree9821ff658057f3b1e8c965298280a7cf250a2aab /docs/howto/deployment/modpython.txt
parent97b22bde3c4ef46867b0190e462110f1c542e7e8 (diff)
[1.0.X] A whole lotta documentation fixes, backported from r10303 on trunk.
I got my commit message cut off the first try, but luckily I get to still thank Kevin Kubasik for rolling all these fixes up into a single easy patch. git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10306 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs/howto/deployment/modpython.txt')
-rw-r--r--docs/howto/deployment/modpython.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/docs/howto/deployment/modpython.txt b/docs/howto/deployment/modpython.txt
index 14f0219421..3c3af82ec4 100644
--- a/docs/howto/deployment/modpython.txt
+++ b/docs/howto/deployment/modpython.txt
@@ -215,8 +215,10 @@ We recommend using a separate Web server -- i.e., one that's not also running
Django -- for serving media. Here are some good choices:
* lighttpd_
+ * Nginx_
* TUX_
* A stripped-down version of Apache_
+ * Cherokee_
If, however, you have no option but to serve media files on the same Apache
``VirtualHost`` as Django, here's how you can turn off mod_python for a
@@ -249,8 +251,10 @@ the ``media`` subdirectory and any URL that ends with ``.jpg``, ``.gif`` or
.. _lighttpd: http://www.lighttpd.net/
+.. _Nginx: http://wiki.codemongers.com/Main
.. _TUX: http://en.wikipedia.org/wiki/TUX_web_server
.. _Apache: http://httpd.apache.org/
+.. _Cherokee: http://www.cherokee-project.com/
.. _howto-deployment-modpython-serving-the-admin-files: