diff options
author | elijah <elijah@riseup.net> | 2015-11-02 14:30:03 -0800 |
---|---|---|
committer | elijah <elijah@riseup.net> | 2015-11-02 14:30:03 -0800 |
commit | 9b00dd3c1dd07cd59d0bd1b4bcd6a54dae1a03da (patch) | |
tree | 7ce48f9cda603c4a400797b9a087d991f7c57a5b /pages/home | |
parent | 83ff982135829ed88946ffc428dcf6d593b78e2c (diff) | |
parent | 7fe1eed396d8f96754c705289aaf2509d47a5a24 (diff) |
Merge branch 'master' of ssh://leap.se/bitmask_help
Diffstat (limited to 'pages/home')
-rw-r--r-- | pages/home/_about.en.text | 2 | ||||
-rw-r--r-- | pages/home/_about.es.text | 2 | ||||
-rw-r--r-- | pages/home/_intro.en.text | 2 | ||||
-rw-r--r-- | pages/home/_text.haml | 5 |
4 files changed, 8 insertions, 3 deletions
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]] |