Restructure and fix and improve docs and manpages.

.gitignore

@@ -9,7 +9,7 @@ docs/man/man*/*.html
 docs/man/man*/*.xml
 docs/man/man*/docbook-xsl.css
 docs/man/man7/cdist-type__*.rst
-docs/man/man7/cdist-reference.rst
+docs/man/cdist-reference.rst
 
 # Ignore cdist cache for version control
 /cache/

Makefile

@@ -63,10 +63,10 @@ $(MANREF): $(MANREFSH)
 	$(MANREFSH)
 
 # Manpages #3: generic part
-mansphinxman: $(MANTYPES) $(MANREF)
+mansphinxman: $(MANTYPES) $(MANREF) $(PYTHON_VERSION)
 	$(SPHINXM)
 
-mansphinxhtml: $(MANTYPES) $(MANREF)
+mansphinxhtml: $(MANTYPES) $(MANREF) $(PYTHON_VERSION)
 	$(SPHINXH)
 
 man: mansphinxman mansphinxhtml

bin/build-helper.freebsd

@@ -0,0 +1,336 @@
+#!/bin/sh
+#
+# 2011-2013 Nico Schottelius (nico-cdist at schottelius.org)
+# 2016 Darko Poljak (darko.poljak at gmail.com)
+#
+# This file is part of cdist.
+#
+# cdist 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.
+#
+# cdist 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 cdist. If not, see <http://www.gnu.org/licenses/>.
+#
+#
+# This file contains the heavy lifting found usually in the Makefile
+#
+
+# vars for make
+helper=$0
+
+basedir=${0%/*}/../
+# run_as is used to check how the script is called (by $0 value)
+# currently supported sufixes for $0 are:
+# .freebsd - run as freebsd
+basename=${0##*/}
+run_as=${basename#*.}
+case "$run_as" in
+    freebsd)
+        to_a=cdist-configuration-management
+        to_d=googlegroups.com
+        from_a=darko.poljak
+        from_d=gmail.com
+        ml_name="Darko Poljak"
+        ml_sig_name="Darko"
+
+        # vars for make
+        WEBDIR=../vcs/www.nico.schottelius.org
+    ;;
+    *)
+        to_a=cdist
+        to_d=l.schottelius.org
+        from_a=nico-cdist
+        from_d=schottelius.org
+        ml_name="Nico -telmich- Schottelius"
+        ml_sig_name="Nico"
+
+        # vars for make
+        WEBDIR=$$HOME/vcs/www.nico.schottelius.org
+    ;;
+esac
+
+# Change to checkout directory
+cd "$basedir"
+
+version=$(git describe)
+
+option=$1; shift
+
+case "$option" in
+    print-make-vars)
+        printf "helper: ${helper}\n"
+        printf "WEBDIR: ${WEBDIR}\n"
+    ;;
+    print-runas)
+        printf "run_as: $run_as\n"
+    ;;
+    changelog-changes)
+        if [ "$#" -eq 1 ]; then
+            start=$1
+        else
+            start="[[:digit:]]"
+        fi
+
+        end="[[:digit:]]"
+
+        awk -F: "BEGIN { start=0 }
+            {
+                if(start == 0) {
+                    if (\$0 ~ /^$start/) {
+                        start = 1
+                    }
+                } else {
+                    if (\$0 ~ /^$end/) {
+                        exit
+                    } else {
+                        print \$0 
+                    }
+                }
+            }" "$basedir/docs/changelog"
+    ;;
+
+    changelog-version)
+        # get version from changelog
+        grep '^[[:digit:]]' "$basedir/docs/changelog" | head -n1 | sed 's/:.*//'
+    ;;
+
+    check-date)
+        # verify date in changelog is today
+        date_today="$(date +%Y-%m-%d)"
+        date_changelog=$(grep '^[[:digit:]]' "$basedir/docs/changelog" | head -n1 | sed 's/.*: //')
+
+        if [ "$date_today" != "$date_changelog" ]; then
+            echo "Date in changelog is not today"
+            echo "Changelog: $date_changelog"
+            exit 1
+        fi
+    ;;
+
+    check-unittest)
+        "$0" test
+    ;;
+
+    blog)
+        version=$1; shift
+        blogfile=$1; shift
+        dir=${blogfile%/*}
+        file=${blogfile##*/}
+
+
+        cat << eof > "$blogfile"
+[[!meta title="Cdist $version released"]]
+
+Here's a short overview about the changes found in version ${version}:
+
+eof
+
+        $0 changelog-changes "$version" >> "$blogfile"
+
+        cat << eof >> "$blogfile"
+For more information visit the [[cdist homepage|software/cdist]].
+
+[[!tag cdist config unix]]
+eof
+        cd "$dir"
+        git add "$file"
+        # Allow git commit to fail if there are no changes
+        git commit -m "cdist blog update: $version" "$blogfile" || true
+    ;;
+
+    ml-release)
+        if [ $# -ne 1 ]; then
+            echo "$0 ml-release version" >&2
+            exit 1
+        fi
+
+        version=$1; shift
+
+        to=${to_a}@${to_d}
+        from=${from_a}@${from_d}
+
+        ( 
+        cat << eof
+From: ${ml_name} <$from>
+To: cdist mailing list <$to>
+Subject: cdist $version released
+
+Hello .*,
+
+cdist $version has been released with the following changes:
+
+eof
+
+        "$0" changelog-changes "$version"
+        cat << eof
+
+Cheers,
+
+${ml_sig_name}
+
+-- 
+Automatisation at its best level. With cdist.
+eof
+        ) | /usr/sbin/sendmail -f "$from" "$to"
+    ;;
+
+    release-git-tag)
+        target_version=$($0 changelog-version)
+        if git rev-parse --verify refs/tags/$target_version 2>/dev/null; then
+            echo "Tag for $target_version exists, aborting"
+            exit 1
+        fi
+        printf "Enter tag description for ${target_version}: "
+        read tagmessage
+        git tag "$target_version" -m "$$tagmessage"
+    ;;
+
+    release)
+        set -e
+        target_version=$($0 changelog-version)
+        target_branch=$($0 version-branch)
+
+        echo "Beginning release process for $target_version"
+
+        # First check everything is sane
+        "$0" check-date
+        "$0" check-unittest
+
+        # Generate version file to be included in packaging
+        "$0" version
+
+        # Ensure the git status is clean, else abort
+        if ! git diff-index --name-only --exit-code HEAD ; then
+            echo "Unclean tree, see files above, aborting"
+            exit 1
+        fi
+
+        # Ensure we are on the master branch
+        masterbranch=yes
+        if [ "$(git rev-parse --abbrev-ref HEAD)" != "master" ]; then
+            echo "Releases are happening from the master branch, aborting"
+
+            echo "Enter the magic word to release anyway"
+            read magicword
+
+            if [ "$magicword" = "iknowwhatido" ]; then
+                masterbranch=no
+            else
+                exit 1
+            fi
+        fi
+
+        if [ "$masterbranch" = yes ]; then
+            # Ensure version branch exists
+            if ! git rev-parse --verify refs/heads/$target_branch 2>/dev/null; then
+                git branch "$target_branch"
+            fi
+
+            # Merge master branch into version branch
+            git checkout "$target_branch"
+            git merge master
+        fi
+
+        # Verify that after the merge everything works
+        "$0" check-date
+        "$0" check-unittest
+
+        # Generate man pages (indirect check if they build)
+        make helper=${helper} WEBDIR=${WEBDIR} man
+
+        # Generate speeches (indirect check if they build)
+        make helper=${helper} WEBDIR=${WEBDIR} speeches
+
+        ############################################################# 
+        # Everything green, let's do the release
+
+        # Tag the current commit
+        "$0" release-git-tag
+
+        # Also merge back the version branch
+        if [ "$masterbranch" = yes ]; then
+            git checkout master
+            git merge "$target_branch"
+        fi
+
+        # Publish git changes
+        make helper=${helper} WEBDIR=${WEBDIR} pub
+
+        # publish man, speeches, website
+        if [ "$masterbranch" = yes ]; then
+            make helper=${helper} WEBDIR=${WEBDIR} web-release-all
+        else
+            make helper=${helper} WEBDIR=${WEBDIR} web-release-all-no-latest
+        fi
+
+        # Ensure that pypi release has the right version
+        "$0" version
+
+        # Create and publish package for pypi
+        make helper=${helper} WEBDIR=${WEBDIR} pypi-release
+
+        case "$run_as" in
+            freebsd)
+            ;;
+            *)
+                # Archlinux release is based on pypi
+                make archlinux-release
+            ;;
+        esac
+
+        # Announce change on ML
+        make helper=${helper} WEBDIR=${WEBDIR} ml-release
+
+        cat << eof
+Manual steps post release:
+
+    - linkedin
+    - hackernews
+    - reddit
+    - twitter
+
+eof
+
+        case "$run_as" in
+            freebsd)
+                cat <<eof
+Additional steps post release:
+    - archlinux release
+eof
+            ;;
+            *)
+            ;;
+        esac
+
+    ;;
+
+    test)
+        export PYTHONPATH="$(pwd -P)"
+
+        if [ $# -lt 1 ]; then
+            python3 -m cdist.test
+        else
+            python3 -m unittest "$@"
+        fi
+    ;;
+
+    version-branch)
+        "$0" changelog-version | cut -d. -f '1,2'
+    ;;
+
+    version)
+        echo "VERSION = \"$(git describe)\"" > cdist/version.py
+    ;;
+
+    *)
+        echo "Unknown helper target $@ - aborting"
+        exit 1
+    ;;
+
+esac

cdist/conf/type/__apt_key/man.rst

@@ -5,8 +5,6 @@ NAME
 ----
 cdist-type__apt_key - Manage the list of keys used by apt
 
-Steven Armstrong <steven-cdist--@--armstrong.cc>
-
 
 DESCRIPTION
 -----------
@@ -52,7 +50,13 @@ EXAMPLES
 
 SEE ALSO
 --------
-- `cdist-type(7) <cdist-type.html>`_
+Full documentation at: <:cdist_docs:`index`>,
+especially cdist type chapter: <:cdist_docs:`cdist-type`>.
+
+
+AUTHORS
+-------
+Steven Armstrong <steven-cdist--@--armstrong.cc>
 
 
 COPYING

cdist/conf/type/__apt_key_uri/man.rst

@@ -5,8 +5,6 @@ NAME
 ----
 cdist-type__apt_key_uri - Add apt key from uri
 
-Steven Armstrong <steven-cdist--@--armstrong.cc>
-
 
 DESCRIPTION
 -----------
@@ -42,7 +40,13 @@ EXAMPLES
 
 SEE ALSO
 --------
-- `cdist-type(7) <cdist-type.html>`_
+Full documentation at: <:cdist_docs:`index`>,
+especially cdist type chapter: <:cdist_docs:`cdist-type`>.
+
+
+AUTHORS
+-------
+Steven Armstrong <steven-cdist--@--armstrong.cc>
 
 
 COPYING

cdist/conf/type/__apt_norecommends/man.rst

@@ -5,8 +5,6 @@ NAME
 ----
 cdist-type__apt_norecommends - Configure apt to not install recommended packages
 
-Steven Armstrong <steven-cdist--@--armstrong.cc>
-
 
 DESCRIPTION
 -----------
@@ -33,7 +31,13 @@ EXAMPLES
 
 SEE ALSO
 --------
