15 files changed, 95 insertions, 53 deletions
diff --git a/share/man/container-auto.1.txt b/share/man/container-auto.1.txt
index a1f1ab3..0eb76d2 100644
--- a/share/man/container-auto.1.txt
+++ b/share/man/container-auto.1.txt
@@ -68,9 +68,12 @@ HOMEPAGE
 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 sending a bug report to the Debian Bug Tracking System at https://bugs.debian.org.
+CONTACT
+-------
+Bug reports, feature requests, help, patches, support and everything else
+are welcome on the Open Infrastructure Software Mailing List <software@lists.open-infrastructure.net>.
+
+Debian specific bugs can also be reported in the Debian Bug Tracking System at https://bugs.debian.org.
 
 
 AUTHORS
diff --git a/share/man/container-console.1.txt b/share/man/container-console.1.txt
index 410ff92..7b25125 100644
--- a/share/man/container-console.1.txt
+++ b/share/man/container-console.1.txt
@@ -62,9 +62,12 @@ HOMEPAGE
 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 sending a bug report to the Debian Bug Tracking System at https://bugs.debian.org.
+CONTACT
+-------
+Bug reports, feature requests, help, patches, support and everything else
+are welcome on the Open Infrastructure Software Mailing List <software@lists.open-infrastructure.net>.
+
+Debian specific bugs can also be reported in the Debian Bug Tracking System at https://bugs.debian.org.
 
 
 AUTHORS
diff --git a/share/man/container-create-debconf.1.txt b/share/man/container-create-debconf.1.txt
index 9593415..a51dfef 100644
--- a/share/man/container-create-debconf.1.txt
+++ b/share/man/container-create-debconf.1.txt
@@ -141,9 +141,12 @@ HOMEPAGE
 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 sending a bug report to the Debian Bug Tracking System at https://bugs.debian.org.
+CONTACT
+-------
+Bug reports, feature requests, help, patches, support and everything else
+are welcome on the Open Infrastructure Software Mailing List <software@lists.open-infrastructure.net>.
+
+Debian specific bugs can also be reported in the Debian Bug Tracking System at https://bugs.debian.org.
 
 
 AUTHORS
diff --git a/share/man/container-create-debootstrap.1.txt b/share/man/container-create-debootstrap.1.txt
index 7f7d8fb..9de3f94 100644
--- a/share/man/container-create-debootstrap.1.txt
+++ b/share/man/container-create-debootstrap.1.txt
@@ -83,9 +83,12 @@ HOMEPAGE
 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 sending a bug report to the Debian Bug Tracking System at https://bugs.debian.org.
+CONTACT
+-------
+Bug reports, feature requests, help, patches, support and everything else
+are welcome on the Open Infrastructure Software Mailing List <software@lists.open-infrastructure.net>.
+
+Debian specific bugs can also be reported in the Debian Bug Tracking System at https://bugs.debian.org.
 
 
 AUTHORS
diff --git a/share/man/container-create.1.txt b/share/man/container-create.1.txt
index 4fe592f..3ab7419 100644
--- a/share/man/container-create.1.txt
+++ b/share/man/container-create.1.txt
@@ -93,9 +93,12 @@ HOMEPAGE
 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 sending a bug report to the Debian Bug Tracking System at https://bugs.debian.org.
+CONTACT
+-------
+Bug reports, feature requests, help, patches, support and everything else
+are welcome on the Open Infrastructure Software Mailing List <software@lists.open-infrastructure.net>.
+
+Debian specific bugs can also be reported in the Debian Bug Tracking System at https://bugs.debian.org.
 
 
 AUTHORS
diff --git a/share/man/container-list.1.txt b/share/man/container-list.1.txt
index 8ac59c2..6e08d25 100644
--- a/share/man/container-list.1.txt
+++ b/share/man/container-list.1.txt
@@ -82,9 +82,12 @@ HOMEPAGE
 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 sending a bug report to the Debian Bug Tracking System at https://bugs.debian.org.
+CONTACT
+-------
+Bug reports, feature requests, help, patches, support and everything else
+are welcome on the Open Infrastructure Software Mailing List <software@lists.open-infrastructure.net>.
+
+Debian specific bugs can also be reported in the Debian Bug Tracking System at https://bugs.debian.org.
 
 
 AUTHORS
