mirror of
https://github.com/django/django.git
synced 2025-10-24 06:06:09 +00:00
Fixed #11509 -- Modified usage of "Web" to match our style guide in various documentation, comments and code. Thanks to timo and Simon Meers for the work on the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14069 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
@@ -22,7 +22,7 @@ to the Web server, which, in turn, passes it back to the client's Web browser.
|
||||
|
||||
Like mod_wsgi, FastCGI allows code to stay in memory, allowing requests to be
|
||||
served with no startup time. While mod_wsgi can either be configured embedded
|
||||
in the Apache webserver process or as a separate daemon process, a FastCGI
|
||||
in the Apache Web server process or as a separate daemon process, a FastCGI
|
||||
process never runs inside the Web server process, always in a separate,
|
||||
persistent process.
|
||||
|
||||
@@ -367,14 +367,14 @@ Forcing the URL prefix to a particular value
|
||||
============================================
|
||||
|
||||
Because many of these fastcgi-based solutions require rewriting the URL at
|
||||
some point inside the webserver, the path information that Django sees may not
|
||||
some point inside the Web server, the path information that Django sees may not
|
||||
resemble the original URL that was passed in. This is a problem if the Django
|
||||
application is being served from under a particular prefix and you want your
|
||||
URLs from the ``{% url %}`` tag to look like the prefix, rather than the
|
||||
rewritten version, which might contain, for example, ``mysite.fcgi``.
|
||||
|
||||
Django makes a good attempt to work out what the real script name prefix
|
||||
should be. In particular, if the webserver sets the ``SCRIPT_URL`` (specific
|
||||
should be. In particular, if the Web server sets the ``SCRIPT_URL`` (specific
|
||||
to Apache's mod_rewrite), or ``REDIRECT_URL`` (set by a few servers, including
|
||||
Apache + mod_rewrite in some situations), Django will work out the original
|
||||
prefix automatically.
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
Deploying Django
|
||||
================
|
||||
|
||||
Django's chock-full of shortcuts to make web developer's lives easier, but all
|
||||
Django's chock-full of shortcuts to make Web developer's lives easier, but all
|
||||
those tools are of no use if you can't easily deploy your sites. Since Django's
|
||||
inception, ease of deployment has been a major goal. There's a number of good
|
||||
ways to easily deploy Django:
|
||||
|
||||
@@ -317,7 +317,7 @@ project (or somewhere else) that contains something like the following:
|
||||
import os
|
||||
os.environ['PYTHON_EGG_CACHE'] = '/some/directory'
|
||||
|
||||
Here, ``/some/directory`` is a directory that the Apache webserver process can
|
||||
Here, ``/some/directory`` is a directory that the Apache Web server process can
|
||||
write to. It will be used as the location for any unpacking of code the eggs
|
||||
need to do.
|
||||
|
||||
|
||||
Reference in New Issue
Block a user