summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkwadronaut <kwadronaut@leap.se>2017-07-05 00:31:51 +0200
committerkwadronaut <kwadronaut@leap.se>2017-07-05 00:31:51 +0200
commit3ba867e64defcbe5aea10037fd7caceb56a29eb0 (patch)
tree9948797731c5a7a87da4f8f6206933d51cdc42de
parent7e81a5c2603ad7d52b74c0cc5daf102e06c4a841 (diff)
[DOC] update Debian versions linux install fixes #8963
-rw-r--r--amber/layouts/_footer.en.html.haml2
-rw-r--r--amber/layouts/_footer.ru.html.haml2
-rw-r--r--pages/install/linux/en.md40
3 files changed, 22 insertions, 22 deletions
diff --git a/amber/layouts/_footer.en.html.haml b/amber/layouts/_footer.en.html.haml
index ff27877..3f0df2e 100644
--- a/amber/layouts/_footer.en.html.haml
+++ b/amber/layouts/_footer.en.html.haml
@@ -9,5 +9,5 @@
%a(href="https://creativecommons.org/licenses/by-sa/3.0/" rel="license")<
%img(alt="Creative Commons License" src="/assets/images/by-sa-3.0-80x15.png" style="border-width:0; vertical-align: text-top")
&nbsp;
- &#169; 2015-2016
+ &#169; 2015-2017
%a(href="https://leap.se")=t :leap
diff --git a/amber/layouts/_footer.ru.html.haml b/amber/layouts/_footer.ru.html.haml
index 67d6674..6d582f3 100644
--- a/amber/layouts/_footer.ru.html.haml
+++ b/amber/layouts/_footer.ru.html.haml
@@ -9,5 +9,5 @@
%a(href="https://creativecommons.org/licenses/by-sa/3.0/deed.ru" rel="license")<
%img(alt="Creative Commons License" src="/assets/images/by-sa-3.0-80x15.png" style="border-width:0; vertical-align: text-top")
&nbsp;
- &#169; 2015-2016
+ &#169; 2015-2017
%a(href="https://leap.se")=t :leap
diff --git a/pages/install/linux/en.md b/pages/install/linux/en.md
index f1eb444..1b8942e 100644
--- a/pages/install/linux/en.md
+++ b/pages/install/linux/en.md
@@ -14,6 +14,24 @@ To find out which distribution you are running, open a terminal and type in the
cat /etc/issue
+# 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]].
+
+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>
+
+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)
@@ -32,11 +50,11 @@ To find out which distribution you are running, open a terminal and type in the
If you are using Wheezy, then you will need to use the bundle method.
-### Debian 8 (Stable/Jessie)
+### Debian 8 (Oldstable/Jessie)
<%= render({:partial => 'via_packages'}, {:distro => 'jessie', :os => 'debian', :backport => 'true'}) %>
-### Debian Testing (Stretch)
+### Debian Stable (Stretch)
<%= render({:partial => 'via_packages'}, {:distro => 'testing', :os => 'debian'}) %>
@@ -44,24 +62,6 @@ If you are using Wheezy, then you will need to use the bundle method.
<%= 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]].
-
-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>
-
-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.