From d8e6cb17693c7e70d47e6515dc2ed13eee53b0f2 Mon Sep 17 00:00:00 2001
From: "Paul J. Davis" <paul.joseph.davis@gmail.com>
Date: Sun, 30 May 2010 14:38:27 -0400
Subject: [PATCH] Rebuild after rebase.

---
 doc/htdocs/configure.html | 60 ++++++++++++++++++++++++++++-----------
 doc/htdocs/news.html      | 41 +++++++++++---------------
 2 files changed, 59 insertions(+), 42 deletions(-)

diff --git a/doc/htdocs/configure.html b/doc/htdocs/configure.html
index 94c36ade..f8b72cc2 100644
--- a/doc/htdocs/configure.html
+++ b/doc/htdocs/configure.html
@@ -61,28 +61,30 @@
 </ul>
 </li>
 <li><a class="reference internal" href="#server-mechanics" id="id21">Server Mechanics</a><ul>
-<li><a class="reference internal" href="#daemon" id="id22">daemon</a></li>
-<li><a class="reference internal" href="#pidfile" id="id23">pidfile</a></li>
-<li><a class="reference internal" href="#user" id="id24">user</a></li>
-<li><a class="reference internal" href="#group" id="id25">group</a></li>
-<li><a class="reference internal" href="#umask" id="id26">umask</a></li>
-<li><a class="reference internal" href="#tmp-upload-dir" id="id27">tmp_upload_dir</a></li>
+<li><a class="reference internal" href="#preload-app" id="id22">preload_app</a></li>
+<li><a class="reference internal" href="#daemon" id="id23">daemon</a></li>
+<li><a class="reference internal" href="#pidfile" id="id24">pidfile</a></li>
+<li><a class="reference internal" href="#user" id="id25">user</a></li>
+<li><a class="reference internal" href="#group" id="id26">group</a></li>
+<li><a class="reference internal" href="#umask" id="id27">umask</a></li>
+<li><a class="reference internal" href="#tmp-upload-dir" id="id28">tmp_upload_dir</a></li>
 </ul>
 </li>
-<li><a class="reference internal" href="#logging" id="id28">Logging</a><ul>
-<li><a class="reference internal" href="#logfile" id="id29">logfile</a></li>
-<li><a class="reference internal" href="#loglevel" id="id30">loglevel</a></li>
+<li><a class="reference internal" href="#logging" id="id29">Logging</a><ul>
+<li><a class="reference internal" href="#logfile" id="id30">logfile</a></li>
+<li><a class="reference internal" href="#loglevel" id="id31">loglevel</a></li>
 </ul>
 </li>
-<li><a class="reference internal" href="#process-naming" id="id31">Process Naming</a><ul>
-<li><a class="reference internal" href="#proc-name" id="id32">proc_name</a></li>
-<li><a class="reference internal" href="#default-proc-name" id="id33">default_proc_name</a></li>
+<li><a class="reference internal" href="#process-naming" id="id32">Process Naming</a><ul>
+<li><a class="reference internal" href="#proc-name" id="id33">proc_name</a></li>
+<li><a class="reference internal" href="#default-proc-name" id="id34">default_proc_name</a></li>
 </ul>
 </li>
-<li><a class="reference internal" href="#server-hooks" id="id34">Server Hooks</a><ul>
-<li><a class="reference internal" href="#pre-fork" id="id35">pre_fork</a></li>
-<li><a class="reference internal" href="#post-fork" id="id36">post_fork</a></li>
-<li><a class="reference internal" href="#pre-exec" id="id37">pre_exec</a></li>
+<li><a class="reference internal" href="#server-hooks" id="id35">Server Hooks</a><ul>
+<li><a class="reference internal" href="#pre-fork" id="id36">pre_fork</a></li>
+<li><a class="reference internal" href="#post-fork" id="id37">post_fork</a></li>
+<li><a class="reference internal" href="#when-ready" id="id38">when_ready</a></li>
+<li><a class="reference internal" href="#pre-exec" id="id39">pre_exec</a></li>
 </ul>
 </li>
 </ul>
