Adding upstream version 20160601.upstream/20160601

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

14 files changed, 31 insertions, 29 deletions

diff --git a/share/man/container-auto.1.txt b/share/man/container-auto.1.txt
index af2d3c7..cdb9b2c 100644
--- a/share/man/container-auto.1.txt
+++ b/share/man/container-auto.1.txt
@@ -65,12 +65,12 @@ container(1).
 
 HOMEPAGE
 --------
-More information about container-tools and the Open Infrastructure project can be found on the homepage at http://open-infrastructure.net.
+More information about container-tools and the Open Infrastructure project can be found on the homepage at https://open-infrastructure.net.
 
 
 BUGS
 ----
-Bugs can be reported by opening an issue in the GitHub repository at http://github.com/open-infrastructure/container-tools.
+Bugs can be reported by opening an issue in the GitHub repository at https://github.com/open-infrastructure/container-tools.
 
 
 AUTHORS
diff --git a/share/man/container-console.1.txt b/share/man/container-console.1.txt
index abccf63..c898c34 100644
--- a/share/man/container-console.1.txt
+++ b/share/man/container-console.1.txt
@@ -59,12 +59,12 @@ container(1).
 
 HOMEPAGE
 --------
-More information about container-tools and the Open Infrastructure project can be found on the homepage at http://open-infrastructure.net.
+More information about container-tools and the Open Infrastructure project can be found on the homepage at https://open-infrastructure.net.
 
 
 BUGS
 ----
-Bugs can be reported by opening an issue in the GitHub repository at http://github.com/open-infrastructure/container-tools.
+Bugs can be reported by opening an issue in the GitHub repository at https://github.com/open-infrastructure/container-tools.
 
 
 AUTHORS
diff --git a/share/man/container-create-debconf.1.txt b/share/man/container-create-debconf.1.txt
index f882714..beef8b5 100644
--- a/share/man/container-create-debconf.1.txt
+++ b/share/man/container-create-debconf.1.txt
@@ -138,12 +138,12 @@ container(1).
 
 HOMEPAGE
 --------
-More information about container-tools and the Open Infrastructure project can be found on the homepage at http://open-infrastructure.net.
+More information about container-tools and the Open Infrastructure project can be found on the homepage at https://open-infrastructure.net.
 
 
 BUGS
 ----
-Bugs can be reported by opening an issue in the GitHub repository at http://github.com/open-infrastructure/container-tools.
+Bugs can be reported by opening an issue in the GitHub repository at https://github.com/open-infrastructure/container-tools.
 
 
 AUTHORS
diff --git a/share/man/container-create-debootstrap.1.txt b/share/man/container-create-debootstrap.1.txt
index 360d7b6..cc6a109 100644
--- a/share/man/container-create-debootstrap.1.txt
+++ b/share/man/container-create-debootstrap.1.txt
@@ -80,12 +80,12 @@ container(1).
 
 HOMEPAGE
 --------
-More information about container-tools and the Open Infrastructure project can be found on the homepage at http://open-infrastructure.net.
+More information about container-tools and the Open Infrastructure project can be found on the homepage at https://open-infrastructure.net.
 
 
 BUGS
 ----
-Bugs can be reported by opening an issue in the GitHub repository at http://github.com/open-infrastructure/container-tools.
+Bugs can be reported by opening an issue in the GitHub repository at https://github.com/open-infrastructure/container-tools.
 
 
 AUTHORS
diff --git a/share/man/container-create.1.txt b/share/man/container-create.1.txt
index 6646ad1..2553569 100644
--- a/share/man/container-create.1.txt
+++ b/share/man/container-create.1.txt
@@ -67,6 +67,9 @@ The following container scripts are available:
 *debconf*::
 	Advanced script to automatically create Debian based container, see container-create-debconf(1).
 
+*default*::
+	Symlink (if existing) to a container script which is used if no script was specified. On Debian based system this can be managed through update-alternatives(1), i.e. 'sudo update-alternatives --config container-tools_script'.
+
 
 EXAMPLES
 --------
