rebuild

5 files changed, 8 insertions, 60 deletions

diff --git a/public/apt.key b/public/apt.key
index 18fd398..b6b5077 100644
--- a/public/apt.key
+++ b/public/apt.key
diff --git a/public/common/_download_button.haml b/public/common/_download_button.haml
deleted file mode 100644
index 3e98432..0000000
--- a/public/common/_download_button.haml
+++ /dev/null
@@ -1,3 +0,0 @@
-%a{:href => @locals[:link], :class => 'btn btn-primary btn-large'}
-  %i.fa.fa-cloud-download.fa-lg
-  = @locals[:text] || t(:download)
diff --git a/public/common/_email.md b/public/common/_email.md
deleted file mode 100644
index 2db279e..0000000
--- a/public/common/_email.md
+++ /dev/null
@@ -1,24 +0,0 @@
-## Configuring email
-
-To get encrypted email to work, you have two options:
-
-1. [Bitmask Thunderbird Extension](https://addons.mozilla.org/en-us/thunderbird/addon/bitmask/) (recommended)
-2. Manual email client configuration
-
-#### Bitmask Thunderbird Extension
-
-1. Install Bitmask app and register for an account.
-2. Install the [Bitmask Thunderbird Extension](https://addons.mozilla.org/en-us/thunderbird/addon/bitmask/).
-3. Select the Thunderbird menu item `File` > `New` > `Bitmask Account...`
-
-#### Manual email client configuration
-
-* IMAP -- `localhost:1984`
-  * username: the full email address you use with the Bitmask app.
-  * password: ignored, can be anything.
-  * SSL/TLS: off
-* SMTP -- `localhost:2013`
-  * authentication: none
-  * SSL/TLS: off
-
-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.
diff --git a/public/common/_notice.haml b/public/common/_notice.haml
deleted file mode 100644
index dc15c96..0000000
--- a/public/common/_notice.haml
+++ /dev/null
@@ -1,9 +0,0 @@
-.row
-  .col-sm-8.col-sm-offset-2
-    - if @locals[:type] == 'warning'
-      .p.alert.alert-danger
-        %i.fa.fa-warning
-        = @locals[:text]
-    - elsif @locals[:type] == 'info'
-      .p.alert.alert-info
-        = @locals[:text]
diff --git a/public/linux/index.en.html b/public/linux/index.en.html
index e76d16a..4eab0b7 100644
--- a/public/linux/index.en.html
+++ b/public/linux/index.en.html
@@ -73,43 +73,27 @@ apt-get dist-upgrade</code></pre>
 <h2><a name="install-as-packages"></a>Install as packages</h2>
 <p>This is the recommended method of installing Bitmask. If installed as a package, Bitmask will run faster, be better integrated in the system, and will be kept up to date.</p>
 <h3><a name="ubuntu-1504-vivid-vervet"></a>Ubuntu 15.04 (Vivid Vervet)</h3>
-<p><p class='b'>
-  To install
-</p>
+<p><p class='b'>To install</p>
 <pre>sudo -s&#x000A;add-apt-repository "deb http://deb.bitmask.net/debian vivid main"&#x000A;wget -O- https://dl.bitmask.net/apt.key | apt-key add -&#x000A;apt-get update&#x000A;apt-get install bitmask leap-keyring&#x000A;</pre>
-<p class='b'>
-  To remove
-</p>
+<p class='b'>To remove</p>
 <pre>sudo -s&#x000A;apt-get remove bitmask leap-keyring&#x000A;apt-key del 0x1E34A1828E207901&#x000A;add-apt-repository --remove "deb http://deb.bitmask.net/debian vivid main"</pre>
 </p>
 <h3><a name="ubuntu-1404-lts-trusty-tahr"></a>Ubuntu 14.04 <span class="caps">LTS</span> (Trusty Tahr)</h3>
-<p><p class='b'>
-  To install
-</p>
+<p><p class='b'>To install</p>
 <pre>sudo -s&#x000A;add-apt-repository "deb http://deb.bitmask.net/debian trusty main"&#x000A;wget -O- https://dl.bitmask.net/apt.key | apt-key add -&#x000A;apt-get update&#x000A;apt-get install bitmask leap-keyring&#x000A;</pre>
-<p class='b'>
-  To remove
-</p>
+<p class='b'>To remove</p>
 <pre>sudo -s&#x000A;apt-get remove bitmask leap-keyring&#x000A;apt-key del 0x1E34A1828E207901&#x000A;add-apt-repository --remove "deb http://deb.bitmask.net/debian trusty main"</pre>
 </p>
 <h3><a name="debian-70-wheezy"></a>Debian 7.0 (Wheezy)</h3>
-<p><p class='b'>
-  To install
-</p>
+<p><p class='b'>To install</p>
 <pre>sudo -s&#x000A;echo "deb http://deb.bitmask.net/debian wheezy main" > /etc/apt/sources.list.d/bitmask.list&#x000A;wget -O- https://dl.bitmask.net/apt.key | apt-key add -&#x000A;apt-get update&#x000A;apt-get install bitmask leap-keyring&#x000A;</pre>
-<p class='b'>
-  To remove
-</p>
+<p class='b'>To remove</p>
 <pre>sudo -s&#x000A;apt-get remove bitmask leap-keyring&#x000A;apt-key del 0x1E34A1828E207901&#x000A;rm /etc/apt/sources.list.d/bitmask.list&#x000A;</pre>
 </p>
 <h3><a name="debian-80-jessie"></a>Debian 8.0 (Jessie)</h3>
-<p><p class='b'>
-  To install
-</p>
+<p><p class='b'>To install</p>
 <pre>sudo -s&#x000A;echo "deb http://deb.bitmask.net/debian jessie main" > /etc/apt/sources.list.d/bitmask.list&#x000A;wget -O- https://dl.bitmask.net/apt.key | apt-key add -&#x000A;apt-get update&#x000A;apt-get install bitmask leap-keyring&#x000A;</pre>
-<p class='b'>
-  To remove
-</p>
+<p class='b'>To remove</p>
 <pre>sudo -s&#x000A;apt-get remove bitmask leap-keyring&#x000A;apt-key del 0x1E34A1828E207901&#x000A;rm /etc/apt/sources.list.d/bitmask.list&#x000A;</pre>
 </p>
 <h2><a name="install-stand-alone-bundle"></a>Install stand-alone bundle</h2>