summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkali <kali@leap.se>2013-01-24 07:56:52 +0900
committerkali <kali@leap.se>2013-01-24 07:56:52 +0900
commit73b73793d524b795279a697cad12c22a808f5c36 (patch)
tree96011407b7e0e7d0eefa1f1d7f81d7b863ab6172
parent39430cf8c1f9b7118586b1a1f232168fb2d5730b (diff)
update docs
-rw-r--r--docs/dev/environment.rst8
-rw-r--r--docs/pkg/debian.rst5
-rw-r--r--docs/testers/howto.rst2
3 files changed, 7 insertions, 8 deletions
diff --git a/docs/dev/environment.rst b/docs/dev/environment.rst
index 33310b91..c3868b81 100644
--- a/docs/dev/environment.rst
+++ b/docs/dev/environment.rst
@@ -21,18 +21,18 @@ Leap client depends on these libraries:
* `python 2.6 or 2.7`
* `qt4` libraries (see also :ref:`Troubleshooting PyQt install <pyqtvirtualenv>` about how to install inside your virtualenv)
-* `libgnutls`
-* `openvpn<http://openvpn.net/index.php/open-source/345-openvpn-project.html>`_
+* `openssl`
+* `openvpn <http://openvpn.net/index.php/open-source/345-openvpn-project.html>`_
Debian
^^^^^^
In debian-based systems::
- $ apt-get install openvpn python-qt4 python-crypto python-gnutls
+ $ apt-get install openvpn python-qt4 python-crypto python-openssl
To install the software from sources::
- $ apt-get install python-pip python-dev libgnutls-dev
+ $ apt-get install python-pip python-dev
.. _virtualenv:
diff --git a/docs/pkg/debian.rst b/docs/pkg/debian.rst
index 9d6712e1..e98032a5 100644
--- a/docs/pkg/debian.rst
+++ b/docs/pkg/debian.rst
@@ -14,13 +14,12 @@ Dependencies
* ``python-crypto``
* ``python setuptools``
* ``python-requests``
-* ``python-gnutls``
+* ``python-openssl``
.. note::
- these two need a version that is not found in the current debian stable or in ubuntu 12.04.
+ these need a version that is not found in the current debian stable or in ubuntu 12.04.
They will be packaged... soon.
-* ``python-gnutls == 1.1.9``
* ``python-keyring``
For tests
diff --git a/docs/testers/howto.rst b/docs/testers/howto.rst
index 9b55154f..c4a928ed 100644
--- a/docs/testers/howto.rst
+++ b/docs/testers/howto.rst
@@ -21,7 +21,7 @@ Install dependencies
^^^^^^^^^^^^^^^^^^^^
First, install all the base dependencies plus git, virtualenv and development files needed to compile several extensions::
- apt-get install openvpn git-core libgnutls-dev python-dev python-qt4 python-setuptools python-virtualenv
+ apt-get install openvpn git-core python-dev python-qt4 python-setuptools python-virtualenv
Bootstrap script