From: Rainer Jung Date: Wed, 12 Dec 2012 16:32:22 +0000 (+0000) Subject: Xforms. X-Git-Tag: 2.4.4~315 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=31277ab116fd0d3cb3edd208e4258cca899b2c87;p=apache Xforms. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1420812 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/man/dbmmanage.1 b/docs/man/dbmmanage.1 index 88e4a7057e..a0f9f78001 100644 --- a/docs/man/dbmmanage.1 +++ b/docs/man/dbmmanage.1 @@ -19,7 +19,7 @@ .el .ne 3 .IP "\\$1" \\$2 .. -.TH "DBMMANAGE" 1 "2004-12-10" "Apache HTTP Server" "dbmmanage" +.TH "DBMMANAGE" 1 "2012-12-12" "Apache HTTP Server" "dbmmanage" .SH NAME dbmmanage \- Manage user authentication files in DBM format @@ -41,6 +41,9 @@ dbmmanage \- Manage user authentication files in DBM format .PP 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_authn_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 +Another tool to maintain a DBM password database is htdbm\&. + .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/\&. diff --git a/docs/man/htdbm.1 b/docs/man/htdbm.1 index 010755b45b..61a691880c 100644 --- a/docs/man/htdbm.1 +++ b/docs/man/htdbm.1 @@ -19,7 +19,7 @@ .el .ne 3 .IP "\\$1" \\$2 .. -.TH "HTDBM" 1 "2009-03-27" "Apache HTTP Server" "htdbm" +.TH "HTDBM" 1 "2012-12-12" "Apache HTTP Server" "htdbm" .SH NAME htdbm \- Manipulate DBM password databases @@ -27,25 +27,25 @@ htdbm \- Manipulate DBM password databases .SH "SYNOPSIS" .PP -\fBhtdbm\fR [ -\fBT\fR\fIDBTYPE\fR ] [ -\fBc\fR ] [ -\fBm\fR | -\fBd\fR | -\fBp\fR | -\fBs\fR ] [ -\fBt\fR ] [ -\fBv\fR ] [ -\fBx\fR ] \fIfilename\fR \fIusername\fR +\fBhtdbm\fR [ -\fBT\fR\fIDBTYPE\fR ] [ -\fBi\fR ] [ -\fBc\fR ] [ -\fBm\fR | -\fBB\fR | -\fBd\fR | -\fBs\fR | -\fBp\fR ] [ -\fBC\fR \fIcost\fR ] [ -\fBt\fR ] [ -\fBv\fR ] \fIfilename\fR \fIusername\fR .PP -\fBhtdbm\fR -\fBb\fR [ -\fBT\fR\fIDBTYPE\fR ] [ -\fBc\fR ] [ -\fBm\fR | -\fBd\fR | -\fBp\fR | -\fBs\fR ] [ -\fBt\fR ] [ -\fBv\fR ] \fIfilename\fR \fIusername\fR \fIpassword\fR +\fBhtdbm\fR -\fBb\fR [ -\fBT\fR\fIDBTYPE\fR ] [ -\fBc\fR ] [ -\fBm\fR | -\fBB\fR | -\fBd\fR | -\fBs\fR | -\fBp\fR ] [ -\fBC\fR \fIcost\fR ] [ -\fBt\fR ] [ -\fBv\fR ] \fIfilename\fR \fIusername\fR \fIpassword\fR .PP -\fBhtdbm\fR -\fBn\fR [ -\fBc\fR ] [ -\fBm\fR | -\fBd\fR | -\fBp\fR | -\fBs\fR ] [ -\fBt\fR ] [ -\fBv\fR ] \fIusername\fR +\fBhtdbm\fR -\fBn\fR [ -\fBi\fR ] [ -\fBc\fR ] [ -\fBm\fR | -\fBB\fR | -\fBd\fR | -\fBs\fR | -\fBp\fR ] [ -\fBC\fR \fIcost\fR ] [ -\fBt\fR ] [ -\fBv\fR ] \fIusername\fR .PP -\fBhtdbm\fR -\fBnb\fR [ -\fBc\fR ] [ -\fBm\fR | -\fBd\fR | -\fBp\fR | -\fBs\fR ] [ -\fBt\fR ] [ -\fBv\fR ] \fIusername\fR \fIpassword\fR +\fBhtdbm\fR -\fBnb\fR [ -\fBc\fR ] [ -\fBm\fR | -\fBB\fR | -\fBd\fR | -\fBs\fR | -\fBp\fR ] [ -\fBC\fR \fIcost\fR ] [ -\fBt\fR ] [ -\fBv\fR ] \fIusername\fR \fIpassword\fR .PP -\fBhtdbm\fR -\fBv\fR [ -\fBT\fR\fIDBTYPE\fR ] [ -\fBc\fR ] [ -\fBm\fR | -\fBd\fR | -\fBp\fR | -\fBs\fR ] [ -\fBt\fR ] [ -\fBv\fR ] \fIfilename\fR \fIusername\fR +\fBhtdbm\fR -\fBv\fR [ -\fBT\fR\fIDBTYPE\fR ] [ -\fBi\fR ] [ -\fBc\fR ] [ -\fBm\fR | -\fBB\fR | -\fBd\fR | -\fBs\fR | -\fBp\fR ] [ -\fBC\fR \fIcost\fR ] [ -\fBt\fR ] [ -\fBv\fR ] \fIfilename\fR \fIusername\fR .PP -\fBhtdbm\fR -\fBvb\fR [ -\fBT\fR\fIDBTYPE\fR ] [ -\fBc\fR ] [ -\fBm\fR | -\fBd\fR | -\fBp\fR | -\fBs\fR ] [ -\fBt\fR ] [ -\fBv\fR ] \fIfilename\fR \fIusername\fR \fIpassword\fR +\fBhtdbm\fR -\fBvb\fR [ -\fBT\fR\fIDBTYPE\fR ] [ -\fBc\fR ] [ -\fBm\fR | -\fBB\fR | -\fBd\fR | -\fBs\fR | -\fBp\fR ] [ -\fBC\fR \fIcost\fR ] [ -\fBt\fR ] [ -\fBv\fR ] \fIfilename\fR \fIusername\fR \fIpassword\fR .PP -\fBhtdbm\fR -\fBx\fR [ -\fBT\fR\fIDBTYPE\fR ] [ -\fBm\fR | -\fBd\fR | -\fBp\fR | -\fBs\fR ] \fIfilename\fR \fIusername\fR +\fBhtdbm\fR -\fBx\fR [ -\fBT\fR\fIDBTYPE\fR ] \fIfilename\fR \fIusername\fR .PP \fBhtdbm\fR -\fBl\fR [ -\fBT\fR\fIDBTYPE\fR ] @@ -62,7 +62,10 @@ htdbm is used to manipulate the DBM format files used to store usernames and pas .TP -b -Use batch mode; \fIi\&.e\&.\fR, get the password from the command line rather than prompting for it\&. This option should be used with extreme care, since \fBthe password is clearly visible\fR on the command line\&. +Use batch mode; \fIi\&.e\&.\fR, get the password from the command line rather than prompting for it\&. This option should be used with extreme care, since \fBthe password is clearly visible\fR on the command line\&. For script use see the -i option\&. +.TP +-i +Read the password from stdin without verification (for script usage)\&. .TP -c Create the \fIpasswdfile\fR\&. If \fIpasswdfile\fR already exists, it is rewritten and truncated\&. This option cannot be combined with the -n option\&. @@ -73,11 +76,17 @@ Display the results on standard output rather than updating a database\&. This o -m Use MD5 encryption for passwords\&. On Windows and Netware, this is the default\&. .TP +-B +Use bcrypt encryption for passwords\&. This is currently considered to be very secure\&. +.TP +-C +This flag is only allowed in combination with -B (bcrypt encryption)\&. It sets the computing time used for the bcrypt algorithm (higher is more secure but slower, default: 5, valid: 4 to 31)\&. +.TP -d -Use crypt() encryption for passwords\&. The default on all platforms but Windows and Netware\&. Though possibly supported by htdbm on all platforms, it is not supported by the httpd server on Windows and Netware\&. +Use crypt() encryption for passwords\&. The default on all platforms but Windows and Netware\&. Though possibly supported by htdbm on all platforms, it is not supported by the httpd server on Windows and Netware\&. This algorithm is \fBinsecure\fR by today's standards\&. .TP -s -Use SHA encryption for passwords\&. Facilitates migration from/to Netscape servers using the LDAP Directory Interchange Format (ldif)\&. +Use SHA encryption for passwords\&. Facilitates migration from/to Netscape servers using the LDAP Directory Interchange Format (ldif)\&. This algorithm is \fBinsecure\fR by today's standards\&. .TP -p Use plaintext passwords\&. Though htdbm will support creation on all platforms, the httpd daemon will only accept plain text passwords on Windows and Netware\&. @@ -85,15 +94,15 @@ Use plaintext passwords\&. Though htdbm will support creation on all platforms, -l Print each of the usernames and comments from the database on stdout\&. .TP --t -Interpret the final parameter as a comment\&. When this option is specified, an additional string can be appended to the command line; this string will be stored in the "Comment" field of the database, associated with the specified username\&. -.TP -v Verify the username and password\&. The program will print a message indicating whether the supplied password is valid\&. If the password is invalid, the program exits with error code 3\&. .TP -x Delete user\&. If the username exists in the specified DBM file, it will be deleted\&. .TP +-t +Interpret the final parameter as a comment\&. When this option is specified, an additional string can be appended to the command line; this string will be stored in the "Comment" field of the database, associated with the specified username\&. +.TP \fIfilename\fR The filename of the DBM format file\&. Usually without the extension \&.db, \&.pag, or \&.dir\&. If -c is given, the DBM file is created if it does not already exist, or updated if it does exist\&. .TP @@ -156,6 +165,15 @@ Web password files such as those managed by htdbm should \fInot\fR be within the .PP The use of the -b option is discouraged, since when it is used the unencrypted password appears on the command line\&. +.PP +When using the crypt() algorithm, note that only the first 8 characters of the password are used to form the password\&. If the supplied password is longer, the extra characters will be silently discarded\&. + +.PP +The SHA encryption format does not use salting: for a given password, there is only one encrypted representation\&. The crypt() and MD5 formats permute the representation by prepending a random salt string, to make dictionary attacks against the passwords more difficult\&. + +.PP +The SHA and crypt() formats are insecure by today's standards\&. + .SH "RESTRICTIONS" .PP diff --git a/docs/man/htpasswd.1 b/docs/man/htpasswd.1 index b8a4db1db2..07fc3a50c4 100644 --- a/docs/man/htpasswd.1 +++ b/docs/man/htpasswd.1 @@ -19,7 +19,7 @@ .el .ne 3 .IP "\\$1" \\$2 .. -.TH "HTPASSWD" 1 "2012-07-29" "Apache HTTP Server" "htpasswd" +.TH "HTPASSWD" 1 "2012-12-12" "Apache HTTP Server" "htpasswd" .SH NAME htpasswd \- Manage user files for basic authentication @@ -27,16 +27,16 @@ htpasswd \- Manage user files for basic authentication .SH "SYNOPSIS" .PP -\fBhtpasswd\fR [ -\fBc\fR ] [ -\fBm\fR ] [ -\fBD\fR ] \fIpasswdfile\fR \fIusername\fR +\fBhtpasswd\fR [ -\fBc\fR ] [ -\fBi\fR ] [ -\fBm\fR | -\fBB\fR | -\fBd\fR | -\fBs\fR | -\fBp\fR ] [ -\fBC\fR \fIcost\fR ] [ -\fBD\fR ] \fIpasswdfile\fR \fIusername\fR .PP -\fBhtpasswd\fR -\fBb\fR [ -\fBc\fR ] [ -\fBm\fR | -\fBd\fR | -\fBp\fR | -\fBs\fR ] [ -\fBD\fR ] \fIpasswdfile\fR \fIusername\fR \fIpassword\fR +\fBhtpasswd\fR -\fBb\fR [ -\fBc\fR ] [ -\fBm\fR | -\fBB\fR | -\fBd\fR | -\fBs\fR | -\fBp\fR ] [ -\fBC\fR \fIcost\fR ] [ -\fBD\fR ] \fIpasswdfile\fR \fIusername\fR \fIpassword\fR .PP -\fBhtpasswd\fR -\fBn\fR [ -\fBm\fR | -\fBd\fR | -\fBs\fR | -\fBp\fR ] \fIusername\fR +\fBhtpasswd\fR -\fBn\fR [ -\fBi\fR ] [ -\fBm\fR | -\fBB\fR | -\fBd\fR | -\fBs\fR | -\fBp\fR ] [ -\fBC\fR \fIcost\fR ] \fIusername\fR .PP -\fBhtpasswd\fR -\fBnb\fR [ -\fBm\fR | -\fBd\fR | -\fBs\fR | -\fBp\fR ] \fIusername\fR \fIpassword\fR +\fBhtpasswd\fR -\fBnb\fR [ -\fBm\fR | -\fBB\fR | -\fBd\fR | -\fBs\fR | -\fBp\fR ] [ -\fBC\fR \fIcost\fR ] \fIusername\fR \fIpassword\fR .SH "SUMMARY" @@ -45,10 +45,10 @@ htpasswd \- Manage user files for basic authentication htpasswd is used to create and update the flat-files used to store usernames and password for basic authentication of HTTP users\&. If htpasswd cannot access a file, such as not being able to write to the output file or not being able to read the file in order to update it, it returns an error status and makes no changes\&. .PP -Resources available from the Apache HTTP server can be restricted to just the users listed in the files created by htpasswd\&. This program can only manage usernames and passwords stored in a flat-file\&. It can encrypt and display password information for use in other types of data stores, though\&. To use a DBM database see dbmmanage\&. +Resources available from the Apache HTTP server can be restricted to just the users listed in the files created by htpasswd\&. This program can only manage usernames and passwords stored in a flat-file\&. It can encrypt and display password information for use in other types of data stores, though\&. To use a DBM database see dbmmanage or htdbm\&. .PP -htpasswd encrypts passwords using either a version of MD5 modified for Apache, or the system's crypt() routine\&. Files managed by htpasswd may contain both types of passwords; some user records may have MD5-encrypted passwords while others in the same file may have passwords encrypted with crypt()\&. +htpasswd encrypts passwords using either bcrypt, a version of MD5 modified for Apache, SHA1, or the system's crypt() routine\&. Files managed by htpasswd may contain a mixture of different encoding types of passwords; some user records may have bcrypt or MD5-encrypted passwords while others in the same file may have passwords encrypted with crypt()\&. .PP This manual page only lists the command line arguments\&. For details of the directives necessary to configure user authentication in httpd see the Apache manual, which is part of the Apache distribution or can be found at http://httpd\&.apache\&.org/\&. @@ -59,7 +59,10 @@ This manual page only lists the command line arguments\&. For details of the dir .TP -b -Use batch mode; \fIi\&.e\&.\fR, get the password from the command line rather than prompting for it\&. This option should be used with extreme care, since \fBthe password is clearly visible\fR on the command line\&. +Use batch mode; \fIi\&.e\&.\fR, get the password from the command line rather than prompting for it\&. This option should be used with extreme care, since \fBthe password is clearly visible\fR on the command line\&. For script use see the -i option\&. +.TP +-i +Read the password from stdin without verification (for script usage)\&. .TP -c Create the \fIpasswdfile\fR\&. If \fIpasswdfile\fR already exists, it is rewritten and truncated\&. This option cannot be combined with the -n option\&. @@ -70,6 +73,12 @@ Display the results on standard output rather than updating a file\&. This is us -m Use MD5 encryption for passwords\&. This is the default\&. .TP +-B +Use bcrypt encryption for passwords\&. This is currently considered to be very secure\&. +.TP +-C +This flag is only allowed in combination with -B (bcrypt encryption)\&. It sets the computing time used for the bcrypt algorithm (higher is more secure but slower, default: 5, valid: 4 to 31)\&. +.TP -d Use crypt() encryption for passwords\&. This is not supported by the httpd server on Windows and Netware\&. This algorithm limits the password length to 8 characters\&. This algorithm is \fBinsecure\fR by today's standards\&. .TP diff --git a/docs/manual/convenience.map b/docs/manual/convenience.map index 15fd6d8eda..edef97c190 100644 --- a/docs/manual/convenience.map +++ b/docs/manual/convenience.map @@ -526,6 +526,8 @@ sslrequiressl mod/mod_ssl.html#sslrequiressl sslsessioncache mod/mod_ssl.html#sslsessioncache sslsessioncachetimeout mod/mod_ssl.html#sslsessioncachetimeout sslsessionticketkeyfile mod/mod_ssl.html#sslsessionticketkeyfile +sslsrpunknownuserseed mod/mod_ssl.html#sslsrpunknownuserseed +sslsrpverifierfile mod/mod_ssl.html#sslsrpverifierfile sslstaplingcache mod/mod_ssl.html#sslstaplingcache sslstaplingerrorcachetimeout mod/mod_ssl.html#sslstaplingerrorcachetimeout sslstaplingfaketrylater mod/mod_ssl.html#sslstaplingfaketrylater diff --git a/docs/manual/misc/password_encryptions.html.en b/docs/manual/misc/password_encryptions.html.en index b7f6c28e4c..7dfe1ae724 100644 --- a/docs/manual/misc/password_encryptions.html.en +++ b/docs/manual/misc/password_encryptions.html.en @@ -34,20 +34,15 @@