-- `cdist-type(7) <cdist-type.html>`_
+Full documentation at: <:cdist_docs:`index`>,
+especially cdist type chapter: <:cdist_docs:`cdist-type`>.
+
+
+AUTHORS
+-------
+Steven Armstrong <steven-cdist--@--armstrong.cc>
 
 
 COPYING

cdist/conf/type/__apt_ppa/man.rst

@@ -5,8 +5,6 @@ NAME
 ----
 cdist-type__apt_ppa - Manage ppa repositories
 
-Steven Armstrong <steven-cdist--@--armstrong.cc>
-
 
 DESCRIPTION
 -----------
@@ -41,7 +39,13 @@ EXAMPLES
 
 SEE ALSO
 --------
-- `cdist-type(7) <cdist-type.html>`_
+Full documentation at: <:cdist_docs:`index`>,
+especially cdist type chapter: <:cdist_docs:`cdist-type`>.
+
+
+AUTHORS
+-------
+Steven Armstrong <steven-cdist--@--armstrong.cc>
 
 
 COPYING

cdist/conf/type/__apt_source/man.rst

@@ -5,8 +5,6 @@ NAME
 ----
 cdist-type__apt_source - Manage apt sources
 
-Steven Armstrong <steven-cdist--@--armstrong.cc>
-
 
 DESCRIPTION
 -----------
@@ -60,7 +58,13 @@ EXAMPLES
 
 SEE ALSO
 --------
-- `cdist-type(7) <cdist-type.html>`_
+Full documentation at: <:cdist_docs:`index`>,
+especially cdist type chapter: <:cdist_docs:`cdist-type`>.
+
+
+AUTHORS
+-------
+Steven Armstrong <steven-cdist--@--armstrong.cc>
 
 
 COPYING

cdist/conf/type/__apt_update_index/man.rst

@@ -5,8 +5,6 @@ NAME
 ----
 cdist-type__apt_update_index - Update apt's package index
 
-Steven Armstrong <steven-cdist--@--armstrong.cc>
-
 
 DESCRIPTION
 -----------
@@ -32,7 +30,13 @@ EXAMPLES
 
 SEE ALSO
 --------
-- `cdist-type(7) <cdist-type.html>`_
+Full documentation at: <:cdist_docs:`index`>,
+especially cdist type chapter: <:cdist_docs:`cdist-type`>.
+
+
+AUTHORS
+-------
+Steven Armstrong <steven-cdist--@--armstrong.cc>
 
 
 COPYING

cdist/conf/type/__block/man.rst

@@ -5,8 +5,6 @@ NAME
 ----
 cdist-type__block - Manage blocks of text in files
 
-Steven Armstrong <steven-cdist--@--armstrong.cc>
-
 
 DESCRIPTION
 -----------
@@ -73,7 +71,13 @@ EXAMPLES
 
 SEE ALSO
 --------
-- `cdist-type(7) <cdist-type.html>`_
+Full documentation at: <:cdist_docs:`index`>,
+especially cdist type chapter: <:cdist_docs:`cdist-type`>.
+
+
+AUTHORS
+-------
+Steven Armstrong <steven-cdist--@--armstrong.cc>
 
 
 COPYING

cdist/conf/type/__ccollect_source/man.rst

@@ -5,8 +5,6 @@ NAME
 ----
 cdist-type__ccollect_source - Manage ccollect sources
 
-Nico Schottelius <nico-cdist--@--schottelius.org>
-
 
 DESCRIPTION
 -----------
@@ -55,9 +53,17 @@ EXAMPLES
 
 SEE ALSO
 --------
-- `cdist-type(7) <cdist-type.html>`_
+ccollect(1)
-- ccollect(1)
+
-- http://www.nico.schottelius.org/software/ccollect/
+Full documentation at: <:cdist_docs:`index`>,
+especially cdist type chapter: <:cdist_docs:`cdist-type`>.
+ccollect documentation at:
+<http://www.nico.schottelius.org/software/ccollect/>.
+
+
+AUTHORS
+-------
+Nico Schottelius <nico-cdist--@--schottelius.org>
 
 
 COPYING

cdist/conf/type/__cdist/man.rst

@@ -5,8 +5,6 @@ NAME
 ----
 cdist-type__cdist - Manage cdist installations
 
-Nico Schottelius <nico-cdist--@--schottelius.org>
-
 
 DESCRIPTION
 -----------
@@ -54,7 +52,13 @@ EXAMPLES
 
 SEE ALSO
 --------
-- `cdist-type(7) <cdist-type.html>`_
+Full documentation at: <:cdist_docs:`index`>,
+especially cdist type chapter: <:cdist_docs:`cdist-type`>.
+
+
+AUTHORS
+-------
+Nico Schottelius <nico-cdist--@--schottelius.org>
 
 
 COPYING

cdist/conf/type/__cdistmarker/man.rst

@@ -5,8 +5,6 @@ NAME
 ----
 cdist-type__cdistmarker - Add a timestamped cdist marker.
 
-Daniel Maher <phrawzty+cdist--@--gmail.com>
-
 
 DESCRIPTION
 -----------
@@ -46,7 +44,13 @@ EXAMPLES
 
 SEE ALSO
 --------
-- `cdist-type(7) <cdisty-type.html>`_
+Full documentation at: <:cdist_docs:`index`>,
+especially cdist type chapter: <:cdist_docs:`cdist-type`>.
+
+
+AUTHORS
+-------
+Daniel Maher <phrawzty+cdist--@--gmail.com>
 
 
 COPYING

cdist/conf/type/__config_file/man.rst

@@ -5,8 +5,6 @@ NAME
 ----
 cdist-type__config_file - _Manages config files
 
-Steven Armstrong <steven-cdist--@--armstrong.cc>
-
 
 DESCRIPTION
 -----------
@@ -50,8 +48,15 @@ EXAMPLES
 
 SEE ALSO
 --------
-- `cdist-type(7) <cdist-type.html>`_
+`cdist-type__file(7) <cdist-type__file.html>`_
-- `cdist-type__file(7) <cdist-type__file.html>`_
+
+Full documentation at: <:cdist_docs:`index`>,
+especially cdist type chapter: <:cdist_docs:`cdist-type`>.
+
+
+AUTHORS
+-------
+Steven Armstrong <steven-cdist--@--armstrong.cc>
 
 
 COPYING

cdist/conf/type/__consul/man.rst

@@ -5,8 +5,6 @@ NAME
 ----
 cdist-type__consul - Install consul
 
-Steven Armstrong <steven-cdist--@--armstrong.cc>
-
 
 DESCRIPTION
 -----------
@@ -45,7 +43,13 @@ EXAMPLES
 
 SEE ALSO
 --------
-- `cdist-type(7) <cdist-type.html>`_
+Full documentation at: <:cdist_docs:`index`>,
+especially cdist type chapter: <:cdist_docs:`cdist-type`>.
+
+
+AUTHORS
+-------
+Steven Armstrong <steven-cdist--@--armstrong.cc>
 
 
 COPYING

cdist/conf/type/__consul_agent/man.rst

@@ -5,8 +5,6 @@ NAME
 ----
 cdist-type__consul_agent - Manage the consul agent
 
-Steven Armstrong <steven-cdist--@--armstrong.cc>
-
 
 DESCRIPTION
 -----------
@@ -167,8 +165,15 @@ EXAMPLES
 
 SEE ALSO
 --------
-- `cdist-type(7) <cdist-type.html>`_
+Full documentation at: <:cdist_docs:`index`>,
-- http://www.consul.io/docs/agent/options.html
+especially cdist type chapter: <:cdist_docs:`cdist-type`>.
+consul documentation at:
+<http://www.consul.io/docs/agent/options.html>.
+
+
+AUTHORS
+-------
+Steven Armstrong <steven-cdist--@--armstrong.cc>
 
 
 COPYING

cdist/conf/type/__consul_check/man.rst

@@ -5,8 +5,6 @@ NAME
 ----
 cdist-type__consul_check - Manages consul checks
 
-Steven Armstrong <steven-cdist--@--armstrong.cc>
-
 
 DESCRIPTION
 -----------
@@ -64,8 +62,15 @@ EXAMPLES
 
 SEE ALSO
 --------
-- `cdist-type(7) <cdist-type.html>`_
+`cdist-type__consul_agent(7) <cdist-type__consul_agent.html>`_
-- `cdist-type__consul_agent(7) <cdist-type__consul_agent.html>`_
+
+Full documentation at: <:cdist_docs:`index`>,
+especially cdist type chapter: <:cdist_docs:`cdist-type`>.
+
+
+AUTHORS
+-------
+Steven Armstrong <steven-cdist--@--armstrong.cc>
 
 
 COPYING

cdist/conf/type/__consul_reload/man.rst

@@ -5,8 +5,6 @@ NAME
 ----
 cdist-type__consul_reload - Reload consul
 
-Steven Armstrong <steven-cdist--@--armstrong.cc>
-
 
 DESCRIPTION
 -----------
@@ -33,7 +31,13 @@ EXAMPLES
 
 SEE ALSO
 --------
-- `cdist-type(7) <cdist-type.html>`_
+Full documentation at: <:cdist_docs:`index`>,
+especially cdist type chapter: <:cdist_docs:`cdist-type`>.
+
+
+AUTHORS
+-------
+Steven Armstrong <steven-cdist--@--armstrong.cc>
 
 
 COPYING

cdist/conf/type/__consul_service/man.rst

@@ -5,8 +5,6 @@ NAME
 ----
 cdist-type__consul_service - Manages consul services
 
-Steven Armstrong <steven-cdist--@--armstrong.cc>
-
 
 DESCRIPTION
 -----------
@@ -68,8 +66,15 @@ EXAMPLES
 
 SEE ALSO
 --------
-- `cdist-type(7) <cdist-type.html>`_
+`cdist-type__consul_agent(7) <cdist-type__consul_agent.html>`_
-- `cdist-type__consul_agent(7) <cdist-type__consul_agent.html>`_
+
+Full documentation at: <:cdist_docs:`index`>,
+especially cdist type chapter: <:cdist_docs:`cdist-type`>.
+
+
+AUTHORS
+-------
+Steven Armstrong <steven-cdist--@--armstrong.cc>
 
 
 COPYING

cdist/conf/type/__consul_template/man.rst

@@ -5,8 +5,6 @@ NAME
 ----
 cdist-type__consul_template - Manage the consul-template service
 
-Steven Armstrong <steven-cdist--@--armstrong.cc>
-
 
 DESCRIPTION
 -----------
@@ -127,8 +125,15 @@ EXAMPLES
 
 SEE ALSO
 --------
-- `cdist-type(7) <cdist-type.html>`_
+Full documentation at: <:cdist_docs:`index`>,
-- https://github.com/hashicorp/consul-template
+especially cdist type chapter: <:cdist_docs:`cdist-type`>.
+consul documentation at:
+<https://github.com/hashicorp/consul-template>.
+
+
+AUTHORS
+-------
+Steven Armstrong <steven-cdist--@--armstrong.cc>
 
 
 COPYING

cdist/conf/type/__consul_template_template/man.rst

@@ -5,8 +5,6 @@ NAME
 ----
 cdist-type__consul_template_template - Manage consul-template templates
 
-Steven Armstrong <steven-cdist--@--armstrong.cc>
-
 
 DESCRIPTION
 -----------
@@ -61,9 +59,16 @@ EXAMPLES
 
 SEE ALSO
 --------