@@ -281,7 +283,7 @@ is not tied to the length of time required to handle a single request.</p>
 <div class="section" id="debug">
 <h4><a class="toc-backref" href="#contents">debug</a></h4>
 <ul class="simple">
-<li><tt class="docutils literal"><span class="pre">-d,</span> <span class="pre">--debug</span></tt></li>
+<li><tt class="docutils literal"><span class="pre">--debug</span></tt></li>
 <li><tt class="docutils literal">False</tt></li>
 </ul>
 <p>Turn on debugging in the server.</p>
@@ -300,6 +302,18 @@ handling that's sent to clients.</p>
 </div>
 <div class="section" id="server-mechanics">
 <h3><a class="toc-backref" href="#contents">Server Mechanics</a></h3>
+<div class="section" id="preload-app">
+<h4><a class="toc-backref" href="#contents">preload_app</a></h4>
+<ul class="simple">
+<li><tt class="docutils literal"><span class="pre">--preload</span></tt></li>
+<li><tt class="docutils literal">False</tt></li>
+</ul>
+<p>Load application code before the worker processes are forked.</p>
+<p>By preloading an application you can save some RAM resources as well as
+speed up server boot times. Although, if you defer application loading
+to each worker process, you can reload your application code easily by
+restarting workers.</p>
+</div>
 <div class="section" id="daemon">
 <h4><a class="toc-backref" href="#contents">daemon</a></h4>
 <ul class="simple">
@@ -444,6 +458,18 @@ def def_post_fork(server, worker):
 <p>The callable needs to accept two instance variables for the Arbiter and
 new Worker.</p>
 </div>
+<div class="section" id="when-ready">
+<h4><a class="toc-backref" href="#contents">when_ready</a></h4>
+<ul>
+<li><pre class="first literal-block">
+def def_start_server(server):
+    pass
+</pre>
+</li>
+</ul>
+<p>Called just after the server is started.</p>
+<p>The callable needs to accept a single instance variable for the Arbiter.</p>
+</div>
 <div class="section" id="pre-exec">
 <h4><a class="toc-backref" href="#contents">pre_exec</a></h4>
 <ul>
diff --git a/doc/htdocs/news.html b/doc/htdocs/news.html
index dc69fa2c..45fb2338 100644
--- a/doc/htdocs/news.html
+++ b/doc/htdocs/news.html
@@ -27,17 +27,8 @@
       </div>
       <div id="content">
       <div class="document">
-<div class="section" id="dev-2010-05-17">
-<h2>0.9.0-dev / 2010-05-17</h2>
-<ul class="simple">
-<li>Fix pidfile</li>
-<li>Fix QUIT/HUP in async workers</li>
-<li>Fix reexec</li>
-<li>Documentation improvments</li>
-</ul>
-</div>
 <div class="section" id="id1">
-<h1>0.9.1 / 2010-05-26</h1>
+<h2>0.9.1 / 2010-05-26</h2>
 <ul class="simple">
 <li>Support https via X-Forwarded-Protocol or X-Forwarded-Ssl headers</li>
 <li>Fix configuration</li>
@@ -46,7 +37,7 @@
 </ul>
 </div>
 <div class="section" id="id2">
-<h1>0.9.0 / 2010-05-24</h1>
+<h2>0.9.0 / 2010-05-24</h2>
 <ul class="simple">
 <li>Added <em>when_ready</em> hook. Called just after the server is started</li>
 <li>Added <em>preload</em> setting. Load application code before the worker processes
@@ -59,7 +50,7 @@ are forked.</li>
 </ul>
 </div>
 <div class="section" id="id3">
-<h1>0.8.1 / 2010-04-29</h1>
+<h2>0.8.1 / 2010-04-29</h2>
 <ul class="simple">
 <li>Fix builtins import in config</li>
 <li>Fix installation with pip</li>