Basic Authentication

-

There are four formats that Apache recognizes for basic-authentication +

There are five formats that Apache recognizes for basic-authentication passwords. Note that not all formats work on every platform:

-
PLAIN TEXT (i.e. unencrypted)
-
Windows & Netware only.
- -
CRYPT
-
Unix only. Uses the traditional Unix crypt(3) function - with a randomly-generated 32-bit salt (only 12 bits used) and the first 8 - characters of the password.
- -
SHA1
-
"{SHA}" + Base64-encoded SHA-1 digest of the password.
+
bcrypt
+
"$2y$" + the result of the crypt_blowfish algorithm. + See the APR source file + crypt_blowfish.c + for the details of the algorithm.
MD5
"$apr1$" + the result of an Apache-specific algorithm using an @@ -55,10 +50,26 @@ random 32-bit salt and the password. See the APR source file apr_md5.c for the details of the algorithm.
+ +
SHA1
+
"{SHA}" + Base64-encoded SHA-1 digest of the password. Insecure.
+ +
CRYPT
+
Unix only. Uses the traditional Unix crypt(3) function + with a randomly-generated 32-bit salt (only 12 bits used) and the first 8 + characters of the password. Insecure.
+ +
PLAIN TEXT (i.e. unencrypted)
+
Windows & Netware only. Insecure.

