Merge branch 'master' of ssh://leap.se/bitmask_help

10 files changed, 68 insertions, 49 deletions

diff --git a/pages/assets/providers/mail.bitmask.net.png b/pages/assets/providers/mail.bitmask.net.png
new file mode 100644
index 0000000..580bbac
--- /dev/null
+++ b/pages/assets/providers/mail.bitmask.net.png
diff --git a/pages/assets/style.scss b/pages/assets/style.scss
index 2a7eb96..47e4d21 100644
--- a/pages/assets/style.scss
+++ b/pages/assets/style.scss
@@ -40,6 +40,12 @@ h2.hidey {
   margin: 0;
 }
 
+h3 {
+    @extend h3;
+    font-size: 21px;
+}
+
+
 h4 {
   margin-top: 20px;
 }
diff --git a/pages/home/_about.en.text b/pages/home/_about.en.text
index 753dab1..642f062 100644
--- a/pages/home/_about.en.text
+++ b/pages/home/_about.en.text
@@ -2,4 +2,4 @@
 
 The *Bitmask* application is lovingly hand-crafted by a team of paid and volunteer programmers from seven different countries. Development is principally sponsored by the [[LEAP Encryption Access Project => https://leap.se]], an non-profit organization dedicated to defending democracy by *protecting the right to whisper*.
 
-The service provider https://demo.bitmask.net is operated by LEAP in order to demonstrate usage of the *Bitmask* application. However, we actively encourage other organizations to start their own compatible service providers by using our free software [[platform for server automation => https://leap.se/en/platform]].
\ No newline at end of file
+The service providers https://demo.bitmask.net and https://mail.bitmask.net are operated by LEAP in order to demonstrate usage of the *Bitmask* application. However, we actively encourage other organizations to start their own compatible service providers by using our free software [[platform for server automation => https://leap.se/en/platform]].
diff --git a/pages/home/_about.es.text b/pages/home/_about.es.text
index 1b8c684..7e32189 100644
--- a/pages/home/_about.es.text
+++ b/pages/home/_about.es.text
@@ -2,4 +2,4 @@
 
 La aplicación *Bitmask* está cuidadosamente manufacturada por un equipo de programadores, pagados y voluntarios, repartidos por siete países diferentes. El desarrollo está esponsorizado principalmente por el proyecto [[LEAP Encryption Access Project => https://leap.se]], una organización sin ánimo de lucro dedicada a la defensa de la democracia al *proteger el derecho a susurrar*.
 
-LEAP opera el proveedor de servicios *demo.bitmask.net* a efectos de demostración del uso de la aplicación *Bitmask*. Al mismo tiempo, animamos activamente a otras organizaciones a montar sus propios proveedores de servicios compatibles, usando nuestra [[plataforma para la automatización de servidores => https://leap.se/es/platform]], que es software libre.
+LEAP opera los proveedores de servicios https://demo.bitmask.net y https://mail.bitmask.net a efectos de demostración del uso de la aplicación *Bitmask*. Al mismo tiempo, animamos activamente a otras organizaciones a montar sus propios proveedores de servicios compatibles, usando nuestra [[plataforma para la automatización de servidores => https://leap.se/es/platform]], que es software libre.
diff --git a/pages/home/_intro.en.text b/pages/home/_intro.en.text
index 5361337..798ad04 100644
--- a/pages/home/_intro.en.text
+++ b/pages/home/_intro.en.text
@@ -1 +1 @@
-*Bitmask* is an open source application to provide easy and secure encrypted communication. You can choose among [[several different service providers => #providers]] or [[start your own => https://leap.se/en/docs/platform]]. Currently, Bitmask supports encrypted internet (VPN) with encrypted email coming soon.
+*Bitmask* is an open source application to provide easy and secure encrypted communication. You can choose among [[several different service providers => #providers]] or [[start your own => https://leap.se/en/docs/platform]]. Currently, Bitmask supports encrypted internet (VPN) and encrypted email.
diff --git a/pages/home/_text.haml b/pages/home/_text.haml
index a6338cd..be722d9 100644
--- a/pages/home/_text.haml
+++ b/pages/home/_text.haml
@@ -34,6 +34,11 @@
             [[demo.bitmask.net => https://demo.bitmask.net]]
       .col-lg-2.col-md-3.col-sm-3.col-xs-4
         .thumbnail
+          %img(src='/assets/providers/mail.bitmask.net.png')
+          .b
+            [[mail.bitmask.net => https://mail.bitmask.net]]
+      .col-lg-2.col-md-3.col-sm-3.col-xs-4
+        .thumbnail
           %img(src='/assets/providers/calyx.net.png')
           .b
             [[calyx.net => https://calyx.net]]
diff --git a/pages/install/en.haml b/pages/install/en.haml
index aa4a44f..a7044a3 100644
--- a/pages/install/en.haml
+++ b/pages/install/en.haml
@@ -7,6 +7,12 @@
       %i.fa.fa-warning
         = t :warning
 
+.row
+  .col-sm-8.col-sm-offset-2
+    .p.alert.alert-info
+      %i.fa.fa-info-circle
+        = t :providers_for_testers
+
 .row.bm-front-buttons
   .col-sm-3.col-xs-6
     %a.btn.btn-default{:href=>"android"}
diff --git a/pages/install/es.haml b/pages/install/es.haml
index ada090b..f996a85 100644
--- a/pages/install/es.haml
+++ b/pages/install/es.haml
@@ -7,6 +7,12 @@
       %i.fa.fa-warning
         = t :warning
 
+.row
+  .col-sm-8.col-sm-offset-2
+    .p.alert.alert-info
+      %i.fa.fa-info-circle
+        = t :providers_for_testers
+
 .row.bm-front-buttons
   .col-sm-3.col-xs-6
     %a.btn.btn-default{:href=>"android"}
diff --git a/pages/install/linux/en.text b/pages/install/linux/en.text
index 482df21..05bda76 100644
--- a/pages/install/linux/en.text
+++ b/pages/install/linux/en.text
@@ -3,76 +3,73 @@
 
 <%= render({:partial => 'common/notice'}, {:type => 'info', :text => '<b>NOTE:</b> 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).
-
-There are two disadvantages to the stand-alone bundle:
+h2. Install as packages
 
-* The Bitmask app will be less well integrated with the desktop environment.
-* Running from the bundle is slower to start than via 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.
 
-Optionally, you can [[authenticate the signature => signature-verification]] for the Bitmask files before you run them.
+h3. Ubuntu 15.10 (Wily Werewolf)
+<%= 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/install/linux/ru.text b/pages/install/linux/ru.text
index d27ab91..b65fdf9 100644
--- a/pages/install/linux/ru.text
+++ b/pages/install/linux/ru.text
@@ -22,6 +22,9 @@ h2. Установить как пакет
 
 Это рекомендуемый способ установки Bitmask. При установке в качестве пакета Bitmask будет работать быстрее, будет лучше интегрирована с системой, а также будет постоянно обновляться.
 
+h3. Ubuntu 15.10 (Wily Werewolf)
+<%= render({:partial => 'via_packages'}, {:distro => 'wily'}) %>
+
 h3. Ubuntu 15.04 (Vivid Vervet)
 
 <%= render({:partial => 'via_packages'}, {:distro => 'vivid'}) %>
@@ -30,10 +33,6 @@ 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'}) %>