Comment by default Alias directive for tinymce

diff --git a/debian/changelog b/debian/changelog
index cde4a3c1ad18c4e9d06a8572dd1a95f52fca044b..3b26f173f4817ee788d2b977f346660570ffb444 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+roundcube (0.1.1-2) unstable; urgency=low
+
+  * Comment by default Alias directive for tinymce in Apache configuration
+    file (Closes: #476162).
+
+ -- Vincent Bernat <bernat@luffy.cx>  Tue, 15 Apr 2008 08:20:47 +0200
+
 roundcube (0.1.1-1) unstable; urgency=low
 
   * New upstream release

diff --git a/debian/conf/apache.conf b/debian/conf/apache.conf
index a5e05623d3c99bcc1c3f928efdf8a086c3d03236..79e3d41b7df6e336d2960ac9d202a5aa29c90f2e 100644 (file)
--- a/debian/conf/apache.conf
+++ b/debian/conf/apache.conf
@@ -1,7 +1,9 @@
-# Uncomment this to use tinymce (you need tinymce package)
-# See README.Debian for more details
+# Those aliases do not work properly with several hosts on your apache server
+# Uncomment them to use it or adapt them to your configuration
+#    Alias /roundcube/program/js/tiny_mce/ /usr/share/tinymce/www/
+#    Alias /roundcube /var/lib/roundcube
 
-Alias /roundcube/program/js/tiny_mce/ /usr/share/tinymce/www/
+# Access to tinymce files
 <Directory "/usr/share/tinymce/www/">
       Options Indexes MultiViews FollowSymLinks
       AllowOverride None
@@ -9,10 +11,6 @@ Alias /roundcube/program/js/tiny_mce/ /usr/share/tinymce/www/
       allow from all
 </Directory>
 
-# This alias does not work properly with several hosts on your apache server
-# Uncomment it to use it
-#    Alias /roundcube /var/lib/roundcube
-
 <Directory /var/lib/roundcube/>
         Options +FollowSymLinks
         AllowOverride All