Merging upstream version 20170101.

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

19 files changed, 23 insertions, 20 deletions

diff --git a/share/man/Makefile b/share/man/Makefile
index decf333..5141ced 100644
--- a/share/man/Makefile
+++ b/share/man/Makefile
@@ -1,7 +1,7 @@
 # Makefile
 
 # container-tools - Manage systemd-nspawn containers
-# Copyright (C) 2014-2016 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+# Copyright (C) 2014-2017 Daniel Baumann <daniel.baumann@open-infrastructure.net>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/share/man/container-auto.1.txt b/share/man/container-auto.1.txt
index 0eb76d2..5aaf0d1 100644
--- a/share/man/container-auto.1.txt
+++ b/share/man/container-auto.1.txt
@@ -1,5 +1,5 @@
 // container-tools - Manage systemd-nspawn containers
-// Copyright (C) 2014-2016 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+// Copyright (C) 2014-2017 Daniel Baumann <daniel.baumann@open-infrastructure.net>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -41,6 +41,9 @@ OPTIONS
 -------
 The following container options are available:
 
+*-f, --force*::
+	Removing stray lock file if existing.
+
 *-s, --start*::
 	Start all container on the host system.
 
diff --git a/share/man/container-console.1.txt b/share/man/container-console.1.txt
index 7b25125..add4fc0 100644
--- a/share/man/container-console.1.txt
+++ b/share/man/container-console.1.txt
@@ -1,5 +1,5 @@
 // container-tools - Manage systemd-nspawn containers
-// Copyright (C) 2014-2016 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+// Copyright (C) 2014-2017 Daniel Baumann <daniel.baumann@open-infrastructure.net>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/share/man/container-create-curl.1.txt b/share/man/container-create-curl.1.txt
index e046b24..a1bd487 100644
--- a/share/man/container-create-curl.1.txt
+++ b/share/man/container-create-curl.1.txt
@@ -1,5 +1,5 @@
 // container-tools - Manage systemd-nspawn containers
-// Copyright (C) 2014-2016 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+// Copyright (C) 2014-2017 Daniel Baumann <daniel.baumann@open-infrastructure.net>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/share/man/container-create-debconf.1.txt b/share/man/container-create-debconf.1.txt
index a51dfef..2b5c37c 100644
--- a/share/man/container-create-debconf.1.txt
+++ b/share/man/container-create-debconf.1.txt
@@ -1,5 +1,5 @@
 // container-tools - Manage systemd-nspawn containers
-// Copyright (C) 2014-2016 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+// Copyright (C) 2014-2017 Daniel Baumann <daniel.baumann@open-infrastructure.net>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/share/man/container-create-debootstrap.1.txt b/share/man/container-create-debootstrap.1.txt
index 9de3f94..5b3b815 100644
--- a/share/man/container-create-debootstrap.1.txt
+++ b/share/man/container-create-debootstrap.1.txt
@@ -1,5 +1,5 @@
 // container-tools - Manage systemd-nspawn containers
-// Copyright (C) 2014-2016 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+// Copyright (C) 2014-2017 Daniel Baumann <daniel.baumann@open-infrastructure.net>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/share/man/container-create.1.txt b/share/man/container-create.1.txt
index 0fd5187..9176b84 100644
--- a/share/man/container-create.1.txt
+++ b/share/man/container-create.1.txt
@@ -1,5 +1,5 @@
 // container-tools - Manage systemd-nspawn containers
-// Copyright (C) 2014-2016 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+// Copyright (C) 2014-2017 Daniel Baumann <daniel.baumann@open-infrastructure.net>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/share/man/container-enter.1.txt b/share/man/container-enter.1.txt
index 42a7211..43d1721 100644
--- a/share/man/container-enter.1.txt
+++ b/share/man/container-enter.1.txt
@@ -1,5 +1,5 @@
 // container-tools - Manage systemd-nspawn containers
-// Copyright (C) 2014-2016 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+// Copyright (C) 2014-2017 Daniel Baumann <daniel.baumann@open-infrastructure.net>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/share/man/container-limit.1.txt b/share/man/container-limit.1.txt
index 9fc9cba..f942fba 100644
--- a/share/man/container-limit.1.txt
+++ b/share/man/container-limit.1.txt
@@ -1,5 +1,5 @@
 // container-tools - Manage systemd-nspawn containers
-// Copyright (C) 2014-2016 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+// Copyright (C) 2014-2017 Daniel Baumann <daniel.baumann@open-infrastructure.net>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/share/man/container-list.1.txt b/share/man/container-list.1.txt
index d964c4e..abb4c8f 100644
--- a/share/man/container-list.1.txt
+++ b/share/man/container-list.1.txt
@@ -1,5 +1,5 @@
 // container-tools - Manage systemd-nspawn containers
