From 00c0021d891ffd42352a4acc5e389cc543f2779a Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 6 May 2016 14:47:01 +0200 Subject: Merging upstream version 20160501. Signed-off-by: Daniel Baumann --- share/man/container-list.1.txt | 17 ++++++++++++++--- share/man/container-shell.1.txt | 2 +- share/man/container-tools.7.txt | 10 ++++++++-- 3 files changed, 23 insertions(+), 6 deletions(-) (limited to 'share/man') diff --git a/share/man/container-list.1.txt b/share/man/container-list.1.txt index 4dcbd78..e7015b7 100644 --- a/share/man/container-list.1.txt +++ b/share/man/container-list.1.txt @@ -39,13 +39,24 @@ The container list command lists container on the system. OPTIONS ------- -This command has no options. +The following container options are available: +*-a, --all*:: + List all available container. + +*-f, --format='FORMAT'*:: + Use format to list container. Currently available formats are 'short' or 'full' (default). + +*-s, --started*:: + List only started container. + +*-t, --stopped*:: + List only stopped container. EXAMPLES -------- -*List container on the the system:*:: - sudo container list +*List all started container on the the system as a machine-readable list:*:: + sudo container list --all --format=short SEE ALSO diff --git a/share/man/container-shell.1.txt b/share/man/container-shell.1.txt index 9a2fdd8..dc60af2 100644 --- a/share/man/container-shell.1.txt +++ b/share/man/container-shell.1.txt @@ -50,7 +50,7 @@ All container commands are available, see container(1). Additionally, the follow *help COMMAND:*:: shows help (manpage) for a specific container command. -*logout:*:: +*logout*, *exit:*:: exits container-shell. diff --git a/share/man/container-tools.7.txt b/share/man/container-tools.7.txt index d8e5ac9..0e3e44d 100644 --- a/share/man/container-tools.7.txt +++ b/share/man/container-tools.7.txt @@ -51,7 +51,7 @@ SOURCE 2. git clone https://github.com/open-infrastructure/container-tools 3. cd container-tools && sudo make install -DEBIAN 8 (STRETCH) AND NEWER +DEBIAN 9 (STRETCH) AND NEWER ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * sudo apt install container-tools @@ -60,7 +60,13 @@ DEBIAN 8 (STRETCH) AND NEWER DEVELOPMENT ----------- -Bug reports, feature requests, and patches are welcome. Please base them against the 'next' Git branch. +Bug reports, feature requests, and patches are welcome via Github: + + * https://github.com/open-infrastructure/container-tools + +Please base them against the 'next' Git branch using common sense: + + * https://www.kernel.org/doc/Documentation/SubmittingPatches USAGE -- cgit v1.2.3