Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Fixed #11063: updated install docs to mention mod_wsgi instead of mod…

…_python.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@10745 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit e7fdfa14a4da1c3a231679800ed5a8e790c72ee5 1 parent 7b81dd4
Jacob Kaplan-Moss authored May 12, 2009

Showing 1 changed file with 19 additions and 17 deletions. Show diff stats Hide diff stats

  1. 36  docs/topics/install.txt
36  docs/topics/install.txt
@@ -26,31 +26,33 @@ probably already have it installed.
26 26
 
27 27
 .. _jython: http://jython.org/
28 28
 
29  
-Install Apache and mod_python
  29
+Install Apache and mod_wsgi
30 30
 =============================
31 31
 
32  
-If you just want to experiment with Django, skip ahead to the next
33  
-section; Django includes a lightweight web server you can use for
34  
-testing, so you won't need to set up Apache until you're ready to
35  
-deploy Django in production.
  32
+If you just want to experiment with Django, skip ahead to the next section;
  33
+Django includes a lightweight web server you can use for testing, so you won't
  34
+need to set up Apache until you're ready to deploy Django in production.
36 35
 
37  
-If you want to use Django on a production site, use Apache with `mod_python`_.
38  
-mod_python is similar to mod_perl -- it embeds Python within Apache and loads
  36
+If you want to use Django on a production site, use Apache with `mod_wsgi`_.
  37
+mod_wsgi is similar to mod_perl -- it embeds Python within Apache and loads
39 38
 Python code into memory when the server starts. Code stays in memory throughout
40  
-the life of an Apache process, which leads to significant performance gains
41  
-over other server arrangements. Make sure you have Apache installed, with the
42  
-mod_python module activated. Django requires Apache 2.x and mod_python 3.x.
  39
+the life of an Apache process, which leads to significant performance gains over
  40
+other server arrangements. Make sure you have Apache installed, with the
  41
+mod_wsgi module activated. Django will work with any version of Apache that
  42
+supports mod_wsgi.
43 43
 
44  
-See :ref:`How to use Django with mod_python <howto-deployment-modpython>` for
45  
-information on how to configure mod_python once you have it installed.
  44
+See :ref:`How to use Django with mod_wsgi <howto-deployment-modwsgi>` for
  45
+information on how to configure mod_wsgi once you have it installed.
46 46
 
47  
-If you can't use mod_python for some reason, fear not: Django follows the WSGI_
48  
-spec, which allows it to run on a variety of server platforms. See the
49  
-`server-arrangements wiki page`_ for specific installation instructions for
50  
-each platform.
  47
+If you can't use mod_wsgi for some reason, fear not: Django supports many other
  48
+deployment options. A great second choice is :ref:`mod_python
  49
+<howto-deployment-modpython>`, the predecessor to mod_wsgi. Additionally, Django
  50
+follows the WSGI_ spec, which allows it to run on a variety of server platforms.
  51
+See the `server-arrangements wiki page`_ for specific installation instructions
  52
+for each platform.
51 53
 
52 54
 .. _Apache: http://httpd.apache.org/
53  
-.. _mod_python: http://www.modpython.org/
  55
+.. _mod_wsgi: http://code.google.com/p/modwsgi/
54 56
 .. _WSGI: http://www.python.org/peps/pep-0333.html
55 57
 .. _server-arrangements wiki page: http://code.djangoproject.com/wiki/ServerArrangements
56 58
 

0 notes on commit e7fdfa1

Please sign in to comment.
Something went wrong with that request. Please try again.