added signature verification info and converted pages from markdown to textile.

8 files changed, 165 insertions, 85 deletions

diff --git a/pages/android/en.haml b/pages/android/en.haml
deleted file mode 100644
index 0a959a5..0000000
--- a/pages/android/en.haml
+++ /dev/null
@@ -1,42 +0,0 @@
-- @title = "Bitmask for Android"
-- @nav_title = "Android"
-
-:javascript
-  $(document).ready(function() {
-    if (navigator.userAgent.toLowerCase().indexOf("android") > -1) {
-      $('.non-android').hide();
-    }
-  });
-
-.row
-  .col-sm-8.col-sm-offset-2
-    .p.alert.alert-info
-      %i.fa.fa-envelope
-      <b>NOTE:</b> Bitmask for Android does not yet support encrypted email.
-
-%h2 Install from Google Play
-
-You can search for "Bitmask" in the Google Play store or use this link:
-
-.p.android
-  = render({:partial => 'common/download_button'}, {:link => 'https://play.google.com/store/apps/details?id=se.leap.bitmaskclient', :text => 'Install for Android'})
-
-.p.non-android
-  %a(href='https://play.google.com/store/apps/details?id=se.leap.bitmaskclient' alt='download')
-    %img(src='/assets/qr/market-se.leap.bitmaskclient.png')
-
-%h2 Download app
-
-%p Alternately, you can download the Bitmask app directly from this website. You will need to enabled the option <b>Settings > Security > Unknown Sources</b> on your device for this method to work.
-
-.p.android
-  = render({:partial => 'common/download_button'}, {:link => 'https://dl.bitmask.net/client/android/Bitmask-Android-latest.apk', :text => 'Download for Android'})
-
-.p.non-android
-  %a(href='https://dl.bitmask.net/client/android/Bitmask-Android-latest.apk' alt='download')
-    %img(src='/assets/qr/dl.bitmask.net-bitmask-android-latest.png')
-
-%h2 Download other versions
-
-%p
-  If you want to install an old version of Bitmask, you can <a href="https://dl.bitmask.net/client/android/">browse all releases</a>.
diff --git a/pages/android/en.text b/pages/android/en.text
new file mode 100644
index 0000000..6418162
--- /dev/null
+++ b/pages/android/en.text
@@ -0,0 +1,32 @@
+@title = "Bitmask for Android"
+@nav_title = "Android"
+
+<script>
+  $(document).ready(function() {
+    if (navigator.userAgent.toLowerCase().indexOf("android") > -1) {
+      $('.non-android').hide();
+    }
+  });
+</script>
+
+<%= render({:partial => 'common/notice'}, {:type => 'info', :text => '<b>NOTE:</b> Bitmask for Android does not yet support encrypted email.'}) %>
+
+h2. Install from Google Play
+
+You can search for "Bitmask" in the Google Play store or use this link:
+
+p(android). <%= render({:partial => 'common/download_button'}, {:link => 'https://play.google.com/store/apps/details?id=se.leap.bitmaskclient', :text => 'Install for Android'}) %>
+
+p(non-android). !/assets/qr/market-se.leap.bitmaskclient.png!:https://play.google.com/store/apps/details?id=se.leap.bitmaskclient
+
+h2. Download app
+
+Alternately, you can download the Bitmask app directly from this website. You will need to enabled the option <b>Settings > Security > Unknown Sources</b> on your device for this method to work.
+
+p(android). <%= render({:partial => 'common/download_button'}, {:link => 'https://dl.bitmask.net/client/android/Bitmask-Android-latest.apk', :text => 'Download for Android'}) %>
+
+p(non-android). !/assets/qr/dl.bitmask.net-bitmask-android-latest.png!:https://dl.bitmask.net/client/android/Bitmask-Android-latest.apk
+
+h2. Download other versions
+
+If you want to install an old version of Bitmask, you can [[browse all releases => https://dl.bitmask.net/client/android/]].
diff --git a/pages/common/_notice.haml b/pages/common/_notice.haml
new file mode 100644
index 0000000..dc15c96
--- /dev/null
+++ b/pages/common/_notice.haml
@@ -0,0 +1,9 @@
+.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/pages/linux/en.md b/pages/linux/en.text
index 313af63..718b263 100644
--- a/pages/linux/en.md
+++ b/pages/linux/en.text
@@ -1,55 +1,58 @@
-- @title = 'Bitmask for Linux'
-- @nav_title = 'Linux'
+@title = 'Bitmask for Linux'
+@nav_title = 'Linux'
 
-<%= render :partial => 'notice' %>
+<%= render({:partial => 'common/notice'}, {:type => 'info', :text => '<b>NOTE:</b> Encrypted email support in Bitmask is still experimental.'}) %>
 
-## Install as packages
+h2. Install as packages
 
 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.
 
-### Ubuntu 14.04 (Trusty Tahr)
+h2. Ubuntu 14.04 (Trusty Tahr)
 
 <%= render({:partial => 'via_packages'}, {:distro => 'trusty'}) %>
 
-### Debian 7.0 (Wheezy)
+h3. Debian 7.0 (Wheezy)
 
 <%= render({:partial => 'via_packages'}, {:distro => 'wheezy', :os => 'debian'}) %>
 
-### Debian 8.0 (Jessie)
+h3. Debian 8.0 (Jessie)
 
 <%= render({:partial => 'via_packages'}, {:distro => 'jessie', :os => 'debian'}) %>
 
-## Install stand-alone bundle
+h2. Install stand-alone bundle
 
 Alternately, you can run Bitmask from a stand alone bundle. This is useful if want to run Bitmask from a thumb drive. The bundle should work on most recent Linux distributions that are derived from Debian (e.g. Ubuntu, Mint, etc).
 
-There are several disadvantages to the stand-alone bundle:
+There are two disadvantages to the stand-alone bundle:
 
-* Installing via the bundle takes up more space.
 * The Bitmask app will be less well integrated with the desktop environment.
 * Running from the bundle is slower to start than via packages.
-* You will not get automatic updates running the stand alone bundle.
+
+Optionally, you can [[authenticate the signature => signature-verification]] for the Bitmask files before you run them.
 
 How do you tell if you running a 32 bit or 64 bit kernel? Run the following command:
 
-    uname -m
+bc. uname -m
 
 If the result is:
 
-* `x86_64`, you have **64 bit**
-* `i686`, you have **32 bit**
-* `i386`, you have **32 bit**
+* @x86_64@, you have *64 bit*
+* @i686@, you have *32 bit*
+* @i386@, you have *32 bit*
 
-### 32 bit kernel
+h3. 32 bit kernel
 
 <%= render({:partial => 'common/download_button'}, {:link => 'https://dl.bitmask.net/client/linux/Bitmask-linux32-latest.tar.bz2', :text => 'Download 32 bit'}) %>
 
-### 64 bit kernel
+[[Signature file => https://dl.bitmask.net/client/linux/Bitmask-linux32-latest.tar.bz2.asc]]
+
+h3. 64 bit kernel
 
 <%= render({:partial => 'common/download_button'}, {:link => 'https://dl.bitmask.net/client/linux/Bitmask-linux64-latest.tar.bz2', :text => 'Download 64 bit'}) %>
 
-### Other options
+[[Signature file => https://dl.bitmask.net/client/linux/Bitmask-linux64-latest.tar.bz2.asc]]
+
+h3. Other options
 
-If you want to install an old or development version of Bitmask, you can [browse all releases.](https://dl.bitmask.net/client/linux/)
+If you want to install an old or development version of Bitmask, you can [[browse all releases => https://dl.bitmask.net/client/linux/]].
 
-<%= render({:partial => 'common/email'}) %>
diff --git a/pages/mac/en.md b/pages/mac/en.text
index 495bf24..1a37a97 100644
--- a/pages/mac/en.md
+++ b/pages/mac/en.text
@@ -1,16 +1,17 @@
 - @title = "Bitmask for Mac OS"
 - @nav_title = 'Mac OS'
 
-## Download latest version
+h2. Download latest version
 
 Bitmask requires Mountain Lion or newer.
 
 <%= render({:partial => 'common/download_button'}, {:link => 'https://dl.bitmask.net/client/osx/Bitmask-OSX-latest.dmg', :text => 'Download for Mac OS'}) %>
 
+Optionally, you can [[authenticate the signature => signature-verification]] for the Bitmask .dmg file using [[this signature file => https://dl.bitmask.net/client/osx/Bitmask-OSX-latest.dmg.asc]].
+
 Once the file `Bitmask-OSX-latest.dmg` has been saved to your computer, mount the `.dmg` image and drag the `Bitmask` icon to your `Applications` folder.
 
-## Download other versions
+h2. Download other versions
 
-If you want to install an old or experimental version of Bitmask, you can [browse all releases.](https://dl.bitmask.net/client/osx/)
+If you want to install an old or experimental version of Bitmask, you can [[browse all releases => https://dl.bitmask.net/client/osx/]].
 
-<%= render({:partial => 'common/email'}) %>
diff --git a/pages/signature-verification/en.text b/pages/signature-verification/en.text
new file mode 100644
index 0000000..0f72ddf
--- /dev/null
+++ b/pages/signature-verification/en.text
@@ -0,0 +1,81 @@
+@title = 'Signature Verification'
+
+Many of the files available for download from this site have been signed. This page will walk you through what you need to do in order to verify these signatures. This process is entirely optional.
+
+h2. Import LEAP's key
+
+All the files have been signed with the "LEAP archive signing key". The first step is to import this key into your local keyring. These instructions will use @gpg@, a free implementation of OpenPGP that works on Mac, Windows, and Linux.
+
+h3. Option 1 - wget
+
+The easiest way to get the LEAP archive signing key is to just download it from the bitmask.net website and import into your keyring:
+
+bc. wget -O- https://dl.bitmask.net/apt.key | gpg --import
+
+You should see output that looks like this:
+
+bc. gpg: key 0x1E34A1828E207901: public key "LEAP archive signing key <sysdev@leap.se>" imported
+gpg: Total number processed: 1
+gpg:               imported: 1  (RSA: 1)
+gpg: 3 marginal(s) needed, 1 complete(s) needed, classic trust model
+gpg: depth: 0  valid:   4  signed:   7  trust: 0-, 0q, 0n, 0m, 0f, 4u
+gpg: depth: 1  valid:   7  signed:  22  trust: 6-, 1q, 0n, 0m, 0f, 0u
+
+h3. Option 2 - search keyservers
+
+Alternately, you can import the LEAP archive signing key by fetching from a keyserver:
+
+bc. gpg --recv-key 1E453B2CE87BEE2F7DFE99661E34A1828E207901
+
+If you want to make the keyserver connection use TLS, you can use the sks-keyserver pool. To use this keyserver pool, you will need to [[download the sks-keyservers.net CA => https://sks-keyservers.net/sks-keyservers.netCA.pem]] and save it somewhere on your machine. Additionally, you can [[verify the certificate’s finger print => https://sks-keyservers.net/verify_tls.php]].
+
+Once you have downloaded the SKS keyserver pool CA, the @recv-key@ command looks like this:
+
+bc. gpg --keyserver hkps://pool.sks-keyservers.net --keyserver-options 'ca-cert-file=sks-keyservers.netCA.pem' --recv-key 1E453B2CE87BEE2F7DFE99661E34A1828E207901
+
+Assuming you saved the CA certificate to the file @sks-keyservers.netCA.pem@. For more information, see this [[OpenPGP best practices page => https://help.riseup.net/en/gpg-best-practices]].
+
+There is absolutely no guarentee that the key just imported with @recv-key@ is the one you just requested. To confirm, you need to manually check the fingerprint:
+
+bc. gpg --fingerprint 1E453B2CE87BEE2F7DFE99661E34A1828E207901
+
+Which should produce output like so:
+
+bc. pub   4096R/0x1E34A1828E207901 2013-02-06 [expires: 2015-02-07]
+      Key fingerprint = 1E45 3B2C E87B EE2F 7DFE  9966 1E34 A182 8E20 7901
+uid                 [  undef ] LEAP archive signing key <sysdev@leap.se>
+
+
+h2. Download signature file
+
+The signature file for each download has the same name as the file but with @.asc@ appended.
+
+For a listing of the available signature files, see:
+
+* [[All Android files => https://dl.bitmask.net/client/android/]]
+* [[All Linux files => https://dl.bitmask.net/client/linux/]]
+* [[All Mac files => https://dl.bitmask.net/client/mac/]]
+* [[All Windows files => https://dl.bitmask.net/client/windows/]]
+
+Make sure you put the signature file and the download you want to authenticate in the same directory, and that they have the same name (other than the .asc suffix for the signature file).
+
+h2. Verify signature
+
+Now, just run this command:
+
+bc. gpg --verify FILE.asc
+
+Where FILE is the name of the download you want to authenticate.
+
+You should see some output like so:
+
+bc. gpg: Signature made Mon 15 Sep 2014 07:49:07 AM PDT
+gpg:                using RSA key 0x1E34A1828E207901
+gpg: Good signature from "LEAP archive signing key <sysdev@leap.se>" [unknown]
+gpg: WARNING: This key is not certified with a trusted signature!
+gpg:          There is no indication that the signature belongs to the owner.
+Primary key fingerprint: 1E45 3B2C E87B EE2F 7DFE  9966 1E34 A182 8E20 7901
+
+If you have trusted one of the keys that has signed the LEAP key, then you will not see the warning.
+
+If you do not see the text [@Good signature from "LEAP archive signing key <sysdev@leap.se>"@] then something is wrong and you should not run the application you downloaded.
\ No newline at end of file
diff --git a/pages/windows/en.haml b/pages/windows/en.haml
deleted file mode 100644
index bb2b2e4..0000000
--- a/pages/windows/en.haml
+++ /dev/null
@@ -1,19 +0,0 @@
-- @title = "Bitmask for Windows"
-
-%h1 Bitmask for Windows
-
-.row
-  .col-sm-8.col-sm-offset-2
-    .p.alert.alert-danger
-      %i.fa.fa-warning
-      <b>WARNING:</b> Currently, the Windows build is very buggy and is not officially supported. If you know Windows programming, we could <a href="https://leap.se/get-involved">use your help</a>.
-
-%h2 Download latest version
-
-= render({:partial => 'common/download_button'}, {:link => 'https://dl.bitmask.net/client/windows/Bitmask-win32-latest.zip', :text => 'Download for Windows'})
-
-%h2 Download other versions
-
-%p If you want to install an old version of Bitmask, you can <a href="https://dl.bitmask.net/client/windows/">browse all releases</a>.
-
-= render({:partial => 'common/email'})
diff --git a/pages/windows/en.text b/pages/windows/en.text
new file mode 100644
index 0000000..87743c3
--- /dev/null
+++ b/pages/windows/en.text
@@ -0,0 +1,15 @@
+@title = "Bitmask for Windows"
+
+h1. Bitmask for Windows
+
+<%= render({:partial => 'common/notice'}, {:type => 'warning', :text => '<b>WARNING:</b> Currently, the Windows build is very buggy and is not officially supported. If you know Windows programming, we could <a href="https://leap.se/get-involved">use your help</a>.'}) %>
+
+h2. Download latest version
+
+<%= render({:partial => 'common/download_button'}, {:link => 'https://dl.bitmask.net/client/windows/Bitmask-win32-latest.zip', :text => 'Download for Windows'}) %>
+
+Optionally, you can [[authenticate the signature => signature-verification]] for the Bitmask .zip file using [[this signature file => https://dl.bitmask.net/client/osx/Bitmask-win32-latest.zip.asc]].
+
+h2. Download other versions
+
+If you want to install an old version of Bitmask, you can <a href="https://dl.bitmask.net/client/windows/">browse all releases</a>.