From 12e766db1cd7cd4eb5a2ae5413700aaf4a3bd2f6 Mon Sep 17 00:00:00 2001 From: Ivan Alejandro Date: Tue, 27 Oct 2015 15:16:39 -0300 Subject: Reorder install methods Also remove other methods, they are already listed on leap.se docs. --- pages/install/linux/en.text | 40 +++++++++++++++++----------------------- 1 file changed, 17 insertions(+), 23 deletions(-) (limited to 'pages/install/linux/en.text') diff --git a/pages/install/linux/en.text b/pages/install/linux/en.text index 482df21..a300ced 100644 --- a/pages/install/linux/en.text +++ b/pages/install/linux/en.text @@ -18,26 +18,6 @@ bc. sudo add-apt-repository "deb http://deb.bitmask.net/debian vivid main" This is because the Ubuntu upgrade process probably commented out all your prior custom repository lines in @/etc/apt/sources.list@. -h2. Install as packages - -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. - -h3. Ubuntu 15.04 (Vivid Vervet) - -<%= render({:partial => 'via_packages'}, {:distro => 'vivid'}) %> - -h3. Ubuntu 14.04 LTS (Trusty Tahr) - -<%= render({:partial => 'via_packages'}, {:distro => 'trusty'}) %> - -h3. Debian 7.0 (Wheezy) - -<%= render({:partial => 'via_packages'}, {:distro => 'wheezy', :os => 'debian'}) %> - -h3. Debian 8.0 (Jessie) - -<%= render({:partial => 'via_packages'}, {:distro => 'jessie', :os => 'debian'}) %> - h2. Install stand-alone bundle Alternately, you can run Bitmask from a stand alone bundle. This is useful if want to run Bitmask from a thumb drive. The bundle should work on most recent Linux distributions that are derived from Debian (e.g. Ubuntu, Mint, Trisquel, etc). @@ -71,8 +51,22 @@ h3. 64 bit kernel [[Signature file => https://dl.bitmask.net/client/linux/stable/Bitmask-linux64-latest.tar.bz2.asc]] -h3. Other options +h2. Install as packages + +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. + +h3. Ubuntu 15.04 (Vivid Vervet) + +<%= render({:partial => 'via_packages'}, {:distro => 'vivid'}) %> + +h3. Ubuntu 14.04 LTS (Trusty Tahr) -You can [[browse all releases => https://dl.bitmask.net/client/linux/]] for old or experimental downloads. +<%= render({:partial => 'via_packages'}, {:distro => 'trusty'}) %> -You should install the latest stable release. Downloads tagged with "RC" are "Release Candidates" and receive frequent experimental updates that may break the application. +h3. Debian 7.0 (Wheezy) + +<%= render({:partial => 'via_packages'}, {:distro => 'wheezy', :os => 'debian'}) %> + +h3. Debian 8.0 (Jessie) + +<%= render({:partial => 'via_packages'}, {:distro => 'jessie', :os => 'debian'}) %> -- cgit v1.2.3 From a364427136ec896f4da7c781b66776c0bb479a08 Mon Sep 17 00:00:00 2001 From: Ivan Alejandro Date: Fri, 30 Oct 2015 17:39:38 -0300 Subject: Reorder and simplify bundle installation docs --- pages/install/linux/en.text | 35 +++++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 14 deletions(-) (limited to 'pages/install/linux/en.text') diff --git a/pages/install/linux/en.text b/pages/install/linux/en.text index a300ced..8ecdf55 100644 --- a/pages/install/linux/en.text +++ b/pages/install/linux/en.text @@ -18,16 +18,26 @@ bc. sudo add-apt-repository "deb http://deb.bitmask.net/debian vivid main" This is because the Ubuntu upgrade process probably commented out all your prior custom repository lines in @/etc/apt/sources.list@. -h2. Install stand-alone bundle +--- -Alternately, you can run Bitmask from a stand alone bundle. This is useful if want to run Bitmask from a thumb drive. The bundle should work on most recent Linux distributions that are derived from Debian (e.g. Ubuntu, Mint, Trisquel, etc). +There are two ways to install Bitmask - via the stand-alone bundles or via packages. -There are two disadvantages to the stand-alone bundle: +h2. Download 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. +h3. 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]] -Optionally, you can [[authenticate the signature => signature-verification]] for the Bitmask files before you run them. +h3. 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]]. How do you tell if you running a 32 bit or 64 bit kernel? Run the following command: @@ -39,17 +49,14 @@ If the result is: * @i686@, you have *32 bit* * @i386@, you have *32 bit* -h3. 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]] +NOTE: + Stand-alone bundles are useful if want to run Bitmask from a thumb drive. + 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. -h3. 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]] h2. Install as packages -- cgit v1.2.3 From ee978e16ee3f6fa85510dfccb9b23efcecbc2220 Mon Sep 17 00:00:00 2001 From: Ivan Alejandro Date: Mon, 2 Nov 2015 13:23:16 -0300 Subject: Move upgrade instructions to bottom --- pages/install/linux/en.text | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) (limited to 'pages/install/linux/en.text') diff --git a/pages/install/linux/en.text b/pages/install/linux/en.text index 8ecdf55..06e5028 100644 --- a/pages/install/linux/en.text +++ b/pages/install/linux/en.text @@ -3,23 +3,6 @@ <%= render({:partial => 'common/notice'}, {:type => 'info', :text => 'NOTE: Encrypted email support in Bitmask is still experimental.'}) %> -h2. 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. - -*From packages*: If you are running from packages, then you can trigger an update like so: - -bc. apt-get update -apt-get dist-upgrade - -NOTE: When upgrading Ubuntu from 14.10 (Utopic) to 15.04 (Vivid), you may need to run this command again: - -bc. sudo add-apt-repository "deb http://deb.bitmask.net/debian vivid main" - -This is because the Ubuntu upgrade process probably commented out all your prior custom repository lines in @/etc/apt/sources.list@. - ---- - There are two ways to install Bitmask - via the stand-alone bundles or via packages. h2. Download stand-alone bundle @@ -77,3 +60,18 @@ h3. Debian 7.0 (Wheezy) h3. Debian 8.0 (Jessie) <%= render({:partial => 'via_packages'}, {:distro => 'jessie', :os => 'debian'}) %> + +h2. 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. + +*From packages*: If you are running from packages, then you can trigger an update like so: + +bc. apt-get update +apt-get dist-upgrade + +NOTE: When upgrading Ubuntu from 14.10 (Utopic) to 15.04 (Vivid), you may need to run this command again: + +bc. sudo add-apt-repository "deb http://deb.bitmask.net/debian vivid main" + +This is because the Ubuntu upgrade process probably commented out all your prior custom repository lines in @/etc/apt/sources.list@. -- cgit v1.2.3 From a53659fdd4a4b9213bb5b277a51aa01c2148b6d2 Mon Sep 17 00:00:00 2001 From: kwadronaut Date: Mon, 2 Nov 2015 18:25:05 +0100 Subject: update package installation for Wheezy, Trusty (dropped) and Wily (added) --- pages/install/linux/en.text | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) (limited to 'pages/install/linux/en.text') diff --git a/pages/install/linux/en.text b/pages/install/linux/en.text index 06e5028..05bda76 100644 --- a/pages/install/linux/en.text +++ b/pages/install/linux/en.text @@ -3,7 +3,7 @@ <%= render({:partial => 'common/notice'}, {:type => 'info', :text => 'NOTE: Encrypted email support in Bitmask is still experimental.'}) %> -There are two ways to install Bitmask - via the stand-alone bundles or via packages. +There are two ways to install Bitmask - via the stand-alone bundles or via packages. h2. Download stand-alone bundle @@ -33,9 +33,8 @@ If the result is: * @i386@, you have *32 bit* - NOTE: - Stand-alone bundles are useful if want to run Bitmask from a thumb drive. + 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. @@ -45,18 +44,13 @@ h2. Install as packages 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. +h3. Ubuntu 15.10 (Wily Werewolf) +<%= render({:partial => 'via_packages'}, {:distro => 'wily'}) %> + h3. Ubuntu 15.04 (Vivid Vervet) <%= render({:partial => 'via_packages'}, {:distro => 'vivid'}) %> -h3. Ubuntu 14.04 LTS (Trusty Tahr) - -<%= render({:partial => 'via_packages'}, {:distro => 'trusty'}) %> - -h3. Debian 7.0 (Wheezy) - -<%= render({:partial => 'via_packages'}, {:distro => 'wheezy', :os => 'debian'}) %> - h3. Debian 8.0 (Jessie) <%= render({:partial => 'via_packages'}, {:distro => 'jessie', :os => 'debian'}) %> @@ -74,4 +68,8 @@ NOTE: When upgrading Ubuntu from 14.10 (Utopic) to 15.04 (Vivid), you may need t bc. sudo add-apt-repository "deb http://deb.bitmask.net/debian vivid main" +Similar is needed for the upgrade from 15.04 to 15.10 (Wily): + +bc. sudo add-apt-repository "deb http://deb.bitmask.net/debian wily main" + This is because the Ubuntu upgrade process probably commented out all your prior custom repository lines in @/etc/apt/sources.list@. -- cgit v1.2.3