update transformation

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@105904 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/docs/man/apxs.8 b/docs/man/apxs.8
index 82f1ad563ea6b247ef43e5024ab17da44f3e2e0a..759a04599dd99621ef85b41373567d15f173ac05 100644 (file)
--- a/docs/man/apxs.8
+++ b/docs/man/apxs.8
@@ -19,7 +19,7 @@
 .el .ne 3
 .IP "\\$1" \\$2
 ..
-.TH "APXS" 8 "2004-01-06" "Apache HTTP Server" "apxs"
+.TH "APXS" 8 "2004-11-20" "Apache HTTP Server" "apxs"
 
 .SH NAME
 apxs \- APache eXtenSion tool
@@ -96,7 +96,7 @@ This explicitly sets the module name for the -i (install) and -g (template gener
  
 .TP
 -q
-Performs a query for apxs's knowledge about certain settings\&. The \fIquery\fR parameters can be one or more of the following strings: CC, CFLAGS, CFLAGS_SHLIB, INCLUDEDIR, LD_SHLIB, LDFLAGS_SHLIB, LIBEXECDIR, LIBS_SHLIB, SBINDIR, SYSCONFDIR, TARGET\&. .PP Use this for manually determining settings\&. For instance use .nf INC=-I`apxs -q INCLUDEDIR` .fi .PP inside your own Makefiles if you need manual access to Apache's C header files\&.  
+Performs a query for apxs's knowledge about certain settings\&. The \fIquery\fR parameters can be one or more of the following strings: CC, CFLAGS, CFLAGS_SHLIB, INCLUDEDIR, LD_SHLIB, LDFLAGS_SHLIB, LIBEXECDIR, LIBS_SHLIB, SBINDIR, SYSCONFDIR, TARGET\&. .PP Use this for manually determining settings\&. For instance use INC=-I`apxs -q INCLUDEDIR` .PP inside your own Makefiles if you need manual access to Apache's C header files\&.  
   
 .SS "Configuration Options"
  

diff --git a/docs/man/dbmmanage.1 b/docs/man/dbmmanage.1
index dafbe935c4b682853147135cb963bcc737023647..a297070d375fa1155cfbbb35da0f3f5395a93920 100644 (file)
--- a/docs/man/dbmmanage.1
+++ b/docs/man/dbmmanage.1
@@ -19,7 +19,7 @@
 .el .ne 3
 .IP "\\$1" \\$2
 ..
-.TH "DBMMANAGE" 1 "2004-01-06" "Apache HTTP Server" "dbmmanage"
+.TH "DBMMANAGE" 1 "2004-11-20" "Apache HTTP Server" "dbmmanage"
 
 .SH NAME
 dbmmanage \- Manage user authentication files in DBM format
@@ -39,7 +39,7 @@ dbmmanage \- Manage user authentication files in DBM format
 .SH "SUMMARY"
  
 .PP
-dbmmanage is used to create and update the DBM format files used to store usernames and password for basic authentication of HTTP users\&. Resources available from the Apache HTTP server can be restricted to just the users listed in the files created by dbmmanage\&. This program can only be used when the usernames are stored in a DBM file\&. To use a flat-file database see htpasswd\&.
+dbmmanage is used to create and update the DBM format files used to store usernames and password for basic authentication of HTTP users via mod_auth_dbm\&. Resources available from the Apache HTTP server can be restricted to just the users listed in the files created by dbmmanage\&. This program can only be used when the usernames are stored in a DBM file\&. To use a flat-file database see htpasswd\&.
  
 .PP
 This manual page only lists the command line arguments\&. For details of the directives necessary to configure user authentication in httpd see the httpd manual, which is part of the Apache distribution or can be found at http://httpd\&.apache\&.org/\&.
@@ -85,25 +85,25 @@ plaintext (\fInot recommended\fR)
  
 .TP
 add
-Adds an entry for \fIusername\fR to \fIfilename\fR using the encrypted password \fIencpasswd\fR\&.  
+Adds an entry for \fIusername\fR to \fIfilename\fR using the encrypted password \fIencpasswd\fR\&. dbmmanage passwords\&.dat add rbowen foKntnEF3KSXA  
 .TP
 adduser
-Asks for a password and then adds an entry for \fIusername\fR to \fIfilename\fR\&.  
+Asks for a password and then adds an entry for \fIusername\fR to \fIfilename\fR\&. dbmmanage passwords\&.dat adduser krietz  
 .TP
 check
-Asks for a password and then checks if \fIusername\fR is in \fIfilename\fR and if it's password matches the specified one\&.  
+Asks for a password and then checks if \fIusername\fR is in \fIfilename\fR and if it's password matches the specified one\&. dbmmanage passwords\&.dat check rbowen  
 .TP
 delete
-Deletes the \fIusername\fR entry from \fIfilename\fR\&.  
+Deletes the \fIusername\fR entry from \fIfilename\fR\&. dbmmanage passwords\&.dat delete rbowen  
 .TP
 import
 Reads \fIusername\fR:\fIpassword\fR entries (one per line) from STDIN and adds them to \fIfilename\fR\&. The passwords already have to be crypted\&.  
 .TP
 update
-Same as the adduser command, except that it makes sure \fIusername\fR already exists in \fIfilename\fR\&.  
+Same as the adduser command, except that it makes sure \fIusername\fR already exists in \fIfilename\fR\&. dbmmanage passwords\&.dat update rbowen  
 .TP
 view
-Just displays the contents of the DBM file\&. If you specify a \fIusername\fR, it displays the particular record only\&.  
+Just displays the contents of the DBM file\&. If you specify a \fIusername\fR, it displays the particular record only\&. dbmmanage passwords\&.dat view  
   
 .SH "BUGS"
  

diff --git a/docs/manual/mod/mpm_common.html.en b/docs/manual/mod/mpm_common.html.en
index 1db5718f30d1d53041375131f91e5c52891a1906..b8e83a1cc66ecd5334ed835c2464ed0d17496e46 100644 (file)
--- a/docs/manual/mod/mpm_common.html.en
+++ b/docs/manual/mod/mpm_common.html.en
@@ -289,6 +289,12 @@ listens to</td></tr>
       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>

diff --git a/docs/manual/programs/dbmmanage.html.en b/docs/manual/programs/dbmmanage.html.en
index 7a2894d620d26a739094d0271f79d479ac01ba2a..902f7b1d19bf68712812edc005d245025c3b9ef5 100644 (file)
--- a/docs/manual/programs/dbmmanage.html.en
+++ b/docs/manual/programs/dbmmanage.html.en
@@ -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>