diff --git a/share/man/container-remove.1.txt b/share/man/container-remove.1.txt
index cad779f..4c3577f 100644
--- a/share/man/container-remove.1.txt
+++ b/share/man/container-remove.1.txt
@@ -71,9 +71,12 @@ HOMEPAGE
 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 sending a bug report to the Debian Bug Tracking System at https://bugs.debian.org.
+CONTACT
+-------
+Bug reports, feature requests, help, patches, support and everything else
+are welcome on the Open Infrastructure Software Mailing List <software@lists.open-infrastructure.net>.
+
+Debian specific bugs can also be reported in the Debian Bug Tracking System at https://bugs.debian.org.
 
 
 AUTHORS
diff --git a/share/man/container-restart.1.txt b/share/man/container-restart.1.txt
index eda0174..2aed923 100644
--- a/share/man/container-restart.1.txt
+++ b/share/man/container-restart.1.txt
@@ -62,9 +62,12 @@ HOMEPAGE
 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 sending a bug report to the Debian Bug Tracking System at https://bugs.debian.org.
+CONTACT
+-------
+Bug reports, feature requests, help, patches, support and everything else
+are welcome on the Open Infrastructure Software Mailing List <software@lists.open-infrastructure.net>
+
+Debian specific bugs can also be reported in the Debian Bug Tracking System at https://bugs.debian.org.
 
 
 AUTHORS
diff --git a/share/man/container-shell.1.txt b/share/man/container-shell.1.txt
index f7e0270..38a8034 100644
--- a/share/man/container-shell.1.txt
+++ b/share/man/container-shell.1.txt
@@ -65,9 +65,12 @@ HOMEPAGE
 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 sending a bug report to the Debian Bug Tracking System at https://bugs.debian.org.
+CONTACT
+-------
+Bug reports, feature requests, help, patches, support and everything else
+are welcome on the Open Infrastructure Software Mailing List <software@lists.open-infrastructure.net>.
+
+Debian specific bugs can also be reported in the Debian Bug Tracking System at https://bugs.debian.org.
 
 
 AUTHORS
diff --git a/share/man/container-start.1.txt b/share/man/container-start.1.txt
index bf1d8de..64c4b3c 100644
--- a/share/man/container-start.1.txt
+++ b/share/man/container-start.1.txt
@@ -65,9 +65,12 @@ HOMEPAGE
 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 sending a bug report to the Debian Bug Tracking System at https://bugs.debian.org.
+CONTACT
+-------
+Bug reports, feature requests, help, patches, support and everything else
+are welcome on the Open Infrastructure Software Mailing List <software@lists.open-infrastructure.net>.
+
+Debian specific bugs can also be reported in the Debian Bug Tracking System at https://bugs.debian.org.
 
 
 AUTHORS
diff --git a/share/man/container-status.1.txt b/share/man/container-status.1.txt
index f1688dc..8da969f 100644
--- a/share/man/container-status.1.txt
+++ b/share/man/container-status.1.txt
@@ -62,9 +62,12 @@ HOMEPAGE
 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 sending a bug report to the Debian Bug Tracking System at https://bugs.debian.org.
+CONTACT
+-------
+Bug reports, feature requests, help, patches, support and everything else
+are welcome on the Open Infrastructure Software Mailing List <software@lists.open-infrastructure.net>.
+
+Debian specific bugs can also be reported in the Debian Bug Tracking System at https://bugs.debian.org.
 
 
 AUTHORS
diff --git a/share/man/container-stop.1.txt b/share/man/container-stop.1.txt
index 8b864d6..24fcd93 100644
--- a/share/man/container-stop.1.txt
+++ b/share/man/container-stop.1.txt
@@ -62,9 +62,12 @@ HOMEPAGE
 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 sending a bug report to the Debian Bug Tracking System at https://bugs.debian.org.
