summaryrefslogtreecommitdiff
path: root/docs/howto/deployment
diff options
context:
space:
mode:
Diffstat (limited to 'docs/howto/deployment')
-rw-r--r--docs/howto/deployment/wsgi/gunicorn.txt11
-rw-r--r--docs/howto/deployment/wsgi/index.txt6
-rw-r--r--docs/howto/deployment/wsgi/modwsgi.txt4
3 files changed, 10 insertions, 11 deletions
diff --git a/docs/howto/deployment/wsgi/gunicorn.txt b/docs/howto/deployment/wsgi/gunicorn.txt
index bcdff4879e..6091120488 100644
--- a/docs/howto/deployment/wsgi/gunicorn.txt
+++ b/docs/howto/deployment/wsgi/gunicorn.txt
@@ -5,14 +5,14 @@ How to use Django with Gunicorn
.. highlight:: bash
Gunicorn_ ('Green Unicorn') is a pure-Python WSGI server for UNIX. It has no
-dependencies and is easy to install and use.
+dependencies and can be installed using ``pip``.
.. _Gunicorn: https://gunicorn.org/
Installing Gunicorn
===================
-Installing gunicorn is as easy as ``python -m pip install gunicorn``. For more
+Install gunicorn by running ``python -m pip install gunicorn``. For more
details, see the `gunicorn documentation`_.
.. _gunicorn documentation: https://docs.gunicorn.org/en/latest/install.html
@@ -21,10 +21,9 @@ Running Django in Gunicorn as a generic WSGI application
========================================================
When Gunicorn is installed, a ``gunicorn`` command is available which starts
-the Gunicorn server process. At its simplest, gunicorn just needs to be called
-with the location of a module containing a WSGI application object named
-`application`. So for a typical Django project, invoking gunicorn would look
-like::
+the Gunicorn server process. The simplest invocation of gunicorn is to pass the
+location of a module containing a WSGI application object named
+``application``, which for a typical Django project would look like::
gunicorn myproject.wsgi
diff --git a/docs/howto/deployment/wsgi/index.txt b/docs/howto/deployment/wsgi/index.txt
index ffc0fbe09a..c7416b84fd 100644
--- a/docs/howto/deployment/wsgi/index.txt
+++ b/docs/howto/deployment/wsgi/index.txt
@@ -7,7 +7,7 @@ servers and applications.
.. _WSGI: https://wsgi.readthedocs.io/en/latest/
-Django's :djadmin:`startproject` management command sets up a simple default
+Django's :djadmin:`startproject` management command sets up a minimal default
WSGI configuration for you, which you can tweak as needed for your project,
and direct any WSGI-compliant application server to use.
@@ -70,8 +70,8 @@ If this variable isn't set, the default :file:`wsgi.py` sets it to
Applying WSGI middleware
========================
-To apply `WSGI middleware`_ you can simply wrap the application object. For
-instance you could add these lines at the bottom of :file:`wsgi.py`::
+To apply `WSGI middleware`_ you can wrap the application object. For instance
+you could add these lines at the bottom of :file:`wsgi.py`::
from helloworld.wsgi import HelloWorldApplication
application = HelloWorldApplication(application)
diff --git a/docs/howto/deployment/wsgi/modwsgi.txt b/docs/howto/deployment/wsgi/modwsgi.txt
index c2e74d3bae..b2ab1555df 100644
--- a/docs/howto/deployment/wsgi/modwsgi.txt
+++ b/docs/howto/deployment/wsgi/modwsgi.txt
@@ -57,8 +57,8 @@ virtualenv guide`_ for more details.
The ``WSGIPythonPath`` line ensures that your project package is available for
import on the Python path; in other words, that ``import mysite`` works.
-The ``<Directory>`` piece just ensures that Apache can access your
-:file:`wsgi.py` file.
+The ``<Directory>`` piece ensures that Apache can access your :file:`wsgi.py`
+file.
Next we'll need to ensure this :file:`wsgi.py` with a WSGI application object
exists. As of Django version 1.4, :djadmin:`startproject` will have created one