-- `cdist-type(7) <cdist-type.html>`_
+`cdist-type__consul_template(7) <cdist-type__consul_template.html>`_,
-- `cdist-type__consul_template(7) <cdist-type__consul_template.html>`_
+`cdist-type__consul_template_config(7) <cdist-type__consul_template_config.html>`_
-- `cdist-type__consul_template_config(7) <cdist-type__consul_template_config.html>`_
+
+Full documentation at: <:cdist_docs:`index`>,
+especially cdist type chapter: <:cdist_docs:`cdist-type`>.
+
+
+AUTHORS
+-------
+Steven Armstrong <steven-cdist--@--armstrong.cc>
 
 
 COPYING

cdist/conf/type/__consul_watch_checks/man.rst

@@ -5,8 +5,6 @@ NAME
 ----
 cdist-type__consul_watch_checks - Manages consul checks watches
 
-Steven Armstrong <steven-cdist--@--armstrong.cc>
-
 
 DESCRIPTION
 -----------
@@ -57,9 +55,17 @@ EXAMPLES
 
 SEE ALSO
 --------
-- `cdist-type(7) <cdist-type.html>`_
+`cdist-type__consul_agent(7) <cdist-type__consul_agent.html>`_
-- `cdist-type__consul_agent(7) <cdist-type__consul_agent.html>`_
+
-- http://www.consul.io/docs/agent/watches.html
+Full documentation at: <:cdist_docs:`index`>,
+especially cdist type chapter: <:cdist_docs:`cdist-type`>.
+consul documentation at:
+<http://www.consul.io/docs/agent/watches.html>.
+
+
+AUTHORS
+-------
+Steven Armstrong <steven-cdist--@--armstrong.cc>
 
 
 COPYING

cdist/conf/type/__consul_watch_event/man.rst

@@ -5,8 +5,6 @@ NAME
 ----
 cdist-type__consul_watch_event - Manages consul event watches
 
-Steven Armstrong <steven-cdist--@--armstrong.cc>
-
 
 DESCRIPTION
 -----------
@@ -50,9 +48,17 @@ EXAMPLES
 
 SEE ALSO
 --------
-- `cdist-type(7) <cdist-type.html>`_
+`cdist-type__consul_agent(7) <cdist-type__consul_agent.html>`_
-- `cdist-type__consul_agent(7) <cdist-type__consul_agent.html>`_
+
-- http://www.consul.io/docs/agent/watches.html
+Full documentation at: <:cdist_docs:`index`>,
+especially cdist type chapter: <:cdist_docs:`cdist-type`>.
+consul documentation at:
+<http://www.consul.io/docs/agent/watches.html>.
+
+
+AUTHORS
+-------
+Steven Armstrong <steven-cdist--@--armstrong.cc>
 
 
 COPYING

cdist/conf/type/__consul_watch_key/man.rst

@@ -5,8 +5,6 @@ NAME
 ----
 cdist-type__consul_watch_key - Manages consul key watches
 
-Steven Armstrong <steven-cdist--@--armstrong.cc>
-
 
 DESCRIPTION
 -----------
@@ -47,9 +45,17 @@ EXAMPLES
 
 SEE ALSO
 --------
-- `cdist-type(7) <cdist-type.html>`_
+`cdist-type__consul_agent(7) <cdist-type__consul_agent.html>`_
-- `cdist-type__consul_agent(7) <cdist-type__consul_agent.html>`_
+
-- http://www.consul.io/docs/agent/watches.html
+Full documentation at: <:cdist_docs:`index`>,
+especially cdist type chapter: <:cdist_docs:`cdist-type`>.
+consul documentation at:
+<http://www.consul.io/docs/agent/watches.html>.
+
+
+AUTHORS
+-------
+Steven Armstrong <steven-cdist--@--armstrong.cc>
 
 
 COPYING

cdist/conf/type/__consul_watch_keyprefix/man.rst

@@ -5,8 +5,6 @@ NAME
 ----
 cdist-type__consul_watch_keyprefix - Manages consul keyprefix watches
 
-Steven Armstrong <steven-cdist--@--armstrong.cc>
-
 
 DESCRIPTION
 -----------
@@ -47,9 +45,16 @@ EXAMPLES
 
 SEE ALSO
 --------
-- `cdist-type(7) <cdist-type.html>`_
+`cdist-type__consul_agent(7) <cdist-type__consul_agent.html>`_
-- `cdist-type__consul_agent(7) <cdist-type__consul_agent.html>`_
+
-- http://www.consul.io/docs/agent/watches.html
+Full documentation at: <:cdist_docs:`index`>,
+especially cdist type chapter: <:cdist_docs:`cdist-type`>.
+consule documentation at: <http://www.consul.io/docs/agent/watches.html>.
+
+
+AUTHORS
+-------
+Steven Armstrong <steven-cdist--@--armstrong.cc>
 
 
 COPYING

cdist/conf/type/__consul_watch_nodes/man.rst

@@ -5,8 +5,6 @@ NAME
 ----
 cdist-type__consul_watch_nodes - Manages consul nodes watches
 
-Steven Armstrong <steven-cdist--@--armstrong.cc>
-
 
 DESCRIPTION
 -----------
@@ -43,9 +41,17 @@ EXAMPLES
 
 SEE ALSO
 --------
-- `cdist-type(7) <cdist-type.html>`_
+`cdist-type__consul_agent(7) <cdist-type__consul_agent.html>`_
-- `cdist-type__consul_agent(7) <cdist-type__consul_agent.html>`_
+
-- http://www.consul.io/docs/agent/watches.html
+Full documentation at: <:cdist_docs:`index`>,
+especially cdist type chapter: <:cdist_docs:`cdist-type`>.
+consul documentation at:
+<http://www.consul.io/docs/agent/watches.html>.
+
+
+AUTHORS
+-------
+Steven Armstrong <steven-cdist--@--armstrong.cc>
 
 
 COPYING

cdist/conf/type/__consul_watch_service/man.rst

@@ -5,8 +5,6 @@ NAME
 ----
 cdist-type__consul_watch_service - Manages consul service watches
 
-Steven Armstrong <steven-cdist--@--armstrong.cc>
-
 
 DESCRIPTION
 -----------
@@ -67,9 +65,16 @@ EXAMPLES
 
 SEE ALSO
 --------
-- `cdist-type(7) <cdist-type.html>`_
+`cdist-type__consul_agent(7) <cdist-type__consul_agent.html>`_
-- `cdist-type__consul_agent(7) <cdist-type__consul_agent.html>`_
+
-- http://www.consul.io/docs/agent/watches.html
+Full documentation at: <:cdist_docs:`index`>,
+especially cdist type chapter: <:cdist_docs:`cdist-type`>.
+consule documentation at: <http://www.consul.io/docs/agent/watches.html>.
+
+
+AUTHORS
+-------
+Steven Armstrong <steven-cdist--@--armstrong.cc>
 
 
 COPYING

cdist/conf/type/__consul_watch_services/man.rst

@@ -5,8 +5,6 @@ NAME
 ----
 cdist-type__consul_watch_services - Manages consul services watches
 
-Steven Armstrong <steven-cdist--@--armstrong.cc>
-
 
 DESCRIPTION
 -----------
@@ -43,9 +41,17 @@ EXAMPLES
 
 SEE ALSO
 --------
-- `cdist-type(7) <cdist-type.html>`_
+`cdist-type__consul_agent(7) <cdist-type__consul_agent.html>`_
-- `cdist-type__consul_agent(7) <cdist-type__consul_agent.html>`_
+
-- http://www.consul.io/docs/agent/watches.html
+Full documentation at: <:cdist_docs:`index`>,
+especially cdist type chapter: <:cdist_docs:`cdist-type`>.
+consul documentation at:
+<http://www.consul.io/docs/agent/watches.html>.
+
+
+AUTHORS
+-------
+Steven Armstrong <steven-cdist--@--armstrong.cc>
 
 
 COPYING

cdist/conf/type/__cron/man.rst

@@ -5,8 +5,6 @@ NAME
 ----
 cdist-type__cron - Installs and manages cron jobs
 
-Steven Armstrong <steven-cdist--@--armstrong.cc>
-
 
 DESCRIPTION
 -----------
@@ -70,8 +68,15 @@ EXAMPLES
 
 SEE ALSO
 --------
-- `cdist-type(7) <cdist-type.html>`_
+crontab(5)
-- crontab(5)
+
+Full documentation at: <:cdist_docs:`index`>,
+especially cdist type chapter: <:cdist_docs:`cdist-type`>.
+
+
+AUTHORS
+-------
+Steven Armstrong <steven-cdist--@--armstrong.cc>
 
 
 COPYING

cdist/conf/type/__debconf_set_selections/man.rst

@@ -5,8 +5,6 @@ NAME
 ----
 cdist-type__debconf_set_selections - Setup debconf selections
 
-Nico Schottelius <nico-cdist--@--schottelius.org>
-
 
 DESCRIPTION
 -----------
@@ -39,9 +37,16 @@ EXAMPLES
 
 SEE ALSO
 --------
-- `cdist-type(7) <cdist-type.html>`_
+debconf-set-selections(1),
-- `cdist-type__update_alternatives(7) <cdist-type__update_alternatives.html>`_
+`cdist-type__update_alternatives(7) <cdist-type__update_alternatives.html>`_
-- debconf-set-selections(1)
+
+Full documentation at: <:cdist_docs:`index`>,
+especially cdist type chapter: <:cdist_docs:`cdist-type`>.
+
+
+AUTHORS
+-------
+Nico Schottelius <nico-cdist--@--schottelius.org>
 
 
 COPYING

cdist/conf/type/__directory/man.rst

@@ -5,8 +5,6 @@ NAME
 ----
 cdist-type__directory - Manage a directory
 
-Nico Schottelius <nico-cdist--@--schottelius.org>
-
 
 DESCRIPTION
 -----------
@@ -92,7 +90,13 @@ EXAMPLES
 
 SEE ALSO
 --------
-- `cdist-type(7) <cdist-type.html>`_
+Full documentation at: <:cdist_docs:`index`>,
+especially cdist type chapter: <:cdist_docs:`cdist-type`>.
+
+
+AUTHORS
+-------
+Nico Schottelius <nico-cdist--@--schottelius.org>
 
 
 COPYING

cdist/conf/type/__dog_vdi/man.rst

@@ -5,8 +5,6 @@ NAME
 ----
 cdist-type__dog_vdi - Manage Sheepdog VM images
 
-Nico Schottelius <nico-cdist--@--schottelius.org>
-
 
 DESCRIPTION
 -----------
@@ -45,9 +43,15 @@ EXAMPLES
 
 SEE ALSO
 --------
-- `cdist-type(7) <cdist-type.html>`_
+qemu(1), dog(8)
-- dog(8)
+
-- qemu(1)
+Full documentation at: <:cdist_docs:`index`>,
+especially cdist type chapter: <:cdist_docs:`cdist-type`>.
+
+
+AUTHORS
+-------
+Nico Schottelius <nico-cdist--@--schottelius.org>
 
 
 COPYING

cdist/conf/type/__file/man.rst

@@ -5,8 +5,6 @@ NAME
 ----
 cdist-type__file - Manage files.
 
-Nico Schottelius <nico-cdist--@--schottelius.org>
-
 
 DESCRIPTION
 -----------
@@ -103,7 +101,13 @@ EXAMPLES
 
 SEE ALSO
 --------
-* `cdist-type(7) <cdist-type.html>`_
+Full documentation at: <:cdist_docs:`index`>,
+especially cdist type chapter: <:cdist_docs:`cdist-type`>.
+
+
+AUTHORS
+-------
+Nico Schottelius <nico-cdist--@--schottelius.org>
 
 
 COPYING

