From 8b015c599a49f7bac7fce573d3b8f83e5903c501 Mon Sep 17 00:00:00 2001
From: Zhang Huangbin <Zhang Huangbin@localhost>
Date: Tue, 31 Jan 2017 12:26:27 +0800
Subject: [PATCH] Sync en_US/upgrade/0-upgrade.ubuntu.14.04-16.04.md.

---
 en_US/upgrade/0-upgrade.ubuntu.14.04-16.04.md | 22 +++++++++++++++++++
 html/upgrade.ubuntu.14.04-16.04.html          | 20 +++++++++++++++++
 2 files changed, 42 insertions(+)

diff --git a/en_US/upgrade/0-upgrade.ubuntu.14.04-16.04.md b/en_US/upgrade/0-upgrade.ubuntu.14.04-16.04.md
index bbc98721..a2455a1f 100644
--- a/en_US/upgrade/0-upgrade.ubuntu.14.04-16.04.md
+++ b/en_US/upgrade/0-upgrade.ubuntu.14.04-16.04.md
@@ -20,6 +20,28 @@ iRedAPD requires package `python-pymysql`:
 apt -y install python-pymysql
 ```
 
+## Roundcube webmail
+
+Make sure you have settings below in Roundcube config file `config/config.inc.php`:
+
+```
+// Required if you're running PHP 5.6 or later
+$config['imap_conn_options'] = array(
+    'ssl' => array(
+        'verify_peer'  => false,
+        'verify_peer_name' => false,
+    ),
+);
+
+// Required if you're running PHP 5.6 or later
+$config['smtp_conn_options'] = array(
+    'ssl' => array(
+        'verify_peer'      => false,
+        'verify_peer_name' => false,
+    ),
+);
+```
+
 ## PHP [OPTIONAL]
 
 > NOTE: This step is toally optional if you're fine with old PHP release.
diff --git a/html/upgrade.ubuntu.14.04-16.04.html b/html/upgrade.ubuntu.14.04-16.04.html
index 6352336b..fdc3a560 100644
--- a/html/upgrade.ubuntu.14.04-16.04.html
+++ b/html/upgrade.ubuntu.14.04-16.04.html
@@ -21,6 +21,7 @@
 <li><a href="#fixes-you-need-after-upgrading-ubuntu-to-1604-from-1404">Fixes you need after upgrading Ubuntu to 16.04 from 14.04</a><ul>
 <li><a href="#postfix">Postfix</a></li>
 <li><a href="#iredapd">iRedAPD</a></li>
+<li><a href="#roundcube-webmail">Roundcube webmail</a></li>
 <li><a href="#php-optional">PHP [OPTIONAL]</a><ul>
 <li><a href="#nginx-and-php-fpm">Nginx and php-fpm</a></li>
 </ul>
@@ -43,6 +44,25 @@ postconf -e shlib_directory='/usr/lib/postfix'
 <pre><code>apt -y install python-pymysql
 </code></pre>
 
+<h2 id="roundcube-webmail">Roundcube webmail</h2>
+<p>Make sure you have settings below in Roundcube config file <code>config/config.inc.php</code>:</p>
+<pre><code>// Required if you're running PHP 5.6 or later
+$config['imap_conn_options'] = array(
+    'ssl' =&gt; array(
+        'verify_peer'  =&gt; false,
+        'verify_peer_name' =&gt; false,
+    ),
+);
+
+// Required if you're running PHP 5.6 or later
+$config['smtp_conn_options'] = array(
+    'ssl' =&gt; array(
+        'verify_peer'      =&gt; false,
+        'verify_peer_name' =&gt; false,
+    ),
+);
+</code></pre>
+
 <h2 id="php-optional">PHP [OPTIONAL]</h2>
 <blockquote>
 <p>NOTE: This step is toally optional if you're fine with old PHP release.</p>