You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rb...@apache.org on 2004/11/23 03:18:24 UTC
svn commit: r106264 - /httpd/httpd/trunk/docs/manual/mod/core.html.en /httpd/httpd/trunk/docs/manual/mod/mod_ssl.html.en /httpd/httpd/trunk/docs/manual/mod/mpm_common.html.en /httpd/httpd/trunk/docs/manual/programs/dbmmanage.html.en
Author: rbowen
Date: Mon Nov 22 18:18:22 2004
New Revision: 106264
Modified:
httpd/httpd/trunk/docs/manual/mod/core.html.en
httpd/httpd/trunk/docs/manual/mod/mod_ssl.html.en
httpd/httpd/trunk/docs/manual/mod/mpm_common.html.en
httpd/httpd/trunk/docs/manual/programs/dbmmanage.html.en
Log:
Converting xml -> html
Modified: httpd/httpd/trunk/docs/manual/mod/core.html.en
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/mod/core.html.en?view=diff&rev=106264&p1=httpd/httpd/trunk/docs/manual/mod/core.html.en&r1=106263&p2=httpd/httpd/trunk/docs/manual/mod/core.html.en&r2=106264
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/core.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/core.html.en Mon Nov 22 18:18:22 2004
@@ -2720,8 +2720,8 @@
<p>The <code class="directive">ServerRoot</code> directive sets the
directory in which the server lives. Typically it will contain the
subdirectories <code>conf/</code> and <code>logs/</code>. Relative
- paths for other configuration files are taken as relative to this
- directory.</p>
+ paths in other configuration directives (such as <code class="directive"><a href="#include">Include</a></code> or <code class="directive"><a href="../mod/so.html#loadmodule">LoadModule</a></code>, for example) are taken as
+ relative to this directory.</p>
<div class="example"><h3>Example</h3><p><code>
ServerRoot /home/httpd
Modified: httpd/httpd/trunk/docs/manual/mod/mod_ssl.html.en
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/mod/mod_ssl.html.en?view=diff&rev=106264&p1=httpd/httpd/trunk/docs/manual/mod/mod_ssl.html.en&r1=106263&p2=httpd/httpd/trunk/docs/manual/mod/mod_ssl.html.en&r2=106264
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_ssl.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_ssl.html.en Mon Nov 22 18:18:22 2004
@@ -95,7 +95,7 @@
<table class="bordered">
<tr>
- <th>Variable Name:</th>
+ <th><a name="table3">Variable Name:</a></th>
<th>Value Type:</th>
<th>Description:</th>
</tr>
@@ -394,7 +394,7 @@
<table class="bordered">
-<tr><th>Tag</th> <th>Description</th></tr>
+<tr><th><a name="table1">Tag</a></th> <th>Description</th></tr>
<tr><td colspan="2"><em>Key Exchange Algorithm:</em></td></tr>
<tr><td><code>kRSA</code></td> <td>RSA key exchange</td></tr>
<tr><td><code>kDHr</code></td> <td>Diffie-Hellman key exchange with RSA key</td></tr>
@@ -471,7 +471,7 @@
</code></p></div>
<table class="bordered">
-<tr><th>Cipher-Tag</th> <th>Protocol</th> <th>Key Ex.</th> <th>Auth.</th> <th>Enc.</th> <th>MAC</th> <th>Type</th> </tr>
+<tr><th><a name="table2">Cipher-Tag</a></th> <th>Protocol</th> <th>Key Ex.</th> <th>Auth.</th> <th>Enc.</th> <th>MAC</th> <th>Type</th> </tr>
<tr><td colspan="7"><em>RSA Ciphers:</em></td></tr>
<tr><td><code>DES-CBC3-SHA</code></td> <td>SSLv3</td> <td>RSA</td> <td>RSA</td> <td>3DES(168)</td> <td>SHA1</td> <td /> </tr>
<tr><td><code>DES-CBC3-MD5</code></td> <td>SSLv2</td> <td>RSA</td> <td>RSA</td> <td>3DES(168)</td> <td>MD5</td> <td /> </tr>
Modified: httpd/httpd/trunk/docs/manual/mod/mpm_common.html.en
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/mod/mpm_common.html.en?view=diff&rev=106264&p1=httpd/httpd/trunk/docs/manual/mod/mpm_common.html.en&r1=106263&p2=httpd/httpd/trunk/docs/manual/mod/mpm_common.html.en&r2=106264
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mpm_common.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mpm_common.html.en Mon Nov 22 18:18:22 2004
@@ -276,6 +276,12 @@
Listen [fe80::a00:20ff:fea7:ccea]:80
</code></p></div>
+ <div class="warning"><h3>Error condition</h3>
+ Multiple <code>Listen</code> directives for the same ip address and
+ port will result in an 'Address already in use' error message.
+ </div>
+
+
<h3>See also</h3>
<ul>
<li><a href="../dns-caveats.html">DNS Issues</a></li>
Modified: httpd/httpd/trunk/docs/manual/programs/dbmmanage.html.en
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/programs/dbmmanage.html.en?view=diff&rev=106264&p1=httpd/httpd/trunk/docs/manual/programs/dbmmanage.html.en&r1=106263&p2=httpd/httpd/trunk/docs/manual/programs/dbmmanage.html.en&r2=106264
==============================================================================
--- httpd/httpd/trunk/docs/manual/programs/dbmmanage.html.en (original)
+++ httpd/httpd/trunk/docs/manual/programs/dbmmanage.html.en Mon Nov 22 18:18:22 2004
@@ -23,7 +23,8 @@
</div>
<p><code>dbmmanage</code> is used to create and update the DBM format files
- used to store usernames and password for basic authentication of HTTP users.
+ used to store usernames and password for basic authentication of HTTP users
+ via <code class="module"><a href="../mod/mod_auth_dbm.html">mod_auth_dbm</a></code>.
Resources available from the Apache HTTP server can be restricted to just
the users listed in the files created by <code>dbmmanage</code>. This
program can only be used when the usernames are stored in a DBM file. To
@@ -105,18 +106,30 @@
<dl>
<dt><code>add</code></dt>
<dd>Adds an entry for <var>username</var> to <var>filename</var> using the
- encrypted password <var>encpasswd</var>.</dd>
+ encrypted password <var>encpasswd</var>.
+
+ <div class="example"><p><code>dbmmanage passwords.dat add rbowen foKntnEF3KSXA</code></p></div>
+ </dd>
<dt><code>adduser</code></dt>
<dd>Asks for a password and then adds an entry for <var>username</var> to
- <var>filename</var>.</dd>
+ <var>filename</var>.
+
+ <div class="example"><p><code>dbmmanage passwords.dat adduser krietz</code></p></div>
+ </dd>
<dt><code>check</code></dt>
<dd>Asks for a password and then checks if <var>username</var> is in
- <var>filename</var> and if it's password matches the specified one.</dd>
+ <var>filename</var> and if it's password matches the specified one.
+
+ <div class="example"><p><code>dbmmanage passwords.dat check rbowen</code></p></div>
+ </dd>
<dt><code>delete</code></dt>
- <dd>Deletes the <var>username</var> entry from <var>filename</var>.</dd>
+ <dd>Deletes the <var>username</var> entry from <var>filename</var>.
+
+ <div class="example"><p><code>dbmmanage passwords.dat delete rbowen</code></p></div>
+ </dd>
<dt><code>import</code></dt>
<dd>Reads <code><var>username</var>:<var>password</var></code> entries
@@ -125,11 +138,17 @@
<dt><code>update</code></dt>
<dd>Same as the <code>adduser</code> command, except that it makes
- sure <var>username</var> already exists in <var>filename</var>.</dd>
+ sure <var>username</var> already exists in <var>filename</var>.
+
+ <div class="example"><p><code>dbmmanage passwords.dat update rbowen</code></p></div>
+ </dd>
<dt><code>view</code></dt>
<dd>Just displays the contents of the DBM file. If you specify a
- <var>username</var>, it displays the particular record only.</dd>
+ <var>username</var>, it displays the particular record only.
+
+ <div class="example"><p><code>dbmmanage passwords.dat view</code></p></div>
+ </dd>
</dl>
</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>