Generating values with htpasswd

+

bcrypt

+ $ htpasswd -nbB myName myPassword
+ myName:$2y$05$c4WoMPo3SXsafkva.HHa6uXQZWr7oboPiC2bT/r7q1BB8I2s0BRqC +

+

MD5

$ htpasswd -nbm myName myPassword
myName:$apr1$r31.....$HqJZimcKQFAMYayBlzkrA/ diff --git a/docs/manual/mod/mod_authn_dbm.html.en b/docs/manual/mod/mod_authn_dbm.html.en index bece9b7caf..614acc19bf 100644 --- a/docs/manual/mod/mod_authn_dbm.html.en +++ b/docs/manual/mod/mod_authn_dbm.html.en @@ -62,6 +62,8 @@

  • AuthDigestProvider
    • +
  • htpasswd
    • +
  • htdbm
  • Password Formats
    • @@ -131,7 +133,9 @@ passwords for authentication

    A perl script called dbmmanage is included with Apache. This program can be used to create and update DBM - format password files for use with this module.

    + format password files for use with this module. Another + tool for maintaining the DBM files is the included program + htdbm.

    diff --git a/docs/manual/mod/mod_authn_dbm.xml.ja b/docs/manual/mod/mod_authn_dbm.xml.ja index c3d81dc664..c3b43a2ffe 100644 --- a/docs/manual/mod/mod_authn_dbm.xml.ja +++ b/docs/manual/mod/mod_authn_dbm.xml.ja @@ -1,7 +1,7 @@ - + + + diff --git a/docs/manual/mod/mod_proxy_html.xml.meta b/docs/manual/mod/mod_proxy_html.xml.meta index cd380113ea..6bfed94b35 100644 --- a/docs/manual/mod/mod_proxy_html.xml.meta +++ b/docs/manual/mod/mod_proxy_html.xml.meta @@ -8,6 +8,6 @@ en - fr + fr diff --git a/docs/manual/mod/quickreference.html.de b/docs/manual/mod/quickreference.html.de index 2e4e32ca28..85343fad7b 100644 --- a/docs/manual/mod/quickreference.html.de +++ b/docs/manual/mod/quickreference.html.de @@ -664,17 +664,17 @@ stylesheets. ProxyHTMLCharsetOut Charset | *svdBSpecify a charset for mod_proxy_html output. ProxyHTMLDocType HTML|XHTML [Legacy]
    OR
    ProxyHTMLDocType fpi [SGML|XML]    svdBSets an HTML or XHTML document type declaration. -ProxyHTMLEnable On|OffsvdBTurns the proxy_html filter on or off. +ProxyHTMLEnable On|Off Off svdBTurns the proxy_html filter on or off. ProxyHTMLEvents attribute [attribute ...]svdBSpecify attributes to treat as scripting events. -ProxyHTMLExtended On|OffsvdBDetermines whether to fix links in inline scripts, stylesheets, +ProxyHTMLExtended On|Off Off svdBDetermines whether to fix links in inline scripts, stylesheets, and scripting events. ProxyHTMLFixups [lowercase] [dospath] [reset]svdBFixes for simple HTML errors. -ProxyHTMLInterp On|OffsvdBEnables per-request interpolation of +ProxyHTMLInterp On|Off Off svdBEnables per-request interpolation of ProxyHTMLURLMap rules. ProxyHTMLLinks element attribute [attribute2 ...]svdBSpecify HTML elements that have URL attributes to be rewritten. -ProxyHTMLMeta On|OffsvdBTurns on or off extra pre-parsing of metadata in HTML +ProxyHTMLMeta On|Off Off svdBTurns on or off extra pre-parsing of metadata in HTML <head> sections. -ProxyHTMLStripComments On|OffsvdBDetermines whether to strip HTML comments. +ProxyHTMLStripComments On|Off Off svdBDetermines whether to strip HTML comments. ProxyHTMLURLMap from-pattern to-pattern [flags] [cond]svdBDefines a rule to rewrite HTML links ProxyIOBufferSize bytes 8192 svEDetermine size of internal data throughput buffer <ProxyMatch regex> ...</ProxyMatch>svEContainer for directives applied to regular-expression-matched diff --git a/docs/manual/mod/quickreference.html.en b/docs/manual/mod/quickreference.html.en index a8c79e3fb0..4ba6a100f8 100644 --- a/docs/manual/mod/quickreference.html.en +++ b/docs/manual/mod/quickreference.html.en @@ -653,17 +653,17 @@ stylesheets. ProxyHTMLCharsetOut Charset | *svdBSpecify a charset for mod_proxy_html output. ProxyHTMLDocType HTML|XHTML [Legacy]
    OR
    ProxyHTMLDocType fpi [SGML|XML]    svdBSets an HTML or XHTML document type declaration. -ProxyHTMLEnable On|OffsvdBTurns the proxy_html filter on or off. +ProxyHTMLEnable On|Off Off svdBTurns the proxy_html filter on or off. ProxyHTMLEvents attribute [attribute ...]svdBSpecify attributes to treat as scripting events. -ProxyHTMLExtended On|OffsvdBDetermines whether to fix links in inline scripts, stylesheets, +ProxyHTMLExtended On|Off Off svdBDetermines whether to fix links in inline scripts, stylesheets, and scripting events. ProxyHTMLFixups [lowercase] [dospath] [reset]svdBFixes for simple HTML errors. -ProxyHTMLInterp On|OffsvdBEnables per-request interpolation of +ProxyHTMLInterp On|Off Off svdBEnables per-request interpolation of ProxyHTMLURLMap rules. ProxyHTMLLinks element attribute [attribute2 ...]svdBSpecify HTML elements that have URL attributes to be rewritten. -ProxyHTMLMeta On|OffsvdBTurns on or off extra pre-parsing of metadata in HTML +ProxyHTMLMeta On|Off Off svdBTurns on or off extra pre-parsing of metadata in HTML <head> sections. -ProxyHTMLStripComments On|OffsvdBDetermines whether to strip HTML comments. +ProxyHTMLStripComments On|Off Off svdBDetermines whether to strip HTML comments. ProxyHTMLURLMap from-pattern to-pattern [flags] [cond]svdBDefines a rule to rewrite HTML links ProxyIOBufferSize bytes 8192 svEDetermine size of internal data throughput buffer <ProxyMatch regex> ...</ProxyMatch>svEContainer for directives applied to regular-expression-matched diff --git a/docs/manual/mod/quickreference.html.es b/docs/manual/mod/quickreference.html.es index 2b9f465140..f79ecc229f 100644 --- a/docs/manual/mod/quickreference.html.es +++ b/docs/manual/mod/quickreference.html.es @@ -660,17 +660,17 @@ stylesheets. ProxyHTMLCharsetOut Charset | *svdBSpecify a charset for mod_proxy_html output. ProxyHTMLDocType HTML|XHTML [Legacy]
    OR
    ProxyHTMLDocType fpi [SGML|XML]    svdBSets an HTML or XHTML document type declaration. -ProxyHTMLEnable On|OffsvdBTurns the proxy_html filter on or off. +ProxyHTMLEnable On|Off Off svdBTurns the proxy_html filter on or off. ProxyHTMLEvents attribute [attribute ...]svdBSpecify attributes to treat as scripting events. -ProxyHTMLExtended On|OffsvdBDetermines whether to fix links in inline scripts, stylesheets, +ProxyHTMLExtended On|Off Off svdBDetermines whether to fix links in inline scripts, stylesheets, and scripting events. ProxyHTMLFixups [lowercase] [dospath] [reset]svdBFixes for simple HTML errors. -ProxyHTMLInterp On|OffsvdBEnables per-request interpolation of +ProxyHTMLInterp On|Off Off svdBEnables per-request interpolation of ProxyHTMLURLMap rules. ProxyHTMLLinks element attribute [attribute2 ...]svdBSpecify HTML elements that have URL attributes to be rewritten. -ProxyHTMLMeta On|OffsvdBTurns on or off extra pre-parsing of metadata in HTML +ProxyHTMLMeta On|Off Off svdBTurns on or off extra pre-parsing of metadata in HTML <head> sections. -ProxyHTMLStripComments On|OffsvdBDetermines whether to strip HTML comments. +ProxyHTMLStripComments On|Off Off svdBDetermines whether to strip HTML comments. ProxyHTMLURLMap from-pattern to-pattern [flags] [cond]svdBDefines a rule to rewrite HTML links ProxyIOBufferSize bytes 8192 svEDetermine size of internal data throughput buffer <ProxyMatch regex> ...</ProxyMatch>svEContainer for directives applied to regular-expression-matched diff --git a/docs/manual/mod/quickreference.html.ja.utf8 b/docs/manual/mod/quickreference.html.ja.utf8 index e14af4c923..72713fd772 100644 --- a/docs/manual/mod/quickreference.html.ja.utf8 +++ b/docs/manual/mod/quickreference.html.ja.utf8 @@ -617,17 +617,17 @@ stylesheets. ProxyHTMLCharsetOut Charset | *svdBSpecify a charset for mod_proxy_html output. ProxyHTMLDocType HTML|XHTML [Legacy]
    OR
    ProxyHTMLDocType fpi [SGML|XML]    svdBSets an HTML or XHTML document type declaration. -ProxyHTMLEnable On|OffsvdBTurns the proxy_html filter on or off. +ProxyHTMLEnable On|Off Off svdBTurns the proxy_html filter on or off. ProxyHTMLEvents attribute [attribute ...]svdBSpecify attributes to treat as scripting events. -ProxyHTMLExtended On|OffsvdBDetermines whether to fix links in inline scripts, stylesheets, +ProxyHTMLExtended On|Off Off svdBDetermines whether to fix links in inline scripts, stylesheets, and scripting events. ProxyHTMLFixups [lowercase] [dospath] [reset]svdBFixes for simple HTML errors. -ProxyHTMLInterp On|OffsvdBEnables per-request interpolation of +ProxyHTMLInterp On|Off Off svdBEnables per-request interpolation of ProxyHTMLURLMap rules. ProxyHTMLLinks element attribute [attribute2 ...]svdBSpecify HTML elements that have URL attributes to be rewritten. -ProxyHTMLMeta On|OffsvdBTurns on or off extra pre-parsing of metadata in HTML +ProxyHTMLMeta On|Off Off svdBTurns on or off extra pre-parsing of metadata in HTML <head> sections. -ProxyHTMLStripComments On|OffsvdBDetermines whether to strip HTML comments. +ProxyHTMLStripComments On|Off Off svdBDetermines whether to strip HTML comments. ProxyHTMLURLMap from-pattern to-pattern [flags] [cond]svdBDefines a rule to rewrite HTML links ProxyIOBufferSize bytes 8192 svE内部データスループットバッファのサイズを決定する <ProxyMatch regex> ...</ProxyMatch>svE正規表現でのマッチによるプロキシリソース用のディレクティブコンテナ diff --git a/docs/manual/mod/quickreference.html.ko.euc-kr b/docs/manual/mod/quickreference.html.ko.euc-kr index 51ab87c504..b9405a78a9 100644 --- a/docs/manual/mod/quickreference.html.ko.euc-kr +++ b/docs/manual/mod/quickreference.html.ko.euc-kr @@ -620,17 +620,17 @@ stylesheets. ProxyHTMLCharsetOut Charset | *svdBSpecify a charset for mod_proxy_html output. ProxyHTMLDocType HTML|XHTML [Legacy]
    OR
    ProxyHTMLDocType fpi [SGML|XML]    svdBSets an HTML or XHTML document type declaration. -ProxyHTMLEnable On|OffsvdBTurns the proxy_html filter on or off. +ProxyHTMLEnable On|Off Off svdBTurns the proxy_html filter on or off. ProxyHTMLEvents attribute [attribute ...]svdBSpecify attributes to treat as scripting events. -ProxyHTMLExtended On|OffsvdBDetermines whether to fix links in inline scripts, stylesheets, +ProxyHTMLExtended On|Off Off svdBDetermines whether to fix links in inline scripts, stylesheets, and scripting events. ProxyHTMLFixups [lowercase] [dospath] [reset]svdBFixes for simple HTML errors. -ProxyHTMLInterp On|OffsvdBEnables per-request interpolation of +ProxyHTMLInterp On|Off Off svdBEnables per-request interpolation of ProxyHTMLURLMap rules. ProxyHTMLLinks element attribute [attribute2 ...]svdBSpecify HTML elements that have URL attributes to be rewritten. -ProxyHTMLMeta On|OffsvdBTurns on or off extra pre-parsing of metadata in HTML +ProxyHTMLMeta On|Off Off svdBTurns on or off extra pre-parsing of metadata in HTML <head> sections. -ProxyHTMLStripComments On|OffsvdBDetermines whether to strip HTML comments. +ProxyHTMLStripComments On|Off Off svdBDetermines whether to strip HTML comments. ProxyHTMLURLMap from-pattern to-pattern [flags] [cond]svdBDefines a rule to rewrite HTML links ProxyIOBufferSize bytes 8192 svEDetermine size of internal data throughput buffer <ProxyMatch regex> ...</ProxyMatch>svEContainer for directives applied to regular-expression-matched diff --git a/docs/manual/mod/quickreference.html.tr.utf8 b/docs/manual/mod/quickreference.html.tr.utf8 index a5d1ef7113..6cb3e63cda 100644 --- a/docs/manual/mod/quickreference.html.tr.utf8 +++ b/docs/manual/mod/quickreference.html.tr.utf8 @@ -651,17 +651,17 @@ stylesheets. ProxyHTMLCharsetOut Charset | *skdTSpecify a charset for mod_proxy_html output. ProxyHTMLDocType HTML|XHTML [Legacy]
    OR
    ProxyHTMLDocType fpi [SGML|XML]    skdTSets an HTML or XHTML document type declaration. -ProxyHTMLEnable On|OffskdTTurns the proxy_html filter on or off. +ProxyHTMLEnable On|Off Off skdTTurns the proxy_html filter on or off. ProxyHTMLEvents attribute [attribute ...]skdTSpecify attributes to treat as scripting events. -ProxyHTMLExtended On|OffskdTDetermines whether to fix links in inline scripts, stylesheets, +ProxyHTMLExtended On|Off Off skdTDetermines whether to fix links in inline scripts, stylesheets, and scripting events. ProxyHTMLFixups [lowercase] [dospath] [reset]skdTFixes for simple HTML errors. -ProxyHTMLInterp On|OffskdTEnables per-request interpolation of +ProxyHTMLInterp On|Off Off skdTEnables per-request interpolation of ProxyHTMLURLMap rules. ProxyHTMLLinks element attribute [attribute2 ...]skdTSpecify HTML elements that have URL attributes to be rewritten. -ProxyHTMLMeta On|OffskdTTurns on or off extra pre-parsing of metadata in HTML +ProxyHTMLMeta On|Off Off skdTTurns on or off extra pre-parsing of metadata in HTML <head> sections. -ProxyHTMLStripComments On|OffskdTDetermines whether to strip HTML comments. +ProxyHTMLStripComments On|Off Off skdTDetermines whether to strip HTML comments. ProxyHTMLURLMap from-pattern to-pattern [flags] [cond]skdTDefines a rule to rewrite HTML links ProxyIOBufferSize bytes 8192 skEDetermine size of internal data throughput buffer <ProxyMatch regex> ...</ProxyMatch>skEContainer for directives applied to regular-expression-matched diff --git a/docs/manual/mod/quickreference.html.zh-cn b/docs/manual/mod/quickreference.html.zh-cn index 8f69397234..4d352718c1 100644 --- a/docs/manual/mod/quickreference.html.zh-cn +++ b/docs/manual/mod/quickreference.html.zh-cn @@ -648,17 +648,17 @@ stylesheets. ProxyHTMLCharsetOut Charset | *svdBSpecify a charset for mod_proxy_html output. ProxyHTMLDocType HTML|XHTML [Legacy]
    OR
    ProxyHTMLDocType fpi [SGML|XML]    svdBSets an HTML or XHTML document type declaration. -ProxyHTMLEnable On|OffsvdBTurns the proxy_html filter on or off. +ProxyHTMLEnable On|Off Off svdBTurns the proxy_html filter on or off. ProxyHTMLEvents attribute [attribute ...]svdBSpecify attributes to treat as scripting events. -ProxyHTMLExtended On|OffsvdBDetermines whether to fix links in inline scripts, stylesheets, +ProxyHTMLExtended On|Off Off svdBDetermines whether to fix links in inline scripts, stylesheets, and scripting events. ProxyHTMLFixups [lowercase] [dospath] [reset]svdBFixes for simple HTML errors. -ProxyHTMLInterp On|OffsvdBEnables per-request interpolation of +ProxyHTMLInterp On|Off Off svdBEnables per-request interpolation of ProxyHTMLURLMap rules. ProxyHTMLLinks element attribute [attribute2 ...]svdBSpecify HTML elements that have URL attributes to be rewritten. -ProxyHTMLMeta On|OffsvdBTurns on or off extra pre-parsing of metadata in HTML +ProxyHTMLMeta On|Off Off svdBTurns on or off extra pre-parsing of metadata in HTML <head> sections. -ProxyHTMLStripComments On|OffsvdBDetermines whether to strip HTML comments. +ProxyHTMLStripComments On|Off Off svdBDetermines whether to strip HTML comments. ProxyHTMLURLMap from-pattern to-pattern [flags] [cond]svdBDefines a rule to rewrite HTML links ProxyIOBufferSize bytes 8192 svEDetermine size of internal data throughput buffer <ProxyMatch regex> ...</ProxyMatch>svEContainer for directives applied to regular-expression-matched diff --git a/docs/manual/programs/dbmmanage.html.en b/docs/manual/programs/dbmmanage.html.en index aed9a22403..6374c42087 100644 --- a/docs/manual/programs/dbmmanage.html.en +++ b/docs/manual/programs/dbmmanage.html.en @@ -35,6 +35,9 @@ program can only be used when the usernames are stored in a DBM file. To use a flat-file database see htpasswd.

    +

    Another tool to maintain a DBM password database is + htdbm.

    +

    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 @@ -43,7 +46,7 @@

    +

    See also

    top

    Synopsis

    diff --git a/docs/manual/programs/dbmmanage.html.fr b/docs/manual/programs/dbmmanage.html.fr index 51d40d4d27..5f02691e64 100644 --- a/docs/manual/programs/dbmmanage.html.fr +++ b/docs/manual/programs/dbmmanage.html.fr @@ -28,6 +28,8 @@ utilisateurs au format DBM  ko  |  tr 

    +
    Cette traduction peut être périmée. Vérifiez la version + anglaise pour les changements récents.

    dbmmanage permet de créer et de maintenir les fichiers au format DBM où sont stockés les noms d'utilisateurs et diff --git a/docs/manual/programs/dbmmanage.html.tr.utf8 b/docs/manual/programs/dbmmanage.html.tr.utf8 index bbf6e52ebf..80531325e9 100644 --- a/docs/manual/programs/dbmmanage.html.tr.utf8 +++ b/docs/manual/programs/dbmmanage.html.tr.utf8 @@ -26,6 +26,7 @@  ko  |  tr 

    +
    Bu çeviri güncel olmayabilir. Son değişiklikler için İngilizce sürüm geçerlidir.

    dbmmanage, mod_authn_dbm üzerinden HTTP kullanıcılarının temel diff --git a/docs/manual/programs/dbmmanage.xml.fr b/docs/manual/programs/dbmmanage.xml.fr index bd8e910d68..7930cacc99 100644 --- a/docs/manual/programs/dbmmanage.xml.fr +++ b/docs/manual/programs/dbmmanage.xml.fr @@ -1,7 +1,7 @@ - + diff --git a/docs/manual/programs/dbmmanage.xml.ko b/docs/manual/programs/dbmmanage.xml.ko index ac171b2cb9..a0116bf1a3 100644 --- a/docs/manual/programs/dbmmanage.xml.ko +++ b/docs/manual/programs/dbmmanage.xml.ko @@ -1,7 +1,7 @@ - + + + diff --git a/docs/manual/programs/htdbm.xml.meta b/docs/manual/programs/htdbm.xml.meta index 3e6cd174bc..f313589693 100644 --- a/docs/manual/programs/htdbm.xml.meta +++ b/docs/manual/programs/htdbm.xml.meta @@ -8,7 +8,7 @@ en - fr - tr + fr + tr diff --git a/docs/manual/programs/htdbm.xml.tr b/docs/manual/programs/htdbm.xml.tr index 0ab7d162aa..94d291212c 100644 --- a/docs/manual/programs/htdbm.xml.tr +++ b/docs/manual/programs/htdbm.xml.tr @@ -1,7 +1,7 @@ - + + diff --git a/docs/manual/programs/htpasswd.xml.ko b/docs/manual/programs/htpasswd.xml.ko index 8c8ba7c64a..1f472201a3 100644 --- a/docs/manual/programs/htpasswd.xml.ko +++ b/docs/manual/programs/htpasswd.xml.ko @@ -1,7 +1,7 @@ - + +