summaryrefslogtreecommitdiff
path: root/docs/user/intro.rst
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2013-09-04 21:38:02 +0200
committerKali Kaneko <kali@leap.se>2013-09-04 23:39:19 +0200
commit1fd9b7cffaf1063c3a2a23e056556be18ef3848a (patch)
treecd5c4a2a0494a2d887327f0fcc1d7de67b6a0f23 /docs/user/intro.rst
parent1782f6328de41a19dfa8e81f30b9fe31c1a0d34c (diff)
Update intro
Diffstat (limited to 'docs/user/intro.rst')
-rw-r--r--docs/user/intro.rst18
1 files changed, 14 insertions, 4 deletions
diff --git a/docs/user/intro.rst b/docs/user/intro.rst
index 22ad9356..b93df12b 100644
--- a/docs/user/intro.rst
+++ b/docs/user/intro.rst
@@ -6,26 +6,34 @@ Introduction
Bitmask
-------
.. if yoy change this, change it also in the index.rst
-**Bitmask** is a :ref:`GPL3 Licensed <gpl3>` multiplatform client, written in python using PySide, that supports the features offered by :ref:`the LEAP Platform <leapplatform>`. Currently is being tested on Linux, support for OSX and Windows will come soon.
+**Bitmask** is the multiplatform desktop client for the services offered by :ref:`the LEAP Platform <leapplatform>`.
+It is written in python using `PySide`_ and :ref:`licensed under the GPL3 <gpl3>`.
+Currently we distribute pre-compiled bundles for Linux and OSX, with Windows
+bundles following soon.
Features
^^^^^^^^
Bitmask allows to easily secure communications.
-- Provider selection
-- User registration
+- Provider selection.
+- User registration.
- Encrypted Internet Proxy support (autoconfigured service using openvpn).
+- Encrypted email.
Coming soon
^^^^^^^^^^^^
-- Encrypted email
+- Encrypted chat.
+
.. _leapplatform:
The LEAP Platform
^^^^^^^^^^^^^^^^^
+
+.. image:: leap-color-small.*
+
The LEAP Provider Platform is the server-side part of LEAP that is run by service providers. It consists of a set of complementary packages and recipes to automate the maintenance of LEAP services in a hardened GNU/Linux environment. Our goal is to make it painless for service providers and ISPs to deploy a secure communications platform.
Read `more about the LEAP Platform <https://leap.se/en/technology/platform>`_ or `check out the code <https://github.com/leapcode/leap_platform>`_.
@@ -97,5 +105,7 @@ Bitmask is released under the terms of the `GNU GPL version 3`_ or later.
.. _`GNU GPL version 3`: http://www.gnu.org/licenses/gpl.txt
+.. _`PySide`: http://qt-project.org/wiki/PySide
+
.. ??? include whole version?
.. include:: ../COPYING