cdist/conf/type/__firewalld_rule/man.rst

@@ -5,8 +5,6 @@ NAME
 ----
 cdist-type__firewalld_rule - Configure firewalld rules
 
-Nico Schottelius <nico-cdist--@--schottelius.org>
-
 
 DESCRIPTION
 -----------
@@ -67,9 +65,16 @@ EXAMPLES
 
 SEE ALSO
 --------
-- `cdist-type(7) <cdist-type.html>`_
+`cdist-type__iptables_rule(7) <cdist-type__iptables_rule.html>`_,
-- `cdist-type__iptables_rule(7) <cdist-type__iptables_rule.html>`_
+firewalld(8)
-- firewalld(8)
+
+Full documentation at: <:cdist_docs:`index`>,
+especially cdist type chapter: <:cdist_docs:`cdist-type`>.
+
+
+AUTHORS
+-------
+Nico Schottelius <nico-cdist--@--schottelius.org>
 
 
 COPYING

cdist/conf/type/__git/man.rst

@@ -5,8 +5,6 @@ NAME
 ----
 cdist-type__git -  Get and or keep git repositories up-to-date
 
-Nico Schottelius <nico-cdist--@--schottelius.org>
-
 
 DESCRIPTION
 -----------
@@ -51,7 +49,13 @@ EXAMPLES
 
 SEE ALSO
 --------
-- `cdist-type(7) <cdist-type.html>`_
+Full documentation at: <:cdist_docs:`index`>,
+especially cdist type chapter: <:cdist_docs:`cdist-type`>.
+
+
+AUTHORS
+-------
+Nico Schottelius <nico-cdist--@--schottelius.org>
 
 
 COPYING

cdist/conf/type/__group/man.rst

@@ -5,8 +5,6 @@ NAME
 ----
 cdist-type__group - Manage groups
 
-Steven Armstrong <steven-cdist--@--armstrong.cc>
-
 
 DESCRIPTION
 -----------
@@ -71,7 +69,13 @@ EXAMPLES
 
 SEE ALSO
 --------
-- `cdist-type(7) <cdist-type.html>`_
+Full documentation at: <:cdist_docs:`index`>,
+especially cdist type chapter: <:cdist_docs:`cdist-type`>.
+
+
+AUTHORS
+-------
+Steven Armstrong <steven-cdist--@--armstrong.cc>
 
 
 COPYING

cdist/conf/type/__hostname/man.rst

@@ -5,8 +5,6 @@ NAME
 ----
 cdist-type__hostname - Set the hostname
 
-Steven Armstrong <steven-cdist--@--armstrong.cc>
-
 
 DESCRIPTION
 -----------
@@ -43,7 +41,13 @@ EXAMPLES
 
 SEE ALSO
 --------
-- `cdist-type(7) <cdist-type.html>`_
+Full documentation at: <:cdist_docs:`index`>,
+especially cdist type chapter: <:cdist_docs:`cdist-type`>.
+
+
+AUTHORS
+-------
+Steven Armstrong <steven-cdist--@--armstrong.cc>
 
 
 COPYING

cdist/conf/type/__iptables_apply/man.rst

@@ -5,8 +5,6 @@ NAME
 ----
 cdist-type__iptables_apply - Apply the rules
 
-Nico Schottelius <nico-cdist--@--schottelius.org>
-
 
 DESCRIPTION
 -----------
@@ -31,9 +29,16 @@ None (__iptables_apply is used by __iptables_rule)
 
 SEE ALSO
 --------
-- `cdist-type(7) <cdist-type.html>`_
+`cdist-type__iptables_rule(7) <cdist-type__iptables_rule.html>`_,
-- `cdist-type__iptables_rule(7) <cdist-type__iptables_rule.html>`_
+iptables(8)
-- iptables(8)
+
+Full documentation at: <:cdist_docs:`index`>,
+especially cdist type chapter: <:cdist_docs:`cdist-type`>.
+
+
+AUTHORS
+-------
+Nico Schottelius <nico-cdist--@--schottelius.org>
 
 
 COPYING

cdist/conf/type/__iptables_rule/man.rst

@@ -5,8 +5,6 @@ NAME
 ----
 cdist-type__iptables_rule - Deploy iptable rulesets
 
-Nico Schottelius <nico-cdist--@--schottelius.org>
-
 
 DESCRIPTION
 -----------
@@ -52,9 +50,16 @@ EXAMPLES
 
 SEE ALSO
 --------
-- `cdist-type(7) <cdist-type.html>`_
+`cdist-type__iptables_apply(7) <cdist-type__iptables_apply.html>`_,
-- `cdist-type__iptables_apply(7) <cdist-type__iptables_apply.html>`_
+iptables(8)
-- iptables(8)
+
+Full documentation at: <:cdist_docs:`index`>,
+especially cdist type chapter: <:cdist_docs:`cdist-type`>.
+
+
+AUTHORS
+-------
+Nico Schottelius <nico-cdist--@--schottelius.org>
 
 
 COPYING

cdist/conf/type/__issue/man.rst

@@ -5,8 +5,6 @@ NAME
 ----
 cdist-type__issue - Manage issue
 
-Nico Schottelius <nico-cdist--@--schottelius.org>
-
 
 DESCRIPTION
 -----------
@@ -38,7 +36,13 @@ EXAMPLES
 
 SEE ALSO
 --------
-- `cdist-type(7) <cdist-type.html>`_
+Full documentation at: <:cdist_docs:`index`>,
+especially cdist type chapter: <:cdist_docs:`cdist-type`>.
+
+
+AUTHORS
+-------
+Nico Schottelius <nico-cdist--@--schottelius.org>
 
 
 COPYING

cdist/conf/type/__jail/man.rst

@@ -5,8 +5,6 @@ NAME
 ----
 cdist-type__jail - Manage FreeBSD jails
 
-Jake Guffey <jake.guffey--@--jointheirstm.org>
-
 
 DESCRIPTION
 -----------
@@ -110,7 +108,13 @@ EXAMPLES
 
 SEE ALSO
 --------
-- `cdist-type(7) <cdist-type.html>`_
+Full documentation at: <:cdist_docs:`index`>,
+especially cdist type chapter: <:cdist_docs:`cdist-type`>.
+
+
+AUTHORS
+-------
+Jake Guffey <jake.guffey--@--jointheirstm.org>
 
 
 COPYING

cdist/conf/type/__jail_freebsd10/man.rst

@@ -5,8 +5,6 @@ NAME
 ----
 cdist-type__jail_freeebsd10 - Manage FreeBSD jails
 
-Jake Guffey <jake.guffey--@--jointheirstm.org>
-
 
 DESCRIPTION
 -----------
@@ -109,7 +107,13 @@ EXAMPLES
 
 SEE ALSO
 --------
-- `cdist-type(7) <cdist-type.html>`_
+Full documentation at: <:cdist_docs:`index`>,
+especially cdist type chapter: <:cdist_docs:`cdist-type`>.
+
+
+AUTHORS
+-------
+Jake Guffey <jake.guffey--@--jointheirstm.org>
 
 
 COPYING

cdist/conf/type/__jail_freebsd9/man.rst

@@ -5,8 +5,6 @@ NAME
 ----
 cdist-type__jail_freebsd9 - Manage FreeBSD jails
 
-Jake Guffey <jake.guffey--@--eprotex.com>
-
 
 DESCRIPTION
 -----------
@@ -110,7 +108,13 @@ EXAMPLES
 
 SEE ALSO
 --------
-- `cdist-type(7) <cdist-type.html>`_
+Full documentation at: <:cdist_docs:`index`>,
+especially cdist type chapter: <:cdist_docs:`cdist-type`>.
+
+
+AUTHORS
+-------
+Jake Guffey <jake.guffey--@--eprotex.com>
 
 
 COPYING

cdist/conf/type/__key_value/man.rst

@@ -5,8 +5,6 @@ NAME
 ----
 cdist-type__key_value - Change property values in files
 
-Steven Armstrong <steven-cdist--@--armstrong.cc>
-
 
 DESCRIPTION
 -----------
@@ -85,7 +83,13 @@ So you need to exactly specify the key and delimiter. Delimiter can be of any le
 
 SEE ALSO
 --------
-- `cdist-type(7) <cdist-type.html>`_
+Full documentation at: <:cdist_docs:`index`>,
+especially cdist type chapter: <:cdist_docs:`cdist-type`>.
+
+
+AUTHORS
+-------
+Steven Armstrong <steven-cdist--@--armstrong.cc>
 
 
 COPYING

cdist/conf/type/__line/man.rst

@@ -5,8 +5,6 @@ NAME
 ----
 cdist-type__line - Manage lines in files
 
-Nico Schottelius <nico-cdist--@--schottelius.org>
-
 
 DESCRIPTION
 -----------
@@ -63,8 +61,15 @@ EXAMPLES
 
 SEE ALSO
 --------
-- `cdist-type(7) <cdist-type.html>`_
+grep(1)
-- grep(1)
+
+Full documentation at: <:cdist_docs:`index`>,
+especially cdist type chapter: <:cdist_docs:`cdist-type`>.
+
+
+AUTHORS
+-------
+Nico Schottelius <nico-cdist--@--schottelius.org>
 
 
 COPYING

cdist/conf/type/__link/man.rst

@@ -5,8 +5,6 @@ NAME
 ----
 cdist-type__link - Manage links (hard and symbolic)
 
-Nico Schottelius <nico-cdist--@--schottelius.org>
-
 
 DESCRIPTION
 -----------
@@ -51,7 +49,13 @@ EXAMPLES
 
 SEE ALSO
 --------
-- `cdist-type(7) <cdist-type.html>`_
+Full documentation at: <:cdist_docs:`index`>,
+especially cdist type chapter: <:cdist_docs:`cdist-type`>.
+
+
+AUTHORS
+-------
+Nico Schottelius <nico-cdist--@--schottelius.org>
 
 
 COPYING

cdist/conf/type/__locale/man.rst

@@ -5,8 +5,6 @@ NAME
 ----
 cdit-type__locale - Configure locales
 
-Nico Schottelius <nico-cdist--@--schottelius.org>
-
 
 DESCRIPTION
 -----------
@@ -36,9 +34,15 @@ EXAMPLES
 
 SEE ALSO
 --------
-- locale(1)
+locale(1), localedef(1)
-- localedef(1)
+
-- `cdist-type(7) <cdist-type.html>`_
+Full documentation at: <:cdist_docs:`index`>,
+especially cdist type chapter: <:cdist_docs:`cdist-type`>.
+
+
+AUTHORS
+-------
+Nico Schottelius <nico-cdist--@--schottelius.org>
 
 
 COPYING

cdist/conf/type/__motd/man.rst

@@ -5,8 +5,6 @@ NAME
 ----
 cdist-type__motd - Manage message of the day
 
-Nico Schottelius <nico-cdist--@--schottelius.org>
-
 
 DESCRIPTION
 -----------
@@ -39,7 +37,13 @@ EXAMPLES
 
 SEE ALSO
 --------
-- `cdist-type(7) <cdist-type.html>`_
+Full documentation at: <:cdist_docs:`index`>,
+especially cdist type chapter: <:cdist_docs:`cdist-type`>.
+
+
+AUTHORS
+-------
+Nico Schottelius <nico-cdist--@--schottelius.org>
 
 
 COPYING

cdist/conf/type/__mount/man.rst

@@ -5,8 +5,6 @@ NAME
 ----
 cdit-type__mount - Manage filesystem mounts
 
