Merging upstream version 20210725.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

50 files changed, 2706 insertions, 2416 deletions

diff --git a/share/man/Makefile b/share/man/Makefile
index 2ef1507..a8af58d 100644
--- a/share/man/Makefile
+++ b/share/man/Makefile
@@ -1,4 +1,4 @@
-# Makefile
+# Open Infrastructure: compute-tools
 
 # Copyright (C) 2014-2021 Daniel Baumann <daniel.baumann@open-infrastructure.net>
 #
@@ -17,28 +17,43 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-# Depends: asciidoc dblatex docbook-xsl libxml2-utils source-highlight
+# Depends: python3-docutils
 
-A2X = a2x \
-	--asciidoc-opts="-a revdate=$(shell cat ../../VERSION.txt)" \
-	--doctype=manpage
+RST2MAN = rst2man \
+	--no-datestamp \
+	--no-generator \
+	--strict \
+	--strip-comments \
+	--tab-width=4 \
+	--verbose
+
+VERSION := $(shell cat ../../VERSION.txt)
 
 SHELL := sh -e
 
 all: build
 
-clean:
-	rm -f *.[0-9]
-	rm -f *.xml
-
 build: man
 
 rebuild: clean build
 
-man: *.txt
-	for FILE in *.txt; \
+man: man.in *.rst
+	@echo -n "Creating manpages... "
+
+	@for FILE in *.rst; \
 	do \
-		$(A2X) --format=manpage $${FILE}; \
+		cp man.in $$(basename $${FILE} .rst); \
+		$(RST2MAN) $${FILE} | \
+		sed	-e '/^.\\" Man page generated/d' \
+			-e '/^.\\" Generated by/d' \
+			-e "s|^\(.TH .*\) \(\"\" \"\"\) |\1 $${VERSION} compute-tools |" \
+		>> $$(basename $${FILE} .rst); \
+		echo -n "."; \
 	done
 
+	@echo " done."
+
+clean:
+	rm -f *.[0-9]
+
 .PHONY: all clean build rebuild man