+CONTACT
+-------
+Bug reports, feature requests, help, patches, support and everything else
+are welcome on the Open Infrastructure Software Mailing List <software@lists.open-infrastructure.net>.
+
+Debian specific bugs can also be reported in the Debian Bug Tracking System at https://bugs.debian.org.
 
 
 AUTHORS
diff --git a/share/man/container-tools.7.txt b/share/man/container-tools.7.txt
index 2e71b05..b6c83d6 100644
--- a/share/man/container-tools.7.txt
+++ b/share/man/container-tools.7.txt
@@ -37,7 +37,6 @@ container-tools provides the system integration for managing containers using sy
 
 DOWNLOAD
 --------
-
   * 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
@@ -49,32 +48,33 @@ INSTALLATION
 
 SOURCE
 ~~~~~~
-
   1. sudo apt install asciidoc git docbook-xml docbook-xsl libxml2-utils make xsltproc dbus systemd-container
   2. git clone https://sources.open-infrastructure.net/software/container-tools
   3. cd container-tools && sudo make install
 
 DEBIAN 9 (STRETCH) AND NEWER
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
   * sudo apt install container-tools
 
 
 DEVELOPMENT
 -----------
+Bug reports, feature requests, help, patches, support and everything else
+are welcome on the Open Infrastructure Software Mailing List:
 
-Bug reports, feature requests, and patches are welcome via Debian Bug Tracking System:
+  * https://lists.open-infrastructure.net/listinfo/software
 
-  * https://bugs.debian.org
-
-Please base them against the 'next' Git branch using common sense:
+Please base patches against the 'next' Git branch using common sense:
 
   * https://www.kernel.org/doc/Documentation/SubmittingPatches
 
+Debian specific bugs can also be reported in the Debian Bug Tracking System:
+
+  * https://bugs.debian.org
+
 
 KNOWN LIMITATIONS
 -----------------
-
   * This version of container-tools currently do not work with systemd-networkd and depend on ifupdown.
   * Using overlay, the upper directory can not be an NFS mount due to limitations in Linux' overlay filesystem,
     see https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/Documentation/filesystems/overlayfs.txt
@@ -82,7 +82,6 @@ KNOWN LIMITATIONS
 
 USAGE
 -----
-
 *Create a new container:*::
 	sudo container create -n NAME
 
@@ -106,7 +105,6 @@ See container(1) for a list of all container commands.
 
 LINKS
 -----
-
 *2016-02-24: Systemd vs. Docker*::
 	https://lwn.net/Articles/676831/
 
@@ -131,5 +129,4 @@ LINKS
 
 AUTHORS
 -------
-
   * Daniel Baumann <daniel.baumann@open-infrastructure.net>
diff --git a/share/man/container-version.1.txt b/share/man/container-version.1.txt
index 5e50ad4..d9f37f9 100644
--- a/share/man/container-version.1.txt
+++ b/share/man/container-version.1.txt
@@ -59,9 +59,12 @@ HOMEPAGE
 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 sending a bug report to the Debian Bug Tracking System at https://bugs.debian.org.
+CONTACT
+-------
+Bug reports, feature requests, help, patches, support and everything else
+are welcome on the Open Infrastructure Software Mailing List <software@lists.open-infrastructure.net>.
+
+Debian specific bugs can also be reported in the Debian Bug Tracking System at https://bugs.debian.org.
 
 
 AUTHORS
diff --git a/share/man/container.1.txt b/share/man/container.1.txt
index 78a7d68..880d990 100644
--- a/share/man/container.1.txt
+++ b/share/man/container.1.txt
@@ -81,6 +81,9 @@ FILES
 -----
 The following files are used:
 
+*/etc/container-tools*::
+	Container configuration files.
+
 */usr/bin/container*, */usr/bin/cnt*::
 	Container program.
 
@@ -111,9 +114,12 @@ HOMEPAGE
 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 sending a bug report to the Debian Bug Tracking System at https://bugs.debian.org.
+CONTACT
+-------
+Bug reports, feature requests, help, patches, support and everything else
+are welcome on the Open Infrastructure Software Mailing List <software@lists.open-infrastructure.net>.
+
+Debian specific bugs can also be reported in the Debian Bug Tracking System at https://bugs.debian.org.
 
 
 AUTHORS