updated install instructions

5 files changed, 115 insertions, 158 deletions

diff --git a/amber/locales/en.yml b/amber/locales/en.yml
index acd00b0..585b301 100644
--- a/amber/locales/en.yml
+++ b/amber/locales/en.yml
@@ -46,3 +46,4 @@ en:
   #
   to_install: To install
   to_remove: To remove
+  upgrade_os: When upgrading to this OS
diff --git a/pages/install/linux/_via_packages.html.haml b/pages/install/linux/_via_packages.html.haml
index ca009e2..3c0dae2 100644
--- a/pages/install/linux/_via_packages.html.haml
+++ b/pages/install/linux/_via_packages.html.haml
@@ -7,20 +7,31 @@
       sudo -s
       echo "deb http://deb.bitmask.net/debian #{@locals[:distro]} main" > /etc/apt/sources.list.d/bitmask.list
       wget -O- https://dl.bitmask.net/apt.key | apt-key add -
-      apt-get update
-      apt-get install bitmask leap-archive-keyring
+      apt update
+      apt install bitmask leap-archive-keyring
 
   %p.b= t :to_remove
 
   %pre
     :preserve
       sudo -s
-      apt-get remove bitmask leap-archive-keyring
+      apt remove bitmask leap-archive-keyring
       apt-key del 0x1E34A1828E207901
       rm /etc/apt/sources.list.d/bitmask.list
 
+  %p.b= t :upgrade_os
+
+  %pre
+    :preserve
+      sudo -s
+      echo "deb http://deb.bitmask.net/debian #{@locals[:distro]} main" > /etc/apt/sources.list.d/bitmask.list
+      apt update
+      apt upgrade
+
 - else
 
+  - prior = {"xenial" => "wily", "wily" => "vivid", "vivid" => "utopic"}
+
   %p.b= t :to_install
 
   %pre
@@ -28,14 +39,25 @@
       sudo -s
       add-apt-repository "deb http://deb.bitmask.net/debian #{@locals[:distro]} main"
       wget -O- https://dl.bitmask.net/apt.key | apt-key add -
-      apt-get update
-      apt-get install bitmask leap-archive-keyring
+      apt update
+      apt install bitmask leap-archive-keyring
 
   %p.b= t :to_remove
 
   %pre
     :preserve
       sudo -s
-      apt-get remove bitmask leap-archive-keyring
+      apt remove bitmask leap-archive-keyring
       apt-key del 0x1E34A1828E207901
       add-apt-repository --remove "deb http://deb.bitmask.net/debian #{@locals[:distro]} main"
