summaryrefslogtreecommitdiffstats
path: root/share/man
diff options
context:
space:
mode:
authorDaniel Baumann <mail@daniel-baumann.ch>2016-04-21 17:48:29 +0000
committerDaniel Baumann <mail@daniel-baumann.ch>2016-05-06 12:06:02 +0000
commit87e067ca938dd0ed23e45b55d60c0fd859d037c6 (patch)
tree9c1ad03676a98e0b691a806fa2f82d5d198fe617 /share/man
parentReleasing debian version 20160401-1. (diff)
downloadopen-infrastructure-compute-tools-87e067ca938dd0ed23e45b55d60c0fd859d037c6.tar.xz
open-infrastructure-compute-tools-87e067ca938dd0ed23e45b55d60c0fd859d037c6.zip
Merging upstream version 20160415.
Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
Diffstat (limited to 'share/man')
-rw-r--r--share/man/container-shell.1.txt14
-rw-r--r--share/man/container-stop.1.txt4
-rw-r--r--share/man/container-tools.7.txt2
3 files changed, 16 insertions, 4 deletions
diff --git a/share/man/container-shell.1.txt b/share/man/container-shell.1.txt
index 946f77e..9a2fdd8 100644
--- a/share/man/container-shell.1.txt
+++ b/share/man/container-shell.1.txt
@@ -39,7 +39,19 @@ container-tools provides the system integration for managing containers using sy
COMMANDS
--------
-All container commands are available, see container(1).
+All container commands are available, see container(1). Additionally, the following commands are specific to container-shell:
+
+*about:*::
+ shows introduction (manpage).
+
+*help:*::
+ shows available commands within the container-shell.
+
+*help COMMAND:*::
+ shows help (manpage) for a specific container command.
+
+*logout:*::
+ exits container-shell.
SEE ALSO
diff --git a/share/man/container-stop.1.txt b/share/man/container-stop.1.txt
index 8f368cf..5f8356d 100644
--- a/share/man/container-stop.1.txt
+++ b/share/man/container-stop.1.txt
@@ -44,7 +44,7 @@ The following container options are available:
*-n, --name='NAME'*::
Specify container name.
-*-k, --kill*::
+*-f, --force*::
Instead of running the proper shutdown sequence, terminate all processes of the container imediatly.
@@ -54,7 +54,7 @@ EXAMPLES
sudo container stop -n example.net
*Immediately stop example.net container:*::
- sudo container stop -n example.net -k
+ sudo container stop -n example.net -f
SEE ALSO
diff --git a/share/man/container-tools.7.txt b/share/man/container-tools.7.txt
index dc35030..d8e5ac9 100644
--- a/share/man/container-tools.7.txt
+++ b/share/man/container-tools.7.txt
@@ -54,7 +54,7 @@ SOURCE
DEBIAN 8 (STRETCH) AND NEWER
~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- * sudo apt install open-infrastructure-container-tools
+ * sudo apt install container-tools
DEVELOPMENT