From: Daniel Gruno
Date: Fri, 27 Apr 2012 05:58:41 +0000 (+0000)
Subject: Syntax updates for mod_x*.xml and mpm_common.xml
X-Git-Tag: 2.5.0-alpha~6987
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7be37152b79ccc6cd214e3975173aeb267cbd2bb;p=thirdparty%2Fapache%2Fhttpd.git
Syntax updates for mod_x*.xml and mpm_common.xml
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1331232 13f79535-47bb-0310-9956-ffa450edef68
---
diff --git a/docs/manual/mod/mod_xml2enc.xml b/docs/manual/mod/mod_xml2enc.xml
index 82bd50dffa0..1d4f23c6f45 100644
--- a/docs/manual/mod/mod_xml2enc.xml
+++ b/docs/manual/mod/mod_xml2enc.xml
@@ -132,7 +132,7 @@ module for earlier versions.
information, you can set this default to help mod_xml2enc process
the data correctly. For example, to work with the default value
of Latin1 (iso-8859-1 specified in HTTP/1.0, use
- xml2EncDefault iso-8859-1
+ xml2EncDefault iso-8859-1
diff --git a/docs/manual/mod/mpm_common.xml b/docs/manual/mod/mpm_common.xml
index 92413c3d26c..bf2b1bdde8f 100644
--- a/docs/manual/mod/mpm_common.xml
+++ b/docs/manual/mod/mpm_common.xml
@@ -143,7 +143,9 @@ of the daemon
ServerRoot.
Example
+
PidFile /var/run/apache.pid
+
It is often useful to be able to send the server a signal,
@@ -202,25 +204,25 @@ The protocol argument was added in 2.1.5
For example, to make the server accept connections on both
port 80 and port 8000, use:
-
- Listen 80
- Listen 8000
-
+
+Listen 80
+Listen 8000
+
To make the server accept connections on two specified
interfaces and port numbers, use
-
- Listen 192.170.2.1:80
- Listen 192.170.2.5:8000
-
+
+Listen 192.170.2.1:80
+Listen 192.170.2.5:8000
+
IPv6 addresses must be surrounded in square brackets, as in the
following example:
-
+
Listen [2001:db8::a00:20ff:fea7:ccea]:80
-
+
The optional protocol argument is not required for most
configurations. If not specified, https
is the default for
@@ -232,9 +234,9 @@ The protocol argument was added in 2.1.5
You only need to set the protocol if you are running on non-standard
ports. For example, running an https
site on port 8443:
-
+
Listen 192.170.2.1:8443 https
-
+
Error condition
Multiple Listen directives for the same ip
@@ -469,7 +471,9 @@ the child processes
Apache httpd to always create the file on the disk.
Example
+
ScoreBoardFile /var/run/apache_status
+
File-based shared memory is useful for third-party applications