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

[Stefan Fritsch]

The following commit has been merged in the next branch:
commit be6908fcc0ad08211c739dca335f88f48db0e7a0
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Sat Apr 14 22:35:57 2012 +0200

    Re-word to make clear that including in the vhost does not work in
    all cases

diff --git a/debian/config-dir/sites-available/000-default.conf b/debian/config-dir/sites-available/000-default.conf
index 0d37ba3..1326408 100644
--- a/debian/config-dir/sites-available/000-default.conf
+++ b/debian/config-dir/sites-available/000-default.conf
@@ -10,8 +10,8 @@
 	ErrorLog ${APACHE_LOG_DIR}/error.log
 	CustomLog ${APACHE_LOG_DIR}/access.log combined
 
-	# You can include here config files from conf-available that you
-	# have disabled globally and want to enable for some vhosts. For
-	# example:
+	# For most config files from conf-available, it is possible to
+	# include the file only for some vhosts while having it disabled
+	# globally. For example:
 	#Include conf-available/usr-lib-cgi-bin.conf
 </VirtualHost>
diff --git a/debian/config-dir/sites-available/default-ssl.conf b/debian/config-dir/sites-available/default-ssl.conf
index 284459a..98a468e 100644
--- a/debian/config-dir/sites-available/default-ssl.conf
+++ b/debian/config-dir/sites-available/default-ssl.conf
@@ -11,12 +11,11 @@
 	ErrorLog ${APACHE_LOG_DIR}/error.log
 	CustomLog ${APACHE_LOG_DIR}/access.log combined
 
-	# You can include here config files from conf-available that you
-	# have disabled globally and want to enable for some vhosts. For
-	# example:
+	# For most config files from conf-available, it is possible to
+	# include the file only for some vhosts while having it disabled
+	# globally. For example:
 	#Include conf-available/usr-lib-cgi-bin.conf
 
-
 	#   SSL Engine Switch:
 	#   Enable/Disable SSL for this virtual host.
 	SSLEngine on

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