+
+  %p.b= t :upgrade_os
+
+  %pre
+    :preserve
+      sudo -s
+      add-apt-repository --remove "deb http://deb.bitmask.net/debian #{prior[@locals[:distro]]} main"
+      add-apt-repository "deb http://deb.bitmask.net/debian #{@locals[:distro]} main"
+      apt update
+      apt upgrade
+
diff --git a/pages/install/linux/en.md b/pages/install/linux/en.md
new file mode 100644
index 0000000..6cdf26e
--- /dev/null
+++ b/pages/install/linux/en.md
@@ -0,0 +1,82 @@
+@title = 'Bitmask for GNU/Linux'
+@nav_title = 'Linux'
+
+<%= render({:partial => 'common/notice'}, {:type => 'info', :text => '<b>NOTE:</b> Encrypted email support in Bitmask is still experimental.'}) %>
+
+# Introduction
+
+There are two ways to install Bitmask on Linux, as a **package** or as a stand-alone **bundle**.
+
+* **Packages**: run faster, and are better integrated with the desktop environment.
+* **Bundles**: do not require root, and can be installed on a portable thumb drive.
+
+To find out which distribution you are running, open a terminal and type in the following:
+
+    cat /etc/issue
+
+# Ubuntu Packages
+
+### Ubuntu 16.04 LTS (Xenial Xerus)
+
+<%= render({:partial => 'via_packages'}, {:distro => 'xenial'}) %>
+
+### Ubuntu 15.10 (Wily Werewolf)
+
+<%= render({:partial => 'via_packages'}, {:distro => 'wily'}) %>
+
+### Ubuntu 15.04 (Vivid Vervet)
+
+<%= render({:partial => 'via_packages'}, {:distro => 'vivid'}) %>
+
+# Debian Packages
+
+If you are using Wheezy, then you will need to use the bundle method.
+
+### Debian 8 (Stable/Jessie)
+
+<%= render({:partial => 'via_packages'}, {:distro => 'jessie', :os => 'debian'}) %>
+
+### Debian Testing (Stretch)
+
+<%= render({:partial => 'via_packages'}, {:distro => 'testing', :os => 'debian'}) %>
+
+### Debian Unstable (Sid)
+
+<%= render({:partial => 'via_packages'}, {:distro => 'sid', :os => 'debian'}) %>
+
+### Stand Alone Bundle
+
+The Bitmask stand alone bundle should work on most recent versions of Debian and Ubuntu. You are welcome to try the bundle on other distributions, it sometimes works. Alternately, you can [[build it from source => https://leap.se/en/docs/get-involved/source]].
+
+First determine if you running a 32 bit or 64 bit kernel by running the following command:
+
+    uname -m
+
+<table class="table"><tr><td>
+  If the result is x86_64, you have <b>64 bit</b>
+</td><td>
+  <%= render({:partial => 'common/download_button'}, {:link => 'https://dl.bitmask.net/client/linux/stable/Bitmask-linux64-latest.tar.gz', :text => 'Download 64 bit'}) %>
+</td><td>
+  [[Signature file => https://dl.bitmask.net/client/linux/stable/Bitmask-linux64-latest.tar.gz.asc]]
+</td></tr><tr><td>
+  If the result is: i686 or i386, you have <b>32 bit</b>
+</td><td>
+  <%= render({:partial => 'common/download_button'}, {:link => 'https://dl.bitmask.net/client/linux/stable/Bitmask-linux32-latest.tar.gz', :text => 'Download 32 bit'}) %>
+</td><td>
+  [[Signature file => https://dl.bitmask.net/client/linux/stable/Bitmask-linux32-latest.tar.gz.asc]]
+</td></tr></table>
+
+Optionally, you can [[authenticate the signature => signature-verification]] using LEAP's archive signing key.
+
+If you want to try an experimental or release candidate versions of Bitmask, you can browse the [[full list of available downloads => https://dl.bitmask.net/client/linux]].
+
+# Upgrading
+
+**From stand-alone bundles**: Bitmask should upgrade itself automatically (for versions equal or later than 0.7.0). If you are running a version prior to 0.7.0, you can download the new bundle and copy the "config" folder from the old bundle directory.
+
+**From packages**: If you are running from packages, then you can trigger an update like so:
+
+    apt-get update
+    apt-get dist-upgrade
+
+**NOTE:** When upgrading the version of your operating system, you must also follow the directions listed under "When upgrading the OS" above.
\ No newline at end of file
diff --git a/pages/install/linux/en.text b/pages/install/linux/en.text
deleted file mode 100644
index f7c762f..0000000
--- a/pages/install/linux/en.text
+++ /dev/null
@@ -1,152 +0,0 @@
-@title = 'Bitmask for GNU/Linux'
-@nav_title = 'Linux'
-
-<%= render({:partial => 'common/notice'}, {:type => 'info', :text => '<b>NOTE:</b> Encrypted email support in Bitmask is still experimental.'}) %>
-
-h2. Introduction
-
-For GNU/Linux, we recommend following the installation method detailed below based on what distribution you are running.
-
-To find out which distribution you are running, open a terminal and type in the following:
-
-bc. cat /etc/issue
-
-h2. Ubuntu
-
-There are two ways to install bitmask on Ubuntu, via packages and via bundles. If you are comfortable with the command line, we recommend using packages when available, otherwise use the bundle. If installed as a package, Bitmask will run faster, be better integrated in the desktop environment, and will be faster to start.
-
-For Ubuntu, we only provide packages for Wily Werewolf (15.10) and Vivid Vervet (15.04).
-
-If you are using Trusty, then you will need to use the bundle method.
-
-We are sorry, Precise Penguin (12.04) is not working at this time.
-
-h3. Bundle
-
-First determine if you running a 32 bit or 64 bit kernel by running the following command:
-
-bc. uname -m
-
-If the result is:
-
-* @x86_64@, you have *64 bit*
-* @i686@, you have *32 bit*
-* @i386@, you have *32 bit*
-
-Then download the appropriate version below:
-
-<%= render({:partial => 'common/download_button'}, {:link => 'https://dl.bitmask.net/client/linux/stable/Bitmask-linux64-latest.tar.gz', :text => 'Download 64 bit'}) %>
-
-[[Signature file => https://dl.bitmask.net/client/linux/stable/Bitmask-linux64-latest.tar.gz.asc]]
-
-<%= render({:partial => 'common/download_button'}, {:link => 'https://dl.bitmask.net/client/linux/stable/Bitmask-linux32-latest.tar.gz', :text => 'Download 32 bit'}) %>
-
-[[Signature file => https://dl.bitmask.net/client/linux/stable/Bitmask-linux32-latest.tar.gz.asc]]
-
-If you want to make sure that the Bitmask wasn't messed with during download you can [[authenticate the signature => signature-verification]].
-
-*NOTE:*
-  Stand-alone bundles are useful if want to run Bitmask from a thumb drive. Or from a distribution which we don't support with packages.
-  There are two disadvantages to the stand-alone bundle:
-    * The Bitmask app will be less well integrated with the desktop environment.
-    * Running from the bundle is slower to start than via packages.
-
-h3. Packages
-
-*Wily Werewolf (15.10)*
-
-<%= render({:partial => 'via_packages'}, {:distro => 'wily'}) %>
-
-*Vivid Vervet (15.04)*
-
-<%= render({:partial => 'via_packages'}, {:distro => 'vivid'}) %>
-
-h2. Debian
-
-There are two ways to install bitmask on Debian, via packages and via bundles. If you are comfortable with the command line, we recommend using packages when available, otherwise use the bundle. If installed as a package, Bitmask will run faster, be better integrated in the system, and will be kept up to date.
-
-For Debian, we only provide packages for Stable (Jessie/8), Testing (Stretch) and Unstable (Sid).
-
-If you are using Wheezy, then you will need to use the bundle method.
-
-h3. Bundle
-
-First determine if you running a 32 bit or 64 bit kernel by running the following command:
-
-bc. uname -m
-
-If the result is:
-
-* @x86_64@, you have *64 bit*
-* @i686@, you have *32 bit*
-* @i386@, you have *32 bit*
-
-Then download the appropriate version below:
-
-<%= render({:partial => 'common/download_button'}, {:link => 'https://dl.bitmask.net/client/linux/stable/Bitmask-linux64-latest.tar.gz', :text => 'Download 64 bit'}) %>
-
-[[Signature file => https://dl.bitmask.net/client/linux/stable/Bitmask-linux64-latest.tar.gz.asc]]
-
-<%= render({:partial => 'common/download_button'}, {:link => 'https://dl.bitmask.net/client/linux/stable/Bitmask-linux32-latest.tar.gz', :text => 'Download 32 bit'}) %>
-
-[[Signature file => https://dl.bitmask.net/client/linux/stable/Bitmask-linux32-latest.tar.gz.asc]]
-
-If you want to make sure that the Bitmask wasn't messed with during download you can [[authenticate the signature => signature-verification]].
-
-h3. Packages
-
-*Stable (Jessie/8)*
-
-<%= render({:partial => 'via_packages'}, {:distro => 'jessie', :os => 'debian'}) %>
-
-*Testing (Stretch)*
-
-<%= render({:partial => 'via_packages'}, {:distro => 'testing', :os => 'debian'}) %>
-
-*Unstable (Sid)*
-<%= render({:partial => 'via_packages'}, {:distro => 'sid', :os => 'debian'}) %>
-
-h2. Other
-
-Please note that we only provide support for the above versions of Debian and Ubuntu. You are welcome to try and get Bitmask running on another distribution. If you want to try, we recommend attempting to use the bundle (see below), or have a look at [[building it from source => https://leap.se/en/docs/get-involved/source]].
-
-First determine if you running a 32 bit or 64 bit kernel by running the following command:
-
-bc. uname -m
-
-If the result is:
-
-* @x86_64@, you have *64 bit*
-* @i686@, you have *32 bit*
-* @i386@, you have *32 bit*
-
-Then download the appropriate version below:
-
-<%= render({:partial => 'common/download_button'}, {:link => 'https://dl.bitmask.net/client/linux/stable/Bitmask-linux64-latest.tar.gz', :text => 'Download 64 bit'}) %>
-
-[[Signature file => https://dl.bitmask.net/client/linux/stable/Bitmask-linux64-latest.tar.gz.asc]]
-
-<%= render({:partial => 'common/download_button'}, {:link => 'https://dl.bitmask.net/client/linux/stable/Bitmask-linux32-latest.tar.gz', :text => 'Download 32 bit'}) %>
-
-[[Signature file => https://dl.bitmask.net/client/linux/stable/Bitmask-linux32-latest.tar.gz.asc]]
-
-If you want to make sure that the Bitmask wasn't messed with during download you can [[authenticate the signature => signature-verification]].
-
-h2. Upgrading
-
-*From stand-alone bundles*: Bitmask should upgrade itself automatically (for versions equal or later than 0.7.0). If you are running a version prior to 0.7.0, you can download the new bundle and copy the "config" folder from the old bundle directory.
-
-*From packages*: If you are running from packages, then you can trigger an update like so:
-
-bc. apt-get update
-apt-get dist-upgrade
-
-*NOTE:* When upgrading Ubuntu from 14.10 (Utopic) to 15.04 (Vivid), you may need to run this command again:
-
-bc. sudo add-apt-repository "deb http://deb.bitmask.net/debian vivid main"
-
-Similar is needed for the upgrade from 15.04 to 15.10 (Wily):
-
-bc. sudo add-apt-repository "deb http://deb.bitmask.net/debian wily main"
-
-This is because the Ubuntu upgrade process probably commented out all your prior custom repository lines in @/etc/apt/sources.list@.
diff --git a/pages/install/linux/ru.text b/pages/install/linux/ru.text
index aafa4fc..9b89027 100644
--- a/pages/install/linux/ru.text
+++ b/pages/install/linux/ru.text
@@ -22,6 +22,10 @@ h2. Установить как пакет
 
 Это рекомендуемый способ установки Bitmask. При установке в качестве пакета Bitmask будет работать быстрее, будет лучше интегрирована с системой, а также будет постоянно обновляться.
 
+h3. Ubuntu 16.04 (Xenial Xerus)
+
+<%= render({:partial => 'via_packages'}, {:distro => 'xenial'}) %>
+
 h3. Ubuntu 15.10 (Wily Werewolf)
 
 <%= render({:partial => 'via_packages'}, {:distro => 'wily'}) %>