summaryrefslogtreecommitdiff
path: root/docs/dev
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2014-07-11 16:28:57 -0300
committerTomás Touceda <chiiph@leap.se>2014-07-11 16:28:57 -0300
commitfa68f4a86173aca3313d4254811471bc93d2a86d (patch)
tree39549cedefbb8e84c0a71863fd4daaf79bec40f1 /docs/dev
parent07686dfa07b03d5faa609a1554894aadf275a738 (diff)
parent6246056799898218422075994b8f657a6b208bca (diff)
Merge remote-tracking branch 'refs/remotes/elijah/feature/routedns' into develop
Diffstat (limited to 'docs/dev')
-rw-r--r--docs/dev/environment.rst14
-rw-r--r--docs/dev/quickstart.rst2
2 files changed, 2 insertions, 14 deletions
diff --git a/docs/dev/environment.rst b/docs/dev/environment.rst
index 0f6366ef..a3184b01 100644
--- a/docs/dev/environment.rst
+++ b/docs/dev/environment.rst
@@ -54,7 +54,7 @@ It is a tool to create isolated Python environments.
The basic problem being addressed is one of dependencies and versions, and indirectly permissions. Imagine you have an application that needs version 1 of LibFoo, but another application requires version 2. How can you use both these applications? If you install everything into /usr/lib/python2.7/site-packages (or whatever your platform's standard location is), it's easy to end up in a situation where you unintentionally upgrade an application that shouldn't be upgraded.
-Read more about it in the `project documentation page <http://pypi.python.org/pypi/virtualenv/>`_.
+Read more about it in the `project documentation page <http://pypi.python.org/pypi/virtualenv/>`_.
.. note::
this section could be completed with useful options that can be passed to the virtualenv command (e.g., to make portable paths, site-packages, ...). We also should document how to use virtualenvwrapper.
@@ -73,7 +73,7 @@ You first create a virtualenv in any directory that you like::
Note the change in the prompt.
-.. TODO use virtualenvwrapper + isis non-sudo recipe here
+.. TODO use virtualenvwrapper + isis non-sudo recipe here
.. _pysidevirtualenv:
@@ -143,16 +143,6 @@ You need to repeat this step each time you change a ``.ui`` file.
.. TODO need to make translations too?
-.. _copyscriptfiles:
-
-Copy script files
------------------
-
-The openvpn invocation expects some files to be in place. If you have not installed `bitmask` from a debian package, you must copy these files manually by now::
-
- $ sudo mkdir -p /etc/leap
- $ sudo cp pkg/linux/resolv-update /etc/leap
-
.. _policykit:
Running openvpn without root privileges
diff --git a/docs/dev/quickstart.rst b/docs/dev/quickstart.rst
index a8be955e..d9c04a69 100644
--- a/docs/dev/quickstart.rst
+++ b/docs/dev/quickstart.rst
@@ -65,8 +65,6 @@ Compile the resource files::
Copy necessary files into system folders, with root privileges::
- (bitmask)$ sudo mkdir -p /etc/leap
- (bitmask)$ sudo cp pkg/linux/resolv-update /etc/leap
(bitmask)$ sudo cp pkg/linux/polkit/net.openvpn.gui.leap.policy /usr/share/polkit-1/actions/