From 0971099ec2a10628109fb070f0b8203876effb10 Mon Sep 17 00:00:00 2001
From: Rich Bowen <rbowen@apache.org>
Date: Thu, 24 Jan 2013 02:08:24 +0000
Subject: [PATCH] Merge from trunk

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1437838 13f79535-47bb-0310-9956-ffa450edef68
---
 docs/manual/mod/mod_actions.xml      | 3 +--
 docs/manual/mod/mod_auth_basic.xml   | 2 +-
 docs/manual/mod/mod_dav_fs.xml       | 2 +-
 docs/manual/mod/mod_dav_lock.xml     | 2 +-
 docs/manual/mod/mod_heartbeat.xml    | 2 +-
 docs/manual/mod/mod_heartmonitor.xml | 2 +-
 docs/manual/mod/mpm_winnt.xml        | 3 +--
 7 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/docs/manual/mod/mod_actions.xml b/docs/manual/mod/mod_actions.xml
index 465a8eeb10..9b295b58ff 100644
--- 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 b414b8fa4c..8fb11d3ac2 100644
--- 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 ce04374974..5fbf72158c 100644
--- 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 9a0d4230ef..d833e88ee8 100644
--- 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 a2180aae4c..b0b1e1242a 100644
--- 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 b2577410d3..2d9fee1330 100644
--- 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 cf1dcf6c27..52fbbdd95d 100644
--- 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>
-- 
2.50.1