-Steven Armstrong <steven-cdist--@--armstrong.cc>
-
 
 DESCRIPTION
 -----------
@@ -75,7 +73,13 @@ EXAMPLES
 
 SEE ALSO
 --------
-- `cdist-type(7) <cdist-type.html>`_
+Full documentation at: <:cdist_docs:`index`>,
+especially cdist type chapter: <:cdist_docs:`cdist-type`>.
+
+
+AUTHORS
+-------
+Steven Armstrong <steven-cdist--@--armstrong.cc>
 
 
 COPYING

cdist/conf/type/__mysql_database/man.rst

@@ -5,8 +5,6 @@ NAME
 ----
 cdist-type__mysql_database - Manage a MySQL database
 
-Benedikt Koeppel <code@benediktkoeppel.ch>
-
 
 DESCRIPTION
 -----------
@@ -40,7 +38,13 @@ EXAMPLES
 
 SEE ALSO
 --------
-- `cdist-type(7) <cdist-type.html>`_
+Full documentation at: <:cdist_docs:`index`>,
+especially cdist type chapter: <:cdist_docs:`cdist-type`>.
+
+
+AUTHORS
+-------
+Benedikt Koeppel <code@benediktkoeppel.ch>
 
 
 COPYING

cdist/conf/type/__package/man.rst

@@ -5,8 +5,6 @@ NAME
 ----
 cdist-type__package - Manage packages
 
-Steven Armstrong <steven-cdist--@--armstrong.cc>
-
 
 DESCRIPTION
 -----------
@@ -55,7 +53,13 @@ EXAMPLES
 
 SEE ALSO
 --------
-- `cdist-type(7) <cdist-type.html>`_
+Full documentation at: <:cdist_docs:`index`>,
+especially cdist type chapter: <:cdist_docs:`cdist-type`>.
+
+
+AUTHORS
+-------
+Steven Armstrong <steven-cdist--@--armstrong.cc>
 
 
 COPYING

cdist/conf/type/__package_apt/man.rst

@@ -5,8 +5,6 @@ NAME
 ----
 cdist-type__package_apt - Manage packages with apt-get
 
-Nico Schottelius <nico-cdist--@--schottelius.org>
-
 
 DESCRIPTION
 -----------
@@ -48,8 +46,15 @@ EXAMPLES
 
 SEE ALSO
 --------
-- `cdist-type(7) <cdist-type.html>`_
+`cdist-type__package(7) <cdist-type__package.html>`_
-- `cdist-type__package(7) <cdist-type__package.html>`_
+
+Full documentation at: <:cdist_docs:`index`>,
+especially cdist type chapter: <:cdist_docs:`cdist-type`>.
+
+
+AUTHORS
+-------
+Nico Schottelius <nico-cdist--@--schottelius.org>
 
 
 COPYING

cdist/conf/type/__package_emerge/man.rst

@@ -5,8 +5,6 @@ NAME
 ----
 cdist-type__package_emerge - Manage packages with portage
 
-Thomas Oettli <otho--@--sfs.biz>
-
 
 DESCRIPTION
 -----------
@@ -49,9 +47,16 @@ EXAMPLES
 
 SEE ALSO
 --------
-- `cdist-type(7) <cdist-type.html>`_
+`cdist-type__package(7) <cdist-type__package.html>`_,
-- `cdist-type__package(7) <cdist-type__package.html>`_
+`cdist-type__package_emerge_dependencies(7) <cdist-type__package_emerge_dependencies.html>`_
-- `cdist-type__package_emerge_dependencies(7) <cdist-type__package_emerge_dependencies.html>`_
+
+Full documentation at: <:cdist_docs:`index`>,
+especially cdist type chapter: <:cdist_docs:`cdist-type`>.
+
+
+AUTHORS
+-------
+Thomas Oettli <otho--@--sfs.biz>
 
 
 COPYING

cdist/conf/type/__package_emerge_dependencies/man.rst

@@ -5,8 +5,6 @@ NAME
 ----
 cdist-type__package_emerge_dependencies - Install dependencies for __package_emerge
 
-Thomas Oettli <otho--@--sfs.biz>
-
 
 DESCRIPTION
 -----------
@@ -38,9 +36,16 @@ EXAMPLES
 
 SEE ALSO
 --------
-- `cdist-type(7) <cdist-type.html>`_
+`cdist-type__package(7) <cdist-type__package.html>`_,
-- `cdist-type__package(7) <cdist-type__package.html>`_
+`cdist-type__package_emerge(7) <cdist-type__package_emerge.html>`_
-- `cdist-type__package_emerge(7) <cdist-type__package_emerge.html>`_
+
+Full documentation at: <:cdist_docs:`index`>,
+especially cdist type chapter: <:cdist_docs:`cdist-type`>.
+
+
+AUTHORS
+-------
+Thomas Oettli <otho--@--sfs.biz>
 
 
 COPYING

cdist/conf/type/__package_luarocks/man.rst

@@ -5,8 +5,6 @@ NAME
 ----
 cdist-type__package_luarocks - Manage luarocks packages
 
-Christian G. Warden <cwarden@xerus.org>
-
 
 DESCRIPTION
 -----------
@@ -41,8 +39,15 @@ EXAMPLES
 
 SEE ALSO
 --------
-- `cdist-type(7) <cdist-type.html>`_
+`cdist-type__package(7) <cdist-type__package.html>`_
-- `cdist-type__package(7) <cdist-type__package.html>`_
+
+Full documentation at: <:cdist_docs:`index`>,
+especially cdist type chapter: <:cdist_docs:`cdist-type`>.
+
+
+AUTHORS
+-------
+Christian G. Warden <cwarden@xerus.org>
 
 
 COPYING

cdist/conf/type/__package_opkg/man.rst

@@ -5,8 +5,6 @@ NAME
 ----
 cdist-type__package_opkg - Manage packages with opkg
 
-Giel van Schijndel <giel+cdist--@--mortis.eu>
-
 
 DESCRIPTION
 -----------
@@ -41,8 +39,15 @@ EXAMPLES
 
 SEE ALSO
 --------
-- `cdist-type(7) <cdist-type.html>`_
+`cdist-type__package(7) <cdist-type__package.html>`_
-- `cdist-type__package(7) <cdist-type__package.html>`_
+
+Full documentation at: <:cdist_docs:`index`>,
+especially cdist type chapter: <:cdist_docs:`cdist-type`>.
+
+
+AUTHORS
+-------
+Giel van Schijndel <giel+cdist--@--mortis.eu>
 
 
 COPYING

cdist/conf/type/__package_pacman/man.rst

@@ -5,8 +5,6 @@ NAME
 ----
 cdist-type__package_pacman - Manage packages with pacman
 
-Nico Schottelius <nico-cdist--@--schottelius.org>
-
 
 DESCRIPTION
 -----------
@@ -44,8 +42,15 @@ EXAMPLES
 
 SEE ALSO
 --------
-- `cdist-type(7) <cdist-type.html>`_
+`cdist-type__package(7) <cdist-type__package.html>`_
-- `cdist-type__package(7) <cdist-type__package.html>`_
+
+Full documentation at: <:cdist_docs:`index`>,
+especially cdist type chapter: <:cdist_docs:`cdist-type`>.
+
+
+AUTHORS
+-------
+Nico Schottelius <nico-cdist--@--schottelius.org>
 
 
 COPYING

cdist/conf/type/__package_pip/man.rst

@@ -5,8 +5,6 @@ NAME
 ----
 cdist-type__package_pip - Manage packages with pip
 
-Nico Schottelius <nico-cdist--@--schottelius.org>
-
 
 DESCRIPTION
 -----------
@@ -51,8 +49,15 @@ EXAMPLES
 
 SEE ALSO
 --------
-- `cdist-type(7) <cdist-type.html>`_
+`cdist-type__package(7) <cdist-type__package.html>`_
-- `cdist-type__package(7) <cdist-type__package.html>`_
+
+Full documentation at: <:cdist_docs:`index`>,
+especially cdist type chapter: <:cdist_docs:`cdist-type`>.
+
+
+AUTHORS
+-------
+Nico Schottelius <nico-cdist--@--schottelius.org>
 
 
 COPYING

cdist/conf/type/__package_pkg_freebsd/man.rst

@@ -5,8 +5,6 @@ NAME
 ----
 cdist-type__package_pkg_freebsd - Manage FreeBSD packages 
 
-Jake Guffey <jake.guffey--@--eprotex.com>
-
 
 DESCRIPTION
 -----------
@@ -56,8 +54,15 @@ EXAMPLES
 
 SEE ALSO
 --------
-- `cdist-type(7) <cdist-type.html>`_
+`cdist-type__package(7) <cdist-type__package.html>`_
-- `cdist-type__package(7) <cdist-type__package.html>`_
+
+Full documentation at: <:cdist_docs:`index`>,
+especially cdist type chapter: <:cdist_docs:`cdist-type`>.
+
+
+AUTHORS
+-------
+Jake Guffey <jake.guffey--@--eprotex.com>
 
 
 COPYING

cdist/conf/type/__package_pkg_openbsd/man.rst

@@ -5,8 +5,6 @@ NAME
 ----
 cdist-type__package_pkg - Manage OpenBSD packages
 
-Andi Brönnimann <andi-cdist--@--v-net.ch>
-
 
 DESCRIPTION
 -----------
@@ -56,8 +54,15 @@ EXAMPLES
 
 SEE ALSO
 --------
-- `cdist-type(7) <cdist-type.html>`_
+`cdist-type__package(7) <cdist-type__package.html>`_
-- `cdist-type__package(7) <cdist-type__package.html>`_
+
+Full documentation at: <:cdist_docs:`index`>,
+especially cdist type chapter: <:cdist_docs:`cdist-type`>.
+
+
+AUTHORS
+-------
+Andi Brönnimann <andi-cdist--@--v-net.ch>
 
 
 COPYING

cdist/conf/type/__package_pkgng_freebsd/man.rst

@@ -5,8 +5,6 @@ NAME
 ----
 cdist-type__package_pkgng_freebsd - Manage FreeBSD packages with pkg-ng
 
-Jake Guffey <jake.guffey--@--eprotex.com>
-
 
 DESCRIPTION
 -----------
@@ -87,8 +85,15 @@ EXAMPLES
 
 SEE ALSO
 --------
-- `cdist-type(7) <cdist-type.html>`_
+`cdist-type__package(7) <cdist-type__package.html>`_
-- `cdist-type__package(7) <cdist-type__package.html>`_
+
+Full documentation at: <:cdist_docs:`index`>,
+especially cdist type chapter: <:cdist_docs:`cdist-type`>.
+
+
+AUTHORS
+-------
+Jake Guffey <jake.guffey--@--eprotex.com>
 
 
 COPYING

cdist/conf/type/__package_rubygem/man.rst

@@ -5,8 +5,6 @@ NAME
 ----
 cdist-type__package_rubygem - Manage rubygem packages
 
-Chase Allen James <nx-cdist@nu-ex.com>
-
 
 DESCRIPTION
 -----------
@@ -41,8 +39,15 @@ EXAMPLES
 
 SEE ALSO
 --------
-- `cdist-type(7) <cdist-type.html>`_
+`cdist-type__package(7) <cdist-type__package.html>`_
-- `cdist-type__package(7) <cdist-type__package.html>`_
+
+Full documentation at: <:cdist_docs:`index`>,
+especially cdist type chapter: <:cdist_docs:`cdist-type`>.
+
+
+AUTHORS
+-------
+Chase Allen James <nx-cdist@nu-ex.com>
 
 
 COPYING

