From e9a1d558defa1323e8e915ad236923b034e16d14 Mon Sep 17 00:00:00 2001 From: kwadronaut Date: Tue, 3 Nov 2015 21:03:57 +0100 Subject: sync changes from bitmask_help --- pages/linux/en.text | 80 ++++++++++++++++++++++++++--------------------------- pages/linux/ru.text | 12 +++----- 2 files changed, 43 insertions(+), 49 deletions(-) (limited to 'pages/linux') diff --git a/pages/linux/en.text b/pages/linux/en.text index 482df21..b267384 100644 --- a/pages/linux/en.text +++ b/pages/linux/en.text @@ -3,76 +3,74 @@ <%= 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. +There are two ways to install Bitmask - via the stand-alone bundles or via packages. -*From packages*: If you are running from packages, then you can trigger an update like so: - -bc. apt-get update -apt-get dist-upgrade +h2. Download stand-alone bundle -NOTE: When upgrading Ubuntu from 14.10 (Utopic) to 15.04 (Vivid), you may need to run this command again: +h3. 64 bit kernel -bc. sudo add-apt-repository "deb http://deb.bitmask.net/debian vivid main" +<%= render({:partial => 'common/download_button'}, {:link => 'https://dl.bitmask.net/client/linux/stable/Bitmask-linux64-latest.tar.bz2', :text => 'Download 64 bit'}) %> -This is because the Ubuntu upgrade process probably commented out all your prior custom repository lines in @/etc/apt/sources.list@. +[[Signature file => https://dl.bitmask.net/client/linux/stable/Bitmask-linux64-latest.tar.bz2.asc]] -h2. Install as packages +h3. 32 bit kernel -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. +<%= render({:partial => 'common/download_button'}, {:link => 'https://dl.bitmask.net/client/linux/stable/Bitmask-linux32-latest.tar.bz2', :text => 'Download 32 bit'}) %> -h3. Ubuntu 15.04 (Vivid Vervet) +[[Signature file => https://dl.bitmask.net/client/linux/stable/Bitmask-linux32-latest.tar.bz2.asc]] -<%= render({:partial => 'via_packages'}, {:distro => 'vivid'}) %> +If you want to make sure that the Bitmask wasn't messed with during download +you can [[authenticate the signature => signature-verification]]. -h3. Ubuntu 14.04 LTS (Trusty Tahr) +How do you tell if you running a 32 bit or 64 bit kernel? Run the following command: -<%= render({:partial => 'via_packages'}, {:distro => 'trusty'}) %> +bc. uname -m -h3. Debian 7.0 (Wheezy) +If the result is: -<%= render({:partial => 'via_packages'}, {:distro => 'wheezy', :os => 'debian'}) %> +* @x86_64@, you have *64 bit* +* @i686@, you have *32 bit* +* @i386@, you have *32 bit* -h3. Debian 8.0 (Jessie) -<%= render({:partial => 'via_packages'}, {:distro => 'jessie', :os => 'debian'}) %> +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. -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). +h2. Install as packages -There are two disadvantages to the stand-alone bundle: +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. -* The Bitmask app will be less well integrated with the desktop environment. -* Running from the bundle is slower to start than via packages. +h3. Ubuntu 15.10 (Wily Werewolf) -Optionally, you can [[authenticate the signature => signature-verification]] for the Bitmask files before you run them. +<%= render({:partial => 'via_packages'}, {:distro => 'wily'}) %> -How do you tell if you running a 32 bit or 64 bit kernel? Run the following command: +h3. Ubuntu 15.04 (Vivid Vervet) -bc. uname -m +<%= render({:partial => 'via_packages'}, {:distro => 'vivid'}) %> -If the result is: +h3. Debian 8.0 (Jessie) -* @x86_64@, you have *64 bit* -* @i686@, you have *32 bit* -* @i386@, you have *32 bit* +<%= render({:partial => 'via_packages'}, {:distro => 'jessie', :os => 'debian'}) %> -h3. 32 bit kernel +h2. Upgrading -<%= render({:partial => 'common/download_button'}, {:link => 'https://dl.bitmask.net/client/linux/stable/Bitmask-linux32-latest.tar.bz2', :text => 'Download 32 bit'}) %> +*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. -[[Signature file => https://dl.bitmask.net/client/linux/stable/Bitmask-linux32-latest.tar.bz2.asc]] +*From packages*: If you are running from packages, then you can trigger an update like so: -h3. 64 bit kernel +bc. apt-get update +apt-get dist-upgrade -<%= render({:partial => 'common/download_button'}, {:link => 'https://dl.bitmask.net/client/linux/stable/Bitmask-linux64-latest.tar.bz2', :text => 'Download 64 bit'}) %> +NOTE: When upgrading Ubuntu from 14.10 (Utopic) to 15.04 (Vivid), you may need to run this command again: -[[Signature file => https://dl.bitmask.net/client/linux/stable/Bitmask-linux64-latest.tar.bz2.asc]] +bc. sudo add-apt-repository "deb http://deb.bitmask.net/debian vivid main" -h3. Other options +Similar is needed for the upgrade from 15.04 to 15.10 (Wily): -You can [[browse all releases => https://dl.bitmask.net/client/linux/]] for old or experimental downloads. +bc. sudo add-apt-repository "deb http://deb.bitmask.net/debian wily main" -You should install the latest stable release. Downloads tagged with "RC" are "Release Candidates" and receive frequent experimental updates that may break the application. +This is because the Ubuntu upgrade process probably commented out all your prior custom repository lines in @/etc/apt/sources.list@. diff --git a/pages/linux/ru.text b/pages/linux/ru.text index d27ab91..0c2c484 100644 --- a/pages/linux/ru.text +++ b/pages/linux/ru.text @@ -22,17 +22,13 @@ h2. Установить как пакет Это рекомендуемый способ установки Bitmask. При установке в качестве пакета Bitmask будет работать быстрее, будет лучше интегрирована с системой, а также будет постоянно обновляться. -h3. Ubuntu 15.04 (Vivid Vervet) - -<%= render({:partial => 'via_packages'}, {:distro => 'vivid'}) %> +h3. Ubuntu 15.10 (Wily Werewolf) -h3. Ubuntu 14.04 LTS (Trusty Tahr) +<%= render({:partial => 'via_packages'}, {:distro => 'wily'}) %> -<%= render({:partial => 'via_packages'}, {:distro => 'trusty'}) %> - -h3. Debian 7.0 (Wheezy) +h3. Ubuntu 15.04 (Vivid Vervet) -<%= render({:partial => 'via_packages'}, {:distro => 'wheezy', :os => 'debian'}) %> +<%= render({:partial => 'via_packages'}, {:distro => 'vivid'}) %> h3. Debian 8.0 (Jessie) -- cgit v1.2.3