@@ -76,7 +79,6 @@ EXAMPLES
 *Create example.net container using debconf script:*::
 	sudo container create -n example.net -s debconf
 
-
 SEE ALSO
 --------
 container-tools(7),
@@ -85,12 +87,12 @@ container(1).
 
 HOMEPAGE
 --------
-More information about container-tools and the Open Infrastructure project can be found on the homepage at http://open-infrastructure.net.
+More information about container-tools and the Open Infrastructure project can be found on the homepage at https://open-infrastructure.net.
 
 
 BUGS
 ----
-Bugs can be reported by opening an issue in the GitHub repository at http://github.com/open-infrastructure/container-tools.
+Bugs can be reported by opening an issue in the GitHub repository at https://github.com/open-infrastructure/container-tools.
 
 
 AUTHORS
diff --git a/share/man/container-limit.1.txt b/share/man/container-limit.1.txt
index 995374e..d7a060f 100644
--- a/share/man/container-limit.1.txt
+++ b/share/man/container-limit.1.txt
@@ -92,12 +92,12 @@ container(1).
 
 HOMEPAGE
 --------
-More information about container-tools and the Open Infrastructure project can be found on the homepage at http://open-infrastructure.net.
+More information about container-tools and the Open Infrastructure project can be found on the homepage at https://open-infrastructure.net.
 
 
 BUGS
 ----
-Bugs can be reported by opening an issue in the GitHub repository at http://github.com/open-infrastructure/container-tools.
+Bugs can be reported by opening an issue in the GitHub repository at https://github.com/open-infrastructure/container-tools.
 
 
 AUTHORS
diff --git a/share/man/container-list.1.txt b/share/man/container-list.1.txt
index e7015b7..4d8bc72 100644
--- a/share/man/container-list.1.txt
+++ b/share/man/container-list.1.txt
@@ -67,12 +67,12 @@ container(1).
 
 HOMEPAGE
 --------
-More information about container-tools and the Open Infrastructure project can be found on the homepage at http://open-infrastructure.net.
+More information about container-tools and the Open Infrastructure project can be found on the homepage at https://open-infrastructure.net.
 
 
 BUGS
 ----
-Bugs can be reported by opening an issue in the GitHub repository at http://github.com/open-infrastructure/container-tools.
+Bugs can be reported by opening an issue in the GitHub repository at https://github.com/open-infrastructure/container-tools.
 
 
 AUTHORS
diff --git a/share/man/container-remove.1.txt b/share/man/container-remove.1.txt
index e5e38bd..cdd1d15 100644
--- a/share/man/container-remove.1.txt
+++ b/share/man/container-remove.1.txt
@@ -65,12 +65,12 @@ container(1).
 
 HOMEPAGE
 --------
-More information about container-tools and the Open Infrastructure project can be found on the homepage at http://open-infrastructure.net.
+More information about container-tools and the Open Infrastructure project can be found on the homepage at https://open-infrastructure.net.
 
 
 BUGS
 ----
-Bugs can be reported by opening an issue in the GitHub repository at http://github.com/open-infrastructure/container-tools.
+Bugs can be reported by opening an issue in the GitHub repository at https://github.com/open-infrastructure/container-tools.
 
 
 AUTHORS
diff --git a/share/man/container-restart.1.txt b/share/man/container-restart.1.txt
index 992bc5b..1de7277 100644
--- a/share/man/container-restart.1.txt
+++ b/share/man/container-restart.1.txt
@@ -59,12 +59,12 @@ container(1).
 
 HOMEPAGE
 --------
-More information about container-tools and the Open Infrastructure project can be found on the homepage at http://open-infrastructure.net.
+More information about container-tools and the Open Infrastructure project can be found on the homepage at https://open-infrastructure.net.
 
 
 BUGS
 ----
-Bugs can be reported by opening an issue in the GitHub repository at http://github.com/open-infrastructure/container-tools.
+Bugs can be reported by opening an issue in the GitHub repository at https://github.com/open-infrastructure/container-tools.
 
 
 AUTHORS
