[Pkg-apache-commits] [SCM] Debian packaging for apache2 (Apache HTTPD 2.x) branch, next, updated. debian/2.4.2-2-21-gc21c68d

[Stefan Fritsch]

The following commit has been merged in the next branch:
commit c21c68ddb78082523b22415f7581e9cf31817e79
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Mon May 28 22:31:26 2012 +0200

    tweak comments

diff --git a/debian/config-dir/apache2.conf b/debian/config-dir/apache2.conf
index 1c1c2f0..75839a1 100644
--- a/debian/config-dir/apache2.conf
+++ b/debian/config-dir/apache2.conf
@@ -38,7 +38,8 @@
 #
 # * Configuration files in the mods-enabled/, conf-enabled/ and sites-enabled/
 #   directories contain particular configuration snippets which manage modules,
-#   global configuration fragments or site specific configuration respectively.
+#   global configuration fragments, or virtual host configurations,
+#   respectively.
 #
 #   They are activated by symlinking available configuration files from their
 #   respective *-available/ counterparts. These should be managed by using our
@@ -80,7 +81,7 @@ Mutex file:${APACHE_LOCK_DIR} default
 PidFile ${APACHE_PID_FILE}
 
 #
-# Timeout: The number of seconds to allow before sending a time out.
+# Timeout: The number of seconds before receives and sends time out.
 #
 Timeout 300
 

-- 
Debian packaging for apache2 (Apache HTTPD 2.x)