Adding upstream version 20160801.upstream/20160801

Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>

7 files changed, 16 insertions, 17 deletions

diff --git a/share/man/container-create.1.txt b/share/man/container-create.1.txt
index b7a4f01..4fe592f 100644
--- a/share/man/container-create.1.txt
+++ b/share/man/container-create.1.txt
@@ -56,6 +56,9 @@ The following container-create options are available:
 *-b, --bind='DIRECTORY:DIRECTORY[:OPTIONS][;DIRECTORY:DIRECTORY[:OPTIONS]]'*::
 	Specify container bind mounts, see systemd-nspawn(1) --bind option.
 
+*--cnt-overlay='DIRECTORY_LOWER:DIRECTORY_UPPER:DIRECTORY_WORK:DIRECTORY_MERGED[;DIRECTORY_UPPER:DIRECTORY_LOWER:DIRECTORY_WORK:DIRECTORY_MERGED]'*::
+	Specify container overlay mounts, see Documentation/filesystems/overlayfs.txt.
+
 
 SCRIPTS
 -------
diff --git a/share/man/container-enter.1.txt b/share/man/container-enter.1.txt
index 792cac7..61c0f66 100644
--- a/share/man/container-enter.1.txt
+++ b/share/man/container-enter.1.txt
@@ -29,7 +29,7 @@ container-enter - Enter a container namespace
 
 SYNOPSIS
 --------
-*container enter* ['OPTIONS'] [-- COMMAND|"COMMANDS"]
+*container enter* ['OPTIONS']
 
 
 DESCRIPTION
@@ -50,9 +50,6 @@ EXAMPLES
 *Enter to example.net container namespace:*::
 	sudo container enter -n example.net
 
-*Execute 'ip a' in example.net container namespace:*::
-	sudo container enter -n example.net -- 'ip a'
-
 
 SEE ALSO
 --------
diff --git a/share/man/container-remove.1.txt b/share/man/container-remove.1.txt
index cb9b77f..cad779f 100644
--- a/share/man/container-remove.1.txt
+++ b/share/man/container-remove.1.txt
@@ -47,6 +47,9 @@ The following container options are available:
 *-f, --force*::
 	Do not prompt before removal.
 
+*-v, --verbose*::
+	Explain what is being done.
+
 
 EXAMPLES
 --------
diff --git a/share/man/container-start.1.txt b/share/man/container-start.1.txt
index 313587d..bf1d8de 100644
--- a/share/man/container-start.1.txt
+++ b/share/man/container-start.1.txt
@@ -44,6 +44,9 @@ The following container options are available:
 *-n, --name='NAME'*::
 	Specify container name.
 
+*-f, --force'*::
+	Removing stray lock file if existing.
+
 
 EXAMPLES
 --------
diff --git a/share/man/container-status.1.txt b/share/man/container-status.1.txt
index e5c700b..f1688dc 100644
--- a/share/man/container-status.1.txt
+++ b/share/man/container-status.1.txt
@@ -24,7 +24,7 @@ CONTAINER-STATUS(1)
 
 NAME
 ----
-container-status - Get the status of a container
+container-status - Show container status
 
 
 SYNOPSIS
diff --git a/share/man/container-tools.7.txt b/share/man/container-tools.7.txt
index 7fd1a0f..604683f 100644
--- a/share/man/container-tools.7.txt
+++ b/share/man/container-tools.7.txt
@@ -87,30 +87,20 @@ USAGE
 *Start a container:*::
 	sudo container start -n NAME
 
-*Restart a container:*::
-	sudo container restart -n NAME
-
 *Stop a container:*::
 	sudo container stop -n NAME
 
 *Remove a container:*::
 	sudo container remove -n NAME
 
-*Attach console to a container:*::
-	sudo container console -n NAME
-
-*Enter a container namespace:*::
-	sudo container enter -n NAME
-
-*limit*::
-	sudo container limit -n NAME --cpu-quota 10%
-
 *List container on the system:*::
 	sudo container list
 
 *Show container-tools version:*::
 	container version
 
+See container(1) for a list of all container commands.
+
 
 LINKS
 -----
diff --git a/share/man/container.1.txt b/share/man/container.1.txt
index d660379..32bd393 100644
--- a/share/man/container.1.txt
+++ b/share/man/container.1.txt
@@ -76,6 +76,9 @@ The following container commands are available:
 *list*::
 	List container on the system, see container-list(1).
 
+*status*::
+	Show container status, see container-status(1).
+
 *version*::
 	Show container-tools version, see container-version(1).