add timeout in configuration doc. spotted by @jbergstriem

doc/htdocs/configuration.html

@@ -52,6 +52,25 @@
 <p>Gunicorn 0.5 introduced the ability to use a Python configuration file. Gunicorn will look for <tt class="docutils literal">gunicorn.conf.py</tt> in the current working directory or what ever path is specified on the command line with the <tt class="docutils literal"><span class="pre">-c</span></tt> option.</p>
 <div class="section" id="example-gunicorn-conf-py">
 <h1>Example gunicorn.conf.py</h1>
+<p>arbiter=&quot;egg:gunicorn&quot;,
+backlog=2048,
+bind='127.0.0.1:8000',
+daemon=False,
+debug=False,
+default_proc_name = os.getcwd(),
+group=None,
+keepalive=2,
+logfile='-',
+loglevel='info',
+pidfile=None,
+proc_name = None,
+spew=False,
+timeout=30,
+tmp_upload_dir=None,
+umask=&quot;0&quot;,
+user=None,
+workers=1,
+worker_connections=1000,</p>
 <pre class="literal-block">
 arbiter = &quot;egg:gunicorn&quot;    # The arbiter to use for worker management
 backlog = 2048              # The listen queue size for the server socket
@@ -67,6 +86,8 @@ umask = 0                   # Umask to set when daemonizing
 user = None                 # Change process owner to user
 group = None                # Change process group to group
 proc_name = None            # Change the process name
+spew=False                  # Display trace
+timeout=30                  # Worker timeout
 tmp_upload_dir = None       # Set path used to store temporary uploads
 worker_connections=1000     # Maximum number of simultaneous connections
 

doc/htdocs/news.html

@@ -50,12 +50,20 @@
   <div class="document" id="news">
 <h1 class="title">News</h1>
 <div class="section" id="id1">
+<h1>0.7.2 / 2010-04-15</h1>
+<ul class="simple">
+<li>Added --spew option to help debugging (install a Trace hook)</li>
+<li>Some fixes in async arbiters</li>
+<li>Fix a bug in start_response on error</li>
+</ul>
+</div>
+<div class="section" id="id2">
 <h1>0.7.1 / 2010-04-01</h1>
 <ul class="simple">
 <li>Fix bug when responses have no body.</li>
 </ul>
 </div>
-<div class="section" id="id2">
+<div class="section" id="id3">
 <h1>0.7.0 / 2010-03-26</h1>
 <ul class="simple">
 <li>Added support for <a class="reference external" href="faq.html">sleepy applications</a> using <a class="reference external" href="http://eventlet.net">Eventlet</a> or <a class="reference external" href="http://gevent.org">Gevent</a>.</li>
@@ -65,28 +73,28 @@
 <li>Fix <a class="reference external" href="http://www.python.org/dev/peps/pep-0333/">PEP 333</a> compliance for the write callable.</li>
 </ul>
 </div>
-<div class="section" id="id3">
+<div class="section" id="id4">
 <h1>0.6.5 / 2010-03-11</h1>
 <ul class="simple">
 <li>Fix pidfile</li>
 <li>Fix Exception Error</li>
 </ul>
 </div>
-<div class="section" id="id4">
+<div class="section" id="id5">
 <h1>0.6.4 / 2010-03-08</h1>
 <ul class="simple">
 <li>Use cStringIO for performance when possible.</li>
 <li>Fix worker freeze when a remote connection closes unexpectedly.</li>
 </ul>
 </div>
-<div class="section" id="id5">
+<div class="section" id="id6">
 <h1>0.6.3 / 2010-03-07</h1>
 <ul class="simple">
 <li>Make HTTP parsing faster.</li>
 <li>Some fixes (see <a class="reference external" href="http://github.com/benoitc/gunicorn/commits/master">logs</a>)</li>
 </ul>
 </div>
-<div class="section" id="id6">
+<div class="section" id="id7">
 <h1>0.6.2 / 2010-03-01</h1>
 <ul class="simple">
 <li>Added support for chunked response.</li>
@@ -96,7 +104,7 @@
 <li>Workers are now murdered by age (the oldest is killed first).</li>
 </ul>
 </div>
-<div class="section" id="id7">
+<div class="section" id="id8">
 <h1>0.6.1 / 2010-02-24</h1>
 <ul class="simple">
 <li>Added gunicorn config file support for django admin command</li>
@@ -104,21 +112,21 @@
 <li>Removed TTIN/TTOU from workers which blocked other signals.</li>
 </ul>
 </div>
-<div class="section" id="id8">
+<div class="section" id="id9">
 <h1>0.6 / 2010-02-22</h1>
 <ul class="simple">
 <li>Added setproctitle</li>
 <li>Change privilege switch behaviour. We now work like NGINX, master keeps the permissions, new uid/gid permissions are only set for workers.</li>
 </ul>
 </div>
-<div class="section" id="id9">
+<div class="section" id="id10">
 <h1>0.5.1 / 2010-02-22</h1>
 <ul class="simple">
 <li>Fix umask</li>
 <li>Added debian packaging</li>
 </ul>
 </div>
-<div class="section" id="id10">
+<div class="section" id="id11">
 <h1>0.5 / 2010-02-20</h1>
 <ul class="simple">
 <li>Added <a class="reference external" href="configuration.html">configuration file</a> handler.</li>

doc/htdocs/usage.html

@@ -103,6 +103,7 @@ Options:
   --log-level=LOGLEVEL  Log level below which to silence messages. [info]
   --log-file=LOGFILE    Log to a file. - equals stdout. [-]
   -d, --debug           Debug mode. only 1 worker.
+  --spew                Install a trace hook
   --version             show program's version number and exit
   -h, --help            show this help message and exit
 </pre>

doc/site/configuration.rst

@@ -8,6 +8,26 @@ Gunicorn 0.5 introduced the ability to use a Python configuration file. Gunicorn
 
 Example gunicorn.conf.py
 ------------------------
+
+arbiter="egg:gunicorn",
+backlog=2048,
+bind='127.0.0.1:8000',
+daemon=False,
+debug=False,
+default_proc_name = os.getcwd(),
+group=None,
+keepalive=2,
+logfile='-',
+loglevel='info',
+pidfile=None,
+proc_name = None,
+spew=False,
+timeout=30,
+tmp_upload_dir=None,
+umask="0",
+user=None,
+workers=1,
+worker_connections=1000,
 ::
 
     arbiter = "egg:gunicorn"    # The arbiter to use for worker management
@@ -24,6 +44,8 @@ Example gunicorn.conf.py
     user = None                 # Change process owner to user
     group = None                # Change process group to group
     proc_name = None            # Change the process name
+    spew=False                  # Display trace
+    timeout=30                  # Worker timeout
     tmp_upload_dir = None       # Set path used to store temporary uploads
     worker_connections=1000     # Maximum number of simultaneous connections