From 29d239a3689fda781b969ceb9f7c6ba9645ebcd9 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 14 Jun 2016 21:21:09 +0200 Subject: Merging upstream version 20160615. Signed-off-by: Daniel Baumann --- share/man/container-limit.1.txt | 6 +++--- share/man/container-list.1.txt | 6 ++++++ share/man/container-tools.7.txt | 7 +++++-- 3 files changed, 14 insertions(+), 5 deletions(-) (limited to 'share/man') diff --git a/share/man/container-limit.1.txt b/share/man/container-limit.1.txt index d7a060f..8538fe3 100644 --- a/share/man/container-limit.1.txt +++ b/share/man/container-limit.1.txt @@ -14,8 +14,8 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -CONTAINER-STOP(1) -================= +CONTAINER-LIMIT(1) +================== :doctype: manpage :man manual: Open Infrastructure :man source: container-tools @@ -24,7 +24,7 @@ CONTAINER-STOP(1) NAME ---- -container-stop - Limit ressources of a container +container-limit - Limit ressources of a container SYNOPSIS diff --git a/share/man/container-list.1.txt b/share/man/container-list.1.txt index 4d8bc72..5474da4 100644 --- a/share/man/container-list.1.txt +++ b/share/man/container-list.1.txt @@ -47,6 +47,12 @@ The following container options are available: *-f, --format='FORMAT'*:: Use format to list container. Currently available formats are 'short' or 'full' (default). +*-h, --host='HOSTNAME'*:: + List only container that are enabled for automatic start on the specified hostname. Defaults to list containers of the local system only. Using 'all' shows all container regardless of any automatic start configuration. + +*-h, --other*:: + List only container that are not enable for automatic start on the current system. + *-s, --started*:: List only started container. diff --git a/share/man/container-tools.7.txt b/share/man/container-tools.7.txt index 0e3e44d..95d09c8 100644 --- a/share/man/container-tools.7.txt +++ b/share/man/container-tools.7.txt @@ -38,7 +38,10 @@ container-tools provides the system integration for managing containers using sy DOWNLOAD -------- - * https://github.com/open-infrastructure/container-tools + * Upstream Releases: https://files.open-infrastructure.net/software/container-tools/upstream + * Upstream Sources: https://sources.open-infrastructure.net/software/container-tools + * Debian Releases: https://files.open-infrastructure.net/software/container-tools/debian + * Debian Sources: https://sources.progress-linux.org/users/daniel/debian/packages/open-infrastructure-container-tools INSTALLATION @@ -47,7 +50,7 @@ INSTALLATION SOURCE ~~~~~~ - 1. sudo apt instal asciidoc git docbook-xml docbook-xsl libxml2-utils make xsltproc + 1. sudo apt install asciidoc git docbook-xml docbook-xsl libxml2-utils make xsltproc 2. git clone https://github.com/open-infrastructure/container-tools 3. cd container-tools && sudo make install -- cgit v1.2.3