-// Copyright (C) 2014-2016 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+// Copyright (C) 2014-2017 Daniel Baumann <daniel.baumann@open-infrastructure.net>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/share/man/container-move.1.txt b/share/man/container-move.1.txt
index 43e04bc..0c682d3 100644
--- a/share/man/container-move.1.txt
+++ b/share/man/container-move.1.txt
@@ -1,5 +1,5 @@
 // container-tools - Manage systemd-nspawn containers
-// Copyright (C) 2014-2016 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+// Copyright (C) 2014-2017 Daniel Baumann <daniel.baumann@open-infrastructure.net>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/share/man/container-remove.1.txt b/share/man/container-remove.1.txt
index 843fa5e..917311d 100644
--- a/share/man/container-remove.1.txt
+++ b/share/man/container-remove.1.txt
@@ -1,5 +1,5 @@
 // container-tools - Manage systemd-nspawn containers
-// Copyright (C) 2014-2016 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+// Copyright (C) 2014-2017 Daniel Baumann <daniel.baumann@open-infrastructure.net>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/share/man/container-restart.1.txt b/share/man/container-restart.1.txt
index 2aed923..c2b2d39 100644
--- a/share/man/container-restart.1.txt
+++ b/share/man/container-restart.1.txt
@@ -1,5 +1,5 @@
 // container-tools - Manage systemd-nspawn containers
-// Copyright (C) 2014-2016 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+// Copyright (C) 2014-2017 Daniel Baumann <daniel.baumann@open-infrastructure.net>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/share/man/container-shell.1.txt b/share/man/container-shell.1.txt
index 38a8034..6d792b8 100644
--- a/share/man/container-shell.1.txt
+++ b/share/man/container-shell.1.txt
@@ -1,5 +1,5 @@
 // container-tools - Manage systemd-nspawn containers
-// Copyright (C) 2014-2016 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+// Copyright (C) 2014-2017 Daniel Baumann <daniel.baumann@open-infrastructure.net>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/share/man/container-start.1.txt b/share/man/container-start.1.txt
index 64c4b3c..5210d08 100644
--- a/share/man/container-start.1.txt
+++ b/share/man/container-start.1.txt
@@ -1,5 +1,5 @@
 // container-tools - Manage systemd-nspawn containers
-// Copyright (C) 2014-2016 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+// Copyright (C) 2014-2017 Daniel Baumann <daniel.baumann@open-infrastructure.net>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/share/man/container-stop.1.txt b/share/man/container-stop.1.txt
index 07426af..95c67e4 100644
--- a/share/man/container-stop.1.txt
+++ b/share/man/container-stop.1.txt
@@ -1,5 +1,5 @@
 // container-tools - Manage systemd-nspawn containers
-// Copyright (C) 2014-2016 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+// Copyright (C) 2014-2017 Daniel Baumann <daniel.baumann@open-infrastructure.net>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/share/man/container-tools.7.txt b/share/man/container-tools.7.txt
index b6c83d6..9f9aba4 100644
--- a/share/man/container-tools.7.txt
+++ b/share/man/container-tools.7.txt
@@ -1,5 +1,5 @@
 // container-tools - Manage systemd-nspawn containers
-// Copyright (C) 2014-2016 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+// Copyright (C) 2014-2017 Daniel Baumann <daniel.baumann@open-infrastructure.net>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -48,7 +48,7 @@ INSTALLATION
 
 SOURCE
 ~~~~~~
-  1. sudo apt install asciidoc git docbook-xml docbook-xsl libxml2-utils make xsltproc dbus systemd-container
+  1. sudo apt install asciidoc git docbook-xml docbook-xsl libxml2-utils make xsltproc dbus systemd-container net-tools
   2. git clone https://sources.open-infrastructure.net/software/container-tools
   3. cd container-tools && sudo make install
 
diff --git a/share/man/container-version.1.txt b/share/man/container-version.1.txt
index bb11d40..d3a59f8 100644
--- a/share/man/container-version.1.txt
+++ b/share/man/container-version.1.txt
@@ -1,5 +1,5 @@
 // container-tools - Manage systemd-nspawn containers
-// Copyright (C) 2014-2016 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+// Copyright (C) 2014-2017 Daniel Baumann <daniel.baumann@open-infrastructure.net>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
diff --git a/share/man/container.1.txt b/share/man/container.1.txt
index f76bbda..7708c6a 100644
--- a/share/man/container.1.txt
+++ b/share/man/container.1.txt
@@ -1,5 +1,5 @@
 // container-tools - Manage systemd-nspawn containers
-// Copyright (C) 2014-2016 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+// Copyright (C) 2014-2017 Daniel Baumann <daniel.baumann@open-infrastructure.net>
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by