summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2017-10-03 03:39:26 +0200
committerKali Kaneko <kali@leap.se>2017-10-04 01:56:49 +0200
commit0ede8c83b372cb17c65158c31405e66580ce8fd7 (patch)
tree88750403300c9a5f0fb99dd72a297368e3479670
parent418af4ac6b35f48c899c4ebc17c5913ab91cbfc7 (diff)
some further simplification
-rw-r--r--pages/install/linux/debs/en.md4
-rw-r--r--pages/install/linux/en.md14
2 files changed, 8 insertions, 10 deletions
diff --git a/pages/install/linux/debs/en.md b/pages/install/linux/debs/en.md
index d2ea72e..37ddb3f 100644
--- a/pages/install/linux/debs/en.md
+++ b/pages/install/linux/debs/en.md
@@ -11,7 +11,7 @@ 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-qt bitmask-vpn bitmask-mail
+sudo apt update && sudo apt install bitmask
```
# Sources for stable, staging and master
@@ -38,7 +38,7 @@ If you want to remove bitmask from your system:
```
sudo -s
-apt remove bitmask-qt leap-archive-keyring
+apt remove bitmask leap-archive-keyring
rm /etc/apt/sources.list.d/bitmask.list
```
diff --git a/pages/install/linux/en.md b/pages/install/linux/en.md
index eddffda..d1390ec 100644
--- a/pages/install/linux/en.md
+++ b/pages/install/linux/en.md
@@ -1,24 +1,22 @@
@title = 'Bitmask for GNU/Linux. Version 0.10.0'
@nav_title = 'Linux'
+@this.toc = false
# Standalone Bundles
-<%= render({:partial => 'common/download_button'}, {:link => 'https://dl.bitmask.net/client/linux/stable/Bitmask-linux64-latest.tar.gz', :text => 'Download Stable Bundle (64 bit)'}) %>
+<%= render({:partial => 'common/download_button'}, {:link => 'https://dl.bitmask.net/client/linux/stable/Bitmask-linux64-latest.tar.gz', :text => 'Download (64 bit)'}) %>
-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 [[all the downloads => https://dl.bitmask.net/client/linux]], including release candidates.
+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.
-# Experimental bundles
+If you want to try the latest code, you can download the [[latest bundles => https://0xacab.org/leap/bitmask-dev/builds/artifacts/master/download?job=bitmask_latest_bundle]] that are built automatically for every change.
-If you want to try the latest code, new bundles are continously built.
-
- <%= render({:partial => 'common/download_button'}, {:link => 'https://0xacab.org/leap/bitmask-dev/builds/artifacts/master/download?job=bitmask_latest_bundle', :text => 'Download Experimental Bundle (64 bit)'}) %>
# Debian/ubuntu
```
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-qt bitmask-vpn bitmask-mail
+sudo apt update && sudo apt install bitmask
```
Change ``stretch`` for ``zesty`` or ``buster``, according to your distro. Read more about [[ our different repositories => debs ]] for deb packages.
@@ -26,4 +24,4 @@ Change ``stretch`` for ``zesty`` or ``buster``, according to your distro. Read m
# Other
-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#installing-with-pip]] or [[from source => http://bitmask.readthedocs.io/en/latest/hacking/index.html#devenv]], or get in contact with us if you want to package Bitmask for some other distribution.
+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.