[SCM] Debian packaging for apache2 branch, master, updated. debian/2.2.22-3-30-g179b845

[Stefan Fritsch]

The following commit has been merged in the master branch:
commit 8bc6762055a4f562b3979e3933da87607cb86de9
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Mon Jun 11 21:59:01 2012 +0200

    minor formatting / language fixes

diff --git a/debian/config-dir/apache2.conf b/debian/config-dir/apache2.conf
index c1fdd70..5054567 100644
--- a/debian/config-dir/apache2.conf
+++ b/debian/config-dir/apache2.conf
@@ -40,7 +40,7 @@
 #
 #   Yet we strongly suggest that all configuration files either end with a
 #   .conf or .load suffix in the file name. The next Debian release will
-#   ignore files not ending with .conf (nor .load for mods-enabled).
+#   ignore files not ending with .conf (or .load for mods-enabled).
 #
 # * ports.conf is always included from the main configuration file. It is
 #   supposed to determine listening ports for incoming connections, and which
@@ -58,8 +58,8 @@
 # * Configuration files in the conf.d directory are either provided by other
 #   packages or may be added by the local administrator. Local additions
 #   should start with local- or end with .local.conf to avoid name clashes. All
-#   files in conf.d are considered (excluding the exceptions noted
-#   above) by the Apache 2 web server.
+#   files in conf.d are considered (excluding the exceptions noted above) by
+#   the Apache 2 web server.
 #
 # * The binary is called apache2. Due to the use of environment variables, in
 #   the default configuration, apache2 needs to be started/stopped with

-- 
Debian packaging for apache2