summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorStefan Fritsch <sf@debian.org>2007-06-26 20:28:15 +0000
committerStefan Fritsch <sf@sfritsch.de>2012-01-02 10:36:44 +0100
commit15191815bdc33ed0d7d4a96ce1770e043f33a25b (patch)
treef37457acc56260e945125286f4aa1c1fcf014353 /debian
parent5bc8717f6a848ffc8e84040360de7543b80312ec (diff)
downloadapache2-15191815bdc33ed0d7d4a96ce1770e043f33a25b.tar.gz
Don't use AddDefaultCharset for our docs
git-svn-id: svn+ssh://svn.debian.org/svn/pkg-apache/trunk/apache2@392 01b336ce-410b-0410-9a02-a0e7f243c266
Diffstat (limited to 'debian')
-rw-r--r--debian/apache2-doc.conf1
-rw-r--r--debian/changelog1
2 files changed, 2 insertions, 0 deletions
diff --git a/debian/apache2-doc.conf b/debian/apache2-doc.conf
index a87b79e8..86357496 100644
--- a/debian/apache2-doc.conf
+++ b/debian/apache2-doc.conf
@@ -6,6 +6,7 @@ AliasMatch ^/apache2-default/manual(?:/(?:de|en|es|fr|ja|ko|pt-br|ru))?(/.*)?$ "
AllowOverride None
Order allow,deny
Allow from all
+ AddDefaultCharset off
<Files *.html>
SetHandler type-map
diff --git a/debian/changelog b/debian/changelog
index 7d70b9b4..fa57d695 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,6 +28,7 @@ apache2 (2.2.4-1) UNRELEASED; urgency=low
* Add httxt2dbm(8) man page
* Show -X option in help message (Closes: #391817)
* remove sick-hack-to-update-modules
+ * Don't use AddDefaultCharset for our docs (Closes: #414429)
[ Peter Samuelson ]
* Add shlibs:Depends to apache2.2-common.