From 009dff383adadb62b2884e3988c5a31ae17c24a2 Mon Sep 17 00:00:00 2001
From: Zhang Huangbin <Zhang Huangbin@localhost>
Date: Fri, 13 May 2016 23:37:24 +0800
Subject: [PATCH] Updated file.locations.html, mention roundcube directory in
 old iredmail.

---
 en_US/faq/file.locations.md |  6 ++++--
 html/css/markdown.css       | 21 +++++++++++++++++++--
 html/file.locations.html    |  6 ++++--
 3 files changed, 27 insertions(+), 6 deletions(-)
 mode change 100644 => 100755 html/css/markdown.css

diff --git a/en_US/faq/file.locations.md b/en_US/faq/file.locations.md
index 5c63a7e3..aebe5cc9 100644
--- a/en_US/faq/file.locations.md
+++ b/en_US/faq/file.locations.md
@@ -171,8 +171,10 @@ Main config file:
 
     * RHEL/CentOS: `/var/www/roundcubemail`. It's a symbol link to
       `/var/www/roundcubemail-x.y.z`.
-    * Debian/Ubuntu: `/usr/share/apache2/roundcubemail`. It's a symbol link of
-      `/usr/share/apache2/roundcubemail-x.y.z/`.
+    * Debian/Ubuntu: `/opt/www/roundcubemail`. It's a symbol link to
+      `/opt/www/roundcubemail-x.y.z`.
+        Note: with old iRedMail releases, it's `/usr/share/apache2/roundcubemail`,
+        it's a symbol link to `/usr/share/apache2/roundcubemail-x.y.z/`.
     * FreeBSD: `/usr/local/www/roundcube`.
     * OpenBSD: `/var/www/roundcubemail`. It's a symbol link to
       `/var/www/roundcubemail-x.y.z/`.
diff --git a/html/css/markdown.css b/html/css/markdown.css
old mode 100644
new mode 100755
index 2c6f1592..754a46c6
--- a/html/css/markdown.css
+++ b/html/css/markdown.css
@@ -335,7 +335,7 @@ li { line-height: 26px; }
 }
 */
 
-.api, .note, .attention, .caution, .danger, .error, .hint, .important, .tip, .warning, .seealso, .admonition-todo {
+.note, .attention, .caution, .danger, .error, .hint, .important, .tip, .warning, .seealso, .admonition-todo {
 	padding: 12px;
 	line-height: 24px;
 	margin-bottom: 24px;
@@ -373,7 +373,7 @@ li { line-height: 26px; }
 /* Style for API document */
 .api {
 	line-height: 18px;
-	background: #e7f2fa;
+	#background: #e7f2fa;
 	padding: 3px 12px 0px 0px;
     margin-top: 0px;
 	margin-bottom: 0px;
@@ -401,3 +401,20 @@ th, td { border: 1px solid black; }
 /*
 caption { font-size: 200%;}
 */
+
+/*
+.api_url, .api_method, .api_comment { float: left; }
+*/
+
+.admonition  table {
+	border-collapse: collapse;
+    #width: 100%;
+    text-align: left;
+    line-height: 33px;
+    vertical-align: middle;
+    margin-bottom: 20px;
+}
+
+.admonition  table thead {
+    background-color: #f4f8e9;
+}
\ No newline at end of file
diff --git a/html/file.locations.html b/html/file.locations.html
index 3f8fcdc4..7b48e7fc 100644
--- a/html/file.locations.html
+++ b/html/file.locations.html
@@ -236,8 +236,10 @@ empty, please check normal syslog log file <code>/var/log/messages</code> or
 <ul>
 <li>RHEL/CentOS: <code>/var/www/roundcubemail</code>. It's a symbol link to
   <code>/var/www/roundcubemail-x.y.z</code>.</li>
-<li>Debian/Ubuntu: <code>/usr/share/apache2/roundcubemail</code>. It's a symbol link of
-  <code>/usr/share/apache2/roundcubemail-x.y.z/</code>.</li>
+<li>Debian/Ubuntu: <code>/opt/www/roundcubemail</code>. It's a symbol link to
+  <code>/opt/www/roundcubemail-x.y.z</code>.
+    Note: with old iRedMail releases, it's <code>/usr/share/apache2/roundcubemail</code>,
+    it's a symbol link to <code>/usr/share/apache2/roundcubemail-x.y.z/</code>.</li>
 <li>FreeBSD: <code>/usr/local/www/roundcube</code>.</li>
 <li>OpenBSD: <code>/var/www/roundcubemail</code>. It's a symbol link to
   <code>/var/www/roundcubemail-x.y.z/</code>.</li>