From: Rich Bowen
Date: Tue, 23 Nov 2004 02:18:22 +0000 (+0000)
Subject: Converting xml -> html
X-Git-Tag: 2.1.2~136
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4569e98c029255b723a51e3936540f10b3cf6dc0;p=thirdparty%2Fapache%2Fhttpd.git
Converting xml -> html
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@106264 13f79535-47bb-0310-9956-ffa450edef68
---
diff --git a/docs/manual/mod/core.html.en b/docs/manual/mod/core.html.en
index 89f33da9e23..1acc2cfd12d 100644
--- a/docs/manual/mod/core.html.en
+++ b/docs/manual/mod/core.html.en
@@ -2720,8 +2720,8 @@ is accessed by an incompatible browser
The ServerRoot directive sets the
directory in which the server lives. Typically it will contain the
subdirectories conf/ and logs/. Relative
- paths for other configuration files are taken as relative to this
- directory.
+ paths in other configuration directives (such as Include or LoadModule, for example) are taken as
+ relative to this directory.
Example
ServerRoot /home/httpd
diff --git a/docs/manual/mod/mod_ssl.html.en b/docs/manual/mod/mod_ssl.html.en
index 717c7062950..fe5ccc2c4bc 100644
--- a/docs/manual/mod/mod_ssl.html.en
+++ b/docs/manual/mod/mod_ssl.html.en
@@ -95,7 +95,7 @@ compatibility variables.
- | Variable Name: |
+ Variable Name: |
Value Type: |
Description: |
@@ -394,7 +394,7 @@ specify the preference and order for the ciphers (see Table
-| Tag | Description |
+| Tag | Description |
| Key Exchange Algorithm: |
kRSA | RSA key exchange |
kDHr | Diffie-Hellman key exchange with RSA key |
@@ -471,7 +471,7 @@ SSLCipherSuite RSA:!EXP:!NULL:+HIGH:+MEDIUM:-LOW
-| Cipher-Tag | Protocol | Key Ex. | Auth. | Enc. | MAC | Type |
+| Cipher-Tag | Protocol | Key Ex. | Auth. | Enc. | MAC | Type |
| RSA Ciphers: |
DES-CBC3-SHA | SSLv3 | RSA | RSA | 3DES(168) | SHA1 | |
DES-CBC3-MD5 | SSLv2 | RSA | RSA | 3DES(168) | MD5 | |
diff --git a/docs/manual/mod/mpm_common.html.en b/docs/manual/mod/mpm_common.html.en
index 006d565c334..2c3977cf0e6 100644
--- a/docs/manual/mod/mpm_common.html.en
+++ b/docs/manual/mod/mpm_common.html.en
@@ -276,6 +276,12 @@ listens to
Listen [fe80::a00:20ff:fea7:ccea]:80
+ Error condition
+ Multiple Listen directives for the same ip address and
+ port will result in an 'Address already in use' error message.
+
+
+
See also
- DNS Issues
diff --git a/docs/manual/programs/dbmmanage.html.en b/docs/manual/programs/dbmmanage.html.en
index 5e8f8ca6f12..7b441c8a3f2 100644
--- a/docs/manual/programs/dbmmanage.html.en
+++ b/docs/manual/programs/dbmmanage.html.en
@@ -23,7 +23,8 @@
dbmmanage 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 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
@@ -105,18 +106,30 @@
add
- Adds an entry for username to filename using the
- encrypted password encpasswd.
+ encrypted password encpasswd.
+
+ dbmmanage passwords.dat add rbowen foKntnEF3KSXA
+
adduser
- Asks for a password and then adds an entry for username to
- filename.
+ filename.
+
+ dbmmanage passwords.dat adduser krietz
+
check
- Asks for a password and then checks if username is in
- filename and if it's password matches the specified one.
+ filename and if it's password matches the specified one.
+
+ dbmmanage passwords.dat check rbowen
+
delete
- - Deletes the username entry from filename.
+ - Deletes the username entry from filename.
+
+
dbmmanage passwords.dat delete rbowen
+
import
- Reads
username:password entries
@@ -125,11 +138,17 @@
update
- Same as the
adduser command, except that it makes
- sure username already exists in filename.
+ sure username already exists in filename.
+
+ dbmmanage passwords.dat update rbowen
+
view
- Just displays the contents of the DBM file. If you specify a
- username, it displays the particular record only.
+ username, it displays the particular record only.
+
+ dbmmanage passwords.dat view
+
