diff --git a/software/cdist/man/beta/_sources/cdist-preos.rst.txt b/software/cdist/man/beta/_sources/cdist-preos.rst.txt
index 87f9a36d..7364c389 100644
--- a/software/cdist/man/beta/_sources/cdist-preos.rst.txt
+++ b/software/cdist/man/beta/_sources/cdist-preos.rst.txt
@@ -14,7 +14,8 @@ With cdist you can create PreOS.
Currently supported PreOS-es include:
* debian
-* ubuntu.
+* ubuntu
+* devuan.
PreOS is created using cdist preos command. preos command has subcommands that
create the desired PreOS.
diff --git a/software/cdist/man/beta/_sources/cdist-reference.rst.txt b/software/cdist/man/beta/_sources/cdist-reference.rst.txt
index 486ce5b9..e658864d 100644
--- a/software/cdist/man/beta/_sources/cdist-reference.rst.txt
+++ b/software/cdist/man/beta/_sources/cdist-reference.rst.txt
@@ -331,6 +331,9 @@ __target_fqdn
This variable is derived from **__target_host**
(using **socket.getfqdn()**).
Available for: explorer, initial manifest, type explorer, type manifest, type gencode, shell.
+__target_host_tags
+ Comma separated list of target host tags.
+ Available for: explorer, initial manifest, type explorer, type manifest, type gencode, shell.
__type
Path to the current type.
Available for: type manifest, type gencode.
diff --git a/software/cdist/man/beta/_sources/man1/cdist.rst.txt b/software/cdist/man/beta/_sources/man1/cdist.rst.txt
index 4b4747da..b4ce7cc0 100644
--- a/software/cdist/man/beta/_sources/man1/cdist.rst.txt
+++ b/software/cdist/man/beta/_sources/man1/cdist.rst.txt
@@ -60,6 +60,14 @@ SYNOPSIS
[-y REMOTE_COPY]
target_dir
+ cdist preos devuan [-h] [-d] [-v] [-b] [-a ARCH] [-B] [-C]
+ [-c CDIST_PARAMS] [-D DRIVE] [-e REMOTE_EXEC]
+ [-i MANIFEST] [-k KEYFILE ] [-m MIRROR]
+ [-P ROOT_PASSWORD] [-p PXE_BOOT_DIR] [-r]
+ [-S SCRIPT] [-s SUITE] [-t TRIGGER_COMMAND]
+ [-y REMOTE_COPY]
+ target_dir
+
cdist preos ubuntu [-h] [-d] [-v] [-b] [-a ARCH] [-B] [-C]
[-c CDIST_PARAMS] [-D DRIVE] [-e REMOTE_EXEC]
[-i MANIFEST] [-k KEYFILE ] [-m MIRROR]
@@ -484,10 +492,11 @@ Create PreOS. Currently, the following PreOS-es are supported:
* debian
* ubuntu
+* devuan
-PREOS DEBIAN
-------------
+PREOS DEBIAN/DEVUAN
+-------------------
.. option:: target_dir
diff --git a/software/cdist/man/beta/_sources/man7/cdist-type__daemontools.rst.txt b/software/cdist/man/beta/_sources/man7/cdist-type__daemontools.rst.txt
index 2e012cb5..a8e81e54 100644
--- a/software/cdist/man/beta/_sources/man7/cdist-type__daemontools.rst.txt
+++ b/software/cdist/man/beta/_sources/man7/cdist-type__daemontools.rst.txt
@@ -24,7 +24,7 @@ from-package
BOOLEAN PARAMETERS
------------------
install-init-script
- Add an init script and set it to start on boot. Default yes.
+ Add an init script and set it to start on boot.
EXAMPLES
--------
diff --git a/software/cdist/man/beta/_sources/man7/cdist-type__prometheus_alertmanager.rst.txt b/software/cdist/man/beta/_sources/man7/cdist-type__prometheus_alertmanager.rst.txt
index f218254e..ba99e7c8 100644
--- a/software/cdist/man/beta/_sources/man7/cdist-type__prometheus_alertmanager.rst.txt
+++ b/software/cdist/man/beta/_sources/man7/cdist-type__prometheus_alertmanager.rst.txt
@@ -10,6 +10,9 @@ DESCRIPTION
-----------
Install and configure Prometheus Alertmanager (https://prometheus.io/docs/alerting/alertmanager/).
+This type create a daemontools-compatible service directory under /service/prometheus.
+Daemontools (or something compatible) must be installed (in particular, the command `svc` must be executable).
+
REQUIRED PARAMETERS
-------------------
@@ -27,10 +30,7 @@ storage-path
BOOLEAN PARAMETERS
------------------
-with-daemontools
- Create a daemontools service directory under /service/prometheus. Default: yes.
- Note: If you do not use this, Alertmanager will not be launched, and will not reload config on change.
- If you use this, daemontools (or something compatible) must be installed.
+None
EXAMPLES
@@ -44,6 +44,7 @@ EXAMPLES
__golang_from_vendor --version 1.8.1 # required for prometheus and many exporters
require="__daemontools __golang_from_vendor" __prometheus_alertmanager \
+ --with-daemontools \
--config "$__manifest/files/alertmanager.yml" \
--storage-path /data/alertmanager \
--listen-address "[::]:$ALERTPORT"
diff --git a/software/cdist/man/beta/_sources/man7/cdist-type__prometheus_server.rst.txt b/software/cdist/man/beta/_sources/man7/cdist-type__prometheus_server.rst.txt
index c03a71d5..fadebd3f 100644
--- a/software/cdist/man/beta/_sources/man7/cdist-type__prometheus_server.rst.txt
+++ b/software/cdist/man/beta/_sources/man7/cdist-type__prometheus_server.rst.txt
@@ -10,6 +10,9 @@ DESCRIPTION
-----------
Install and configure Prometheus (https://prometheus.io/).
+This type creates a daemontools-compatible service directory under /service/prometheus.
+Daemontools (or something compatible) must be installed (in particular, the command `svc` must be executable).
+
REQUIRED PARAMETERS
-------------------
@@ -35,10 +38,7 @@ target-heap-size
BOOLEAN PARAMETERS
------------------
-with-daemontools
- Create a daemontools service directory under /service/prometheus. Default: yes.
- Note: If you do not use this, Prometheus will not be launched, and will not reload config on change.
- If you use this, daemontools (or something compatible) must be installed.
+None
EXAMPLES
@@ -53,6 +53,7 @@ EXAMPLES
__golang_from_vendor --version 1.8.1 # required for prometheus and many exporters
require="__daemontools __golang_from_vendor" __prometheus_server \
+ --with-daemontools \
--config "$__manifest/files/prometheus.yml" \
--retention-days 14 \
--storage-path /data/prometheus \
diff --git a/software/cdist/man/beta/cdist-best-practice.html b/software/cdist/man/beta/cdist-best-practice.html
index 808c1dfd..0b4f97d4 100644
--- a/software/cdist/man/beta/cdist-best-practice.html
+++ b/software/cdist/man/beta/cdist-best-practice.html
@@ -8,7 +8,7 @@
- 21. Best practice — cdist 4.4.3-252-gf24af8c2 documentation
+ 21. Best practice — cdist 4.4.4 documentation
@@ -35,7 +35,7 @@
-
+
@@ -66,7 +66,7 @@