diff --git a/doc/htdocs/configuration.html b/doc/htdocs/configuration.html index 2f72bf26..ae9a83e8 100644 --- a/doc/htdocs/configuration.html +++ b/doc/htdocs/configuration.html @@ -49,7 +49,7 @@

The Configuration File

-

Gunciorn 0.5 introduced the ability to use a Python configuration file. Gunicorn will look for gunicorn.conf.py in the current working directory or what ever path is specified on the command line with the -c option.

+

Gunicorn 0.5 introduced the ability to use a Python configuration file. Gunicorn will look for gunicorn.conf.py in the current working directory or what ever path is specified on the command line with the -c option.

Example gunicorn.conf.py

@@ -104,13 +104,13 @@ connections. The default is 2048. See listen(2) for more information
 the master receives a HUP or USR2 signal.
 
bind:
The address on which workers are listening. It can be a TCP address with a -format of IP:PORT or a Unix socket address like +format of IP:PORT or a Unix socket address like unix:/path/to/socketfile.
daemon:
Whether or not to detach the server from the controlling terminal.
debug:
-
If True, only one worker will be launch and the variable -wsgi.multiprocess will be set to False.
+
If True, only one worker will be launch and the variable +wsgi.multiprocess will be set to False.
group:
The group in which worker processes will be launched.
keepalive:
@@ -119,15 +119,15 @@ most conditions for browsers to render the page and start retrieving extra elements for. Increasing this beyond 5 seconds is not recommended. Zero disables KeepAlive entirely.
logfile:
-
The path to the log file - (stdout) by default.
+
The path to the log file - (stdout) by default.
loglevel:
-
The level at which to log. info, debug, or error for instance. +
The level at which to log. info, debug, or error for instance. Only log messages of equal or greater severity are logged.
pidfile:
A file to store the master's PID.
proc_name:
A name for the master process. Only takes effect if setproctitle is -installed. This alters the process names listed by commands like ps.
+installed. This alters the process names listed by commands like ps.
umask:
Used to set the umask when daemonizing.
user:
diff --git a/doc/htdocs/faq.html b/doc/htdocs/faq.html index e1f51600..8dfaf026 100644 --- a/doc/htdocs/faq.html +++ b/doc/htdocs/faq.html @@ -84,8 +84,8 @@ $ kill -TTOU $masterpid
How do I set SCRIPT_NAME?
-
By default SCRIPT_NAME is an empy string. The value could be set by -setting SCRIPT_NAME in the environment or as an HTTP header.
+
By default SCRIPT_NAME is an empy string. The value could be set by +setting SCRIPT_NAME in the environment or as an HTTP header.
How to name processes?
You need to install the Python package setproctitle. Then you can name your process with -n or just let the default. If you use a configuration diff --git a/doc/htdocs/installation.html b/doc/htdocs/installation.html index c185b4ca..5de0269e 100644 --- a/doc/htdocs/installation.html +++ b/doc/htdocs/installation.html @@ -59,8 +59,8 @@

Installing with easy_install

-

If you don't already have easy_install available you'll want to download -and run the ez_setup.py script:

+

If you don't already have easy_install available you'll want to download +and run the ez_setup.py script:

 $ curl -O http://peak.telecommunity.com/dist/ez_setup.py
 $ sudo python ez_setup.py -U setuptools
@@ -89,7 +89,7 @@ $ git clone git://github.com/benoitc/gunicorn.git
 $ python setup.py install
 

If you've cloned the git repository, its highly recommended that you use the -develop command which will allow you to use Gunicorn from the source +develop command which will allow you to use Gunicorn from the source directory. This will allow you to keep up to date with development on GitHub as well as make changes to the source:

@@ -105,13 +105,13 @@ $ python setup.py develop
 
 $ easy_install -U eventlet
 
-

Replace eventlet with gevent if you want to use the gevent +

Replace eventlet with gevent if you want to use the gevent arbiter.

You can now launch gunicorn with Eventlet or Gevent arbiter, see usage for more information.

Note

-

If eventlet or gevent fails to install for you, its most likely +

If eventlet or gevent fails to install for you, its most likely due to an out of date libev library. You'll need to download and install a newer version for either of those to modules to work properly.

@@ -119,7 +119,7 @@ a newer version for either of those to modules to work properly.

Installing on Ubuntu/Debian systems

If you use Ubuntu karmic, you can update your -system with packages from our PPA by adding ppa:bchesneau/gunicorn +system with packages from our PPA by adding ppa:bchesneau/gunicorn to your system's Software Sources.

Or this PPA can be added to your system manually by copying the lines below and adding them to your system's software sources:

diff --git a/doc/htdocs/usage.html b/doc/htdocs/usage.html index aa530410..26801277 100644 --- a/doc/htdocs/usage.html +++ b/doc/htdocs/usage.html @@ -61,8 +61,8 @@ $ cd /path/to/gunicorn/examples/ $ gunicorn --workers=2 test:app
-

The module test:app specifies the complete module name and WSGI callable. -You can replace it with anything that is available on your PYTHONPATH like +

The module test:app specifies the complete module name and WSGI callable. +You can replace it with anything that is available on your PYTHONPATH like such:

 $ cd ~/
@@ -111,14 +111,14 @@ Options:
 

Django Projects

Django projects can be handled easily by Gunicorn using the -gunicorn_django command:

+gunicorn_django command:

 $ cd $yourdjangoproject
 $ gunicorn_django --workers=2
 
-

But you can also use the run_gunicorn admin command like the other -management.py commands.

-

Add "gunicorn" to INSTALLED_APPS in your settings file:

+

But you can also use the run_gunicorn admin command like the other +management.py commands.

+

Add "gunicorn" to INSTALLED_APPS in your settings file:

 INSTALLED_APPS = (
     ...
@@ -133,12 +133,12 @@ python manage.py run_gunicorn
 

Paste-compatible projects

For Paste compatible projects (Pylons, TurboGears 2, ...) use the -gunicorn_paste command:

+gunicorn_paste command:

 $ cd $yourpasteproject
 $ gunicorn_paste --workers=2 development.ini
 
-

To use the paster command add a sever section for Gunicorn:

+

To use the paster command add a sever section for Gunicorn:

 [server:main]
 use = egg:gunicorn#main
diff --git a/doc/site/configuration.rst b/doc/site/configuration.rst
index 97fb34c9..650f28d2 100644
--- a/doc/site/configuration.rst
+++ b/doc/site/configuration.rst
@@ -4,7 +4,7 @@ title: The Configuration File
 The Configuration File
 ======================
 
-Gunciorn 0.5 introduced the ability to use a Python configuration file. Gunicorn will look for ``gunicorn.conf.py`` in the current working directory or what ever path is specified on the command line with the ``-c`` option.
+Gunicorn 0.5 introduced the ability to use a Python configuration file. Gunicorn will look for ``gunicorn.conf.py`` in the current working directory or what ever path is specified on the command line with the ``-c`` option.
 
 Example gunicorn.conf.py
 ------------------------
@@ -115,4 +115,5 @@ tmp_upload_dir:
 .. _Eventlet: http://eventlet.net
 .. _Gevent: http://gevent.org
 .. _Twisted: http://twistedmatrix.com
-.. _setproctitle: http://pypi.python.org/pypi/setproctitle
\ No newline at end of file
+.. _setproctitle: http://pypi.python.org/pypi/setproctitle
+