summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2014-06-05 13:27:04 -0300
committerTomás Touceda <chiiph@leap.se>2014-06-05 13:27:04 -0300
commitb6b906cbfa82210d52805b4cf39bbc21b31b4a24 (patch)
treeb2ab43b1708009b7ac424ef96e3114a64b956189 /docs
parent82e1c4b1e3e5dd49b6e868732451a744ba37ba59 (diff)
parent556c589dd470ed2b48b5421c38156333da78c369 (diff)
Merge remote-tracking branch 'refs/remotes/kali/feature/bitmask-root-versioning' into develop
Diffstat (limited to 'docs')
-rw-r--r--docs/man/bitmask-root.1.rst17
-rw-r--r--docs/man/bitmask.1.rst4
-rw-r--r--docs/release_checklist.wiki1
3 files changed, 15 insertions, 7 deletions
diff --git a/docs/man/bitmask-root.1.rst b/docs/man/bitmask-root.1.rst
index 7ed53aa9..c18cc4d6 100644
--- a/docs/man/bitmask-root.1.rst
+++ b/docs/man/bitmask-root.1.rst
@@ -7,23 +7,24 @@ privileged helper for bitmask, the encrypted internet access toolkit.
------------------------------------------------------------------------
:Author: LEAP Encryption Access Project https://leap.se
-:Date: 2014-05-19
+:Date: 2014-06-05
:Copyright: GPLv3+
-:Version: 0.5.1
+:Version: 0.5.2
:Manual section: 1
:Manual group: General Commands Manual
SYNOPSIS
========
-bitmask-root [openvpn | firewall | isup ] [start | stop] [ARGS]
+bitmask-root [openvpn | firewall | version] [start | stop | isup] [ARGS]
DESCRIPTION
===========
*bitmask-root* is a privileged helper for bitmask.
-It is used to start or stop openvpn and the bitmask firewall.
+It is used to start or stop openvpn and the bitmask firewall. To operate, it
+needs to be executed with root privileges.
OPTIONS
@@ -33,7 +34,9 @@ openvpn
--------
**start** [ARGS] Starts openvpn. All args are passed to openvpn, and
- filtered against a list of allowed args.
+ filtered against a list of allowed args. If the next
+ argument is `restart`, the firewall will not be teared
+ down in the case of errors lauching openvpn.
**stop** Stops openvpn.
@@ -46,6 +49,10 @@ firewall
**stop** Stops the firewall.
+version
+--------
+
+**version** Prints the `bitmask-root` version string.
BUGS
diff --git a/docs/man/bitmask.1.rst b/docs/man/bitmask.1.rst
index 38da64af..6eae7ff5 100644
--- a/docs/man/bitmask.1.rst
+++ b/docs/man/bitmask.1.rst
@@ -7,9 +7,9 @@ graphical client to control LEAP, the encrypted internet access toolkit.
------------------------------------------------------------------------
:Author: LEAP Encryption Access Project https://leap.se
-:Date: 2014-05-19
+:Date: 2014-06-05
:Copyright: GPLv3+
-:Version: 0.5.1
+:Version: 0.5.2
:Manual section: 1
:Manual group: General Commands Manual
diff --git a/docs/release_checklist.wiki b/docs/release_checklist.wiki
index fc99fdf0..075591a7 100644
--- a/docs/release_checklist.wiki
+++ b/docs/release_checklist.wiki
@@ -1,5 +1,6 @@
= Bitmask Release Checklist (*) =
* [ ] Check that all tests are passing!
+ * [ ] Check that the version in bitmask_client/pkg/linux/bitmask-root is bumped if needed.
* [ ] Tag everything
* Should be done for the following packages, in order:
* [ ] 1. leap.common