1 files changed, 92 insertions, 29 deletions
diff --git a/pages/install/linux/en.md b/pages/install/linux/en.md
index 81ed467..9f0b789 100644
--- a/pages/install/linux/en.md
+++ b/pages/install/linux/en.md
@@ -1,57 +1,120 @@
-@title = 'Bitmask for GNU/Linux. Version 0.10.7'
+@title = "Bitmask for Linux"
 @nav_title = 'Linux'
-@this.toc = false
 
-# Standalone Bundles
+# Bitmask is now RiseupVPN
 
-<%= render({:partial => 'common/download_button'}, {:link => 'https://dl.bitmask.net/client/linux/stable/Bitmask-linux64-latest.tar.gz', :text => 'Download (64 bit)'}) %>
+We've deprecated Bitmask for all desktop clients. We've rewritten the clients and offer provider branded versions. You can try the new client by installing RiseupVPN.
 
-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.
+## Requirements
 
+RiseupVPN is officially distributed as a `snap` package. Knowing that not everybody likes snap, we produce `deb` packages as well and we do our best to keep them up to date. Currently we don't have the capacities to offer packages for other Linux distributions and need community support for it!
+You can get [[in contact with us => https://0xacab.org/leap/bitmask-vpn/-/issues/new]], if you want to help with packaging!
+RiseupVPN is currently tested on **Ubuntu LTS** (18.04) and **Debian Stable**. If you have a different release, it may or may not work.
 
-# Debian/Ubuntu
+## Snap Installation
+
+If you use Ubuntu, snap is already installed. Otherwise, run:
 
-## For Ubuntu Bionic Beaver (18.04) and Debian testing (buster):
 ```
-sudo apt install leap-archive-keyring lsb-release
-sudo sh -c 'echo "deb http://deb.leap.se/client release $(lsb_release -sc)" > /etc/apt/sources.list.d/bitmask.list'
-sudo apt update && sudo apt install bitmask
+sudo apt install snapd gnome-software-plugin-snap
 ```
 
-## For Debian stable (9.0, Stretch): 
+Then, search for **RiseupVPN** in the **Software Center** or click on this link:
+
+<a class="btn btn-default btn-lg" href="snap://riseup-vpn">
+  <i class="fa fa-reply-all"></i>
+  Open RiseupVPN in Software Center
+</a>
 
-You need to enable `stretch-backports` to install the latest `leap-archive-keyring` package (skip this step
-if you already have `stretch-backports` enabled):
+If the link above does not work for you, you can also install via the command line:
 
 ```
-sudo sh -c 'echo "deb http://deb.debian.org/debian stretch-backports main" > /etc/apt/sources.list.d/stretch-backports.list'
-sudo apt update && sudo apt install -t stretch-backports leap-archive-keyring
+sudo snap install --classic riseup-vpn
 ```
+If you get an error stating that "python" is missing from /usr/bin/env, you need to install python. This is the case for instance in Lubuntu, at least since version 19.04.
+
+## Package Installation
+
+Run the following commands in a terminal to install the Debian Stable package.
+
+       sudo apt install leap-archive-keyring
+       echo "deb http://deb.leap.se/client release buster" | sudo tee -a /etc/apt/sources.list.d/leap.list
+       sudo apt update
+       sudo apt install riseup-vpn
+       
+## Download other versions
+
+You can [[browse all releases => https://dl.bitmask.net/RiseupVPN/linux/]] for old or experimental downloads.
+
+You should install the latest stable release. Downloads tagged with "RC" are "Release Candidates" and receive frequent experimental updates that may break the application.
+
+
+## Troubleshooting
+
+### Bug Reports and Feature Requests
+
+RiseupVPN is built using a free software program called <b>bitmask-vpn</b>.
+
+**Step 1:** [[Search to see => https://0xacab.org/leap/bitmask-vpn/issues]] if the bug has already been reported.
+
+**Step 2:** [[Register an account => https://0xacab.org/users/sign_in]] with [[0xacab.org => https://0xacab.org]] and log in.
+
+**Step 3:** Create a [[new bug report or feature request => https://0xacab.org/leap/bitmask-vpn/issues/new]].
+
+Please include the following information in your bug report:
+
+* Steps to reproduce the bug
+* What is the expected behaviour and what do you see
+* A screenshot if it is something visual
+* Your linux distribution and its version
+* The log of the program
+
+### Get the logs
+
+The log of RiseupVPN is located in your home folder:
 
 ```
-sudo sh -c 'echo "deb http://deb.leap.se/client release stretch" > /etc/apt/sources.list.d/bitmask.list'
-sudo apt update && sudo apt install bitmask
+~/.config/leap/systray.log
 ```
 
-## For Ubuntu oldstable (17.10, Artful):
+When reporting a bug it is very useful to include the log file.
+
+### Force quit
+
+If anything stops working, run these commands and then try again:
 
 ```
-sudo apt install wget
-sudo sh -c 'echo "deb http://deb.leap.se/client release artful" > /etc/apt/sources.list.d/bitmask.list'
-wget https://downloads.leap.se/platform/leap-archive-signing-keys.asc -O /tmp/leap-archive-signing-keys.asc
-sha256sum /tmp/leap-archive-signing-keys.asc
+sudo pkill -e -f riseup-vpn
 ```
 
-The latest command will output a checksum that you need to compare with this one: `940aed61f2bd9db8246c4855a2239a7ed5b847894de89e25bebb163055f85da9`
-Please *only* proceed if the checksums are identical !
+### Won't start
+
+If the launcher icon does not work, you can run RiseupVPN from the command line in order to identify the problem:
 
 ```
-sudo apt-key add /tmp/leap-archive-signing-keys.asc
-sudo apt update && sudo apt install bitmask
+/snap/bin/riseup-vpn.launcher
 ```
 
-Read more about [[ our different repositories => debs ]] for deb packages.
+Any problem starting will be displayed on the terminal.
+
+### Test a pre-release version
 
-# Other
+If you want to help us test a development, pre-release version of RiseupVPN, you can install it using this command:
+
+```
+sudo snap install --classic --beta riseup-vpn
+```
+
+### Remove PID file
+
+Sometimes RiseupVPN will fail to start if it thinks another version is already running.
+
+If you get this error, run these commands:
+
+```
+sudo pkill -e -f riseup-vpn
+test -f ~/.config/leap/systray.pid && rm -v ~/.config/leap/systray.pid
+```
 
-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.
+## Source code
+The code for the Linux client can be found [[here => https://0xacab.org/leap/bitmask-vpn]].