copying over the docs we revamped in bitmask_help

I had misunderstood the direction of the sync.sh script, so copying here
things manually.

2 files changed, 66 insertions, 67 deletions

diff --git a/pages/linux/debs/en.md b/pages/linux/debs/en.md
new file mode 100644
index 0000000..b0cac54
--- /dev/null
+++ b/pages/linux/debs/en.md
@@ -0,0 +1,51 @@
+@title = 'Bitmask debian/ubuntu repositories'
+@nav_title = 'Bitmask debian/ubuntu repositories'
+@this.toc = false
+
+# Supported distributions
+
+We provide packages for **ubuntu** ``zesty`` (17.04), **debian** ``stretch`` (*stable*) and ``buster`` (*testing*).
+Try the [[ standalone bundles => /en/install/linux/#standalone-bundles ]] if your distribution is not there.
+
+Change ``stretch`` in the following instructions for the one you are using:
+
+```
+sudo apt install leap-archive-keyring
+sudo sh -c 'echo "deb http://deb.leap.se/client stretch release" > /etc/apt/sources.list.d/bitmask.list'
+sudo apt update && sudo apt install bitmask
+```
+
+# Release, staging, or master?
+
+Above, the ``release`` component tracks only the **stable** releases. That is probably what you want to use.
+
+If you want **alpha** versions and **release candidates**, use ``staging`` in your ``/etc/apt/sources.list.d/bitmask.list`` file, like this:
+
+```
+sudo gedit /etc/apt/sources.list.d/bitmask.list
+deb http://deb.leap.se/client stretch staging
+```
+
+If you want to have the bleeding edge, use ``master`` instead. Beware that this can be unstable at times:
+
+```
+deb http://deb.leap.se/client stretch master
+```
+
+
+# Removing the packages 
+
+If you want to remove bitmask from your system:
+
+```
+sudo -s
+apt remove bitmask leap-archive-keyring
+rm /etc/apt/sources.list.d/bitmask.list
+```
+
+You probably also want to wipe all the files in your local user account, in:
+
+
+```
+~/.config/leap/
+```
diff --git a/pages/linux/en.md b/pages/linux/en.md
index 1b8942e..e10630c 100644
--- a/pages/linux/en.md
+++ b/pages/linux/en.md
@@ -1,79 +1,27 @@
-@title = 'Bitmask for GNU/Linux'
+@title = 'Bitmask for GNU/Linux. Version 0.10.0'
 @nav_title = 'Linux'
+@this.toc = false
 
-<%= render({:partial => 'common/notice'}, {:type => 'info', :text => '<b>NOTE:</b> Encrypted email support in Bitmask is still experimental.'}) %>
+# Standalone Bundles
 
-# Introduction
+<%= render({:partial => 'common/download_button'}, {:link => 'https://dl.bitmask.net/client/linux/stable/Bitmask-linux64-latest.tar.gz', :text => 'Download (64 bit)'}) %>
 
-There are two ways to install Bitmask on Linux, as a **package** or as a stand-alone **bundle**.
+The [[signature => https://dl.bitmask.net/client/linux/stable/Bitmask-linux64-latest.tar.gz.asc]] can be [[verified => signature-verification]] using LEAP's archive signing key. You can browse [[the downloads => https://dl.bitmask.net/client/linux]], including release candidates.
 
-* **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.
+If you want to try the latest code, you can download the [[latest bundle => https://0xacab.org/leap/bitmask-dev/-/jobs/artifacts/master/download?job=bitmask_latest_bundle]] that is built automatically for every change.
 
-To find out which distribution you are running, open a terminal and type in the following:
 
-    cat /etc/issue
+# Debian/ubuntu
 
-# Stand Alone Bundle
+```
+sudo apt install leap-archive-keyring
+sudo sh -c 'echo "deb http://deb.leap.se/client stretch release" > /etc/apt/sources.list.d/bitmask.list'
+sudo apt update && sudo apt install bitmask
+```
 
-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]].
+Change ``stretch`` for ``zesty`` or ``buster``, according to your distro. Read more about [[ our different repositories => debs ]] for deb packages.
 
-Our most recent stable release is only available for a 64 bit kernel. 
 
-<table class="table">
-<tr><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>
-</table>
+# Other
 
-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]].
-
-# 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 (Oldstable/Jessie)
-
-<%= render({:partial => 'via_packages'}, {:distro => 'jessie', :os => 'debian', :backport => 'true'}) %>
-
-### Debian Stable (Stretch)
-
-<%= render({:partial => 'via_packages'}, {:distro => 'testing', :os => 'debian'}) %>
-
-### Debian Unstable (Sid)
-
-<%= render({:partial => 'via_packages'}, {:distro => 'sid', :os => 'debian'}) %>
-
-# 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.
-
-# Latest builds
-For the more adventurous we make stand alone bundle builds available after each commit or merge. Currently best tested again cdev.bitmask.net, because of ongoing changes of Soledad. 
-
-  <%= render({:partial => 'common/download_button'}, {:link => 'https://0xacab.org/leap/bitmask-dev/builds/artifacts/master/download?job=bitmask_latest_bundle', :text => 'Download latest experimental bundle'}) %>
+If none of the above methods works for you, you can try to install [[via pip => http://bitmask.readthedocs.io/en/latest/installation/index.html#with-pip]] or [[from source => http://bitmask.readthedocs.io/en/latest/hacking/devenv.html]], or get in contact with us if you want to package Bitmask for some other distribution.