diff --git a/share/man/container-shell.1.txt b/share/man/container-shell.1.txt
index dc60af2..3a8ed05 100644
--- a/share/man/container-shell.1.txt
+++ b/share/man/container-shell.1.txt
@@ -62,12 +62,12 @@ systemd-nspawn(1).
 
 HOMEPAGE
 --------
-More information about container-tools and the Open Infrastructure project can be found on the homepage at http://open-infrastructure.net.
+More information about container-tools and the Open Infrastructure project can be found on the homepage at https://open-infrastructure.net.
 
 
 BUGS
 ----
-Bugs can be reported by opening an issue in the GitHub repository at http://github.com/open-infrastructure/container-tools.
+Bugs can be reported by opening an issue in the GitHub repository at https://github.com/open-infrastructure/container-tools.
 
 
 AUTHORS
diff --git a/share/man/container-start.1.txt b/share/man/container-start.1.txt
index e74f780..e2405a7 100644
--- a/share/man/container-start.1.txt
+++ b/share/man/container-start.1.txt
@@ -59,12 +59,12 @@ container(1).
 
 HOMEPAGE
 --------
-More information about container-tools and the Open Infrastructure project can be found on the homepage at http://open-infrastructure.net.
+More information about container-tools and the Open Infrastructure project can be found on the homepage at https://open-infrastructure.net.
 
 
 BUGS
 ----
-Bugs can be reported by opening an issue in the GitHub repository at http://github.com/open-infrastructure/container-tools.
+Bugs can be reported by opening an issue in the GitHub repository at https://github.com/open-infrastructure/container-tools.
 
 
 AUTHORS
diff --git a/share/man/container-stop.1.txt b/share/man/container-stop.1.txt
index 5f8356d..cf7ad76 100644
--- a/share/man/container-stop.1.txt
+++ b/share/man/container-stop.1.txt
@@ -65,12 +65,12 @@ container(1).
 
 HOMEPAGE
 --------
-More information about container-tools and the Open Infrastructure project can be found on the homepage at http://open-infrastructure.net.
+More information about container-tools and the Open Infrastructure project can be found on the homepage at https://open-infrastructure.net.
 
 
 BUGS
 ----
-Bugs can be reported by opening an issue in the GitHub repository at http://github.com/open-infrastructure/container-tools.
+Bugs can be reported by opening an issue in the GitHub repository at https://github.com/open-infrastructure/container-tools.
 
 
 AUTHORS
diff --git a/share/man/container-version.1.txt b/share/man/container-version.1.txt
index 4fede67..99548cc 100644
--- a/share/man/container-version.1.txt
+++ b/share/man/container-version.1.txt
@@ -56,12 +56,12 @@ container(1).
 
 HOMEPAGE
 --------
-More information about container-tools and the Open Infrastructure project can be found on the homepage at http://open-infrastructure.net.
+More information about container-tools and the Open Infrastructure project can be found on the homepage at https://open-infrastructure.net.
 
 
 BUGS
 ----
-Bugs can be reported by opening an issue in the GitHub repository at http://github.com/open-infrastructure/container-tools.
+Bugs can be reported by opening an issue in the GitHub repository at https://github.com/open-infrastructure/container-tools.
 
 
 AUTHORS
diff --git a/share/man/container.1.txt b/share/man/container.1.txt
index 93cf309..7ad4f87 100644
--- a/share/man/container.1.txt
+++ b/share/man/container.1.txt
@@ -108,12 +108,12 @@ systemd-nspawn(1).
 
 HOMEPAGE
 --------
-More information about container-tools and the Open Infrastructure project can be found on the homepage at http://open-infrastructure.net.
+More information about container-tools and the Open Infrastructure project can be found on the homepage at https://open-infrastructure.net.
 
 
 BUGS
 ----
-Bugs can be reported by opening an issue in the GitHub repository at http://github.com/open-infrastructure/container-tools.
+Bugs can be reported by opening an issue in the GitHub repository at https://github.com/open-infrastructure/container-tools.
 
 
 AUTHORS