summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVarac <varac@leap.se>2018-03-20 20:12:25 +0100
committerVarac <varac@leap.se>2018-03-20 20:12:25 +0100
commit2c4be0b7814d0000271644ff12d3429392de755a (patch)
tree312545db12572b1b76aff4f43c6502493150660a
parent2a34c773ea8b7ba949cc1382c9ae523bae5b64fe (diff)
Polish installation docs
-rw-r--r--pages/linux/debs/en.md12
-rw-r--r--pages/linux/en.md11
-rw-r--r--public/linux/debs/index.en.html11
-rw-r--r--public/linux/debs/index.es.html11
-rw-r--r--public/linux/debs/index.pt.html11
-rw-r--r--public/linux/debs/index.ru.html11
-rw-r--r--public/linux/index.en.html18
-rw-r--r--public/linux/index.es.html18
-rw-r--r--public/linux/index.pt.html18
9 files changed, 59 insertions, 62 deletions
diff --git a/pages/linux/debs/en.md b/pages/linux/debs/en.md
index 3d22e0c..f306260 100644
--- a/pages/linux/debs/en.md
+++ b/pages/linux/debs/en.md
@@ -4,16 +4,10 @@
# Supported distributions
-We provide packages for **ubuntu** ``zesty`` (17.04), **debian** ``stretch`` (*stable*) and ``buster`` (*testing*).
+We provide packages for **ubuntu** ``Artful`` (17.10), **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 release stretch" > /etc/apt/sources.list.d/bitmask.list'
-sudo apt update && sudo apt install bitmask
-```
+Please refer to the [[ linux installation docs => /en/install/linux#Debian/Ubuntu ]] how to install the debian packages for your distribution.
# Release, staging, or master?
@@ -39,7 +33,7 @@ If you want to remove bitmask from your system:
```
sudo -s
-apt remove bitmask leap-archive-keyring
+apt remove --purge bitmask leap-archive-keyring
rm /etc/apt/sources.list.d/bitmask.list
```
diff --git a/pages/linux/en.md b/pages/linux/en.md
index df70f6c..d7d2c0b 100644
--- a/pages/linux/en.md
+++ b/pages/linux/en.md
@@ -13,21 +13,13 @@ If you want to try the latest code, you can download the [[latest bundle => http
# Debian/Ubuntu
-We officially support these releases:
-
-- Latest stable Debian release (9.0, Stretch)
-- Latest stable Ubuntu release (17.10, Artful)
-
-You might find debian packages for other releases as well but they might or might not work for you. Please understand that we can't provide support for these.
-
-Read more about [[ our different repositories => debs ]] for deb packages.
For Debian jessie and Ubuntu Artful:
```
sudo apt install lsb-release curl
sudo sh -c 'echo "deb http://deb.leap.se/client release $(lsb_release -sc)" > /etc/apt/sources.list.d/bitmask.list'
-curl https://downloads.leap.se/platform/leap-archive-signing-keys.asc | sudo apt-key add
+curl https://downloads.leap.se/platform/leap-archive-signing-keys.asc | sudo apt-key add -
sudo apt update && sudo apt install bitmask
```
@@ -40,6 +32,7 @@ sudo sh -c 'echo "deb http://deb.leap.se/client release $(lsb_release -sc)" > /e
sudo apt update && sudo apt install bitmask
```
+Read more about [[ our different repositories => debs ]] for deb packages.
# Other
diff --git a/public/linux/debs/index.en.html b/public/linux/debs/index.en.html
index 7f4c904..96be802 100644
--- a/public/linux/debs/index.en.html
+++ b/public/linux/debs/index.en.html
@@ -19,15 +19,10 @@ Bitmask Downloads
<div class='bm-main container'>
<h1><a name="supported-distributions"></a>Supported distributions</h1>
-<p>We provide packages for <strong>ubuntu</strong> <code>zesty</code> (17.04), <strong>debian</strong> <code>stretch</code> (<em>stable</em>) and <code>buster</code> (<em>testing</em>).
+<p>We provide packages for <strong>ubuntu</strong> <code>Artful</code> (17.10), <strong>debian</strong> <code>Stretch</code> (<em>stable</em>) and <code>Buster</code> (<em>testing</em>).
Try the <a href="/en/linux#standalone-bundles">standalone bundles</a> if your distribution is not there.</p>
-<p>Change <code>stretch</code> in the following instructions for the one you are using:</p>
-
-<pre><code>sudo apt install leap-archive-keyring
-sudo sh -c 'echo "deb http://deb.leap.se/client release stretch" &gt; /etc/apt/sources.list.d/bitmask.list'
-sudo apt update &amp;&amp; sudo apt install bitmask
-</code></pre>
+<p>Please refer to the <a href="/en/linux#Debian/Ubuntu">linux installation docs</a> how to install the debian packages for your distribution.</p>
<h1><a name="release-staging-or-master"></a>Release, staging, or master?</h1>
@@ -49,7 +44,7 @@ deb http://deb.leap.se/client staging stretch
<p>If you want to remove bitmask from your system:</p>
<pre><code>sudo -s
-apt remove bitmask leap-archive-keyring
+apt remove --purge bitmask leap-archive-keyring
rm /etc/apt/sources.list.d/bitmask.list
</code></pre>
diff --git a/public/linux/debs/index.es.html b/public/linux/debs/index.es.html
index a520a7f..bf2b2f3 100644
--- a/public/linux/debs/index.es.html
+++ b/public/linux/debs/index.es.html
@@ -19,15 +19,10 @@ Bitmask Downloads
<div class='bm-main container'>
<h1><a name="supported-distributions"></a>Supported distributions</h1>
-<p>We provide packages for <strong>ubuntu</strong> <code>zesty</code> (17.04), <strong>debian</strong> <code>stretch</code> (<em>stable</em>) and <code>buster</code> (<em>testing</em>).
+<p>We provide packages for <strong>ubuntu</strong> <code>Artful</code> (17.10), <strong>debian</strong> <code>Stretch</code> (<em>stable</em>) and <code>Buster</code> (<em>testing</em>).
Try the <a href="/es/linux#standalone-bundles">standalone bundles</a> if your distribution is not there.</p>
-<p>Change <code>stretch</code> in the following instructions for the one you are using:</p>
-
-<pre><code>sudo apt install leap-archive-keyring
-sudo sh -c 'echo "deb http://deb.leap.se/client release stretch" &gt; /etc/apt/sources.list.d/bitmask.list'
-sudo apt update &amp;&amp; sudo apt install bitmask
-</code></pre>
+<p>Please refer to the <a href="/es/linux#Debian/Ubuntu">linux installation docs</a> how to install the debian packages for your distribution.</p>
<h1><a name="release-staging-or-master"></a>Release, staging, or master?</h1>
@@ -49,7 +44,7 @@ deb http://deb.leap.se/client staging stretch
<p>If you want to remove bitmask from your system:</p>
<pre><code>sudo -s
-apt remove bitmask leap-archive-keyring
+apt remove --purge bitmask leap-archive-keyring
rm /etc/apt/sources.list.d/bitmask.list
</code></pre>
diff --git a/public/linux/debs/index.pt.html b/public/linux/debs/index.pt.html
index 3f450a0..2caeef9 100644
--- a/public/linux/debs/index.pt.html
+++ b/public/linux/debs/index.pt.html
@@ -19,15 +19,10 @@ Bitmask Downloads
<div class='bm-main container'>
<h1><a name="supported-distributions"></a>Supported distributions</h1>
-<p>We provide packages for <strong>ubuntu</strong> <code>zesty</code> (17.04), <strong>debian</strong> <code>stretch</code> (<em>stable</em>) and <code>buster</code> (<em>testing</em>).
+<p>We provide packages for <strong>ubuntu</strong> <code>Artful</code> (17.10), <strong>debian</strong> <code>Stretch</code> (<em>stable</em>) and <code>Buster</code> (<em>testing</em>).
Try the <a href="/pt/linux#standalone-bundles">standalone bundles</a> if your distribution is not there.</p>
-<p>Change <code>stretch</code> in the following instructions for the one you are using:</p>
-
-<pre><code>sudo apt install leap-archive-keyring
-sudo sh -c 'echo "deb http://deb.leap.se/client release stretch" &gt; /etc/apt/sources.list.d/bitmask.list'
-sudo apt update &amp;&amp; sudo apt install bitmask
-</code></pre>
+<p>Please refer to the <a href="/pt/linux#Debian/Ubuntu">linux installation docs</a> how to install the debian packages for your distribution.</p>
<h1><a name="release-staging-or-master"></a>Release, staging, or master?</h1>
@@ -49,7 +44,7 @@ deb http://deb.leap.se/client staging stretch
<p>If you want to remove bitmask from your system:</p>
<pre><code>sudo -s
-apt remove bitmask leap-archive-keyring
+apt remove --purge bitmask leap-archive-keyring
rm /etc/apt/sources.list.d/bitmask.list
</code></pre>
diff --git a/public/linux/debs/index.ru.html b/public/linux/debs/index.ru.html
index 32d7d02..172efa7 100644
--- a/public/linux/debs/index.ru.html
+++ b/public/linux/debs/index.ru.html
@@ -19,15 +19,10 @@ Bitmask debian/ubuntu repositories - Скачать Bitmask
<div class='bm-main container'>
<h1><a name="supported-distributions"></a>Supported distributions</h1>
-<p>We provide packages for <strong>ubuntu</strong> <code>zesty</code> (17.04), <strong>debian</strong> <code>stretch</code> (<em>stable</em>) and <code>buster</code> (<em>testing</em>).
+<p>We provide packages for <strong>ubuntu</strong> <code>Artful</code> (17.10), <strong>debian</strong> <code>Stretch</code> (<em>stable</em>) and <code>Buster</code> (<em>testing</em>).
Try the <a href="/ru/linux#standalone-bundles">standalone bundles</a> if your distribution is not there.</p>
-<p>Change <code>stretch</code> in the following instructions for the one you are using:</p>
-
-<pre><code>sudo apt install leap-archive-keyring
-sudo sh -c 'echo "deb http://deb.leap.se/client release stretch" &gt; /etc/apt/sources.list.d/bitmask.list'
-sudo apt update &amp;&amp; sudo apt install bitmask
-</code></pre>
+<p>Please refer to the <a href="/ru/linux#Debian/Ubuntu">linux installation docs</a> how to install the debian packages for your distribution.</p>
<h1><a name="release-staging-or-master"></a>Release, staging, or master?</h1>
@@ -49,7 +44,7 @@ deb http://deb.leap.se/client staging stretch
<p>If you want to remove bitmask from your system:</p>
<pre><code>sudo -s
-apt remove bitmask leap-archive-keyring
+apt remove --purge bitmask leap-archive-keyring
rm /etc/apt/sources.list.d/bitmask.list
</code></pre>
diff --git a/public/linux/index.en.html b/public/linux/index.en.html
index 6f6f7a1..1626578 100644
--- a/public/linux/index.en.html
+++ b/public/linux/index.en.html
@@ -29,14 +29,24 @@ Bitmask Downloads
<p>If you want to try the latest code, you can download the <a href="https://0xacab.org/leap/bitmask-dev/-/jobs/artifacts/master/download?job=bitmask_latest_bundle">latest bundle</a> that is built automatically for every change.</p>
-<h1><a name="debianubuntu"></a>Debian/ubuntu</h1>
+<h1><a name="debianubuntu"></a>Debian/Ubuntu</h1>
-<pre><code>sudo apt install leap-archive-keyring
-sudo sh -c 'echo "deb http://deb.leap.se/client release stretch" &gt; /etc/apt/sources.list.d/bitmask.list'
+<p>For Debian jessie and Ubuntu Artful:</p>
+
+<pre><code>sudo apt install lsb-release curl
+sudo sh -c 'echo "deb http://deb.leap.se/client release $(lsb_release -sc)" &gt; /etc/apt/sources.list.d/bitmask.list'
+curl https://downloads.leap.se/platform/leap-archive-signing-keys.asc | sudo apt-key add -
+sudo apt update &amp;&amp; sudo apt install bitmask
+</code></pre>
+
+<p>For Debian testing and Ubuntu Bionic:</p>
+
+<pre><code>sudo apt install leap-archive-keyring lsb-release
+sudo sh -c 'echo "deb http://deb.leap.se/client release $(lsb_release -sc)" &gt; /etc/apt/sources.list.d/bitmask.list'
sudo apt update &amp;&amp; sudo apt install bitmask
</code></pre>
-<p>Change <code>stretch</code> for <code>zesty</code> or <code>buster</code>, according to your distro. Read more about <a href="/en/linux/debs">our different repositories</a> for deb packages.</p>
+<p>Read more about <a href="/en/linux/debs">our different repositories</a> for deb packages.</p>
<h1><a name="other"></a>Other</h1>
diff --git a/public/linux/index.es.html b/public/linux/index.es.html
index 7e2e067..eb2eb50 100644
--- a/public/linux/index.es.html
+++ b/public/linux/index.es.html
@@ -29,14 +29,24 @@ Bitmask Downloads
<p>If you want to try the latest code, you can download the <a href="https://0xacab.org/leap/bitmask-dev/-/jobs/artifacts/master/download?job=bitmask_latest_bundle">latest bundle</a> that is built automatically for every change.</p>
-<h1><a name="debianubuntu"></a>Debian/ubuntu</h1>
+<h1><a name="debianubuntu"></a>Debian/Ubuntu</h1>
-<pre><code>sudo apt install leap-archive-keyring
-sudo sh -c 'echo "deb http://deb.leap.se/client release stretch" &gt; /etc/apt/sources.list.d/bitmask.list'
+<p>For Debian jessie and Ubuntu Artful:</p>
+
+<pre><code>sudo apt install lsb-release curl
+sudo sh -c 'echo "deb http://deb.leap.se/client release $(lsb_release -sc)" &gt; /etc/apt/sources.list.d/bitmask.list'
+curl https://downloads.leap.se/platform/leap-archive-signing-keys.asc | sudo apt-key add -
+sudo apt update &amp;&amp; sudo apt install bitmask
+</code></pre>
+
+<p>For Debian testing and Ubuntu Bionic:</p>
+
+<pre><code>sudo apt install leap-archive-keyring lsb-release
+sudo sh -c 'echo "deb http://deb.leap.se/client release $(lsb_release -sc)" &gt; /etc/apt/sources.list.d/bitmask.list'
sudo apt update &amp;&amp; sudo apt install bitmask
</code></pre>
-<p>Change <code>stretch</code> for <code>zesty</code> or <code>buster</code>, according to your distro. Read more about <a href="/es/linux/debs">our different repositories</a> for deb packages.</p>
+<p>Read more about <a href="/es/linux/debs">our different repositories</a> for deb packages.</p>
<h1><a name="other"></a>Other</h1>
diff --git a/public/linux/index.pt.html b/public/linux/index.pt.html
index 4b0ffe9..3b70b77 100644
--- a/public/linux/index.pt.html
+++ b/public/linux/index.pt.html
@@ -29,14 +29,24 @@ Bitmask Downloads
<p>If you want to try the latest code, you can download the <a href="https://0xacab.org/leap/bitmask-dev/-/jobs/artifacts/master/download?job=bitmask_latest_bundle">latest bundle</a> that is built automatically for every change.</p>
-<h1><a name="debianubuntu"></a>Debian/ubuntu</h1>
+<h1><a name="debianubuntu"></a>Debian/Ubuntu</h1>
-<pre><code>sudo apt install leap-archive-keyring
-sudo sh -c 'echo "deb http://deb.leap.se/client release stretch" &gt; /etc/apt/sources.list.d/bitmask.list'
+<p>For Debian jessie and Ubuntu Artful:</p>
+
+<pre><code>sudo apt install lsb-release curl
+sudo sh -c 'echo "deb http://deb.leap.se/client release $(lsb_release -sc)" &gt; /etc/apt/sources.list.d/bitmask.list'
+curl https://downloads.leap.se/platform/leap-archive-signing-keys.asc | sudo apt-key add -
+sudo apt update &amp;&amp; sudo apt install bitmask
+</code></pre>
+
+<p>For Debian testing and Ubuntu Bionic:</p>
+
+<pre><code>sudo apt install leap-archive-keyring lsb-release
+sudo sh -c 'echo "deb http://deb.leap.se/client release $(lsb_release -sc)" &gt; /etc/apt/sources.list.d/bitmask.list'
sudo apt update &amp;&amp; sudo apt install bitmask
</code></pre>
-<p>Change <code>stretch</code> for <code>zesty</code> or <code>buster</code>, according to your distro. Read more about <a href="/pt/linux/debs">our different repositories</a> for deb packages.</p>
+<p>Read more about <a href="/pt/linux/debs">our different repositories</a> for deb packages.</p>
<h1><a name="other"></a>Other</h1>