summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--pages/linux/en.md2
-rw-r--r--pages/mac/en.md2
-rw-r--r--pages/windows/en.md2
-rw-r--r--public/linux/index.en.html35
4 files changed, 39 insertions, 2 deletions
diff --git a/pages/linux/en.md b/pages/linux/en.md
index b4afa73..f0066ba 100644
--- a/pages/linux/en.md
+++ b/pages/linux/en.md
@@ -52,3 +52,5 @@ If the result is:
### Other options
If you want to install an old version of Bitmask, you can [browse all releases.](/client/linux/)
+
+<%= render({:partial => 'common/email'}) %> \ No newline at end of file
diff --git a/pages/mac/en.md b/pages/mac/en.md
index cd8651b..9c5c944 100644
--- a/pages/mac/en.md
+++ b/pages/mac/en.md
@@ -12,4 +12,4 @@ Once the .dmg has been saved to your computer, mount the image and drag "Bitmask
If you want to install an old version of Bitmask, you can [browse all releases.](/client/osx/)
-<%= render({:partial => 'common/email'}, {:blah => true}) %>
+<%= render({:partial => 'common/email'}) %>
diff --git a/pages/windows/en.md b/pages/windows/en.md
index ff27d0f..31728b1 100644
--- a/pages/windows/en.md
+++ b/pages/windows/en.md
@@ -12,4 +12,4 @@ Use at your own risk.
If you want to install an old version of Bitmask, you can [browse all releases.](/client/windows/)
-<%= render({:partial => 'common/email'}, {:blah => true}) %>
+<%= render({:partial => 'common/email'}) %>
diff --git a/public/linux/index.en.html b/public/linux/index.en.html
index f0c2b66..04db0d7 100644
--- a/public/linux/index.en.html
+++ b/public/linux/index.en.html
@@ -33,6 +33,7 @@
<li><a href="#L64.bit.kernel">64 bit kernel</a></li>
<li><a href="#Other.options">Other options</a></li>
</ul></li>
+ <li><a href="#Configuring.email">Configuring email</a></li>
</ul></li>
</ul>
@@ -168,6 +169,40 @@
<h3>Other options</h3>
<p>If you want to install an old version of Bitmask, you can <a href="/client/linux/">browse all releases.</a></p>
+
+<a name="Configuring.email"></a>
+<h2>Configuring email</h2>
+
+<p>To get encrypted email to work, you have two options:</p>
+
+<ol>
+<li>Install the <a href="https://addons.mozilla.org/en-us/thunderbird/addon/bitmask/">Bitmask Thunderbird Extension</a> (recommended).</li>
+<li>Configure your email client manually.</li>
+</ol>
+
+
+<p>Manual email client configuration:</p>
+
+<ul>
+<li>IMAP &mdash; <code>localhost:1984</code>
+
+<ul>
+<li>username: the full email address you use with the Bitmask app.</li>
+<li>password: ignored, can be anything.</li>
+<li>SSL/TLS: off</li>
+</ul>
+</li>
+<li>SMTP &mdash; <code>localhost:2013</code>
+
+<ul>
+<li>authentication: none</li>
+<li>SSL/TLS: off</li>
+</ul>
+</li>
+</ul>
+
+
+<p>You should also disable any local caching in your email client, if applicable. All the data stored by Bitmask is kept on disk in an encrypted format, but your mail client might cache your email in clear text, so it is good to disable caching if you can. Also, all your Bitmask email is sync'ed locally anyway, so there is no benefit to local caching.</p>
</div>
<footer>
<div>