Merge from trunk

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

diff --git a/docs/manual/mod/mod_actions.xml b/docs/manual/mod/mod_actions.xml
index 465a8eeb107646c1ee083a60224aa2f094e63897..9b295b58ffe20c2a188ac7a9739e06551f371aed 100644 (file)
--- a/docs/manual/mod/mod_actions.xml
+++ b/docs/manual/mod/mod_actions.xml
@@ -24,8 +24,7 @@
 
 <name>mod_actions</name>
 
-<description>This module provides for executing CGI scripts based on
-media type or request method.</description>
+<description>Execute CGI scripts based on media type or request method.</description>
 
 <status>Base</status>
 <sourcefile>mod_actions.c</sourcefile>

diff --git a/docs/manual/mod/mod_auth_basic.xml b/docs/manual/mod/mod_auth_basic.xml
index b414b8fa4cd0016ded2e37f2e7880bda33af1518..8fb11d3ac2fa1f23b44b9db2f8f144c1a96c0eac 100644 (file)
--- a/docs/manual/mod/mod_auth_basic.xml
+++ b/docs/manual/mod/mod_auth_basic.xml
@@ -23,7 +23,7 @@
 <modulesynopsis metafile="mod_auth_basic.xml.meta">
 
 <name>mod_auth_basic</name>
-<description>Basic authentication</description>
+<description>Basic HTTP authentication</description>
 <status>Base</status>
 <sourcefile>mod_auth_basic.c</sourcefile>
 <identifier>auth_basic_module</identifier>

diff --git a/docs/manual/mod/mod_dav_fs.xml b/docs/manual/mod/mod_dav_fs.xml
index ce04374974e76946f3ac5e89cf3d66bcbc14097c..5fbf72158c5d601752cba8376d7b4e659c969c63 100644 (file)
--- a/docs/manual/mod/mod_dav_fs.xml
+++ b/docs/manual/mod/mod_dav_fs.xml
@@ -23,7 +23,7 @@
 <modulesynopsis metafile="mod_dav_fs.xml.meta">
 
 <name>mod_dav_fs</name>
-<description>filesystem provider for <module>mod_dav</module></description>
+<description>Filesystem provider for <module>mod_dav</module></description>
 <status>Extension</status>
 <sourcefile>mod_dav_fs.c</sourcefile>
 <identifier>dav_fs_module</identifier>

diff --git a/docs/manual/mod/mod_dav_lock.xml b/docs/manual/mod/mod_dav_lock.xml
index 9a0d4230efeb0bb412b690533178c0b121b54fd6..d833e88ee8670a0d475200ff921b0c43b0d99348 100644 (file)
--- a/docs/manual/mod/mod_dav_lock.xml
+++ b/docs/manual/mod/mod_dav_lock.xml
@@ -23,7 +23,7 @@
 <modulesynopsis metafile="mod_dav_lock.xml.meta">
 
 <name>mod_dav_lock</name>
-<description>generic locking module for <module>mod_dav</module></description>
+<description>Generic locking module for <module>mod_dav</module></description>
 <status>Extension</status>
 <sourcefile>mod_dav_lock.c</sourcefile>
 <identifier>dav_lock_module</identifier>

diff --git a/docs/manual/mod/mod_heartbeat.xml b/docs/manual/mod/mod_heartbeat.xml
index a2180aae4c669aedd53e0400cc3903e07324e8f5..b0b1e1242ae49db5f248783457b7037101c3c9d5 100644 (file)
--- a/docs/manual/mod/mod_heartbeat.xml
+++ b/docs/manual/mod/mod_heartbeat.xml
@@ -23,7 +23,7 @@
 <modulesynopsis metafile="mod_heartbeat.xml.meta">
 
 <name>mod_heartbeat</name>
-<description>sends messages with server status to frontend proxy</description>
+<description>Sends messages with server status to frontend proxy</description>
 <status>Experimental</status>
 <sourcefile>mod_heartbeat</sourcefile>
 <identifier>heartbeat_module</identifier>

diff --git a/docs/manual/mod/mod_heartmonitor.xml b/docs/manual/mod/mod_heartmonitor.xml
index b2577410d36e390c21e3eab5595aa3ae976fea86..2d9fee1330f7c4b2d24c67f74acffaa728296a98 100644 (file)
--- a/docs/manual/mod/mod_heartmonitor.xml
+++ b/docs/manual/mod/mod_heartmonitor.xml
@@ -23,7 +23,7 @@
 <modulesynopsis metafile="mod_heartmonitor.xml.meta">
 
 <name>mod_heartmonitor</name>
-<description>centralized monitor for mod_heartbeat origin servers</description>
+<description>Centralized monitor for mod_heartbeat origin servers</description>
 <status>Experimental</status>
 <sourcefile>mod_heartmonitor.c</sourcefile>
 <identifier>heartmonitor_module</identifier>

diff --git a/docs/manual/mod/mpm_winnt.xml b/docs/manual/mod/mpm_winnt.xml
index cf1dcf6c276ba08ba8e4b5556ce30592d38d7aac..52fbbdd95d6c679941e696efbf5d80bd1ebfd80f 100644 (file)
--- a/docs/manual/mod/mpm_winnt.xml
+++ b/docs/manual/mod/mpm_winnt.xml
@@ -23,8 +23,7 @@
 <modulesynopsis metafile="mpm_winnt.xml.meta">
 
 <name>mpm_winnt</name>
-<description>This Multi-Processing Module is optimized for Windows
-NT.</description>
+<description>Multi-Processing Module optimized for Windows NT.</description>
 <status>MPM</status>
 <sourcefile>mpm_winnt.c</sourcefile>
 <identifier>mpm_winnt_module</identifier>