cdist/conf/type/__package_update_index/man.rst

@@ -5,8 +5,6 @@ NAME
 ----
 cdist-type__update_index - Update the package index
 
-Ricardo Catalinas Jiménez <jimenezrick--@--gmail.com>
-
 
 DESCRIPTION
 -----------
@@ -44,7 +42,13 @@ EXAMPLES
 
 SEE ALSO
 --------
-- `cdist-type(7) <cdist-type.html>`_
+Full documentation at: <:cdist_docs:`index`>,
+especially cdist type chapter: <:cdist_docs:`cdist-type`>.
+
+
+AUTHORS
+-------
+Ricardo Catalinas Jiménez <jimenezrick--@--gmail.com>
 
 
 COPYING

cdist/conf/type/__package_upgrade_all/man.rst

@@ -5,8 +5,6 @@ NAME
 ----
 cdist-type__package_upgrade_all - Upgrade all the installed packages
 
-Ricardo Catalinas Jiménez <jimenezrick--@--gmail.com>
-
 
 DESCRIPTION
 -----------
@@ -44,7 +42,13 @@ EXAMPLES
 
 SEE ALSO
 --------
-- `cdist-type(7) <cdist-type.html>`_
+Full documentation at: <:cdist_docs:`index`>,
+especially cdist type chapter: <:cdist_docs:`cdist-type`>.
+
+
+AUTHORS
+-------
+Ricardo Catalinas Jiménez <jimenezrick--@--gmail.com>
 
 
 COPYING

cdist/conf/type/__package_yum/man.rst

@@ -5,8 +5,6 @@ NAME
 ----
 cdist-type__package_yum - Manage packages with yum
 
-Nico Schottelius <nico-cdist--@--schottelius.org>
-
 
 DESCRIPTION
 -----------
@@ -51,8 +49,15 @@ EXAMPLES
 
 SEE ALSO
 --------
-- `cdist-type(7) <cdist-type.html>`_
+`cdist-type__package(7) <cdist-type__package.html>`_
-- `cdist-type__package(7) <cdist-type__package.html>`_
+
+Full documentation at: <:cdist_docs:`index`>,
+especially cdist type chapter: <:cdist_docs:`cdist-type`>.
+
+
+AUTHORS
+-------
+Nico Schottelius <nico-cdist--@--schottelius.org>
 
 
 COPYING

cdist/conf/type/__package_zypper/man.rst

@@ -5,8 +5,6 @@ NAME
 ----
 cdist-type__package_zypper - Manage packages with zypper
 
-Daniel Heule <hda--@--sfs.biz>
-
 
 DESCRIPTION
 -----------
@@ -58,8 +56,15 @@ EXAMPLES
 
 SEE ALSO
 --------
-- `cdist-type(7) <cdist-type.html>`_
+`cdist-type__package(7) <cdist-type__package.html>`_
-- `cdist-type__package(7) <cdist-type__package.html>`_
+
+Full documentation at: <:cdist_docs:`index`>,
+especially cdist type chapter: <:cdist_docs:`cdist-type`>.
+
+
+AUTHORS
+-------
+Daniel Heule <hda--@--sfs.biz>
 
 
 COPYING

cdist/conf/type/__pacman_conf/man.rst

@@ -5,8 +5,6 @@ NAME
 ----
 cdist-type__pacman_conf - Manage pacman configuration
 
-Dominique Roux <dominique.roux4@gmail.com>
-
 
 DESCRIPTION
 -----------
@@ -61,8 +59,15 @@ EXAMPLES
 
 SEE ALSO
 --------
-- `cdist-type(7) <cdist-type.html>`_
+grep(1)
-- grep(1)
+
+Full documentation at: <:cdist_docs:`index`>,
+especially cdist type chapter: <:cdist_docs:`cdist-type`>.
+
+
+AUTHORS
+-------
+Dominique Roux <dominique.roux4@gmail.com>
 
 
 COPYING

cdist/conf/type/__pacman_conf_integrate/man.rst

@@ -5,8 +5,6 @@ NAME
 ----
 cdist-type__pacman_conf_integrate - Integrate default pacman.conf to cdist conform and vice versa
 
-Dominique Roux <dominique.roux4@gmail.com>
-
 
 DESCRIPTION
 -----------
@@ -37,8 +35,15 @@ EXAMPLES
 
 SEE ALSO
 --------
-- `cdist-type(7) <cdist-type.html>`_
+grep(1)
-- grep(1)
+
+Full documentation at: <:cdist_docs:`index`>,
+especially cdist type chapter: <:cdist_docs:`cdist-type`>.
+
+
+AUTHORS
+-------
+Dominique Roux <dominique.roux4@gmail.com>
 
 
 COPYING

cdist/conf/type/__pf_apply/man.rst

@@ -5,8 +5,6 @@ NAME
 ----
 cdist-type__pf_apply - Apply pf(4) ruleset on \*BSD
 
-Jake Guffey <jake.guffey--@--eprotex.com>
-
 
 DESCRIPTION
 -----------
@@ -41,9 +39,16 @@ EXAMPLES
 
 SEE ALSO
 --------
-- `cdist-type(7) <cdist-type.html>`_
+pf(4),
-- `cdist-type__pf_ruleset(7) <cdist-type__pf_ruleset.html>`_
+`cdist-type__pf_ruleset(7) <cdist-type__pf_ruleset.html>`_
-- pf(4)
+
+Full documentation at: <:cdist_docs:`index`>,
+especially cdist type chapter: <:cdist_docs:`cdist-type`>.
+
+
+AUTHORS
+-------
+Jake Guffey <jake.guffey--@--eprotex.com>
 
 
 COPYING

cdist/conf/type/__pf_ruleset/man.rst

@@ -5,8 +5,6 @@ NAME
 ----
 cdist-type__pf_ruleset - Copy a pf(4) ruleset to $__target_host
 
-Jake Guffey <jake.guffey--@--eprotex.com>
-
 
 DESCRIPTION
 -----------
@@ -41,8 +39,15 @@ EXAMPLES
 
 SEE ALSO
 --------
-- `cdist-type(7) <cdist-type.html>`_
+pf(4)
-- pf(4)
+
+Full documentation at: <:cdist_docs:`index`>,
+especially cdist type chapter: <:cdist_docs:`cdist-type`>.
+
+
+AUTHORS
+-------
+Jake Guffey <jake.guffey--@--eprotex.com>
 
 
 COPYING

cdist/conf/type/__postfix/man.rst

@@ -5,8 +5,6 @@ NAME
 ----
 cdist-type__postfix - Install postfix
 
-Steven Armstrong <steven-cdist--@--armstrong.cc>
-
 
 DESCRIPTION
 -----------
@@ -33,7 +31,13 @@ EXAMPLES
 
 SEE ALSO
 --------
-- `cdist-type(7) <cdist-type.html>`_
+Full documentation at: <:cdist_docs:`index`>,
+especially cdist type chapter: <:cdist_docs:`cdist-type`>.
+
+
+AUTHORS
+-------
+Steven Armstrong <steven-cdist--@--armstrong.cc>
 
 
 COPYING

cdist/conf/type/__postfix_master/man.rst

@@ -5,8 +5,6 @@ NAME
 ----
 cdist-type__postfix_master - Configure postfix master.cf
 
-Steven Armstrong <steven-cdist--@--armstrong.cc>
-
 
 DESCRIPTION
 -----------
@@ -70,8 +68,15 @@ EXAMPLES
 
 SEE ALSO
 --------
-- `cdist-type(7) <cdist-type.html>`_
+master(5)
-- master(5)
+
+Full documentation at: <:cdist_docs:`index`>,
+especially cdist type chapter: <:cdist_docs:`cdist-type`>.
+
+
+AUTHORS
+-------
+Steven Armstrong <steven-cdist--@--armstrong.cc>
 
 
 COPYING

cdist/conf/type/__postfix_postconf/man.rst

@@ -5,8 +5,6 @@ NAME
 ----
 cdist-type__postfix_postconf - Configure postfix main.cf
 
-Steven Armstrong <steven-cdist--@--armstrong.cc>
-
 
 DESCRIPTION
 -----------
@@ -40,8 +38,15 @@ EXAMPLES
 
 SEE ALSO
 --------
-- `cdist-type(7) <cdist-type.html>`_
+postconf(5)
-- postconf(5)
+
+Full documentation at: <:cdist_docs:`index`>,
+especially cdist type chapter: <:cdist_docs:`cdist-type`>.
+
+
+AUTHORS
+-------
+Steven Armstrong <steven-cdist--@--armstrong.cc>
 
 
 COPYING

cdist/conf/type/__postfix_postmap/man.rst

@@ -5,8 +5,6 @@ NAME
 ----
 cdist-type__postfix_postmap - Run postmap on the given file
 
-Steven Armstrong <steven-cdist--@--armstrong.cc>
-
 
 DESCRIPTION
 -----------
@@ -33,7 +31,13 @@ EXAMPLES
 
 SEE ALSO
 --------
-- `cdist-type(7) <cdist-type.html>`_
+Full documentation at: <:cdist_docs:`index`>,
+especially cdist type chapter: <:cdist_docs:`cdist-type`>.
+
+
+AUTHORS
+-------
+Steven Armstrong <steven-cdist--@--armstrong.cc>
 
 
 COPYING

cdist/conf/type/__postfix_reload/man.rst

@@ -5,8 +5,6 @@ NAME
 ----
 cdist-type__postfix_reload - Tell postfix to reload its configuration
 
-Steven Armstrong <steven-cdist--@--armstrong.cc>
-
 
 DESCRIPTION
 -----------
@@ -33,7 +31,13 @@ EXAMPLES
 
 SEE ALSO
 --------
-- `cdist-type(7) <cdist-type.html>`_
+Full documentation at: <:cdist_docs:`index`>,
+especially cdist type chapter: <:cdist_docs:`cdist-type`>.
+
+
+AUTHORS
+-------
+Steven Armstrong <steven-cdist--@--armstrong.cc>
 
 
 COPYING

cdist/conf/type/__postgres_database/man.rst

@@ -5,8 +5,6 @@ NAME
 ----
 cdist-type__postgres_database - Create/drop postgres databases
 
-Steven Armstrong <steven-cdist--@--armstrong.cc>
-
 
 DESCRIPTION
 -----------
@@ -32,8 +30,15 @@ EXAMPLES
 
 SEE ALSO
 --------
-- `cdist-type(7) <cdist-type.html>`_
+`cdist-type__postgres_role(7) <cdist-type__postgres_role.html>`_
-- `cdist-type__postgres_role(7) <cdist-type__postgres_role.html>`_
+
+Full documentation at: <:cdist_docs:`index`>,
+especially cdist type chapter: <:cdist_docs:`cdist-type`>.
+
+
+AUTHORS
+-------
+Steven Armstrong <steven-cdist--@--armstrong.cc>
 
 
 COPYING

cdist/conf/type/__postgres_role/man.rst

@@ -5,8 +5,6 @@ NAME
 ----
 cdist-type__postgres_role - Manage postgres roles
 
-Steven Armstrong <steven-cdist--@--armstrong.cc>
-
 
 DESCRIPTION
 -----------
@@ -50,9 +48,17 @@ EXAMPLES
 
 SEE ALSO
 --------
