summaryrefslogtreecommitdiff
path: root/docs/client/en.md
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2014-06-11 10:23:48 +0200
committervarac <varacanero@zeromail.org>2014-06-11 10:23:48 +0200
commitdfa5bc15c9a866b3dad595ba9965539cbd229c93 (patch)
tree1d5aa97e3905128e73acb02d22c12d1edfe78894 /docs/client/en.md
parent364db6ffafd036ed768b126b53ad7909e066e152 (diff)
parent4c3543f175252fae9ae48ac8f6accca207eeed8d (diff)
Merge branch 'master' of ssh://code.leap.se/leap_doc
Diffstat (limited to 'docs/client/en.md')
-rw-r--r--docs/client/en.md32
1 files changed, 17 insertions, 15 deletions
diff --git a/docs/client/en.md b/docs/client/en.md
index 0436ec2..4dd6953 100644
--- a/docs/client/en.md
+++ b/docs/client/en.md
@@ -5,15 +5,11 @@
Bitmask
=======
-**Bitmask** is the multiplatform desktop client for the services offered by
-[the LEAP Platform](platform). It is written in python using
-[PySide](http://qt-project.org/wiki/PySide) and licensed under the GPL3. Currently we distribute pre-compiled bundles for Linux and OSX, with Windows bundles following soon.
+**Bitmask** is the multiplatform desktop client for the services offered by [the LEAP Platform](platform).
-You can find the complete up-to-date documentation [at the python package documentation
-site.](http://pythonhosted.org/leap.bitmask "Bitmask documentation")
+It is written in python using [PySide](http://qt-project.org/wiki/PySide) and licensed under the GPL3. Currently we distribute pre-compiled bundles for Linux and OSX, with Windows bundles following soon.
-We include below some sections of the user guide and the development documentation so
-you can get started.
+We include below some sections of the user guide and the development documentation so you can get started.
User Guide
----------
@@ -23,8 +19,7 @@ User Guide
Tester Guide
------------
-This part of the documentation details how to fetch the last development
-version and how to report bugs.
+This part of the documentation details how to fetch the last development version and how to report bugs.
* [Howto for testers](client/testers-howto)
@@ -46,12 +41,19 @@ If you want to contribute to the project, we wrote this for you.
Supported OSs
-------------
-Currently supported OSs (32 and 64 bits) are:
+We currently support:
-* Debian 7 (32bits lxde and 64 bits gnome3)
-* Ubuntu 12.04 (LTS, unity)
-* Ubuntu 13.10 (latest, unity)
+### Through the bundle
+
+* Debian 7
+* Ubuntu 12.04 (LTS)
+* Ubuntu 13.10 (latest)
* Mac OSX >= 10.8
-* Windows 7 (32 bits only)
-* Windows 8 (planned)
+* Note: It *should* work in other Debian based distros
+
+### Through the debian package
+* Ubuntu 13.04 (Raring Ringtail)
+* Ubuntu 13.10 (Saucy Salamander)
+* Debian 7.0 (Wheezy)
+* Debian 8.0 (Jessie)