From: Daniel Ferradal
Date: Tue, 21 Apr 2026 21:14:42 +0000 (+0000)
Subject: Remaining Updates produced by running build.sh all
X-Git-Url: http://git.ipfire.org/index.cgi?a=commitdiff_plain;p=thirdparty%2Fapache%2Fhttpd.git
Remaining Updates produced by running build.sh all
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1933228 13f79535-47bb-0310-9956-ffa450edef68
---
diff --git a/docs/man/ab.1 b/docs/man/ab.1
index e64e02503f..815ff1d516 100644
--- a/docs/man/ab.1
+++ b/docs/man/ab.1
@@ -19,7 +19,7 @@
.el .ne 3
.IP "\\$1" \\$2
..
-.TH "AB" 1 "2022-03-07" "Apache HTTP Server" "ab"
+.TH "AB" 1 "2026-04-21" "Apache HTTP Server" "ab"
.SH NAME
ab \- Apache HTTP server benchmarking tool
@@ -33,7 +33,7 @@ ab \- Apache HTTP server benchmarking tool
.SH "SUMMARY"
.PP
-\fBab\fR is a tool for benchmarking your Apache Hypertext Transfer Protocol (HTTP) server\&. It is designed to give you an impression of how your current Apache installation performs\&. This especially shows you how many requests per second your Apache installation is capable of serving\&.
+ab is a tool for benchmarking your Apache Hypertext Transfer Protocol (HTTP) server\&. It is designed to give you an impression of how your current Apache installation performs\&. This especially shows you how many requests per second your Apache installation is capable of serving\&.
.SH "OPTIONS"
@@ -98,7 +98,7 @@ File containing data to POST\&. Remember to also set \fB-T\fR\&.
Supply BASIC Authentication credentials to a proxy en-route\&. The username and password are separated by a single \fB:\fR and sent on the wire base64 encoded\&. The string is sent regardless of whether the proxy needs it (\fIi\&.e\&.\fR, has sent an 407 proxy authentication needed)\&.
.TP
\fB-q\fR
-When processing more than 150 requests, \fBab\fR outputs a progress count on \fBstderr\fR every 10% or 100 requests or so\&. The \fB-q\fR flag will suppress these messages\&.
+When processing more than 150 requests, ab outputs a progress count on \fBstderr\fR every 10% or 100 requests or so\&. The \fB-q\fR flag will suppress these messages\&.
.TP
\fB-r\fR
Don't exit on socket receive errors\&.
@@ -148,7 +148,7 @@ Specify SSL/TLS cipher suite (See openssl ciphers)
.SH "OUTPUT"
.PP
-The following list describes the values returned by \fBab\fR:
+The following list describes the values returned by ab:
.TP
@@ -215,5 +215,5 @@ The rate of transfer as calculated by the formula \fBtotalread / 1024 / timetake
There are various statically declared buffers of fixed length\&. Combined with the lazy parsing of the command line arguments, the response headers from the server and other external inputs, this might bite you\&.
.PP
-It does not implement HTTP/1\&.x fully; only accepts some 'expected' forms of responses\&. The rather heavy use of \fBstrstr(3)\fR shows up top in profile, which might indicate a performance problem; \fIi\&.e\&.\fR, you would measure the \fBab\fR performance rather than the server's\&.
+It does not implement HTTP/1\&.x fully; only accepts some 'expected' forms of responses\&. The rather heavy use of \fBstrstr(3)\fR shows up top in profile, which might indicate a performance problem; \fIi\&.e\&.\fR, you would measure the ab performance rather than the server's\&.
diff --git a/docs/man/apachectl.8 b/docs/man/apachectl.8
index ad32f9c9b6..03d53d39cd 100644
--- a/docs/man/apachectl.8
+++ b/docs/man/apachectl.8
@@ -19,7 +19,7 @@
.el .ne 3
.IP "\\$1" \\$2
..
-.TH "APACHECTL" 8 "2018-09-27" "Apache HTTP Server" "apachectl"
+.TH "APACHECTL" 8 "2026-04-21" "Apache HTTP Server" "apachectl"
.SH NAME
apachectl \- Apache HTTP Server Control Interface
@@ -27,13 +27,13 @@ apachectl \- Apache HTTP Server Control Interface
.SH "SYNOPSIS"
.PP
-When acting in pass-through mode, \fBapachectl\fR can take all the arguments available for the httpd binary\&.
+When acting in pass-through mode, apachectl can take all the arguments available for the httpd binary\&.
.PP
\fB\fBapachectl\fR [ \fIhttpd-argument\fR ]\fR
.PP
-When acting in SysV init mode, \fBapachectl\fR takes simple, one-word commands, defined below\&.
+When acting in SysV init mode, apachectl takes simple, one-word commands, defined below\&.
.PP
\fB\fBapachectl\fR \fIcommand\fR\fR
@@ -42,16 +42,16 @@ When acting in SysV init mode, \fBapachectl\fR takes simple, one-word commands,
.SH "SUMMARY"
.PP
-\fBapachectl\fR is a front end to the Apache HyperText Transfer Protocol (HTTP) server\&. It is designed to help the administrator control the functioning of the Apache httpd daemon\&.
+apachectl is a front end to the Apache HyperText Transfer Protocol (HTTP) server\&. It is designed to help the administrator control the functioning of the Apache httpd daemon\&.
.PP
-The \fBapachectl\fR script can operate in two modes\&. First, it can act as a simple front-end to the httpd command that simply sets any necessary environment variables and then invokes httpd, passing through any command line arguments\&. Second, \fBapachectl\fR can act as a SysV init script, taking simple one-word arguments like \fBstart\fR, \fBrestart\fR, and \fBstop\fR, and translating them into appropriate signals to httpd\&.
+The apachectl script can operate in two modes\&. First, it can act as a simple front-end to the httpd command that simply sets any necessary environment variables and then invokes httpd, passing through any command line arguments\&. Second, apachectl can act as a SysV init script, taking simple one-word arguments like \fBstart\fR, \fBrestart\fR, and \fBstop\fR, and translating them into appropriate signals to httpd\&.
.PP
-If your Apache installation uses non-standard paths, you will need to edit the \fBapachectl\fR script to set the appropriate paths to the httpd binary\&. You can also specify any necessary httpd command line arguments\&. See the comments in the script for details\&.
+If your Apache installation uses non-standard paths, you will need to edit the apachectl script to set the appropriate paths to the httpd binary\&. You can also specify any necessary httpd command line arguments\&. See the comments in the script for details\&.
.PP
-The \fBapachectl\fR script returns a 0 exit value on success, and >0 if an error occurs\&. For more details, view the comments in the script\&.
+The apachectl script returns a 0 exit value on success, and >0 if an error occurs\&. For more details, view the comments in the script\&.
.SH "OPTIONS"
diff --git a/docs/man/apxs.1 b/docs/man/apxs.1
index 236c3add36..e17c1ab515 100644
--- a/docs/man/apxs.1
+++ b/docs/man/apxs.1
@@ -19,7 +19,7 @@
.el .ne 3
.IP "\\$1" \\$2
..
-.TH "APXS" 1 "2018-09-27" "Apache HTTP Server" "apxs"
+.TH "APXS" 1 "2026-04-21" "Apache HTTP Server" "apxs"
.SH NAME
apxs \- APache eXtenSion tool
@@ -45,38 +45,38 @@ apxs \- APache eXtenSion tool
.SH "SUMMARY"
.PP
-\fBapxs\fR is a tool for building and installing extension modules for the Apache HyperText Transfer Protocol (HTTP) server\&. This is achieved by building a dynamic shared object (DSO) from one or more source or object \fIfiles\fR which then can be loaded into the Apache server under runtime via the LoadModule directive from mod_so\&.
+apxs is a tool for building and installing extension modules for the Apache HyperText Transfer Protocol (HTTP) server\&. This is achieved by building a dynamic shared object (DSO) from one or more source or object \fIfiles\fR which then can be loaded into the Apache server under runtime via the LoadModule directive from mod_so\&.
.PP
-So to use this extension mechanism your platform has to support the DSO feature and your Apache httpd binary has to be built with the mod_so module\&. The \fBapxs\fR tool automatically complains if this is not the case\&. You can check this yourself by manually running the command
+So to use this extension mechanism your platform has to support the DSO feature and your Apache httpd binary has to be built with the mod_so module\&. The apxs tool automatically complains if this is not the case\&. You can check this yourself by manually running the command
.nf
-
- $ httpd -l
-
+
+$ httpd -l
+
.fi
.PP
-The module mod_so should be part of the displayed list\&. If these requirements are fulfilled you can easily extend your Apache server's functionality by installing your own modules with the DSO mechanism by the help of this \fBapxs\fR tool:
+The module mod_so should be part of the displayed list\&. If these requirements are fulfilled you can easily extend your Apache server's functionality by installing your own modules with the DSO mechanism by the help of this apxs tool:
.nf
-
- $ apxs -i -a -c mod_foo\&.c
- gcc -fpic -DSHARED_MODULE -I/path/to/apache/include -c mod_foo\&.c
- ld -Bshareable -o mod_foo\&.so mod_foo\&.o
- cp mod_foo\&.so /path/to/apache/modules/mod_foo\&.so
- chmod 755 /path/to/apache/modules/mod_foo\&.so
- [activating module `foo' in /path/to/apache/etc/httpd\&.conf]
- $ apachectl restart
- /path/to/apache/sbin/apachectl restart: httpd not running, trying to start
- [Tue Mar 31 11:27:55 1998] [debug] mod_so\&.c(303): loaded module foo_module
- /path/to/apache/sbin/apachectl restart: httpd started
- $ _
-
+
+$ apxs -i -a -c mod_foo\&.c
+gcc -fpic -DSHARED_MODULE -I/path/to/apache/include -c mod_foo\&.c
+ld -Bshareable -o mod_foo\&.so mod_foo\&.o
+cp mod_foo\&.so /path/to/apache/modules/mod_foo\&.so
+chmod 755 /path/to/apache/modules/mod_foo\&.so
+[activating module `foo' in /path/to/apache/etc/httpd\&.conf]
+$ apachectl restart
+/path/to/apache/sbin/apachectl restart: httpd not running, trying to start
+[Tue Mar 31 11:27:55 1998] [debug] mod_so\&.c(303): loaded module foo_module
+/path/to/apache/sbin/apachectl restart: httpd started
+$ _
+
.fi
.PP
-The arguments \fIfiles\fR can be any C source file (\&.c), a object file (\&.o) or even a library archive (\&.a)\&. The \fBapxs\fR tool automatically recognizes these extensions and automatically used the C source files for compilation while just using the object and archive files for the linking phase\&. But when using such pre-compiled objects make sure they are compiled for position independent code (PIC) to be able to use them for a dynamically loaded shared object\&. For instance with GCC you always just have to use \fB-fpic\fR\&. For other C compilers consult its manual page or at watch for the flags \fBapxs\fR uses to compile the object files\&.
+The arguments \fIfiles\fR can be any C source file (\&.c), a object file (\&.o) or even a library archive (\&.a)\&. The apxs tool automatically recognizes these extensions and automatically used the C source files for compilation while just using the object and archive files for the linking phase\&. But when using such pre-compiled objects make sure they are compiled for position independent code (PIC) to be able to use them for a dynamically loaded shared object\&. For instance with GCC you always just have to use \fB-fpic\fR\&. For other C compilers consult its manual page or at watch for the flags apxs uses to compile the object files\&.
.PP
For more details about DSO support in Apache read the documentation of mod_so or perhaps even read the \fBsrc/modules/standard/mod_so\&.c\fR source file\&.
@@ -89,7 +89,7 @@ For more details about DSO support in Apache read the documentation of mod_so or
.TP
\fB-n \fImodname\fR\fR
-This explicitly sets the module name for the \fB-i\fR (install) and \fB-g\fR (template generation) option\&. Use this to explicitly specify the module name\&. For option \fB-g\fR this is required, for option \fB-i\fR the \fBapxs\fR tool tries to determine the name from the source or (as a fallback) at least by guessing it from the filename\&.
+This explicitly sets the module name for the \fB-i\fR (install) and \fB-g\fR (template generation) option\&. Use this to explicitly specify the module name\&. For option \fB-g\fR this is required, for option \fB-i\fR the apxs tool tries to determine the name from the source or (as a fallback) at least by guessing it from the filename\&.
.SS "Query Options"
@@ -165,83 +165,83 @@ This indicates the editing operation, which can be used with the \fB-a\fR and \f
Assume you have an Apache module named \fBmod_foo\&.c\fR available which should extend Apache's server functionality\&. To accomplish this you first have to compile the C source into a shared object suitable for loading into the Apache server under runtime via the following command:
.nf
-
- $ apxs -c mod_foo\&.c
- /path/to/libtool --mode=compile gcc \&.\&.\&. -c mod_foo\&.c
- /path/to/libtool --mode=link gcc \&.\&.\&. -o mod_foo\&.la mod_foo\&.slo
- $ _
-
+
+$ apxs -c mod_foo\&.c
+/path/to/libtool --mode=compile gcc \&.\&.\&. -c mod_foo\&.c
+/path/to/libtool --mode=link gcc \&.\&.\&. -o mod_foo\&.la mod_foo\&.slo
+$ _
+
.fi
.PP
-Then you have to update the Apache configuration by making sure a LoadModule directive is present to load this shared object\&. To simplify this step \fBapxs\fR provides an automatic way to install the shared object in its "modules" directory and updating the \fBhttpd\&.conf\fR file accordingly\&. This can be achieved by running:
+Then you have to update the Apache configuration by making sure a LoadModule directive is present to load this shared object\&. To simplify this step apxs provides an automatic way to install the shared object in its "modules" directory and updating the \fBhttpd\&.conf\fR file accordingly\&. This can be achieved by running:
.nf
-
- $ apxs -i -a mod_foo\&.la
- /path/to/instdso\&.sh mod_foo\&.la /path/to/apache/modules
- /path/to/libtool --mode=install cp mod_foo\&.la /path/to/apache/modules
- \&.\&.\&.
- chmod 755 /path/to/apache/modules/mod_foo\&.so
- [activating module `foo' in /path/to/apache/conf/httpd\&.conf]
- $ _
-
+
+$ apxs -i -a mod_foo\&.la
+/path/to/instdso\&.sh mod_foo\&.la /path/to/apache/modules
+/path/to/libtool --mode=install cp mod_foo\&.la /path/to/apache/modules
+\&.\&.\&.
+chmod 755 /path/to/apache/modules/mod_foo\&.so
+[activating module `foo' in /path/to/apache/conf/httpd\&.conf]
+$ _
+
.fi
.PP
This way a line named
.nf
-
- LoadModule foo_module modules/mod_foo\&.so
-
+
+LoadModule foo_module modules/mod_foo\&.so
+
.fi
.PP
is added to the configuration file if still not present\&. If you want to have this disabled per default use the \fB-A\fR option, \fIi\&.e\&.\fR
.nf
-
- $ apxs -i -A mod_foo\&.c
-
+
+$ apxs -i -A mod_foo\&.c
+
.fi
.PP
For a quick test of the apxs mechanism you can create a sample Apache module template plus a corresponding Makefile via:
.nf
-
- $ apxs -g -n foo
- Creating [DIR] foo
- Creating [FILE] foo/Makefile
- Creating [FILE] foo/modules\&.mk
- Creating [FILE] foo/mod_foo\&.c
- Creating [FILE] foo/\&.deps
- $ _
-
+
+$ apxs -g -n foo
+Creating [DIR] foo
+Creating [FILE] foo/Makefile
+Creating [FILE] foo/modules\&.mk
+Creating [FILE] foo/mod_foo\&.c
+Creating [FILE] foo/\&.deps
+$ _
+
.fi
.PP
Then you can immediately compile this sample module into a shared object and load it into the Apache server:
.nf
-
- $ cd foo
- $ make all reload
- apxs -c mod_foo\&.c
- /path/to/libtool --mode=compile gcc \&.\&.\&. -c mod_foo\&.c
- /path/to/libtool --mode=link gcc \&.\&.\&. -o mod_foo\&.la mod_foo\&.slo
- apxs -i -a -n "foo" mod_foo\&.la
- /path/to/instdso\&.sh mod_foo\&.la /path/to/apache/modules
- /path/to/libtool --mode=install cp mod_foo\&.la /path/to/apache/modules
- \&.\&.\&.
- chmod 755 /path/to/apache/modules/mod_foo\&.so
- [activating module `foo' in /path/to/apache/conf/httpd\&.conf]
- apachectl restart
- /path/to/apache/sbin/apachectl restart: httpd not running, trying to start
- [Tue Mar 31 11:27:55 1998] [debug] mod_so\&.c(303): loaded module foo_module
- /path/to/apache/sbin/apachectl restart: httpd started
- $ _
-
+
+$ cd foo
+$ make all reload
+apxs -c mod_foo\&.c
+/path/to/libtool --mode=compile gcc \&.\&.\&. -c mod_foo\&.c
+/path/to/libtool --mode=link gcc \&.\&.\&. -o mod_foo\&.la mod_foo\&.slo
+apxs -i -a -n "foo" mod_foo\&.la
+/path/to/instdso\&.sh mod_foo\&.la /path/to/apache/modules
+/path/to/libtool --mode=install cp mod_foo\&.la /path/to/apache/modules
+\&.\&.\&.
+chmod 755 /path/to/apache/modules/mod_foo\&.so
+[activating module `foo' in /path/to/apache/conf/httpd\&.conf]
+apachectl restart
+/path/to/apache/sbin/apachectl restart: httpd not running, trying to start
+[Tue Mar 31 11:27:55 1998] [debug] mod_so\&.c(303): loaded module foo_module
+/path/to/apache/sbin/apachectl restart: httpd started
+$ _
+
.fi
diff --git a/docs/man/ctlogconfig.8 b/docs/man/ctlogconfig.8
index 9329f06478..8f6bae45c1 100644
--- a/docs/man/ctlogconfig.8
+++ b/docs/man/ctlogconfig.8
@@ -19,7 +19,7 @@
.el .ne 3
.IP "\\$1" \\$2
..
-.TH "CTLOGCONFIG" 8 "2018-09-27" "Apache HTTP Server" "ctlogconfig"
+.TH "CTLOGCONFIG" 8 "2026-04-21" "Apache HTTP Server" "ctlogconfig"
.SH NAME
ctlogconfig \- Certificate Transparency log configuration tool
@@ -108,42 +108,31 @@ Consider an Apache httpd instance which serves as a TLS server and a proxy\&. Th
First we'll configure the URLs for logs where server certificates are logged:
.nf
+
+$ ctlogconfig /path/to/conf/log-config configure-url http://log1\&.example\&.com/
+$ ctlogconfig /path/to/conf/log-config configure-url http://log2\&.example\&.com/
+$ ctlogconfig /path/to/conf/log-config dump
+Log entry:
+ Record 1
+ Log id : (not configured)
+ Public key file: (not configured)
+ URL : http://log1\&.example\&.com/
+ Time range : -INF to +INF
- $ ctlogconfig /path/to/conf/log-config configure-url http://log1\&.example\&.com/
- $ ctlogconfig /path/to/conf/log-config configure-url http://log2\&.example\&.com/
- $ ctlogconfig /path/to/conf/log-config dump
- Log entry:
- Record 1
- Log id : (not configured)
- Public key file: (not configured)
- URL : http://log1\&.example\&.com/
- Time range : -INF to +INF
- Log entry:
- Record 2
- Log id : (not configured)
- Public key file: (not configured)
- URL : http://log2\&.example\&.com/
- Time range : -INF to +INF
+Log entry:
+ Record 2
+ Log id : (not configured)
+ Public key file: (not configured)
+ URL : http://log2\&.example\&.com/
+ Time range : -INF to +INF
+
.fi
.PP
Next we'll set the public key of a log where the certificate of our only backend server is published\&. In this case it is the log with URL http://log2\&.example\&.com/ which has already been configured\&.
.nf
-
- $ ctlogconfig /path/to/conf/log-config configure-public-key \\
- $ ctlogconfig /path/to/conf/log-config dump
- Log entry:
- Record 1
- Log id : (not configured)
- Public key file: (not configured)
- URL : http://log1\&.example\&.com/
- Time range : -INF to +INF
- Log entry:
- Record 2
- Log id : (not configured)
- Public key file: /path/to/conf/log2-pub\&.pem
- URL : http://log2\&.example\&.com/
- Time range : -INF to +INF
+
+$ ctlogconfig /path/to/conf/log-config configure-public-key \\
.fi
diff --git a/docs/man/dbmmanage.1 b/docs/man/dbmmanage.1
index d60e84a810..7ec7d89aad 100644
--- a/docs/man/dbmmanage.1
+++ b/docs/man/dbmmanage.1
@@ -19,7 +19,7 @@
.el .ne 3
.IP "\\$1" \\$2
..
-.TH "DBMMANAGE" 1 "2018-09-27" "Apache HTTP Server" "dbmmanage"
+.TH "DBMMANAGE" 1 "2026-04-21" "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
-\fBdbmmanage\fR 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 \fBdbmmanage\fR\&. 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_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\&.
@@ -111,10 +111,10 @@ Just displays the contents of the DBM file\&. If you specify a \fIusername\fR, i
.SH "BUGS"
.PP
-One should be aware that there are a number of different DBM file formats in existence, and with all likelihood, libraries for more than one format may exist on your system\&. The three primary examples are SDBM, NDBM, the GNU project's GDBM, and Berkeley DB 2\&. Unfortunately, all these libraries use different file formats, and you must make sure that the file format used by \fIfilename\fR is the same format that \fBdbmmanage\fR expects to see\&. \fBdbmmanage\fR currently has no way of determining what type of DBM file it is looking at\&. If used against the wrong format, will simply return nothing, or may create a different DBM file with a different name, or at worst, it may corrupt the DBM file if you were attempting to write to it\&.
+One should be aware that there are a number of different DBM file formats in existence, and with all likelihood, libraries for more than one format may exist on your system\&. The three primary examples are SDBM, NDBM, the GNU project's GDBM, and Berkeley DB 2\&. Unfortunately, all these libraries use different file formats, and you must make sure that the file format used by \fIfilename\fR is the same format that dbmmanage expects to see\&. dbmmanage currently has no way of determining what type of DBM file it is looking at\&. If used against the wrong format, will simply return nothing, or may create a different DBM file with a different name, or at worst, it may corrupt the DBM file if you were attempting to write to it\&.
.PP
-\fBdbmmanage\fR has a list of DBM format preferences, defined by the \fB@AnyDBM::ISA\fR array near the beginning of the program\&. Since we prefer the Berkeley DB 2 file format, the order in which \fBdbmmanage\fR will look for system libraries is Berkeley DB 2, then NDBM, then GDBM and then SDBM\&. The first library found will be the library \fBdbmmanage\fR will attempt to use for all DBM file transactions\&. This ordering is slightly different than the standard \fB@AnyDBM::ISA\fR ordering in Perl, as well as the ordering used by the simple \fBdbmopen()\fR call in Perl, so if you use any other utilities to manage your DBM files, they must also follow this preference ordering\&. Similar care must be taken if using programs in other languages, like C, to access these files\&.
+dbmmanage has a list of DBM format preferences, defined by the \fB@AnyDBM::ISA\fR array near the beginning of the program\&. Since we prefer the Berkeley DB 2 file format, the order in which dbmmanage will look for system libraries is Berkeley DB 2, then NDBM, then GDBM and then SDBM\&. The first library found will be the library dbmmanage will attempt to use for all DBM file transactions\&. This ordering is slightly different than the standard \fB@AnyDBM::ISA\fR ordering in Perl, as well as the ordering used by the simple \fBdbmopen()\fR call in Perl, so if you use any other utilities to manage your DBM files, they must also follow this preference ordering\&. Similar care must be taken if using programs in other languages, like C, to access these files\&.
.PP
One can usually use the \fBfile\fR program supplied with most Unix systems to see what format a DBM file is in\&.
diff --git a/docs/man/htcacheclean.8 b/docs/man/htcacheclean.8
index 092cf0e99d..8935a7792c 100644
--- a/docs/man/htcacheclean.8
+++ b/docs/man/htcacheclean.8
@@ -19,7 +19,7 @@
.el .ne 3
.IP "\\$1" \\$2
..
-.TH "HTCACHECLEAN" 8 "2019-11-13" "Apache HTTP Server" "htcacheclean"
+.TH "HTCACHECLEAN" 8 "2026-04-21" "Apache HTTP Server" "htcacheclean"
.SH NAME
htcacheclean \- Clean up the disk cache
@@ -42,7 +42,7 @@ htcacheclean \- Clean up the disk cache
.SH "SUMMARY"
.PP
-\fBhtcacheclean\fR is used to keep the size of mod_cache_disk's storage within a given size limit, or limit on inodes in use\&. This tool can run either manually or in daemon mode\&. When running in daemon mode, it sleeps in the background and checks the cache directory at regular intervals for cached content to be removed\&. You can stop the daemon cleanly by sending it a TERM or INT signal\&. When run manually, a once off check of the cache directory is made for cached content to be removed\&. If one or more URLs are specified, each URL will be deleted from the cache, if present\&.
+htcacheclean is used to keep the size of mod_cache_disk's storage within a given size limit, or limit on inodes in use\&. This tool can run either manually or in daemon mode\&. When running in daemon mode, it sleeps in the background and checks the cache directory at regular intervals for cached content to be removed\&. You can stop the daemon cleanly by sending it a TERM or INT signal\&. When run manually, a once off check of the cache directory is made for cached content to be removed\&. If one or more URLs are specified, each URL will be deleted from the cache, if present\&.
.SH "OPTIONS"
@@ -62,7 +62,7 @@ Be verbose and print statistics\&. This option is mutually exclusive with the \f
Clean thoroughly\&. This assumes that the Apache web server is not running (otherwise you may get garbage in the cache)\&. This option is mutually exclusive with the \fB-d\fR option and implies the \fB-t\fR option\&.
.TP
\fB-n\fR
-Be nice\&. This causes slower processing in favour of other processes\&. \fBhtcacheclean\fR will sleep from time to time so that (a) the disk IO will be delayed and (b) the kernel can schedule other processes in the meantime\&.
+Be nice\&. This causes slower processing in favor of other processes\&. htcacheclean will sleep from time to time so that (a) the disk IO will be delayed and (b) the kernel can schedule other processes in the meantime\&.
.TP
\fB-t\fR
Delete all empty directories\&. By default only cache files are removed, however with some configurations the large number of directories created may require attention\&. If your configuration requires a very large number of directories, to the point that inode or file allocation table exhaustion may become an issue, use of this option is advised\&.
@@ -94,7 +94,7 @@ List the URLs currently stored in the cache, along with their attributes in the
.SH "DELETING A SPECIFIC URL"
.PP
-If \fBhtcacheclean\fR is passed one or more URLs, each URL will be deleted from the cache\&. If multiple variants of an URL exists, all variants would be deleted\&.
+If htcacheclean is passed one or more URLs, each URL will be deleted from the cache\&. If multiple variants of an URL exists, all variants would be deleted\&.
.PP
When a reverse proxied URL is to be deleted, the effective URL is constructed from the \fBHost\fR header, the \fBport\fR, the \fBpath\fR and the \fBquery\fR\&. Note the '?' in the URL must always be specified explicitly, whether a query string is present or not\&. For example, an attempt to delete the path \fB/\fR from the server \fBlocalhost\fR, the URL to delete would be \fBhttp://localhost:80/?\fR\&.
@@ -102,7 +102,7 @@ When a reverse proxied URL is to be deleted, the effective URL is constructed fr
.SH "LISTING URLS IN THE CACHE"
.PP
-By passing the \fB-a\fR or \fB-A\fR options to \fBhtcacheclean\fR, the URLs within the cache will be listed as they are found, one URL per line\&. The \fB-A\fR option dumps the full cache entry after the URL, with fields in the following order:
+By passing the \fB-a\fR or \fB-A\fR options to htcacheclean, the URLs within the cache will be listed as they are found, one URL per line\&. The \fB-A\fR option dumps the full cache entry after the URL, with fields in the following order:
.TP
@@ -142,5 +142,5 @@ If 1, the entry contains a cached HEAD request with no body, 0 otherwise\&.
.SH "EXIT STATUS"
.PP
-\fBhtcacheclean\fR returns a zero status ("true") if all operations were successful, \fB1\fR otherwise\&. If an URL is specified, and the URL was cached and successfully removed, \fB0\fR is returned, \fB2\fR otherwise\&. If an error occurred during URL removal, \fB1\fR is returned\&.
+htcacheclean returns a zero status ("true") if all operations were successful, \fB1\fR otherwise\&. If an URL is specified, and the URL was cached and successfully removed, \fB0\fR is returned, \fB2\fR otherwise\&. If an error occurred during URL removal, \fB1\fR is returned\&.
diff --git a/docs/man/htdbm.1 b/docs/man/htdbm.1
index c9187c4da4..491e779541 100644
--- a/docs/man/htdbm.1
+++ b/docs/man/htdbm.1
@@ -19,7 +19,7 @@
.el .ne 3
.IP "\\$1" \\$2
..
-.TH "HTDBM" 1 "2021-07-09" "Apache HTTP Server" "htdbm"
+.TH "HTDBM" 1 "2026-04-21" "Apache HTTP Server" "htdbm"
.SH NAME
htdbm \- Manipulate DBM password databases
@@ -54,7 +54,7 @@ htdbm \- Manipulate DBM password databases
.SH "SUMMARY"
.PP
-\fBhtdbm\fR is used to manipulate the DBM format files used to store usernames and password for basic authentication of HTTP users via mod_authn_dbm\&. See the dbmmanage documentation for more information about these DBM files\&.
+htdbm is used to manipulate the DBM format files used to store usernames and password for basic authentication of HTTP users via mod_authn_dbm\&. See the dbmmanage documentation for more information about these DBM files\&.
.SH "OPTIONS"
@@ -89,7 +89,7 @@ Use \fBcrypt()\fR hashing for passwords\&. The default on all platforms but Wind
Use SHA hashing 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
\fB-p\fR
-Use plaintext passwords\&. Though \fBhtdbm\fR will support creation on all platforms, the httpd daemon will only accept plain text passwords on Windows and Netware\&.
+Use plaintext passwords\&. Though htdbm will support creation on all platforms, the httpd daemon will only accept plain text passwords on Windows and Netware\&.
.TP
\fB-l\fR
Print each of the usernames and comments from the database on stdout\&.
@@ -118,7 +118,7 @@ Type of DBM file (SDBM, GDBM, DB, or "default")\&.
.SH "BUGS"
.PP
-One should be aware that there are a number of different DBM file formats in existence, and with all likelihood, libraries for more than one format may exist on your system\&. The three primary examples are SDBM, NDBM, GNU GDBM, and Berkeley/Sleepycat DB 2/3/4\&. Unfortunately, all these libraries use different file formats, and you must make sure that the file format used by \fIfilename\fR is the same format that \fBhtdbm\fR expects to see\&. \fBhtdbm\fR currently has no way of determining what type of DBM file it is looking at\&. If used against the wrong format, will simply return nothing, or may create a different DBM file with a different name, or at worst, it may corrupt the DBM file if you were attempting to write to it\&.
+One should be aware that there are a number of different DBM file formats in existence, and with all likelihood, libraries for more than one format may exist on your system\&. The three primary examples are SDBM, NDBM, GNU GDBM, and Berkeley/Sleepycat DB 2/3/4\&. Unfortunately, all these libraries use different file formats, and you must make sure that the file format used by \fIfilename\fR is the same format that htdbm expects to see\&. htdbm currently has no way of determining what type of DBM file it is looking at\&. If used against the wrong format, will simply return nothing, or may create a different DBM file with a different name, or at worst, it may corrupt the DBM file if you were attempting to write to it\&.
.PP
One can usually use the \fBfile\fR program supplied with most Unix systems to see what format a DBM file is in\&.
@@ -126,7 +126,7 @@ One can usually use the \fBfile\fR program supplied with most Unix systems to se
.SH "EXIT STATUS"
.PP
-\fBhtdbm\fR returns a zero status ("true") if the username and password have been successfully added or updated in the DBM File\&. \fBhtdbm\fR returns \fB1\fR if it encounters some problem accessing files, \fB2\fR if there was a syntax problem with the command line, \fB3\fR if the password was entered interactively and the verification entry didn't match, \fB4\fR if its operation was interrupted, \fB5\fR if a value is too long (username, filename, password, or final computed record), \fB6\fR if the username contains illegal characters (see the Restrictions section), and \fB7\fR if the file is not a valid DBM password file\&.
+htdbm returns a zero status ("true") if the username and password have been successfully added or updated in the DBM File\&. htdbm returns \fB1\fR if it encounters some problem accessing files, \fB2\fR if there was a syntax problem with the command line, \fB3\fR if the password was entered interactively and the verification entry didn't match, \fB4\fR if its operation was interrupted, \fB5\fR if a value is too long (username, filename, password, or final computed record), \fB6\fR if the username contains illegal characters (see the Restrictions section), and \fB7\fR if the file is not a valid DBM password file\&.
.SH "EXAMPLES"
@@ -137,7 +137,7 @@ One can usually use the \fBfile\fR program supplied with most Unix systems to se
.fi
.PP
-Adds or modifies the password for user \fBjsmith\fR\&. The user is prompted for the password\&. If executed on a Windows system, the password will be hashed using the modified Apache MD5 algorithm; otherwise, the system's \fBcrypt()\fR routine will be used\&. If the file does not exist, \fBhtdbm\fR will do nothing except return an error\&.
+Adds or modifies the password for user \fBjsmith\fR\&. The user is prompted for the password\&. If executed on a Windows system, the password will be hashed using the modified Apache MD5 algorithm; otherwise, the system's \fBcrypt()\fR routine will be used\&. If the file does not exist, htdbm will do nothing except return an error\&.
.nf
@@ -146,7 +146,7 @@ Adds or modifies the password for user \fBjsmith\fR\&. The user is prompted for
.fi
.PP
-Creates a new file and stores a record in it for user \fBjane\fR\&. The user is prompted for the password\&. If the file exists and cannot be read, or cannot be written, it is not altered and \fBhtdbm\fR will display a message and return an error status\&.
+Creates a new file and stores a record in it for user \fBjane\fR\&. The user is prompted for the password\&. If the file exists and cannot be read, or cannot be written, it is not altered and htdbm will display a message and return an error status\&.
.nf
@@ -158,7 +158,7 @@ Creates a new file and stores a record in it for user \fBjane\fR\&. The user is
Encrypts the password from the command line (\fBPwd4Steve\fR) using the MD5 algorithm, and stores it in the specified file\&.
.PP
-To convert an existing text file \fBhtpasswd\fR-generated password file to a \fBdbm\fR file, use \fBawk\fR to feed each line of that file into \fBhtdbm\fR:
+To convert an existing text file \fBhtpasswd\fR-generated password file to a \fBdbm\fR file, use \fBawk\fR to feed each line of that file into htdbm:
.nf
@@ -174,7 +174,7 @@ The first line creates a new password database with a temporary placeholder entr
.SH "SECURITY CONSIDERATIONS"
.PP
-Web password files such as those managed by \fBhtdbm\fR should \fInot\fR be within the Web server's URI space -- that is, they should not be fetchable with a browser\&.
+Web password files such as those managed by htdbm should \fInot\fR be within the Web server's URI space -- that is, they should not be fetchable with a browser\&.
.PP
The use of the \fB-b\fR option is discouraged, since when it is used the plaintext password appears on the command line\&.
@@ -191,10 +191,10 @@ The SHA and \fBcrypt()\fR formats are insecure by today's standards\&.
.SH "RESTRICTIONS"
.PP
-On the Windows platform, passwords hashed with \fBhtdbm\fR are limited to no more than \fB255\fR characters in length\&. Longer passwords will be truncated to 255 characters\&.
+On the Windows platform, passwords hashed with htdbm are limited to no more than \fB255\fR characters in length\&. Longer passwords will be truncated to 255 characters\&.
.PP
-The MD5 algorithm used by \fBhtdbm\fR is specific to the Apache software; passwords hashed using it will not be usable with other Web servers\&.
+The MD5 algorithm used by htdbm is specific to the Apache software; passwords hashed using it will not be usable with other Web servers\&.
.PP
Usernames are limited to \fB255\fR bytes and may not include the character \fB:\fR\&.
diff --git a/docs/man/htdigest.1 b/docs/man/htdigest.1
index 19d717b8e4..e02a3a1634 100644
--- a/docs/man/htdigest.1
+++ b/docs/man/htdigest.1
@@ -19,7 +19,7 @@
.el .ne 3
.IP "\\$1" \\$2
..
-.TH "HTDIGEST" 1 "2018-09-27" "Apache HTTP Server" "htdigest"
+.TH "HTDIGEST" 1 "2026-04-21" "Apache HTTP Server" "htdigest"
.SH NAME
htdigest \- manage user files for digest authentication
@@ -33,7 +33,7 @@ htdigest \- manage user files for digest authentication
.SH "SUMMARY"
.PP
-\fBhtdigest\fR is used to create and update the flat-files used to store usernames, realm and password for digest authentication of HTTP users\&. Resources available from the Apache HTTP server can be restricted to just the users listed in the files created by \fBhtdigest\fR\&.
+htdigest is used to create and update the flat-files used to store usernames, realm and password for digest authentication of HTTP users\&. Resources available from the Apache HTTP server can be restricted to just the users listed in the files created by htdigest\&.
.PP
This manual page only lists the command line arguments\&. For details of the directives necessary to configure digest authentication in httpd see the Apache manual, which is part of the Apache distribution or can be found at http://httpd\&.apache\&.org/\&.
diff --git a/docs/man/htpasswd.1 b/docs/man/htpasswd.1
index 1d66ebab91..10adf50b66 100644
--- a/docs/man/htpasswd.1
+++ b/docs/man/htpasswd.1
@@ -19,7 +19,7 @@
.el .ne 3
.IP "\\$1" \\$2
..
-.TH "HTPASSWD" 1 "2021-07-09" "Apache HTTP Server" "htpasswd"
+.TH "HTPASSWD" 1 "2026-04-21" "Apache HTTP Server" "htpasswd"
.SH NAME
htpasswd \- Manage user files for basic authentication
@@ -42,13 +42,13 @@ htpasswd \- Manage user files for basic authentication
.SH "SUMMARY"
.PP
-\fBhtpasswd\fR is used to create and update the flat-files used to store usernames and password for basic authentication of HTTP users\&. If \fBhtpasswd\fR 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\&.
+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 \fBhtpasswd\fR\&. This program can only manage usernames and passwords stored in a flat-file\&. It can hash and display password information for use in other types of data stores, though\&. To use a DBM database see dbmmanage or htdbm\&.
+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 hash and display password information for use in other types of data stores, though\&. To use a DBM database see dbmmanage or htdbm\&.
.PP
-\fBhtpasswd\fR hashes passwords using either bcrypt, a version of MD5 modified for Apache, SHA-1, or the system's \fBcrypt()\fR routine\&. SHA-2-based hashes (SHA-256 and SHA-512) are supported for \fBcrypt()\fR\&. Files managed by \fBhtpasswd\fR may contain a mixture of different encoding types of passwords; some user records may have bcrypt or MD5-hashed passwords while others in the same file may have passwords hashed with \fBcrypt()\fR\&.
+htpasswd hashes passwords using either bcrypt, a version of MD5 modified for Apache, SHA-1, or the system's \fBcrypt()\fR routine\&. SHA-2-based hashes (SHA-256 and SHA-512) are supported for \fBcrypt()\fR\&. Files managed by htpasswd may contain a mixture of different encoding types of passwords; some user records may have bcrypt or MD5-hashed passwords while others in the same file may have passwords hashed with \fBcrypt()\fR\&.
.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/\&.
@@ -95,7 +95,7 @@ Use \fBcrypt()\fR hashing for passwords\&. This is not supported by the httpd se
Use SHA-1 (160-bit) hashing 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
\fB-p\fR
-Use plaintext passwords\&. Though \fBhtpasswd\fR will support creation on all platforms, the httpd daemon will only accept plain text passwords on Windows and Netware\&.
+Use plaintext passwords\&. Though htpasswd will support creation on all platforms, the httpd daemon will only accept plain text passwords on Windows and Netware\&.
.TP
\fB-D\fR
Delete user\&. If the username exists in the specified htpasswd file, it will be deleted\&.
@@ -115,7 +115,7 @@ The plaintext password to be hashed and stored in the file\&. Only used with the
.SH "EXIT STATUS"
.PP
-\fBhtpasswd\fR returns a zero status ("true") if the username and password have been successfully added or updated in the \fIpasswdfile\fR\&. \fBhtpasswd\fR returns \fB1\fR if it encounters some problem accessing files, \fB2\fR if there was a syntax problem with the command line, \fB3\fR if the password was entered interactively and the verification entry didn't match, \fB4\fR if its operation was interrupted, \fB5\fR if a value is too long (username, filename, password, or final computed record), \fB6\fR if the username contains illegal characters (see the Restrictions section), and \fB7\fR if the file is not a valid password file\&.
+htpasswd returns a zero status ("true") if the username and password have been successfully added or updated in the \fIpasswdfile\fR\&. htpasswd returns \fB1\fR if it encounters some problem accessing files, \fB2\fR if there was a syntax problem with the command line, \fB3\fR if the password was entered interactively and the verification entry didn't match, \fB4\fR if its operation was interrupted, \fB5\fR if a value is too long (username, filename, password, or final computed record), \fB6\fR if the username contains illegal characters (see the Restrictions section), and \fB7\fR if the file is not a valid password file\&.
.SH "EXAMPLES"
@@ -126,7 +126,7 @@ The plaintext password to be hashed and stored in the file\&. Only used with the
.fi
.PP
-Adds or modifies the password for user \fBjsmith\fR\&. The user is prompted for the password\&. The password will be hashed using the modified Apache MD5 algorithm\&. If the file does not exist, \fBhtpasswd\fR will do nothing except return an error\&.
+Adds or modifies the password for user \fBjsmith\fR\&. The user is prompted for the password\&. The password will be hashed using the modified Apache MD5 algorithm\&. If the file does not exist, htpasswd will do nothing except return an error\&.
.nf
@@ -135,7 +135,7 @@ Adds or modifies the password for user \fBjsmith\fR\&. The user is prompted for
.fi
.PP
-Creates a new file and stores a record in it for user \fBjane\fR\&. The user is prompted for the password\&. If the file exists and cannot be read, or cannot be written, it is not altered and \fBhtpasswd\fR will display a message and return an error status\&.
+Creates a new file and stores a record in it for user \fBjane\fR\&. The user is prompted for the password\&. If the file exists and cannot be read, or cannot be written, it is not altered and htpasswd will display a message and return an error status\&.
.nf
@@ -149,7 +149,7 @@ Encrypts the password from the command line (\fBPwd4Steve\fR) using the \fBcrypt
.SH "SECURITY CONSIDERATIONS"
.PP
-Web password files such as those managed by \fBhtpasswd\fR should \fInot\fR be within the Web server's URI space -- that is, they should not be fetchable with a browser\&.
+Web password files such as those managed by htpasswd should \fInot\fR be within the Web server's URI space -- that is, they should not be fetchable with a browser\&.
.PP
This program is not safe as a setuid executable\&. Do \fInot\fR make it setuid\&.
@@ -172,10 +172,10 @@ The SHA-2-based \fBcrypt()\fR formats (SHA-256 and SHA-512) are supported on mos
.SH "RESTRICTIONS"
.PP
-On the Windows platform, passwords hashed with \fBhtpasswd\fR are limited to no more than \fB255\fR characters in length\&. Longer passwords will be truncated to 255 characters\&.
+On the Windows platform, passwords hashed with htpasswd are limited to no more than \fB255\fR characters in length\&. Longer passwords will be truncated to 255 characters\&.
.PP
-The MD5 algorithm used by \fBhtpasswd\fR is specific to the Apache software; passwords hashed using it will not be usable with other Web servers\&.
+The MD5 algorithm used by htpasswd is specific to the Apache software; passwords hashed using it will not be usable with other Web servers\&.
.PP
Usernames are limited to \fB255\fR bytes and may not include the character \fB:\fR\&.
diff --git a/docs/man/httpd.8 b/docs/man/httpd.8
index 2b43a922eb..78f6dc0cbd 100644
--- a/docs/man/httpd.8
+++ b/docs/man/httpd.8
@@ -19,7 +19,7 @@
.el .ne 3
.IP "\\$1" \\$2
..
-.TH "HTTPD" 8 "2025-08-29" "Apache HTTP Server" "httpd"
+.TH "HTTPD" 8 "2026-04-21" "Apache HTTP Server" "httpd"
.SH NAME
httpd \- Apache Hypertext Transfer Protocol Server
@@ -39,10 +39,10 @@ On Windows systems, the following additional arguments are available:
.SH "SUMMARY"
.PP
-\fBhttpd\fR is the Apache HyperText Transfer Protocol (HTTP) server program\&. It is designed to be run as a standalone daemon process\&. When used like this it will create a pool of child processes or threads to handle requests\&.
+httpd is the Apache HyperText Transfer Protocol (HTTP) server program\&. It is designed to be run as a standalone daemon process\&. When used like this it will create a pool of child processes or threads to handle requests\&.
.PP
-In general, \fBhttpd\fR should not be invoked directly, but rather should be invoked via apachectl on Unix-based systems or as a service on Windows NT, 2000 and XP and as a console application on Windows 9x and ME\&.
+In general, httpd should not be invoked directly, but rather should be invoked via apachectl on Unix-based systems or as a service on Windows NT, 2000 and XP and as a console application on Windows 9x and ME\&.
.SH "OPTIONS"
@@ -56,7 +56,7 @@ Set the initial value for the ServerRoot directive to \fIserverroot\fR\&. This c
Uses the directives in the file \fIconfig\fR on startup\&. If \fIconfig\fR does not begin with a /, then it is taken to be a path relative to the ServerRoot\&. The default is \fBconf/httpd\&.conf\fR\&.
.TP
\fB-k \fBstart|restart|graceful|stop|graceful-stop\fR\fR
-Signals \fBhttpd\fR to start, restart, or stop\&. See Stopping Apache httpd for more information\&.
+Signals httpd to start, restart, or stop\&. See Stopping Apache httpd for more information\&.
.TP
\fB-C \fIdirective\fR\fR
Process the configuration \fIdirective\fR before reading config files\&.
@@ -95,10 +95,10 @@ Skip document root check at startup/restart\&.
Run syntax tests for configuration files only\&. The program immediately exits after these syntax parsing tests with either a return code of 0 (Syntax OK) or return code not equal to 0 (Syntax Error)\&. This option can be combined with various \fI-D DUMP_\&.\&.\&.\fR arguments to print information about the configuration, as listed below\&.
.TP
\fB-v\fR
-Print the version of \fBhttpd\fR, and then exit\&.
+Print the version of httpd, and then exit\&.
.TP
\fB-V\fR
-Print the version and build parameters of \fBhttpd\fR, and then exit\&.
+Print the version and build parameters of httpd, and then exit\&.
.TP
\fB-X\fR
Run httpd in debug mode\&. Only one worker will be started and the server will not detach from the console\&.
diff --git a/docs/man/httxt2dbm.1 b/docs/man/httxt2dbm.1
index 2a06b0c9ae..52154d3be0 100644
--- a/docs/man/httxt2dbm.1
+++ b/docs/man/httxt2dbm.1
@@ -19,7 +19,7 @@
.el .ne 3
.IP "\\$1" \\$2
..
-.TH "HTTXT2DBM" 1 "2019-11-13" "Apache HTTP Server" "httxt2dbm"
+.TH "HTTXT2DBM" 1 "2026-04-21" "Apache HTTP Server" "httxt2dbm"
.SH NAME
httxt2dbm \- Generate dbm files for use with RewriteMap
@@ -33,7 +33,7 @@ httxt2dbm \- Generate dbm files for use with RewriteMap
.SH "SUMMARY"
.PP
-\fBhttxt2dbm\fR is used to generate dbm files from text input, for use in RewriteMap with the \fBdbm\fR map type\&.
+httxt2dbm is used to generate dbm files from text input, for use in RewriteMap with the \fBdbm\fR map type\&.
.PP
If the output file already exists, it will not be truncated\&. New keys will be added and existing keys will be updated\&.
@@ -58,8 +58,9 @@ Name of the output dbm files\&.
.SH "EXAMPLES"
.nf
-
- httxt2dbm -i rewritemap\&.txt -o rewritemap\&.dbm
- httxt2dbm -f SDBM -i rewritemap\&.txt -o rewritemap\&.dbm
+
+httxt2dbm -i rewritemap\&.txt -o rewritemap\&.dbm
+httxt2dbm -f SDBM -i rewritemap\&.txt -o rewritemap\&.dbm
+
.fi
diff --git a/docs/man/logresolve.1 b/docs/man/logresolve.1
index 4ebe720178..fdd23748f7 100644
--- a/docs/man/logresolve.1
+++ b/docs/man/logresolve.1
@@ -19,7 +19,7 @@
.el .ne 3
.IP "\\$1" \\$2
..
-.TH "LOGRESOLVE" 1 "2018-09-27" "Apache HTTP Server" "logresolve"
+.TH "LOGRESOLVE" 1 "2026-04-21" "Apache HTTP Server" "logresolve"
.SH NAME
logresolve \- Resolve IP-addresses to hostnames in Apache log files
@@ -33,7 +33,7 @@ logresolve \- Resolve IP-addresses to hostnames in Apache log files
.SH "SUMMARY"
.PP
-\fBlogresolve\fR is a post-processing program to resolve IP-addresses in Apache's access logfiles\&. To minimize impact on your nameserver, logresolve has its very own internal hash-table cache\&. This means that each IP number will only be looked up the first time it is found in the log file\&.
+logresolve is a post-processing program to resolve IP-addresses in Apache's access logfiles\&. To minimize impact on your nameserver, logresolve has its very own internal hash-table cache\&. This means that each IP number will only be looked up the first time it is found in the log file\&.
.PP
Takes an Apache log file on standard input\&. The IP addresses must be the first thing on each line and must be separated from the remainder of the line by a space\&.
@@ -47,5 +47,5 @@ Takes an Apache log file on standard input\&. The IP addresses must be the first
Specifies a filename to record statistics\&.
.TP
\fB-c\fR
-This causes \fBlogresolve\fR to apply some DNS checks: after finding the hostname from the IP address, it looks up the IP addresses for the hostname and checks that one of these matches the original address\&.
+This causes logresolve to apply some DNS checks: after finding the hostname from the IP address, it looks up the IP addresses for the hostname and checks that one of these matches the original address\&.
diff --git a/docs/man/rotatelogs.8 b/docs/man/rotatelogs.8
index 2c21ce3985..db6e6c68eb 100644
--- a/docs/man/rotatelogs.8
+++ b/docs/man/rotatelogs.8
@@ -19,7 +19,7 @@
.el .ne 3
.IP "\\$1" \\$2
..
-.TH "ROTATELOGS" 8 "2023-04-11" "Apache HTTP Server" "rotatelogs"
+.TH "ROTATELOGS" 8 "2026-04-21" "Apache HTTP Server" "rotatelogs"
.SH NAME
rotatelogs \- Piped logging program to rotate Apache logs
@@ -33,7 +33,7 @@ rotatelogs \- Piped logging program to rotate Apache logs
.SH "SUMMARY"
.PP
-\fBrotatelogs\fR is a simple program for use in conjunction with Apache's piped logfile feature\&. It supports rotation based on a time interval or maximum size of the log\&.
+rotatelogs is a simple program for use in conjunction with Apache's piped logfile feature\&. It supports rotation based on a time interval or maximum size of the log\&.
.SH "OPTIONS"
@@ -44,13 +44,13 @@ rotatelogs \- Piped logging program to rotate Apache logs
Causes the use of local time rather than GMT as the base for the interval or for \fBstrftime(3)\fR formatting with size-based rotation\&.
.TP
\fB-L\fR \fIlinkname\fR
-.PP Causes a hard link to be made from the current logfile to the specified link name\&. This can be used to watch the log continuously across rotations using a command like \fBtail -F linkname\fR\&. .PP If the linkname is not an absolute path, it is relative to \fBrotatelogs\fR' working directory, which is the ServerRoot when \fBrotatelogs\fR is run by the server\&.
+.PP Causes a hard link to be made from the current logfile to the specified link name\&. This can be used to watch the log continuously across rotations using a command like \fBtail -F linkname\fR\&. .PP If the linkname is not an absolute path, it is relative to rotatelogs' working directory, which is the ServerRoot when rotatelogs is run by the server\&.
.TP
\fB-p\fR \fIprogram\fR
-.PP If given, \fBrotatelogs\fR will execute the specified program every time a new log file is opened\&. The filename of the newly opened file is passed as the first argument to the program\&. If executing after a rotation, the old log file is passed as the second argument\&. .PP \fBrotatelogs\fR does not wait for the specified program to terminate before continuing to operate, and will not log any error code returned on termination\&. .PP The spawned program uses the same stdin, stdout, and stderr as rotatelogs itself, and also inherits the environment\&. .PP When two parameters are provided, under some conditions the parameters will have the same value\&. For example, if rotation is triggerd but the portions of the time and date incorporated into the log filename do not change across the rotation\&.
+.PP If given, rotatelogs will execute the specified program every time a new log file is opened\&. The filename of the newly opened file is passed as the first argument to the program\&. If executing after a rotation, the old log file is passed as the second argument\&. .PP rotatelogs does not wait for the specified program to terminate before continuing to operate, and will not log any error code returned on termination\&. .PP The spawned program uses the same stdin, stdout, and stderr as rotatelogs itself, and also inherits the environment\&. .PP When two parameters are provided, under some conditions the parameters will have the same value\&. For example, if rotation is triggerd but the portions of the time and date incorporated into the log filename do not change across the rotation\&.
.TP
\fB-f\fR
-Causes the logfile to be opened immediately, as soon as \fBrotatelogs\fR starts, instead of waiting for the first logfile entry to be read (for non-busy sites, there may be a substantial delay between when the server is started and when the first request is handled, meaning that the associated logfile does not "exist" until then, which causes problems from some automated logging tools)
+Causes the logfile to be opened immediately, as soon as rotatelogs starts, instead of waiting for the first logfile entry to be read (for non-busy sites, there may be a substantial delay between when the server is started and when the first request is handled, meaning that the associated logfile does not "exist" until then, which causes problems from some automated logging tools)
.TP
\fB-D\fR
Creates the parent directories of the path that the log file will be placed in if they do not already exist\&. This allows \fBstrftime(3)\fR formatting to be used in the path and not just the filename\&.
@@ -74,7 +74,7 @@ Create log file for each interval, even if empty\&.
Use a circular list of filenames without timestamps\&. This option overwrites log files at startup and during rotation\&. With -n 3, the series of log files opened would be "logfile", "logfile\&.1", "logfile\&.2", then overwriting "logfile"\&. When this program first opens "logfile", the file will only be truncated if \fB-t\fR is also provided\&. Every subsequent rotation will always begin with truncation of the target file\&. For size based rotation without \fB-t\fR and existing log files in place, this option may result in unintuitive behavior such as initial log entries being sent to "logfile\&.1", and entries in "logfile\&.1" not being preserved even if later "logfile\&.n" have not yet been used\&. Available in 2\&.4\&.5 and later\&.
.TP
\fB\fIlogfile\fR\fR
-.PP The path plus basename of the logfile\&. If \fIlogfile\fR includes any '%' characters, it is treated as a format string for \fBstrftime(3)\fR\&. Otherwise, the suffix \fI\&.nnnnnnnnnn\fR is automatically added and is the time in seconds (unless the -t option is used)\&. Both formats compute the start time from the beginning of the current period\&. For example, if a rotation time of 86400 is specified, the hour, minute, and second fields created from the \fBstrftime(3)\fR format will all be zero, referring to the beginning of the current 24-hour period (midnight)\&. .PP When using \fBstrftime(3)\fR filename formatting, be sure the log file format has enough granularity to produce a different file name each time the logs are rotated\&. Otherwise rotation will overwrite the same file instead of starting a new one\&. For example, if \fIlogfile\fR was \fB/var/log/errorlog\&.%Y-%m-%d\fR with log rotation at 5 megabytes, but 5 megabytes was reached twice in the same day, the same log file name would be produced and log rotation would keep writing to the same file\&. .PP If the logfile is not an absolute path, it is relative to \fBrotatelogs\fR' working directory, which is the ServerRoot when \fBrotatelogs\fR is run by the server\&.
+.PP The path plus basename of the logfile\&. If \fIlogfile\fR includes any '%' characters, it is treated as a format string for \fBstrftime(3)\fR\&. Otherwise, the suffix \fI\&.nnnnnnnnnn\fR is automatically added and is the time in seconds (unless the -t option is used)\&. Both formats compute the start time from the beginning of the current period\&. For example, if a rotation time of 86400 is specified, the hour, minute, and second fields created from the \fBstrftime(3)\fR format will all be zero, referring to the beginning of the current 24-hour period (midnight)\&. .PP When using \fBstrftime(3)\fR filename formatting, be sure the log file format has enough granularity to produce a different file name each time the logs are rotated\&. Otherwise rotation will overwrite the same file instead of starting a new one\&. For example, if \fIlogfile\fR was \fB/var/log/errorlog\&.%Y-%m-%d\fR with log rotation at 5 megabytes, but 5 megabytes was reached twice in the same day, the same log file name would be produced and log rotation would keep writing to the same file\&. .PP If the logfile is not an absolute path, it is relative to rotatelogs' working directory, which is the ServerRoot when rotatelogs is run by the server\&.
.TP
\fB\fIrotationtime\fR\fR
The time between log file rotations in seconds\&. The rotation occurs at the beginning of this interval\&. For example, if the rotation time is 3600, the log file will be rotated at the beginning of every hour; if the rotation time is 86400, the log file will be rotated every night at midnight\&. (If no data is logged during an interval, no file will be created\&.)
diff --git a/docs/man/suexec.8 b/docs/man/suexec.8
index e879caa2fd..20b1247594 100644
--- a/docs/man/suexec.8
+++ b/docs/man/suexec.8
@@ -19,7 +19,7 @@
.el .ne 3
.IP "\\$1" \\$2
..
-.TH "SUEXEC" 8 "2018-09-27" "Apache HTTP Server" "suexec"
+.TH "SUEXEC" 8 "2026-04-21" "Apache HTTP Server" "suexec"
.SH NAME
suexec \- Switch user before executing external programs
@@ -33,7 +33,7 @@ suexec \- Switch user before executing external programs
.SH "SUMMARY"
.PP
-\fBsuexec\fR is used by the Apache HTTP Server to switch to another user before executing CGI programs\&. In order to achieve this, it must run as \fBroot\fR\&. Since the HTTP daemon normally doesn't run as \fBroot\fR, the \fBsuexec\fR executable needs the setuid bit set and must be owned by \fBroot\fR\&. It should never be writable for any other person than \fBroot\fR\&.
+suexec is used by the Apache HTTP Server to switch to another user before executing CGI programs\&. In order to achieve this, it must run as \fBroot\fR\&. Since the HTTP daemon normally doesn't run as \fBroot\fR, the suexec executable needs the setuid bit set and must be owned by \fBroot\fR\&. It should never be writable for any other person than \fBroot\fR\&.
.PP
For further information about the concepts and the security model of suexec please refer to the suexec documentation (http://httpd\&.apache\&.org/docs/trunk/suexec\&.html)\&.
@@ -44,5 +44,5 @@ For further information about the concepts and the security model of suexec plea
.TP
\fB-V\fR
-If you are \fBroot\fR, this option displays the compile options of \fBsuexec\fR\&. For security reasons all configuration options are changeable only at compile time\&.
+If you are \fBroot\fR, this option displays the compile options of suexec\&. For security reasons all configuration options are changeable only at compile time\&.
diff --git a/docs/manual/bind.html.de b/docs/manual/bind.html.de
index 97ca5f79f2..6c2e611b30 100644
--- a/docs/manual/bind.html.de
+++ b/docs/manual/bind.html.de
@@ -31,14 +31,12 @@
ko |
tr
-
Diese Übersetzung ist möglicherweise
- nicht mehr aktuell. Bitte prüfen Sie die englische Version auf
- die neuesten Änderungen.
Konfiguration der vom Apache HTTP Server verwendeten Adressen und
Ports.
Wenn der httpd neu gestartet wird, müssen Änderungen an
+ Listen-Direktiven besonders
+ beachtet werden. Während eines Neustarts bleiben die Ports an den httpd
+ gebunden (wie in der ursprünglichen Konfiguration), um
+ "Connection refused"-Fehler für neue Verbindungsversuche zum
+ Server zu vermeiden. Wenn Änderungen an den verwendeten
+ Listen-Direktiven vorgenommen
+ werden, die mit der alten Konfiguration in Konflikt stehen, schlägt
+ die Konfiguration fehl und der Server wird beendet.
+
+
Zum Beispiel kann die Änderung der Konfiguration von:
+
+
Listen 127.0.0.1:80
+
+
+
zur folgenden Konfiguration fehlschlagen, da das Binden an
+ Port 80 auf allen Adressen mit dem Binden an Port 80 auf nur
+ 127.0.0.1 in Konflikt steht.
+
+
Listen 80
+
+
+
Damit solche Konfigurationsänderungen wirksam werden, muss
+ der Server gestoppt und dann neu gestartet werden.
.htaccess files would be a very expensive operation,
partially defeating the point of caching (to speed up requests),
mod_cache makes no decision about whether a cached
- entity is authorised for serving. In other words; if
+ entity is authorized for serving. In other words; if
mod_cache has cached some content, it will be served
from the cache as long as that content has not expired.
@@ -845,7 +845,7 @@ sys 0m0.000s
Another example is so-called HTTP request-smuggling attacks.
This document is not the correct place for an in-depth discussion
- of HTTP request smuggling (instead, try your favourite search engine)
+ of HTTP request smuggling (instead, try your favorite search engine)
however it is important to be aware that it is possible to make
a series of requests, and to exploit a vulnerability on an origin
webserver such that the attacker can entirely control the content
diff --git a/docs/manual/caching.html.fr.utf8 b/docs/manual/caching.html.fr.utf8
index f5469e5c67..9344b0bdea 100644
--- a/docs/manual/caching.html.fr.utf8
+++ b/docs/manual/caching.html.fr.utf8
@@ -27,6 +27,8 @@
fr |
tr
httpd supports 'server driven' content negotiation, as
defined in the HTTP/1.1 specification. It fully supports the
@@ -161,17 +160,16 @@ Negotiation
absolute or relative URIs for any file located on the same server as
the map file.
URI: foo
+
+URI: foo.en.html
+Content-type: text/html
+Content-language: en
+
+URI: foo.fr.de.html
+Content-type: text/html;charset=iso-8859-2
+Content-language: fr, de
+
Note also that a typemap file will take precedence over the
filename's extension, even when Multiviews is on. If a
@@ -194,34 +192,32 @@ Negotiation
the original) in the type map file. The original file can be
assigned its language in the type map without being renamed:
If the variants have different source qualities, that may be
indicated by the "qs" parameter to the media type, as in this
picture (available as JPEG, GIF, or ASCII-art):
qs values can vary in the range 0.000 to 1.000. Note that
any variant with a qs value of 0.000 will never be chosen.
diff --git a/docs/manual/content-negotiation.html.fr.utf8 b/docs/manual/content-negotiation.html.fr.utf8
index 66a426185e..7c82a2daa4 100644
--- a/docs/manual/content-negotiation.html.fr.utf8
+++ b/docs/manual/content-negotiation.html.fr.utf8
@@ -29,6 +29,8 @@
ko |
tr
Apache Tutorial: Dynamic Content with CGI - Apache HTTP Server Version 2.5
+Apache HTTP Server Tutorial: Dynamic Content with CGI - Apache HTTP Server Version 2.5
@@ -21,7 +21,7 @@
@@ -51,18 +51,18 @@
is a simple way to put dynamic content on
your web site, using whatever programming language you're most
familiar with. This document will be an introduction to setting
- up CGI on your Apache web server, and getting started writing
+ up CGI on your httpd web server, and getting started writing
CGI programs.
In order to get your CGI programs to work properly, you'll
- need to have Apache configured to permit CGI execution. There
+ need to have httpd configured to permit CGI execution. There
are several ways to do this.
-
Note: If Apache has been built with shared module
+
Note: If httpd has been built with shared module
support you need to ensure that the module is loaded; in your
httpd.conf you need to make sure the
LoadModule
@@ -86,8 +86,8 @@
The
ScriptAlias
- directive tells Apache that a particular directory is set
- aside for CGI programs. Apache will assume that every file in
+ directive tells httpd that a particular directory is set
+ aside for CGI programs. httpd will assume that every file in
this directory is a CGI program, and will attempt to execute
it, when that particular resource is requested by a
client.
@@ -99,7 +99,7 @@
The example shown is from your default httpd.conf
- configuration file, if you installed Apache in the default
+ configuration file, if you installed httpd in the default
location. The ScriptAlias
directive is much like the Alias directive, which defines a URL prefix that
is to mapped to a particular directory. Alias
@@ -108,18 +108,18 @@
Alias and ScriptAlias
is that ScriptAlias has the added meaning
that everything under that URL prefix will be considered a CGI
- program. So, the example above tells Apache that any request for a
+ program. So, the example above tells httpd that any request for a
resource beginning with /cgi-bin/ should be served from
the directory /usr/local/apache2/cgi-bin/, and should be
treated as a CGI program.
For example, if the URL
http://www.example.com/cgi-bin/test.pl
- is requested, Apache will attempt to execute the file
+ is requested, httpd will attempt to execute the file
/usr/local/apache2/cgi-bin/test.pl
and return the output. Of course, the file will have to
exist, and be executable, and return output in a particular
- way, or Apache will return an error message.
The above directive tells Apache to permit the execution
+
The above directive tells httpd to permit the execution
of CGI files. You will also need to tell the server what
files are CGI files. The following AddHandler directive tells the server to treat all
files with the cgi or pl extension as CGI
@@ -237,7 +237,7 @@ print "Hello, World.";
Even if you are not familiar with Perl, you should be able
- to see what is happening here. The first line tells Apache
+ to see what is happening here. The first line tells httpd
(or whatever shell you happen to be running under) that this
program can be executed by feeding the file to the
interpreter found at the location /usr/bin/perl.
@@ -276,19 +276,19 @@ print "Hello, World.";
The source code of your CGI program or a "POST Method Not
Allowed" message
-
That means that you have not properly configured Apache
+
That means that you have not properly configured httpd
to process your CGI program. Reread the section on
configuring
- Apache and try to find what you missed.
If you check the
- Apache error log, you will probably
+ httpd error log, you will probably
find that it says "Premature end of
script headers", possibly along with an error message
generated by your CGI program. In this case, you will want to
@@ -357,7 +357,7 @@ print "Hello, World.";
If your CGI program depends on non-standard environment variables, you will need to
- assure that those variables are passed by Apache.
+ assure that those variables are passed by httpd.
When you miss HTTP headers from the environment, make
sure they are formatted according to
@@ -384,12 +384,12 @@ print "Hello, World.";
(Do not call the perl interpreter. The shell
- and Apache should find the interpreter using the path information on the first line of
+ and httpd should find the interpreter using the path information on the first line of
the script.)
The first thing you see written by your program should be
a set of HTTP headers, including the Content-Type,
- followed by a blank line. If you see anything else, Apache will
+ followed by a blank line. If you see anything else, httpd will
return the Premature end of script headers error if
you try to run it through the server. See Writing a CGI program above for more
details.
@@ -419,7 +419,7 @@ print "Hello, World.";
To check if you are using suexec, run apachectl
-V and check for the location of SUEXEC_BIN.
- If Apache finds an suexec binary there on startup,
+ If httpd finds an suexec binary there on startup,
suexec will be activated.
Unless you fully understand suexec, you should not be using it.
@@ -456,7 +456,7 @@ print "Hello, World.";
During the CGI transaction, the server and the browser
also set environment variables, so that they can communicate
with one another. These are things like the browser type
- (Netscape, IE, Lynx), the server type (Apache, IIS, WebSite),
+ (Chrome, Firefox, Lynx), the server type (Apache httpd, Nginx, IIS),
the name of the CGI program that is being run, and so on.
These variables are available to the CGI programmer, and
@@ -470,10 +470,10 @@ print "Hello, World.";
similar programs are included in the
cgi-bin
- directory of the Apache distribution. Note that some
+ directory of the httpd distribution. Note that some
variables are required, while others are optional, so you may
see some variables listed that were not in the official list.
- In addition, Apache provides many different ways for you to
+ In addition, httpd provides many different ways for you to
add your own environment variables
to the basic ones provided by default.
@@ -565,8 +565,8 @@ foreach my $key (keys %ENV) {
make finding your problem much simpler.
Note that questions about CGI problems should never
- be posted to the Apache bug database unless you are sure you
- have found a problem in the Apache source code.
+ be posted to the httpd bug database unless you are sure you
+ have found a problem in the httpd source code.
Available Languages: en |
diff --git a/docs/manual/howto/cgi.html.fr.utf8 b/docs/manual/howto/cgi.html.fr.utf8
index cf057d1fa0..ed0b1c0791 100644
--- a/docs/manual/howto/cgi.html.fr.utf8
+++ b/docs/manual/howto/cgi.html.fr.utf8
@@ -29,6 +29,8 @@
ja |
ko
This directive is not normally necessary: it is implied if
authentication caching is enabled anywhere in httpd.conf.
However, if it is not enabled anywhere in httpd.conf
- it will by default not be initialised, and is therefore not
+ it will by default not be initialized, and is therefore not
available in a .htaccess context. This directive
- ensures it is initialised so it can be used in .htaccess.
+ ensures it is initialized so it can be used in .htaccess.
Because of the way that mod_authnz_ldap handles this
- directive, Barbara Jenson could sign on as Barbara
- Jenson, Babs Jenson or any other cn that
+ directive, Barbara Jenson could sign on as Barbara
+ Jenson, Babs Jenson or any other cn that
she has in her LDAP entry. Only the single Require
ldap-user line is needed to support all values of the attribute
in the user's entry.
@@ -653,13 +653,13 @@ Require valid-user
(&(|(qpagePagerID=*)(uid=jmanager))(uid=fuser))
-
The above search will only succeed if fuser has a
- pager. When Joe Manager connects as jmanager, the
+
The above search will only succeed if fuser has a
+ pager. When Joe Manager connects as jmanager, the
filter looks like
The above search will succeed whether jmanager
has a pager or not.
@@ -672,7 +672,7 @@ Require valid-user
An optional second parameter can be added to the
AuthLDAPURL to override
the default connection type set by LDAPTrustedMode.
- This will allow the connection established by an ldap:// Url
+ This will allow the connection established by an ldap:// Url
to be upgraded to a secure connection on the same port.
@@ -712,12 +712,12 @@ Require valid-user
a User Principle Name (UPN) can be added to a user's entry in the
directory. This UPN usually takes the form of the user's account
name, followed by the domain components of the particular domain,
- for example somebody@nz.example.com.
+ for example somebody@nz.example.com.
You may wish to configure the mod_authnz_ldap
module to authenticate users present in any of the domains making up
the Active Directory forest. In this way both
- somebody@nz.example.com and someone@au.example.com
+ somebody@nz.example.com and someone@au.example.com
can be authenticated using the same query at the same time.
To make this practical, Active Directory supports the concept of
@@ -729,7 +729,7 @@ Require valid-user
If enabled, the Global Catalog is an independent directory server
that runs on port 3268 (3269 for SSL). To search for a user, do a
- subtree search for the attribute userPrincipalName, with
+ subtree search for the attribute userPrincipalName, with
an empty search root, like so:
This directive allows you to override the prefix used for environment
- variables set during LDAP authorization. If AUTHENTICATE_ is
+ variables set during LDAP authorization. If AUTHENTICATE_ is
specified, consumers of these environment variables see the same information
whether LDAP has performed authentication, authorization, or both.
@@ -858,7 +858,7 @@ authorization
user cannot be mapped to a DN, but not if the user can be mapped to a DN and their
password cannot be verified with an LDAP bind.
If AuthLDAPBindAuthoritative
- is set to off, other configured authentication modules will have
+ is set to off, other configured authentication modules will have
a chance to validate the user if the LDAP bind (with the current user's credentials)
fails for any reason.
This allows users present in both LDAP and
@@ -876,7 +876,7 @@ authorization
A bind password to use in conjunction with the bind DN. Note
that the bind password is probably sensitive data, and should be
@@ -922,7 +922,7 @@ AuthLDAPBindPassword "exec:/path/to/otherProgram argument1"
@@ -961,7 +961,7 @@ AuthLDAPBindPassword "exec:/path/to/otherProgram argument1"
and HTTP basic authentication password of the authenticated user instead of
the servers configured credentials.
-
The ldap-attribute, ldap-user, and ldap-group (single-level only)
+
The ldap-attribute, ldap-user, and ldap-group (single-level only)
authorization checks use comparisons.
This directive only has effect on the comparisons performed during
@@ -1023,7 +1023,7 @@ AuthLDAPBindPassword "exec:/path/to/otherProgram argument1"
If AuthLDAPInitialBindAsUser is set to
- ON, the basic authentication username will be transformed according to the
+ ON, the basic authentication username will be transformed according to the
regular expression and substitution arguments.
The regular expression argument is compared against the current basic authentication username.
@@ -1138,7 +1138,7 @@ to perform a DN lookup
debugging
The substituted DN is recorded in the environment variable
- LDAP_BINDASUSER. If the regular expression does not match the input,
+ LDAP_BINDASUSER. If the regular expression does not match the input,
the verbatim username is used.
@@ -1243,7 +1243,7 @@ environment variable
and HTTP basic authentication password of the authenticated user instead of
the servers configured credentials.
-
The ldap-filter and ldap-dn authorization
+
The ldap-filter and ldap-dn authorization
checks use searches.
This directive only has effect on the comparisons performed during
@@ -1267,7 +1267,7 @@ environment variable
Caveat: If you specify multiple servers, you need to enclose the entire URL string in quotes;
-otherwise you will get an error: "AuthLDAPURL takes one argument, URL to define LDAP connection.."
+
Caveat
+
If you specify multiple servers, you need to enclose the entire URL string in quotes;
+otherwise you will get an error: "AuthLDAPURL takes one argument, URL to define LDAP connection.."
You can of course use search parameters on each of these.
+
ldap
@@ -1407,7 +1409,7 @@ You can of course use search parameters on each of these.
When doing searches, the attribute, filter and username passed
by the HTTP client are combined to create a search filter that
looks like
- (&(filter)(attribute=username)).
+ (&(filter)(attribute=username)).
For example, consider an URL of
ldap://ldap.example.com/o=Example?cn?sub?(posixid=*). When
diff --git a/docs/manual/mod/mod_authnz_ldap.html.fr.utf8 b/docs/manual/mod/mod_authnz_ldap.html.fr.utf8
index 153f2339d7..69a0aa6c04 100644
--- a/docs/manual/mod/mod_authnz_ldap.html.fr.utf8
+++ b/docs/manual/mod/mod_authnz_ldap.html.fr.utf8
@@ -433,7 +433,7 @@ Require ldap-user "Joe Manager"
mod_firehose provides a mechanism to record data
being passed between the httpd server and the client at the raw
connection level to either a file or a pipe in such a way that the
- data can be analysed or played back to the server at a future date.
+ data can be analyzed or played back to the server at a future date.
It can be thought of as "tcpdump for httpd".
Connections are recorded after the SSL has been stripped, and can
@@ -99,7 +99,7 @@
webserver has been built against APR v2.0 or later, and an optional
"nonblock" parameter is specified all file writes will be non
blocking, and buffer overflows will cause debugging data to be lost.
- In this case it is possible to prioritise the running of the server
+ In this case it is possible to prioritize the running of the server
over the recording of firehose data.
The directive H2OutputBuffering controls the buffering of stream output.
- The default is on, which is the behaviour of previous versions. When off, all
+ The default is on, which is the behavior of previous versions. When off, all
bytes are made available immediately to the main connection for sending them
out to the client. This fixes interop issues with certain flavours of gRPC.
@@ -573,7 +573,7 @@
With the default 0, no padding bytes are added to any payload
- frames, e.g. HEADERS, DATA and PUSH_PROMISE. This is the behaviour
+ frames, e.g. HEADERS, DATA and PUSH_PROMISE. This is the behavior
of previous versions. It means that under certain conditions, an
observer of network traffic can see the length of those frames
in the TLS stream.
diff --git a/docs/manual/mod/mod_http2.html.fr.utf8 b/docs/manual/mod/mod_http2.html.fr.utf8
index 250ab8a3c1..a897b54d35 100644
--- a/docs/manual/mod/mod_http2.html.fr.utf8
+++ b/docs/manual/mod/mod_http2.html.fr.utf8
@@ -29,6 +29,8 @@
In addition to the configuration directives that control the
- behaviour of mod_proxy, an environment
+ behavior of mod_proxy, an environment
variable may also control the SCGI protocol
provider:
@@ -157,7 +157,7 @@ header
optimizations, which are not possible if the file comes over the backend
socket. Additionally, the file contents are not transmitted twice.
The ProxySCGISendfile argument determines the
- gateway behaviour:
Using the "show cookies" feature of your browser, you would have seen
a clear text representation of the session. This could potentially be a
problem should the end user need to be kept unaware of the contents of
- the session, or where a third party could gain unauthorised access to the
+ the session, or where a third party could gain unauthorized access to the
data within the session.
The contents of the session can be optionally encrypted before being
diff --git a/docs/manual/mod/mod_session.html.fr.utf8 b/docs/manual/mod/mod_session.html.fr.utf8
index fd6046101f..545d1b2285 100644
--- a/docs/manual/mod/mod_session.html.fr.utf8
+++ b/docs/manual/mod/mod_session.html.fr.utf8
@@ -29,6 +29,8 @@
Client certificate's subjectAltName extension entries of type rfc822Name
-
SSL_CLIENT_SAN_DNS_n
string
Client certificate's subjectAltName extension entries of type dNSName
-
SSL_CLIENT_SAN_OTHER_msUPN_n
string
Client certificate's subjectAltName extension entries of type otherName, Microsoft User Principal Name form (OID 1.3.6.1.4.1.311.20.2.3)
+
SSL_CLIENT_S_DN_x509
string
Component of client's Subject DN
+
SSL_CLIENT_SAN_Email_n
string
Client certificate's subjectAltName extension entries of type rfc822Name
+
SSL_CLIENT_SAN_DNS_n
string
Client certificate's subjectAltName extension entries of type dNSName
+
SSL_CLIENT_SAN_OTHER_msUPN_n
string
Client certificate's subjectAltName extension entries of type otherName, Microsoft User Principal Name form (OID 1.3.6.1.4.1.311.20.2.3)
SSL_CLIENT_I_DN
string
Issuer DN of client's certificate
-
SSL_CLIENT_I_DN_x509
string
Component of client's Issuer DN
+
SSL_CLIENT_I_DN_x509
string
Component of client's Issuer DN
SSL_CLIENT_V_START
string
Validity of client's certificate (start time)
SSL_CLIENT_V_END
string
Validity of client's certificate (end time)
SSL_CLIENT_V_REMAIN
string
Number of days until client's certificate expires
SSL_CLIENT_A_SIG
string
Algorithm used for the signature of client's certificate
SSL_CLIENT_A_KEY
string
Algorithm used for the public key of client's certificate
SSL_CLIENT_CERT
string
PEM-encoded client certificate
-
SSL_CLIENT_CERT_CHAIN_n
string
PEM-encoded certificates in client certificate chain
+
SSL_CLIENT_CERT_CHAIN_n
string
PEM-encoded certificates in client certificate chain
SSL_CLIENT_CERT_RFC4523_CEA
string
Serial number and issuer of the certificate. The format matches that of the CertificateExactAssertion in RFC4523
-
SSL_CLIENT_VERIFY
string
NONE, SUCCESS, GENEROUS or FAILED:reason
+
SSL_CLIENT_VERIFY
string
NONE, SUCCESS, GENEROUS or FAILED:reason
SSL_SERVER_M_VERSION
string
The version of the server certificate
SSL_SERVER_M_SERIAL
string
The serial of the server certificate
SSL_SERVER_S_DN
string
Subject DN in server's certificate
-
SSL_SERVER_SAN_Email_n
string
Server certificate's subjectAltName extension entries of type rfc822Name
-
SSL_SERVER_SAN_DNS_n
string
Server certificate's subjectAltName extension entries of type dNSName
-
SSL_SERVER_SAN_OTHER_dnsSRV_n
string
Server certificate's subjectAltName extension entries of type otherName, SRVName form (OID 1.3.6.1.5.5.7.8.7, RFC 4985)
-
SSL_SERVER_S_DN_x509
string
Component of server's Subject DN
+
SSL_SERVER_SAN_Email_n
string
Server certificate's subjectAltName extension entries of type rfc822Name
+
SSL_SERVER_SAN_DNS_n
string
Server certificate's subjectAltName extension entries of type dNSName
+
SSL_SERVER_SAN_OTHER_dnsSRV_n
string
Server certificate's subjectAltName extension entries of type otherName, SRVName form (OID 1.3.6.1.5.5.7.8.7, RFC 4985)
+
SSL_SERVER_S_DN_x509
string
Component of server's Subject DN
SSL_SERVER_I_DN
string
Issuer DN of server's certificate
-
SSL_SERVER_I_DN_x509
string
Component of server's Issuer DN
+
SSL_SERVER_I_DN_x509
string
Component of server's Issuer DN
SSL_SERVER_V_START
string
Validity of server's certificate (start time)
SSL_SERVER_V_END
string
Validity of server's certificate (end time)
SSL_SERVER_A_SIG
string
Algorithm used for the signature of server's certificate
@@ -214,9 +214,9 @@ compatibility variables.
SSL_ECH_OUTER_SNI
string
SNI value that was seen in plaintext SNI (or `NONE`)
-
x509 specifies a component of an X.509 DN; one of
+
x509 specifies a component of an X.509 DN; one of
C,ST,L,O,OU,CN,T,I,G,S,D,UID,Email. In httpd 2.2.0 and
-later, x509 may also include a numeric _n
+later, x509 may also include a numeric _n
suffix. If the DN in question contains multiple attributes of the
same name, this suffix is used as a zero-based index to select a
particular attribute. For example, where the server certificate
@@ -231,13 +231,13 @@ the SSLOptions directiv
first (or only) attribute of any DN is added only under a non-suffixed
name; i.e. no _0 suffixed entries are added.
-
In httpd 2.4.32 and later, an optional _RAW suffix may be
-added to x509 in a DN component, to suppress conversion of
+
In httpd 2.4.32 and later, an optional _RAW suffix may be
+added to x509 in a DN component, to suppress conversion of
the attribute value to UTF-8. This must be placed after the index
suffix (if any). For example, SSL_SERVER_S_DN_OU_RAW or
SSL_SERVER_S_DN_OU_0_RAW could be used.
-
The format of the *_DN variables has changed in Apache HTTPD
+
The format of the *_DN variables has changed in Apache HTTPD
2.3.11. See the LegacyDNStringFormat option for
SSLOptions for details.
@@ -268,13 +268,13 @@ REQUEST_URI REMOTE_USER
In these contexts, two special formats can also be used:
-
ENV:variablename
+
ENV:variablename
This will expand to the standard environment
- variable variablename.
+ variable variablename.
-
HTTP:headername
+
HTTP:headername
This will expand to the value of the request header with name
- headername.
+ headername.
@@ -284,13 +284,13 @@ REQUEST_URI REMOTE_USER
When mod_ssl is built into Apache or at least
loaded (under DSO situation) additional functions exist for the Custom Log Format of
mod_log_config. First there is an
-additional ``%{varname}x''
+additional ``%{varname}x''
eXtension format function which can be used to expand any variables
provided by any module, especially those provided by mod_ssl which can
you find in the above table.
For backward compatibility there is additionally a special
-``%{name}c'' cryptography format function
+``%{name}c'' cryptography format function
provided. Information about this function is provided in the Compatibility chapter.
mod_ssl sets "notes" for the request which can be
-used in logging with the %{name}n format
+used in logging with the %{name}n format
string in mod_log_config.
The notes supported are as follows:
@@ -334,12 +334,12 @@ loaded (under DSO situation) any variables
provided by mod_ssl can be used in expressions
for the ap_expr Expression Parser.
The variables can be referenced using the syntax
-``%{varname}''. Starting
+``%{varname}''. Starting
with version 2.4.18 one can also use the
mod_rewrite style syntax
-``%{SSL:varname}'' or
+``%{SSL:varname}'' or
the function style syntax
-``ssl(varname)''.
+``ssl(varname)''.
@@ -428,7 +428,7 @@ verify the client certificate on Client Authentication.
The files in this directory have to be PEM-encoded and are accessed through
hash filenames. So usually you can't just place the Certificate files
there: you also have to create symbolic links named
-hash-value.N. And you should always make sure this directory
+hash-value.N. And you should always make sure this directory
contains the appropriate symbolic links.
The files in this directory have to be PEM-encoded and are accessed
through hash filenames. So usually you can't just place the
Certificate files there: you also have to create symbolic links named
-hash-value.N. And you should always make sure
+hash-value.N. And you should always make sure
this directory contains the appropriate symbolic links.
@@ -535,7 +535,7 @@ configured. When set to chain (recommended setting),
CRL checks are applied to all certificates in the chain, while setting it to
leaf limits the checks to the end-entity cert.
-
The available flags are:
+
The available flags are:
no_crl_for_cert_ok
@@ -552,8 +552,8 @@ CRL checks are applied to all certificates in the chain, while setting it to
"unable to get certificate CRL" error.
- The flagno_crl_for_cert_ok allows to restore
- previous behaviour.
+ The flagno_crl_for_cert_ok allows to restore
+ previous behavior.
@@ -608,7 +608,7 @@ These are used to revoke the client certificate on Client Authentication.
The files in this directory have to be PEM-encoded and are accessed through
hash filenames. So usually you have not only to place the CRL files there.
Additionally you have to create symbolic links named
-hash-value.rN. And you should always make sure this directory
+hash-value.rN. And you should always make sure this directory
contains the appropriate symbolic links.
-This complex directive uses a colon-separated cipher-spec string
+This complex directive uses a colon-separated cipher-spec string
consisting of OpenSSL cipher specifications to configure the Cipher Suite the
client is permitted to negotiate in the SSL handshake phase. The optional
protocol specifier can configure the Cipher Suite for a specific SSL version.
@@ -872,7 +872,7 @@ For a list of TLSv1.3 cipher names, see
the OpenSSL
documentation.
-An SSL cipher specification in cipher-spec is composed of 4 major
+An SSL cipher specification in cipher-spec is composed of 4 major
attributes plus a few extra minor ones:
Key Exchange Algorithm:
@@ -949,7 +949,7 @@ Now where this becomes interesting is that these can be put together
to specify the order and ciphers you wish to use. To speed this up
there are also aliases (SSLv3, TLSv1, EXP, LOW, MEDIUM,
HIGH) for certain groups of ciphers. These tags can be joined
-together with prefixes to form the cipher-spec. Available
+together with prefixes to form the cipher-spec. Available
prefixes are:
none: add cipher to list
@@ -968,7 +968,7 @@ ciphers are always disabled, as mod_ssl unconditionally adds
A simpler way to look at all of this is to use the ``openssl ciphers
-v'' command which provides a nice way to successively create the
-correct cipher-spec string. The default cipher-spec string
+correct cipher-spec string. The default cipher-spec string
depends on the version of the OpenSSL libraries used. Let's suppose it is
``RC4-SHA:AES128-SHA:HIGH:MEDIUM:!aNULL:!MD5'' which
means the following: Put RC4-SHA and AES128-SHA at
@@ -1029,7 +1029,7 @@ KRB5-RC4-SHA SSLv3 Kx=KRB5 Au=KRB5 Enc=RC4(128) Mac=SHA1
Available in httpd 2.5.2 and later, requires OpenSSL 1.1.1 or later
This directive enables collection of ClientHello data during the handshake that is retained for
-the length of the connection so it can be exposed as SSL_CLIENTHELLLO_* environment
+the length of the connection so it can be exposed as SSL_CLIENTHELLO_* environment
variables for requests depending upon the StdEnvVars setting. The variables are
formatted as the hex-encoded raw buffers seen in the raw network protocol and as provided
by OpenSSL. GREASE (RFC 8701) values are filtered by OpenSSL when enumerating extension IDs, but
@@ -1061,7 +1061,7 @@ CRIME attack).
@@ -1480,7 +1480,7 @@ though the syntax / allowable values for the parameters may sometimes differ.SSLOpenSSLConfCmd is only used for features of
OpenSSL which are not configurable by mod_ssl. It is possible that
-mod_ssl behaviour will change across versions of httpd where
+mod_ssl behavior will change across versions of httpd where
SSLOpenSSLConfCmd is used.
@@ -1489,7 +1489,7 @@ mod_ssl behaviour will change across versions of httpd where
@@ -1506,7 +1506,7 @@ are merged. Any options preceded by a + are added to the
options currently in force, and any options preceded by a
- are removed from the options currently in force.
-The available options are:
+The available options are:
StdEnvVars
@@ -1520,7 +1520,7 @@ The available options are:
When this option is enabled, additional CGI/SSI environment variables are
created: SSL_SERVER_CERT, SSL_CLIENT_CERT and
- SSL_CLIENT_CERT_CHAIN_n (with n = 0,1,2,..).
+ SSL_CLIENT_CERT_CHAIN_n (with n = 0,1,2,..).
These contain the PEM-encoded X.509 Certificates of server and client for
the current HTTPS connection and can be used by CGI scripts for deeper
Certificate checking. Additionally all other certificates of the client
@@ -1536,7 +1536,7 @@ The available options are:
be used for access control. The user name is just the Subject of the
Client's X509 Certificate (can be determined by running OpenSSL's
openssl x509 command: openssl x509 -noout -subject -in
- certificate.crt). The optional SSLUserName directive can be used to
+ certificate.crt). The optional SSLUserName directive can be used to
specify which part of the certificate Subject is embedded in the username.
Note that no password is obtained from the user. Every entry in the user
file needs this password: ``xxj31ZMTZzkVA'', which is the
@@ -1616,7 +1616,7 @@ The available options are:
@@ -1630,7 +1630,7 @@ SSL-enabled virtual servers. Because for security reasons the Private
Key files are usually encrypted, mod_ssl needs to query the
administrator for a Pass Phrase in order to decrypt those files. This
query can be done in two ways which can be configured by
-type:
+type:
builtin
@@ -1692,7 +1692,7 @@ query can be done in two ways which can be configured by
@@ -1733,7 +1733,7 @@ overwritten. Configuration directives following an SSLPolicy may overwrite it.
This directive can be used to control which versions of the SSL/TLS protocol
will be accepted in new connections.
-The available (case-insensitive) protocols are:
+The available (case-insensitive) protocols are:
SSLv3
@@ -1828,7 +1828,7 @@ preference. This can be used alternatively and/or additionally to
@@ -1842,7 +1842,7 @@ verify the remote server certificate on Remote Server Authentication.
The files in this directory have to be PEM-encoded and are accessed through
hash filenames. So usually you can't just place the Certificate files
there: you also have to create symbolic links named
-hash-value.N. And you should always make sure this directory
+hash-value.N. And you should always make sure this directory
contains the appropriate symbolic links.
@@ -1927,7 +1927,7 @@ These are used to revoke the remote server certificate on Remote Server Authenti
The files in this directory have to be PEM-encoded and are accessed through
hash filenames. So usually you have not only to place the CRL files there.
Additionally you have to create symbolic links named
-hash-value.rN. And you should always make sure this directory
+hash-value.rN. And you should always make sure this directory
contains the appropriate symbolic links.
This configures one or more sources for seeding the Pseudo Random Number
-Generator (PRNG) in OpenSSL at startup time (context is
+Generator (PRNG) in OpenSSL at startup time (context is
startup) and/or just before a new SSL connection is established
-(context is connect). This directive can only be used
+(context is connect). This directive can only be used
in the global server context because the PRNG is a global facility.
-The following source variants are available:
+The following source variants are available:
builtin
This is the always available builtin seeding source. Its usage
@@ -2330,10 +2330,10 @@ The following source variants are available:
file:/path/to/source
This variant uses an external file /path/to/source as the
- source for seeding the PRNG. When bytes is specified, only the
- first bytes number of bytes of the file form the entropy (and
- bytes is given to /path/to/source as the first
- argument). When bytes is not specified the whole file forms the
+ source for seeding the PRNG. When bytes is specified, only the
+ first bytes number of bytes of the file form the entropy (and
+ bytes is given to /path/to/source as the first
+ argument). When bytes is not specified the whole file forms the
entropy (and 0 is given to /path/to/source as
the first argument). Use this especially at startup time, for instance
with an available /dev/random and/or
@@ -2354,9 +2354,9 @@ The following source variants are available:
This variant uses an external executable
/path/to/program as the source for seeding the
- PRNG. When bytes is specified, only the first
- bytes number of bytes of its stdout contents
- form the entropy. When bytes is not specified, the
+ PRNG. When bytes is specified, only the first
+ bytes number of bytes of its stdout contents
+ form the entropy. When bytes is not specified, the
entirety of the data produced on stdout form the
entropy. Use this only at startup time when you need a very strong
seeding with the help of an external program (for instance as in
@@ -2416,7 +2416,7 @@ memory must be considered when changing this configuration setting.
@@ -2450,7 +2450,7 @@ fulfilled in order to allow access. It is a very powerful directive because the
requirement specification is an arbitrarily complex boolean expression
containing any number of access checks.
-The expression must match the following syntax (given as a BNF
+The expression must match the following syntax (given as a BNF
grammar notation):
The expression is parsed into an internal machine
+
The expression is parsed into an internal machine
representation when the configuration is loaded, and then evaluated
-during request processing. In .htaccess context, the expression is
+during request processing. In .htaccess context, the expression is
both parsed and executed each time the .htaccess file is encountered during
request processing.
The PeerExtList(object-ID) function expects
to find zero or more instances of the X.509 certificate extension
-identified by the given object ID (OID) in the client certificate.
+identified by the given object ID (OID) in the client certificate.
The expression evaluates to true if the left-hand side string matches
exactly against the value of an extension identified with this OID.
(If multiple extensions with the same OID are present, at least one
@@ -2569,7 +2569,7 @@ are denied which are not using SSL.
@@ -2585,7 +2585,7 @@ up to four parallel requests are common) those requests are served by
different pre-forked server processes. Here an inter-process cache
helps to avoid unnecessary session handshakes.
-The following five storage types are currently supported:
+The following five storage types are currently supported:
none
@@ -2608,10 +2608,10 @@ The following five storage types are currently supported:
high load. To use this, ensure that
mod_socache_dbm is loaded.
-
shmcb:/path/to/datafile[(size)]
+
shmcb:/path/to/datafile[(size)]
This makes use of a high-performance cyclic buffer
- (approx. size bytes in size) inside a shared memory
+ (approx. size bytes in size) inside a shared memory
segment in RAM (established via /path/to/datafile) to
synchronize the local OpenSSL memory caches of the server
processes. This is the recommended session cache. To use this,
@@ -2644,7 +2644,7 @@ using the Mutex
@@ -2981,7 +2981,7 @@ version of OpenSSL.
This directive sets the "user" field in the Apache request object.
This is used by lower modules to identify the user with a character
string. In particular, this may cause the environment variable
-REMOTE_USER to be set. The varname can be
+REMOTE_USER to be set. The varname can be
any of the SSL environment variables.
When the FakeBasicAuth option is enabled, this directive
@@ -3034,7 +3034,7 @@ of OCSP responses. These mutexes can be configured using the
@@ -3050,7 +3050,7 @@ established. In per-directory context it forces a SSL renegotiation with the
reconfigured client verification level after the HTTP request was read but
before the HTTP response is sent.
-The following levels are available for level:
+The following levels are available for level:
none:
no client Certificate is required at all
@@ -3072,7 +3072,7 @@ The following levels are available for level:
mod_ssl enregistre des informations à propos de la
requête que l'on peut restituer dans les journaux avec la chaîne de
-format %{nom}n via le module
+format %{nom}n via le module
mod_log_config.
-L'expression doit respecter la syntaxe suivante (fournie ici
+L'expression doit respecter la syntaxe suivante (fournie ici
sous la forme d'une notation dans le style de la grammaire BNF) :
expr ::= "true" | "false"
@@ -2769,10 +2827,10 @@ Pour funcname, vous trouverez la liste des fonctions
disponibles dans la documentation
ap_expr.
-
diff --git a/docs/manual/mod/mod_ssl.xml.es b/docs/manual/mod/mod_ssl.xml.es
index 15361150cf..209e82b676 100644
--- a/docs/manual/mod/mod_ssl.xml.es
+++ b/docs/manual/mod/mod_ssl.xml.es
@@ -1,7 +1,7 @@
-
+
diff --git a/docs/manual/mod/mod_ssl.xml.fr b/docs/manual/mod/mod_ssl.xml.fr
index b7f9117b2e..4d0f9d6589 100644
--- a/docs/manual/mod/mod_ssl.xml.fr
+++ b/docs/manual/mod/mod_ssl.xml.fr
@@ -1,7 +1,7 @@
-
+
diff --git a/docs/manual/mod/mod_substitute.html.en.utf8 b/docs/manual/mod/mod_substitute.html.en.utf8
index 6bd1b1e204..a59a76154c 100644
--- a/docs/manual/mod/mod_substitute.html.en.utf8
+++ b/docs/manual/mod/mod_substitute.html.en.utf8
@@ -179,7 +179,7 @@ Substitute "s|http://internal.blog.example.com/|http://www.example.com/blog/|i"<
context (off).
The latter was the default in versions 2.4 and earlier, but changed
starting with 2.5, hence SubstituteInheritBefore
- set to off allows to restore the legacy behaviour.
+ set to off allows to restore the legacy behavior.
SubstituteInheritBefore is itself inherited,
hence contexts that inherit it (those that don't specify their own
SubstituteInheritBefore value) will apply the
diff --git a/docs/manual/mod/mod_substitute.html.fr.utf8 b/docs/manual/mod/mod_substitute.html.fr.utf8
index 23a93b681a..96f60c9486 100644
--- a/docs/manual/mod/mod_substitute.html.fr.utf8
+++ b/docs/manual/mod/mod_substitute.html.fr.utf8
@@ -29,6 +29,8 @@
xml2enc_filter optional function to postprocess to another
encoding. Using mod_xml2enc with an enabled module, no configuration
is necessary: the other module will configure mod_xml2enc for you
- (though you may still want to customise it using the configuration
+ (though you may still want to customize it using the configuration
directives below).
Non-enabled modules
@@ -148,10 +148,10 @@ them to a supported encoding using xml2EncAlias.<
This server-wide directive aliases one or more encoding to another
- encoding. This enables encodings not recognised by libxml2 to be handled
+ encoding. This enables encodings not recognized by libxml2 to be handled
internally by libxml2's encoding support using the translation table for
- a recognised encoding. This serves two purposes: to support character sets
- (or names) not recognised either by libxml2 or iconv, and to skip
+ a recognized encoding. This serves two purposes: to support character sets
+ (or names) not recognized either by libxml2 or iconv, and to skip
conversion for an encoding where it is known to be unnecessary.
diff --git a/docs/manual/mod/mod_xml2enc.xml.fr b/docs/manual/mod/mod_xml2enc.xml.fr
index 44768eff13..52029331ad 100644
--- a/docs/manual/mod/mod_xml2enc.xml.fr
+++ b/docs/manual/mod/mod_xml2enc.xml.fr
@@ -1,7 +1,7 @@
-
+
diff --git a/docs/manual/mod/mod_xml2enc.xml.meta b/docs/manual/mod/mod_xml2enc.xml.meta
index 317673379c..328a18ea15 100644
--- a/docs/manual/mod/mod_xml2enc.xml.meta
+++ b/docs/manual/mod/mod_xml2enc.xml.meta
@@ -8,6 +8,6 @@
en
- fr
+ fr
diff --git a/docs/manual/mod/mpm_common.html.en.utf8 b/docs/manual/mod/mpm_common.html.en.utf8
index 9c70b87865..0bab194b4b 100644
--- a/docs/manual/mod/mpm_common.html.en.utf8
+++ b/docs/manual/mod/mpm_common.html.en.utf8
@@ -286,7 +286,7 @@ Listen 192.170.2.5:8000
IPv6 address without also accepting connections via IPv4, or
conflicting with a Listen directive using an IPv4 address bound
to the same port. (If the server is built with IPv4-mapped
- addresses disabled, this is the default behaviour and
+ addresses disabled, this is the default behavior and
this option has no effect.)
multipathtcp: Enable the use of
diff --git a/docs/manual/mod/mpm_common.xml.de b/docs/manual/mod/mpm_common.xml.de
index 723fec4c87..7fa769a5cf 100644
--- a/docs/manual/mod/mpm_common.xml.de
+++ b/docs/manual/mod/mpm_common.xml.de
@@ -1,7 +1,7 @@
-
+
+
diff --git a/docs/manual/mod/mpm_common.xml.ja b/docs/manual/mod/mpm_common.xml.ja
index 1b0d5d7cd5..ac8c586432 100644
--- a/docs/manual/mod/mpm_common.xml.ja
+++ b/docs/manual/mod/mpm_common.xml.ja
@@ -1,7 +1,7 @@
-
+
+
+
+
diff --git a/docs/manual/new_features_2_2.xml.ko b/docs/manual/new_features_2_2.xml.ko
index 3b80c9761e..0f01574d69 100644
--- a/docs/manual/new_features_2_2.xml.ko
+++ b/docs/manual/new_features_2_2.xml.ko
@@ -1,7 +1,7 @@
-
+
+
+
-
+
+
-Using Apache With Novell NetWare - Apache HTTP Server Version 2.5
+Using Apache HTTP Server With Novell NetWare - Apache HTTP Server Version 2.5
@@ -21,7 +21,7 @@
Available Languages: en |
fr |
@@ -30,34 +30,34 @@
This document explains how to install, configure and run
- Apache 2.0 under Novell NetWare 6.0 and above. If you find any bugs,
+ Apache HTTP Server 2.0 under Novell NetWare 6.0 and above. If you find any bugs,
or wish to contribute in other ways, please use our
bug reporting
page.
The bug reporting page and dev-httpd mailing list are
not provided to answer questions about configuration or
- running Apache. Before you submit a bug report or request, first
+ running httpd. Before you submit a bug report or request, first
consult this document, the Frequently Asked
Questions page and the other relevant documentation topics. If
you still have a question or problem, post it to the
- novell.devsup.webserver newsgroup, where many Apache users are
+ novell.devsup.webserver newsgroup, where many httpd users are
more than willing to answer new and obscure questions about using
- Apache on NetWare.
+ httpd on NetWare.
-
Most of this document assumes that you are installing Apache
- from a binary distribution. If you want to compile Apache
+
Apache 2.0 is designed to run on NetWare 6.0 service pack 3
+
httpd 2.0 is designed to run on NetWare 6.0 service pack 3
and above. If you are running a service pack less
than SP3, you must install the latest
NetWare Libraries
@@ -73,37 +73,37 @@
Apache 2.0 for NetWare can also be run in a NetWare 5.1 environment
+
httpd 2.0 for NetWare can also be run in a NetWare 5.1 environment
as long as the latest service pack or the latest version
of the NetWare Libraries
- for C (LibC) has been installed . WARNING: Apache 2.0
+ for C (LibC)
has been installed . WARNING: httpd 2.0
for NetWare has not been targeted for or tested in this environment.
Information on the latest version of Apache can be found on
- the Apache web server at http://www.apache.org/. This
+
Information on the latest version of httpd can be found on
+ the httpd web server at http://www.apache.org/. This
will list the current release, any more recent alpha or
beta-test releases, together with details of mirror web and
anonymous ftp sites. Binary builds of the latest releases of
- Apache 2.0 for NetWare can be downloaded from
+ httpd 2.0 for NetWare can be downloaded from
here.
There is no Apache install program for NetWare currently. If you
- are building Apache 2.0 for NetWare from source, you will need to
+
There is no httpd install program for NetWare currently. If you
+ are building httpd 2.0 for NetWare from source, you will need to
copy the files over to the server manually.
-
Follow these steps to install Apache on NetWare from the
+
Follow these steps to install httpd on NetWare from the
binary download (assuming you will install to
sys:/apache2):
@@ -120,7 +120,7 @@
-
Follow these steps to install Apache on NetWare manually
+
Follow these steps to install httpd on NetWare manually
from your own build source (assuming you will install to
sys:/apache2):
@@ -178,40 +178,40 @@
-
Apache may be installed to other volumes besides the default SYS volume.
+
httpd may be installed to other volumes besides the default SYS volume.
To start httpd just type apache at the
console. This will load apache in the OS address space. If you
- prefer to load Apache in a protected address space you may
+ prefer to load httpd in a protected address space you may
specify the address space with the load statement as follows:
load address space = apache2 apache2
-
This will load Apache into an address space called apache2.
- Running multiple instances of Apache concurrently on NetWare is
+
This will load httpd into an address space called apache2.
+ Running multiple instances of httpd concurrently on NetWare is
possible by loading each instance into its own protected
address space.
-
After starting Apache, it will be listening to port 80
+
After starting httpd, it will be listening to port 80
(unless you changed the Listen
directive in the configuration files).
To connect to the server and access the default page,
launch a browser and enter the server's name or address. This
- should respond with a welcome page, and a link to the Apache
+ should respond with a welcome page, and a link to the httpd
manual. If nothing happens or you get an error, look in the
error_log file in the logs
directory.
@@ -220,7 +220,7 @@
configure it properly by editing the files in the
conf directory.
-
To unload Apache running in the OS address space just type
+
To unload httpd running in the OS address space just type
the following at the console:
@@ -240,7 +240,7 @@
unload address space = apache2 apache2
-
When working with Apache it is important to know how it will
+
When working with httpd it is important to know how it will
find the configuration files. You can specify a configuration
file on the command line in two ways:
@@ -261,10 +261,10 @@
should be set in the configuration file.
If you don't specify a configuration file name with -f,
- Apache will use the file name compiled into the server, usually
- conf/httpd.conf. Invoking Apache with the -V
+ httpd will use the file name compiled into the server, usually
+ conf/httpd.conf. Invoking httpd with the -V
switch will display this value labeled as SERVER_CONFIG_FILE.
- Apache will then determine its ServerRoot
+ httpd will then determine its ServerRoot
by trying the following, in this order:
@@ -282,20 +282,20 @@
invoking apache with the -V switch will display this value labeled as
HTTPD_ROOT.
-
Apache 2.0 for NetWare includes a set of command line directives that can
+
httpd 2.0 for NetWare includes a set of command line directives that can
be used to modify or display information about the running instance of the
- web server. These directives are only available while Apache is running. Each
+ web server. These directives are only available while httpd is running. Each
of these directives must be preceded by the keyword APACHE2.
RESTART
-
Instructs Apache to terminate all running worker
+
Instructs httpd to terminate all running worker
threads as they become idle, reread the configuration file and restart each
worker thread based on the new configuration.
VERSION
Displays version information about the currently
- running instance of Apache.
+ running instance of httpd.
MODULES
Displays a list of loaded modules both built-in
@@ -307,39 +307,39 @@
SETTINGS
Enables or disables the thread status display
on the console. When enabled, the state of each running threads is displayed
- on the Apache console screen.
+ on the httpd console screen.
SHUTDOWN
-
Terminates the running instance of the Apache
+
Terminates the running instance of the httpd
web server.
HELP
Describes each of the runtime directives.
-
By default these directives are issued against the instance of Apache running
+
By default these directives are issued against the instance of httpd running
in the OS address space. To issue a directive against a specific instance running
in a protected address space, include the -p parameter along with the name of the
address space. For more information type "apache2 Help" on the command line.
Apache is configured by reading configuration files usually stored
+
httpd is configured by reading configuration files usually stored
in the conf directory. These are the same as files used
to configure the Unix version, but there are a few different directives for
- Apache on NetWare. See the Apache module
+ httpd on NetWare. See the httpd module
documentation for all the available directives.
-
The main differences in Apache for NetWare are:
+
The main differences in httpd for NetWare are:
-
Because Apache for NetWare is multithreaded, it does not
- use a separate process for each request, as Apache does on some Unix
+
Because httpd for NetWare is multithreaded, it does not
+ use a separate process for each request, as httpd does on some Unix
implementations. Instead there are only threads running: a parent
thread, and multiple child or worker threads which handle the requests.
@@ -378,16 +378,16 @@
The directives that accept filenames as arguments must use
- NetWare filenames instead of Unix names. However, because Apache
+ NetWare filenames instead of Unix names. However, because httpd
uses Unix-style names internally, forward slashes must be used
rather than backslashes. It is recommended that all rooted file paths
- begin with a volume name. If omitted, Apache will assume the
+ begin with a volume name. If omitted, httpd will assume the
SYS: volume which may not be correct.
-
Apache for NetWare has the ability to load modules at
- runtime, without recompiling the server. If Apache is
+
httpd for NetWare has the ability to load modules at
+ runtime, without recompiling the server. If httpd is
compiled normally, it will install a number of optional
modules in the \Apache2\modules directory.
To activate these, or other modules, the LoadModule directive
@@ -428,12 +428,12 @@
Compiling Apache requires MetroWerks CodeWarrior 6.x or higher. Once
- Apache has been built, it can be installed to the root of any NetWare
+
Compiling httpd requires MetroWerks CodeWarrior 6.x or higher. Once
+ httpd has been built, it can be installed to the root of any NetWare
volume. The default is the sys:/Apache2 directory.
Before running the server you must fill out the conf
@@ -450,7 +450,7 @@
The following development tools are required to build
- Apache 2.0 for NetWare:
+ httpd 2.0 for NetWare:
Metrowerks CodeWarrior 6.0 or higher with the
@@ -475,7 +475,7 @@
-
Copy the files test_char.h and chartables.c
to the directory \httpd-2.0\os\netware on the build machine.
-
Change directory to \httpd-2.0 and build Apache by running
+
Change directory to \httpd-2.0 and build httpd by running
"gmake -f nwgnumakefile". You can create a distribution directory by
adding an install parameter to the command, for example:
gmake -f nwgnumakefile install
@@ -570,7 +570,7 @@
gmake -f nwgnumakefile DEBUG=1
Builds debug versions of all of the
binaries and copies them to a \debug destination directory.
-
gmake -f nwgnumakefile install
Creates a complete Apache
+
gmake -f nwgnumakefile install
Creates a complete httpd
distribution with binaries, docs and additional support files in a
\dist\Apache2 directory.
@@ -601,7 +601,7 @@
Set EXPERIMENTAL=1
-
To build Apache using standard BSD style sockets rather than
+
To build httpd using standard BSD style sockets rather than
Winsock, set the environment variable USE_STDSOCKETS:
Set USE_STDSOCKETS=1
@@ -614,7 +614,7 @@
-
By default Apache for NetWare uses the built-in module
+
By default httpd for NetWare uses the built-in module
mod_nw_ssl to provide SSL services. This module
simply enables the native SSL services implemented in NetWare OS
to handle all encryption for a given port. Alternatively, mod_ssl
@@ -649,7 +649,7 @@
Warning: don't use the CodeWarrior Assembler - it produces broken code!
-
Before building Apache, set the environment variable
+
Before building httpd, set the environment variable
OSSLSDK to the full path to the root of the openssl
source code directory, and set WITH_MOD_SSL to 1.
diff --git a/docs/manual/platform/netware.html.fr.utf8 b/docs/manual/platform/netware.html.fr.utf8
index 21c6eec0ba..dd282b73a6 100644
--- a/docs/manual/platform/netware.html.fr.utf8
+++ b/docs/manual/platform/netware.html.fr.utf8
@@ -27,6 +27,8 @@
fr |
ko
dbmmanage is used to create and update the DBM format files
+
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
+ 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.
@@ -169,19 +169,19 @@
may exist on your system. The three primary examples are SDBM, NDBM, the GNU
project's GDBM, and Berkeley DB 2. Unfortunately, all these libraries use
different file formats, and you must make sure that the file format used
- by filename is the same format that dbmmanage
- expects to see. dbmmanage currently has no way of determining
+ by filename is the same format that dbmmanage
+ expects to see. dbmmanage currently has no way of determining
what type of DBM file it is looking at. If used against the wrong format,
will simply return nothing, or may create a different DBM file with a
different name, or at worst, it may corrupt the DBM file if you were
attempting to write to it.
-
dbmmanage has a list of DBM format preferences, defined by
+
dbmmanage has a list of DBM format preferences, defined by
the @AnyDBM::ISA array near the beginning of the program. Since
we prefer the Berkeley DB 2 file format, the order in which
- dbmmanage will look for system libraries is Berkeley DB 2,
+ dbmmanage will look for system libraries is Berkeley DB 2,
then NDBM, then GDBM and then SDBM. The first library found will be the
- library dbmmanage will attempt to use for all DBM file
+ library dbmmanage will attempt to use for all DBM file
transactions. This ordering is slightly different than the standard
@AnyDBM::ISA ordering in Perl, as well as the ordering used by
the simple dbmopen() call in Perl, so if you use any other
diff --git a/docs/manual/programs/dbmmanage.html.fr.utf8 b/docs/manual/programs/dbmmanage.html.fr.utf8
index 22ae78a242..0dd516d137 100644
--- a/docs/manual/programs/dbmmanage.html.fr.utf8
+++ b/docs/manual/programs/dbmmanage.html.fr.utf8
@@ -30,6 +30,8 @@ utilisateurs au format DBM
ko |
tr