@@ -67,7 +58,7 @@ are forked.</li>
 <li>Delay application loading until after processing all configuration</li>
 </ul>
 </div>
-<div class="section" id="id2">
+<div class="section" id="id4">
 <h2>0.8.0 / 2010-04-22</h2>
 <ul class="simple">
 <li>Refactored Worker management for better async support. Now use the -k option
@@ -76,21 +67,21 @@ to set the type of request processing to use</li>
 </ul>
 </div>
 <div class="section" id="id5">
-<h1>0.7.2 / 2010-04-15</h1>
+<h2>0.7.2 / 2010-04-15</h2>
 <ul class="simple">
 <li>Added --spew option to help debugging (installs a system 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="id4">
+<div class="section" id="id6">
 <h2>0.7.1 / 2010-04-01</h2>
 <ul class="simple">
 <li>Fix bug when responses have no body.</li>
 </ul>
 </div>
 <div class="section" id="id7">
-<h1>0.7.0 / 2010-03-26</h1>
+<h2>0.7.0 / 2010-03-26</h2>
 <ul class="simple">
 <li>Added support for <a class="reference external" href="http://eventlet.net">Eventlet</a> and <a class="reference external" href="http://gevent.org">Gevent</a> based workers.</li>
 <li>Added <a class="reference external" href="http://dev.w3.org/html5/websockets/">Websockets</a> support</li>
@@ -100,27 +91,27 @@ to set the type of request processing to use</li>
 </ul>
 </div>
 <div class="section" id="id8">
-<h1>0.6.5 / 2010-03-11</h1>
+<h2>0.6.5 / 2010-03-11</h2>
 <ul class="simple">
 <li>Fix pidfile handling</li>
 <li>Fix Exception Error</li>
 </ul>
 </div>
-<div class="section" id="id7">
+<div class="section" id="id9">
 <h2>0.6.4 / 2010-03-08</h2>
 <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="id8">
+<div class="section" id="id10">
 <h2>0.6.3 / 2010-03-07</h2>
 <ul class="simple">
 <li>Make HTTP parsing faster.</li>
 <li>Various bug fixes</li>
 </ul>
 </div>
-<div class="section" id="id9">
+<div class="section" id="id11">
 <h2>0.6.2 / 2010-03-01</h2>
 <ul class="simple">
 <li>Added support for chunked response.</li>
@@ -131,7 +122,7 @@ temporary data.</li>
 <li>Workers are now murdered by age (the oldest is killed first).</li>
 </ul>
 </div>
-<div class="section" id="id10">
+<div class="section" id="id12">
 <h2>0.6.1 / 2010-02-24</h2>
 <ul class="simple">
 <li>Added gunicorn config file support for Django admin command</li>
@@ -139,7 +130,7 @@ temporary data.</li>
 <li>Removed TTIN/TTOU from workers which blocked other signals.</li>
 </ul>
 </div>
-<div class="section" id="id11">
+<div class="section" id="id13">
 <h2>0.6 / 2010-02-22</h2>
 <ul class="simple">
 <li>Added setproctitle support</li>
@@ -147,14 +138,14 @@ temporary data.</li>
 permissions, new uid/gid permissions are only set for workers.</li>
 </ul>
 </div>
-<div class="section" id="id12">
+<div class="section" id="id14">
 <h2>0.5.1 / 2010-02-22</h2>
 <ul class="simple">
 <li>Fix umask</li>
 <li>Added Debian packaging</li>
 </ul>
 </div>
-<div class="section" id="id13">
+<div class="section" id="id15">
 <h2>0.5 / 2010-02-20</h2>
 <ul class="simple">
 <li>Added <a class="reference external" href="configuration.html">configuration file</a> handler.</li>
@@ -179,4 +170,4 @@ permissions, new uid/gid permissions are only set for workers.</li>
       </div>
     </div>
   </body>
-</html>
+</html>
\ No newline at end of file