summaryrefslogtreecommitdiff
path: root/public
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2015-11-04 18:25:06 -0500
committerMicah Anderson <micah@riseup.net>2015-11-04 18:25:06 -0500
commitd5c1a47c51f2f24c25fcad467e66eed3a91b24a5 (patch)
tree4ce19340bcaac8436d5534f6da94d0bf5cafd23c /public
parent3cf537fb65a76652c732f2601a31998600c17f3c (diff)
rebuild
Diffstat (limited to 'public')
-rw-r--r--public/linux/index.en.html108
-rw-r--r--public/linux/index.es.html108
-rw-r--r--public/linux/index.pt.html108
3 files changed, 138 insertions, 186 deletions
diff --git a/public/linux/index.en.html b/public/linux/index.en.html
index ede2ebf..267b046 100644
--- a/public/linux/index.en.html
+++ b/public/linux/index.en.html
@@ -19,25 +19,16 @@ Bitmask Downloads
<div class='bm-main container'>
<div id="TOC"><ol>
<li>
- <a href="#for-gnulinux-please-use-one-of-the-following-options-depending-on-what-distribution-you-are-running">For <span class="caps">GNU</span>/Linux, please use one of the following options depending on what distribution you are running</a>
- </li>
- <li>
- <a href="#how-do-i-know-which-gnulinux-distribution-i-am-running">How do I know which <span class="caps">GNU</span>/Linux distribution I am running?</a>
+ <a href="#introduction">Introduction</a>
</li>
<li>
<a href="#ubuntu">Ubuntu</a>
<ol>
<li>
- <a href="#wily-werewolf-1510">Wily Werewolf (15.10)</a>
- </li>
- <li>
- <a href="#vivid-vervet-1504">Vivid Vervet (15.04)</a>
- </li>
- <li>
- <a href="#trusty-tahr-1404">Trusty Tahr (14.04)</a>
+ <a href="#bundle">Bundle</a>
</li>
<li>
- <a href="#other">Other</a>
+ <a href="#packages">Packages</a>
</li>
</ol>
</li>
@@ -45,13 +36,18 @@ Bitmask Downloads
<a href="#debian">Debian</a>
<ol>
<li>
- <a href="#80stable-jessie">8.0/Stable (Jessie)</a>
+ <a href="#bundle-2">Bundle</a>
</li>
<li>
- <a href="#testing-stretch">Testing (Stretch)</a>
+ <a href="#packages-2">Packages</a>
</li>
+ </ol>
+ </li>
+ <li>
+ <a href="#other">Other</a>
+ <ol>
<li>
- <a href="#other-2">Other</a>
+ <a href="#bundle-3">Bundle</a>
</li>
</ol>
</li>
@@ -68,35 +64,16 @@ Bitmask Downloads
</div>
</div>
</p>
-<h2><a name="for-gnulinux-please-use-one-of-the-following-options-depending-on-what-distribution-you-are-running"></a>For <span class="caps">GNU</span>/Linux, please use one of the following options depending on what distribution you are running</h2>
-<h2><a name="how-do-i-know-which-gnulinux-distribution-i-am-running"></a>How do I know which <span class="caps">GNU</span>/Linux distribution I am running?</h2>
-<p>To find out which distribution you are running, opena terminal and type in the following:</p>
-<p>.bc cat /etc/issue</p>
+<h2><a name="introduction"></a>Introduction</h2>
+<p>For <span class="caps">GNU</span>/Linux, we recommend following the installation method detailed below based on what distribution you are running.</p>
+<p>To find out which distribution you are running, open a terminal and type in the following:</p>
+<pre><code>cat /etc/issue</code></pre>
<h2><a name="ubuntu"></a>Ubuntu</h2>
-<p>For Ubuntu, we provide packages for Wily Werewolf (15.10) and Vivid Vervet (15.04). 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.</p>
-<p>If you are using Trusty, then you will use the bundle method.</p>
+<p>There are two ways to install bitmask on Ubuntu, via packages and via bundles. If you are comfortable with the command line, we recommend using packages when available, otherwise use the bundle. If installed as a package, Bitmask will run faster, be better integrated in the desktop environment, and will be faster to start.</p>
+<p>For Ubuntu, we only provide packages for Wily Werewolf (15.10) and Vivid Vervet (15.04).</p>
+<p>If you are using Trusty, then you will need to use the bundle method.</p>
<p>We are sorry, Precise Penguin (12.04) is not working at this time.</p>
-<h3><a name="wily-werewolf-1510"></a>Wily Werewolf (15.10)</h3>
-<p><p class='b'>To install</p>
-<pre>sudo -s&#x000A;add-apt-repository "deb http://deb.bitmask.net/debian wily main"&#x000A;wget -O- https://dl.bitmask.net/apt.key | apt-key add -&#x000A;apt-get update&#x000A;apt-get install bitmask leap-keyring&#x000A;</pre>
-<p class='b'>To remove</p>
-<pre>sudo -s&#x000A;apt-get remove bitmask leap-keyring&#x000A;apt-key del 0x1E34A1828E207901&#x000A;add-apt-repository --remove "deb http://deb.bitmask.net/debian wily main"</pre>
-</p>
-<h3><a name="vivid-vervet-1504"></a>Vivid Vervet (15.04)</h3>
-<p><p class='b'>To install</p>
-<pre>sudo -s&#x000A;add-apt-repository "deb http://deb.bitmask.net/debian vivid main"&#x000A;wget -O- https://dl.bitmask.net/apt.key | apt-key add -&#x000A;apt-get update&#x000A;apt-get install bitmask leap-keyring&#x000A;</pre>
-<p class='b'>To remove</p>
-<pre>sudo -s&#x000A;apt-get remove bitmask leap-keyring&#x000A;apt-key del 0x1E34A1828E207901&#x000A;add-apt-repository --remove "deb http://deb.bitmask.net/debian vivid main"</pre>
-</p>
-<h3><a name="trusty-tahr-1404"></a>Trusty Tahr (14.04)</h3>
-<p><code>Bundle Installation</code></p>
-<p><strong><span class="caps">NOTE</span>:</strong><br />
- Stand-alone bundles are useful if want to run Bitmask from a thumb drive. Or from a distribution which we don&#8217;t support with packages.<br />
- There are two disadvantages to the stand-alone bundle:</p>
-<ul>
- <li>The Bitmask app will be less well integrated with the desktop environment.</li>
- <li>Running from the bundle is slower to start than via packages.</li>
-</ul>
+<h3><a name="bundle"></a>Bundle</h3>
<p>First determine if you running a 32 bit or 64 bit kernel by running the following command:</p>
<pre><code>uname -m</code></pre>
<p>If the result is:</p>
@@ -125,9 +102,6 @@ Bitmask Downloads
</p>
<p><a href="https://dl.bitmask.net/client/linux/stable/Bitmask-linux32-latest.tar.bz2.asc">Signature file</a></p>
<p>If you want to make sure that the Bitmask wasn&#8217;t messed with during download you can <a href="/en/signature-verification">authenticate the signature</a>.</p>
-<h3><a name="other"></a>Other</h3>
-<p>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 <a href="https://leap.se/en/docs/get-involved/source">building it from source</a>.</p>
-<p><code>Bundle Installation</code></p>
<p><strong><span class="caps">NOTE</span>:</strong><br />
Stand-alone bundles are useful if want to run Bitmask from a thumb drive. Or from a distribution which we don&#8217;t support with packages.<br />
There are two disadvantages to the stand-alone bundle:</p>
@@ -135,6 +109,24 @@ Bitmask Downloads
<li>The Bitmask app will be less well integrated with the desktop environment.</li>
<li>Running from the bundle is slower to start than via packages.</li>
</ul>
+<h3><a name="packages"></a>Packages</h3>
+<p><strong>Wily Werewolf (15.10)</strong></p>
+<p><p class='b'>To install</p>
+<pre>sudo -s&#x000A;add-apt-repository "deb http://deb.bitmask.net/debian wily main"&#x000A;wget -O- https://dl.bitmask.net/apt.key | apt-key add -&#x000A;apt-get update&#x000A;apt-get install bitmask leap-keyring&#x000A;</pre>
+<p class='b'>To remove</p>
+<pre>sudo -s&#x000A;apt-get remove bitmask leap-keyring&#x000A;apt-key del 0x1E34A1828E207901&#x000A;add-apt-repository --remove "deb http://deb.bitmask.net/debian wily main"</pre>
+</p>
+<p><strong>Vivid Vervet (15.04)</strong></p>
+<p><p class='b'>To install</p>
+<pre>sudo -s&#x000A;add-apt-repository "deb http://deb.bitmask.net/debian vivid main"&#x000A;wget -O- https://dl.bitmask.net/apt.key | apt-key add -&#x000A;apt-get update&#x000A;apt-get install bitmask leap-keyring&#x000A;</pre>
+<p class='b'>To remove</p>
+<pre>sudo -s&#x000A;apt-get remove bitmask leap-keyring&#x000A;apt-key del 0x1E34A1828E207901&#x000A;add-apt-repository --remove "deb http://deb.bitmask.net/debian vivid main"</pre>
+</p>
+<h2><a name="debian"></a>Debian</h2>
+<p>There are two ways to install bitmask on Debian, via packages and via bundles. If you are comfortable with the command line, we recommend using packages when available, if you are comfortable with the command line, otherwise use the bundle. If installed as a package, Bitmask will run faster, be better integrated in the system, and will be kept up to date.</p>
+<p>For Debian, we only provide packages for Stable (Jessie/8), Testing (Stretch) and Unstable (Sid).</p>
+<p>If you are using Wheezy, then you will need to use the bundle method.</p>
+<h3><a name="bundle-2"></a>Bundle</h3>
<p>First determine if you running a 32 bit or 64 bit kernel by running the following command:</p>
<pre><code>uname -m</code></pre>
<p>If the result is:</p>
@@ -163,37 +155,29 @@ Bitmask Downloads
</p>
<p><a href="https://dl.bitmask.net/client/linux/stable/Bitmask-linux32-latest.tar.bz2.asc">Signature file</a></p>
<p>If you want to make sure that the Bitmask wasn&#8217;t messed with during download you can <a href="/en/signature-verification">authenticate the signature</a>.</p>
-<h2><a name="debian"></a>Debian</h2>
-<p>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.</p>
-<h3><a name="80stable-jessie"></a>8.0/Stable (Jessie)</h3>
+<h3><a name="packages-2"></a>Packages</h3>
+<p><strong>Stable (Jessie/8)</strong></p>
<p><p class='b'>To install</p>
<pre>sudo -s&#x000A;echo "deb http://deb.bitmask.net/debian jessie main" > /etc/apt/sources.list.d/bitmask.list&#x000A;wget -O- https://dl.bitmask.net/apt.key | apt-key add -&#x000A;apt-get update&#x000A;apt-get install bitmask leap-keyring&#x000A;</pre>
<p class='b'>To remove</p>
<pre>sudo -s&#x000A;apt-get remove bitmask leap-keyring&#x000A;apt-key del 0x1E34A1828E207901&#x000A;rm /etc/apt/sources.list.d/bitmask.list&#x000A;</pre>
</p>
-<h3><a name="testing-stretch"></a>Testing (Stretch)</h3>
+<p><strong>Testing (Stretch)</strong></p>
<p><p class='b'>To install</p>
<pre>sudo -s&#x000A;echo "deb http://deb.bitmask.net/debian testing main" > /etc/apt/sources.list.d/bitmask.list&#x000A;wget -O- https://dl.bitmask.net/apt.key | apt-key add -&#x000A;apt-get update&#x000A;apt-get install bitmask leap-keyring&#x000A;</pre>
<p class='b'>To remove</p>
<pre>sudo -s&#x000A;apt-get remove bitmask leap-keyring&#x000A;apt-key del 0x1E34A1828E207901&#x000A;rm /etc/apt/sources.list.d/bitmask.list&#x000A;</pre>
</p>
-<h3>Unstable (Sid)<br />
+<p><strong>Unstable (Sid)</strong><br />
<p class='b'>To install</p>
<pre>sudo -s&#x000A;echo "deb http://deb.bitmask.net/debian sid main" > /etc/apt/sources.list.d/bitmask.list&#x000A;wget -O- https://dl.bitmask.net/apt.key | apt-key add -&#x000A;apt-get update&#x000A;apt-get install bitmask leap-keyring&#x000A;</pre>
<p class='b'>To remove</p>
<pre>sudo -s&#x000A;apt-get remove bitmask leap-keyring&#x000A;apt-key del 0x1E34A1828E207901&#x000A;rm /etc/apt/sources.list.d/bitmask.list&#x000A;</pre>
-</h3>
-<h3><a name="other-2"></a>Other</h3>
-<p>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 <a href="https://leap.se/en/docs/get-involved/source">building it from source</a>.</p>
-<p><strong><span class="caps">NOTE</span>:</strong><br />
- Stand-alone bundles are useful if want to run Bitmask from a thumb drive. Or from a distribution which we don&#8217;t support with packages.<br />
- There are two disadvantages to the stand-alone bundle:</p>
-<ul>
- <li>The Bitmask app will be less well integrated with the desktop environment.</li>
- <li>Running from the bundle is slower to start than via packages.</li>
-</ul>
-<p><code>Bundle Installation</code></p>
-<p>How do you tell if you running a 32 bit or 64 bit kernel? Run the following command:</p>
+</p>
+<h2><a name="other"></a>Other</h2>
+<p>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 <a href="https://leap.se/en/docs/get-involved/source">building it from source</a>.</p>
+<h3><a name="bundle-3"></a>Bundle</h3>
+<p>First determine if you running a 32 bit or 64 bit kernel by running the following command:</p>
<pre><code>uname -m</code></pre>
<p>If the result is:</p>
<ul>
diff --git a/public/linux/index.es.html b/public/linux/index.es.html
index 3dd424c..5d2fc5c 100644
--- a/public/linux/index.es.html
+++ b/public/linux/index.es.html
@@ -19,25 +19,16 @@ Bitmask Downloads
<div class='bm-main container'>
<div id="TOC"><ol>
<li>
- <a href="#for-gnulinux-please-use-one-of-the-following-options-depending-on-what-distribution-you-are-running">For <span class="caps">GNU</span>/Linux, please use one of the following options depending on what distribution you are running</a>
- </li>
- <li>
- <a href="#how-do-i-know-which-gnulinux-distribution-i-am-running">How do I know which <span class="caps">GNU</span>/Linux distribution I am running?</a>
+ <a href="#introduction">Introduction</a>
</li>
<li>
<a href="#ubuntu">Ubuntu</a>
<ol>
<li>
- <a href="#wily-werewolf-1510">Wily Werewolf (15.10)</a>
- </li>
- <li>
- <a href="#vivid-vervet-1504">Vivid Vervet (15.04)</a>
- </li>
- <li>
- <a href="#trusty-tahr-1404">Trusty Tahr (14.04)</a>
+ <a href="#bundle">Bundle</a>
</li>
<li>
- <a href="#other">Other</a>
+ <a href="#packages">Packages</a>
</li>
</ol>
</li>
@@ -45,13 +36,18 @@ Bitmask Downloads
<a href="#debian">Debian</a>
<ol>
<li>
- <a href="#80stable-jessie">8.0/Stable (Jessie)</a>
+ <a href="#bundle-2">Bundle</a>
</li>
<li>
- <a href="#testing-stretch">Testing (Stretch)</a>
+ <a href="#packages-2">Packages</a>
</li>
+ </ol>
+ </li>
+ <li>
+ <a href="#other">Other</a>
+ <ol>
<li>
- <a href="#other-2">Other</a>
+ <a href="#bundle-3">Bundle</a>
</li>
</ol>
</li>
@@ -68,35 +64,16 @@ Bitmask Downloads
</div>
</div>
</p>
-<h2><a name="for-gnulinux-please-use-one-of-the-following-options-depending-on-what-distribution-you-are-running"></a>For <span class="caps">GNU</span>/Linux, please use one of the following options depending on what distribution you are running</h2>
-<h2><a name="how-do-i-know-which-gnulinux-distribution-i-am-running"></a>How do I know which <span class="caps">GNU</span>/Linux distribution I am running?</h2>
-<p>To find out which distribution you are running, opena terminal and type in the following:</p>
-<p>.bc cat /etc/issue</p>
+<h2><a name="introduction"></a>Introduction</h2>
+<p>For <span class="caps">GNU</span>/Linux, we recommend following the installation method detailed below based on what distribution you are running.</p>
+<p>To find out which distribution you are running, open a terminal and type in the following:</p>
+<pre><code>cat /etc/issue</code></pre>
<h2><a name="ubuntu"></a>Ubuntu</h2>
-<p>For Ubuntu, we provide packages for Wily Werewolf (15.10) and Vivid Vervet (15.04). 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.</p>
-<p>If you are using Trusty, then you will use the bundle method.</p>
+<p>There are two ways to install bitmask on Ubuntu, via packages and via bundles. If you are comfortable with the command line, we recommend using packages when available, otherwise use the bundle. If installed as a package, Bitmask will run faster, be better integrated in the desktop environment, and will be faster to start.</p>
+<p>For Ubuntu, we only provide packages for Wily Werewolf (15.10) and Vivid Vervet (15.04).</p>
+<p>If you are using Trusty, then you will need to use the bundle method.</p>
<p>We are sorry, Precise Penguin (12.04) is not working at this time.</p>
-<h3><a name="wily-werewolf-1510"></a>Wily Werewolf (15.10)</h3>
-<p><p class='b'>To install</p>
-<pre>sudo -s&#x000A;add-apt-repository "deb http://deb.bitmask.net/debian wily main"&#x000A;wget -O- https://dl.bitmask.net/apt.key | apt-key add -&#x000A;apt-get update&#x000A;apt-get install bitmask leap-keyring&#x000A;</pre>
-<p class='b'>To remove</p>
-<pre>sudo -s&#x000A;apt-get remove bitmask leap-keyring&#x000A;apt-key del 0x1E34A1828E207901&#x000A;add-apt-repository --remove "deb http://deb.bitmask.net/debian wily main"</pre>
-</p>
-<h3><a name="vivid-vervet-1504"></a>Vivid Vervet (15.04)</h3>
-<p><p class='b'>To install</p>
-<pre>sudo -s&#x000A;add-apt-repository "deb http://deb.bitmask.net/debian vivid main"&#x000A;wget -O- https://dl.bitmask.net/apt.key | apt-key add -&#x000A;apt-get update&#x000A;apt-get install bitmask leap-keyring&#x000A;</pre>
-<p class='b'>To remove</p>
-<pre>sudo -s&#x000A;apt-get remove bitmask leap-keyring&#x000A;apt-key del 0x1E34A1828E207901&#x000A;add-apt-repository --remove "deb http://deb.bitmask.net/debian vivid main"</pre>
-</p>
-<h3><a name="trusty-tahr-1404"></a>Trusty Tahr (14.04)</h3>
-<p><code>Bundle Installation</code></p>
-<p><strong><span class="caps">NOTE</span>:</strong><br />
- Stand-alone bundles are useful if want to run Bitmask from a thumb drive. Or from a distribution which we don&#8217;t support with packages.<br />
- There are two disadvantages to the stand-alone bundle:</p>
-<ul>
- <li>The Bitmask app will be less well integrated with the desktop environment.</li>
- <li>Running from the bundle is slower to start than via packages.</li>
-</ul>
+<h3><a name="bundle"></a>Bundle</h3>
<p>First determine if you running a 32 bit or 64 bit kernel by running the following command:</p>
<pre><code>uname -m</code></pre>
<p>If the result is:</p>
@@ -125,9 +102,6 @@ Bitmask Downloads
</p>
<p><a href="https://dl.bitmask.net/client/linux/stable/Bitmask-linux32-latest.tar.bz2.asc">Signature file</a></p>
<p>If you want to make sure that the Bitmask wasn&#8217;t messed with during download you can <a href="/es/signature-verification">authenticate the signature</a>.</p>
-<h3><a name="other"></a>Other</h3>
-<p>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 <a href="https://leap.se/en/docs/get-involved/source">building it from source</a>.</p>
-<p><code>Bundle Installation</code></p>
<p><strong><span class="caps">NOTE</span>:</strong><br />
Stand-alone bundles are useful if want to run Bitmask from a thumb drive. Or from a distribution which we don&#8217;t support with packages.<br />
There are two disadvantages to the stand-alone bundle:</p>
@@ -135,6 +109,24 @@ Bitmask Downloads
<li>The Bitmask app will be less well integrated with the desktop environment.</li>
<li>Running from the bundle is slower to start than via packages.</li>
</ul>
+<h3><a name="packages"></a>Packages</h3>
+<p><strong>Wily Werewolf (15.10)</strong></p>
+<p><p class='b'>To install</p>
+<pre>sudo -s&#x000A;add-apt-repository "deb http://deb.bitmask.net/debian wily main"&#x000A;wget -O- https://dl.bitmask.net/apt.key | apt-key add -&#x000A;apt-get update&#x000A;apt-get install bitmask leap-keyring&#x000A;</pre>
+<p class='b'>To remove</p>
+<pre>sudo -s&#x000A;apt-get remove bitmask leap-keyring&#x000A;apt-key del 0x1E34A1828E207901&#x000A;add-apt-repository --remove "deb http://deb.bitmask.net/debian wily main"</pre>
+</p>
+<p><strong>Vivid Vervet (15.04)</strong></p>
+<p><p class='b'>To install</p>
+<pre>sudo -s&#x000A;add-apt-repository "deb http://deb.bitmask.net/debian vivid main"&#x000A;wget -O- https://dl.bitmask.net/apt.key | apt-key add -&#x000A;apt-get update&#x000A;apt-get install bitmask leap-keyring&#x000A;</pre>
+<p class='b'>To remove</p>
+<pre>sudo -s&#x000A;apt-get remove bitmask leap-keyring&#x000A;apt-key del 0x1E34A1828E207901&#x000A;add-apt-repository --remove "deb http://deb.bitmask.net/debian vivid main"</pre>
+</p>
+<h2><a name="debian"></a>Debian</h2>
+<p>There are two ways to install bitmask on Debian, via packages and via bundles. If you are comfortable with the command line, we recommend using packages when available, if you are comfortable with the command line, otherwise use the bundle. If installed as a package, Bitmask will run faster, be better integrated in the system, and will be kept up to date.</p>
+<p>For Debian, we only provide packages for Stable (Jessie/8), Testing (Stretch) and Unstable (Sid).</p>
+<p>If you are using Wheezy, then you will need to use the bundle method.</p>
+<h3><a name="bundle-2"></a>Bundle</h3>
<p>First determine if you running a 32 bit or 64 bit kernel by running the following command:</p>
<pre><code>uname -m</code></pre>
<p>If the result is:</p>
@@ -163,37 +155,29 @@ Bitmask Downloads
</p>
<p><a href="https://dl.bitmask.net/client/linux/stable/Bitmask-linux32-latest.tar.bz2.asc">Signature file</a></p>
<p>If you want to make sure that the Bitmask wasn&#8217;t messed with during download you can <a href="/es/signature-verification">authenticate the signature</a>.</p>
-<h2><a name="debian"></a>Debian</h2>
-<p>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.</p>
-<h3><a name="80stable-jessie"></a>8.0/Stable (Jessie)</h3>
+<h3><a name="packages-2"></a>Packages</h3>
+<p><strong>Stable (Jessie/8)</strong></p>
<p><p class='b'>To install</p>
<pre>sudo -s&#x000A;echo "deb http://deb.bitmask.net/debian jessie main" > /etc/apt/sources.list.d/bitmask.list&#x000A;wget -O- https://dl.bitmask.net/apt.key | apt-key add -&#x000A;apt-get update&#x000A;apt-get install bitmask leap-keyring&#x000A;</pre>
<p class='b'>To remove</p>
<pre>sudo -s&#x000A;apt-get remove bitmask leap-keyring&#x000A;apt-key del 0x1E34A1828E207901&#x000A;rm /etc/apt/sources.list.d/bitmask.list&#x000A;</pre>
</p>
-<h3><a name="testing-stretch"></a>Testing (Stretch)</h3>
+<p><strong>Testing (Stretch)</strong></p>
<p><p class='b'>To install</p>
<pre>sudo -s&#x000A;echo "deb http://deb.bitmask.net/debian testing main" > /etc/apt/sources.list.d/bitmask.list&#x000A;wget -O- https://dl.bitmask.net/apt.key | apt-key add -&#x000A;apt-get update&#x000A;apt-get install bitmask leap-keyring&#x000A;</pre>
<p class='b'>To remove</p>
<pre>sudo -s&#x000A;apt-get remove bitmask leap-keyring&#x000A;apt-key del 0x1E34A1828E207901&#x000A;rm /etc/apt/sources.list.d/bitmask.list&#x000A;</pre>
</p>
-<h3>Unstable (Sid)<br />
+<p><strong>Unstable (Sid)</strong><br />
<p class='b'>To install</p>
<pre>sudo -s&#x000A;echo "deb http://deb.bitmask.net/debian sid main" > /etc/apt/sources.list.d/bitmask.list&#x000A;wget -O- https://dl.bitmask.net/apt.key | apt-key add -&#x000A;apt-get update&#x000A;apt-get install bitmask leap-keyring&#x000A;</pre>
<p class='b'>To remove</p>
<pre>sudo -s&#x000A;apt-get remove bitmask leap-keyring&#x000A;apt-key del 0x1E34A1828E207901&#x000A;rm /etc/apt/sources.list.d/bitmask.list&#x000A;</pre>
-</h3>
-<h3><a name="other-2"></a>Other</h3>
-<p>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 <a href="https://leap.se/en/docs/get-involved/source">building it from source</a>.</p>
-<p><strong><span class="caps">NOTE</span>:</strong><br />
- Stand-alone bundles are useful if want to run Bitmask from a thumb drive. Or from a distribution which we don&#8217;t support with packages.<br />
- There are two disadvantages to the stand-alone bundle:</p>
-<ul>
- <li>The Bitmask app will be less well integrated with the desktop environment.</li>
- <li>Running from the bundle is slower to start than via packages.</li>
-</ul>
-<p><code>Bundle Installation</code></p>
-<p>How do you tell if you running a 32 bit or 64 bit kernel? Run the following command:</p>
+</p>
+<h2><a name="other"></a>Other</h2>
+<p>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 <a href="https://leap.se/en/docs/get-involved/source">building it from source</a>.</p>
+<h3><a name="bundle-3"></a>Bundle</h3>
+<p>First determine if you running a 32 bit or 64 bit kernel by running the following command:</p>
<pre><code>uname -m</code></pre>
<p>If the result is:</p>
<ul>
diff --git a/public/linux/index.pt.html b/public/linux/index.pt.html
index 834a568..e4d7447 100644
--- a/public/linux/index.pt.html
+++ b/public/linux/index.pt.html
@@ -19,25 +19,16 @@ Bitmask Downloads
<div class='bm-main container'>
<div id="TOC"><ol>
<li>
- <a href="#for-gnulinux-please-use-one-of-the-following-options-depending-on-what-distribution-you-are-running">For <span class="caps">GNU</span>/Linux, please use one of the following options depending on what distribution you are running</a>
- </li>
- <li>
- <a href="#how-do-i-know-which-gnulinux-distribution-i-am-running">How do I know which <span class="caps">GNU</span>/Linux distribution I am running?</a>
+ <a href="#introduction">Introduction</a>
</li>
<li>
<a href="#ubuntu">Ubuntu</a>
<ol>
<li>
- <a href="#wily-werewolf-1510">Wily Werewolf (15.10)</a>
- </li>
- <li>
- <a href="#vivid-vervet-1504">Vivid Vervet (15.04)</a>
- </li>
- <li>
- <a href="#trusty-tahr-1404">Trusty Tahr (14.04)</a>
+ <a href="#bundle">Bundle</a>
</li>
<li>
- <a href="#other">Other</a>
+ <a href="#packages">Packages</a>
</li>
</ol>
</li>
@@ -45,13 +36,18 @@ Bitmask Downloads
<a href="#debian">Debian</a>
<ol>
<li>
- <a href="#80stable-jessie">8.0/Stable (Jessie)</a>
+ <a href="#bundle-2">Bundle</a>
</li>
<li>
- <a href="#testing-stretch">Testing (Stretch)</a>
+ <a href="#packages-2">Packages</a>
</li>
+ </ol>
+ </li>
+ <li>
+ <a href="#other">Other</a>
+ <ol>
<li>
- <a href="#other-2">Other</a>
+ <a href="#bundle-3">Bundle</a>
</li>
</ol>
</li>
@@ -68,35 +64,16 @@ Bitmask Downloads
</div>
</div>
</p>
-<h2><a name="for-gnulinux-please-use-one-of-the-following-options-depending-on-what-distribution-you-are-running"></a>For <span class="caps">GNU</span>/Linux, please use one of the following options depending on what distribution you are running</h2>
-<h2><a name="how-do-i-know-which-gnulinux-distribution-i-am-running"></a>How do I know which <span class="caps">GNU</span>/Linux distribution I am running?</h2>
-<p>To find out which distribution you are running, opena terminal and type in the following:</p>
-<p>.bc cat /etc/issue</p>
+<h2><a name="introduction"></a>Introduction</h2>
+<p>For <span class="caps">GNU</span>/Linux, we recommend following the installation method detailed below based on what distribution you are running.</p>
+<p>To find out which distribution you are running, open a terminal and type in the following:</p>
+<pre><code>cat /etc/issue</code></pre>
<h2><a name="ubuntu"></a>Ubuntu</h2>
-<p>For Ubuntu, we provide packages for Wily Werewolf (15.10) and Vivid Vervet (15.04). 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.</p>
-<p>If you are using Trusty, then you will use the bundle method.</p>
+<p>There are two ways to install bitmask on Ubuntu, via packages and via bundles. If you are comfortable with the command line, we recommend using packages when available, otherwise use the bundle. If installed as a package, Bitmask will run faster, be better integrated in the desktop environment, and will be faster to start.</p>
+<p>For Ubuntu, we only provide packages for Wily Werewolf (15.10) and Vivid Vervet (15.04).</p>
+<p>If you are using Trusty, then you will need to use the bundle method.</p>
<p>We are sorry, Precise Penguin (12.04) is not working at this time.</p>
-<h3><a name="wily-werewolf-1510"></a>Wily Werewolf (15.10)</h3>
-<p><p class='b'>To install</p>
-<pre>sudo -s&#x000A;add-apt-repository "deb http://deb.bitmask.net/debian wily main"&#x000A;wget -O- https://dl.bitmask.net/apt.key | apt-key add -&#x000A;apt-get update&#x000A;apt-get install bitmask leap-keyring&#x000A;</pre>
-<p class='b'>To remove</p>
-<pre>sudo -s&#x000A;apt-get remove bitmask leap-keyring&#x000A;apt-key del 0x1E34A1828E207901&#x000A;add-apt-repository --remove "deb http://deb.bitmask.net/debian wily main"</pre>
-</p>
-<h3><a name="vivid-vervet-1504"></a>Vivid Vervet (15.04)</h3>
-<p><p class='b'>To install</p>
-<pre>sudo -s&#x000A;add-apt-repository "deb http://deb.bitmask.net/debian vivid main"&#x000A;wget -O- https://dl.bitmask.net/apt.key | apt-key add -&#x000A;apt-get update&#x000A;apt-get install bitmask leap-keyring&#x000A;</pre>
-<p class='b'>To remove</p>
-<pre>sudo -s&#x000A;apt-get remove bitmask leap-keyring&#x000A;apt-key del 0x1E34A1828E207901&#x000A;add-apt-repository --remove "deb http://deb.bitmask.net/debian vivid main"</pre>
-</p>
-<h3><a name="trusty-tahr-1404"></a>Trusty Tahr (14.04)</h3>
-<p><code>Bundle Installation</code></p>
-<p><strong><span class="caps">NOTE</span>:</strong><br />
- Stand-alone bundles are useful if want to run Bitmask from a thumb drive. Or from a distribution which we don&#8217;t support with packages.<br />
- There are two disadvantages to the stand-alone bundle:</p>
-<ul>
- <li>The Bitmask app will be less well integrated with the desktop environment.</li>
- <li>Running from the bundle is slower to start than via packages.</li>
-</ul>
+<h3><a name="bundle"></a>Bundle</h3>
<p>First determine if you running a 32 bit or 64 bit kernel by running the following command:</p>
<pre><code>uname -m</code></pre>
<p>If the result is:</p>
@@ -125,9 +102,6 @@ Bitmask Downloads
</p>
<p><a href="https://dl.bitmask.net/client/linux/stable/Bitmask-linux32-latest.tar.bz2.asc">Signature file</a></p>
<p>If you want to make sure that the Bitmask wasn&#8217;t messed with during download you can <a href="/pt/signature-verification">authenticate the signature</a>.</p>
-<h3><a name="other"></a>Other</h3>
-<p>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 <a href="https://leap.se/en/docs/get-involved/source">building it from source</a>.</p>
-<p><code>Bundle Installation</code></p>
<p><strong><span class="caps">NOTE</span>:</strong><br />
Stand-alone bundles are useful if want to run Bitmask from a thumb drive. Or from a distribution which we don&#8217;t support with packages.<br />
There are two disadvantages to the stand-alone bundle:</p>
@@ -135,6 +109,24 @@ Bitmask Downloads
<li>The Bitmask app will be less well integrated with the desktop environment.</li>
<li>Running from the bundle is slower to start than via packages.</li>
</ul>
+<h3><a name="packages"></a>Packages</h3>
+<p><strong>Wily Werewolf (15.10)</strong></p>
+<p><p class='b'>To install</p>
+<pre>sudo -s&#x000A;add-apt-repository "deb http://deb.bitmask.net/debian wily main"&#x000A;wget -O- https://dl.bitmask.net/apt.key | apt-key add -&#x000A;apt-get update&#x000A;apt-get install bitmask leap-keyring&#x000A;</pre>
+<p class='b'>To remove</p>
+<pre>sudo -s&#x000A;apt-get remove bitmask leap-keyring&#x000A;apt-key del 0x1E34A1828E207901&#x000A;add-apt-repository --remove "deb http://deb.bitmask.net/debian wily main"</pre>
+</p>
+<p><strong>Vivid Vervet (15.04)</strong></p>
+<p><p class='b'>To install</p>
+<pre>sudo -s&#x000A;add-apt-repository "deb http://deb.bitmask.net/debian vivid main"&#x000A;wget -O- https://dl.bitmask.net/apt.key | apt-key add -&#x000A;apt-get update&#x000A;apt-get install bitmask leap-keyring&#x000A;</pre>
+<p class='b'>To remove</p>
+<pre>sudo -s&#x000A;apt-get remove bitmask leap-keyring&#x000A;apt-key del 0x1E34A1828E207901&#x000A;add-apt-repository --remove "deb http://deb.bitmask.net/debian vivid main"</pre>
+</p>
+<h2><a name="debian"></a>Debian</h2>
+<p>There are two ways to install bitmask on Debian, via packages and via bundles. If you are comfortable with the command line, we recommend using packages when available, if you are comfortable with the command line, otherwise use the bundle. If installed as a package, Bitmask will run faster, be better integrated in the system, and will be kept up to date.</p>
+<p>For Debian, we only provide packages for Stable (Jessie/8), Testing (Stretch) and Unstable (Sid).</p>
+<p>If you are using Wheezy, then you will need to use the bundle method.</p>
+<h3><a name="bundle-2"></a>Bundle</h3>
<p>First determine if you running a 32 bit or 64 bit kernel by running the following command:</p>
<pre><code>uname -m</code></pre>
<p>If the result is:</p>
@@ -163,37 +155,29 @@ Bitmask Downloads
</p>
<p><a href="https://dl.bitmask.net/client/linux/stable/Bitmask-linux32-latest.tar.bz2.asc">Signature file</a></p>
<p>If you want to make sure that the Bitmask wasn&#8217;t messed with during download you can <a href="/pt/signature-verification">authenticate the signature</a>.</p>
-<h2><a name="debian"></a>Debian</h2>
-<p>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.</p>
-<h3><a name="80stable-jessie"></a>8.0/Stable (Jessie)</h3>
+<h3><a name="packages-2"></a>Packages</h3>
+<p><strong>Stable (Jessie/8)</strong></p>
<p><p class='b'>To install</p>
<pre>sudo -s&#x000A;echo "deb http://deb.bitmask.net/debian jessie main" > /etc/apt/sources.list.d/bitmask.list&#x000A;wget -O- https://dl.bitmask.net/apt.key | apt-key add -&#x000A;apt-get update&#x000A;apt-get install bitmask leap-keyring&#x000A;</pre>
<p class='b'>To remove</p>
<pre>sudo -s&#x000A;apt-get remove bitmask leap-keyring&#x000A;apt-key del 0x1E34A1828E207901&#x000A;rm /etc/apt/sources.list.d/bitmask.list&#x000A;</pre>
</p>
-<h3><a name="testing-stretch"></a>Testing (Stretch)</h3>
+<p><strong>Testing (Stretch)</strong></p>
<p><p class='b'>To install</p>
<pre>sudo -s&#x000A;echo "deb http://deb.bitmask.net/debian testing main" > /etc/apt/sources.list.d/bitmask.list&#x000A;wget -O- https://dl.bitmask.net/apt.key | apt-key add -&#x000A;apt-get update&#x000A;apt-get install bitmask leap-keyring&#x000A;</pre>
<p class='b'>To remove</p>
<pre>sudo -s&#x000A;apt-get remove bitmask leap-keyring&#x000A;apt-key del 0x1E34A1828E207901&#x000A;rm /etc/apt/sources.list.d/bitmask.list&#x000A;</pre>
</p>
-<h3>Unstable (Sid)<br />
+<p><strong>Unstable (Sid)</strong><br />
<p class='b'>To install</p>
<pre>sudo -s&#x000A;echo "deb http://deb.bitmask.net/debian sid main" > /etc/apt/sources.list.d/bitmask.list&#x000A;wget -O- https://dl.bitmask.net/apt.key | apt-key add -&#x000A;apt-get update&#x000A;apt-get install bitmask leap-keyring&#x000A;</pre>
<p class='b'>To remove</p>
<pre>sudo -s&#x000A;apt-get remove bitmask leap-keyring&#x000A;apt-key del 0x1E34A1828E207901&#x000A;rm /etc/apt/sources.list.d/bitmask.list&#x000A;</pre>
-</h3>
-<h3><a name="other-2"></a>Other</h3>
-<p>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 <a href="https://leap.se/en/docs/get-involved/source">building it from source</a>.</p>
-<p><strong><span class="caps">NOTE</span>:</strong><br />
- Stand-alone bundles are useful if want to run Bitmask from a thumb drive. Or from a distribution which we don&#8217;t support with packages.<br />
- There are two disadvantages to the stand-alone bundle:</p>
-<ul>
- <li>The Bitmask app will be less well integrated with the desktop environment.</li>
- <li>Running from the bundle is slower to start than via packages.</li>
-</ul>
-<p><code>Bundle Installation</code></p>
-<p>How do you tell if you running a 32 bit or 64 bit kernel? Run the following command:</p>
+</p>
+<h2><a name="other"></a>Other</h2>
+<p>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 <a href="https://leap.se/en/docs/get-involved/source">building it from source</a>.</p>
+<h3><a name="bundle-3"></a>Bundle</h3>
+<p>First determine if you running a 32 bit or 64 bit kernel by running the following command:</p>
<pre><code>uname -m</code></pre>
<p>If the result is:</p>
<ul>