-- `cdist-type(7) <cdist-type.html>`_
+`cdist-type__postgres_database(7) <cdist-type__postgres_database.html>`_
-- `cdist-type__postgres_database(7) <cdist-type__postgres_database.html>`_
+
-- http://www.postgresql.org/docs/current/static/sql-createrole.html
+Full documentation at: <:cdist_docs:`index`>,
+especially cdist type chapter: <:cdist_docs:`cdist-type`>.
+postgresql documentation at:
+<http://www.postgresql.org/docs/current/static/sql-createrole.html>.
+
+
+AUTHORS
+-------
+Steven Armstrong <steven-cdist--@--armstrong.cc>
 
 
 COPYING

cdist/conf/type/__process/man.rst

@@ -5,8 +5,6 @@ NAME
 ----
 cdist-type__process - Start or stop process
 
-Nico Schottelius <nico-cdist--@--schottelius.org>
-
 
 DESCRIPTION
 -----------
@@ -60,8 +58,15 @@ EXAMPLES
 
 SEE ALSO
 --------
-- `cdist-type(7) <cdist-type.html>`_
+`cdist-type__start_on_boot(7) <cdist-type__start_on_boot.html>`_
-- `cdist-type__start_on_boot(7) <cdist-type__start_on_boot.html>`_
+
+Full documentation at: <:cdist_docs:`index`>,
+especially cdist type chapter: <:cdist_docs:`cdist-type`>.
+
+
+AUTHORS
+-------
+Nico Schottelius <nico-cdist--@--schottelius.org>
 
 
 COPYING

cdist/conf/type/__pyvenv/man.rst

@@ -5,8 +5,6 @@ NAME
 ----
 cdist-type__pyvenv - Create or remove python virtual environment
 
-Darko Poljak <darko.poljak--@--gmail.com>
-
 
 DESCRIPTION
 -----------
@@ -71,7 +69,13 @@ EXAMPLES
 
 SEE ALSO
 --------
-- `cdist-type(7) <cdist-type.html>`_
+Full documentation at: <:cdist_docs:`index`>,
+especially cdist type chapter: <:cdist_docs:`cdist-type`>.
+
+
+AUTHORS
+-------
+Darko Poljak <darko.poljak--@--gmail.com>
 
 
 COPYING

cdist/conf/type/__qemu_img/man.rst

@@ -5,8 +5,6 @@ NAME
 ----
 cdist-type__qemu_img - Manage VM disk images
 
-Nico Schottelius <nico-cdist--@--schottelius.org>
-
 
 DESCRIPTION
 -----------
@@ -39,8 +37,15 @@ EXAMPLES
 
 SEE ALSO
 --------
-- `cdist-type(7) <cdist-type.html>`_
+qemu-img(1)
-- qemu-img(1)
+
+Full documentation at: <:cdist_docs:`index`>,
+especially cdist type chapter: <:cdist_docs:`cdist-type`>.
+
+
+AUTHORS
+-------
+Nico Schottelius <nico-cdist--@--schottelius.org>
 
 
 COPYING

cdist/conf/type/__rbenv/man.rst

@@ -5,8 +5,6 @@ NAME
 ----
 cdist-type__rbenv - Manage rbenv installation
 
-Nico Schottelius <nico-cdist--@--schottelius.org>
-
 
 DESCRIPTION
 -----------
@@ -40,7 +38,13 @@ EXAMPLES
 
 SEE ALSO
 --------
-- `cdist-type(7) <cdist-type.html>`_
+Full documentation at: <:cdist_docs:`index`>,
+especially cdist type chapter: <:cdist_docs:`cdist-type`>.
+
+
+AUTHORS
+-------
+Nico Schottelius <nico-cdist--@--schottelius.org>
 
 
 COPYING

cdist/conf/type/__rsync/man.rst

@@ -5,8 +5,6 @@ NAME
 ----
 cdist-type__rsync - Mirror directories using rsync
 
-Nico Schottelius <nico-cdist--@--schottelius.org>
-
 
 DESCRIPTION
 -----------
@@ -100,8 +98,15 @@ EXAMPLES
 
 SEE ALSO
 --------
-- `cdist-type(7) <cdist-type.html>`_
+rsync(1)
-- rsync(1)
+
+Full documentation at: <:cdist_docs:`index`>,
+especially cdist type chapter: <:cdist_docs:`cdist-type`>.
+
+
+AUTHORS
+-------
+Nico Schottelius <nico-cdist--@--schottelius.org>
 
 
 COPYING

cdist/conf/type/__rvm/man.rst

@@ -5,8 +5,6 @@ NAME
 ----
 cdist-type__rvm - Install rvm for a given user
 
-Evax Software <contact@evax.fr>
-
 
 DESCRIPTION
 -----------
@@ -33,10 +31,17 @@ EXAMPLES
 
 SEE ALSO
 --------
-- `cdist-type(7) <cdist-type.html>`_
+`cdist-type__rvm_gem(7) <cdist-type__rvm_gem.html>`_,
-- `cdist-type__rvm_ruby(7) <cdist-type__rvm_ruby.html>`_
+`cdist-type__rvm_gemset(7) <cdist-type__rvm_gemset.html>`_,
-- `cdist-type__rvm_gemset(7) <cdist-type__rvm_gemset.html>`_
+`cdist-type__rvm_ruby(7) <cdist-type__rvm_ruby.html>`_
-- `cdist-type__rvm_gem(7) <cdist-type__rvm_gem.html>`_
+
+Full documentation at: <:cdist_docs:`index`>,
+especially cdist type chapter: <:cdist_docs:`cdist-type`>.
+
+
+AUTHORS
+-------
+Evax Software <contact@evax.fr>
 
 
 COPYING

cdist/conf/type/__rvm_gem/man.rst

@@ -5,8 +5,6 @@ NAME
 ----
 cdist-type__rvm_gemset - Manage Ruby gems through rvm
 
-Evax Software <contact@evax.fr>
-
 
 DESCRIPTION
 -----------
@@ -45,10 +43,17 @@ EXAMPLES
 
 SEE ALSO
 --------
-- `cdist-type(7) <cdist-type.html>`_
+`cdist-type__rvm(7) <cdist-type__rvm.html>`_,
-- `cdist-type__rvm(7) <cdist-type__rvm.html>`_
+`cdist-type__rvm_gemset(7) <cdist-type__rvm_gemset.html>`_,
-- `cdist-type__rvm_ruby(7) <cdist-type__rvm_ruby.html>`_
+`cdist-type__rvm_ruby(7) <cdist-type__rvm_ruby.html>`_
-- `cdist-type__rvm_gemset(7) <cdist-type__rvm_gemset.html>`_
+
+Full documentation at: <:cdist_docs:`index`>,
+especially cdist type chapter: <:cdist_docs:`cdist-type`>.
+
+
+AUTHORS
+-------
+Evax Software <contact@evax.fr>
 
 
 COPYING

cdist/conf/type/__rvm_gemset/man.rst

@@ -5,8 +5,6 @@ NAME
 ----
 cdist-type__rvm_gemset - Manage gemsets through rvm
 
-Evax Software <contact@evax.fr>
-
 
 DESCRIPTION
 -----------
@@ -43,10 +41,17 @@ EXAMPLES
 
 SEE ALSO
 --------
-- `cdist-type(7) <cdist-type.html>`_
+`cdist-type__rvm(7) <cdist-type__rvm.html>`_,
-- `cdist-type__rvm(7) <cdist-type__rvm.html>`_
+`cdist-type__rvm_gem(7) <cdist-type__rvm_gem.html>`_,
-- `cdist-type__rvm_ruby(7) <cdist-type__rvm_ruby.html>`_
+`cdist-type__rvm_ruby(7) <cdist-type__rvm_ruby.html>`_
-- `cdist-type__rvm_gem(7) <cdist-type__rvm_gem.html>`_
+
+Full documentation at: <:cdist_docs:`index`>,
+especially cdist type chapter: <:cdist_docs:`cdist-type`>.
+
+
+AUTHORS
+-------
+Evax Software <contact@evax.fr>
 
 
 COPYING

cdist/conf/type/__rvm_ruby/man.rst

@@ -5,8 +5,6 @@ NAME
 ----
 cdist-type__rvm_ruby - Manage ruby installations through rvm
 
-Evax Software <contact@evax.fr>
-
 
 DESCRIPTION
 -----------
@@ -44,10 +42,17 @@ EXAMPLES
 
 SEE ALSO
 --------
-- `cdist-type(7) <cdist-type.html>`_
+`cdist-type__rvm(7) <cdist-type__rvm.html>`_,
-- `cdist-type__rvm(7) <cdist-type__rvm.html>`_
+`cdist-type__rvm_gem(7) <cdist-type__rvm_gem.html>`_,
-- `cdist-type__rvm_gemset(7) <cdist-type__rvm_gemset.html>`_
+`cdist-type__rvm_gemset(7) <cdist-type__rvm_gemset.html>`_
-- `cdist-type__rvm_gem(7) <cdist-type__rvm_gem.html>`_
+
+Full documentation at: <:cdist_docs:`index`>,
+especially cdist type chapter: <:cdist_docs:`cdist-type`>.
+
+
+AUTHORS
+-------
+Evax Software <contact@evax.fr>
 
 
 COPYING

cdist/conf/type/__ssh_authorized_key/man.rst

@@ -5,8 +5,6 @@ NAME
 ----
 cdist-type__ssh_authorized_key - Manage a single ssh authorized key entry
 
-Steven Armstrong <steven-cdist--@--armstrong.cc>
-
 
 DESCRIPTION
 -----------
@@ -57,9 +55,16 @@ EXAMPLES
 
 SEE ALSO
 --------
-- `cdist-type(7) <cdist-type.html>`_
+`cdist__ssh_authorized_keys(7) <cdist__ssh_authorized_keys.html>`_,
-- `cdist__ssh_authorized_keys(7) <cdist__ssh_authorized_keys.html>`_
+sshd(8)
-- sshd(8)
+
+Full documentation at: <:cdist_docs:`index`>,
+especially cdist type chapter: <:cdist_docs:`cdist-type`>.
+
+AUTHORS
+-------
+Steven Armstrong <steven-cdist--@--armstrong.cc>
+
 
 COPYING
 -------

cdist/conf/type/__ssh_authorized_keys/man.rst

@@ -5,8 +5,6 @@ NAME
 ----
 cdist-type__ssh_authorized_keys - Manage ssh authorized_keys files
 
-Steven Armstrong <steven-cdist--@--armstrong.cc>
-
 
 DESCRIPTION
 -----------
@@ -107,8 +105,15 @@ EXAMPLES
 
 SEE ALSO
 --------
-- `cdist-type(7) <cdist-type.html>`_
+sshd(8)
-- sshd(8)
+
+Full documentation at: <:cdist_docs:`index`>,
+especially cdist type chapter: <:cdist_docs:`cdist-type`>.
+
+
+AUTHORS
+-------
+Steven Armstrong <steven-cdist--@--armstrong.cc>
 
 
 COPYING

cdist/conf/type/__ssh_dot_ssh/man.rst

@@ -5,8 +5,6 @@ NAME
 ----
 cdist-type__ssh_dot_ssh - Manage .ssh directory
 
-Nico Schottelius <nico-cdist--@--schottelius.org>
-
 
 DESCRIPTION
 -----------
@@ -35,8 +33,15 @@ EXAMPLES
 
 SEE ALSO
 --------
-- `cdist-type(7) <cdist-type.html>`_
+`cdist-type__ssh_authorized_keys(7) <cdist-type__ssh_authorized_keys.html>`_
-- `cdist-type__ssh_authorized_keys(7) <cdist-type__ssh_authorized_keys.html>`_
+
+Full documentation at: <:cdist_docs:`index`>,
+especially cdist type chapter: <:cdist_docs:`cdist-type`>.
+
+
+AUTHORS
+-------
+Nico Schottelius <nico-cdist--@--schottelius.org>
 
 
 COPYING