diff --git a/share/man/compute-tools.7.rst b/share/man/compute-tools.7.rst
new file mode 100644
index 0000000..b6405b2
--- /dev/null
+++ b/share/man/compute-tools.7.rst
@@ -0,0 +1,147 @@
+.. Open Infrastructure: compute-tools
+
+.. Copyright (C) 2014-2021 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+..
+.. SPDX-License-Identifier: GPL-3.0+
+..
+.. 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
+.. the Free Software Foundation, either version 3 of the License, or
+.. (at your option) any later version.
+..
+.. This program is distributed in the hope that it will be useful,
+.. but WITHOUT ANY WARRANTY; without even the implied warranty of
+.. MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+.. GNU General Public License for more details.
+..
+.. You should have received a copy of the GNU General Public License
+.. along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+=============
+compute-tools
+=============
+
+--------------------------------
+Manage systemd-nspawn containers
+--------------------------------
+
+:manual section: 7
+:manual group: Open Infrastructure
+
+Description
+===========
+
+[A Linux container] is an operating-system-level virtualization environment for
+running multiple isolated Linux systems (containers) on a single Linux control
+host.
+
+  -- Wikipedia (https://en.wikipedia.org/wiki/LXC)
+
+**compute-tools** provides the system integration for managing containers using
+systemd-nspawn(1).
+
+Download
+========
+
+| Upstream Releases:
+| https://get.open-infrastructure.net/software/compute-tools/upstream
+
+| Upstream Sources:
+| https://git.open-infrastructure.net/software/compute-tools
+
+| Debian Releases:
+| https://get.open-infrastructure.net/software/compute-tools/debian
+
+| Debian Sources:
+| https://git.progress-linux.org/users/daniel/debian/packages/open-infrastructure-compute-tools
+
+Installation
+============
+
+Source
+------
+
+| $ sudo apt install git make python3-docutils dbus systemd-container
+| $ git clone https://git.open-infrastructure.net/software/compute-tools
+| $ cd compute-tools && sudo make install
+
+Debian 9 (stretch) and newer
+----------------------------
+
+| $ sudo apt install compute-tools
+
+Development
+===========
+
+Bug reports, feature requests, help, patches, support and everything else are
+welcome on the Open Infrastructure Software Mailing List
+(https://lists.open-infrastructure.net/listinfo/software).
+
+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 compute-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
+(https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/Documentation/filesystems/overlayfs.txt).
+
+Usage
+=====
+
+Create a new container:
+  sudo container create -n NAME
+
+Start a container:
+  sudo container start -n NAME
+
+Stop a container:
+  sudo container stop -n NAME
+
+Remove a container:
+  sudo container remove -n NAME
+
+List container on the system:
+  sudo container list
+
+Show container version:
+  container version
+
+See container(1) for a list of all container commands.
+
+Links
+=====
+
+| * 2016-02-24: Systemd vs. Docker
+|   (https://lwn.net/Articles/676831/)
+
+| * 2015-06-10: Systemd and containers
+|  (https://lwn.net/Articles/647634/)
+
+| * 2014-07-07: Control groups
+|   (https://lwn.net/Articles/604609/)
+
+| * 2013-11-13: Systemd-Nspawn is Chroot on Steroids [LinuxCon Europe]
+|   (https://www.youtube.com/watch?v=s7LlUs5D9p4)
+
+| * 2013-11-03: Creating containers with systemd-nspawn
+|   (https://lwn.net/Articles/572957/)
+
+| * 2013-02-06: Systemd lightweight containers
+|   (https://lwn.net/Articles/536033/)
+
+| * 2013-01-04: Namespaces in operation
+|   (https://lwn.net/Articles/531114/)
+
+Authors
+=======
+
+compute-tools were written by Daniel Baumann
+<daniel.baumann@open-infrastructure.net> and others.
diff --git a/share/man/compute-tools.7.txt b/share/man/compute-tools.7.txt
deleted file mode 100644
index e5f2c54..0000000
--- a/share/man/compute-tools.7.txt
+++ /dev/null
@@ -1,133 +0,0 @@
-// Copyright (C) 2014-2021 Daniel Baumann <daniel.baumann@open-infrastructure.net>
-//
-// SPDX-License-Identifier: GPL-3.0+
-//
-// 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
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-CONTAINER-TOOLS(7)
-==================
-:doctype: manpage
-:man manual: Open Infrastructure
-:man source: compute-tools
-:man version: {revnumber}
-
-
-NAME
-----
-compute-tools - Manage systemd-nspawn containers
-
-
-DESCRIPTION
------------
-"[A Linux container] is an operating-system-level virtualization environment for running multiple isolated Linux systems (containers) on a single Linux control host."::
-    -- Wikipedia (https://en.wikipedia.org/wiki/LXC)
-
-compute-tools provides the system integration for managing containers using systemd-nspawn.
-
-
-DOWNLOAD
---------
-  * Upstream Releases: https://get.open-infrastructure.net/software/compute-tools/upstream
-  * Upstream Sources: https://git.open-infrastructure.net/software/compute-tools
-  * Debian Releases: https://get.open-infrastructure.net/software/compute-tools/debian
-  * Debian Sources: https://git.progress-linux.org/users/daniel/debian/packages/open-infrastructure-compute-tools
-
-
-INSTALLATION
-------------
-
-SOURCE
-~~~~~~
-  1. sudo apt install asciidoc git docbook-xml docbook-xsl libxml2-utils make xsltproc dbus systemd-container
-  2. git clone https://git.open-infrastructure.net/software/compute-tools
-  3. cd compute-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:
-
-  * https://lists.open-infrastructure.net/listinfo/software
-
-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 compute-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
-
-
-USAGE
------
-*Create a new container:*::
-	sudo container create -n NAME
-
-*Start a container:*::
-	sudo container start -n NAME
-
-*Stop a container:*::
-	sudo container stop -n NAME
-
-*Remove a container:*::
-	sudo container remove -n NAME
-
-*List container on the system:*::
-	sudo container list
-
-*Show container version:*::
-	container version
-
-See container(1) for a list of all container commands.
-
-
-LINKS
------
-*2016-02-24: Systemd vs. Docker*::
-	https://lwn.net/Articles/676831/
-
-*2015-06-10: Systemd and containers*::
-	https://lwn.net/Articles/647634/
-
-*2014-07-07: Control groups*::
-	https://lwn.net/Articles/604609/
-
-*2013-11-13: Systemd-Nspawn is Chroot on Steroids [LinuxCon Europe]*::
-	https://www.youtube.com/watch?v=s7LlUs5D9p4
-
-*2013-11-03: Creating containers with systemd-nspawn*::
-	https://lwn.net/Articles/572957/
-
-*2013-02-06: Systemd lightweight containers*::
-	https://lwn.net/Articles/536033/
-
-*2013-01-04: Namespaces in operation*::
-	https://lwn.net/Articles/531114/
-
-
-AUTHORS
--------
-compute-tools were written by Daniel Baumann <daniel.baumann@open-infrastructure.net> and others.
diff --git a/share/man/container-auto.1.rst b/share/man/container-auto.1.rst
new file mode 100644
index 0000000..fc588de
--- /dev/null
+++ b/share/man/container-auto.1.rst
@@ -0,0 +1,92 @@
+.. Open Infrastructure: compute-tools
+
+.. Copyright (C) 2014-2021 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+..
+.. SPDX-License-Identifier: GPL-3.0+
+..
+.. 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
+.. the Free Software Foundation, either version 3 of the License, or
+.. (at your option) any later version.
+..
+.. This program is distributed in the hope that it will be useful,
+.. but WITHOUT ANY WARRANTY; without even the implied warranty of
+.. MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+.. GNU General Public License for more details.
+..
+.. You should have received a copy of the GNU General Public License
+.. along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+==============
+container-auto
+==============
+
+-------------------------------------------------------
+Start/stop all container automatically at boot/shutdown
+-------------------------------------------------------
+
+:manual section: 1
+:manual group: Open Infrastructure
+
+Synopsis
+========
+
+| **container auto** ['OPTIONS']
+
+Description
+===========
+
+The **container auto** command starts or stops all container on the host system.
+
+Options
+=======
+
+The following **container auto** options are available:
+
+-f, --force:
+  Removing stray lock file if existing.
+
+-s, --start:
+  Start all container on the host system.
+
+-t, --stop:
+  Stop all container on the host system.
+
+Examples
+========
+
+Start all container on the host system:
+
+  sudo container auto --start
+
+Stop all container on the host system:
+
+  sudo container auto --stop
+
+See also
+========
+
+| compute-tools(7),
+| container(1).
+
+Homepage
+========
+
+More information about compute-tools and the Open Infrastructure project can be
+found on the homepage at https://open-infrastructure.net.
+
+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
+(https://bugs.debian.org).
+
+Authors
+=======
+
+compute-tools were written by Daniel Baumann
+<daniel.baumann@open-infrastructure.net> and others.
diff --git a/share/man/container-auto.1.txt b/share/man/container-auto.1.txt
deleted file mode 100644
index ecb84b0..0000000
--- a/share/man/container-auto.1.txt
+++ /dev/null
@@ -1,85 +0,0 @@
-// Copyright (C) 2014-2021 Daniel Baumann <daniel.baumann@open-infrastructure.net>
-//
-// SPDX-License-Identifier: GPL-3.0+
-//
-// 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
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-CONTAINER-START(1)
-==================
-:doctype: manpage
-:man manual: Open Infrastructure
-:man source: compute-tools
-:man version: {revnumber}
-
-
-NAME
-----
-container-auto - Start/stop all container automatically at boot/shutdown
-
-
-SYNOPSIS
---------
-*container auto* ['OPTIONS']
-
-
-DESCRIPTION
------------
-The container auto command starts or stops all container on the host system.
-
-
-OPTIONS
--------
-The following container options are available:
-
-*-f, --force*::
-	Removing stray lock file if existing.
-
-*-s, --start*::
-	Start all container on the host system.
-
-*-t, --stop*::
-	Stop all container on the host system.
-
-
-EXAMPLES
---------
-*Start all container on the host system:*::
-	sudo container auto --start
-
-*Stop all container on the host system:*::
-	sudo container auto --stop
-
-
-SEE ALSO
---------
-compute-tools(7),
-container(1).
-
-
-HOMEPAGE
---------
-More information about compute-tools and the Open Infrastructure project can be found on the homepage at https://open-infrastructure.net.
-
-
-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
--------
-compute-tools were written by Daniel Baumann <daniel.baumann@open-infrastructure.net> and others.
diff --git a/share/man/container-console.1.rst b/share/man/container-console.1.rst
new file mode 100644
index 0000000..3571bc5
--- /dev/null
+++ b/share/man/container-console.1.rst
@@ -0,0 +1,86 @@
+.. Open Infrastructure: compute-tools
+
+.. Copyright (C) 2014-2021 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+..
+.. SPDX-License-Identifier: GPL-3.0+
+..
+.. 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
+.. the Free Software Foundation, either version 3 of the License, or
+.. (at your option) any later version.
+..
+.. This program is distributed in the hope that it will be useful,
+.. but WITHOUT ANY WARRANTY; without even the implied warranty of
+.. MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+.. GNU General Public License for more details.
+..
+.. You should have received a copy of the GNU General Public License
+.. along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+=================
+container-console
+=================
+
+-------------------------------
+Attach a console to a container
+-------------------------------
+
+:manual section: 1
+:manual group: Open Infrastructure
+
+Synopsis
+========
+
+| **container console** ['OPTIONS']
+
+Description
+===========
+
+The **container console** command attaches a console to a container.
+
+While 'container enter' bypasses the login prompt and drops to a root shell, the
+'container console' command shows a full login prompt where any valid user and
+password combination can be used.
+
+Options
+=======
+
+The following **container console** options are available:
+
+-n, --name='NAME':
+  Specify container name.
+
+Examples
+========
+
+Attach console to example.net container:
+
+  sudo container console -n example.net
+
+See also
+========
+
+| compute-tools(7),
+| container(1).
+
+Homepage
+========
+
+More information about compute-tools and the Open Infrastructure project can be
+found on the homepage at https://open-infrastructure.net.
+
+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
+(https://bugs.debian.org).
+
+Authors
+=======
+
+compute-tools were written by Daniel Baumann
+<daniel.baumann@open-infrastructure.net> and others.
diff --git a/share/man/container-console.1.txt b/share/man/container-console.1.txt
deleted file mode 100644
index 59bb421..0000000
--- a/share/man/container-console.1.txt
+++ /dev/null
@@ -1,79 +0,0 @@
-// Copyright (C) 2014-2021 Daniel Baumann <daniel.baumann@open-infrastructure.net>
-//
-// SPDX-License-Identifier: GPL-3.0+
-//
-// 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
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-CONTAINER-CONSOLE(1)
-====================
-:doctype: manpage
-:man manual: Open Infrastructure
-:man source: compute-tools
-:man version: {revnumber}
-
-
-NAME
-----
-container-console - Attach a console to a container
-
-
-SYNOPSIS
---------
-*container console* ['OPTIONS']
-
-
-DESCRIPTION
------------
-The container console command attaches a console to a container.
-
-While 'container enter' bypasses the login prompt and drops to a root shell,
-the 'container console' command shows a full login prompt where any valid user and password combination can be used.
-
-
-OPTIONS
--------
-The following container options are available:
-
-*-n, --name='NAME'*::
-	Specify container name.
-
-
-EXAMPLES
---------
-*Attach console to example.net container:*::
-	sudo container console -n example.net
-
-
-SEE ALSO
---------
-compute-tools(7),
-container(1).
-
-
-HOMEPAGE
---------
-More information about compute-tools and the Open Infrastructure project can be found on the homepage at https://open-infrastructure.net.
-
-
-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
--------
-compute-tools were written by Daniel Baumann <daniel.baumann@open-infrastructure.net> and others.
diff --git a/share/man/container-create-curl.1.rst b/share/man/container-create-curl.1.rst
new file mode 100644
index 0000000..ce11006
--- /dev/null
+++ b/share/man/container-create-curl.1.rst
@@ -0,0 +1,146 @@
+.. Open Infrastructure: compute-tools
+
+.. Copyright (C) 2014-2021 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+..
+.. SPDX-License-Identifier: GPL-3.0+
+..
+.. 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
+.. the Free Software Foundation, either version 3 of the License, or
+.. (at your option) any later version.
+..
+.. This program is distributed in the hope that it will be useful,
+.. but WITHOUT ANY WARRANTY; without even the implied warranty of
+.. MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+.. GNU General Public License for more details.
+..
+.. You should have received a copy of the GNU General Public License
+.. along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+=====================
+container-create-curl
+=====================
+
+-------------------------------------------------------------------------
+Create a Debian based container by downloading a tarball over the network
+-------------------------------------------------------------------------
+
+:manual section: 1
+:manual group: Open Infrastructure
+
+Synopsis
+========
+
+| **container create -s curl** ['OPTIONS']
+
+Description
+===========
+
+The curl container creation script uses curl(1) to download a tarball over the
+network to create a Debian based container.
+
+Depending on the tarball this script otherwise creates a pure Debian system
+with three modificiations:
+
+  * hostname is set (container name) in /etc/hostname
+  * systemd machine-id is generated in /etc/machine-id
+  * root password is set (user specified or 16 random characters)
+
+Container images
+----------------
+
+compute-tools will download tarballs from a server expecting that the images are
+tarballs with either gzip, lzip, xz, or no compression. See container-images.sh
+as an example on how to create your own container images.
+
+Options
+=======
+
+The following script options are available:
+
+-n, --name='NAME':
+  Specify container name.
+
+-a, --architecture='ARCHITECTURE':
+  Specify container architecture.
+
+--clean:
+  Remove downloaded tarball after successfull container creation.
+
+-p, --root-password='PASSWORD':
+  Specify the root password, defaults to a random 16 character password.
+
+--server='SERVER':
+  Specify the image server to download from, defaults to
+  https://get.open-infrastructure.net/system/container/debian.
+
+--setup='SETUP':
+  Specify the setup image name to download, defaults to the value specified
+  through --system using the setup.tar.${COMPRESSION} suffix.
+
+--system='SYSTEM':
+  Specify the system image name to download, defaults to
+  debian-bullseye-current_${ARCHITECTURE}.system.tar.${COMPRESSION} (where
+  ${ARCHITECTURE} is the host systems architecture and ${COMPRESSION} either
+  lz, xz, or gz depending on compressor availability on the host system).
+
+Examples
+========
+
+Create a Debian 11 (bullseye) based container with same architecture as the host
+system:
+
+  sudo container create -s curl -n bullseye.example.net
+
+Create a Debian 11 (bullseye) based container with different architecture as the
+host system:
+
+  sudo container create -s curl -n bullseye-i386.example.net -- --system debian-bullseye-current_i386.system.tar.xz
+
+Files
+=====
+
+The following files are used:
+
+/etc/compute-tools/config:
+  Container configuration files.
+
+/usr/share/compute-tools/scripts:
+  Container creation scripts.
+
+/usr/share/doc/compute-tools:
+  Container documentation.
+
+/var/lib/machines:
+  Container directory.
+
+/var/cache/container:
+  Container cache directory.
+
+See also
+========
+
+| compute-tools(7),
+| container(1).
+
+Homepage
+========
+
+More information about compute-tools and the Open Infrastructure project can be
+found on the homepage at https://open-infrastructure.net.
+
+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
+(https://bugs.debian.org).
+
+Authors
+=======
+
+compute-tools were written by Daniel Baumann
+<daniel.baumann@open-infrastructure.net> and others.
diff --git a/share/man/container-create-curl.1.txt b/share/man/container-create-curl.1.txt
deleted file mode 100644
index e263092..0000000
--- a/share/man/container-create-curl.1.txt
+++ /dev/null
@@ -1,129 +0,0 @@
-// Copyright (C) 2014-2021 Daniel Baumann <daniel.baumann@open-infrastructure.net>
-//
-// SPDX-License-Identifier: GPL-3.0+
-//
-// 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
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-CONTAINER-CREATE-CURL(1)
-========================
-:doctype: manpage
-:man manual: Open Infrastructure
-:man source: compute-tools
-:man version: {revnumber}
-
-
-NAME
-----
-container-create-curl - Create a Debian based container by downloading a tarball over the network
-
-
-SYNOPSIS
---------
-*container create -s curl* ['OPTIONS']
-
-
-DESCRIPTION
------------
-The curl container creation script uses curl(1) to download a tarball over the
-network to create a Debian based container.
-
-Depending on the tarball this script otherwise creates a pure Debian system with three modificiations:
-
-  * hostname is set (container name) in /etc/hostname
-  * systemd machine-id is generated in /etc/machine-id
-  * root password is set (user specified or 16 random characters)
-
-
-OPTIONS
--------
-The following script options are available:
-
-*-n, --name='NAME'*::
-	Specify container name.
-
-*-a, --architecture='ARCHITECTURE'*::
-	Specify container architecture.
-
-"--clean*::
-	Remove downloaded tarball after successfull container creation.
-
-*-p, --root-password='PASSWORD'*::
-	Specify the root password, defaults to a random 16 character password.
-
-*--server='SERVER'*::
-	Specify the image server to download from, defaults to https://get.open-infrastructure.net/system/container/debian.
-
-*--setup='SETUP'*::
-	Specify the setup image name to download, defaults to the value specified through --system using the setup.tar.${COMPRESSION} suffix.
-
-*--system='SYSTEM'*::
-	Specify the system image name to download, defaults to debian-stretch-current_${ARCHITECTURE}.system.tar.${COMPRESSION} (where ${ARCHITECTURE} is the host systems architecture and ${COMPRESSION} either lz, xz, or gz depending on compressor availability on the host system).
-
-
-EXAMPLES
---------
-*Create a Debian 9 (stretch) based container with same architecture as the host system:*::
-	sudo container create -s curl -n stretch.example.net
-
-*Create a Debian 9 (stretch) based container with different architecture as the host system:*::
-	sudo container create -s curl -n stretch-i386.example.net -- --system debian-stretch-current_i386.system.tar.xz
-
-FILES
------
-The following files are used:
-
-*/etc/compute-tools/config*::
-	Container configuration files.
-
-*/usr/share/compute-tools/scripts*::
-	Container creation scripts.
-
-*/usr/share/doc/compute-tools*::
-	Container documentation.
-
-*/var/lib/machines*::
-	Container directory.
-
-*/var/cache/container*::
-	Container cache directory.
-
-
-CONTAINER IMAGES
-----------------
-
-compute-tools will download tarballs from a server expecting that the images are tarballs with either gzip, lzip, xz, or no compression. See container-images.sh as an example on how to create your own container images.
-
-
-SEE ALSO
---------
-compute-tools(7),
-container(1).
-
-
-HOMEPAGE
---------
-More information about compute-tools and the Open Infrastructure project can be found on the homepage at https://open-infrastructure.net.
-
-
-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
--------
-compute-tools were written by Daniel Baumann <daniel.baumann@open-infrastructure.net> and others.
diff --git a/share/man/container-create-debconf.1.rst b/share/man/container-create-debconf.1.rst
new file mode 100644
index 0000000..b135b46
--- /dev/null
+++ b/share/man/container-create-debconf.1.rst
@@ -0,0 +1,173 @@
+.. Open Infrastructure: compute-tools
+
+.. Copyright (C) 2014-2021 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+..
+.. SPDX-License-Identifier: GPL-3.0+
+..
+.. 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
+.. the Free Software Foundation, either version 3 of the License, or
+.. (at your option) any later version.
+..
+.. This program is distributed in the hope that it will be useful,
+.. but WITHOUT ANY WARRANTY; without even the implied warranty of
+.. MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+.. GNU General Public License for more details.
+..
+.. You should have received a copy of the GNU General Public License
+.. along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+========================
+container-create-debconf
+========================
+
+------------------------------------------------------
+Create an advanced Debian based container with debconf
+------------------------------------------------------
+
+:manual section: 1
+:manual group: Open Infrastructure
+
+Synopsis
+========
+
+| **container create -s debconf** ['OPTIONS']
+| **cnt cr -s debconf** ['OPTIONS']
+
+| **container create -s debian** ['OPTIONS']
+| **cnt cr -s debian** ['OPTIONS']
+
+| **container create -s progress-linux** ['OPTIONS']
+| **cnt cr -s progress-linux** ['OPTIONS']
+
+Description
+===========
+
+The debconf container creation script uses debconf(1) to automatically create a
+Debian based container.
+
+Scope
+-----
+
+Note that this container creation script can do a few things more than just
+automatically debootstrap based on a preseed file. It also allows you to set a
+root password, configure the network, install certain packages and execute
+hooks.
+
+But: this is *not* a replacement for a configuration management system (like
+ansible, puppet, etc.). The intenion of this script is to create the initial
+container to that extend that a configuration managment system can take over.
+
+As an analogy, think of debian-installer: d-i sets up your system to make it
+ready to boot and connect to the network. Everything after that is out of scope.
+Same goes for this script.
+
+Functions
+---------
+
+This script performs the following configuration on top of a Debian based
+system:
+
+  * network
+  * root password
+  * apt repositories
+  * \.\.\.
+
+Modes
+-----
+
+This container creation script can be used under two different names: debian and
+progress-linux.
+
+Alternative, calling it under the debconf name is equal to the debian mode.
+
+Preseeding
+----------
+
+Hierarchy of Preseed Files:
+
+  * The debconf script can be fully preseeded. Such preseed files can include
+    one or more preseed files themselfs (currently, only one layer of includes
+    is supported, no nested or recursive includes).
+
+  * The general rule of 'the later preseed file overwrites the earlier' applies.
+    The debconf script reads the main preseed file (specified either on command
+    line or by debconf selection/input dialog) after any included preseed files
+    in there.
+
+  * That means that debconf values after the include statement in the main
+    preseed file can overwrite any values specified in the included preseed
+    files.
+
+Options
+=======
+
+The following script options are available:
+
+-n, --name='NAME':
+  Specify container name.
+
+-p, --preseed-file='FILE':
+  Specify the preseed file.
+
+Examples
+========
+
+Create a Debian based container:
+
+  sudo container create -s debian -n debian.example.net
+
+Create a Progress Linux container:
+
+  sudo container create -s progress-linux -n progress.example.net
+
+Files
+=====
+
+The following files are used:
+
+/etc/compute-tools/config:
+  Container configuration files.
+
+/usr/share/compute-tools/scripts:
+  Container creation scripts.
+
+/usr/share/doc/compute-tools:
+  Container documentation.
+
+/var/lib/machines:
+  Container directory.
+
+/var/cache/container:
+  Container cache directory.
+
+/tmp/compute-tools:
+  Container temporary directory.
+
+See also
+========
+
+| compute-tools(7),
+| container(1).
+
+Homepage
+========
+
+More information about compute-tools and the Open Infrastructure project can be
+found on the homepage at https://open-infrastructure.net.
+
+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
+(https://bugs.debian.org).
+
+Authors
+=======
+
+compute-tools were written by Daniel Baumann
+<daniel.baumann@open-infrastructure.net> and others.
diff --git a/share/man/container-create-debconf.1.txt b/share/man/container-create-debconf.1.txt
deleted file mode 100644
index a04dfaf..0000000
--- a/share/man/container-create-debconf.1.txt
+++ /dev/null
@@ -1,157 +0,0 @@
-// Copyright (C) 2014-2021 Daniel Baumann <daniel.baumann@open-infrastructure.net>
-//
-// SPDX-License-Identifier: GPL-3.0+
-//
-// 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
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-CONTAINER-CREATE-DEBOOTSTRAP(1)
-===============================
-:doctype: manpage
-:man manual: Open Infrastructure
-:man source: compute-tools
-:man version: {revnumber}
-
-
-NAME
-----
-container-create-debconf - Create an advanced Debian based container with debconf
-
-
-SYNOPSIS
---------
-*container create -s debconf* ['OPTIONS']
-*cnt cr -s debconf* ['OPTIONS']
-
-*container create -s debian* ['OPTIONS']
-*cnt cr -s debian* ['OPTIONS']
-
-*container create -s progress-linux* ['OPTIONS']
-*cnt cr -s progress-linux* ['OPTIONS']
-
-
-DESCRIPTION
------------
-The debconf container creation script uses debconf(1) to automatically create a Debian based container.
-
-SCOPE
-~~~~~
-Note that this container creation script can do a few things more than just automatically debootstrap based on a preseed file.
-It also allows you to set a root password, configure the network, install certain packages and execute hooks.
-
-But: this is *not* a replacement for a configuration management system (like ansible, puppet, etc.).
-The intenion of this script is to create the initial container to that extend that a configuration managment system
-can take over.
-
-As an analogy, think of debian-installer: d-i sets up your system to make it ready to boot and connect to the network. Everything
-after that is out of scope. Same goes for this script.
-
-FUNCTIONS
-~~~~~~~~~
-
-This script performs the following configuration on top of a Debian based system:
-
-  * network
-  * root password
-  * apt repositories
-  * ...
-
-MODES
-~~~~~
-This container creation script can be used under two different names: debian and progress-linux.
-
-Alternative, calling it under the debconf name is equal to the debian mode.
-
-
-PRESEEDING
-~~~~~~~~~~
-
-Hierarchy of Preseed Files
-
-The debconf script can be fully preseeded. Such preseed files
-can include one or more preseed files themselfs (currently, only one layer of
-includes is supported, no nested or recursive includes).
-
-The general rule of 'the later preseed file overwrites the earlier' applies.
-The debconf script reads the main preseed file (specified either on command line or
-by debconf selection/input dialog) after any included preseed files in there.
-
-That means that debconf values after the include statement in the main preseed
-file can overwrite any values specified in the included preseed files.
-
-
-OPTIONS
--------
-The following script options are available:
-
-*-n, --name='NAME'*::
-	Specify container name.
-
-*-p, --preseed-file='FILE'*::
-	Specify the preseed file.
-
-
-EXAMPLES
---------
-*Create a Debian based container:*::
-	sudo container create -s debian -n debian.example.net
-
-*Create a Progress Linux container:*::
-	sudo container create -s progress-linux -n progress.example.net
-
-
-FILES
------
-The following files are used:
-
-*/etc/compute-tools/config*::
-	Container configuration files.
-
-*/usr/share/compute-tools/scripts*::
-	Container creation scripts.
-
-*/usr/share/doc/compute-tools*::
-	Container documentation.
-
-*/var/lib/machines*::
-	Container directory.
-
-*/var/cache/container*::
-	Container cache directory.
-
-*/tmp/compute-tools*::
-	Container temporary directory.
-
-
-SEE ALSO
---------
-compute-tools(7),
-container(1).
-
-
-HOMEPAGE
---------
-More information about compute-tools and the Open Infrastructure project can be found on the homepage at https://open-infrastructure.net.
-
-
-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
--------
-compute-tools were written by Daniel Baumann <daniel.baumann@open-infrastructure.net> and others.
diff --git a/share/man/container-create-debootstrap.1.rst b/share/man/container-create-debootstrap.1.rst
new file mode 100644
index 0000000..29ef1b6
--- /dev/null
+++ b/share/man/container-create-debootstrap.1.rst
@@ -0,0 +1,111 @@
+.. Open Infrastructure: compute-tools
+
+.. Copyright (C) 2014-2021 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+..
+.. SPDX-License-Identifier: GPL-3.0+
+..
+.. 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
+.. the Free Software Foundation, either version 3 of the License, or
+.. (at your option) any later version.
+..
+.. This program is distributed in the hope that it will be useful,
+.. but WITHOUT ANY WARRANTY; without even the implied warranty of
+.. MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+.. GNU General Public License for more details.
+..
+.. You should have received a copy of the GNU General Public License
+.. along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+============================
+container-create-debootstrap
+============================
+
+--------------------------------------------------------------------
+Create a basic Debian based container with debootstrap or mmdebstrap
+--------------------------------------------------------------------
+
+:manual section: 1
+:manual group: Open Infrastructure
+
+Synopsis
+========
+
+| **container create -s debootstrap** ['OPTIONS']
+| **cnt cr -s debootstrap** ['OPTIONS']
+
+| **container create -s mmdebstrap** ['OPTIONS']
+| **cnt cr -s mmdebstrap** ['OPTIONS']
+
+Description
+===========
+
+The debootstrap container creation script uses debootstrap(8) or mmdebstrap(1)
+to create a Debian based container.
+
+This script creates a pure Debian system with three modificiations:
+
+  * apt cache of packages downloaded during debootstrap is cleaned
+  * hostname is set (container name) in /etc/hostname
+  * root password is set (user specified or 16 random characters)
+
+Options
+=======
+
+The following script options are available:
+
+-n, --name='NAME':
+  Specify container name.
+
+-a, --architecture='ARCHITECTURE':
+  Specify the Debian architecture, defaults to the host systems architecture.
+
+-d, --distribution='DISTRIBUTION':
+  Specify the Debian distribution, defaults to bullseye.
+
+-m, --mirror='MIRROR':
+  Specify the Debian mirror, defaults to https://deb.debian.org/debian.
+
+-p, --root-password='PASSWORD':
+  Specify the root password, defaults to a random 16 character password.
+
+Examples
+========
+
+Create a Debian 11 (bullseye) based container with same architecture as the host
+system using debootstrap:
+
+  sudo container create -s debootstrap -n bullseye.example.net
+
+Create a Debian 11 (bullseye) based container with different architecture as the
+host system using mmdebstrap:
+
+  sudo container create -s mmdebstrap -n bullseye-i386.example.net -- -a i386
+
+See also
+========
+
+| compute-tools(7),
+| container(1).
+
+Homepage
+========
+
+More information about compute-tools and the Open Infrastructure project can be
+found on the homepage at https://open-infrastructure.net.
+
+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
+(https://bugs.debian.org).
+
+Authors
+=======
+
+compute-tools were written by Daniel Baumann
+<daniel.baumann@open-infrastructure.net> and others.
diff --git a/share/man/container-create-debootstrap.1.txt b/share/man/container-create-debootstrap.1.txt
deleted file mode 100644
index 37d6414..0000000
--- a/share/man/container-create-debootstrap.1.txt
+++ /dev/null
@@ -1,100 +0,0 @@
-// Copyright (C) 2014-2021 Daniel Baumann <daniel.baumann@open-infrastructure.net>
-//
-// SPDX-License-Identifier: GPL-3.0+
-//
-// 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
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-CONTAINER-CREATE-DEBOOTSTRAP(1)
-===============================
-:doctype: manpage
-:man manual: Open Infrastructure
-:man source: compute-tools
-:man version: {revnumber}
-
-
-NAME
-----
-container-create-debootstrap - Create a basic Debian based container with debootstrap or mmdebstrap
-
-
-SYNOPSIS
---------
-*container create -s debootstrap* ['OPTIONS']
-*cnt cr -s debootstrap* ['OPTIONS']
-
-*container create -s mmdebstrap* ['OPTIONS']
-*cnt cr -s mmdebstrap* ['OPTIONS']
-
-DESCRIPTION
------------
-The debootstrap container creation script uses debootstrap(8) or mmdebstrap(1) to create a Debian based container.
-
-This script creates a pure Debian system with three modificiations:
-
-  * apt cache of packages downloaded during debootstrap is cleaned
-  * hostname is set (container name) in /etc/hostname
-  * root password is set (user specified or 16 random characters)
-
-
-OPTIONS
--------
-The following script options are available:
-
-*-n, --name='NAME'*::
-	Specify container name.
-
-*-a, --architecture='ARCHITECTURE'*::
-	Specify the Debian architecture, defaults to the host systems architecture.
-
-*-d, --distribution='DISTRIBUTION'*::
-	Specify the Debian distribution, defaults to stretch.
-
-*-m, --mirror='MIRROR'*::
-	Specify the Debian mirror, defaults to https://deb.debian.org/debian.
-
-*-p, --root-password='PASSWORD'*::
-	Specify the root password, defaults to a random 16 character password.
-
-
-EXAMPLES
---------
-*Create a Debian 9 (stretch) based container with same architecture as the host system using debootstrap:*::
-	sudo container create -s debootstrap -n stretch.example.net
-
-*Create a Debian 9 (stretch) based container with different architecture as the host system using mmdebstrap:*::
-	sudo container create -s mmdebstrap -n stretch-i386.example.net -- -a i386
-
-
-SEE ALSO
---------
-compute-tools(7),
-container(1).
-
-
-HOMEPAGE
---------
-More information about compute-tools and the Open Infrastructure project can be found on the homepage at https://open-infrastructure.net.
-
-
-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
--------
-compute-tools were written by Daniel Baumann <daniel.baumann@open-infrastructure.net> and others.
diff --git a/share/man/container-create.1.rst b/share/man/container-create.1.rst
new file mode 100644
index 0000000..ada6c72
--- /dev/null
+++ b/share/man/container-create.1.rst
@@ -0,0 +1,146 @@
+.. Open Infrastructure: compute-tools
+
+.. Copyright (C) 2014-2021 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+..
+.. SPDX-License-Identifier: GPL-3.0+
+..
+.. 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
+.. the Free Software Foundation, either version 3 of the License, or
+.. (at your option) any later version.
+..
+.. This program is distributed in the hope that it will be useful,
+.. but WITHOUT ANY WARRANTY; without even the implied warranty of
+.. MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+.. GNU General Public License for more details.
+..
+.. You should have received a copy of the GNU General Public License
+.. along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+================
+container-create
+================
+
+------------------
+Create a container
+------------------
+
+:manual section: 1
+:manual group: Open Infrastructure
+
+Synopsis
+========
+
+| **container create** ['OPTIONS']
+| **cnt cr** ['OPTIONS']
+
+Description
+===========
+
+The **container create** command creates a container based on a script.
+
+Scripts
+-------
+
+The following container scripts are available:
+
+curl:
+  Basic script to create Debian based container, see container-create-curl(1).
+
+debootstrap:
+  Basic script to create Debian based container, see
+  container-create-debootstrap(1).
+
+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_script'.
+
+Options
+=======
+
+The following **container create** options are available:
+
+-n, --name='NAME':
+  Specify container name.
+
+-c, --capability='CAPABILITY':
+  Specify capabilities to grant, see capabilities(7).
+
+-d, --drop-capability='DROP_CAPABILITY':
+  Specify capabilities to drop, see capabilities(7).
+
+-s, --script='SCRIPT':
+  Specify container creation script, defaults to debootstrap.
+
+-v, --verbose:
+  Explain what is being done.
+
+-b, --bind='DIRECTORY:DIRECTORY[:OPTIONS][;DIRECTORY:DIRECTORY[:OPTIONS]]':
+  Specify container read-write bind mounts, see systemd-nspawn(1) --bind option.
+
+--bind-ro='DIRECTORY:DIRECTORY[:OPTIONS][;DIRECTORY:DIRECTORY[:OPTIONS]]':
+  Specify container read-only bind mounts, see systemd-nspawn(1) --bind-ro
+  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.
+
+--cnt.overlay-options='OPTION1,OPTION2[;OPTION3,OPTION4]':
+  Specify container overlay mount options, see
+  Documentation/filesystems/overlayfs.txt.
+
+--cnt.start='OPTION1[,OPTION2,...]':
+  Specify container start options, see container-start(1).
+
+Examples
+========
+
+Create example.net container using curl script:
+
+  sudo container create -n example.net -s curl
+
+Create example.net container using debootstrap script:
+
+  sudo container create -n example.net -s debootstrap
+
+Create example.net container using debconf script:
+
+  sudo container create -n example.net -s debconf
+
+Create example.net container with the default create script and start it:
+
+  sudo container create,start -n example.net
+
+See also
+========
+
+| compute-tools(7),
+| container(1).
+
+Homepage
+========
+
+More information about compute-tools and the Open Infrastructure project can be
+found on the homepage at https://open-infrastructure.net.
+
+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
+(https://bugs.debian.org).
+
+Authors
+=======
+
+compute-tools were written by Daniel Baumann
+<daniel.baumann@open-infrastructure.net> and others.
diff --git a/share/man/container-create.1.txt b/share/man/container-create.1.txt
deleted file mode 100644
index 4de8171..0000000
--- a/share/man/container-create.1.txt
+++ /dev/null
@@ -1,129 +0,0 @@
-// Copyright (C) 2014-2021 Daniel Baumann <daniel.baumann@open-infrastructure.net>
-//
-// SPDX-License-Identifier: GPL-3.0+
-//
-// 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
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-CONTAINER-CREATE(1)
-===================
-:doctype: manpage
-:man manual: Open Infrastructure
-:man source: compute-tools
-:man version: {revnumber}
-
-
-NAME
-----
-container-create - Create a container
-
-
-SYNOPSIS
---------
-*container create* ['OPTIONS']
-*cnt cr* ['OPTIONS']
-
-
-DESCRIPTION
------------
-The container-create command creates a container based on a script.
-
-
-OPTIONS
--------
-The following container-create options are available:
-
-*-n, --name='NAME'*::
-	Specify container name.
-
-*-c, --capability='CAPABILITY'*::
-	Specify capabilities to grant, see capabilities(7).
-
-*-d, --drop-capability='DROP_CAPABILITY'*::
-	Specify capabilities to drop, see capabilities(7).
-
-*-s, --script='SCRIPT'*::
-	Specify container creation script, defaults to debootstrap.
-
-*-v, --verbose*::
-	Explain what is being done.
-
-*-b, --bind='DIRECTORY:DIRECTORY[:OPTIONS][;DIRECTORY:DIRECTORY[:OPTIONS]]'*::
-	Specify container read-write bind mounts, see systemd-nspawn(1) --bind option.
-
-*--bind-ro='DIRECTORY:DIRECTORY[:OPTIONS][;DIRECTORY:DIRECTORY[:OPTIONS]]'*::
-	Specify container read-only bind mounts, see systemd-nspawn(1) --bind-ro 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.
-
-*--cnt.overlay-options='OPTION1,OPTION2[;OPTION3,OPTION4]'*::
-	Specify container overlay mount options, see Documentation/filesystems/overlayfs.txt.
-
-*--cnt.start='OPTION1[,OPTION2,...]'*::
-	Specify container start options, see container-start(1).
-
-
-SCRIPTS
--------
-The following container scripts are available:
-
-*curl*::
-	Basic script to create Debian based container, see container-create-curl(1).
-
-*debootstrap*::
-	Basic script to create Debian based container, see container-create-debootstrap(1).
-
-*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_script'.
-
-
-EXAMPLES
---------
-*Create example.net container using curl script:*::
-	sudo container create -n example.net -s curl
-
-*Create example.net container using debootstrap script:*::
-	sudo container create -n example.net -s debootstrap
-
-*Create example.net container using debconf script:*::
-	sudo container create -n example.net -s debconf
-
-*Create example.net container with the default create script and start it:*::
-	sudo container create,start -n example.net
-
-SEE ALSO
---------
-compute-tools(7),
-container(1).
-
-
-HOMEPAGE
---------
-More information about compute-tools and the Open Infrastructure project can be found on the homepage at https://open-infrastructure.net.
-
-
-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
--------
-compute-tools were written by Daniel Baumann <daniel.baumann@open-infrastructure.net> and others.
diff --git a/share/man/container-enter.1.rst b/share/man/container-enter.1.rst
new file mode 100644
index 0000000..c2f89c6
--- /dev/null
+++ b/share/man/container-enter.1.rst
@@ -0,0 +1,86 @@
+.. Open Infrastructure: compute-tools
+
+.. Copyright (C) 2014-2021 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+..
+.. SPDX-License-Identifier: GPL-3.0+
+..
+.. 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
+.. the Free Software Foundation, either version 3 of the License, or
+.. (at your option) any later version.
+..
+.. This program is distributed in the hope that it will be useful,
+.. but WITHOUT ANY WARRANTY; without even the implied warranty of
+.. MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+.. GNU General Public License for more details.
+..
+.. You should have received a copy of the GNU General Public License
+.. along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+===============
+container-enter
+===============
+
+---------------------------
+Enter a container namespace
+---------------------------
+
+:manual section: 1
+:manual group: Open Infrastructure
+
+Synopsis
+========
+
+| **container enter** ['OPTIONS']
+
+Description
+===========
+
+The **container enter** command enters a container namespace.
+
+While 'container console' shows a full login prompt where any valid user and
+password combination can be used, the 'container enter' command bypasses this
+and drops to a root shell.
+
+Options
+=======
+
+The following **container enter** options are available:
+
+-n, --name='NAME':
+  Specify container name.
+
+Examples
+========
+
+Enter to example.net container namespace:
+
+  sudo container enter -n example.net
+
+See also
+========
+
+| compute-tools(7),
+| container(1).
+
+Homepage
+========
+
+More information about compute-tools and the Open Infrastructure project can be
+found on the homepage at https://open-infrastructure.net.
+
+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
+(https://bugs.debian.org).
+
+Authors
+=======
+
+compute-tools were written by Daniel Baumann
+<daniel.baumann@open-infrastructure.net> and others.
diff --git a/share/man/container-enter.1.txt b/share/man/container-enter.1.txt
deleted file mode 100644
index c7adc1e..0000000
--- a/share/man/container-enter.1.txt
+++ /dev/null
@@ -1,79 +0,0 @@
-// Copyright (C) 2014-2021 Daniel Baumann <daniel.baumann@open-infrastructure.net>
-//
-// SPDX-License-Identifier: GPL-3.0+
-//
-// 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
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-CONTAINER-CONSOLE(1)
-====================
-:doctype: manpage
-:man manual: Open Infrastructure
-:man source: compute-tools
-:man version: {revnumber}
-
-
-NAME
-----
-container-enter - Enter a container namespace
-
-
-SYNOPSIS
---------
-*container enter* ['OPTIONS']
-
-
-DESCRIPTION
------------
-The container enter enters a container namespace.
-
-While 'container console' shows a full login prompt where any valid user and password combination can be used,
-the 'container enter' command bypasses this and drops to a root shell.
-
-
-OPTIONS
--------
-The following container options are available:
-
-*-n, --name='NAME'*::
-	Specify container name.
-
-
-EXAMPLES
---------
-*Enter to example.net container namespace:*::
-	sudo container enter -n example.net
-
-
-SEE ALSO
---------
-compute-tools(7),
-container(1).
-
-
-HOMEPAGE
---------
-More information about compute-tools and the Open Infrastructure project can be found on the homepage at https://open-infrastructure.net.
-
-
-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
--------
-compute-tools were written by Daniel Baumann <daniel.baumann@open-infrastructure.net> and others.
diff --git a/share/man/container-info.1.rst b/share/man/container-info.1.rst
new file mode 100644
index 0000000..3b4d4c1
--- /dev/null
+++ b/share/man/container-info.1.rst
@@ -0,0 +1,97 @@
+.. Open Infrastructure: compute-tools
+
+.. Copyright (C) 2014-2021 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+..
+.. SPDX-License-Identifier: GPL-3.0+
+..
+.. 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
+.. the Free Software Foundation, either version 3 of the License, or
+.. (at your option) any later version.
+..
+.. This program is distributed in the hope that it will be useful,
+.. but WITHOUT ANY WARRANTY; without even the implied warranty of
+.. MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+.. GNU General Public License for more details.
+..
+.. You should have received a copy of the GNU General Public License
+.. along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+==============
+container-info
+==============
+
+----------------------------------------
+Show specific information of a container
+----------------------------------------
+
+:manual section: 1
+:manual group: Open Infrastructure
+
+Synopsis
+========
+
+| **container info** ['OPTIONS']
+
+Description
+===========
+
+The **container info** command shows specific information of a container.
+
+Options
+=======
+
+The following **container info** options are available, defaults to *--status
+--os --ip*:
+
+--status:
+  Show container status (started|stopped|other).
+
+--os:
+  Show container operating system (FIXME: Debian only).
+
+--ip:
+  Show container IP address.
+
+Examples
+========
+
+Show example.net container status:
+
+  sudo container info -n example.net --status
+
+Show example.net container operating system:
+
+  sudo container info -n example.net --os
+
+Show example.net container IP address:
+
+  sudo container info -n example.net --ip
+
+See also
+========
+
+| compute-tools(7),
+| container(1).
+
+Homepage
+========
+
+More information about compute-tools and the Open Infrastructure project can be
+found on the homepage at https://open-infrastructure.net.
+
+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
+(https://bugs.debian.org).
+
+Authors
+=======
+
+compute-tools were written by Daniel Baumann
+<daniel.baumann@open-infrastructure.net> and others.
diff --git a/share/man/container-info.1.txt b/share/man/container-info.1.txt
deleted file mode 100644
index 125bdef..0000000
--- a/share/man/container-info.1.txt
+++ /dev/null
@@ -1,87 +0,0 @@
-// Copyright (C) 2014-2021 Daniel Baumann <daniel.baumann@open-infrastructure.net>
-//
-// SPDX-License-Identifier: GPL-3.0+
-//
-// 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
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-CONTAINER-LIST(1)
-=================
-:doctype: manpage
-:man manual: Open Infrastructure
-:man source: compute-tools
-:man version: {revnumber}
-
-
-NAME
-----
-container-info - Show specific information of a container
-
-
-SYNOPSIS
---------
-*container info* ['OPTIONS']
-
-
-DESCRIPTION
------------
-The container info command shows specific information of a container.
-
-
-OPTIONS
--------
-The following container options are available, defaults to *--status --os --ip*:
-
-*--status*::
-	Show container status (started|stopped|other).
-
-*--os*::
-	Show container operating system (FIXME: Debian only).
-
-*--ip*::
-	Show container IP address.
-
-EXAMPLES
---------
-*Show example.net container status:*::
-	sudo container info -n example.net --status
-
-*Show example.net container operating system:*::
-	sudo container info -n example.net --os
-
-*Show example.net container IP address:*::
-	sudo container info -n example.net --ip
-
-
-SEE ALSO
---------
-compute-tools(7),
-container(1).
-
-
-HOMEPAGE
---------
-More information about compute-tools and the Open Infrastructure project can be found on the homepage at https://open-infrastructure.net.
-
-
-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
--------
-compute-tools were written by Daniel Baumann <daniel.baumann@open-infrastructure.net> and others.
diff --git a/share/man/container-key.1.rst b/share/man/container-key.1.rst
new file mode 100644
index 0000000..0ae508a
--- /dev/null
+++ b/share/man/container-key.1.rst
@@ -0,0 +1,94 @@
+.. Open Infrastructure: compute-tools
+
+.. Copyright (C) 2014-2021 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+..
+.. SPDX-License-Identifier: GPL-3.0+
+..
+.. 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
+.. the Free Software Foundation, either version 3 of the License, or
+.. (at your option) any later version.
+..
+.. This program is distributed in the hope that it will be useful,
+.. but WITHOUT ANY WARRANTY; without even the implied warranty of
+.. MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+.. GNU General Public License for more details.
+..
+.. You should have received a copy of the GNU General Public License
+.. along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+=============
+container-key
+=============
+
+---------------------------------------------
+Manage GnuPG keyring for container operations
+---------------------------------------------
+
+:manual section: 1
+:manual group: Open Infrastructure
+
+Synopsis
+========
+
+| **container key** ['OPTIONS']
+
+Description
+===========
+
+The **container key** command manages the GnuPG keyring for container
+operations.
+
+Options
+=======
+
+The following **container key** options are available:
+
+-a, --add='KEY':
+  Add a key to the keyring.
+
+-l, --list':
+  List keys in the keyring.
+
+-r, --remove='KEY':
+  Remove a key from the keyring.
+
+Examples
+========
+
+Add a key to the keyring:
+
+  gpg --keyserver hkps://hkps.pool.sks-keyservers.net --recv 0x1E9B3AED2D9FA8F6
+  gpg --armor --export 0x1E9B3AED2D9FA8F6 | sudo container key --add -
+
+Remove a key from the keyring:
+
+  sudo container key --remove 0x1E9B3AED2D9FA8F6
+
+See also
+========
+
+| compute-tools(7),
+| container(1).
+
+Homepage
+========
+
+More information about compute-tools and the Open Infrastructure project can be
+found on the homepage at https://open-infrastructure.net.
+
+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
+(https://bugs.debian.org).
+
+Authors
+=======
+
+compute-tools were written by Daniel Baumann
+<daniel.baumann@open-infrastructure.net> and others.
diff --git a/share/man/container-key.1.txt b/share/man/container-key.1.txt
deleted file mode 100644
index e6c1553..0000000
--- a/share/man/container-key.1.txt
+++ /dev/null
@@ -1,86 +0,0 @@
-// Copyright (C) 2014-2021 Daniel Baumann <daniel.baumann@open-infrastructure.net>
-//
-// SPDX-License-Identifier: GPL-3.0+
-//
-// 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
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-CONTAINER-KEY(1)
-================
-:doctype: manpage
-:man manual: Open Infrastructure
-:man source: compute-tools
-:man version: {revnumber}
-
-
-NAME
-----
-container-key - Manage GnuPG keyring for container operations
-
-
-SYNOPSIS
---------
-*container key* ['OPTIONS']
-
-
-DESCRIPTION
------------
-The container key manages the GnuPG keyring for container operations.
-
-
-OPTIONS
--------
-The following container options are available:
-
-*-a, --add='KEY'*::
-	Add a key to the keyring.
-
-*-l, --list'*::
-	List keys in the keyring.
-
-*-r, --remove='KEY'*::
-	Remove a key from the keyring.
-
-
-EXAMPLES
---------
-*Add a key to the keyring:*::
-	gpg --keyserver hkps://hkps.pool.sks-keyservers.net --recv 0x1E9B3AED2D9FA8F6
-	gpg --armor --export 0x1E9B3AED2D9FA8F6 | sudo container key --add -
-
-*Remove a key from the keyring:*::
-	sudo container key --remove 0x1E9B3AED2D9FA8F6
-
-
-SEE ALSO
---------
-compute-tools(7),
-container(1).
-
-
-HOMEPAGE
---------
-More information about compute-tools and the Open Infrastructure project can be found on the homepage at https://open-infrastructure.net.
-
-
-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
--------
-compute-tools were written by Daniel Baumann <daniel.baumann@open-infrastructure.net> and others.
diff --git a/share/man/container-limit.1.rst b/share/man/container-limit.1.rst
new file mode 100644
index 0000000..0fcfea5
--- /dev/null
+++ b/share/man/container-limit.1.rst
@@ -0,0 +1,121 @@
+.. Open Infrastructure: compute-tools
+
+.. Copyright (C) 2014-2021 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+..
+.. SPDX-License-Identifier: GPL-3.0+
+..
+.. 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
+.. the Free Software Foundation, either version 3 of the License, or
+.. (at your option) any later version.
+..
+.. This program is distributed in the hope that it will be useful,
+.. but WITHOUT ANY WARRANTY; without even the implied warranty of
+.. MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+.. GNU General Public License for more details.
+..
+.. You should have received a copy of the GNU General Public License
+.. along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+===============
+container-limit
+===============
+
+-------------------------------
+Limit ressources of a container
+-------------------------------
+
+:manual section: 1
+:manual group: Open Infrastructure
+
+Synopsis
+========
+
+| **container limit** ['OPTIONS']
+
+Description
+===========
+
+The **container limit** command limits ressources available to a container at
+runtime.
+
+Options
+=======
+
+The following **container limit** options are available:
+
+-n, --name='NAME':
+  Specify container name.
+
+--blockio-device-weight='DEVICE WEIGHT':
+  Specify device specific blockio weight, see systemd.resource-control(5).
+
+--blockio-read-bandwidth='DEVICE BYTES':
+  Specify device specific blockio read bandwidth, see
+  systemd.resource-control(5).
+
+-b, --blockio-weight='WEIGHT':
+  Specify general blockio weight, see systemd.resource-control(5).
+
+--blockio-write-bandwidth='DEVICE BYTES':
+  Specify device specific blockio write bandwidth, see
+  systemd.resource-control(5).
+
+-c, --cpu-quota='QUOTA':
+  Specify CPU quota, see systemd.resource-control(5).
+
+--cpu-shares='SHARES':
+  Specify CPU shares, see systemd.resource-control(5).
+
+-m, --memory-limit='BYTES':
+  Specify memory limit, see systemd.resource-control(5).
+
+-t, --tasks-max='NUMBER':
+  Specify tasks max, see systemd.resource-control(5).
+
+Examples
+========
+
+Set blockio weight for the example.net container:
+
+  sudo container limit -n example.net --blockio-weight 100
+
+Set CPU quota for the example.net container:
+
+  sudo container limit -n example.net --cpu-quota 10%
+
+Set memory limit for the example.net container to 1GB:
+
+  sudo container limit -n example.net --memory-limit 1G
+
+Set tasks max for the example.net container to 100:
+
+  sudo container limit -n example.net --tasks-max 100
+
+See also
+========
+
+| compute-tools(7),
+| container(1).
+
+Homepage
+========
+
+More information about compute-tools and the Open Infrastructure project can be
+found on the homepage at https://open-infrastructure.net.
+
+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
+(https://bugs.debian.org).
+
+Authors
+=======
+
+compute-tools were written by Daniel Baumann
+<daniel.baumann@open-infrastructure.net> and others.
diff --git a/share/man/container-limit.1.txt b/share/man/container-limit.1.txt
deleted file mode 100644
index 12d76cd..0000000
--- a/share/man/container-limit.1.txt
+++ /dev/null
@@ -1,109 +0,0 @@
-// Copyright (C) 2014-2021 Daniel Baumann <daniel.baumann@open-infrastructure.net>
-//
-// SPDX-License-Identifier: GPL-3.0+
-//
-// 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
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-CONTAINER-LIMIT(1)
-==================
-:doctype: manpage
-:man manual: Open Infrastructure
-:man source: compute-tools
-:man version: {revnumber}
-
-
-NAME
-----
-container-limit - Limit ressources of a container
-
-
-SYNOPSIS
---------
-*container limit* ['OPTIONS']
-
-
-DESCRIPTION
------------
-The container limit command limits ressources available to a container at runtime.
-
-
-OPTIONS
--------
-The following container options are available:
-
-*-n, --name='NAME'*::
-	Specify container name.
-
-*--blockio-device-weight='DEVICE WEIGHT'*::
-	Specify device specific blockio weight, see systemd.resource-control(5).
-
-*--blockio-read-bandwidth='DEVICE BYTES'*::
-	Specify device specific blockio read bandwidth, see systemd.resource-control(5).
-
-*-b, --blockio-weight='WEIGHT'*::
-	Specify general blockio weight, see systemd.resource-control(5).
-
-*--blockio-write-bandwidth='DEVICE BYTES'*::
-	Specify device specific blockio write bandwidth, see systemd.resource-control(5).
-
-*-c, --cpu-quota='QUOTA'*::
-	Specify CPU quota, see systemd.resource-control(5).
-
-*--cpu-shares='SHARES'*::
-	Specify CPU shares, see systemd.resource-control(5).
-
-*-m, --memory-limit='BYTES'*::
-	Specify memory limit, see systemd.resource-control(5).
-
-*-t, --tasks-max='NUMBER'*::
-	Specify tasks max, see systemd.resource-control(5).
-
-
-EXAMPLES
---------
-*Set blockio weight for the example.net container:*::
-	sudo container limit -n example.net --blockio-weight 100
-
-*Set CPU quota for the example.net container:*::
-	sudo container limit -n example.net --cpu-quota 10%
-
-*Set memory limit for the example.net container to 1GB:*::
-	sudo container limit -n example.net --memory-limit 1G
-
-*Set tasks max for the example.net container to 100:*::
-	sudo container limit -n example.net --tasks-max 100
-
-
-SEE ALSO
---------
-compute-tools(7),
-container(1).
-
-
-HOMEPAGE
---------
-More information about compute-tools and the Open Infrastructure project can be found on the homepage at https://open-infrastructure.net.
-
-
-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
--------
-compute-tools were written by Daniel Baumann <daniel.baumann@open-infrastructure.net> and others.
diff --git a/share/man/container-list.1.rst b/share/man/container-list.1.rst
new file mode 100644
index 0000000..265ae50
--- /dev/null
+++ b/share/man/container-list.1.rst
@@ -0,0 +1,145 @@
+.. Open Infrastructure: compute-tools
+
+.. Copyright (C) 2014-2021 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+..
+.. SPDX-License-Identifier: GPL-3.0+
+..
+.. 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
+.. the Free Software Foundation, either version 3 of the License, or
+.. (at your option) any later version.
+..
+.. This program is distributed in the hope that it will be useful,
+.. but WITHOUT ANY WARRANTY; without even the implied warranty of
+.. MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+.. GNU General Public License for more details.
+..
+.. You should have received a copy of the GNU General Public License
+.. along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+==============
+container-list
+==============
+
+----------------------------
+List container on the system
+----------------------------
+
+:manual section: 1
+:manual group: Open Infrastructure
+
+Synopsis
+========
+
+| **container list** ['OPTIONS']
+| **cnt ls** ['OPTIONS']
+
+Description
+===========
+
+The **container list** command lists container on the system.
+
+Options
+=======
+
+The following **container list** options are available, defaults to '--started
+--stopped':
+
+-a, --all:
+  List all available container (started, stopped, and other).
+
+--csv-separator='SEPARATOR':
+  Specify custom CSV separator, defaults to ','.
+
+-f, --format='FORMAT':
+  Use format to list container. Currently available formats are 'cli' (default),
+  'csv', 'json', 'nwdiag', 'shell', 'sh', 'yaml', or 'xml'.
+
+-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.
+
+--nwdiag-color='COLOR':
+  Specify custom nwdiag color for the host box, defaults to '#3465a4'.
+
+--nwdiag-label='LABEL':
+  Specify custom nwdiag label for the diagram, defaults to empty.
+
+-o, --other:
+  List only container that are not enable for automatic start on the current
+  system.
+
+-s, --started:
+  List only started container.
+
+-t, --stopped:
+  List only stopped container.
+
+Examples
+========
+
+List all started and stopped containers of the local system:
+
+  sudo container list
+
+List all started and other containers:
+
+  sudo container list -s -o
+
+Create a CSV export of all started and stopped containers:
+
+  sudo container list -f csv
+
+Create a JSON export of all started and stopped containers:
+
+  sudo container list -f json
+
+Create a nwdiag export of all started and stopped containers:
+
+  sudo container list -f nwdiag
+
+Create a SVG image via nwdiag of all started and stopped containers:
+
+  sudo container list -f nwdiag | nwdiag -T svg -o cnt-list.svg -
+
+Create a shell export of all started and stopped containers:
+
+  sudo container list -f shell
+  sudo container list -f sh
+
+Create a YAML export of all started and stopped containers:
+
+  sudo container list -f yaml
+
+Create a XML export of all started and stopped containers:
+
+  sudo container list -f xml
+
+See also
+========
+
+| compute-tools(7),
+| container(1).
+
+Homepage
+========
+
+More information about compute-tools and the Open Infrastructure project can be
+found on the homepage at https://open-infrastructure.net.
+
+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
+(https://bugs.debian.org).
+
+Authors
+=======
+
+compute-tools were written by Daniel Baumann
+<daniel.baumann@open-infrastructure.net> and others.
diff --git a/share/man/container-list.1.txt b/share/man/container-list.1.txt
deleted file mode 100644
index 4b3df3a..0000000
--- a/share/man/container-list.1.txt
+++ /dev/null
@@ -1,125 +0,0 @@
-// Copyright (C) 2014-2021 Daniel Baumann <daniel.baumann@open-infrastructure.net>
-//
-// SPDX-License-Identifier: GPL-3.0+
-//
-// 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
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-CONTAINER-LIST(1)
-=================
-:doctype: manpage
-:man manual: Open Infrastructure
-:man source: compute-tools
-:man version: {revnumber}
-
-
-NAME
-----
-container-list - List container on the system
-
-
-SYNOPSIS
---------
-*container list* ['OPTIONS']
-*container ls* ['OPTIONS']
-
-
-DESCRIPTION
------------
-The container list command lists container on the system.
-
-
-OPTIONS
--------
-The following container options are available, defaults to *--started --stopped*:
-
-*-a, --all*::
-	List all available container (started, stopped, and other).
-
-*--csv-separator='SEPARATOR'*::
-	Specify custom CSV separator, defaults to ','.
-
-*-f, --format='FORMAT'*::
-	Use format to list container. Currently available formats are 'cli' (default), 'csv', 'json', 'nwdiag', 'shell', 'sh', 'yaml', or 'xml'.
-
-*-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.
-
-*--nwdiag-color='COLOR'*::
-	Specify custom nwdiag color for the host box, defaults to '#3465a4'.
-
-*--nwdiag-label='LABEL'*::
-	Specify custom nwdiag label for the diagram, defaults to empty.
-
-*-o, --other*::
-	List only container that are not enable for automatic start on the current system.
-
-*-s, --started*::
-	List only started container.
-
-*-t, --stopped*::
-	List only stopped container.
-
-EXAMPLES
---------
-*List all started and stopped containers of the local system:*::
-	sudo container list
-
-*List all started and other containers:*::
-	sudo container list -s -o
-
-*Create a CSV export of all started and stopped containers:*::
-	sudo container list -f csv
-
-*Create a JSON export of all started and stopped containers:*::
-	sudo container list -f json
-
-*Create a nwdiag export of all started and stopped containers:*::
-	sudo container list -f nwdiag
-
-*Create a SVG image via nwdiag of all started and stopped containers:*::
-	sudo container list -f nwdiag | nwdiag -T svg -o cnt-list.svg -
-
-*Create a shell export of all started and stopped containers:*::
-	sudo container list -f shell
-	sudo container list -f sh
-
-*Create a YAML export of all started and stopped containers:*::
-	sudo container list -f yaml
-
-*Create a XML export of all started and stopped containers:*::
-	sudo container list -f xml
-
-
-SEE ALSO
---------
-compute-tools(7),
-container(1).
-
-
-HOMEPAGE
---------
-More information about compute-tools and the Open Infrastructure project can be found on the homepage at https://open-infrastructure.net.
-
-
-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
--------
-compute-tools were written by Daniel Baumann <daniel.baumann@open-infrastructure.net> and others.
diff --git a/share/man/container-log.1.rst b/share/man/container-log.1.rst
new file mode 100644
index 0000000..2d26a37
--- /dev/null
+++ b/share/man/container-log.1.rst
@@ -0,0 +1,101 @@
+.. Open Infrastructure: compute-tools
+
+.. Copyright (C) 2014-2021 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+..
+.. SPDX-License-Identifier: GPL-3.0+
+..
+.. 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
+.. the Free Software Foundation, either version 3 of the License, or
+.. (at your option) any later version.
+..
+.. This program is distributed in the hope that it will be useful,
+.. but WITHOUT ANY WARRANTY; without even the implied warranty of
+.. MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+.. GNU General Public License for more details.
+..
+.. You should have received a copy of the GNU General Public License
+.. along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+=============
+container-log
+=============
+
+------------------
+Show container log
+------------------
+
+:manual section: 1
+:manual group: Open Infrastructure
+
+Synopsis
+========
+
+| **container log** ['OPTIONS']
+
+Description
+===========
+
+The **container log** command shows the container log.
+
+Options
+=======
+
+The following **container log** options are available:
+
+-d, --date:
+  Show only log entries of the specified date as 'YYYY-MM-DD' or a date range like 'today-7'.
+
+-n, --name:
+  Show only log entries for the specified container.
+
+Examples
+========
+
+Show all log entries:
+
+  sudo container log
+
+Show only log entries of today:
+
+  sudo container log -d today
+
+Show only log entries of yesterday:
+
+  sudo container log -d yesterday
+
+Show all log entries of the example.net container:
+
+  sudo container log -n example.net
+
+Show only log entries of the example.net container of the last 30 days:
+
+  sudo container log -d today-30 -n example.net
+
+See also
+========
+
+| compute-tools(7),
+| container(1).
+
+Homepage
+========
+
+More information about compute-tools and the Open Infrastructure project can be
+found on the homepage at https://open-infrastructure.net.
+
+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
+(https://bugs.debian.org).
+
+Authors
+=======
+
+compute-tools were written by Daniel Baumann
+<daniel.baumann@open-infrastructure.net> and others.
diff --git a/share/man/container-log.1.txt b/share/man/container-log.1.txt
deleted file mode 100644
index b503d42..0000000
--- a/share/man/container-log.1.txt
+++ /dev/null
@@ -1,90 +0,0 @@
-// Copyright (C) 2014-2021 Daniel Baumann <daniel.baumann@open-infrastructure.net>
-//
-// SPDX-License-Identifier: GPL-3.0+
-//
-// 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
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-CONTAINER-LOG(1)
-================
-:doctype: manpage
-:man manual: Open Infrastructure
-:man source: compute-tools
-:man version: {revnumber}
-
-
-NAME
-----
-container-log - Show container log
-
-
-SYNOPSIS
---------
-*container log* ['OPTIONS']
-
-
-DESCRIPTION
------------
-The container log command shows the container log.
-
-
-OPTIONS
--------
-The following container options are available:
-
-*-d, --date*::
-	Show only log entries of the specified date as 'YYYY-MM-DD' or a date range like 'today-7'.
-
-*-n, --name*::
-	Show only log entries for the specified container.
-
-EXAMPLES
---------
-*Show all log entries:*::
-	sudo container log
-
-*Show only log entries of today:*::
-	sudo container log -d today
-
-*Show only log entries of yesterday:*::
-	sudo container log -d yesterday
-
-*Show all log entries of the example.net container:*::
-	sudo container log -n example.net
-
-*Show only log entries of the example.net container of the last 30 days:*::
-	sudo container log -d today-30 -n example.net
-
-
-SEE ALSO
---------
-compute-tools(7),
-container(1).
-
-
-HOMEPAGE
---------
-More information about compute-tools and the Open Infrastructure project can be found on the homepage at https://open-infrastructure.net.
-
-
-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
--------
-compute-tools were written by Daniel Baumann <daniel.baumann@open-infrastructure.net> and others.
diff --git a/share/man/container-move.1.rst b/share/man/container-move.1.rst
new file mode 100644
index 0000000..f77662f
--- /dev/null
+++ b/share/man/container-move.1.rst
@@ -0,0 +1,93 @@
+.. Open Infrastructure: compute-tools
+
+.. Copyright (C) 2014-2021 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+..
+.. SPDX-License-Identifier: GPL-3.0+
+..
+.. 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
+.. the Free Software Foundation, either version 3 of the License, or
+.. (at your option) any later version.
+..
+.. This program is distributed in the hope that it will be useful,
+.. but WITHOUT ANY WARRANTY; without even the implied warranty of
+.. MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+.. GNU General Public License for more details.
+..
+.. You should have received a copy of the GNU General Public License
+.. along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+==============
+container-move
+==============
+
+------------------
+Rename a container
+------------------
+
+:manual section: 1
+:manual group: Open Infrastructure
+
+Synopsis
+========
+
+| **container move** ['OPTIONS']
+| **cnt mv** ['OPTIONS']
+
+Description
+===========
+
+The **container move** commands renames a container.
+
+Options
+=======
+
+The following **container move** options are available:
+
+-n, --new='NAME':
+  Specify new container name.
+
+-f, --force:
+  Do not prompt before moving.
+
+-o, --old:
+  Specify old container name.
+
+Examples
+========
+
+Rename example.net container to example.org:
+
+  sudo container move -n example.org -o example.net
+
+Rename example.net container to example.org without prompt:
+
+  sudo container move -n example.org -o example.net -f
+
+See also
+========
+
+| compute-tools(7),
+| container(1).
+
+Homepage
+========
+
+More information about compute-tools and the Open Infrastructure project can be
+found on the homepage at https://open-infrastructure.net.
+
+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
+(https://bugs.debian.org).
+
+Authors
+=======
+
+compute-tools were written by Daniel Baumann
+<daniel.baumann@open-infrastructure.net> and others.
diff --git a/share/man/container-move.1.txt b/share/man/container-move.1.txt
deleted file mode 100644
index 5c9475c..0000000
--- a/share/man/container-move.1.txt
+++ /dev/null
@@ -1,86 +0,0 @@
-// Copyright (C) 2014-2021 Daniel Baumann <daniel.baumann@open-infrastructure.net>
-//
-// SPDX-License-Identifier: GPL-3.0+
-//
-// 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
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-CONTAINER-REMOVE(1)
-===================
-:doctype: manpage
-:man manual: Open Infrastructure
-:man source: compute-tools
-:man version: {revnumber}
-
-
-NAME
-----
-container-move - Rename a container
-
-
-SYNOPSIS
---------
-*container move* ['OPTIONS']
-*cnt mv* ['OPTIONS']
-
-
-DESCRIPTION
------------
-The container move commands renames a container.
-
-
-OPTIONS
--------
-The following container options are available:
-
-*-n, --new='NAME'*::
-	Specify new container name.
-
-*-f, --force*::
-	Do not prompt before moving.
-
-*-o, --old*::
-	Specify old container name.
-
-
-EXAMPLES
---------
-*Rename example.net container to example.org:*::
-	sudo container move -n example.org -o example.net
-
-*Rename example.net container to example.org without prompt:*::
-	sudo container move -n example.org -o example.net -f
-
-
-SEE ALSO
---------
-compute-tools(7),
-container(1).
-
-
-HOMEPAGE
---------
-More information about compute-tools and the Open Infrastructure project can be found on the homepage at https://open-infrastructure.net.
-
-
-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
--------
-compute-tools were written by Daniel Baumann <daniel.baumann@open-infrastructure.net> and others.
diff --git a/share/man/container-remove.1.rst b/share/man/container-remove.1.rst
new file mode 100644
index 0000000..f1b1df0
--- /dev/null
+++ b/share/man/container-remove.1.rst
@@ -0,0 +1,104 @@
+.. Open Infrastructure: compute-tools
+
+.. Copyright (C) 2014-2021 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+..
+.. SPDX-License-Identifier: GPL-3.0+
+..
+.. 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
+.. the Free Software Foundation, either version 3 of the License, or
+.. (at your option) any later version.
+..
+.. This program is distributed in the hope that it will be useful,
+.. but WITHOUT ANY WARRANTY; without even the implied warranty of
+.. MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+.. GNU General Public License for more details.
+..
+.. You should have received a copy of the GNU General Public License
+.. along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+================
+container-remove
+================
+
+------------------
+Remove a container
+------------------
+
+:manual section: 1
+:manual group: Open Infrastructure
+
+Synopsis
+========
+
+| **container remove** ['OPTIONS']
+| **cnt rm** ['OPTIONS']
+
+Description
+===========
+
+The **container remove** command removes a container.
+
+Options
+=======
+
+The following **container remove** options are available:
+
+-n, --name='NAME':
+  Specify container name. Specifying 'ALL' will remove all stopped container.
+
+--allow-stop:
+  Stop container prior removal.
+
+-f, --force:
+  Do not prompt before removal.
+
+-v, --verbose:
+  Explain what is being done.
+
+Examples
+========
+
+Remove example.net container from the system:
+
+  sudo container remove -n example.net
+
+Remove example.net container from the system without prompt:
+
+  sudo container remove -n example.net -f
+
+Remove a running container from the system, without prompt:
+
+  sudo container remove -n example.net -f --allow-stop
+
+Remove all container:
+
+  sudo container remove -n ALL
+
+See also
+========
+
+| compute-tools(7),
+| container(1).
+
+Homepage
+========
+
+More information about compute-tools and the Open Infrastructure project can be
+found on the homepage at https://open-infrastructure.net.
+
+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
+(https://bugs.debian.org).
+
+Authors
+=======
+
+compute-tools were written by Daniel Baumann
+<daniel.baumann@open-infrastructure.net> and others.
diff --git a/share/man/container-remove.1.txt b/share/man/container-remove.1.txt
deleted file mode 100644
index 50ad861..0000000
--- a/share/man/container-remove.1.txt
+++ /dev/null
@@ -1,95 +0,0 @@
-// Copyright (C) 2014-2021 Daniel Baumann <daniel.baumann@open-infrastructure.net>
-//
-// SPDX-License-Identifier: GPL-3.0+
-//
-// 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
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-CONTAINER-REMOVE(1)
-===================
-:doctype: manpage
-:man manual: Open Infrastructure
-:man source: compute-tools
-:man version: {revnumber}
-
-
-NAME
-----
-container-remove - Remove a container
-
-
-SYNOPSIS
---------
-*container remove* ['OPTIONS']
-*cnt rm* ['OPTIONS']
-
-
-DESCRIPTION
------------
-The container remove command removes a container.
-
-
-OPTIONS
--------
-The following container options are available:
-
-*-n, --name='NAME'*::
-	Specify container name. Specifying 'ALL' will remove all stopped container.
-
-*--allow-stop*::
-	Stop container prior removal.
-
-*-f, --force*::
-	Do not prompt before removal.
-
-*-v, --verbose*::
-	Explain what is being done.
-
-
-EXAMPLES
---------
-*Remove example.net container from the system:*::
-	sudo container remove -n example.net
-
-*Remove example.net container from the system without prompt:*::
-	sudo container remove -n example.net -f
-
-*Remove a running container from the system, without prompt:*::
-	sudo container remove -n example.net -f --allow-stop
-
-*Remove all container:*::
-	sudo container remove -n ALL
-
-
-SEE ALSO
---------
-compute-tools(7),
-container(1).
-
-
-HOMEPAGE
---------
-More information about compute-tools and the Open Infrastructure project can be found on the homepage at https://open-infrastructure.net.
-
-
-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
--------
-compute-tools were written by Daniel Baumann <daniel.baumann@open-infrastructure.net> and others.
diff --git a/share/man/container-restart.1.rst b/share/man/container-restart.1.rst
new file mode 100644
index 0000000..ee13d00
--- /dev/null
+++ b/share/man/container-restart.1.rst
@@ -0,0 +1,90 @@
+.. Open Infrastructure: compute-tools
+
+.. Copyright (C) 2014-2021 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+..
+.. SPDX-License-Identifier: GPL-3.0+
+..
+.. 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
+.. the Free Software Foundation, either version 3 of the License, or
+.. (at your option) any later version.
+..
+.. This program is distributed in the hope that it will be useful,
+.. but WITHOUT ANY WARRANTY; without even the implied warranty of
+.. MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+.. GNU General Public License for more details.
+..
+.. You should have received a copy of the GNU General Public License
+.. along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+=================
+container-restart
+=================
+
+-------------------
+Restart a container
+-------------------
+
+:manual section: 1
+:manual group: Open Infrastructure
+
+Synopsis
+========
+
+| **container restart** ['OPTIONS']
+| **cnt rs** ['OPTIONS']
+
+Description
+===========
+
+The **container restart** command restarts a container.
+
+Options
+=======
+
+The following **container restart** options are available:
+
+-n, --name='NAME':
+  Specify container name. Specifying 'ALL' will restart all started container.
+
+-v, --verbose:
+  Explain what is being done.
+
+Examples
+========
+
+Restart example.net container:
+
+  sudo container restart -n example.net
+
+Restart all container:
+
+  sudo container restart -n ALL
+
+See also
+========
+
+| compute-tools(7),
+| container(1).
+
+Homepage
+========
+
+More information about compute-tools and the Open Infrastructure project can be
+found on the homepage at https://open-infrastructure.net.
+
+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
+(https://bugs.debian.org).
+
+Authors
+=======
+
+compute-tools were written by Daniel Baumann
+<daniel.baumann@open-infrastructure.net> and others.
diff --git a/share/man/container-restart.1.txt b/share/man/container-restart.1.txt
deleted file mode 100644
index afc4581..0000000
--- a/share/man/container-restart.1.txt
+++ /dev/null
@@ -1,83 +0,0 @@
-// Copyright (C) 2014-2021 Daniel Baumann <daniel.baumann@open-infrastructure.net>
-//
-// SPDX-License-Identifier: GPL-3.0+
-//
-// 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
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-CONTAINER-RESTART(1)
-====================
-:doctype: manpage
-:man manual: Open Infrastructure
-:man source: compute-tools
-:man version: {revnumber}
-
-
-NAME
-----
-container-restart - Restart a container
-
-
-SYNOPSIS
---------
-*container restart* ['OPTIONS']
-*cnt rs* ['OPTIONS']
-
-
-DESCRIPTION
------------
-The container restart command restarts a container.
-
-
-OPTIONS
--------
-The following container options are available:
-
-*-n, --name='NAME'*::
-	Specify container name. Specifying 'ALL' will restart all started container.
-
-*-v, --verbose*::
-	Explain what is being done.
-
-
-EXAMPLES
---------
-*Restart example.net container:*::
-	sudo container restart -n example.net
-
-*Restart all container:*::
-	sudo container restart -n ALL
-
-
-SEE ALSO
---------
-compute-tools(7),
-container(1).
-
-
-HOMEPAGE
---------
-More information about compute-tools and the Open Infrastructure project can be found on the homepage at https://open-infrastructure.net.
-
-
-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
--------
-compute-tools were written by Daniel Baumann <daniel.baumann@open-infrastructure.net> and others.
diff --git a/share/man/container-run.1.rst b/share/man/container-run.1.rst
new file mode 100644
index 0000000..f2ad4c6
--- /dev/null
+++ b/share/man/container-run.1.rst
@@ -0,0 +1,88 @@
+.. Open Infrastructure: compute-tools
+
+.. Copyright (C) 2014-2021 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+..
+.. SPDX-License-Identifier: GPL-3.0+
+..
+.. 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
+.. the Free Software Foundation, either version 3 of the License, or
+.. (at your option) any later version.
+..
+.. This program is distributed in the hope that it will be useful,
+.. but WITHOUT ANY WARRANTY; without even the implied warranty of
+.. MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+.. GNU General Public License for more details.
+..
+.. You should have received a copy of the GNU General Public License
+.. along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+=============
+container-run
+=============
+
+-----------------------------------------
+Execute commands in a container namespace
+-----------------------------------------
+
+:manual section: 1
+:manual group: Open Infrastructure
+
+Synopsis
+========
+
+| **container run** ['OPTIONS']
+| **cnt r** ['OPTIONS']
+
+Description
+===========
+
+The **container run** command executes arbitrary commands as root in a container
+namespace.
+
+Options
+=======
+
+The following **container run** options are available:
+
+-n, --name='NAME':
+  Specify container name. Specifying 'ALL' will start all stopped container.
+
+Examples
+========
+
+Run 'hostname' in example.net container:
+
+  sudo container run -n example.net -- hostname
+
+Create and delete a file in example.net container:
+
+  sudo container run -n example.net -- 'touch /tmp/foo && rm -f /tmp/foo'
+
+See also
+========
+
+| compute-tools(7),
+| container(1).
+
+Homepage
+========
+
+More information about compute-tools and the Open Infrastructure project can be
+found on the homepage at https://open-infrastructure.net.
+
+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
+(https://bugs.debian.org).
+
+Authors
+=======
+
+compute-tools were written by Daniel Baumann
+<daniel.baumann@open-infrastructure.net> and others.
diff --git a/share/man/container-run.1.txt b/share/man/container-run.1.txt
deleted file mode 100644
index 593e1a7..0000000
--- a/share/man/container-run.1.txt
+++ /dev/null
@@ -1,80 +0,0 @@
-// Copyright (C) 2014-2021 Daniel Baumann <daniel.baumann@open-infrastructure.net>
-//
-// SPDX-License-Identifier: GPL-3.0+
-//
-// 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
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-CONTAINER-RUN(1)
-================
-:doctype: manpage
-:man manual: Open Infrastructure
-:man source: compute-tools
-:man version: {revnumber}
-
-
-NAME
-----
-container-run - Execute commands in a container namespace
-
-
-SYNOPSIS
---------
-*container run* ['OPTIONS'] -- COMMAND
-*cnt r* ['OPTIONS'] -- COMMAND
-
-
-DESCRIPTION
------------
-The container run command executes arbitrary commands as root in a container namespace.
-
-
-OPTIONS
--------
-The following container options are available:
-
-*-n, --name='NAME'*::
-	Specify container name. Specifying 'ALL' will start all stopped container.
-
-
-EXAMPLES
---------
-*Run 'hostname' in example.net container:*::
-	sudo container run -n example.net -- hostname
-
-*Create and delete a file in example.net container:*::
-	sudo container run -n example.net -- 'touch /tmp/foo && rm -f /tmp/foo'
-
-
-SEE ALSO
---------
-compute-tools(7),
-container(1).
-
-
-HOMEPAGE
---------
-More information about compute-tools and the Open Infrastructure project can be found on the homepage at https://open-infrastructure.net.
-
-
-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
--------
-compute-tools were written by Daniel Baumann <daniel.baumann@open-infrastructure.net> and others.
diff --git a/share/man/container-shell.1.rst b/share/man/container-shell.1.rst
new file mode 100644
index 0000000..2aa1b91
--- /dev/null
+++ b/share/man/container-shell.1.rst
@@ -0,0 +1,141 @@
+.. Open Infrastructure: compute-tools
+
+.. Copyright (C) 2014-2021 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+..
+.. SPDX-License-Identifier: GPL-3.0+
+..
+.. 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
+.. the Free Software Foundation, either version 3 of the License, or
+.. (at your option) any later version.
+..
+.. This program is distributed in the hope that it will be useful,
+.. but WITHOUT ANY WARRANTY; without even the implied warranty of
+.. MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+.. GNU General Public License for more details.
+..
+.. You should have received a copy of the GNU General Public License
+.. along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+===============
+container-shell
+===============
+
+----------------------------------------
+Manage systemd-nspawn containers (shell)
+----------------------------------------
+
+:manual section: 1
+:manual group: Open Infrastructure
+
+Synopsis
+========
+
+| **container-shell** ['OPTIONS']
+| **cntsh** ['OPTIONS']
+
+Description
+===========
+
+compute-tools provides the system integration for managing containers using
+systemd-nspawn.
+
+Usage
+-----
+
+Although the **container-shell** can be started from a running system like any
+other program, the main intend is to use the **container-shell** via SSH. That
+way otherwise unprivileged users have possibility to manage containers without
+needing a regular shell login on the container server.
+
+For usage over SSH a unprivileged user should be created:
+
+|
+|    sudo adduser --gecos "compute-tools,,," \\
+|      --home /var/lib/open-infrastructure/container-shell \\
+|      --shell /usr/bin/container-shell
+
+The container-shell can then be allowed for specific SSH keys via
+/var/lib/compute-tools/container-shell/.ssh/authorized_keys like so:
+
+|
+|    command="/usr/bin/container-shell",no-port-forwarding,no-X11-forwarding,\\
+|      no-agent-forwarding,no-pty ssh-ed25519 [...]
+
+Restricted shell
+----------------
+
+The container-shell by default grants any user that has access to it to use all available container commands.
+
+Through two corresponding environment variables users can be allowed or disallowed to use specific container commands.
+In connection with SSH this makes it possible to grant certain SSH keys (and by that, users) privileges to operate container
+servers without having to give them root access, a login shell at all and prevents them from doing things they are not trusted to do.
+
+Example (blacklisting)
+^^^^^^^^^^^^^^^^^^^^^^
+
+In order to allow all commands except for removing and stopping containers, the
+following variable can be used:
+
+|
+|    command="CONTAINER_COMMANDS_DISABLE='remove stop' \\
+|      /usr/bin/container-shell",no-port-forwarding,no-X11-forwarding,\\
+|      no-agent-forwarding,no-pty ssh-ed25519 [...]
+
+Example (whitelisting)
+^^^^^^^^^^^^^^^^^^^^^^
+
+The other way around works too. To disallow all commands except for listing
+containers and showing the compute-tools version, the following variable can be
+used:
+
+|
+|    command="CONTAINER_COMMANDS_ENABLE='list version' \\
+|      /usr/bin/container-shell",no-port-forwarding,no-X11-forwarding,\\
+|      no-agent-forwarding,no-pty ssh-ed25519 [...]
+
+Commands
+========
+
+All container commands are available, see container(1). Additionally, the
+following commands are specific to container-shell:
+
+about:
+  Shows introduction (manpage).
+
+help:
+  Shows available commands within the container-shell.
+
+help COMMAND:
+  Shows help (manpage) for a specific container command.
+
+logout, exit:
+  Exits container-shell.
+
+See also
+========
+
+| compute-tools(7),
+| container(1).
+
+Homepage
+========
+
+More information about compute-tools and the Open Infrastructure project can be
+found on the homepage at https://open-infrastructure.net.
+
+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
+(https://bugs.debian.org).
+
+Authors
+=======
+
+compute-tools were written by Daniel Baumann
+<daniel.baumann@open-infrastructure.net> and others.
diff --git a/share/man/container-shell.1.txt b/share/man/container-shell.1.txt
deleted file mode 100644
index ce5c13c..0000000
--- a/share/man/container-shell.1.txt
+++ /dev/null
@@ -1,112 +0,0 @@
-// Copyright (C) 2014-2021 Daniel Baumann <daniel.baumann@open-infrastructure.net>
-//
-// SPDX-License-Identifier: GPL-3.0+
-//
-// 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
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-CONTAINER(1)
-============
-:doctype: manpage
-:man manual: Open Infrastructure
-:man source: compute-tools
-:man version: {revnumber}
-
-
-NAME
-----
-container-shell - Manage systemd-nspawn containers (shell)
-
-
-SYNOPSIS
---------
-*container-shell*
-
-
-DESCRIPTION
------------
-compute-tools provides the system integration for managing containers using systemd-nspawn.
-
-
-COMMANDS
---------
-All container commands are available, see container(1). Additionally, the following commands are specific to container-shell:
-
-*about:*::
-	shows introduction (manpage).
-
-*help:*::
-	shows available commands within the container-shell.
-
-*help COMMAND:*::
-	shows help (manpage) for a specific container command.
-
-*logout*, *exit:*::
-	exits container-shell.
-
-USAGE
------
-Although the container-shell can be started from a running system like any other program, the main intend is to use the
-container-shell via SSH. That way otherwise unprivileged users have possibility to manage containers without
-needing a regular shell login on the container server.
-
-For usage over SSH a unprivileged user should be created:
-
-  sudo adduser --gecos "compute-tools,,," \
-	--home /var/lib/open-infrastructure/container-shell \
-	--shell /usr/bin/container-shell
-
-The container-shell can then be allowed for specific SSH keys via /var/lib/open-infrastructure/container-shell/.ssh/authorized_keys like so:
-
-  command="/usr/bin/container-shell",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,no-pty ssh-ed25519 [...]
-
-
-RESTRICTED SHELL
-----------------
-The container-shell by default grants any user that has access to it to use all available container commands.
-
-Through two corresponding environment variables users can be allowed or disallowed to use specific container commands.
-In connection with SSH this makes it possible to grant certain SSH keys (and by that, users) privileges to operate container
-servers without having to give them root access, a login shell at all and prevents them from doing things they are not trusted to do.
-
-Example (blacklisting): In order to allow all commands except for removing and stopping containers, the following variable can be used:
-
-  command="CONTAINER_COMMANDS_DISABLE='remove stop' /usr/bin/container-shell",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,no-pty ssh-rsa [...]
-
-Example (whitelisting): The other way around works too. To disallow all commands except for listing containers and showing the compute-tools version, the following variable can be used:
-
-  command="CONTAINER_COMMANDS_ENABLE='list version' /usr/bin/container-shell",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,no-pty ssh-rsa [...]
-
-
-SEE ALSO
---------
-machinectl(1),
-systemd-nspawn(1).
-
-
-HOMEPAGE
---------
-More information about compute-tools and the Open Infrastructure project can be found on the homepage at https://open-infrastructure.net.
-
-
-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
--------
-compute-tools were written by Daniel Baumann <daniel.baumann@open-infrastructure.net> and others.
diff --git a/share/man/container-start.1.rst b/share/man/container-start.1.rst
new file mode 100644
index 0000000..a1478f6
--- /dev/null
+++ b/share/man/container-start.1.rst
@@ -0,0 +1,93 @@
+.. Open Infrastructure: compute-tools
+
+.. Copyright (C) 2014-2021 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+..
+.. SPDX-License-Identifier: GPL-3.0+
+..
+.. 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
+.. the Free Software Foundation, either version 3 of the License, or
+.. (at your option) any later version.
+..
+.. This program is distributed in the hope that it will be useful,
+.. but WITHOUT ANY WARRANTY; without even the implied warranty of
+.. MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+.. GNU General Public License for more details.
+..
+.. You should have received a copy of the GNU General Public License
+.. along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+===============
+container-start
+===============
+
+-----------------
+Start a container
+-----------------
+
+:manual section: 1
+:manual group: Open Infrastructure
+
+Synopsis
+========
+
+| **container start** ['OPTIONS']
+| **cnt s** ['OPTIONS']
+
+Description
+===========
+
+The **container start** command starts a container.
+
+Options
+=======
+
+The following **container start** options are available:
+
+-n, --name='NAME':
+  Specify container name. Specifying 'ALL' will start all stopped container.
+
+-f, --force':
+  Removing stray lock file if existing.
+
+-v, --verbose:
+  Explain what is being done.
+
+Examples
+========
+
+Start example.net container:
+
+  sudo container start -n example.net
+
+Start all container:
+
+  sudo container start -n ALL
+
+See also
+========
+
+| compute-tools(7),
+| container(1).
+
+Homepage
+========
+
+More information about compute-tools and the Open Infrastructure project can be
+found on the homepage at https://open-infrastructure.net.
+
+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
+(https://bugs.debian.org).
+
+Authors
+=======
+
+compute-tools were written by Daniel Baumann
+<daniel.baumann@open-infrastructure.net> and others.
diff --git a/share/man/container-start.1.txt b/share/man/container-start.1.txt
deleted file mode 100644
index bc0c946..0000000
--- a/share/man/container-start.1.txt
+++ /dev/null
@@ -1,86 +0,0 @@
-// Copyright (C) 2014-2021 Daniel Baumann <daniel.baumann@open-infrastructure.net>
-//
-// SPDX-License-Identifier: GPL-3.0+
-//
-// 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
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-CONTAINER-START(1)
-==================
-:doctype: manpage
-:man manual: Open Infrastructure
-:man source: compute-tools
-:man version: {revnumber}
-
-
-NAME
-----
-container-start - Start a container
-
-
-SYNOPSIS
---------
-*container start* ['OPTIONS']
-*cnt s* ['OPTIONS']
-
-
-DESCRIPTION
------------
-The container start command starts a container.
-
-
-OPTIONS
--------
-The following container options are available:
-
-*-n, --name='NAME'*::
-	Specify container name. Specifying 'ALL' will start all stopped container.
-
-*-f, --force'*::
-	Removing stray lock file if existing.
-
-*-v, --verbose*::
-	Explain what is being done.
-
-
-EXAMPLES
---------
-*Start example.net container:*::
-	sudo container start -n example.net
-
-*Start all container:*::
-	sudo container start -n ALL
-
-
-SEE ALSO
---------
-compute-tools(7),
-container(1).
-
-
-HOMEPAGE
---------
-More information about compute-tools and the Open Infrastructure project can be found on the homepage at https://open-infrastructure.net.
-
-
-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
--------
-compute-tools were written by Daniel Baumann <daniel.baumann@open-infrastructure.net> and others.
diff --git a/share/man/container-status.1.rst b/share/man/container-status.1.rst
new file mode 100644
index 0000000..b60ceeb
--- /dev/null
+++ b/share/man/container-status.1.rst
@@ -0,0 +1,83 @@
+.. Open Infrastructure: compute-tools
+
+.. Copyright (C) 2014-2021 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+..
+.. SPDX-License-Identifier: GPL-3.0+
+..
+.. 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
+.. the Free Software Foundation, either version 3 of the License, or
+.. (at your option) any later version.
+..
+.. This program is distributed in the hope that it will be useful,
+.. but WITHOUT ANY WARRANTY; without even the implied warranty of
+.. MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+.. GNU General Public License for more details.
+..
+.. You should have received a copy of the GNU General Public License
+.. along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+================
+container-status
+================
+
+---------------------
+Show container status
+---------------------
+
+:manual section: 1
+:manual group: Open Infrastructure
+
+Synopsis
+========
+
+| **container status** ['OPTIONS']
+| **cnt st** ['OPTIONS']
+
+Description
+===========
+
+The **container status** command displays the status of a container.
+
+Options
+=======
+
+The following **container status** options are available:
+
+-n, --name='NAME':
+  Specify container name.
+
+Examples
+========
+
+show status of example.net container:
+
+  sudo container status -n example.net
+
+See also
+========
+
+| compute-tools(7),
+| container(1).
+
+Homepage
+========
+
+More information about compute-tools and the Open Infrastructure project can be
+found on the homepage at https://open-infrastructure.net.
+
+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
+(https://bugs.debian.org).
+
+Authors
+=======
+
+compute-tools were written by Daniel Baumann
+<daniel.baumann@open-infrastructure.net> and others.
diff --git a/share/man/container-status.1.txt b/share/man/container-status.1.txt
deleted file mode 100644
index e74b8e5..0000000
--- a/share/man/container-status.1.txt
+++ /dev/null
@@ -1,77 +0,0 @@
-// Copyright (C) 2016 Simon Spöehel <simon.spoehel@open-infrastructure.net>
-//
-// SPDX-License-Identifier: GPL-3.0+
-//
-// 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
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-CONTAINER-STATUS(1)
-===================
-:doctype: manpage
-:man manual: Open Infrastructure
-:man source: compute-tools
-:man version: {revnumber}
-
-
-NAME
-----
-container-status - Show container status
-
-
-SYNOPSIS
---------
-*container status* ['OPTIONS']
-*cnt st* ['OPTIONS']
-
-
-DESCRIPTION
------------
-The container-status command displays the status of a container.
-
-
-OPTIONS
--------
-The following container-status options are available:
-
-*-n, --name='NAME'*::
-	Specify container name.
-
-
-EXAMPLES
---------
-*show status of example.net container:*::
-	sudo container status -n example.net
-
-
-SEE ALSO
---------
-compute-tools(7),
-container(1).
-
-
-HOMEPAGE
---------
-More information about compute-tools and the Open Infrastructure project can be found on the homepage at https://open-infrastructure.net.
-
-
-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
--------
-compute-tools were written by Daniel Baumann <daniel.baumann@open-infrastructure.net> and others.
diff --git a/share/man/container-stop.1.rst b/share/man/container-stop.1.rst
new file mode 100644
index 0000000..ca2a73b
--- /dev/null
+++ b/share/man/container-stop.1.rst
@@ -0,0 +1,98 @@
+.. Open Infrastructure: compute-tools
+
+.. Copyright (C) 2014-2021 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+..
+.. SPDX-License-Identifier: GPL-3.0+
+..
+.. 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
+.. the Free Software Foundation, either version 3 of the License, or
+.. (at your option) any later version.
+..
+.. This program is distributed in the hope that it will be useful,
+.. but WITHOUT ANY WARRANTY; without even the implied warranty of
+.. MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+.. GNU General Public License for more details.
+..
+.. You should have received a copy of the GNU General Public License
+.. along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+==============
+container-stop
+==============
+
+----------------
+Stop a container
+----------------
+
+:manual section: 1
+:manual group: Open Infrastructure
+
+Synopsis
+========
+
+| **container stop** ['OPTIONS']
+| **cnt t** ['OPTIONS']
+
+Description
+===========
+
+The **container stop** command stops a container by running the proper shutdown
+sequence.
+
+Options
+=======
+
+The following **container stop** options are available:
+
+-n, --name='NAME':
+  Specify container name. Specifying 'ALL' will stop all started container.
+
+-f, --force:
+  Instead of running the proper shutdown sequence, terminate all processes of the container imediatly.
+
+-v, --verbose:
+  Explain what is being done.
+
+Examples
+========
+
+Shutdown example.net container:
+
+  sudo container stop -n example.net
+
+Immediately stop example.net container:
+
+  sudo container stop -n example.net -f
+
+Stop all container:
+
+  sudo container stop -n ALL
+
+See also
+========
+
+| compute-tools(7),
+| container(1).
+
+Homepage
+========
+
+More information about compute-tools and the Open Infrastructure project can be
+found on the homepage at https://open-infrastructure.net.
+
+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
+(https://bugs.debian.org).
+
+Authors
+=======
+
+compute-tools were written by Daniel Baumann
+<daniel.baumann@open-infrastructure.net> and others.
diff --git a/share/man/container-stop.1.txt b/share/man/container-stop.1.txt
deleted file mode 100644
index dc36bb9..0000000
--- a/share/man/container-stop.1.txt
+++ /dev/null
@@ -1,89 +0,0 @@
-// Copyright (C) 2014-2021 Daniel Baumann <daniel.baumann@open-infrastructure.net>
-//
-// SPDX-License-Identifier: GPL-3.0+
-//
-// 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
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-CONTAINER-STOP(1)
-=================
-:doctype: manpage
-:man manual: Open Infrastructure
-:man source: compute-tools
-:man version: {revnumber}
-
-
-NAME
-----
-container-stop - Stop a container
-
-
-SYNOPSIS
---------
-*container stop* ['OPTIONS']
-*cnt t* ['OPTIONS']
-
-
-DESCRIPTION
------------
-The container stop command stops a container by running the proper shutdown sequence.
-
-
-OPTIONS
--------
-The following container options are available:
-
-*-n, --name='NAME'*::
-	Specify container name. Specifying 'ALL' will stop all started container.
-
-*-f, --force*::
-	Instead of running the proper shutdown sequence, terminate all processes of the container imediatly.
-
-*-v, --verbose*::
-	Explain what is being done.
-
-
-EXAMPLES
---------
-*Shutdown example.net container:*::
-	sudo container stop -n example.net
-
-*Immediately stop example.net container:*::
-	sudo container stop -n example.net -f
-
-*Stop all container:*::
-	sudo container stop -n ALL
-
-
-SEE ALSO
---------
-compute-tools(7),
-container(1).
-
-
-HOMEPAGE
---------
-More information about compute-tools and the Open Infrastructure project can be found on the homepage at https://open-infrastructure.net.
-
-
-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
--------
-compute-tools were written by Daniel Baumann <daniel.baumann@open-infrastructure.net> and others.
diff --git a/share/man/container-top.1.rst b/share/man/container-top.1.rst
new file mode 100644
index 0000000..24b1050
--- /dev/null
+++ b/share/man/container-top.1.rst
@@ -0,0 +1,81 @@
+.. Open Infrastructure: compute-tools
+
+.. Copyright (C) 2014-2021 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+..
+.. SPDX-License-Identifier: GPL-3.0+
+..
+.. 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
+.. the Free Software Foundation, either version 3 of the License, or
+.. (at your option) any later version.
+..
+.. This program is distributed in the hope that it will be useful,
+.. but WITHOUT ANY WARRANTY; without even the implied warranty of
+.. MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+.. GNU General Public License for more details.
+..
+.. You should have received a copy of the GNU General Public License
+.. along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+=============
+container-top
+=============
+
+------------------------------------
+Dynamic list container on the system
+------------------------------------
+
+:manual section: 1
+:manual group: Open Infrastructure
+
+Synopsis
+========
+
+| **container top** ['OPTIONS']
+
+Description
+===========
+
+The **container top** command dynamically lists container on the system.
+
+Options
+=======
+
+The following **container top** options are available, defaults to '--delay 1':
+
+-d, --delay='SECONDS[.TENTHS]':
+  Specifies the delay between screen updates, defaults to 1.
+
+Examples
+========
+
+Dynamically list containers of the local system:
+  sudo container top
+
+See also
+========
+
+| compute-tools(7),
+| container(1).
+
+Homepage
+========
+
+More information about compute-tools and the Open Infrastructure project can be
+found on the homepage at https://open-infrastructure.net.
+
+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
+(https://bugs.debian.org).
+
+Authors
+=======
+
+compute-tools were written by Daniel Baumann
+<daniel.baumann@open-infrastructure.net> and others.
diff --git a/share/man/container-top.1.txt b/share/man/container-top.1.txt
deleted file mode 100644
index 295f51b..0000000
--- a/share/man/container-top.1.txt
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright (C) 2014-2021 Daniel Baumann <daniel.baumann@open-infrastructure.net>
-//
-// SPDX-License-Identifier: GPL-3.0+
-//
-// 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
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-CONTAINER-TOP(1)
-================
-:doctype: manpage
-:man manual: Open Infrastructure
-:man source: compute-tools
-:man version: {revnumber}
-
-
-NAME
-----
-container-top - Dynamic list container on the system
-
-
-SYNOPSIS
---------
-*container top* ['OPTIONS']
-
-
-DESCRIPTION
------------
-The container top command dynamically lists container on the system.
-
-
-OPTIONS
--------
-The following container options are available, defaults to *--delay 1*:
-
-*-d, --delay='SECONDS[.TENTHS]'*::
-	Specifies the delay between screen updates, defaults to 1.
-
-
-EXAMPLES
---------
-*Dynamically list containers of the local system:*::
-	sudo container top
-
-
-SEE ALSO
---------
-compute-tools(7),
-container(1).
-
-
-HOMEPAGE
---------
-More information about compute-tools and the Open Infrastructure project can be found on the homepage at https://open-infrastructure.net.
-
-
-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
--------
-compute-tools were written by Daniel Baumann <daniel.baumann@open-infrastructure.net> and others.
diff --git a/share/man/container-version.1.rst b/share/man/container-version.1.rst
new file mode 100644
index 0000000..12bc9bb
--- /dev/null
+++ b/share/man/container-version.1.rst
@@ -0,0 +1,79 @@
+.. Open Infrastructure: compute-tools
+
+.. Copyright (C) 2014-2021 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+..
+.. SPDX-License-Identifier: GPL-3.0+
+..
+.. 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
+.. the Free Software Foundation, either version 3 of the License, or
+.. (at your option) any later version.
+..
+.. This program is distributed in the hope that it will be useful,
+.. but WITHOUT ANY WARRANTY; without even the implied warranty of
+.. MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+.. GNU General Public License for more details.
+..
+.. You should have received a copy of the GNU General Public License
+.. along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+=================
+container-version
+=================
+
+----------------------
+Show container version
+----------------------
+
+:manual section: 1
+:manual group: Open Infrastructure
+
+Synopsis
+========
+
+| **container version** ['OPTIONS']
+
+Description
+===========
+
+The **container version** command shows the container version number.
+
+Options
+=======
+
+The **container version** command has no options.
+
+Examples
+========
+
+Show container version:
+
+  container version
+
+See also
+========
+
+| compute-tools(7),
+| container(1).
+
+Homepage
+========
+
+More information about compute-tools and the Open Infrastructure project can be
+found on the homepage at https://open-infrastructure.net.
+
+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
+(https://bugs.debian.org).
+
+Authors
+=======
+
+compute-tools were written by Daniel Baumann
+<daniel.baumann@open-infrastructure.net> and others.
diff --git a/share/man/container-version.1.txt b/share/man/container-version.1.txt
deleted file mode 100644
index 4f625f8..0000000
--- a/share/man/container-version.1.txt
+++ /dev/null
@@ -1,73 +0,0 @@
-// Copyright (C) 2014-2021 Daniel Baumann <daniel.baumann@open-infrastructure.net>
-//
-// SPDX-License-Identifier: GPL-3.0+
-//
-// 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
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-CONTAINER-VERSION(1)
-====================
-:doctype: manpage
-:man manual: Open Infrastructure
-:man source: compute-tools
-:man version: {revnumber}
-
-
-NAME
-----
-container-version - Show container version
-
-
-SYNOPSIS
---------
-*container version* ['OPTIONS']
-
-
-DESCRIPTION
------------
-The container version command shows the container version number.
-
-
-OPTIONS
--------
-This command has no options.
-
-
-EXAMPLES
---------
-*Show container version:*::
-	container version
-
-
-SEE ALSO
---------
-compute-tools(7),
-container(1).
-
-
-HOMEPAGE
---------
-More information about compute-tools and the Open Infrastructure project can be found on the homepage at https://open-infrastructure.net.
-
-
-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
--------
-compute-tools were written by Daniel Baumann <daniel.baumann@open-infrastructure.net> and others.
diff --git a/share/man/container.1.rst b/share/man/container.1.rst
new file mode 100644
index 0000000..895e558
--- /dev/null
+++ b/share/man/container.1.rst
@@ -0,0 +1,165 @@
+.. Open Infrastructure: compute-tools
+
+.. Copyright (C) 2014-2021 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+..
+.. SPDX-License-Identifier: GPL-3.0+
+..
+.. 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
+.. the Free Software Foundation, either version 3 of the License, or
+.. (at your option) any later version.
+..
+.. This program is distributed in the hope that it will be useful,
+.. but WITHOUT ANY WARRANTY; without even the implied warranty of
+.. MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+.. GNU General Public License for more details.
+..
+.. You should have received a copy of the GNU General Public License
+.. along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+=========
+container
+=========
+
+--------------------------------
+Manage systemd-nspawn containers
+--------------------------------
+
+:manual section: 1
+:manual group: Open Infrastructure
+
+Synopsis
+========
+
+| **container** 'COMMAND' ['OPTIONS']
+| **container** 'COMMAND1','COMMAND2',... 'COMMANDn'
+
+Description
+===========
+
+compute-tools provides the system integration for managing containers using
+systemd-nspawn.
+
+Options
+=======
+
+The following **container** common options are available:
+
+-n, --name='NAME':
+  Specify container name.
+
+Commands
+========
+
+The following **container** commands are available:
+
+create:
+  Create a new container, see container-create(1).
+
+start:
+  Start a container, see container-start(1).
+
+restart:
+  Restart a container, see container-restart(1).
+
+stop:
+  Stop a container, see container-stop(1).
+
+remove:
+  Remove a container, see container-remove(1).
+
+move:
+  Rename a container, see container-move(1).
+
+console:
+  Attach console to a container, see container-console(1).
+
+enter:
+  Enter a container namespace, see container-enter(1).
+
+run:
+  Execute commands in a container namespace, see container-run(1).
+
+info:
+  Show specific information of a container, see container-info(1).
+
+key:
+  Manage GnuPG keyring for container operations, see container-key(1).
+
+limit:
+  Limit ressources of a container, see container-limit(1).
+
+list:
+  List container on the system, see container-list(1).
+
+log:
+  Show container log, see container-log(1).
+
+status:
+  Show container status, see container-status(1).
+
+top:
+  Dynamic list of container on the system, see container-top(1).
+
+version:
+  Show container version, see container-version(1).
+
+Files
+=====
+
+The following files are used:
+
+/etc/compute-tools/container:
+  Container configuration files.
+
+/usr/bin/container, /usr/bin/cnt:
+  Container program.
+
+/usr/bin/container-shell, /usr/bin/cntsh:
+  Container shell program.
+
+/usr/libexec/container:
+  Container commands.
+
+/usr/share/compute-tools/:
+  Container shared data.
+
+/usr/share/doc/compute-tools:
+  Container documentation files.
+
+/var/cache/container:
+  Container cache directory.
+
+/var/lib/machines:
+  Container root directory.
+
+/var/log/compute-tools:
+  Container log files.
+
+See also
+========
+
+| machinectl(1),
+| systemd-nspawn(1).
+
+Homepage
+========
+
+More information about compute-tools and the Open Infrastructure project can be
+found on the homepage at https://open-infrastructure.net.
+
+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
+(https://bugs.debian.org).
+
+Authors
+=======
+
+compute-tools were written by Daniel Baumann
+<daniel.baumann@open-infrastructure.net> and others.
diff --git a/share/man/container.1.txt b/share/man/container.1.txt
deleted file mode 100644
index d2734d2..0000000
--- a/share/man/container.1.txt
+++ /dev/null
@@ -1,159 +0,0 @@
-// Copyright (C) 2014-2021 Daniel Baumann <daniel.baumann@open-infrastructure.net>
-//
-// SPDX-License-Identifier: GPL-3.0+
-//
-// 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
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-CONTAINER(1)
-============
-:doctype: manpage
-:man manual: Open Infrastructure
-:man source: compute-tools
-:man version: {revnumber}
-
-
-NAME
-----
-container - Manage systemd-nspawn containers
-
-
-SYNOPSIS
---------
-*container* 'COMMAND' ['OPTIONS']
-*container* 'COMMAND1','COMMAND2',... 'COMMANDn'
-
-
-DESCRIPTION
------------
-compute-tools provides the system integration for managing containers using systemd-nspawn.
-
-
-OPTIONS
--------
-The following container common options are available:
-
-*-n, --name='NAME'*::
-	Specify container name.
-
-
-COMMANDS
---------
-The following container commands are available:
-
-*create*::
-	Create a new container, see container-create(1).
-
-*start*::
-	Start a container, see container-start(1).
-
-*restart*::
-	Restart a container, see container-restart(1).
-
-*stop*::
-	Stop a container, see container-stop(1).
-
-*remove*::
-	Remove a container, see container-remove(1).
-
-*move*::
-	Rename a container, see container-move(1).
-
-*console*::
-	Attach console to a container, see container-console(1).
-
-*enter*::
-	Enter a container namespace, see container-enter(1).
-
-*run*::
-	Execute commands in a container namespace, see container-run(1).
-
-*info*::
-	Show specific information of a container, see container-info(1).
-
-*key*::
-	Manage GnuPG keyring for container operations, see container-key(1).
-
-*limit*::
-	Limit ressources of a container, see container-limit(1).
-
-*list*::
-	List container on the system, see container-list(1).
-
-*log*::
-	Show container log, see container-log(1).
-
-*status*::
-	Show container status, see container-status(1).
-
-*top*::
-	Dynamic list of container on the system, see container-top(1).
-
-*version*::
-	Show container version, see container-version(1).
-
-
-FILES
------
-The following files are used:
-
-*/etc/compute-tools/container*::
-	Container configuration files.
-
-*/usr/bin/container*, */usr/bin/cnt*::
-	Container program.
-
-*/usr/bin/container-shell*, */usr/bin/cntsh*::
-	Container shell program.
-
-*/usr/libexec/container*::
-	Container commands.
-
-*/usr/share/compute-tools/*::
-	Container shared data.
-
-*/usr/share/doc/compute-tools*::
-	Container documentation files.
-
-*/var/cache/container*::
-	Container cache directory.
-
-*/var/lib/machines*::
-	Container root directory.
-
-*/var/log/compute-tools*::
-	Container log files.
-
-
-SEE ALSO
---------
-machinectl(1),
-systemd-nspawn(1).
-
-
-HOMEPAGE
---------
-More information about compute-tools and the Open Infrastructure project can be found on the homepage at https://open-infrastructure.net.
-
-
-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
--------
-compute-tools were written by Daniel Baumann <daniel.baumann@open-infrastructure.net> and others.
diff --git a/share/man/man.in b/share/man/man.in
new file mode 100644
index 0000000..9e8de0e
--- /dev/null
+++ b/share/man/man.in
@@ -0,0 +1,19 @@
+.\" Open Infrastructure: compute-tools
+.\"
+.\" Copyright (C) 2014-2021 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+.\"
+.\" SPDX-License-Identifier: GPL-3.0+
+.\"
+.\" 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
+.\" the Free Software Foundation, either version 3 of the License, or
+.\" (at your option) any later version.
+.\"
+.\" This program is distributed in the hope that it will be useful,
+.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
+.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+.\" GNU General Public License for more details.
+.\"
+.\" You should have received a copy of the GNU General Public License
+.\" along with this program.  If not, see <https://www.gnu.org/licenses/>.
+.\"