summaryrefslogtreecommitdiffstats
path: root/share/man/container.1.txt
diff options
context:
space:
mode:
authorDaniel Baumann <mail@daniel-baumann.ch>2016-04-21 17:46:30 +0000
committerDaniel Baumann <mail@daniel-baumann.ch>2016-05-06 12:05:10 +0000
commit18068f0826aeafc5643f86d915e12a84695e35a4 (patch)
tree267ee00375f0da5f014bbceaec7625ceb8510a1a /share/man/container.1.txt
parentAdding debian version 20160301-1. (diff)
downloadopen-infrastructure-compute-tools-18068f0826aeafc5643f86d915e12a84695e35a4.tar.xz
open-infrastructure-compute-tools-18068f0826aeafc5643f86d915e12a84695e35a4.zip
Merging upstream version 20160401.
Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
Diffstat (limited to 'share/man/container.1.txt')
-rw-r--r--share/man/container.1.txt12
1 files changed, 9 insertions, 3 deletions
diff --git a/share/man/container.1.txt b/share/man/container.1.txt
index 54e3145..93cf309 100644
--- a/share/man/container.1.txt
+++ b/share/man/container.1.txt
@@ -1,4 +1,4 @@
-// Open Infrastructure: container-tools
+// container-tools - Manage systemd-nspawn containers
// Copyright (C) 2014-2016 Daniel Baumann <daniel.baumann@open-infrastructure.net>
//
// This program is free software: you can redistribute it and/or modify
@@ -24,7 +24,7 @@ CONTAINER(1)
NAME
----
-container - Manage systemd-nspawn Containers
+container - Manage systemd-nspawn containers
SYNOPSIS
@@ -34,7 +34,7 @@ SYNOPSIS
DESCRIPTION
-----------
-container-tools provides the integration for Debian based Containers using systemd-nspawn.
+container-tools provides the system integration for managing containers using systemd-nspawn.
OPTIONS
@@ -67,6 +67,9 @@ The following container commands are available:
*console*::
Attach console to a container, see container-console(1).
+*limit*::
+ Limit ressources of a container, see container-limit(1).
+
*list*::
List container on the system, see container-list(1).
@@ -81,6 +84,9 @@ The following files are used:
*/usr/bin/container*, */usr/bin/cnt*::
Container program.
+*/usr/bin/container-shell*, */usr/bin/cntsh*::
+ Container shell program.
+
*/usr/lib/container-tools*::
Container commands.