summaryrefslogtreecommitdiff
path: root/docs/howto/deployment
diff options
context:
space:
mode:
authorJon Dufresne <jon.dufresne@gmail.com>2020-05-29 04:50:04 -0700
committerCarlton Gibson <carlton.gibson@noumenal.es>2020-06-02 11:53:14 +0200
commitd7ee69d2f28da5f08dd8a261bb1f205187a2add2 (patch)
treed9aed625f4d79ca5ba7386f84a50e9ace4a7d64d /docs/howto/deployment
parentfe07357ef9678bfbe06c0552ef1f9ae7f22a8d3d (diff)
[3.1.x] Fixed #31643 -- Changed virtualenv doc references to Python 3 venv.
Backport of 9f4ceee90aaa2a6af8321417d79330f2fdc620ea from master
Diffstat (limited to 'docs/howto/deployment')
-rw-r--r--docs/howto/deployment/wsgi/modwsgi.txt9
-rw-r--r--docs/howto/deployment/wsgi/uwsgi.txt4
2 files changed, 6 insertions, 7 deletions
diff --git a/docs/howto/deployment/wsgi/modwsgi.txt b/docs/howto/deployment/wsgi/modwsgi.txt
index cbc19628bb..97c261f100 100644
--- a/docs/howto/deployment/wsgi/modwsgi.txt
+++ b/docs/howto/deployment/wsgi/modwsgi.txt
@@ -48,9 +48,9 @@ your project package (``mysite`` in this example). This tells Apache to serve
any request below the given URL using the WSGI application defined in that
file.
-If you install your project's Python dependencies inside a `virtualenv`_, add
-the path to the virtualenv using ``WSGIPythonHome``. See the `mod_wsgi
-virtualenv guide`_ for more details.
+If you install your project's Python dependencies inside a :mod:`virtual
+environment <venv>`, add the path using ``WSGIPythonHome``. See the `mod_wsgi
+virtual environment 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.
@@ -64,8 +64,7 @@ for you; otherwise, you'll need to create it. See the :doc:`WSGI overview
documentation</howto/deployment/wsgi/index>` for the default contents you
should put in this file, and what else you can add to it.
-.. _virtualenv: https://virtualenv.pypa.io/
-.. _mod_wsgi virtualenv guide: https://modwsgi.readthedocs.io/en/develop/user-guides/virtual-environments.html
+.. _mod_wsgi virtual environment guide: https://modwsgi.readthedocs.io/en/develop/user-guides/virtual-environments.html
.. warning::
diff --git a/docs/howto/deployment/wsgi/uwsgi.txt b/docs/howto/deployment/wsgi/uwsgi.txt
index 43cfdf3b93..6e66189b4e 100644
--- a/docs/howto/deployment/wsgi/uwsgi.txt
+++ b/docs/howto/deployment/wsgi/uwsgi.txt
@@ -60,7 +60,7 @@ Here's an example command to start a uWSGI server::
--harakiri=20 \ # respawn processes taking more than 20 seconds
--max-requests=5000 \ # respawn processes after serving 5000 requests
--vacuum \ # clear environment on exit
- --home=/path/to/virtual/env \ # optional path to a virtualenv
+ --home=/path/to/virtual/env \ # optional path to a virtual environment
--daemonize=/var/log/uwsgi/yourproject.log # background the process
This assumes you have a top-level project package named ``mysite``, and
@@ -78,7 +78,7 @@ The Django-specific options here are:
* ``module``: The WSGI module to use -- probably the ``mysite.wsgi`` module
that :djadmin:`startproject` creates.
* ``env``: Should probably contain at least :envvar:`DJANGO_SETTINGS_MODULE`.
-* ``home``: Optional path to your project virtualenv.
+* ``home``: Optional path to your project virtual environment.
Example ini configuration file::