summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2015-11-04 17:33:38 -0500
committerMicah Anderson <micah@riseup.net>2015-11-04 17:33:38 -0500
commit25e66023533b98fcca2b8519435abf875563191c (patch)
treefd192a1f27513187ea4282fdc6d1bf37c17b1776
parentc331c9549acc140b9978dc66c190786c28fd322f (diff)
remove the duplicated Other section, it will just be one
-rw-r--r--pages/linux/en.text81
1 files changed, 2 insertions, 79 deletions
diff --git a/pages/linux/en.text b/pages/linux/en.text
index 33f7f5f..fb10b8b 100644
--- a/pages/linux/en.text
+++ b/pages/linux/en.text
@@ -3,9 +3,9 @@
<%= render({:partial => 'common/notice'}, {:type => 'info', :text => '<b>NOTE:</b> Encrypted email support in Bitmask is still experimental.'}) %>
-h2. For GNU/Linux, please use one of the following options depending on what distribution you are running
+h2. Introduction
-h2. How do I know which GNU/Linux distribution I am running?
+For GNU/Linux, please use one of the following installation methods depending on what distribution you are running.
To find out which distribution you are running, opena terminal and type in the following:
@@ -65,45 +65,6 @@ Then download the appropriate version below:
If you want to make sure that the Bitmask wasn't messed with during download you can [[authenticate the signature => signature-verification]].
-h3. Other
-
-Please note that we only provide support for the above versions of Ubuntu. You are welcome to try and get Bitmask running on another version of Ubuntu, but we know that it currently wont work with the packages or bundle for Precise Penguin (12.04). If you wish to attempt to get Bitmask working for another version of Ubuntu that is not listed above, 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]].
-
-@Bundle Installation@
-
-*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.
-
-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:
-
-* 64 bit kernel
-
-<%= render({:partial => 'common/download_button'}, {:link => 'https://dl.bitmask.net/client/linux/stable/Bitmask-linux64-latest.tar.bz2', :text => 'Download 64 bit'}) %>
-
-[[Signature file => https://dl.bitmask.net/client/linux/stable/Bitmask-linux64-latest.tar.bz2.asc]]
-
-* 32 bit kernel
-
-<%= render({:partial => 'common/download_button'}, {:link => 'https://dl.bitmask.net/client/linux/stable/Bitmask-linux32-latest.tar.bz2', :text => 'Download 32 bit'}) %>
-
-[[Signature file => https://dl.bitmask.net/client/linux/stable/Bitmask-linux32-latest.tar.bz2.asc]]
-
-If you want to make sure that the Bitmask wasn't messed with during download you can [[authenticate the signature => signature-verification]].
-
-
h2. Debian
For Debian, we provide packages for the following versions. 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.
@@ -119,44 +80,6 @@ h3. Testing (Stretch)
h3. Unstable (Sid)
<%= render({:partial => 'via_packages'}, {:distro => 'sid', :os => 'debian'}) %>
-h3. Other
-
-Please note that we only provide support for the above versions of Debian. You are welcome to try and get Bitmask running on another version of Debian, 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]].
-
-*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.
-
-@Bundle Installation@
-
-How do you tell if you running a 32 bit or 64 bit kernel? Run 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:
-
-* 64 bit kernel
-
-<%= render({:partial => 'common/download_button'}, {:link => 'https://dl.bitmask.net/client/linux/stable/Bitmask-linux64-latest.tar.bz2', :text => 'Download 64 bit'}) %>
-
-[[Signature file => https://dl.bitmask.net/client/linux/stable/Bitmask-linux64-latest.tar.bz2.asc]]
-
-* 32 bit kernel
-
-<%= render({:partial => 'common/download_button'}, {:link => 'https://dl.bitmask.net/client/linux/stable/Bitmask-linux32-latest.tar.bz2', :text => 'Download 32 bit'}) %>
-
-[[Signature file => https://dl.bitmask.net/client/linux/stable/Bitmask-linux32-latest.tar.bz2.asc]]
-
-If you want to make sure that the Bitmask wasn't messed with during download you can [[authenticate the signature => signature-verification]].
-
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]].