cdist/conf/type/__staged_file/man.rst

@@ -5,8 +5,6 @@ NAME
 ----
 cdist-type__staged_file - Manage staged files
 
-Steven Armstrong <steven-cdist--@--armstrong.cc>
-
 
 DESCRIPTION
 -----------
@@ -101,8 +99,15 @@ EXAMPLES
 
 SEE ALSO
 --------
-- `cdist-type(7) <cdist-type.html>`_
+`cdist-type__file(7) <cdist-type__file.html>`_
-- `cdist-type__file(7) <cdist-type__file.html>`_
+
+Full documentation at: <:cdist_docs:`index`>,
+especially cdist type chapter: <:cdist_docs:`cdist-type`>.
+
+
+AUTHORS
+-------
+Steven Armstrong <steven-cdist--@--armstrong.cc>
 
 
 COPYING

cdist/conf/type/__start_on_boot/man.rst

@@ -5,8 +5,6 @@ NAME
 ----
 cdist-type__start_on_boot - Manage stuff to be started at boot
 
-Nico Schottelius <nico-cdist--@--schottelius.org>
-
 
 DESCRIPTION
 -----------
@@ -47,8 +45,15 @@ EXAMPLES
 
 SEE ALSO
 --------
-- `cdist-type(7) <cdist-type.html>`_
+`cdist-type__process(7) <cdist-type__process.html>`_
-- `cdist-type__process(7) <cdist-type__process.html>`_
+
+Full documentation at: <:cdist_docs:`index`>,
+especially cdist type chapter: <:cdist_docs:`cdist-type`>.
+
+
+AUTHORS
+-------
+Nico Schottelius <nico-cdist--@--schottelius.org>
 
 
 COPYING

cdist/conf/type/__timezone/man.rst

@@ -5,8 +5,6 @@ NAME
 ----
 cdist-type__timezone - Allows one to configure the desired localtime timezone.
 
-Ramon Salvadó <rsalvado--@--gnuine--dot--com>
-
 
 DESCRIPTION
 -----------
@@ -38,7 +36,13 @@ EXAMPLES
 
 SEE ALSO
 --------
-- `cdist-type(7) <cdist-type.html>`_
+Full documentation at: <:cdist_docs:`index`>,
+especially cdist type chapter: <:cdist_docs:`cdist-type`>.
+
+
+AUTHORS
+-------
+Ramon Salvadó <rsalvado--@--gnuine--dot--com>
 
 
 COPYING

cdist/conf/type/__update_alternatives/man.rst

@@ -5,8 +5,6 @@ NAME
 ----
 cdist-type__update_alternatives - Configure alternatives
 
-Nico Schottelius <nico-cdist--@--schottelius.org>
-
 
 DESCRIPTION
 -----------
@@ -32,9 +30,16 @@ EXAMPLES
 
 SEE ALSO
 --------
-- `cdist-type(7) <cdist-type.html>`_
+`cdist-type__debconf_set_selections(7) <cdist-type__debconf_set_selections.html>`_,
-- `cdist-type__debconf_set_selections(7) <cdist-type__debconf_set_selections.html>`_
+update-alternatives(8)
-- update-alternatives(8)
+
+Full documentation at: <:cdist_docs:`index`>,
+especially cdist type chapter: <:cdist_docs:`cdist-type`>.
+
+
+AUTHORS
+-------
+Nico Schottelius <nico-cdist--@--schottelius.org>
 
 
 COPYING

cdist/conf/type/__user/man.rst

@@ -5,8 +5,6 @@ NAME
 ----
 cdist-type__user - Manage users
 
-Steven Armstrong <steven-cdist--@--armstrong.cc>
-
 
 DESCRIPTION
 -----------
@@ -86,8 +84,15 @@ EXAMPLES
 
 SEE ALSO
 --------
-- `cdist-type(7) <cdist-type.html>`_
+pw(8), usermod(8)
-- usermod(8) or pw(8)
+
+Full documentation at: <:cdist_docs:`index`>,
+especially cdist type chapter: <:cdist_docs:`cdist-type`>.
+
+
+AUTHORS
+-------
+Steven Armstrong <steven-cdist--@--armstrong.cc>
 
 
 COPYING

cdist/conf/type/__user_groups/man.rst

@@ -5,8 +5,6 @@ NAME
 ----
 cdist-type__user_groups - Manage user groups
 
-Steven Armstrong <steven-cdist--@--armstrong.cc>
-
 
 DESCRIPTION
 -----------
@@ -43,7 +41,13 @@ EXAMPLES
 
 SEE ALSO
 --------
-- `cdist-type(7) <cdist-type.html>`_
+Full documentation at: <:cdist_docs:`index`>,
+especially cdist type chapter: <:cdist_docs:`cdist-type`>.
+
+
+AUTHORS
+-------
+Steven Armstrong <steven-cdist--@--armstrong.cc>
 
 
 COPYING

cdist/conf/type/__yum_repo/man.rst

@@ -5,8 +5,6 @@ NAME
 ----
 cdist-type__yum_repo - Manage yum repositories
 
-Steven Armstrong <steven-cdist--@--armstrong.cc>
-
 
 DESCRIPTION
 -----------
@@ -115,7 +113,13 @@ EXAMPLES
 
 SEE ALSO
 --------
-- `cdist-type(7) <cdist-type.html>`_
+Full documentation at: <:cdist_docs:`index`>,
+especially cdist type chapter: <:cdist_docs:`cdist-type`>.
+
+
+AUTHORS
+-------
+Steven Armstrong <steven-cdist--@--armstrong.cc>
 
 
 COPYING

cdist/conf/type/__zypper_repo/man.rst

@@ -5,8 +5,6 @@ NAME
 ----
 cdist-type__zypper_repo - Repository management with zypper
 
-Daniel Heule <hda--@--sfs.biz>
-
 
 DESCRIPTION
 -----------
@@ -64,7 +62,13 @@ EXAMPLES
 
 SEE ALSO
 --------
-- `cdist-type(7) <cdist-type.html>`_
+Full documentation at: <:cdist_docs:`index`>,
+especially cdist type chapter: <:cdist_docs:`cdist-type`>.
+
+
+AUTHORS
+-------
+Daniel Heule <hda--@--sfs.biz>
 
 
 COPYING

cdist/conf/type/__zypper_service/man.rst

@@ -5,8 +5,6 @@ NAME
 ----
 cdist-type__zypper_service - Service management with zypper
 
-Daniel Heule <hda--@--sfs.biz>
-
 
 DESCRIPTION
 -----------
@@ -57,7 +55,13 @@ EXAMPLES
 
 SEE ALSO
 --------
-- `cdist-type(7) <cdist-type.html>`_
+Full documentation at: <:cdist_docs:`index`>,
+especially cdist type chapter: <:cdist_docs:`cdist-type`>.
+
+
+AUTHORS
+-------
+Daniel Heule <hda--@--sfs.biz>
 
 
 COPYING

docs/changelog

@@ -2,6 +2,7 @@ Changelog
 ---------
 
 next:
+	* Documentation: Restructure and fix and improve docs and manpages (Darko Poljak)
 	* Core: Add files directory for static files (Darko Poljak)
 	* Core: Fix conflicting requirements (Darko Poljak)
 	* Custom: Add bash and zsh completions (Darko Poljak)

docs/man/cdist-best-practice.rst

@@ -1,14 +1,8 @@
-cdist-best-practice(7)
+Best practice
-======================
+=============
+Practices used in real environments
 
-NAME
+Passwordless connections
-----
-cdist-best-practice - Practices used in real environments
-
-Nico Schottelius <nico-cdist--@--schottelius.org>
-
-
-PASSWORDLESS CONNECTIONS
 ------------------------
 It is recommended to run cdist with public key authentication.
 This requires a private/public key pair and the entry
@@ -16,7 +10,7 @@ This requires a private/public key pair and the entry
 See sshd_config(5) and ssh-keygen(1).
 
 
-SPEEDING UP SSH CONNECTIONS
+Speeding up ssh connections
 ---------------------------
 When connecting to a new host, the initial delay with ssh connections
 is pretty big. You can work around this by
@@ -30,7 +24,7 @@ inclusion into your ~/.ssh/config::
       ControlPersist 10
 
 
-SPEEDING UP SHELL EXECUTION
+Speeding up shell execution
 ----------------------------
 On the source host, ensure that /bin/sh is *not* bash: bash is quite slow for
 script execution. Instead, you could use dash after installing it::
@@ -38,7 +32,7 @@ script execution. Instead, you could use dash after installing it::
     ln -sf /bin/dash /bin/sh
 
 
-MULTI MASTER OR ENVIRONMENT SETUPS
+Multi master or environment setups
 ----------------------------------
 If you plan to distribute cdist among servers or use different
 environments, you can do so easily with the included version
@@ -64,7 +58,7 @@ you can clone it multiple times::
     machine-b % git clone git://your-git-server/cdist
 
 
-SEPERATING WORK BY GROUPS
+Seperating work by groups
 -------------------------
 If you are working with different groups on one cdist-configuration,
 you can delegate to other manifests and have the groups edit only
@@ -77,7 +71,7 @@ their manifests. You can use the following snippet in
     sh -e "$__manifest/cbrg"
 
 
-MAINTAINING MULTIPLE CONFIGURATIONS
+Maintaining multiple configurations
 -----------------------------------
 When you need to manage multiple sites with cdist, like company_a, company_b
 and private for instance, you can easily use git for this purpose.
@@ -138,7 +132,7 @@ The following **.git/config** is taken from a a real world scenario::
 Have a look at git-remote(1) to adjust the remote configuration, which allows
 
 
-MULTIPLE DEVELOPERS WITH DIFFERENT TRUST
+Multiple developers with different trust
 ----------------------------------------
 If you are working in an environment that requires different people to
 work on the same configuration, but having different privileges, you can
@@ -155,7 +149,7 @@ implement this scenario with a gateway host and sudo:
 For more details consult sudoers(5)
 
 
-TEMPLATING
+Templating
 ----------
 * create directory files/ in your type (convention)
 * create the template as an executable file like files/basic.conf.sh, it will output text using shell variables for the values
@@ -193,7 +187,7 @@ TEMPLATING
         --source "$__object/files/basic.conf"
 
 
-TESTING A NEW TYPE
+Testing a new type
 ------------------
 If you want to test a new type on a node, you can tell cdist to only use an
 object of this type: Use the '--initial-manifest' parameter
@@ -214,7 +208,7 @@ of cdist:
         cdist --initial-manifest - cdist-dev-01.ungleich.ch
 
 
-OTHER CONTENT IN CDIST REPOSITORY
+Other content in cdist repository
 ---------------------------------
 Usually the cdist repository contains all configuration
 items. Sometimes you may have additional resources that
@@ -227,15 +221,3 @@ in the repository for such content: It allows you to
 easily distinguish what is used by cdist and what not
 and also to store all important files in one
 repository.
-
-
-SEE ALSO
---------
-- `cdist(1) <../man1/cdist.html>`_
-- `cdist-tutorial(7) <cdist-tutorial.html>`_
-
-
-COPYING
--------
-Copyright \(C) 2011-2013 Nico Schottelius. Free use of this software is
-granted under the terms of the GNU General Public License version 3 (GPLv3).