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

[Stefan Fritsch]

The following commit has been merged in the next branch:
commit 256965cb8d6ce492fd6a4c2a38c00a2228170135
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Sun Mar 18 22:53:11 2012 +0100

    Update paths in docs

diff --git a/debian/README.multiple-instances b/debian/README.multiple-instances
index 62de5d6..ae038d3 100644
--- a/debian/README.multiple-instances
+++ b/debian/README.multiple-instances
@@ -6,7 +6,7 @@ support for handling multiple instances of apache2 running on the same machine.
 
 The basic idea is to copy /etc/apache2 to /etc/apache2-xxx. An example script
 that demonstrates what else needs to be done can be found in
-/usr/share/doc/apache2.2-common/examples/setup-instance. Use with:
+/usr/share/doc/apache2/examples/setup-instance. Use with:
 
 	sh /usr/share/doc/apache2/examples/setup-instance xxx
 
diff --git a/debian/config-dir/mods-available/cache_disk.conf b/debian/config-dir/mods-available/cache_disk.conf
index ce5b1e5..ca9513c 100644
--- a/debian/config-dir/mods-available/cache_disk.conf
+++ b/debian/config-dir/mods-available/cache_disk.conf
@@ -3,7 +3,7 @@
 # /etc/default/apache2
 #
 # For further information, see the comments in that file, 
-# /usr/share/doc/apache2.2-common/README.Debian, and the htcacheclean(8)
+# /usr/share/doc/apache2/README.Debian, and the htcacheclean(8)
 # man page.
 
 	# This path must be the same as the one in /etc/default/apache2
diff --git a/debian/config-dir/sites-available/default-ssl.conf b/debian/config-dir/sites-available/default-ssl.conf
index b7ab402..a82da20 100644
--- a/debian/config-dir/sites-available/default-ssl.conf
+++ b/debian/config-dir/sites-available/default-ssl.conf
@@ -30,7 +30,7 @@
 
 	#   A self-signed (snakeoil) certificate can be created by installing
 	#   the ssl-cert package. See
-	#   /usr/share/doc/apache2.2-common/README.Debian.gz for more info.
+	#   /usr/share/doc/apache2/README.Debian.gz for more info.
 	#   If both key and certificate are stored in the same file, only the
 	#   SSLCertificateFile directive is needed.
 	SSLCertificateFile    /etc/ssl/certs/ssl-cert-snakeoil.pem
diff --git a/debian/manpages/apache2.8 b/debian/manpages/apache2.8
index 5c2a91a..4e0e124 100644
--- a/debian/manpages/apache2.8
+++ b/debian/manpages/apache2.8
@@ -19,7 +19,7 @@ However, apache2ctl can be used to pass arbitrary arguments to apache2.
 The full documentation is available in the apache2-doc package or at
 http://httpd.apache.org/docs/2.2/ . Information about Debian specific changes
 and configuration can be found in
-/usr/share/doc/apache2.2-common/README.Debian.gz .
+/usr/share/doc/apache2/README.Debian.gz .
 .SH "OPTIONS"
 .TP
 -d \fIserverroot\fR
@@ -77,5 +77,5 @@ Print the version and build parameters of apache2, and then exit\&.
 Run apache2 in debug mode\&. Only one worker will be started and the server will not detach from the console\&.  
 .SH SEE ALSO
 .BR apache2ctl (8),
-.BR /usr/share/doc/apache2.2-common/README.Debian.gz
+.BR /usr/share/doc/apache2/README.Debian.gz
 
diff --git a/debian/manpages/apache2ctl.8 b/debian/manpages/apache2ctl.8
index fd05aa0..eb8983d 100644
--- a/debian/manpages/apache2ctl.8
+++ b/debian/manpages/apache2ctl.8
@@ -178,5 +178,5 @@ can be set in
 .BR /etc/apache2/envvars .
 .SH SEE ALSO
 .BR apache2(8) ,
-.BR /usr/share/doc/apache2.2-common/README.Debian.gz
+.BR /usr/share/doc/apache2/README.Debian.gz
 .
diff --git a/debian/manpages/suexec-custom.8 b/debian/manpages/suexec-custom.8
index 8f1477c..ffcf67b 100644
--- a/debian/manpages/suexec-custom.8
+++ b/debian/manpages/suexec-custom.8
@@ -64,5 +64,5 @@ was built.  No other action is taken.
 .BR /etc/apache2/suexec/www-data
 .SH SEE ALSO
 .BR apache2(8) ,
-.BR /usr/share/doc/apache2.2-common/README.Debian.gz ,
+.BR /usr/share/doc/apache2/README.Debian.gz ,
 .BR dpkg-statoverride(8)

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