diff options
Diffstat (limited to 'docs/howto/deployment/wsgi')
| -rw-r--r-- | docs/howto/deployment/wsgi/modwsgi.txt | 10 | ||||
| -rw-r--r-- | docs/howto/deployment/wsgi/uwsgi.txt | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/docs/howto/deployment/wsgi/modwsgi.txt b/docs/howto/deployment/wsgi/modwsgi.txt index fa56f4ee03..e12c927cf4 100644 --- a/docs/howto/deployment/wsgi/modwsgi.txt +++ b/docs/howto/deployment/wsgi/modwsgi.txt @@ -131,10 +131,10 @@ mode`_. Serving files ============= -Django doesn't serve files itself; it leaves that job to whichever Web +Django doesn't serve files itself; it leaves that job to whichever web server you choose. -We recommend using a separate Web server -- i.e., one that's not also running +We recommend using a separate web server -- i.e., one that's not also running Django -- for serving media. Here are some good choices: * Nginx_ @@ -189,15 +189,15 @@ When :mod:`django.contrib.staticfiles` is in :setting:`INSTALLED_APPS`, the Django development server automatically serves the static files of the admin app (and any other installed apps). This is however not the case when you use any other server arrangement. You're responsible for setting up Apache, or -whichever Web server you're using, to serve the admin files. +whichever web server you're using, to serve the admin files. The admin files live in (:file:`django/contrib/admin/static/admin`) of the Django distribution. We **strongly** recommend using :mod:`django.contrib.staticfiles` to handle the -admin files (along with a Web server as outlined in the previous section; this +admin files (along with a web server as outlined in the previous section; this means using the :djadmin:`collectstatic` management command to collect the -static files in :setting:`STATIC_ROOT`, and then configuring your Web server to +static files in :setting:`STATIC_ROOT`, and then configuring your web server to serve :setting:`STATIC_ROOT` at :setting:`STATIC_URL`), but here are three other approaches: diff --git a/docs/howto/deployment/wsgi/uwsgi.txt b/docs/howto/deployment/wsgi/uwsgi.txt index 6e66189b4e..f441d73f04 100644 --- a/docs/howto/deployment/wsgi/uwsgi.txt +++ b/docs/howto/deployment/wsgi/uwsgi.txt @@ -37,7 +37,7 @@ command. For example: uWSGI model ----------- -uWSGI operates on a client-server model. Your Web server (e.g., nginx, Apache) +uWSGI operates on a client-server model. Your web server (e.g., nginx, Apache) communicates with a ``django-uwsgi`` "worker" process to serve dynamic content. Configuring and starting the uWSGI server for Django |