[Pkg-apache-commits] [SCM] Debian packaging for apache2 (Apache HTTPD 2.x) branch, next, updated. d67f80610a5dd5f34ba387dc5d2148f6c3c2eb13

[Arno Töll]

The following commit has been merged in the next branch:
commit d67f80610a5dd5f34ba387dc5d2148f6c3c2eb13
Author: Arno Töll <arno at debian.org>
Date:   Sun Apr 22 13:11:55 2012 +0200

    Merge Oxan's patch to fix #669269

diff --git a/debian/changelog b/debian/changelog
index 186ee3b..d80f513 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,10 @@ apache2 (2.4.2-2) experimental; urgency=low
   [ Arno Töll ]
   * Add mode lines to various configuration files and scripts. Reformat
     configuration files for consitency.
+  * Fix "Fix typographic errors in configuration file comments": Thanks to Oxan
+    van Leeuwen for providing a patch (Closes: #669269)
+
+
 
  -- Arno Töll <arno at debian.org>  Fri, 20 Apr 2012 20:10:11 +0200
 
diff --git a/debian/config-dir/apache2.conf b/debian/config-dir/apache2.conf
index 9fa3300..cb0b9ef 100644
--- a/debian/config-dir/apache2.conf
+++ b/debian/config-dir/apache2.conf
@@ -36,7 +36,7 @@
 #   supposed to determine listening ports for incoming connections which can be
 #   customized anytime.
 #
-# * Configuration files in the sites-enabled/, mods-enabled/ and conf-enabled/
+# * 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.
 #
diff --git a/debian/config-dir/sites-available/000-default.conf b/debian/config-dir/sites-available/000-default.conf
index d3e28ae..13e881c 100644
--- a/debian/config-dir/sites-available/000-default.conf
+++ b/debian/config-dir/sites-available/000-default.conf
@@ -4,6 +4,7 @@
 
 	# Available loglevels: trace8, ..., trace1, debug, info, notice, warn,
 	# error, crit, alert, emerg.
+	# include it only for a particular virtual host. For example the
 	# It is also possible to configure the loglevel for particular
 	# modules, e.g.
 	#LogLevel info ssl:warn
diff --git a/debian/config-dir/sites-available/default-ssl.conf b/debian/config-dir/sites-available/default-ssl.conf
index 3da34e3..da8b257 100644
--- a/debian/config-dir/sites-available/default-ssl.conf
+++ b/debian/config-dir/sites-available/default-ssl.conf
@@ -15,7 +15,7 @@
 
 		# For most configuration files from conf-available/, which are
 		# enabled or disabled at a global level, it is possible to
-		# include a it only for a particular virtual host. For example the
+		# include it only for a particular virtual host. For example the
 		# following line enables the CGI configuration for this host
 		# only after disabling it globally with "a2disconf".
 		#Include conf-available/serve-cgi-bin.conf

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