--- a/packages/net/httpd/current/ChangeLog
+++ b/packages/net/httpd/current/ChangeLog
@@ -4,6 +4,7 @@ 2004-03-09  Nick Garnett  <nickg@calivar
 	* src/init.cxx: 
 	* src/httpd.c: 
 	* src/init.cxx:
+	* doc/httpd.sgml:
 	Added option to enable auto-starting of HTTPD. This is set by
 	default so the current behaviour is retained. When this is
 	disabled the application has to call cyg_httpd_startup() to get

--- a/packages/net/httpd/current/doc/httpd.sgml
+++ b/packages/net/httpd/current/doc/httpd.sgml
@@ -58,10 +58,13 @@ defining content, the application does n
 start the HTTP server.
 </para>
 <para>
-The HTTP server is started by a static constructor. This simply
-creates an initial thread and sets it running. Since this is called
-before the scheduler is started, nothing will happen until the
-application calls <function>cyg_scheduler_start()</function>.
+The HTTP server is, by default, started by a static constructor. This
+simply creates an initial thread and sets it running. Since this is
+called before the scheduler is started, nothing will happen until the
+application calls <function>cyg_scheduler_start()</function>. The
+server thread can also be started explicitly by the application, see
+the <literal>CYGNUM_HTTPD_SERVER_AUTO_START</literal> option for
+details.
 </para>
 <para>
 When the thread gets to run it first optionally delays for some period
@@ -226,6 +229,17 @@ very complex forms, this should be incre
 </sect2>
 
 <sect2>
+<title><literal>CYGNUM_HTTPD_SERVER_AUTO_START</literal></title>
+<para>
+This option causes the HTTP Daemon to be started automatically during
+system initialization. If this option is not set then the application
+must start the daemon explicitly by calling
+<function>cyg_httpd_startup()</function>. This option is set by
+default.
+</para>
+</sect2>
+
+<sect2>
 <title><literal>CYGNUM_HTTPD_SERVER_DELAY</literal></title>
 <para>
 This defines the number of system clock ticks that the HTTP server