diff --git a/core/build/build-manpage.sh b/core/build/build-manpage.sh
new file mode 100755
index 000000000..5adf74375
--- /dev/null
+++ b/core/build/build-manpage.sh
@@ -0,0 +1,44 @@
+#!/bin/bash
+
+cd "$(dirname "${BASH_SOURCE[0]}")"
+
+source ./builder-alias.sh
+
+set -ea
+shopt -s expand_aliases
+
+PROFILE=${PROFILE:-debug}
+if [ "${PROFILE}" = "release" ]; then
+	BUILD_FLAGS="--release"
+else
+  if [ "$PROFILE" != "debug" ]; then
+    >&2 echo "Unknown profile $PROFILE: falling back to debug..."
+    PROFILE=debug
+  fi
+fi
+
+if [ -z "$ARCH" ]; then
+	ARCH=$(uname -m)
+fi
+
+if [ "$ARCH" = "arm64" ]; then
+	ARCH="aarch64"
+fi
+
+RUST_ARCH="$ARCH"
+if [ "$ARCH" = "riscv64" ]; then
+	RUST_ARCH="riscv64gc"
+fi
+
+cd ../..
+FEATURES="$(echo $ENVIRONMENT | sed 's/-/,/g')"
+RUSTFLAGS=""
+if [[ "${ENVIRONMENT}" =~ (^|-)console($|-) ]]; then
+	RUSTFLAGS="--cfg tokio_unstable"
+fi
+echo "FEATURES=\"$FEATURES\""
+echo "RUSTFLAGS=\"$RUSTFLAGS\""
+rust-zig-builder cargo test --manifest-path=./core/Cargo.toml --lib $BUILD_FLAGS --features test,$FEATURES --locked 'export_manpage_'
+if [ "$(ls -nd "core/man" | awk '{ print $3 }')" != "$UID" ]; then
+  rust-zig-builder sh -c "chown -R $UID:$UID core/target && chown -R $UID:$UID core/man && chown -R $UID:$UID  /usr/local/cargo"
+fi
\ No newline at end of file
diff --git a/core/man/start-cli/start-cli-auth-get-pubkey.1 b/core/man/start-cli/start-cli-auth-get-pubkey.1
new file mode 100644
index 000000000..703bb20ac
--- /dev/null
+++ b/core/man/start-cli/start-cli-auth-get-pubkey.1
@@ -0,0 +1,13 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-auth-get-pubkey 1  "get-pubkey " 
+.SH NAME
+start\-cli\-auth\-get\-pubkey \- Get the public key from the server
+.SH SYNOPSIS
+\fBstart\-cli auth get\-pubkey\fR [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+Get the public key from the server
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-cli/start-cli-auth-login.1 b/core/man/start-cli/start-cli-auth-login.1
new file mode 100644
index 000000000..127904b72
--- /dev/null
+++ b/core/man/start-cli/start-cli-auth-login.1
@@ -0,0 +1,13 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-auth-login 1  "login " 
+.SH NAME
+start\-cli\-auth\-login \- Login to a new auth session
+.SH SYNOPSIS
+\fBstart\-cli auth login\fR [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+Login to a new auth session
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-cli/start-cli-auth-logout.1 b/core/man/start-cli/start-cli-auth-logout.1
new file mode 100644
index 000000000..905838ecf
--- /dev/null
+++ b/core/man/start-cli/start-cli-auth-logout.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-auth-logout 1  "logout " 
+.SH NAME
+start\-cli\-auth\-logout \- Logout from current auth session
+.SH SYNOPSIS
+\fBstart\-cli auth logout\fR [\fB\-h\fR|\fB\-\-help\fR] <\fISESSION\fR> 
+.SH DESCRIPTION
+Logout from current auth session
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fISESSION\fR>
+
diff --git a/core/man/start-cli/start-cli-auth-reset-password.1 b/core/man/start-cli/start-cli-auth-reset-password.1
new file mode 100644
index 000000000..147ab9ef7
--- /dev/null
+++ b/core/man/start-cli/start-cli-auth-reset-password.1
@@ -0,0 +1,13 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-auth-reset-password 1  "reset-password " 
+.SH NAME
+start\-cli\-auth\-reset\-password \- Reset the password
+.SH SYNOPSIS
+\fBstart\-cli auth reset\-password\fR [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+Reset the password
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-cli/start-cli-auth-session-kill.1 b/core/man/start-cli/start-cli-auth-session-kill.1
new file mode 100644
index 000000000..accdd9055
--- /dev/null
+++ b/core/man/start-cli/start-cli-auth-session-kill.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-auth-session-kill 1  "kill " 
+.SH NAME
+start\-cli\-auth\-session\-kill \- Terminate auth sessions
+.SH SYNOPSIS
+\fBstart\-cli auth session kill\fR [\fB\-h\fR|\fB\-\-help\fR] [\fIIDS\fR] 
+.SH DESCRIPTION
+Terminate auth sessions
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+[\fIIDS\fR]
+Session identifiers
diff --git a/core/man/start-cli/start-cli-auth-session-list.1 b/core/man/start-cli/start-cli-auth-session-list.1
new file mode 100644
index 000000000..be54a0344
--- /dev/null
+++ b/core/man/start-cli/start-cli-auth-session-list.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-auth-session-list 1  "list " 
+.SH NAME
+start\-cli\-auth\-session\-list \- Display all auth sessions
+.SH SYNOPSIS
+\fBstart\-cli auth session list\fR [\fB\-\-format\fR] [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+Display all auth sessions
+.SH OPTIONS
+.TP
+\fB\-\-format\fR
+
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-cli/start-cli-auth-session.1 b/core/man/start-cli/start-cli-auth-session.1
new file mode 100644
index 000000000..7ca18ae60
--- /dev/null
+++ b/core/man/start-cli/start-cli-auth-session.1
@@ -0,0 +1,20 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-auth-session 1  "session " 
+.SH NAME
+start\-cli\-auth\-session \- List or kill auth sessions
+.SH SYNOPSIS
+\fBstart\-cli auth session\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIsubcommands\fR>
+.SH DESCRIPTION
+List or kill auth sessions
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.SH SUBCOMMANDS
+.TP
+start\-cli\-auth\-session\-kill(1)
+Terminate auth sessions
+.TP
+start\-cli\-auth\-session\-list(1)
+Display all auth sessions
diff --git a/core/man/start-cli/start-cli-auth.1 b/core/man/start-cli/start-cli-auth.1
new file mode 100644
index 000000000..e2283bd00
--- /dev/null
+++ b/core/man/start-cli/start-cli-auth.1
@@ -0,0 +1,29 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-auth 1  "auth " 
+.SH NAME
+start\-cli\-auth \- Commands related to Authentication i.e. login, logout
+.SH SYNOPSIS
+\fBstart\-cli auth\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIsubcommands\fR>
+.SH DESCRIPTION
+Commands related to Authentication i.e. login, logout
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.SH SUBCOMMANDS
+.TP
+start\-cli\-auth\-get\-pubkey(1)
+Get the public key from the server
+.TP
+start\-cli\-auth\-login(1)
+Login to a new auth session
+.TP
+start\-cli\-auth\-logout(1)
+Logout from current auth session
+.TP
+start\-cli\-auth\-reset\-password(1)
+Reset the password
+.TP
+start\-cli\-auth\-session(1)
+List or kill auth sessions
diff --git a/core/man/start-cli/start-cli-backup-create.1 b/core/man/start-cli/start-cli-backup-create.1
new file mode 100644
index 000000000..f43e3ce4a
--- /dev/null
+++ b/core/man/start-cli/start-cli-backup-create.1
@@ -0,0 +1,25 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-backup-create 1  "create " 
+.SH NAME
+start\-cli\-backup\-create \- Create a backup for all packages
+.SH SYNOPSIS
+\fBstart\-cli backup create\fR [\fB\-\-old\-password\fR] [\fB\-\-package\-ids\fR] [\fB\-h\fR|\fB\-\-help\fR] <\fITARGET_ID\fR> <\fIPASSWORD\fR> 
+.SH DESCRIPTION
+Create a backup for all packages
+.SH OPTIONS
+.TP
+\fB\-\-old\-password\fR \fI<OLD_PASSWORD>\fR
+Previous backup password
+.TP
+\fB\-\-package\-ids\fR \fI<PACKAGE_IDS>\fR
+Package IDs to include in backup
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fITARGET_ID\fR>
+Backup target identifier
+.TP
+<\fIPASSWORD\fR>
+Password for backup encryption
diff --git a/core/man/start-cli/start-cli-backup-target-cifs-add.1 b/core/man/start-cli/start-cli-backup-target-cifs-add.1
new file mode 100644
index 000000000..4e20c033b
--- /dev/null
+++ b/core/man/start-cli/start-cli-backup-target-cifs-add.1
@@ -0,0 +1,25 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-backup-target-cifs-add 1  "add " 
+.SH NAME
+start\-cli\-backup\-target\-cifs\-add \- Add a new backup target
+.SH SYNOPSIS
+\fBstart\-cli backup target cifs add\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIHOSTNAME\fR> <\fIPATH\fR> <\fIUSERNAME\fR> [\fIPASSWORD\fR] 
+.SH DESCRIPTION
+Add a new backup target
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIHOSTNAME\fR>
+CIFS server hostname
+.TP
+<\fIPATH\fR>
+Path on the CIFS share
+.TP
+<\fIUSERNAME\fR>
+CIFS authentication username
+.TP
+[\fIPASSWORD\fR]
+CIFS authentication password
diff --git a/core/man/start-cli/start-cli-backup-target-cifs-remove.1 b/core/man/start-cli/start-cli-backup-target-cifs-remove.1
new file mode 100644
index 000000000..8dab94a3c
--- /dev/null
+++ b/core/man/start-cli/start-cli-backup-target-cifs-remove.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-backup-target-cifs-remove 1  "remove " 
+.SH NAME
+start\-cli\-backup\-target\-cifs\-remove \- Remove existing backup target
+.SH SYNOPSIS
+\fBstart\-cli backup target cifs remove\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIID\fR> 
+.SH DESCRIPTION
+Remove existing backup target
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIID\fR>
+Backup target identifier
diff --git a/core/man/start-cli/start-cli-backup-target-cifs-update.1 b/core/man/start-cli/start-cli-backup-target-cifs-update.1
new file mode 100644
index 000000000..a8721bda5
--- /dev/null
+++ b/core/man/start-cli/start-cli-backup-target-cifs-update.1
@@ -0,0 +1,28 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-backup-target-cifs-update 1  "update " 
+.SH NAME
+start\-cli\-backup\-target\-cifs\-update \- Update an existing backup target
+.SH SYNOPSIS
+\fBstart\-cli backup target cifs update\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIID\fR> <\fIHOSTNAME\fR> <\fIPATH\fR> <\fIUSERNAME\fR> [\fIPASSWORD\fR] 
+.SH DESCRIPTION
+Update an existing backup target
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIID\fR>
+Backup target identifier
+.TP
+<\fIHOSTNAME\fR>
+CIFS server hostname
+.TP
+<\fIPATH\fR>
+Path on the CIFS share
+.TP
+<\fIUSERNAME\fR>
+CIFS authentication username
+.TP
+[\fIPASSWORD\fR]
+CIFS authentication password
diff --git a/core/man/start-cli/start-cli-backup-target-cifs.1 b/core/man/start-cli/start-cli-backup-target-cifs.1
new file mode 100644
index 000000000..e7afdc199
--- /dev/null
+++ b/core/man/start-cli/start-cli-backup-target-cifs.1
@@ -0,0 +1,23 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-backup-target-cifs 1  "cifs " 
+.SH NAME
+start\-cli\-backup\-target\-cifs \- Add, remove, or update a backup target
+.SH SYNOPSIS
+\fBstart\-cli backup target cifs\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIsubcommands\fR>
+.SH DESCRIPTION
+Add, remove, or update a backup target
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.SH SUBCOMMANDS
+.TP
+start\-cli\-backup\-target\-cifs\-add(1)
+Add a new backup target
+.TP
+start\-cli\-backup\-target\-cifs\-remove(1)
+Remove existing backup target
+.TP
+start\-cli\-backup\-target\-cifs\-update(1)
+Update an existing backup target
diff --git a/core/man/start-cli/start-cli-backup-target-info.1 b/core/man/start-cli/start-cli-backup-target-info.1
new file mode 100644
index 000000000..c1ff66f11
--- /dev/null
+++ b/core/man/start-cli/start-cli-backup-target-info.1
@@ -0,0 +1,25 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-backup-target-info 1  "info " 
+.SH NAME
+start\-cli\-backup\-target\-info \- Display backup information for a package
+.SH SYNOPSIS
+\fBstart\-cli backup target info\fR [\fB\-\-format\fR] [\fB\-h\fR|\fB\-\-help\fR] <\fITARGET_ID\fR> <\fISERVER_ID\fR> <\fIPASSWORD\fR> 
+.SH DESCRIPTION
+Display backup information for a package
+.SH OPTIONS
+.TP
+\fB\-\-format\fR
+
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fITARGET_ID\fR>
+Backup target identifier
+.TP
+<\fISERVER_ID\fR>
+Unique server identifier
+.TP
+<\fIPASSWORD\fR>
+Password for backup encryption
diff --git a/core/man/start-cli/start-cli-backup-target-list.1 b/core/man/start-cli/start-cli-backup-target-list.1
new file mode 100644
index 000000000..49886b84d
--- /dev/null
+++ b/core/man/start-cli/start-cli-backup-target-list.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-backup-target-list 1  "list " 
+.SH NAME
+start\-cli\-backup\-target\-list \- List existing backup targets
+.SH SYNOPSIS
+\fBstart\-cli backup target list\fR [\fB\-\-format\fR] [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+List existing backup targets
+.SH OPTIONS
+.TP
+\fB\-\-format\fR
+
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-cli/start-cli-backup-target-mount.1 b/core/man/start-cli/start-cli-backup-target-mount.1
new file mode 100644
index 000000000..caf558310
--- /dev/null
+++ b/core/man/start-cli/start-cli-backup-target-mount.1
@@ -0,0 +1,25 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-backup-target-mount 1  "mount " 
+.SH NAME
+start\-cli\-backup\-target\-mount \- Mount a backup target
+.SH SYNOPSIS
+\fBstart\-cli backup target mount\fR [\fB\-\-server\-id\fR] [\fB\-\-allow\-partial\fR] [\fB\-h\fR|\fB\-\-help\fR] <\fITARGET_ID\fR> <\fIPASSWORD\fR> 
+.SH DESCRIPTION
+Mount a backup target
+.SH OPTIONS
+.TP
+\fB\-\-server\-id\fR \fI<SERVER_ID>\fR
+Unique server identifier
+.TP
+\fB\-\-allow\-partial\fR
+Leave media mounted even if backupfs fails to mount
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fITARGET_ID\fR>
+Backup target identifier
+.TP
+<\fIPASSWORD\fR>
+Password for backup encryption
diff --git a/core/man/start-cli/start-cli-backup-target-umount.1 b/core/man/start-cli/start-cli-backup-target-umount.1
new file mode 100644
index 000000000..5b8bb75ef
--- /dev/null
+++ b/core/man/start-cli/start-cli-backup-target-umount.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-backup-target-umount 1  "umount " 
+.SH NAME
+start\-cli\-backup\-target\-umount \- Unmount a backup target
+.SH SYNOPSIS
+\fBstart\-cli backup target umount\fR [\fB\-h\fR|\fB\-\-help\fR] [\fITARGET_ID\fR] 
+.SH DESCRIPTION
+Unmount a backup target
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+[\fITARGET_ID\fR]
+Backup target identifier
diff --git a/core/man/start-cli/start-cli-backup-target.1 b/core/man/start-cli/start-cli-backup-target.1
new file mode 100644
index 000000000..82d1de933
--- /dev/null
+++ b/core/man/start-cli/start-cli-backup-target.1
@@ -0,0 +1,29 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-backup-target 1  "target " 
+.SH NAME
+start\-cli\-backup\-target \- Commands related to a backup target
+.SH SYNOPSIS
+\fBstart\-cli backup target\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIsubcommands\fR>
+.SH DESCRIPTION
+Commands related to a backup target
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.SH SUBCOMMANDS
+.TP
+start\-cli\-backup\-target\-cifs(1)
+Add, remove, or update a backup target
+.TP
+start\-cli\-backup\-target\-info(1)
+Display backup information for a package
+.TP
+start\-cli\-backup\-target\-list(1)
+List existing backup targets
+.TP
+start\-cli\-backup\-target\-mount(1)
+Mount a backup target
+.TP
+start\-cli\-backup\-target\-umount(1)
+Unmount a backup target
diff --git a/core/man/start-cli/start-cli-backup.1 b/core/man/start-cli/start-cli-backup.1
new file mode 100644
index 000000000..5e60d0432
--- /dev/null
+++ b/core/man/start-cli/start-cli-backup.1
@@ -0,0 +1,20 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-backup 1  "backup " 
+.SH NAME
+start\-cli\-backup \- Commands related to backup creation and backup targets
+.SH SYNOPSIS
+\fBstart\-cli backup\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIsubcommands\fR>
+.SH DESCRIPTION
+Commands related to backup creation and backup targets
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.SH SUBCOMMANDS
+.TP
+start\-cli\-backup\-create(1)
+Create a backup for all packages
+.TP
+start\-cli\-backup\-target(1)
+Commands related to a backup target
diff --git a/core/man/start-cli/start-cli-db-apply.1 b/core/man/start-cli/start-cli-db-apply.1
new file mode 100644
index 000000000..f88966143
--- /dev/null
+++ b/core/man/start-cli/start-cli-db-apply.1
@@ -0,0 +1,22 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-db-apply 1  "apply " 
+.SH NAME
+start\-cli\-db\-apply \- Update a database record
+.SH SYNOPSIS
+\fBstart\-cli db apply\fR [\fB\-\-allow\-model\-mismatch\fR] [\fB\-h\fR|\fB\-\-help\fR] <\fIEXPR\fR> [\fIPATH\fR] 
+.SH DESCRIPTION
+Update a database record
+.SH OPTIONS
+.TP
+\fB\-\-allow\-model\-mismatch\fR
+Allow database model mismatch
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIEXPR\fR>
+Database patch expression to apply
+.TP
+[\fIPATH\fR]
+Path to the database
diff --git a/core/man/start-cli/start-cli-db-dump.1 b/core/man/start-cli/start-cli-db-dump.1
new file mode 100644
index 000000000..d8c55918d
--- /dev/null
+++ b/core/man/start-cli/start-cli-db-dump.1
@@ -0,0 +1,22 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-db-dump 1  "dump " 
+.SH NAME
+start\-cli\-db\-dump \- Filter and query the database
+.SH SYNOPSIS
+\fBstart\-cli db dump\fR [\fB\-p\fR|\fB\-\-include\-private\fR] [\fB\-\-format\fR] [\fB\-h\fR|\fB\-\-help\fR] [\fIPATH\fR] 
+.SH DESCRIPTION
+Filter and query the database
+.SH OPTIONS
+.TP
+\fB\-p\fR, \fB\-\-include\-private\fR
+Include private data in output
+.TP
+\fB\-\-format\fR
+
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+[\fIPATH\fR]
+Path to the database
diff --git a/core/man/start-cli/start-cli-db-put-ui.1 b/core/man/start-cli/start-cli-db-put-ui.1
new file mode 100644
index 000000000..5b3587f17
--- /dev/null
+++ b/core/man/start-cli/start-cli-db-put-ui.1
@@ -0,0 +1,22 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-db-put-ui 1  "ui " 
+.SH NAME
+start\-cli\-db\-put\-ui \- Add path and value to db
+.SH SYNOPSIS
+\fBstart\-cli db put ui\fR [\fB\-\-format\fR] [\fB\-h\fR|\fB\-\-help\fR] <\fIPOINTER\fR> <\fIVALUE\fR> 
+.SH DESCRIPTION
+Add path and value to db
+.SH OPTIONS
+.TP
+\fB\-\-format\fR
+
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIPOINTER\fR>
+JSON pointer to specific value
+.TP
+<\fIVALUE\fR>
+JSON value to set
diff --git a/core/man/start-cli/start-cli-db-put.1 b/core/man/start-cli/start-cli-db-put.1
new file mode 100644
index 000000000..a087f07aa
--- /dev/null
+++ b/core/man/start-cli/start-cli-db-put.1
@@ -0,0 +1,17 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-db-put 1  "put " 
+.SH NAME
+start\-cli\-db\-put \- Command for adding UI record to db
+.SH SYNOPSIS
+\fBstart\-cli db put\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIsubcommands\fR>
+.SH DESCRIPTION
+Command for adding UI record to db
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.SH SUBCOMMANDS
+.TP
+start\-cli\-db\-put\-ui(1)
+Add path and value to db
diff --git a/core/man/start-cli/start-cli-db.1 b/core/man/start-cli/start-cli-db.1
new file mode 100644
index 000000000..cace8f21c
--- /dev/null
+++ b/core/man/start-cli/start-cli-db.1
@@ -0,0 +1,23 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-db 1  "db " 
+.SH NAME
+start\-cli\-db \- Commands to interact with the db i.e. dump, put, apply
+.SH SYNOPSIS
+\fBstart\-cli db\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIsubcommands\fR>
+.SH DESCRIPTION
+Commands to interact with the db i.e. dump, put, apply
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.SH SUBCOMMANDS
+.TP
+start\-cli\-db\-apply(1)
+Update a database record
+.TP
+start\-cli\-db\-dump(1)
+Filter and query the database
+.TP
+start\-cli\-db\-put(1)
+Command for adding UI record to db
diff --git a/core/man/start-cli/start-cli-diagnostic-disk-forget.1 b/core/man/start-cli/start-cli-diagnostic-disk-forget.1
new file mode 100644
index 000000000..71f864d8e
--- /dev/null
+++ b/core/man/start-cli/start-cli-diagnostic-disk-forget.1
@@ -0,0 +1,13 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-diagnostic-disk-forget 1  "forget " 
+.SH NAME
+start\-cli\-diagnostic\-disk\-forget \- Remove disk filesystem
+.SH SYNOPSIS
+\fBstart\-cli diagnostic disk forget\fR [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+Remove disk filesystem
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-cli/start-cli-diagnostic-disk-repair.1 b/core/man/start-cli/start-cli-diagnostic-disk-repair.1
new file mode 100644
index 000000000..d2ef7c301
--- /dev/null
+++ b/core/man/start-cli/start-cli-diagnostic-disk-repair.1
@@ -0,0 +1,13 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-diagnostic-disk-repair 1  "repair " 
+.SH NAME
+start\-cli\-diagnostic\-disk\-repair \- Repair disk corruption
+.SH SYNOPSIS
+\fBstart\-cli diagnostic disk repair\fR [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+Repair disk corruption
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-cli/start-cli-diagnostic-disk.1 b/core/man/start-cli/start-cli-diagnostic-disk.1
new file mode 100644
index 000000000..e92a503f6
--- /dev/null
+++ b/core/man/start-cli/start-cli-diagnostic-disk.1
@@ -0,0 +1,20 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-diagnostic-disk 1  "disk " 
+.SH NAME
+start\-cli\-diagnostic\-disk \- Command to remove disk from filesystem
+.SH SYNOPSIS
+\fBstart\-cli diagnostic disk\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIsubcommands\fR>
+.SH DESCRIPTION
+Command to remove disk from filesystem
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.SH SUBCOMMANDS
+.TP
+start\-cli\-diagnostic\-disk\-forget(1)
+Remove disk filesystem
+.TP
+start\-cli\-diagnostic\-disk\-repair(1)
+Repair disk corruption
diff --git a/core/man/start-cli/start-cli-diagnostic-error.1 b/core/man/start-cli/start-cli-diagnostic-error.1
new file mode 100644
index 000000000..8435f72fd
--- /dev/null
+++ b/core/man/start-cli/start-cli-diagnostic-error.1
@@ -0,0 +1,13 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-diagnostic-error 1  "error " 
+.SH NAME
+start\-cli\-diagnostic\-error \- Display diagnostic error
+.SH SYNOPSIS
+\fBstart\-cli diagnostic error\fR [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+Display diagnostic error
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-cli/start-cli-diagnostic-kernel-logs.1 b/core/man/start-cli/start-cli-diagnostic-kernel-logs.1
new file mode 100644
index 000000000..0d1502109
--- /dev/null
+++ b/core/man/start-cli/start-cli-diagnostic-kernel-logs.1
@@ -0,0 +1,28 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-diagnostic-kernel-logs 1  "kernel-logs " 
+.SH NAME
+start\-cli\-diagnostic\-kernel\-logs \- Display kernel logs
+.SH SYNOPSIS
+\fBstart\-cli diagnostic kernel\-logs\fR [\fB\-l\fR|\fB\-\-limit\fR] [\fB\-c\fR|\fB\-\-cursor\fR] [\fB\-b\fR|\fB\-\-boot\fR] [\fB\-B\fR|\fB\-\-before\fR] [\fB\-f\fR|\fB\-\-follow\fR] [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+Display kernel logs
+.SH OPTIONS
+.TP
+\fB\-l\fR, \fB\-\-limit\fR \fI<LIMIT>\fR
+Maximum number of log entries
+.TP
+\fB\-c\fR, \fB\-\-cursor\fR \fI<CURSOR>\fR
+Start from this cursor position
+.TP
+\fB\-b\fR, \fB\-\-boot\fR \fI<BOOT>\fR
+Filter logs by boot ID
+.TP
+\fB\-B\fR, \fB\-\-before\fR
+Show logs before the cursor position
+.TP
+\fB\-f\fR, \fB\-\-follow\fR
+Follow log output in real\-time
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-cli/start-cli-diagnostic-logs.1 b/core/man/start-cli/start-cli-diagnostic-logs.1
new file mode 100644
index 000000000..dc3aeb4b8
--- /dev/null
+++ b/core/man/start-cli/start-cli-diagnostic-logs.1
@@ -0,0 +1,28 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-diagnostic-logs 1  "logs " 
+.SH NAME
+start\-cli\-diagnostic\-logs \- Display OS logs
+.SH SYNOPSIS
+\fBstart\-cli diagnostic logs\fR [\fB\-l\fR|\fB\-\-limit\fR] [\fB\-c\fR|\fB\-\-cursor\fR] [\fB\-b\fR|\fB\-\-boot\fR] [\fB\-B\fR|\fB\-\-before\fR] [\fB\-f\fR|\fB\-\-follow\fR] [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+Display OS logs
+.SH OPTIONS
+.TP
+\fB\-l\fR, \fB\-\-limit\fR \fI<LIMIT>\fR
+Maximum number of log entries
+.TP
+\fB\-c\fR, \fB\-\-cursor\fR \fI<CURSOR>\fR
+Start from this cursor position
+.TP
+\fB\-b\fR, \fB\-\-boot\fR \fI<BOOT>\fR
+Filter logs by boot ID
+.TP
+\fB\-B\fR, \fB\-\-before\fR
+Show logs before the cursor position
+.TP
+\fB\-f\fR, \fB\-\-follow\fR
+Follow log output in real\-time
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-cli/start-cli-diagnostic-rebuild.1 b/core/man/start-cli/start-cli-diagnostic-rebuild.1
new file mode 100644
index 000000000..7397e3844
--- /dev/null
+++ b/core/man/start-cli/start-cli-diagnostic-rebuild.1
@@ -0,0 +1,13 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-diagnostic-rebuild 1  "rebuild " 
+.SH NAME
+start\-cli\-diagnostic\-rebuild \- Teardown and rebuild containers
+.SH SYNOPSIS
+\fBstart\-cli diagnostic rebuild\fR [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+Teardown and rebuild containers
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-cli/start-cli-diagnostic-restart.1 b/core/man/start-cli/start-cli-diagnostic-restart.1
new file mode 100644
index 000000000..f8677c9c1
--- /dev/null
+++ b/core/man/start-cli/start-cli-diagnostic-restart.1
@@ -0,0 +1,13 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-diagnostic-restart 1  "restart " 
+.SH NAME
+start\-cli\-diagnostic\-restart \- Restart the server
+.SH SYNOPSIS
+\fBstart\-cli diagnostic restart\fR [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+Restart the server
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-cli/start-cli-diagnostic.1 b/core/man/start-cli/start-cli-diagnostic.1
new file mode 100644
index 000000000..d8b4003f7
--- /dev/null
+++ b/core/man/start-cli/start-cli-diagnostic.1
@@ -0,0 +1,32 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-diagnostic 1  "diagnostic " 
+.SH NAME
+start\-cli\-diagnostic \- Commands to display logs, restart the server, etc
+.SH SYNOPSIS
+\fBstart\-cli diagnostic\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIsubcommands\fR>
+.SH DESCRIPTION
+Commands to display logs, restart the server, etc
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.SH SUBCOMMANDS
+.TP
+start\-cli\-diagnostic\-disk(1)
+Command to remove disk from filesystem
+.TP
+start\-cli\-diagnostic\-error(1)
+Display diagnostic error
+.TP
+start\-cli\-diagnostic\-kernel\-logs(1)
+Display kernel logs
+.TP
+start\-cli\-diagnostic\-logs(1)
+Display OS logs
+.TP
+start\-cli\-diagnostic\-rebuild(1)
+Teardown and rebuild containers
+.TP
+start\-cli\-diagnostic\-restart(1)
+Restart the server
diff --git a/core/man/start-cli/start-cli-disk-list.1 b/core/man/start-cli/start-cli-disk-list.1
new file mode 100644
index 000000000..497fc21d2
--- /dev/null
+++ b/core/man/start-cli/start-cli-disk-list.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-disk-list 1  "list " 
+.SH NAME
+start\-cli\-disk\-list \- List disk information
+.SH SYNOPSIS
+\fBstart\-cli disk list\fR [\fB\-\-format\fR] [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+List disk information
+.SH OPTIONS
+.TP
+\fB\-\-format\fR
+
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-cli/start-cli-disk-repair.1 b/core/man/start-cli/start-cli-disk-repair.1
new file mode 100644
index 000000000..3de37a206
--- /dev/null
+++ b/core/man/start-cli/start-cli-disk-repair.1
@@ -0,0 +1,13 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-disk-repair 1  "repair " 
+.SH NAME
+start\-cli\-disk\-repair \- Repair disk corruption
+.SH SYNOPSIS
+\fBstart\-cli disk repair\fR [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+Repair disk corruption
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-cli/start-cli-disk.1 b/core/man/start-cli/start-cli-disk.1
new file mode 100644
index 000000000..772eded99
--- /dev/null
+++ b/core/man/start-cli/start-cli-disk.1
@@ -0,0 +1,20 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-disk 1  "disk " 
+.SH NAME
+start\-cli\-disk \- Commands for listing disk info and repairing
+.SH SYNOPSIS
+\fBstart\-cli disk\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIsubcommands\fR>
+.SH DESCRIPTION
+Commands for listing disk info and repairing
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.SH SUBCOMMANDS
+.TP
+start\-cli\-disk\-list(1)
+List disk information
+.TP
+start\-cli\-disk\-repair(1)
+Repair disk corruption
diff --git a/core/man/start-cli/start-cli-echo.1 b/core/man/start-cli/start-cli-echo.1
new file mode 100644
index 000000000..2a2849597
--- /dev/null
+++ b/core/man/start-cli/start-cli-echo.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-echo 1  "echo " 
+.SH NAME
+start\-cli\-echo \- Echo a message back
+.SH SYNOPSIS
+\fBstart\-cli echo\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIMESSAGE\fR> 
+.SH DESCRIPTION
+Echo a message back
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIMESSAGE\fR>
+Message to echo back
diff --git a/core/man/start-cli/start-cli-flash-os.1 b/core/man/start-cli/start-cli-flash-os.1
new file mode 100644
index 000000000..35c1c9f20
--- /dev/null
+++ b/core/man/start-cli/start-cli-flash-os.1
@@ -0,0 +1,32 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-flash-os 1  "flash-os " 
+.SH NAME
+start\-cli\-flash\-os \- Flash StartOS to a drive
+.SH SYNOPSIS
+\fBstart\-cli flash\-os\fR [\fB\-\-efi\fR] [\fB\-h\fR|\fB\-\-help\fR] <\fISQUASHFS\fR> <\fIDISK\fR> 
+.SH DESCRIPTION
+Flash StartOS to a drive
+.SH OPTIONS
+.TP
+\fB\-\-efi\fR \fI<EFI>\fR
+Use EFI boot mode
+.br
+
+.br
+\fIPossible values:\fR
+.RS 14
+.IP \(bu 2
+true
+.IP \(bu 2
+false
+.RE
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fISQUASHFS\fR>
+Path to squashfs image file
+.TP
+<\fIDISK\fR>
+Target disk for installation
diff --git a/core/man/start-cli/start-cli-git-info.1 b/core/man/start-cli/start-cli-git-info.1
new file mode 100644
index 000000000..aabf46dae
--- /dev/null
+++ b/core/man/start-cli/start-cli-git-info.1
@@ -0,0 +1,13 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-git-info 1  "git-info " 
+.SH NAME
+start\-cli\-git\-info \- Display the git hash of this build
+.SH SYNOPSIS
+\fBstart\-cli git\-info\fR [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+Display the git hash of this build
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-cli/start-cli-init-kernel-logs.1 b/core/man/start-cli/start-cli-init-kernel-logs.1
new file mode 100644
index 000000000..475f95470
--- /dev/null
+++ b/core/man/start-cli/start-cli-init-kernel-logs.1
@@ -0,0 +1,28 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-init-kernel-logs 1  "kernel-logs " 
+.SH NAME
+start\-cli\-init\-kernel\-logs \- Display kernel logs
+.SH SYNOPSIS
+\fBstart\-cli init kernel\-logs\fR [\fB\-l\fR|\fB\-\-limit\fR] [\fB\-c\fR|\fB\-\-cursor\fR] [\fB\-b\fR|\fB\-\-boot\fR] [\fB\-B\fR|\fB\-\-before\fR] [\fB\-f\fR|\fB\-\-follow\fR] [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+Display kernel logs
+.SH OPTIONS
+.TP
+\fB\-l\fR, \fB\-\-limit\fR \fI<LIMIT>\fR
+Maximum number of log entries
+.TP
+\fB\-c\fR, \fB\-\-cursor\fR \fI<CURSOR>\fR
+Start from this cursor position
+.TP
+\fB\-b\fR, \fB\-\-boot\fR \fI<BOOT>\fR
+Filter logs by boot ID
+.TP
+\fB\-B\fR, \fB\-\-before\fR
+Show logs before the cursor position
+.TP
+\fB\-f\fR, \fB\-\-follow\fR
+Follow log output in real\-time
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-cli/start-cli-init-key.1 b/core/man/start-cli/start-cli-init-key.1
new file mode 100644
index 000000000..62e21e874
--- /dev/null
+++ b/core/man/start-cli/start-cli-init-key.1
@@ -0,0 +1,13 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-init-key 1  "init-key " 
+.SH NAME
+start\-cli\-init\-key \- Create a new developer key
+.SH SYNOPSIS
+\fBstart\-cli init\-key\fR [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+Create a new developer key
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-cli/start-cli-init-logs.1 b/core/man/start-cli/start-cli-init-logs.1
new file mode 100644
index 000000000..9e778406b
--- /dev/null
+++ b/core/man/start-cli/start-cli-init-logs.1
@@ -0,0 +1,28 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-init-logs 1  "logs " 
+.SH NAME
+start\-cli\-init\-logs \- Display OS logs
+.SH SYNOPSIS
+\fBstart\-cli init logs\fR [\fB\-l\fR|\fB\-\-limit\fR] [\fB\-c\fR|\fB\-\-cursor\fR] [\fB\-b\fR|\fB\-\-boot\fR] [\fB\-B\fR|\fB\-\-before\fR] [\fB\-f\fR|\fB\-\-follow\fR] [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+Display OS logs
+.SH OPTIONS
+.TP
+\fB\-l\fR, \fB\-\-limit\fR \fI<LIMIT>\fR
+Maximum number of log entries
+.TP
+\fB\-c\fR, \fB\-\-cursor\fR \fI<CURSOR>\fR
+Start from this cursor position
+.TP
+\fB\-b\fR, \fB\-\-boot\fR \fI<BOOT>\fR
+Filter logs by boot ID
+.TP
+\fB\-B\fR, \fB\-\-before\fR
+Show logs before the cursor position
+.TP
+\fB\-f\fR, \fB\-\-follow\fR
+Follow log output in real\-time
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-cli/start-cli-init-subscribe.1 b/core/man/start-cli/start-cli-init-subscribe.1
new file mode 100644
index 000000000..375e13c76
--- /dev/null
+++ b/core/man/start-cli/start-cli-init-subscribe.1
@@ -0,0 +1,13 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-init-subscribe 1  "subscribe " 
+.SH NAME
+start\-cli\-init\-subscribe \- Get initialization progress
+.SH SYNOPSIS
+\fBstart\-cli init subscribe\fR [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+Get initialization progress
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-cli/start-cli-init.1 b/core/man/start-cli/start-cli-init.1
new file mode 100644
index 000000000..9b05b8f2f
--- /dev/null
+++ b/core/man/start-cli/start-cli-init.1
@@ -0,0 +1,23 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-init 1  "init " 
+.SH NAME
+start\-cli\-init \- Commands for initialization
+.SH SYNOPSIS
+\fBstart\-cli init\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIsubcommands\fR>
+.SH DESCRIPTION
+Commands for initialization
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.SH SUBCOMMANDS
+.TP
+start\-cli\-init\-kernel\-logs(1)
+Display kernel logs
+.TP
+start\-cli\-init\-logs(1)
+Display OS logs
+.TP
+start\-cli\-init\-subscribe(1)
+Get initialization progress
diff --git a/core/man/start-cli/start-cli-kiosk-disable.1 b/core/man/start-cli/start-cli-kiosk-disable.1
new file mode 100644
index 000000000..9d58d9523
--- /dev/null
+++ b/core/man/start-cli/start-cli-kiosk-disable.1
@@ -0,0 +1,13 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-kiosk-disable 1  "disable " 
+.SH NAME
+start\-cli\-kiosk\-disable \- Disable kiosk mode
+.SH SYNOPSIS
+\fBstart\-cli kiosk disable\fR [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+Disable kiosk mode
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-cli/start-cli-kiosk-enable.1 b/core/man/start-cli/start-cli-kiosk-enable.1
new file mode 100644
index 000000000..4a49e0d15
--- /dev/null
+++ b/core/man/start-cli/start-cli-kiosk-enable.1
@@ -0,0 +1,13 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-kiosk-enable 1  "enable " 
+.SH NAME
+start\-cli\-kiosk\-enable \- Enable kiosk mode
+.SH SYNOPSIS
+\fBstart\-cli kiosk enable\fR [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+Enable kiosk mode
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-cli/start-cli-kiosk.1 b/core/man/start-cli/start-cli-kiosk.1
new file mode 100644
index 000000000..82fd3ac7c
--- /dev/null
+++ b/core/man/start-cli/start-cli-kiosk.1
@@ -0,0 +1,20 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-kiosk 1  "kiosk " 
+.SH NAME
+start\-cli\-kiosk \- Commands for kiosk mode
+.SH SYNOPSIS
+\fBstart\-cli kiosk\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIsubcommands\fR>
+.SH DESCRIPTION
+Commands for kiosk mode
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.SH SUBCOMMANDS
+.TP
+start\-cli\-kiosk\-disable(1)
+Disable kiosk mode
+.TP
+start\-cli\-kiosk\-enable(1)
+Enable kiosk mode
diff --git a/core/man/start-cli/start-cli-net-acme-init.1 b/core/man/start-cli/start-cli-net-acme-init.1
new file mode 100644
index 000000000..44963263d
--- /dev/null
+++ b/core/man/start-cli/start-cli-net-acme-init.1
@@ -0,0 +1,19 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-net-acme-init 1  "init " 
+.SH NAME
+start\-cli\-net\-acme\-init \- Setup ACME certificate acquisition
+.SH SYNOPSIS
+\fBstart\-cli net acme init\fR <\fB\-\-provider\fR> [\fB\-\-contact\fR] [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+Setup ACME certificate acquisition
+.SH OPTIONS
+.TP
+\fB\-\-provider\fR \fI<PROVIDER>\fR
+ACME provider identifier or url
+.TP
+\fB\-\-contact\fR \fI<CONTACT>\fR
+Contact email for ACME certificate authority
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-cli/start-cli-net-acme-remove.1 b/core/man/start-cli/start-cli-net-acme-remove.1
new file mode 100644
index 000000000..0dcfca138
--- /dev/null
+++ b/core/man/start-cli/start-cli-net-acme-remove.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-net-acme-remove 1  "remove " 
+.SH NAME
+start\-cli\-net\-acme\-remove \- Remove ACME certificate acquisition configuration
+.SH SYNOPSIS
+\fBstart\-cli net acme remove\fR <\fB\-\-provider\fR> [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+Remove ACME certificate acquisition configuration
+.SH OPTIONS
+.TP
+\fB\-\-provider\fR \fI<PROVIDER>\fR
+ACME provider identifier or url
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-cli/start-cli-net-acme.1 b/core/man/start-cli/start-cli-net-acme.1
new file mode 100644
index 000000000..f1a95d1cb
--- /dev/null
+++ b/core/man/start-cli/start-cli-net-acme.1
@@ -0,0 +1,20 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-net-acme 1  "acme " 
+.SH NAME
+start\-cli\-net\-acme \- Setup ACME certificate
+.SH SYNOPSIS
+\fBstart\-cli net acme\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIsubcommands\fR>
+.SH DESCRIPTION
+Setup ACME certificate
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.SH SUBCOMMANDS
+.TP
+start\-cli\-net\-acme\-init(1)
+Setup ACME certificate acquisition
+.TP
+start\-cli\-net\-acme\-remove(1)
+Remove ACME certificate acquisition configuration
diff --git a/core/man/start-cli/start-cli-net-dns-dump-table.1 b/core/man/start-cli/start-cli-net-dns-dump-table.1
new file mode 100644
index 000000000..94b524131
--- /dev/null
+++ b/core/man/start-cli/start-cli-net-dns-dump-table.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-net-dns-dump-table 1  "dump-table " 
+.SH NAME
+start\-cli\-net\-dns\-dump\-table \- Dump address resolution table
+.SH SYNOPSIS
+\fBstart\-cli net dns dump\-table\fR [\fB\-\-format\fR] [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+Dump address resolution table
+.SH OPTIONS
+.TP
+\fB\-\-format\fR
+
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-cli/start-cli-net-dns-query.1 b/core/man/start-cli/start-cli-net-dns-query.1
new file mode 100644
index 000000000..410cc5330
--- /dev/null
+++ b/core/man/start-cli/start-cli-net-dns-query.1
@@ -0,0 +1,19 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-net-dns-query 1  "query " 
+.SH NAME
+start\-cli\-net\-dns\-query \- Test DNS configuration for a domain
+.SH SYNOPSIS
+\fBstart\-cli net dns query\fR [\fB\-\-format\fR] [\fB\-h\fR|\fB\-\-help\fR] <\fIFQDN\fR> 
+.SH DESCRIPTION
+Test DNS configuration for a domain
+.SH OPTIONS
+.TP
+\fB\-\-format\fR
+
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIFQDN\fR>
+Fully qualified domain name
diff --git a/core/man/start-cli/start-cli-net-dns-set-static.1 b/core/man/start-cli/start-cli-net-dns-set-static.1
new file mode 100644
index 000000000..766e921a8
--- /dev/null
+++ b/core/man/start-cli/start-cli-net-dns-set-static.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-net-dns-set-static 1  "set-static " 
+.SH NAME
+start\-cli\-net\-dns\-set\-static \- Set static DNS servers
+.SH SYNOPSIS
+\fBstart\-cli net dns set\-static\fR [\fB\-h\fR|\fB\-\-help\fR] [\fISERVERS\fR] 
+.SH DESCRIPTION
+Set static DNS servers
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+[\fISERVERS\fR]
+DNS servers to use
diff --git a/core/man/start-cli/start-cli-net-dns.1 b/core/man/start-cli/start-cli-net-dns.1
new file mode 100644
index 000000000..c3c545460
--- /dev/null
+++ b/core/man/start-cli/start-cli-net-dns.1
@@ -0,0 +1,23 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-net-dns 1  "dns " 
+.SH NAME
+start\-cli\-net\-dns \- Manage and query DNS
+.SH SYNOPSIS
+\fBstart\-cli net dns\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIsubcommands\fR>
+.SH DESCRIPTION
+Manage and query DNS
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.SH SUBCOMMANDS
+.TP
+start\-cli\-net\-dns\-dump\-table(1)
+Dump address resolution table
+.TP
+start\-cli\-net\-dns\-query(1)
+Test DNS configuration for a domain
+.TP
+start\-cli\-net\-dns\-set\-static(1)
+Set static DNS servers
diff --git a/core/man/start-cli/start-cli-net-forward-dump-table.1 b/core/man/start-cli/start-cli-net-forward-dump-table.1
new file mode 100644
index 000000000..79e4e01e5
--- /dev/null
+++ b/core/man/start-cli/start-cli-net-forward-dump-table.1
@@ -0,0 +1,15 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-net-forward-dump-table 1  "dump-table " 
+.SH NAME
+start\-cli\-net\-forward\-dump\-table
+.SH SYNOPSIS
+\fBstart\-cli net forward dump\-table\fR [\fB\-\-format\fR] [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+.SH OPTIONS
+.TP
+\fB\-\-format\fR
+
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-cli/start-cli-net-forward.1 b/core/man/start-cli/start-cli-net-forward.1
new file mode 100644
index 000000000..6e2108602
--- /dev/null
+++ b/core/man/start-cli/start-cli-net-forward.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-net-forward 1  "forward " 
+.SH NAME
+start\-cli\-net\-forward \- Manage port forwards
+.SH SYNOPSIS
+\fBstart\-cli net forward\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIsubcommands\fR>
+.SH DESCRIPTION
+Manage port forwards
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.SH SUBCOMMANDS
+.TP
+start\-cli\-net\-forward\-dump\-table(1)
diff --git a/core/man/start-cli/start-cli-net-gateway-check-dns.1 b/core/man/start-cli/start-cli-net-gateway-check-dns.1
new file mode 100644
index 000000000..6eab6c125
--- /dev/null
+++ b/core/man/start-cli/start-cli-net-gateway-check-dns.1
@@ -0,0 +1,19 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-net-gateway-check-dns 1  "check-dns " 
+.SH NAME
+start\-cli\-net\-gateway\-check\-dns \- Check DNS configuration for a gateway
+.SH SYNOPSIS
+\fBstart\-cli net gateway check\-dns\fR [\fB\-\-format\fR] [\fB\-h\fR|\fB\-\-help\fR] <\fIGATEWAY\fR> 
+.SH DESCRIPTION
+Check DNS configuration for a gateway
+.SH OPTIONS
+.TP
+\fB\-\-format\fR
+
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIGATEWAY\fR>
+Gateway identifier
diff --git a/core/man/start-cli/start-cli-net-gateway-check-port.1 b/core/man/start-cli/start-cli-net-gateway-check-port.1
new file mode 100644
index 000000000..4ee5d6665
--- /dev/null
+++ b/core/man/start-cli/start-cli-net-gateway-check-port.1
@@ -0,0 +1,22 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-net-gateway-check-port 1  "check-port " 
+.SH NAME
+start\-cli\-net\-gateway\-check\-port \- about.check\-port\-reachability
+.SH SYNOPSIS
+\fBstart\-cli net gateway check\-port\fR [\fB\-\-format\fR] [\fB\-h\fR|\fB\-\-help\fR] <\fIPORT\fR> <\fIGATEWAY\fR> 
+.SH DESCRIPTION
+about.check\-port\-reachability
+.SH OPTIONS
+.TP
+\fB\-\-format\fR
+
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIPORT\fR>
+help.arg.port
+.TP
+<\fIGATEWAY\fR>
+Gateway identifier
diff --git a/core/man/start-cli/start-cli-net-gateway-forget.1 b/core/man/start-cli/start-cli-net-gateway-forget.1
new file mode 100644
index 000000000..9896062f8
--- /dev/null
+++ b/core/man/start-cli/start-cli-net-gateway-forget.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-net-gateway-forget 1  "forget " 
+.SH NAME
+start\-cli\-net\-gateway\-forget \- Forget a disconnected gateway
+.SH SYNOPSIS
+\fBstart\-cli net gateway forget\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIGATEWAY\fR> 
+.SH DESCRIPTION
+Forget a disconnected gateway
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIGATEWAY\fR>
+Gateway identifier
diff --git a/core/man/start-cli/start-cli-net-gateway-list.1 b/core/man/start-cli/start-cli-net-gateway-list.1
new file mode 100644
index 000000000..416ec3365
--- /dev/null
+++ b/core/man/start-cli/start-cli-net-gateway-list.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-net-gateway-list 1  "list " 
+.SH NAME
+start\-cli\-net\-gateway\-list \- Show gateways StartOS can listen on
+.SH SYNOPSIS
+\fBstart\-cli net gateway list\fR [\fB\-\-format\fR] [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+Show gateways StartOS can listen on
+.SH OPTIONS
+.TP
+\fB\-\-format\fR
+
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-cli/start-cli-net-gateway-set-default-outbound.1 b/core/man/start-cli/start-cli-net-gateway-set-default-outbound.1
new file mode 100644
index 000000000..76ee6c7ce
--- /dev/null
+++ b/core/man/start-cli/start-cli-net-gateway-set-default-outbound.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-net-gateway-set-default-outbound 1  "set-default-outbound " 
+.SH NAME
+start\-cli\-net\-gateway\-set\-default\-outbound \- about.set\-default\-outbound\-gateway
+.SH SYNOPSIS
+\fBstart\-cli net gateway set\-default\-outbound\fR [\fB\-h\fR|\fB\-\-help\fR] [\fIGATEWAY\fR] 
+.SH DESCRIPTION
+about.set\-default\-outbound\-gateway
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+[\fIGATEWAY\fR]
+Gateway identifier
diff --git a/core/man/start-cli/start-cli-net-gateway-set-name.1 b/core/man/start-cli/start-cli-net-gateway-set-name.1
new file mode 100644
index 000000000..b8ab927e2
--- /dev/null
+++ b/core/man/start-cli/start-cli-net-gateway-set-name.1
@@ -0,0 +1,19 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-net-gateway-set-name 1  "set-name " 
+.SH NAME
+start\-cli\-net\-gateway\-set\-name \- Rename a gateway
+.SH SYNOPSIS
+\fBstart\-cli net gateway set\-name\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIID\fR> <\fINAME\fR> 
+.SH DESCRIPTION
+Rename a gateway
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIID\fR>
+Gateway identifier
+.TP
+<\fINAME\fR>
+Name of the gateway
diff --git a/core/man/start-cli/start-cli-net-gateway.1 b/core/man/start-cli/start-cli-net-gateway.1
new file mode 100644
index 000000000..51741dc9c
--- /dev/null
+++ b/core/man/start-cli/start-cli-net-gateway.1
@@ -0,0 +1,32 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-net-gateway 1  "gateway " 
+.SH NAME
+start\-cli\-net\-gateway \- View and edit gateway configurations
+.SH SYNOPSIS
+\fBstart\-cli net gateway\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIsubcommands\fR>
+.SH DESCRIPTION
+View and edit gateway configurations
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.SH SUBCOMMANDS
+.TP
+start\-cli\-net\-gateway\-check\-dns(1)
+Check DNS configuration for a gateway
+.TP
+start\-cli\-net\-gateway\-check\-port(1)
+about.check\-port\-reachability
+.TP
+start\-cli\-net\-gateway\-forget(1)
+Forget a disconnected gateway
+.TP
+start\-cli\-net\-gateway\-list(1)
+Show gateways StartOS can listen on
+.TP
+start\-cli\-net\-gateway\-set\-default\-outbound(1)
+about.set\-default\-outbound\-gateway
+.TP
+start\-cli\-net\-gateway\-set\-name(1)
+Rename a gateway
diff --git a/core/man/start-cli/start-cli-net-tunnel-add.1 b/core/man/start-cli/start-cli-net-tunnel-add.1
new file mode 100644
index 000000000..d315b28ce
--- /dev/null
+++ b/core/man/start-cli/start-cli-net-tunnel-add.1
@@ -0,0 +1,35 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-net-tunnel-add 1  "add " 
+.SH NAME
+start\-cli\-net\-tunnel\-add \- Add a new tunnel
+.SH SYNOPSIS
+\fBstart\-cli net tunnel add\fR [\fB\-\-set\-as\-default\-outbound\fR] [\fB\-h\fR|\fB\-\-help\fR] <\fINAME\fR> <\fICONFIG\fR> [\fIGATEWAY_TYPE\fR] 
+.SH DESCRIPTION
+Add a new tunnel
+.SH OPTIONS
+.TP
+\fB\-\-set\-as\-default\-outbound\fR
+help.arg.set\-as\-default\-outbound
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fINAME\fR>
+Tunnel name
+.TP
+<\fICONFIG\fR>
+WireGuard configuration
+.TP
+[\fIGATEWAY_TYPE\fR]
+help.arg.gateway\-type
+.br
+
+.br
+\fIPossible values:\fR
+.RS 14
+.IP \(bu 2
+inbound\-outbound
+.IP \(bu 2
+outbound\-only
+.RE
diff --git a/core/man/start-cli/start-cli-net-tunnel-remove.1 b/core/man/start-cli/start-cli-net-tunnel-remove.1
new file mode 100644
index 000000000..d8ba47885
--- /dev/null
+++ b/core/man/start-cli/start-cli-net-tunnel-remove.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-net-tunnel-remove 1  "remove " 
+.SH NAME
+start\-cli\-net\-tunnel\-remove \- Remove a tunnel
+.SH SYNOPSIS
+\fBstart\-cli net tunnel remove\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIID\fR> 
+.SH DESCRIPTION
+Remove a tunnel
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIID\fR>
+Gateway identifier
diff --git a/core/man/start-cli/start-cli-net-tunnel.1 b/core/man/start-cli/start-cli-net-tunnel.1
new file mode 100644
index 000000000..fa5afdead
--- /dev/null
+++ b/core/man/start-cli/start-cli-net-tunnel.1
@@ -0,0 +1,20 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-net-tunnel 1  "tunnel " 
+.SH NAME
+start\-cli\-net\-tunnel \- Manage tunnels
+.SH SYNOPSIS
+\fBstart\-cli net tunnel\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIsubcommands\fR>
+.SH DESCRIPTION
+Manage tunnels
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.SH SUBCOMMANDS
+.TP
+start\-cli\-net\-tunnel\-add(1)
+Add a new tunnel
+.TP
+start\-cli\-net\-tunnel\-remove(1)
+Remove a tunnel
diff --git a/core/man/start-cli/start-cli-net-vhost-add-passthrough.1 b/core/man/start-cli/start-cli-net-vhost-add-passthrough.1
new file mode 100644
index 000000000..9d6aa9892
--- /dev/null
+++ b/core/man/start-cli/start-cli-net-vhost-add-passthrough.1
@@ -0,0 +1,27 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-net-vhost-add-passthrough 1  "add-passthrough " 
+.SH NAME
+start\-cli\-net\-vhost\-add\-passthrough
+.SH SYNOPSIS
+\fBstart\-cli net vhost add\-passthrough\fR <\fB\-\-hostname\fR> <\fB\-\-listen\-port\fR> <\fB\-\-backend\fR> [\fB\-\-public\-gateway\fR] [\fB\-\-private\-ip\fR] [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+.SH OPTIONS
+.TP
+\fB\-\-hostname\fR \fI<HOSTNAME>\fR
+
+.TP
+\fB\-\-listen\-port\fR \fI<LISTEN_PORT>\fR
+
+.TP
+\fB\-\-backend\fR \fI<BACKEND>\fR
+
+.TP
+\fB\-\-public\-gateway\fR \fI<PUBLIC_GATEWAY>\fR
+
+.TP
+\fB\-\-private\-ip\fR \fI<PRIVATE_IP>\fR
+
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-cli/start-cli-net-vhost-dump-table.1 b/core/man/start-cli/start-cli-net-vhost-dump-table.1
new file mode 100644
index 000000000..c6e89acc7
--- /dev/null
+++ b/core/man/start-cli/start-cli-net-vhost-dump-table.1
@@ -0,0 +1,15 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-net-vhost-dump-table 1  "dump-table " 
+.SH NAME
+start\-cli\-net\-vhost\-dump\-table
+.SH SYNOPSIS
+\fBstart\-cli net vhost dump\-table\fR [\fB\-\-format\fR] [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+.SH OPTIONS
+.TP
+\fB\-\-format\fR
+
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-cli/start-cli-net-vhost-list-passthrough.1 b/core/man/start-cli/start-cli-net-vhost-list-passthrough.1
new file mode 100644
index 000000000..a425795a2
--- /dev/null
+++ b/core/man/start-cli/start-cli-net-vhost-list-passthrough.1
@@ -0,0 +1,15 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-net-vhost-list-passthrough 1  "list-passthrough " 
+.SH NAME
+start\-cli\-net\-vhost\-list\-passthrough
+.SH SYNOPSIS
+\fBstart\-cli net vhost list\-passthrough\fR [\fB\-\-format\fR] [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+.SH OPTIONS
+.TP
+\fB\-\-format\fR
+
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-cli/start-cli-net-vhost-remove-passthrough.1 b/core/man/start-cli/start-cli-net-vhost-remove-passthrough.1
new file mode 100644
index 000000000..a444e2593
--- /dev/null
+++ b/core/man/start-cli/start-cli-net-vhost-remove-passthrough.1
@@ -0,0 +1,18 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-net-vhost-remove-passthrough 1  "remove-passthrough " 
+.SH NAME
+start\-cli\-net\-vhost\-remove\-passthrough
+.SH SYNOPSIS
+\fBstart\-cli net vhost remove\-passthrough\fR <\fB\-\-hostname\fR> <\fB\-\-listen\-port\fR> [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+.SH OPTIONS
+.TP
+\fB\-\-hostname\fR \fI<HOSTNAME>\fR
+
+.TP
+\fB\-\-listen\-port\fR \fI<LISTEN_PORT>\fR
+
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-cli/start-cli-net-vhost.1 b/core/man/start-cli/start-cli-net-vhost.1
new file mode 100644
index 000000000..c977761fe
--- /dev/null
+++ b/core/man/start-cli/start-cli-net-vhost.1
@@ -0,0 +1,22 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-net-vhost 1  "vhost " 
+.SH NAME
+start\-cli\-net\-vhost \- Manage SSL vhost proxy
+.SH SYNOPSIS
+\fBstart\-cli net vhost\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIsubcommands\fR>
+.SH DESCRIPTION
+Manage SSL vhost proxy
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.SH SUBCOMMANDS
+.TP
+start\-cli\-net\-vhost\-add\-passthrough(1)
+.TP
+start\-cli\-net\-vhost\-dump\-table(1)
+.TP
+start\-cli\-net\-vhost\-list\-passthrough(1)
+.TP
+start\-cli\-net\-vhost\-remove\-passthrough(1)
diff --git a/core/man/start-cli/start-cli-net.1 b/core/man/start-cli/start-cli-net.1
new file mode 100644
index 000000000..8fe2a8969
--- /dev/null
+++ b/core/man/start-cli/start-cli-net.1
@@ -0,0 +1,32 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-net 1  "net " 
+.SH NAME
+start\-cli\-net \- Network commands
+.SH SYNOPSIS
+\fBstart\-cli net\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIsubcommands\fR>
+.SH DESCRIPTION
+Network commands
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.SH SUBCOMMANDS
+.TP
+start\-cli\-net\-acme(1)
+Setup ACME certificate
+.TP
+start\-cli\-net\-dns(1)
+Manage and query DNS
+.TP
+start\-cli\-net\-forward(1)
+Manage port forwards
+.TP
+start\-cli\-net\-gateway(1)
+View and edit gateway configurations
+.TP
+start\-cli\-net\-tunnel(1)
+Manage tunnels
+.TP
+start\-cli\-net\-vhost(1)
+Manage SSL vhost proxy
diff --git a/core/man/start-cli/start-cli-notification-create.1 b/core/man/start-cli/start-cli-notification-create.1
new file mode 100644
index 000000000..d4bc03412
--- /dev/null
+++ b/core/man/start-cli/start-cli-notification-create.1
@@ -0,0 +1,25 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-notification-create 1  "create " 
+.SH NAME
+start\-cli\-notification\-create \- Persist a new notification
+.SH SYNOPSIS
+\fBstart\-cli notification create\fR [\fB\-p\fR|\fB\-\-package\fR] [\fB\-h\fR|\fB\-\-help\fR] <\fILEVEL\fR> <\fITITLE\fR> <\fIMESSAGE\fR> 
+.SH DESCRIPTION
+Persist a new notification
+.SH OPTIONS
+.TP
+\fB\-p\fR, \fB\-\-package\fR \fI<PACKAGE>\fR
+Package identifier
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fILEVEL\fR>
+Notification severity level
+.TP
+<\fITITLE\fR>
+Notification title
+.TP
+<\fIMESSAGE\fR>
+Notification message content
diff --git a/core/man/start-cli/start-cli-notification-list.1 b/core/man/start-cli/start-cli-notification-list.1
new file mode 100644
index 000000000..03ced50b2
--- /dev/null
+++ b/core/man/start-cli/start-cli-notification-list.1
@@ -0,0 +1,22 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-notification-list 1  "list " 
+.SH NAME
+start\-cli\-notification\-list \- List notifications
+.SH SYNOPSIS
+\fBstart\-cli notification list\fR [\fB\-\-format\fR] [\fB\-h\fR|\fB\-\-help\fR] [\fIBEFORE\fR] [\fILIMIT\fR] 
+.SH DESCRIPTION
+List notifications
+.SH OPTIONS
+.TP
+\fB\-\-format\fR
+
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+[\fIBEFORE\fR]
+Get notifications before this ID
+.TP
+[\fILIMIT\fR]
+Maximum number of notifications to return
diff --git a/core/man/start-cli/start-cli-notification-mark-seen-before.1 b/core/man/start-cli/start-cli-notification-mark-seen-before.1
new file mode 100644
index 000000000..c00a8d83a
--- /dev/null
+++ b/core/man/start-cli/start-cli-notification-mark-seen-before.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-notification-mark-seen-before 1  "mark-seen-before " 
+.SH NAME
+start\-cli\-notification\-mark\-seen\-before \- Mark notifications as seen before a given ID
+.SH SYNOPSIS
+\fBstart\-cli notification mark\-seen\-before\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIBEFORE\fR> 
+.SH DESCRIPTION
+Mark notifications as seen before a given ID
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIBEFORE\fR>
+Get notifications before this ID
diff --git a/core/man/start-cli/start-cli-notification-mark-seen.1 b/core/man/start-cli/start-cli-notification-mark-seen.1
new file mode 100644
index 000000000..d79a3fd86
--- /dev/null
+++ b/core/man/start-cli/start-cli-notification-mark-seen.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-notification-mark-seen 1  "mark-seen " 
+.SH NAME
+start\-cli\-notification\-mark\-seen \- Mark notifications as seen
+.SH SYNOPSIS
+\fBstart\-cli notification mark\-seen\fR [\fB\-h\fR|\fB\-\-help\fR] [\fIIDS\fR] 
+.SH DESCRIPTION
+Mark notifications as seen
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+[\fIIDS\fR]
+Notification IDs
diff --git a/core/man/start-cli/start-cli-notification-mark-unseen.1 b/core/man/start-cli/start-cli-notification-mark-unseen.1
new file mode 100644
index 000000000..d71d67dbb
--- /dev/null
+++ b/core/man/start-cli/start-cli-notification-mark-unseen.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-notification-mark-unseen 1  "mark-unseen " 
+.SH NAME
+start\-cli\-notification\-mark\-unseen \- Mark notifications as unseen
+.SH SYNOPSIS
+\fBstart\-cli notification mark\-unseen\fR [\fB\-h\fR|\fB\-\-help\fR] [\fIIDS\fR] 
+.SH DESCRIPTION
+Mark notifications as unseen
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+[\fIIDS\fR]
+Notification IDs
diff --git a/core/man/start-cli/start-cli-notification-remove-before.1 b/core/man/start-cli/start-cli-notification-remove-before.1
new file mode 100644
index 000000000..8703cfba4
--- /dev/null
+++ b/core/man/start-cli/start-cli-notification-remove-before.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-notification-remove-before 1  "remove-before " 
+.SH NAME
+start\-cli\-notification\-remove\-before \- Remove notifications before a given ID
+.SH SYNOPSIS
+\fBstart\-cli notification remove\-before\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIBEFORE\fR> 
+.SH DESCRIPTION
+Remove notifications before a given ID
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIBEFORE\fR>
+Get notifications before this ID
diff --git a/core/man/start-cli/start-cli-notification-remove.1 b/core/man/start-cli/start-cli-notification-remove.1
new file mode 100644
index 000000000..d198fd056
--- /dev/null
+++ b/core/man/start-cli/start-cli-notification-remove.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-notification-remove 1  "remove " 
+.SH NAME
+start\-cli\-notification\-remove \- Remove notification for IDs
+.SH SYNOPSIS
+\fBstart\-cli notification remove\fR [\fB\-h\fR|\fB\-\-help\fR] [\fIIDS\fR] 
+.SH DESCRIPTION
+Remove notification for IDs
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+[\fIIDS\fR]
+Notification IDs
diff --git a/core/man/start-cli/start-cli-notification.1 b/core/man/start-cli/start-cli-notification.1
new file mode 100644
index 000000000..dfed2c598
--- /dev/null
+++ b/core/man/start-cli/start-cli-notification.1
@@ -0,0 +1,35 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-notification 1  "notification " 
+.SH NAME
+start\-cli\-notification \- Create, delete, or list notifications
+.SH SYNOPSIS
+\fBstart\-cli notification\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIsubcommands\fR>
+.SH DESCRIPTION
+Create, delete, or list notifications
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.SH SUBCOMMANDS
+.TP
+start\-cli\-notification\-create(1)
+Persist a new notification
+.TP
+start\-cli\-notification\-list(1)
+List notifications
+.TP
+start\-cli\-notification\-mark\-seen(1)
+Mark notifications as seen
+.TP
+start\-cli\-notification\-mark\-seen\-before(1)
+Mark notifications as seen before a given ID
+.TP
+start\-cli\-notification\-mark\-unseen(1)
+Mark notifications as unseen
+.TP
+start\-cli\-notification\-remove(1)
+Remove notification for IDs
+.TP
+start\-cli\-notification\-remove\-before(1)
+Remove notifications before a given ID
diff --git a/core/man/start-cli/start-cli-package-action-clear-task.1 b/core/man/start-cli/start-cli-package-action-clear-task.1
new file mode 100644
index 000000000..8c2f46918
--- /dev/null
+++ b/core/man/start-cli/start-cli-package-action-clear-task.1
@@ -0,0 +1,22 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-package-action-clear-task 1  "clear-task " 
+.SH NAME
+start\-cli\-package\-action\-clear\-task \- Clear a service task
+.SH SYNOPSIS
+\fBstart\-cli package action clear\-task\fR [\fB\-\-force\fR] [\fB\-h\fR|\fB\-\-help\fR] <\fIPACKAGE_ID\fR> <\fIREPLAY_ID\fR> 
+.SH DESCRIPTION
+Clear a service task
+.SH OPTIONS
+.TP
+\fB\-\-force\fR
+Force clear the task even if running
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIPACKAGE_ID\fR>
+Package identifier
+.TP
+<\fIREPLAY_ID\fR>
+Replay identifier for task
diff --git a/core/man/start-cli/start-cli-package-action-get-input.1 b/core/man/start-cli/start-cli-package-action-get-input.1
new file mode 100644
index 000000000..0b3aa9d1b
--- /dev/null
+++ b/core/man/start-cli/start-cli-package-action-get-input.1
@@ -0,0 +1,22 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-package-action-get-input 1  "get-input " 
+.SH NAME
+start\-cli\-package\-action\-get\-input \- Get action input specification
+.SH SYNOPSIS
+\fBstart\-cli package action get\-input\fR [\fB\-\-format\fR] [\fB\-h\fR|\fB\-\-help\fR] <\fIPACKAGE_ID\fR> <\fIACTION_ID\fR> 
+.SH DESCRIPTION
+Get action input specification
+.SH OPTIONS
+.TP
+\fB\-\-format\fR
+
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIPACKAGE_ID\fR>
+Package identifier
+.TP
+<\fIACTION_ID\fR>
+Action identifier
diff --git a/core/man/start-cli/start-cli-package-action-run.1 b/core/man/start-cli/start-cli-package-action-run.1
new file mode 100644
index 000000000..81efe9aee
--- /dev/null
+++ b/core/man/start-cli/start-cli-package-action-run.1
@@ -0,0 +1,25 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-package-action-run 1  "run " 
+.SH NAME
+start\-cli\-package\-action\-run \- Run a service action
+.SH SYNOPSIS
+\fBstart\-cli package action run\fR [\fB\-\-event\-id\fR] [\fB\-\-format\fR] [\fB\-h\fR|\fB\-\-help\fR] <\fIPACKAGE_ID\fR> <\fIACTION_ID\fR> 
+.SH DESCRIPTION
+Run a service action
+.SH OPTIONS
+.TP
+\fB\-\-event\-id\fR \fI<EVENT_ID>\fR
+Unique event identifier
+.TP
+\fB\-\-format\fR
+
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIPACKAGE_ID\fR>
+Package identifier
+.TP
+<\fIACTION_ID\fR>
+Action identifier
diff --git a/core/man/start-cli/start-cli-package-action.1 b/core/man/start-cli/start-cli-package-action.1
new file mode 100644
index 000000000..375e2ef4b
--- /dev/null
+++ b/core/man/start-cli/start-cli-package-action.1
@@ -0,0 +1,23 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-package-action 1  "action " 
+.SH NAME
+start\-cli\-package\-action \- Commands to get action input or run an action
+.SH SYNOPSIS
+\fBstart\-cli package action\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIsubcommands\fR>
+.SH DESCRIPTION
+Commands to get action input or run an action
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.SH SUBCOMMANDS
+.TP
+start\-cli\-package\-action\-clear\-task(1)
+Clear a service task
+.TP
+start\-cli\-package\-action\-get\-input(1)
+Get action input specification
+.TP
+start\-cli\-package\-action\-run(1)
+Run a service action
diff --git a/core/man/start-cli/start-cli-package-attach.1 b/core/man/start-cli/start-cli-package-attach.1
new file mode 100644
index 000000000..b230689bf
--- /dev/null
+++ b/core/man/start-cli/start-cli-package-attach.1
@@ -0,0 +1,33 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-package-attach 1  "attach " 
+.SH NAME
+start\-cli\-package\-attach
+.SH SYNOPSIS
+\fBstart\-cli package attach\fR [\fB\-\-force\-tty\fR] [\fB\-s\fR|\fB\-\-subcontainer\fR] [\fB\-n\fR|\fB\-\-name\fR] [\fB\-u\fR|\fB\-\-user\fR] [\fB\-i\fR|\fB\-\-image\-id\fR] [\fB\-h\fR|\fB\-\-help\fR] <\fIID\fR> [\fICOMMAND\fR] 
+.SH DESCRIPTION
+.SH OPTIONS
+.TP
+\fB\-\-force\-tty\fR
+Force TTY mode for I/O
+.TP
+\fB\-s\fR, \fB\-\-subcontainer\fR \fI<SUBCONTAINER>\fR
+Name of the subcontainer
+.TP
+\fB\-n\fR, \fB\-\-name\fR \fI<NAME>\fR
+Name of the container
+.TP
+\fB\-u\fR, \fB\-\-user\fR \fI<USER>\fR
+User name to run as
+.TP
+\fB\-i\fR, \fB\-\-image\-id\fR \fI<IMAGE_ID>\fR
+Docker image identifier
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIID\fR>
+Package identifier
+.TP
+[\fICOMMAND\fR]
+Command to execute in the container
diff --git a/core/man/start-cli/start-cli-package-backup-restore.1 b/core/man/start-cli/start-cli-package-backup-restore.1
new file mode 100644
index 000000000..144e74ab0
--- /dev/null
+++ b/core/man/start-cli/start-cli-package-backup-restore.1
@@ -0,0 +1,22 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-package-backup-restore 1  "restore " 
+.SH NAME
+start\-cli\-package\-backup\-restore \- Restore packages from backup
+.SH SYNOPSIS
+\fBstart\-cli package backup restore\fR [\fB\-h\fR|\fB\-\-help\fR] <\fITARGET_ID\fR> <\fIPASSWORD\fR> [\fIIDS\fR] 
+.SH DESCRIPTION
+Restore packages from backup
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fITARGET_ID\fR>
+Backup target identifier
+.TP
+<\fIPASSWORD\fR>
+Password for backup encryption
+.TP
+[\fIIDS\fR]
+Package identifiers
diff --git a/core/man/start-cli/start-cli-package-backup.1 b/core/man/start-cli/start-cli-package-backup.1
new file mode 100644
index 000000000..02fd83765
--- /dev/null
+++ b/core/man/start-cli/start-cli-package-backup.1
@@ -0,0 +1,17 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-package-backup 1  "backup " 
+.SH NAME
+start\-cli\-package\-backup \- Commands for restoring package(s) from backup
+.SH SYNOPSIS
+\fBstart\-cli package backup\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIsubcommands\fR>
+.SH DESCRIPTION
+Commands for restoring package(s) from backup
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.SH SUBCOMMANDS
+.TP
+start\-cli\-package\-backup\-restore(1)
+Restore packages from backup
diff --git a/core/man/start-cli/start-cli-package-cancel-install.1 b/core/man/start-cli/start-cli-package-cancel-install.1
new file mode 100644
index 000000000..33dc1c34e
--- /dev/null
+++ b/core/man/start-cli/start-cli-package-cancel-install.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-package-cancel-install 1  "cancel-install " 
+.SH NAME
+start\-cli\-package\-cancel\-install \- Cancel an install of a package
+.SH SYNOPSIS
+\fBstart\-cli package cancel\-install\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIID\fR> 
+.SH DESCRIPTION
+Cancel an install of a package
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIID\fR>
+Package identifier
diff --git a/core/man/start-cli/start-cli-package-host-address-domain-private-add.1 b/core/man/start-cli/start-cli-package-host-address-domain-private-add.1
new file mode 100644
index 000000000..f40a9b74c
--- /dev/null
+++ b/core/man/start-cli/start-cli-package-host-address-domain-private-add.1
@@ -0,0 +1,19 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-package-host-address-domain-private-add 1  "add " 
+.SH NAME
+start\-cli\-package\-host\-address\-domain\-private\-add \- Add a private domain to this host
+.SH SYNOPSIS
+\fBstart\-cli package host address domain private add\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIFQDN\fR> <\fIGATEWAY\fR> 
+.SH DESCRIPTION
+Add a private domain to this host
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIFQDN\fR>
+Fully qualified domain name
+.TP
+<\fIGATEWAY\fR>
+
diff --git a/core/man/start-cli/start-cli-package-host-address-domain-private-remove.1 b/core/man/start-cli/start-cli-package-host-address-domain-private-remove.1
new file mode 100644
index 000000000..090938017
--- /dev/null
+++ b/core/man/start-cli/start-cli-package-host-address-domain-private-remove.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-package-host-address-domain-private-remove 1  "remove " 
+.SH NAME
+start\-cli\-package\-host\-address\-domain\-private\-remove \- Remove private domain from host
+.SH SYNOPSIS
+\fBstart\-cli package host address domain private remove\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIFQDN\fR> 
+.SH DESCRIPTION
+Remove private domain from host
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIFQDN\fR>
+Fully qualified domain name
diff --git a/core/man/start-cli/start-cli-package-host-address-domain-private.1 b/core/man/start-cli/start-cli-package-host-address-domain-private.1
new file mode 100644
index 000000000..823896bdb
--- /dev/null
+++ b/core/man/start-cli/start-cli-package-host-address-domain-private.1
@@ -0,0 +1,19 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-package-host-address-domain-private 1  "private " 
+.SH NAME
+start\-cli\-package\-host\-address\-domain\-private
+.SH SYNOPSIS
+\fBstart\-cli package host address domain private\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIsubcommands\fR>
+.SH DESCRIPTION
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.SH SUBCOMMANDS
+.TP
+start\-cli\-package\-host\-address\-domain\-private\-add(1)
+Add a private domain to this host
+.TP
+start\-cli\-package\-host\-address\-domain\-private\-remove(1)
+Remove private domain from host
diff --git a/core/man/start-cli/start-cli-package-host-address-domain-public-add.1 b/core/man/start-cli/start-cli-package-host-address-domain-public-add.1
new file mode 100644
index 000000000..b30b1e6da
--- /dev/null
+++ b/core/man/start-cli/start-cli-package-host-address-domain-public-add.1
@@ -0,0 +1,25 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-package-host-address-domain-public-add 1  "add " 
+.SH NAME
+start\-cli\-package\-host\-address\-domain\-public\-add \- Add a public domain to this host
+.SH SYNOPSIS
+\fBstart\-cli package host address domain public add\fR [\fB\-\-acme\fR] [\fB\-h\fR|\fB\-\-help\fR] <\fIFQDN\fR> <\fIGATEWAY\fR> <\fIINTERNAL_PORT\fR> 
+.SH DESCRIPTION
+Add a public domain to this host
+.SH OPTIONS
+.TP
+\fB\-\-acme\fR \fI<ACME>\fR
+ACME provider identifier or url
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIFQDN\fR>
+Fully qualified domain name
+.TP
+<\fIGATEWAY\fR>
+Gateway identifier
+.TP
+<\fIINTERNAL_PORT\fR>
+Internal port number
diff --git a/core/man/start-cli/start-cli-package-host-address-domain-public-remove.1 b/core/man/start-cli/start-cli-package-host-address-domain-public-remove.1
new file mode 100644
index 000000000..3c99dd2dc
--- /dev/null
+++ b/core/man/start-cli/start-cli-package-host-address-domain-public-remove.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-package-host-address-domain-public-remove 1  "remove " 
+.SH NAME
+start\-cli\-package\-host\-address\-domain\-public\-remove \- Remove public domain from host
+.SH SYNOPSIS
+\fBstart\-cli package host address domain public remove\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIFQDN\fR> 
+.SH DESCRIPTION
+Remove public domain from host
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIFQDN\fR>
+Fully qualified domain name
diff --git a/core/man/start-cli/start-cli-package-host-address-domain-public.1 b/core/man/start-cli/start-cli-package-host-address-domain-public.1
new file mode 100644
index 000000000..096c50bb8
--- /dev/null
+++ b/core/man/start-cli/start-cli-package-host-address-domain-public.1
@@ -0,0 +1,19 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-package-host-address-domain-public 1  "public " 
+.SH NAME
+start\-cli\-package\-host\-address\-domain\-public
+.SH SYNOPSIS
+\fBstart\-cli package host address domain public\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIsubcommands\fR>
+.SH DESCRIPTION
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.SH SUBCOMMANDS
+.TP
+start\-cli\-package\-host\-address\-domain\-public\-add(1)
+Add a public domain to this host
+.TP
+start\-cli\-package\-host\-address\-domain\-public\-remove(1)
+Remove public domain from host
diff --git a/core/man/start-cli/start-cli-package-host-address-domain.1 b/core/man/start-cli/start-cli-package-host-address-domain.1
new file mode 100644
index 000000000..e80a1a407
--- /dev/null
+++ b/core/man/start-cli/start-cli-package-host-address-domain.1
@@ -0,0 +1,17 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-package-host-address-domain 1  "domain " 
+.SH NAME
+start\-cli\-package\-host\-address\-domain
+.SH SYNOPSIS
+\fBstart\-cli package host address domain\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIsubcommands\fR>
+.SH DESCRIPTION
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.SH SUBCOMMANDS
+.TP
+start\-cli\-package\-host\-address\-domain\-private(1)
+.TP
+start\-cli\-package\-host\-address\-domain\-public(1)
diff --git a/core/man/start-cli/start-cli-package-host-address-list.1 b/core/man/start-cli/start-cli-package-host-address-list.1
new file mode 100644
index 000000000..c28cd6a47
--- /dev/null
+++ b/core/man/start-cli/start-cli-package-host-address-list.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-package-host-address-list 1  "list " 
+.SH NAME
+start\-cli\-package\-host\-address\-list \- List addresses for a host
+.SH SYNOPSIS
+\fBstart\-cli package host address list\fR [\fB\-\-format\fR] [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+List addresses for a host
+.SH OPTIONS
+.TP
+\fB\-\-format\fR
+
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-cli/start-cli-package-host-address.1 b/core/man/start-cli/start-cli-package-host-address.1
new file mode 100644
index 000000000..3c9709fe1
--- /dev/null
+++ b/core/man/start-cli/start-cli-package-host-address.1
@@ -0,0 +1,21 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-package-host-address 1  "address " 
+.SH NAME
+start\-cli\-package\-host\-address
+.SH SYNOPSIS
+\fBstart\-cli package host address\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIHOST\fR> <\fIsubcommands\fR>
+.SH DESCRIPTION
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIHOST\fR>
+Host identifier
+.SH SUBCOMMANDS
+.TP
+start\-cli\-package\-host\-address\-domain(1)
+.TP
+start\-cli\-package\-host\-address\-list(1)
+List addresses for a host
diff --git a/core/man/start-cli/start-cli-package-host-binding-list.1 b/core/man/start-cli/start-cli-package-host-binding-list.1
new file mode 100644
index 000000000..e26168089
--- /dev/null
+++ b/core/man/start-cli/start-cli-package-host-binding-list.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-package-host-binding-list 1  "list " 
+.SH NAME
+start\-cli\-package\-host\-binding\-list \- List bindings for a host
+.SH SYNOPSIS
+\fBstart\-cli package host binding list\fR [\fB\-\-format\fR] [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+List bindings for a host
+.SH OPTIONS
+.TP
+\fB\-\-format\fR
+
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-cli/start-cli-package-host-binding-set-address-enabled.1 b/core/man/start-cli/start-cli-package-host-binding-set-address-enabled.1
new file mode 100644
index 000000000..b0cd6bb41
--- /dev/null
+++ b/core/man/start-cli/start-cli-package-host-binding-set-address-enabled.1
@@ -0,0 +1,32 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-package-host-binding-set-address-enabled 1  "set-address-enabled " 
+.SH NAME
+start\-cli\-package\-host\-binding\-set\-address\-enabled \- about.set\-address\-enabled\-for\-binding
+.SH SYNOPSIS
+\fBstart\-cli package host binding set\-address\-enabled\fR <\fB\-\-address\fR> [\fB\-\-enabled\fR] [\fB\-h\fR|\fB\-\-help\fR] <\fIINTERNAL_PORT\fR> 
+.SH DESCRIPTION
+about.set\-address\-enabled\-for\-binding
+.SH OPTIONS
+.TP
+\fB\-\-address\fR \fI<ADDRESS>\fR
+help.arg.address
+.TP
+\fB\-\-enabled\fR \fI<ENABLED>\fR
+Enable or disable this binding
+.br
+
+.br
+\fIPossible values:\fR
+.RS 14
+.IP \(bu 2
+true
+.IP \(bu 2
+false
+.RE
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIINTERNAL_PORT\fR>
+Internal port number
diff --git a/core/man/start-cli/start-cli-package-host-binding.1 b/core/man/start-cli/start-cli-package-host-binding.1
new file mode 100644
index 000000000..ebdf88882
--- /dev/null
+++ b/core/man/start-cli/start-cli-package-host-binding.1
@@ -0,0 +1,22 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-package-host-binding 1  "binding " 
+.SH NAME
+start\-cli\-package\-host\-binding
+.SH SYNOPSIS
+\fBstart\-cli package host binding\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIHOST\fR> <\fIsubcommands\fR>
+.SH DESCRIPTION
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIHOST\fR>
+Host identifier
+.SH SUBCOMMANDS
+.TP
+start\-cli\-package\-host\-binding\-list(1)
+List bindings for a host
+.TP
+start\-cli\-package\-host\-binding\-set\-address\-enabled(1)
+about.set\-address\-enabled\-for\-binding
diff --git a/core/man/start-cli/start-cli-package-host.1 b/core/man/start-cli/start-cli-package-host.1
new file mode 100644
index 000000000..eb980510b
--- /dev/null
+++ b/core/man/start-cli/start-cli-package-host.1
@@ -0,0 +1,21 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-package-host 1  "host " 
+.SH NAME
+start\-cli\-package\-host \- Manage network hosts for a package
+.SH SYNOPSIS
+\fBstart\-cli package host\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIPACKAGE\fR> <\fIsubcommands\fR>
+.SH DESCRIPTION
+Manage network hosts for a package
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIPACKAGE\fR>
+Package identifier
+.SH SUBCOMMANDS
+.TP
+start\-cli\-package\-host\-address(1)
+.TP
+start\-cli\-package\-host\-binding(1)
diff --git a/core/man/start-cli/start-cli-package-install.1 b/core/man/start-cli/start-cli-package-install.1
new file mode 100644
index 000000000..023cd77f7
--- /dev/null
+++ b/core/man/start-cli/start-cli-package-install.1
@@ -0,0 +1,22 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-package-install 1  "install " 
+.SH NAME
+start\-cli\-package\-install \- Install a package
+.SH SYNOPSIS
+\fBstart\-cli package install\fR [\fB\-s\fR|\fB\-\-sideload\fR] [\fB\-h\fR|\fB\-\-help\fR] [\fIID\fR] [\fIVERSION\fR] 
+.SH DESCRIPTION
+Install a package
+.SH OPTIONS
+.TP
+\fB\-s\fR, \fB\-\-sideload\fR
+
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+[\fIID\fR]
+Package identifier
+.TP
+[\fIVERSION\fR]
+Version range constraint
diff --git a/core/man/start-cli/start-cli-package-installed-version.1 b/core/man/start-cli/start-cli-package-installed-version.1
new file mode 100644
index 000000000..43cfadcbd
--- /dev/null
+++ b/core/man/start-cli/start-cli-package-installed-version.1
@@ -0,0 +1,19 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-package-installed-version 1  "installed-version " 
+.SH NAME
+start\-cli\-package\-installed\-version \- Display the installed version of a package
+.SH SYNOPSIS
+\fBstart\-cli package installed\-version\fR [\fB\-\-format\fR] [\fB\-h\fR|\fB\-\-help\fR] <\fIID\fR> 
+.SH DESCRIPTION
+Display the installed version of a package
+.SH OPTIONS
+.TP
+\fB\-\-format\fR
+
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIID\fR>
+Package identifier
diff --git a/core/man/start-cli/start-cli-package-list.1 b/core/man/start-cli/start-cli-package-list.1
new file mode 100644
index 000000000..279047672
--- /dev/null
+++ b/core/man/start-cli/start-cli-package-list.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-package-list 1  "list " 
+.SH NAME
+start\-cli\-package\-list \- List installed packages
+.SH SYNOPSIS
+\fBstart\-cli package list\fR [\fB\-\-format\fR] [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+List installed packages
+.SH OPTIONS
+.TP
+\fB\-\-format\fR
+
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-cli/start-cli-package-logs.1 b/core/man/start-cli/start-cli-package-logs.1
new file mode 100644
index 000000000..dd6fb5571
--- /dev/null
+++ b/core/man/start-cli/start-cli-package-logs.1
@@ -0,0 +1,31 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-package-logs 1  "logs " 
+.SH NAME
+start\-cli\-package\-logs \- Display logs for a package
+.SH SYNOPSIS
+\fBstart\-cli package logs\fR [\fB\-l\fR|\fB\-\-limit\fR] [\fB\-c\fR|\fB\-\-cursor\fR] [\fB\-b\fR|\fB\-\-boot\fR] [\fB\-B\fR|\fB\-\-before\fR] [\fB\-f\fR|\fB\-\-follow\fR] [\fB\-h\fR|\fB\-\-help\fR] <\fIID\fR> 
+.SH DESCRIPTION
+Display logs for a package
+.SH OPTIONS
+.TP
+\fB\-l\fR, \fB\-\-limit\fR \fI<LIMIT>\fR
+Maximum number of log entries
+.TP
+\fB\-c\fR, \fB\-\-cursor\fR \fI<CURSOR>\fR
+Start from this cursor position
+.TP
+\fB\-b\fR, \fB\-\-boot\fR \fI<BOOT>\fR
+Filter logs by boot ID
+.TP
+\fB\-B\fR, \fB\-\-before\fR
+Show logs before the cursor position
+.TP
+\fB\-f\fR, \fB\-\-follow\fR
+Follow log output in real\-time
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIID\fR>
+Package identifier
diff --git a/core/man/start-cli/start-cli-package-rebuild.1 b/core/man/start-cli/start-cli-package-rebuild.1
new file mode 100644
index 000000000..c7b26ce9d
--- /dev/null
+++ b/core/man/start-cli/start-cli-package-rebuild.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-package-rebuild 1  "rebuild " 
+.SH NAME
+start\-cli\-package\-rebuild \- Rebuild service container
+.SH SYNOPSIS
+\fBstart\-cli package rebuild\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIID\fR> 
+.SH DESCRIPTION
+Rebuild service container
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIID\fR>
+Package identifier
diff --git a/core/man/start-cli/start-cli-package-restart.1 b/core/man/start-cli/start-cli-package-restart.1
new file mode 100644
index 000000000..7582f726f
--- /dev/null
+++ b/core/man/start-cli/start-cli-package-restart.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-package-restart 1  "restart " 
+.SH NAME
+start\-cli\-package\-restart \- Restart a service
+.SH SYNOPSIS
+\fBstart\-cli package restart\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIID\fR> 
+.SH DESCRIPTION
+Restart a service
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIID\fR>
+Package identifier
diff --git a/core/man/start-cli/start-cli-package-set-outbound-gateway.1 b/core/man/start-cli/start-cli-package-set-outbound-gateway.1
new file mode 100644
index 000000000..57c4b7b31
--- /dev/null
+++ b/core/man/start-cli/start-cli-package-set-outbound-gateway.1
@@ -0,0 +1,19 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-package-set-outbound-gateway 1  "set-outbound-gateway " 
+.SH NAME
+start\-cli\-package\-set\-outbound\-gateway \- about.set\-outbound\-gateway\-package
+.SH SYNOPSIS
+\fBstart\-cli package set\-outbound\-gateway\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIPACKAGE\fR> [\fIGATEWAY\fR] 
+.SH DESCRIPTION
+about.set\-outbound\-gateway\-package
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIPACKAGE\fR>
+Package identifier
+.TP
+[\fIGATEWAY\fR]
+Gateway identifier
diff --git a/core/man/start-cli/start-cli-package-start.1 b/core/man/start-cli/start-cli-package-start.1
new file mode 100644
index 000000000..0fbddfdb5
--- /dev/null
+++ b/core/man/start-cli/start-cli-package-start.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-package-start 1  "start " 
+.SH NAME
+start\-cli\-package\-start \- Start a service
+.SH SYNOPSIS
+\fBstart\-cli package start\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIID\fR> 
+.SH DESCRIPTION
+Start a service
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIID\fR>
+Package identifier
diff --git a/core/man/start-cli/start-cli-package-stats.1 b/core/man/start-cli/start-cli-package-stats.1
new file mode 100644
index 000000000..9e55fe888
--- /dev/null
+++ b/core/man/start-cli/start-cli-package-stats.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-package-stats 1  "stats " 
+.SH NAME
+start\-cli\-package\-stats \- List LXC container information
+.SH SYNOPSIS
+\fBstart\-cli package stats\fR [\fB\-\-format\fR] [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+List LXC container information
+.SH OPTIONS
+.TP
+\fB\-\-format\fR
+
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-cli/start-cli-package-stop.1 b/core/man/start-cli/start-cli-package-stop.1
new file mode 100644
index 000000000..087541683
--- /dev/null
+++ b/core/man/start-cli/start-cli-package-stop.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-package-stop 1  "stop " 
+.SH NAME
+start\-cli\-package\-stop \- Stop a service
+.SH SYNOPSIS
+\fBstart\-cli package stop\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIID\fR> 
+.SH DESCRIPTION
+Stop a service
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIID\fR>
+Package identifier
diff --git a/core/man/start-cli/start-cli-package-uninstall.1 b/core/man/start-cli/start-cli-package-uninstall.1
new file mode 100644
index 000000000..2a1e69c13
--- /dev/null
+++ b/core/man/start-cli/start-cli-package-uninstall.1
@@ -0,0 +1,22 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-package-uninstall 1  "uninstall " 
+.SH NAME
+start\-cli\-package\-uninstall \- Remove a package
+.SH SYNOPSIS
+\fBstart\-cli package uninstall\fR [\fB\-\-soft\fR] [\fB\-\-force\fR] [\fB\-h\fR|\fB\-\-help\fR] <\fIID\fR> 
+.SH DESCRIPTION
+Remove a package
+.SH OPTIONS
+.TP
+\fB\-\-soft\fR
+Uninstall without deleting service data
+.TP
+\fB\-\-force\fR
+Ignore errors in service uninit script
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIID\fR>
+Package identifier
diff --git a/core/man/start-cli/start-cli-package.1 b/core/man/start-cli/start-cli-package.1
new file mode 100644
index 000000000..894fa0b37
--- /dev/null
+++ b/core/man/start-cli/start-cli-package.1
@@ -0,0 +1,61 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-package 1  "package " 
+.SH NAME
+start\-cli\-package \- Commands related to packages
+.SH SYNOPSIS
+\fBstart\-cli package\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIsubcommands\fR>
+.SH DESCRIPTION
+Commands related to packages
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.SH SUBCOMMANDS
+.TP
+start\-cli\-package\-action(1)
+Commands to get action input or run an action
+.TP
+start\-cli\-package\-attach(1)
+.TP
+start\-cli\-package\-backup(1)
+Commands for restoring package(s) from backup
+.TP
+start\-cli\-package\-cancel\-install(1)
+Cancel an install of a package
+.TP
+start\-cli\-package\-host(1)
+Manage network hosts for a package
+.TP
+start\-cli\-package\-install(1)
+Install a package
+.TP
+start\-cli\-package\-installed\-version(1)
+Display the installed version of a package
+.TP
+start\-cli\-package\-list(1)
+List installed packages
+.TP
+start\-cli\-package\-logs(1)
+Display logs for a package
+.TP
+start\-cli\-package\-rebuild(1)
+Rebuild service container
+.TP
+start\-cli\-package\-restart(1)
+Restart a service
+.TP
+start\-cli\-package\-set\-outbound\-gateway(1)
+about.set\-outbound\-gateway\-package
+.TP
+start\-cli\-package\-start(1)
+Start a service
+.TP
+start\-cli\-package\-stats(1)
+List LXC container information
+.TP
+start\-cli\-package\-stop(1)
+Stop a service
+.TP
+start\-cli\-package\-uninstall(1)
+Remove a package
diff --git a/core/man/start-cli/start-cli-pubkey.1 b/core/man/start-cli/start-cli-pubkey.1
new file mode 100644
index 000000000..5de15da8e
--- /dev/null
+++ b/core/man/start-cli/start-cli-pubkey.1
@@ -0,0 +1,13 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-pubkey 1  "pubkey " 
+.SH NAME
+start\-cli\-pubkey \- Get the developer public key
+.SH SYNOPSIS
+\fBstart\-cli pubkey\fR [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+Get the developer public key
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-cli/start-cli-registry-admin-add.1 b/core/man/start-cli/start-cli-registry-admin-add.1
new file mode 100644
index 000000000..b96f8e407
--- /dev/null
+++ b/core/man/start-cli/start-cli-registry-admin-add.1
@@ -0,0 +1,19 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-registry-admin-add 1  "add " 
+.SH NAME
+start\-cli\-registry\-admin\-add \- Add admin signer
+.SH SYNOPSIS
+\fBstart\-cli registry admin add\fR [\fB\-h\fR|\fB\-\-help\fR] <\fISIGNER\fR> [\fIDATABASE\fR] 
+.SH DESCRIPTION
+Add admin signer
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fISIGNER\fR>
+Signer identifier
+.TP
+[\fIDATABASE\fR]
+Path to the database file
diff --git a/core/man/start-cli/start-cli-registry-admin-list.1 b/core/man/start-cli/start-cli-registry-admin-list.1
new file mode 100644
index 000000000..5a1433140
--- /dev/null
+++ b/core/man/start-cli/start-cli-registry-admin-list.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-registry-admin-list 1  "list " 
+.SH NAME
+start\-cli\-registry\-admin\-list \- List admin signers
+.SH SYNOPSIS
+\fBstart\-cli registry admin list\fR [\fB\-\-format\fR] [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+List admin signers
+.SH OPTIONS
+.TP
+\fB\-\-format\fR
+
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-cli/start-cli-registry-admin-remove.1 b/core/man/start-cli/start-cli-registry-admin-remove.1
new file mode 100644
index 000000000..7028f9b36
--- /dev/null
+++ b/core/man/start-cli/start-cli-registry-admin-remove.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-registry-admin-remove 1  "remove " 
+.SH NAME
+start\-cli\-registry\-admin\-remove \- Remove admin signer
+.SH SYNOPSIS
+\fBstart\-cli registry admin remove\fR [\fB\-h\fR|\fB\-\-help\fR] <\fISIGNER\fR> 
+.SH DESCRIPTION
+Remove admin signer
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fISIGNER\fR>
+Signer identifier
diff --git a/core/man/start-cli/start-cli-registry-admin-signer-add.1 b/core/man/start-cli/start-cli-registry-admin-signer-add.1
new file mode 100644
index 000000000..201c97103
--- /dev/null
+++ b/core/man/start-cli/start-cli-registry-admin-signer-add.1
@@ -0,0 +1,25 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-registry-admin-signer-add 1  "add " 
+.SH NAME
+start\-cli\-registry\-admin\-signer\-add \- Add signer
+.SH SYNOPSIS
+\fBstart\-cli registry admin signer add\fR <\fB\-n\fR|\fB\-\-name\fR> [\fB\-c\fR|\fB\-\-contact\fR] [\fB\-\-key\fR] [\fB\-h\fR|\fB\-\-help\fR] [\fIDATABASE\fR] 
+.SH DESCRIPTION
+Add signer
+.SH OPTIONS
+.TP
+\fB\-n\fR, \fB\-\-name\fR \fI<NAME>\fR
+Name of the signer
+.TP
+\fB\-c\fR, \fB\-\-contact\fR \fI<CONTACT>\fR
+Contact information for signer
+.TP
+\fB\-\-key\fR \fI<KEYS>\fR
+Public key for signer
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+[\fIDATABASE\fR]
+Path to the database file
diff --git a/core/man/start-cli/start-cli-registry-admin-signer-edit.1 b/core/man/start-cli/start-cli-registry-admin-signer-edit.1
new file mode 100644
index 000000000..2d0a3f6e9
--- /dev/null
+++ b/core/man/start-cli/start-cli-registry-admin-signer-edit.1
@@ -0,0 +1,31 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-registry-admin-signer-edit 1  "edit " 
+.SH NAME
+start\-cli\-registry\-admin\-signer\-edit \- Edit signer information
+.SH SYNOPSIS
+\fBstart\-cli registry admin signer edit\fR [\fB\-n\fR|\fB\-\-set\-name\fR] [\fB\-c\fR|\fB\-\-add\-contact\fR] [\fB\-k\fR|\fB\-\-add\-key\fR] [\fB\-C\fR|\fB\-\-remove\-contact\fR] [\fB\-K\fR|\fB\-\-remove\-key\fR] [\fB\-h\fR|\fB\-\-help\fR] <\fIID\fR> 
+.SH DESCRIPTION
+Edit signer information
+.SH OPTIONS
+.TP
+\fB\-n\fR, \fB\-\-set\-name\fR \fI<SET_NAME>\fR
+Set the signer name
+.TP
+\fB\-c\fR, \fB\-\-add\-contact\fR \fI<ADD_CONTACT>\fR
+Add contact information to signer
+.TP
+\fB\-k\fR, \fB\-\-add\-key\fR \fI<ADD_KEY>\fR
+Add a public key to signer
+.TP
+\fB\-C\fR, \fB\-\-remove\-contact\fR \fI<REMOVE_CONTACT>\fR
+Remove contact from signer
+.TP
+\fB\-K\fR, \fB\-\-remove\-key\fR \fI<REMOVE_KEY>\fR
+Remove public key from signer
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIID\fR>
+Signer identifier
diff --git a/core/man/start-cli/start-cli-registry-admin-signer-list.1 b/core/man/start-cli/start-cli-registry-admin-signer-list.1
new file mode 100644
index 000000000..b87068031
--- /dev/null
+++ b/core/man/start-cli/start-cli-registry-admin-signer-list.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-registry-admin-signer-list 1  "list " 
+.SH NAME
+start\-cli\-registry\-admin\-signer\-list \- List signers
+.SH SYNOPSIS
+\fBstart\-cli registry admin signer list\fR [\fB\-\-format\fR] [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+List signers
+.SH OPTIONS
+.TP
+\fB\-\-format\fR
+
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-cli/start-cli-registry-admin-signer.1 b/core/man/start-cli/start-cli-registry-admin-signer.1
new file mode 100644
index 000000000..ad360c9d4
--- /dev/null
+++ b/core/man/start-cli/start-cli-registry-admin-signer.1
@@ -0,0 +1,23 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-registry-admin-signer 1  "signer " 
+.SH NAME
+start\-cli\-registry\-admin\-signer \- Commands to add or list signers
+.SH SYNOPSIS
+\fBstart\-cli registry admin signer\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIsubcommands\fR>
+.SH DESCRIPTION
+Commands to add or list signers
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.SH SUBCOMMANDS
+.TP
+start\-cli\-registry\-admin\-signer\-add(1)
+Add signer
+.TP
+start\-cli\-registry\-admin\-signer\-edit(1)
+Edit signer information
+.TP
+start\-cli\-registry\-admin\-signer\-list(1)
+List signers
diff --git a/core/man/start-cli/start-cli-registry-admin.1 b/core/man/start-cli/start-cli-registry-admin.1
new file mode 100644
index 000000000..472313bc3
--- /dev/null
+++ b/core/man/start-cli/start-cli-registry-admin.1
@@ -0,0 +1,26 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-registry-admin 1  "admin " 
+.SH NAME
+start\-cli\-registry\-admin \- Commands to add or list admins or signers
+.SH SYNOPSIS
+\fBstart\-cli registry admin\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIsubcommands\fR>
+.SH DESCRIPTION
+Commands to add or list admins or signers
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.SH SUBCOMMANDS
+.TP
+start\-cli\-registry\-admin\-add(1)
+Add admin signer
+.TP
+start\-cli\-registry\-admin\-list(1)
+List admin signers
+.TP
+start\-cli\-registry\-admin\-remove(1)
+Remove admin signer
+.TP
+start\-cli\-registry\-admin\-signer(1)
+Commands to add or list signers
diff --git a/core/man/start-cli/start-cli-registry-db-apply.1 b/core/man/start-cli/start-cli-registry-db-apply.1
new file mode 100644
index 000000000..9d2536595
--- /dev/null
+++ b/core/man/start-cli/start-cli-registry-db-apply.1
@@ -0,0 +1,19 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-registry-db-apply 1  "apply " 
+.SH NAME
+start\-cli\-registry\-db\-apply \- Update a database record
+.SH SYNOPSIS
+\fBstart\-cli registry db apply\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIEXPR\fR> [\fIPATH\fR] 
+.SH DESCRIPTION
+Update a database record
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIEXPR\fR>
+Database patch expression to apply
+.TP
+[\fIPATH\fR]
+Path to the database file
diff --git a/core/man/start-cli/start-cli-registry-db-dump.1 b/core/man/start-cli/start-cli-registry-db-dump.1
new file mode 100644
index 000000000..8c1e11666
--- /dev/null
+++ b/core/man/start-cli/start-cli-registry-db-dump.1
@@ -0,0 +1,22 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-registry-db-dump 1  "dump " 
+.SH NAME
+start\-cli\-registry\-db\-dump \- Filter and query the database
+.SH SYNOPSIS
+\fBstart\-cli registry db dump\fR [\fB\-p\fR|\fB\-\-pointer\fR] [\fB\-\-format\fR] [\fB\-h\fR|\fB\-\-help\fR] [\fIPATH\fR] 
+.SH DESCRIPTION
+Filter and query the database
+.SH OPTIONS
+.TP
+\fB\-p\fR, \fB\-\-pointer\fR \fI<POINTER>\fR
+JSON pointer to object in database to dump
+.TP
+\fB\-\-format\fR
+
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+[\fIPATH\fR]
+Path to the database file
diff --git a/core/man/start-cli/start-cli-registry-db.1 b/core/man/start-cli/start-cli-registry-db.1
new file mode 100644
index 000000000..c0d4e0a2a
--- /dev/null
+++ b/core/man/start-cli/start-cli-registry-db.1
@@ -0,0 +1,20 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-registry-db 1  "db " 
+.SH NAME
+start\-cli\-registry\-db \- Commands to interact with the db i.e. dump and apply
+.SH SYNOPSIS
+\fBstart\-cli registry db\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIsubcommands\fR>
+.SH DESCRIPTION
+Commands to interact with the db i.e. dump and apply
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.SH SUBCOMMANDS
+.TP
+start\-cli\-registry\-db\-apply(1)
+Update a database record
+.TP
+start\-cli\-registry\-db\-dump(1)
+Filter and query the database
diff --git a/core/man/start-cli/start-cli-registry-index.1 b/core/man/start-cli/start-cli-registry-index.1
new file mode 100644
index 000000000..497750d4b
--- /dev/null
+++ b/core/man/start-cli/start-cli-registry-index.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-registry-index 1  "index " 
+.SH NAME
+start\-cli\-registry\-index \- List registry info and packages
+.SH SYNOPSIS
+\fBstart\-cli registry index\fR [\fB\-\-format\fR] [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+List registry info and packages
+.SH OPTIONS
+.TP
+\fB\-\-format\fR
+
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-cli/start-cli-registry-info-set-icon.1 b/core/man/start-cli/start-cli-registry-info-set-icon.1
new file mode 100644
index 000000000..2cb688f5f
--- /dev/null
+++ b/core/man/start-cli/start-cli-registry-info-set-icon.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-registry-info-set-icon 1  "set-icon " 
+.SH NAME
+start\-cli\-registry\-info\-set\-icon \- Set the registry icon
+.SH SYNOPSIS
+\fBstart\-cli registry info set\-icon\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIICON\fR> 
+.SH DESCRIPTION
+Set the registry icon
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIICON\fR>
+Path to service icon file
diff --git a/core/man/start-cli/start-cli-registry-info-set-name.1 b/core/man/start-cli/start-cli-registry-info-set-name.1
new file mode 100644
index 000000000..cc01d360f
--- /dev/null
+++ b/core/man/start-cli/start-cli-registry-info-set-name.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-registry-info-set-name 1  "set-name " 
+.SH NAME
+start\-cli\-registry\-info\-set\-name \- Set the registry name
+.SH SYNOPSIS
+\fBstart\-cli registry info set\-name\fR [\fB\-h\fR|\fB\-\-help\fR] <\fINAME\fR> 
+.SH DESCRIPTION
+Set the registry name
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fINAME\fR>
+Name of the registry
diff --git a/core/man/start-cli/start-cli-registry-info.1 b/core/man/start-cli/start-cli-registry-info.1
new file mode 100644
index 000000000..8556dbd3b
--- /dev/null
+++ b/core/man/start-cli/start-cli-registry-info.1
@@ -0,0 +1,23 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-registry-info 1  "info " 
+.SH NAME
+start\-cli\-registry\-info \- Display registry info
+.SH SYNOPSIS
+\fBstart\-cli registry info\fR [\fB\-\-format\fR] [\fB\-h\fR|\fB\-\-help\fR] [\fIsubcommands\fR]
+.SH DESCRIPTION
+Display registry info
+.SH OPTIONS
+.TP
+\fB\-\-format\fR
+
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.SH SUBCOMMANDS
+.TP
+start\-cli\-registry\-info\-set\-icon(1)
+Set the registry icon
+.TP
+start\-cli\-registry\-info\-set\-name(1)
+Set the registry name
diff --git a/core/man/start-cli/start-cli-registry-os-asset-add.1 b/core/man/start-cli/start-cli-registry-os-asset-add.1
new file mode 100644
index 000000000..34d484abc
--- /dev/null
+++ b/core/man/start-cli/start-cli-registry-os-asset-add.1
@@ -0,0 +1,25 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-registry-os-asset-add 1  "add " 
+.SH NAME
+start\-cli\-registry\-os\-asset\-add \- Add asset to registry
+.SH SYNOPSIS
+\fBstart\-cli registry os asset add\fR <\fB\-p\fR|\fB\-\-platform\fR> <\fB\-v\fR|\fB\-\-version\fR> [\fB\-h\fR|\fB\-\-help\fR] <\fIFILE\fR> <\fIURL\fR> 
+.SH DESCRIPTION
+Add asset to registry
+.SH OPTIONS
+.TP
+\fB\-p\fR, \fB\-\-platform\fR \fI<PLATFORM>\fR
+Target platform identifier
+.TP
+\fB\-v\fR, \fB\-\-version\fR \fI<VERSION>\fR
+StartOS version number
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIFILE\fR>
+Path to the asset file
+.TP
+<\fIURL\fR>
+URL of the asset
diff --git a/core/man/start-cli/start-cli-registry-os-asset-get-img.1 b/core/man/start-cli/start-cli-registry-os-asset-get-img.1
new file mode 100644
index 000000000..d69e2f0e0
--- /dev/null
+++ b/core/man/start-cli/start-cli-registry-os-asset-get-img.1
@@ -0,0 +1,25 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-registry-os-asset-get-img 1  "img " 
+.SH NAME
+start\-cli\-registry\-os\-asset\-get\-img \- Download IMG file
+.SH SYNOPSIS
+\fBstart\-cli registry os asset get img\fR [\fB\-d\fR|\fB\-\-download\fR] [\fB\-r\fR|\fB\-\-reverify\fR] [\fB\-h\fR|\fB\-\-help\fR] <\fIVERSION\fR> <\fIPLATFORM\fR> 
+.SH DESCRIPTION
+Download IMG file
+.SH OPTIONS
+.TP
+\fB\-d\fR, \fB\-\-download\fR \fI<DOWNLOAD>\fR
+Directory path to download to
+.TP
+\fB\-r\fR, \fB\-\-reverify\fR
+Verify hash after download completes
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIVERSION\fR>
+StartOS version number
+.TP
+<\fIPLATFORM\fR>
+Target platform identifier
diff --git a/core/man/start-cli/start-cli-registry-os-asset-get-iso.1 b/core/man/start-cli/start-cli-registry-os-asset-get-iso.1
new file mode 100644
index 000000000..f71128e47
--- /dev/null
+++ b/core/man/start-cli/start-cli-registry-os-asset-get-iso.1
@@ -0,0 +1,25 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-registry-os-asset-get-iso 1  "iso " 
+.SH NAME
+start\-cli\-registry\-os\-asset\-get\-iso \- Download ISO file
+.SH SYNOPSIS
+\fBstart\-cli registry os asset get iso\fR [\fB\-d\fR|\fB\-\-download\fR] [\fB\-r\fR|\fB\-\-reverify\fR] [\fB\-h\fR|\fB\-\-help\fR] <\fIVERSION\fR> <\fIPLATFORM\fR> 
+.SH DESCRIPTION
+Download ISO file
+.SH OPTIONS
+.TP
+\fB\-d\fR, \fB\-\-download\fR \fI<DOWNLOAD>\fR
+Directory path to download to
+.TP
+\fB\-r\fR, \fB\-\-reverify\fR
+Verify hash after download completes
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIVERSION\fR>
+StartOS version number
+.TP
+<\fIPLATFORM\fR>
+Target platform identifier
diff --git a/core/man/start-cli/start-cli-registry-os-asset-get-squashfs.1 b/core/man/start-cli/start-cli-registry-os-asset-get-squashfs.1
new file mode 100644
index 000000000..80a4aefdd
--- /dev/null
+++ b/core/man/start-cli/start-cli-registry-os-asset-get-squashfs.1
@@ -0,0 +1,25 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-registry-os-asset-get-squashfs 1  "squashfs " 
+.SH NAME
+start\-cli\-registry\-os\-asset\-get\-squashfs \- Download squashfs file
+.SH SYNOPSIS
+\fBstart\-cli registry os asset get squashfs\fR [\fB\-d\fR|\fB\-\-download\fR] [\fB\-r\fR|\fB\-\-reverify\fR] [\fB\-h\fR|\fB\-\-help\fR] <\fIVERSION\fR> <\fIPLATFORM\fR> 
+.SH DESCRIPTION
+Download squashfs file
+.SH OPTIONS
+.TP
+\fB\-d\fR, \fB\-\-download\fR \fI<DOWNLOAD>\fR
+Directory path to download to
+.TP
+\fB\-r\fR, \fB\-\-reverify\fR
+Verify hash after download completes
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIVERSION\fR>
+StartOS version number
+.TP
+<\fIPLATFORM\fR>
+Target platform identifier
diff --git a/core/man/start-cli/start-cli-registry-os-asset-get.1 b/core/man/start-cli/start-cli-registry-os-asset-get.1
new file mode 100644
index 000000000..4e7a4c611
--- /dev/null
+++ b/core/man/start-cli/start-cli-registry-os-asset-get.1
@@ -0,0 +1,23 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-registry-os-asset-get 1  "get " 
+.SH NAME
+start\-cli\-registry\-os\-asset\-get \- Commands to download image, iso, or squashfs files
+.SH SYNOPSIS
+\fBstart\-cli registry os asset get\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIsubcommands\fR>
+.SH DESCRIPTION
+Commands to download image, iso, or squashfs files
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.SH SUBCOMMANDS
+.TP
+start\-cli\-registry\-os\-asset\-get\-img(1)
+Download IMG file
+.TP
+start\-cli\-registry\-os\-asset\-get\-iso(1)
+Download ISO file
+.TP
+start\-cli\-registry\-os\-asset\-get\-squashfs(1)
+Download squashfs file
diff --git a/core/man/start-cli/start-cli-registry-os-asset-remove.1 b/core/man/start-cli/start-cli-registry-os-asset-remove.1
new file mode 100644
index 000000000..f1bf2aacb
--- /dev/null
+++ b/core/man/start-cli/start-cli-registry-os-asset-remove.1
@@ -0,0 +1,12 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-registry-os-asset-remove 1  "remove " 
+.SH NAME
+start\-cli\-registry\-os\-asset\-remove
+.SH SYNOPSIS
+\fBstart\-cli registry os asset remove\fR [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-cli/start-cli-registry-os-asset-sign.1 b/core/man/start-cli/start-cli-registry-os-asset-sign.1
new file mode 100644
index 000000000..1316e1f05
--- /dev/null
+++ b/core/man/start-cli/start-cli-registry-os-asset-sign.1
@@ -0,0 +1,22 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-registry-os-asset-sign 1  "sign " 
+.SH NAME
+start\-cli\-registry\-os\-asset\-sign \- Sign file and add to registry
+.SH SYNOPSIS
+\fBstart\-cli registry os asset sign\fR <\fB\-p\fR|\fB\-\-platform\fR> <\fB\-v\fR|\fB\-\-version\fR> [\fB\-h\fR|\fB\-\-help\fR] <\fIFILE\fR> 
+.SH DESCRIPTION
+Sign file and add to registry
+.SH OPTIONS
+.TP
+\fB\-p\fR, \fB\-\-platform\fR \fI<PLATFORM>\fR
+Target platform identifier
+.TP
+\fB\-v\fR, \fB\-\-version\fR \fI<VERSION>\fR
+StartOS version number
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIFILE\fR>
+Path to the asset file
diff --git a/core/man/start-cli/start-cli-registry-os-asset.1 b/core/man/start-cli/start-cli-registry-os-asset.1
new file mode 100644
index 000000000..95f6ae704
--- /dev/null
+++ b/core/man/start-cli/start-cli-registry-os-asset.1
@@ -0,0 +1,25 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-registry-os-asset 1  "asset " 
+.SH NAME
+start\-cli\-registry\-os\-asset \- Commands to add, sign, or get registry assets
+.SH SYNOPSIS
+\fBstart\-cli registry os asset\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIsubcommands\fR>
+.SH DESCRIPTION
+Commands to add, sign, or get registry assets
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.SH SUBCOMMANDS
+.TP
+start\-cli\-registry\-os\-asset\-add(1)
+Add asset to registry
+.TP
+start\-cli\-registry\-os\-asset\-get(1)
+Commands to download image, iso, or squashfs files
+.TP
+start\-cli\-registry\-os\-asset\-remove(1)
+.TP
+start\-cli\-registry\-os\-asset\-sign(1)
+Sign file and add to registry
diff --git a/core/man/start-cli/start-cli-registry-os-index.1 b/core/man/start-cli/start-cli-registry-os-index.1
new file mode 100644
index 000000000..8ec4f1859
--- /dev/null
+++ b/core/man/start-cli/start-cli-registry-os-index.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-registry-os-index 1  "index " 
+.SH NAME
+start\-cli\-registry\-os\-index \- List OS versions index
+.SH SYNOPSIS
+\fBstart\-cli registry os index\fR [\fB\-\-format\fR] [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+List OS versions index
+.SH OPTIONS
+.TP
+\fB\-\-format\fR
+
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-cli/start-cli-registry-os-version-add.1 b/core/man/start-cli/start-cli-registry-os-version-add.1
new file mode 100644
index 000000000..d2a3f7974
--- /dev/null
+++ b/core/man/start-cli/start-cli-registry-os-version-add.1
@@ -0,0 +1,25 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-registry-os-version-add 1  "add " 
+.SH NAME
+start\-cli\-registry\-os\-version\-add \- Add OS version
+.SH SYNOPSIS
+\fBstart\-cli registry os version add\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIVERSION\fR> <\fIHEADLINE\fR> <\fIRELEASE_NOTES\fR> <\fISOURCE_VERSION\fR> 
+.SH DESCRIPTION
+Add OS version
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIVERSION\fR>
+StartOS version number
+.TP
+<\fIHEADLINE\fR>
+Short headline for the version
+.TP
+<\fIRELEASE_NOTES\fR>
+Release notes for this version
+.TP
+<\fISOURCE_VERSION\fR>
+Source version range for migration
diff --git a/core/man/start-cli/start-cli-registry-os-version-get.1 b/core/man/start-cli/start-cli-registry-os-version-get.1
new file mode 100644
index 000000000..4a411b055
--- /dev/null
+++ b/core/man/start-cli/start-cli-registry-os-version-get.1
@@ -0,0 +1,28 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-registry-os-version-get 1  "get " 
+.SH NAME
+start\-cli\-registry\-os\-version\-get \- Get OS versions info
+.SH SYNOPSIS
+\fBstart\-cli registry os version get\fR [\fB\-\-src\fR] [\fB\-\-target\-version\fR] [\fB\-\-id\fR] [\fB\-\-platform\fR] [\fB\-\-format\fR] [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+Get OS versions info
+.SH OPTIONS
+.TP
+\fB\-\-src\fR \fI<SOURCE_VERSION>\fR
+Source version to upgrade from
+.TP
+\fB\-\-target\-version\fR \fI<TARGET_VERSION>\fR
+Target version range constraint
+.TP
+\fB\-\-id\fR \fI<SERVER_ID>\fR
+Unique server identifier
+.TP
+\fB\-\-platform\fR \fI<PLATFORM>\fR
+Target platform identifier
+.TP
+\fB\-\-format\fR
+
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-cli/start-cli-registry-os-version-remove.1 b/core/man/start-cli/start-cli-registry-os-version-remove.1
new file mode 100644
index 000000000..bec6b7af1
--- /dev/null
+++ b/core/man/start-cli/start-cli-registry-os-version-remove.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-registry-os-version-remove 1  "remove " 
+.SH NAME
+start\-cli\-registry\-os\-version\-remove \- Remove OS version
+.SH SYNOPSIS
+\fBstart\-cli registry os version remove\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIVERSION\fR> 
+.SH DESCRIPTION
+Remove OS version
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIVERSION\fR>
+StartOS version number
diff --git a/core/man/start-cli/start-cli-registry-os-version-signer-add.1 b/core/man/start-cli/start-cli-registry-os-version-signer-add.1
new file mode 100644
index 000000000..38baa3e36
--- /dev/null
+++ b/core/man/start-cli/start-cli-registry-os-version-signer-add.1
@@ -0,0 +1,19 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-registry-os-version-signer-add 1  "add " 
+.SH NAME
+start\-cli\-registry\-os\-version\-signer\-add \- Add version signer
+.SH SYNOPSIS
+\fBstart\-cli registry os version signer add\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIVERSION\fR> <\fISIGNER\fR> 
+.SH DESCRIPTION
+Add version signer
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIVERSION\fR>
+
+.TP
+<\fISIGNER\fR>
+
diff --git a/core/man/start-cli/start-cli-registry-os-version-signer-list.1 b/core/man/start-cli/start-cli-registry-os-version-signer-list.1
new file mode 100644
index 000000000..3f18d1d69
--- /dev/null
+++ b/core/man/start-cli/start-cli-registry-os-version-signer-list.1
@@ -0,0 +1,19 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-registry-os-version-signer-list 1  "list " 
+.SH NAME
+start\-cli\-registry\-os\-version\-signer\-list \- List version signers
+.SH SYNOPSIS
+\fBstart\-cli registry os version signer list\fR [\fB\-\-format\fR] [\fB\-h\fR|\fB\-\-help\fR] <\fIVERSION\fR> 
+.SH DESCRIPTION
+List version signers
+.SH OPTIONS
+.TP
+\fB\-\-format\fR
+
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIVERSION\fR>
+
diff --git a/core/man/start-cli/start-cli-registry-os-version-signer-remove.1 b/core/man/start-cli/start-cli-registry-os-version-signer-remove.1
new file mode 100644
index 000000000..2a650ff39
--- /dev/null
+++ b/core/man/start-cli/start-cli-registry-os-version-signer-remove.1
@@ -0,0 +1,19 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-registry-os-version-signer-remove 1  "remove " 
+.SH NAME
+start\-cli\-registry\-os\-version\-signer\-remove \- Remove version signer
+.SH SYNOPSIS
+\fBstart\-cli registry os version signer remove\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIVERSION\fR> <\fISIGNER\fR> 
+.SH DESCRIPTION
+Remove version signer
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIVERSION\fR>
+
+.TP
+<\fISIGNER\fR>
+
diff --git a/core/man/start-cli/start-cli-registry-os-version-signer.1 b/core/man/start-cli/start-cli-registry-os-version-signer.1
new file mode 100644
index 000000000..764c97c94
--- /dev/null
+++ b/core/man/start-cli/start-cli-registry-os-version-signer.1
@@ -0,0 +1,23 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-registry-os-version-signer 1  "signer " 
+.SH NAME
+start\-cli\-registry\-os\-version\-signer \- Add, remove, and list version signers
+.SH SYNOPSIS
+\fBstart\-cli registry os version signer\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIsubcommands\fR>
+.SH DESCRIPTION
+Add, remove, and list version signers
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.SH SUBCOMMANDS
+.TP
+start\-cli\-registry\-os\-version\-signer\-add(1)
+Add version signer
+.TP
+start\-cli\-registry\-os\-version\-signer\-list(1)
+List version signers
+.TP
+start\-cli\-registry\-os\-version\-signer\-remove(1)
+Remove version signer
diff --git a/core/man/start-cli/start-cli-registry-os-version.1 b/core/man/start-cli/start-cli-registry-os-version.1
new file mode 100644
index 000000000..b205e9db0
--- /dev/null
+++ b/core/man/start-cli/start-cli-registry-os-version.1
@@ -0,0 +1,26 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-registry-os-version 1  "version " 
+.SH NAME
+start\-cli\-registry\-os\-version \- Commands to add, remove, or list versions or version signers
+.SH SYNOPSIS
+\fBstart\-cli registry os version\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIsubcommands\fR>
+.SH DESCRIPTION
+Commands to add, remove, or list versions or version signers
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.SH SUBCOMMANDS
+.TP
+start\-cli\-registry\-os\-version\-add(1)
+Add OS version
+.TP
+start\-cli\-registry\-os\-version\-get(1)
+Get OS versions info
+.TP
+start\-cli\-registry\-os\-version\-remove(1)
+Remove OS version
+.TP
+start\-cli\-registry\-os\-version\-signer(1)
+Add, remove, and list version signers
diff --git a/core/man/start-cli/start-cli-registry-os.1 b/core/man/start-cli/start-cli-registry-os.1
new file mode 100644
index 000000000..1a60e9915
--- /dev/null
+++ b/core/man/start-cli/start-cli-registry-os.1
@@ -0,0 +1,23 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-registry-os 1  "os " 
+.SH NAME
+start\-cli\-registry\-os \- Commands related to OS assets and versions
+.SH SYNOPSIS
+\fBstart\-cli registry os\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIsubcommands\fR>
+.SH DESCRIPTION
+Commands related to OS assets and versions
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.SH SUBCOMMANDS
+.TP
+start\-cli\-registry\-os\-asset(1)
+Commands to add, sign, or get registry assets
+.TP
+start\-cli\-registry\-os\-index(1)
+List OS versions index
+.TP
+start\-cli\-registry\-os\-version(1)
+Commands to add, remove, or list versions or version signers
diff --git a/core/man/start-cli/start-cli-registry-package-add-mirror.1 b/core/man/start-cli/start-cli-registry-package-add-mirror.1
new file mode 100644
index 000000000..56bb6d474
--- /dev/null
+++ b/core/man/start-cli/start-cli-registry-package-add-mirror.1
@@ -0,0 +1,22 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-registry-package-add-mirror 1  "add-mirror " 
+.SH NAME
+start\-cli\-registry\-package\-add\-mirror \- Add a mirror for an s9pk
+.SH SYNOPSIS
+\fBstart\-cli registry package add\-mirror\fR [\fB\-\-no\-verify\fR] [\fB\-h\fR|\fB\-\-help\fR] <\fIFILE\fR> <\fIURL\fR> 
+.SH DESCRIPTION
+Add a mirror for an s9pk
+.SH OPTIONS
+.TP
+\fB\-\-no\-verify\fR
+Skip signature verification
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIFILE\fR>
+Path to s9pk package file
+.TP
+<\fIURL\fR>
+URL of the mirror
diff --git a/core/man/start-cli/start-cli-registry-package-add.1 b/core/man/start-cli/start-cli-registry-package-add.1
new file mode 100644
index 000000000..b2f7f2538
--- /dev/null
+++ b/core/man/start-cli/start-cli-registry-package-add.1
@@ -0,0 +1,22 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-registry-package-add 1  "add " 
+.SH NAME
+start\-cli\-registry\-package\-add \- Add package to registry index
+.SH SYNOPSIS
+\fBstart\-cli registry package add\fR [\fB\-\-url\fR] [\fB\-\-no\-verify\fR] [\fB\-h\fR|\fB\-\-help\fR] <\fIFILE\fR> 
+.SH DESCRIPTION
+Add package to registry index
+.SH OPTIONS
+.TP
+\fB\-\-url\fR \fI<URL>\fR
+URL of the package
+.TP
+\fB\-\-no\-verify\fR
+Skip signature verification
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIFILE\fR>
+Path to s9pk package file
diff --git a/core/man/start-cli/start-cli-registry-package-category-add-package.1 b/core/man/start-cli/start-cli-registry-package-category-add-package.1
new file mode 100644
index 000000000..4d28f3d2f
--- /dev/null
+++ b/core/man/start-cli/start-cli-registry-package-category-add-package.1
@@ -0,0 +1,19 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-registry-package-category-add-package 1  "add-package " 
+.SH NAME
+start\-cli\-registry\-package\-category\-add\-package \- Add a package to a category
+.SH SYNOPSIS
+\fBstart\-cli registry package category add\-package\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIID\fR> <\fIPACKAGE\fR> 
+.SH DESCRIPTION
+Add a package to a category
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIID\fR>
+
+.TP
+<\fIPACKAGE\fR>
+
diff --git a/core/man/start-cli/start-cli-registry-package-category-add.1 b/core/man/start-cli/start-cli-registry-package-category-add.1
new file mode 100644
index 000000000..f50e87972
--- /dev/null
+++ b/core/man/start-cli/start-cli-registry-package-category-add.1
@@ -0,0 +1,19 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-registry-package-category-add 1  "add " 
+.SH NAME
+start\-cli\-registry\-package\-category\-add \- Add a category to the registry
+.SH SYNOPSIS
+\fBstart\-cli registry package category add\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIID\fR> <\fINAME\fR> 
+.SH DESCRIPTION
+Add a category to the registry
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIID\fR>
+
+.TP
+<\fINAME\fR>
+
diff --git a/core/man/start-cli/start-cli-registry-package-category-list.1 b/core/man/start-cli/start-cli-registry-package-category-list.1
new file mode 100644
index 000000000..2e53a90b4
--- /dev/null
+++ b/core/man/start-cli/start-cli-registry-package-category-list.1
@@ -0,0 +1,15 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-registry-package-category-list 1  "list " 
+.SH NAME
+start\-cli\-registry\-package\-category\-list
+.SH SYNOPSIS
+\fBstart\-cli registry package category list\fR [\fB\-\-format\fR] [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+.SH OPTIONS
+.TP
+\fB\-\-format\fR
+
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-cli/start-cli-registry-package-category-remove-package.1 b/core/man/start-cli/start-cli-registry-package-category-remove-package.1
new file mode 100644
index 000000000..31bb9e272
--- /dev/null
+++ b/core/man/start-cli/start-cli-registry-package-category-remove-package.1
@@ -0,0 +1,19 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-registry-package-category-remove-package 1  "remove-package " 
+.SH NAME
+start\-cli\-registry\-package\-category\-remove\-package \- Remove package from category
+.SH SYNOPSIS
+\fBstart\-cli registry package category remove\-package\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIID\fR> <\fIPACKAGE\fR> 
+.SH DESCRIPTION
+Remove package from category
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIID\fR>
+
+.TP
+<\fIPACKAGE\fR>
+
diff --git a/core/man/start-cli/start-cli-registry-package-category-remove.1 b/core/man/start-cli/start-cli-registry-package-category-remove.1
new file mode 100644
index 000000000..ee83ef7c2
--- /dev/null
+++ b/core/man/start-cli/start-cli-registry-package-category-remove.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-registry-package-category-remove 1  "remove " 
+.SH NAME
+start\-cli\-registry\-package\-category\-remove \- Remove category from registry
+.SH SYNOPSIS
+\fBstart\-cli registry package category remove\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIID\fR> 
+.SH DESCRIPTION
+Remove category from registry
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIID\fR>
+
diff --git a/core/man/start-cli/start-cli-registry-package-category.1 b/core/man/start-cli/start-cli-registry-package-category.1
new file mode 100644
index 000000000..f4304c19b
--- /dev/null
+++ b/core/man/start-cli/start-cli-registry-package-category.1
@@ -0,0 +1,28 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-registry-package-category 1  "category " 
+.SH NAME
+start\-cli\-registry\-package\-category \- Update categories in registry
+.SH SYNOPSIS
+\fBstart\-cli registry package category\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIsubcommands\fR>
+.SH DESCRIPTION
+Update categories in registry
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.SH SUBCOMMANDS
+.TP
+start\-cli\-registry\-package\-category\-add(1)
+Add a category to the registry
+.TP
+start\-cli\-registry\-package\-category\-add\-package(1)
+Add a package to a category
+.TP
+start\-cli\-registry\-package\-category\-list(1)
+.TP
+start\-cli\-registry\-package\-category\-remove(1)
+Remove category from registry
+.TP
+start\-cli\-registry\-package\-category\-remove\-package(1)
+Remove package from category
diff --git a/core/man/start-cli/start-cli-registry-package-download.1 b/core/man/start-cli/start-cli-registry-package-download.1
new file mode 100644
index 000000000..a229b85ad
--- /dev/null
+++ b/core/man/start-cli/start-cli-registry-package-download.1
@@ -0,0 +1,22 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-registry-package-download 1  "download " 
+.SH NAME
+start\-cli\-registry\-package\-download \- Download s9pk package
+.SH SYNOPSIS
+\fBstart\-cli registry package download\fR [\fB\-v\fR|\fB\-\-target\-version\fR] [\fB\-d\fR|\fB\-\-dest\fR] [\fB\-h\fR|\fB\-\-help\fR] <\fIID\fR> 
+.SH DESCRIPTION
+Download s9pk package
+.SH OPTIONS
+.TP
+\fB\-v\fR, \fB\-\-target\-version\fR \fI<TARGET_VERSION>\fR
+Target version range constraint
+.TP
+\fB\-d\fR, \fB\-\-dest\fR \fI<DEST>\fR
+Destination path for download
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIID\fR>
+Package identifier
diff --git a/core/man/start-cli/start-cli-registry-package-get.1 b/core/man/start-cli/start-cli-registry-package-get.1
new file mode 100644
index 000000000..fa176e313
--- /dev/null
+++ b/core/man/start-cli/start-cli-registry-package-get.1
@@ -0,0 +1,40 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-registry-package-get 1  "get " 
+.SH NAME
+start\-cli\-registry\-package\-get \- List installation candidates
+.SH SYNOPSIS
+\fBstart\-cli registry package get\fR [\fB\-v\fR|\fB\-\-target\-version\fR] [\fB\-\-source\-version\fR] [\fB\-\-format\fR] [\fB\-h\fR|\fB\-\-help\fR] [\fIID\fR] [\fIOTHER_VERSIONS\fR] 
+.SH DESCRIPTION
+List installation candidates
+.SH OPTIONS
+.TP
+\fB\-v\fR, \fB\-\-target\-version\fR \fI<TARGET_VERSION>\fR
+Target version range constraint
+.TP
+\fB\-\-source\-version\fR \fI<SOURCE_VERSION>\fR
+Source version to upgrade from
+.TP
+\fB\-\-format\fR
+
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+[\fIID\fR]
+Package identifier
+.TP
+[\fIOTHER_VERSIONS\fR] [default: none]
+Detail level for other versions
+.br
+
+.br
+\fIPossible values:\fR
+.RS 14
+.IP \(bu 2
+none
+.IP \(bu 2
+short
+.IP \(bu 2
+full
+.RE
diff --git a/core/man/start-cli/start-cli-registry-package-index.1 b/core/man/start-cli/start-cli-registry-package-index.1
new file mode 100644
index 000000000..309ba1437
--- /dev/null
+++ b/core/man/start-cli/start-cli-registry-package-index.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-registry-package-index 1  "index " 
+.SH NAME
+start\-cli\-registry\-package\-index \- List packages and categories
+.SH SYNOPSIS
+\fBstart\-cli registry package index\fR [\fB\-\-format\fR] [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+List packages and categories
+.SH OPTIONS
+.TP
+\fB\-\-format\fR
+
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-cli/start-cli-registry-package-remove-mirror.1 b/core/man/start-cli/start-cli-registry-package-remove-mirror.1
new file mode 100644
index 000000000..fcfd1b949
--- /dev/null
+++ b/core/man/start-cli/start-cli-registry-package-remove-mirror.1
@@ -0,0 +1,22 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-registry-package-remove-mirror 1  "remove-mirror " 
+.SH NAME
+start\-cli\-registry\-package\-remove\-mirror \- Remove mirror package
+.SH SYNOPSIS
+\fBstart\-cli registry package remove\-mirror\fR <\fB\-\-url\fR> [\fB\-h\fR|\fB\-\-help\fR] <\fIID\fR> <\fIVERSION\fR> 
+.SH DESCRIPTION
+Remove mirror package
+.SH OPTIONS
+.TP
+\fB\-\-url\fR \fI<URL>\fR
+URL of the mirror
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIID\fR>
+Package identifier
+.TP
+<\fIVERSION\fR>
+Package version
diff --git a/core/man/start-cli/start-cli-registry-package-remove.1 b/core/man/start-cli/start-cli-registry-package-remove.1
new file mode 100644
index 000000000..ca3412740
--- /dev/null
+++ b/core/man/start-cli/start-cli-registry-package-remove.1
@@ -0,0 +1,22 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-registry-package-remove 1  "remove " 
+.SH NAME
+start\-cli\-registry\-package\-remove \- Remove package from registry
+.SH SYNOPSIS
+\fBstart\-cli registry package remove\fR [\fB\-\-sighash\fR] [\fB\-h\fR|\fB\-\-help\fR] <\fIID\fR> <\fIVERSION\fR> 
+.SH DESCRIPTION
+Remove package from registry
+.SH OPTIONS
+.TP
+\fB\-\-sighash\fR \fI<SIGHASH>\fR
+Hash for signature verification
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIID\fR>
+Package identifier
+.TP
+<\fIVERSION\fR>
+Package version
diff --git a/core/man/start-cli/start-cli-registry-package-signer-add.1 b/core/man/start-cli/start-cli-registry-package-signer-add.1
new file mode 100644
index 000000000..99757c6b1
--- /dev/null
+++ b/core/man/start-cli/start-cli-registry-package-signer-add.1
@@ -0,0 +1,25 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-registry-package-signer-add 1  "add " 
+.SH NAME
+start\-cli\-registry\-package\-signer\-add \- Add package signer
+.SH SYNOPSIS
+\fBstart\-cli registry package signer add\fR [\fB\-\-versions\fR] [\fB\-\-merge\fR] [\fB\-h\fR|\fB\-\-help\fR] <\fIID\fR> <\fISIGNER\fR> 
+.SH DESCRIPTION
+Add package signer
+.SH OPTIONS
+.TP
+\fB\-\-versions\fR \fI<VERSIONS>\fR
+Version range constraint
+.TP
+\fB\-\-merge\fR
+Merge with existing version range instead of replacing
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIID\fR>
+Package identifier
+.TP
+<\fISIGNER\fR>
+Signer identifier
diff --git a/core/man/start-cli/start-cli-registry-package-signer-list.1 b/core/man/start-cli/start-cli-registry-package-signer-list.1
new file mode 100644
index 000000000..c27a61ba2
--- /dev/null
+++ b/core/man/start-cli/start-cli-registry-package-signer-list.1
@@ -0,0 +1,19 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-registry-package-signer-list 1  "list " 
+.SH NAME
+start\-cli\-registry\-package\-signer\-list \- List package signers
+.SH SYNOPSIS
+\fBstart\-cli registry package signer list\fR [\fB\-\-format\fR] [\fB\-h\fR|\fB\-\-help\fR] <\fIID\fR> 
+.SH DESCRIPTION
+List package signers
+.SH OPTIONS
+.TP
+\fB\-\-format\fR
+
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIID\fR>
+Package identifier
diff --git a/core/man/start-cli/start-cli-registry-package-signer-remove.1 b/core/man/start-cli/start-cli-registry-package-signer-remove.1
new file mode 100644
index 000000000..ccb973964
--- /dev/null
+++ b/core/man/start-cli/start-cli-registry-package-signer-remove.1
@@ -0,0 +1,19 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-registry-package-signer-remove 1  "remove " 
+.SH NAME
+start\-cli\-registry\-package\-signer\-remove \- Remove package signer
+.SH SYNOPSIS
+\fBstart\-cli registry package signer remove\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIID\fR> <\fISIGNER\fR> 
+.SH DESCRIPTION
+Remove package signer
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIID\fR>
+Package identifier
+.TP
+<\fISIGNER\fR>
+Signer identifier
diff --git a/core/man/start-cli/start-cli-registry-package-signer.1 b/core/man/start-cli/start-cli-registry-package-signer.1
new file mode 100644
index 000000000..f98bf213e
--- /dev/null
+++ b/core/man/start-cli/start-cli-registry-package-signer.1
@@ -0,0 +1,23 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-registry-package-signer 1  "signer " 
+.SH NAME
+start\-cli\-registry\-package\-signer \- Add, remove, and list package signers
+.SH SYNOPSIS
+\fBstart\-cli registry package signer\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIsubcommands\fR>
+.SH DESCRIPTION
+Add, remove, and list package signers
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.SH SUBCOMMANDS
+.TP
+start\-cli\-registry\-package\-signer\-add(1)
+Add package signer
+.TP
+start\-cli\-registry\-package\-signer\-list(1)
+List package signers
+.TP
+start\-cli\-registry\-package\-signer\-remove(1)
+Remove package signer
diff --git a/core/man/start-cli/start-cli-registry-package.1 b/core/man/start-cli/start-cli-registry-package.1
new file mode 100644
index 000000000..6f8192643
--- /dev/null
+++ b/core/man/start-cli/start-cli-registry-package.1
@@ -0,0 +1,41 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-registry-package 1  "package " 
+.SH NAME
+start\-cli\-registry\-package \- Commands to index, add, or get packages
+.SH SYNOPSIS
+\fBstart\-cli registry package\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIsubcommands\fR>
+.SH DESCRIPTION
+Commands to index, add, or get packages
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.SH SUBCOMMANDS
+.TP
+start\-cli\-registry\-package\-add(1)
+Add package to registry index
+.TP
+start\-cli\-registry\-package\-add\-mirror(1)
+Add a mirror for an s9pk
+.TP
+start\-cli\-registry\-package\-category(1)
+Update categories in registry
+.TP
+start\-cli\-registry\-package\-download(1)
+Download s9pk package
+.TP
+start\-cli\-registry\-package\-get(1)
+List installation candidates
+.TP
+start\-cli\-registry\-package\-index(1)
+List packages and categories
+.TP
+start\-cli\-registry\-package\-remove(1)
+Remove package from registry
+.TP
+start\-cli\-registry\-package\-remove\-mirror(1)
+Remove mirror package
+.TP
+start\-cli\-registry\-package\-signer(1)
+Add, remove, and list package signers
diff --git a/core/man/start-cli/start-cli-registry.1 b/core/man/start-cli/start-cli-registry.1
new file mode 100644
index 000000000..62952a830
--- /dev/null
+++ b/core/man/start-cli/start-cli-registry.1
@@ -0,0 +1,32 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-registry 1  "registry " 
+.SH NAME
+start\-cli\-registry \- Commands related to the registry
+.SH SYNOPSIS
+\fBstart\-cli registry\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIsubcommands\fR>
+.SH DESCRIPTION
+Commands related to the registry
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.SH SUBCOMMANDS
+.TP
+start\-cli\-registry\-admin(1)
+Commands to add or list admins or signers
+.TP
+start\-cli\-registry\-db(1)
+Commands to interact with the db i.e. dump and apply
+.TP
+start\-cli\-registry\-index(1)
+List registry info and packages
+.TP
+start\-cli\-registry\-info(1)
+Display registry info
+.TP
+start\-cli\-registry\-os(1)
+Commands related to OS assets and versions
+.TP
+start\-cli\-registry\-package(1)
+Commands to index, add, or get packages
diff --git a/core/man/start-cli/start-cli-s9pk-convert.1 b/core/man/start-cli/start-cli-s9pk-convert.1
new file mode 100644
index 000000000..4fb35556b
--- /dev/null
+++ b/core/man/start-cli/start-cli-s9pk-convert.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-s9pk-convert 1  "convert " 
+.SH NAME
+start\-cli\-s9pk\-convert \- Convert an s9pk from v1 to v2
+.SH SYNOPSIS
+\fBstart\-cli s9pk convert\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIS9PK\fR> 
+.SH DESCRIPTION
+Convert an s9pk from v1 to v2
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIS9PK\fR>
+Path to s9pk package file
diff --git a/core/man/start-cli/start-cli-s9pk-edit-add-image.1 b/core/man/start-cli/start-cli-s9pk-edit-add-image.1
new file mode 100644
index 000000000..ea08b5084
--- /dev/null
+++ b/core/man/start-cli/start-cli-s9pk-edit-add-image.1
@@ -0,0 +1,37 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-s9pk-edit-add-image 1  "add-image " 
+.SH NAME
+start\-cli\-s9pk\-edit\-add\-image \- Add image to s9pk
+.SH SYNOPSIS
+\fBstart\-cli s9pk edit add\-image\fR [\fB\-\-docker\-build\fR] [\fB\-\-dockerfile\fR] [\fB\-\-workdir\fR] [\fB\-\-docker\-tag\fR] [\fB\-\-arch\fR] [\fB\-\-emulate\-missing\-as\fR] [\fB\-\-nvidia\-container\fR] [\fB\-h\fR|\fB\-\-help\fR] <\fIID\fR> 
+.SH DESCRIPTION
+Add image to s9pk
+.SH OPTIONS
+.TP
+\fB\-\-docker\-build\fR
+Build Docker image from Dockerfile
+.TP
+\fB\-\-dockerfile\fR \fI<DOCKERFILE>\fR
+Path to Dockerfile
+.TP
+\fB\-\-workdir\fR \fI<WORKDIR>\fR
+Working directory path
+.TP
+\fB\-\-docker\-tag\fR \fI<DOCKER_TAG>\fR
+Docker image tag to use
+.TP
+\fB\-\-arch\fR \fI<ARCH>\fR
+Filter by CPU architecture
+.TP
+\fB\-\-emulate\-missing\-as\fR \fI<EMULATE_MISSING_AS>\fR
+Emulate missing architecture using this one
+.TP
+\fB\-\-nvidia\-container\fR
+Enable NVIDIA container support
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIID\fR>
+Docker image identifier
diff --git a/core/man/start-cli/start-cli-s9pk-edit-manifest.1 b/core/man/start-cli/start-cli-s9pk-edit-manifest.1
new file mode 100644
index 000000000..b3146de51
--- /dev/null
+++ b/core/man/start-cli/start-cli-s9pk-edit-manifest.1
@@ -0,0 +1,19 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-s9pk-edit-manifest 1  "manifest " 
+.SH NAME
+start\-cli\-s9pk\-edit\-manifest \- Edit s9pk manifest
+.SH SYNOPSIS
+\fBstart\-cli s9pk edit manifest\fR [\fB\-\-format\fR] [\fB\-h\fR|\fB\-\-help\fR] <\fIEXPRESSION\fR> 
+.SH DESCRIPTION
+Edit s9pk manifest
+.SH OPTIONS
+.TP
+\fB\-\-format\fR
+
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIEXPRESSION\fR>
+Database patch expression to apply
diff --git a/core/man/start-cli/start-cli-s9pk-edit.1 b/core/man/start-cli/start-cli-s9pk-edit.1
new file mode 100644
index 000000000..fa66f3353
--- /dev/null
+++ b/core/man/start-cli/start-cli-s9pk-edit.1
@@ -0,0 +1,23 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-s9pk-edit 1  "edit " 
+.SH NAME
+start\-cli\-s9pk\-edit \- Commands to add an image to an s9pk or edit the manifest
+.SH SYNOPSIS
+\fBstart\-cli s9pk edit\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIS9PK\fR> <\fIsubcommands\fR>
+.SH DESCRIPTION
+Commands to add an image to an s9pk or edit the manifest
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIS9PK\fR>
+Path to s9pk package file
+.SH SUBCOMMANDS
+.TP
+start\-cli\-s9pk\-edit\-add\-image(1)
+Add image to s9pk
+.TP
+start\-cli\-s9pk\-edit\-manifest(1)
+Edit s9pk manifest
diff --git a/core/man/start-cli/start-cli-s9pk-inspect-cat.1 b/core/man/start-cli/start-cli-s9pk-inspect-cat.1
new file mode 100644
index 000000000..c41b83384
--- /dev/null
+++ b/core/man/start-cli/start-cli-s9pk-inspect-cat.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-s9pk-inspect-cat 1  "cat " 
+.SH NAME
+start\-cli\-s9pk\-inspect\-cat \- Display file contents from s9pk
+.SH SYNOPSIS
+\fBstart\-cli s9pk inspect cat\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIFILE_PATH\fR> 
+.SH DESCRIPTION
+Display file contents from s9pk
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIFILE_PATH\fR>
+Path to the file
diff --git a/core/man/start-cli/start-cli-s9pk-inspect-commitment.1 b/core/man/start-cli/start-cli-s9pk-inspect-commitment.1
new file mode 100644
index 000000000..15168091a
--- /dev/null
+++ b/core/man/start-cli/start-cli-s9pk-inspect-commitment.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-s9pk-inspect-commitment 1  "commitment " 
+.SH NAME
+start\-cli\-s9pk\-inspect\-commitment \- about.display\-s9pk\-root\-sighash\-and\-maxsize
+.SH SYNOPSIS
+\fBstart\-cli s9pk inspect commitment\fR [\fB\-\-format\fR] [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+about.display\-s9pk\-root\-sighash\-and\-maxsize
+.SH OPTIONS
+.TP
+\fB\-\-format\fR
+
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-cli/start-cli-s9pk-inspect-file-tree.1 b/core/man/start-cli/start-cli-s9pk-inspect-file-tree.1
new file mode 100644
index 000000000..17247bd49
--- /dev/null
+++ b/core/man/start-cli/start-cli-s9pk-inspect-file-tree.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-s9pk-inspect-file-tree 1  "file-tree " 
+.SH NAME
+start\-cli\-s9pk\-inspect\-file\-tree \- Display list of paths in s9pk
+.SH SYNOPSIS
+\fBstart\-cli s9pk inspect file\-tree\fR [\fB\-\-format\fR] [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+Display list of paths in s9pk
+.SH OPTIONS
+.TP
+\fB\-\-format\fR
+
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-cli/start-cli-s9pk-inspect-manifest.1 b/core/man/start-cli/start-cli-s9pk-inspect-manifest.1
new file mode 100644
index 000000000..19bac61fc
--- /dev/null
+++ b/core/man/start-cli/start-cli-s9pk-inspect-manifest.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-s9pk-inspect-manifest 1  "manifest " 
+.SH NAME
+start\-cli\-s9pk\-inspect\-manifest \- Display the s9pk manifest
+.SH SYNOPSIS
+\fBstart\-cli s9pk inspect manifest\fR [\fB\-\-format\fR] [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+Display the s9pk manifest
+.SH OPTIONS
+.TP
+\fB\-\-format\fR
+
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-cli/start-cli-s9pk-inspect.1 b/core/man/start-cli/start-cli-s9pk-inspect.1
new file mode 100644
index 000000000..ddd23c1f8
--- /dev/null
+++ b/core/man/start-cli/start-cli-s9pk-inspect.1
@@ -0,0 +1,29 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-s9pk-inspect 1  "inspect " 
+.SH NAME
+start\-cli\-s9pk\-inspect \- Commands to display file paths, file contents, or manifest
+.SH SYNOPSIS
+\fBstart\-cli s9pk inspect\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIS9PK\fR> <\fIsubcommands\fR>
+.SH DESCRIPTION
+Commands to display file paths, file contents, or manifest
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIS9PK\fR>
+Path to s9pk package file
+.SH SUBCOMMANDS
+.TP
+start\-cli\-s9pk\-inspect\-cat(1)
+Display file contents from s9pk
+.TP
+start\-cli\-s9pk\-inspect\-commitment(1)
+about.display\-s9pk\-root\-sighash\-and\-maxsize
+.TP
+start\-cli\-s9pk\-inspect\-file\-tree(1)
+Display list of paths in s9pk
+.TP
+start\-cli\-s9pk\-inspect\-manifest(1)
+Display the s9pk manifest
diff --git a/core/man/start-cli/start-cli-s9pk-list-ingredients.1 b/core/man/start-cli/start-cli-s9pk-list-ingredients.1
new file mode 100644
index 000000000..b2e6de92f
--- /dev/null
+++ b/core/man/start-cli/start-cli-s9pk-list-ingredients.1
@@ -0,0 +1,37 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-s9pk-list-ingredients 1  "list-ingredients " 
+.SH NAME
+start\-cli\-s9pk\-list\-ingredients \- List paths of package ingredients
+.SH SYNOPSIS
+\fBstart\-cli s9pk list\-ingredients\fR [\fB\-o\fR|\fB\-\-output\fR] [\fB\-\-javascript\fR] [\fB\-\-icon\fR] [\fB\-\-license\fR] [\fB\-\-assets\fR] [\fB\-\-no\-assets\fR] [\fB\-\-arch\fR] [\fB\-h\fR|\fB\-\-help\fR] [\fIPATH\fR] 
+.SH DESCRIPTION
+List paths of package ingredients
+.SH OPTIONS
+.TP
+\fB\-o\fR, \fB\-\-output\fR \fI<OUTPUT>\fR
+Output file path
+.TP
+\fB\-\-javascript\fR \fI<JAVASCRIPT>\fR
+Path to JavaScript file
+.TP
+\fB\-\-icon\fR \fI<ICON>\fR
+Path to service icon file
+.TP
+\fB\-\-license\fR \fI<LICENSE>\fR
+Path to license file
+.TP
+\fB\-\-assets\fR \fI<ASSETS>\fR
+Path to assets directory
+.TP
+\fB\-\-no\-assets\fR
+Build without assets directory
+.TP
+\fB\-\-arch\fR \fI<ARCH>\fR
+Filter by CPU architecture
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+[\fIPATH\fR]
+Path to input file or directory
diff --git a/core/man/start-cli/start-cli-s9pk-pack.1 b/core/man/start-cli/start-cli-s9pk-pack.1
new file mode 100644
index 000000000..c8d956a95
--- /dev/null
+++ b/core/man/start-cli/start-cli-s9pk-pack.1
@@ -0,0 +1,37 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-s9pk-pack 1  "pack " 
+.SH NAME
+start\-cli\-s9pk\-pack \- Package input files into a valid s9pk
+.SH SYNOPSIS
+\fBstart\-cli s9pk pack\fR [\fB\-o\fR|\fB\-\-output\fR] [\fB\-\-javascript\fR] [\fB\-\-icon\fR] [\fB\-\-license\fR] [\fB\-\-assets\fR] [\fB\-\-no\-assets\fR] [\fB\-\-arch\fR] [\fB\-h\fR|\fB\-\-help\fR] [\fIPATH\fR] 
+.SH DESCRIPTION
+Package input files into a valid s9pk
+.SH OPTIONS
+.TP
+\fB\-o\fR, \fB\-\-output\fR \fI<OUTPUT>\fR
+Output file path
+.TP
+\fB\-\-javascript\fR \fI<JAVASCRIPT>\fR
+Path to JavaScript file
+.TP
+\fB\-\-icon\fR \fI<ICON>\fR
+Path to service icon file
+.TP
+\fB\-\-license\fR \fI<LICENSE>\fR
+Path to license file
+.TP
+\fB\-\-assets\fR \fI<ASSETS>\fR
+Path to assets directory
+.TP
+\fB\-\-no\-assets\fR
+Build without assets directory
+.TP
+\fB\-\-arch\fR \fI<ARCH>\fR
+Filter by CPU architecture
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+[\fIPATH\fR]
+Path to input file or directory
diff --git a/core/man/start-cli/start-cli-s9pk-publish.1 b/core/man/start-cli/start-cli-s9pk-publish.1
new file mode 100644
index 000000000..bfdbde500
--- /dev/null
+++ b/core/man/start-cli/start-cli-s9pk-publish.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-s9pk-publish 1  "publish " 
+.SH NAME
+start\-cli\-s9pk\-publish \- Publish s9pk to S3 bucket and index on registry
+.SH SYNOPSIS
+\fBstart\-cli s9pk publish\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIS9PK\fR> 
+.SH DESCRIPTION
+Publish s9pk to S3 bucket and index on registry
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIS9PK\fR>
+Path to s9pk package file
diff --git a/core/man/start-cli/start-cli-s9pk-select.1 b/core/man/start-cli/start-cli-s9pk-select.1
new file mode 100644
index 000000000..95a88faea
--- /dev/null
+++ b/core/man/start-cli/start-cli-s9pk-select.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-s9pk-select 1  "select " 
+.SH NAME
+start\-cli\-s9pk\-select \- Select the best compatible s9pk for a target device
+.SH SYNOPSIS
+\fBstart\-cli s9pk select\fR [\fB\-h\fR|\fB\-\-help\fR] [\fIS9PKS\fR] 
+.SH DESCRIPTION
+Select the best compatible s9pk for a target device
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+[\fIS9PKS\fR]
+Paths to s9pk package files
diff --git a/core/man/start-cli/start-cli-s9pk.1 b/core/man/start-cli/start-cli-s9pk.1
new file mode 100644
index 000000000..6b182760d
--- /dev/null
+++ b/core/man/start-cli/start-cli-s9pk.1
@@ -0,0 +1,35 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-s9pk 1  "s9pk " 
+.SH NAME
+start\-cli\-s9pk \- Commands for interacting with s9pk files
+.SH SYNOPSIS
+\fBstart\-cli s9pk\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIsubcommands\fR>
+.SH DESCRIPTION
+Commands for interacting with s9pk files
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.SH SUBCOMMANDS
+.TP
+start\-cli\-s9pk\-convert(1)
+Convert an s9pk from v1 to v2
+.TP
+start\-cli\-s9pk\-edit(1)
+Commands to add an image to an s9pk or edit the manifest
+.TP
+start\-cli\-s9pk\-inspect(1)
+Commands to display file paths, file contents, or manifest
+.TP
+start\-cli\-s9pk\-list\-ingredients(1)
+List paths of package ingredients
+.TP
+start\-cli\-s9pk\-pack(1)
+Package input files into a valid s9pk
+.TP
+start\-cli\-s9pk\-publish(1)
+Publish s9pk to S3 bucket and index on registry
+.TP
+start\-cli\-s9pk\-select(1)
+Select the best compatible s9pk for a target device
diff --git a/core/man/start-cli/start-cli-server-clear-smtp.1 b/core/man/start-cli/start-cli-server-clear-smtp.1
new file mode 100644
index 000000000..d102ff66a
--- /dev/null
+++ b/core/man/start-cli/start-cli-server-clear-smtp.1
@@ -0,0 +1,13 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-server-clear-smtp 1  "clear-smtp " 
+.SH NAME
+start\-cli\-server\-clear\-smtp \- Remove system smtp server and credentials
+.SH SYNOPSIS
+\fBstart\-cli server clear\-smtp\fR [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+Remove system smtp server and credentials
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-cli/start-cli-server-device-info.1 b/core/man/start-cli/start-cli-server-device-info.1
new file mode 100644
index 000000000..9b5177106
--- /dev/null
+++ b/core/man/start-cli/start-cli-server-device-info.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-server-device-info 1  "device-info " 
+.SH NAME
+start\-cli\-server\-device\-info \- about.get\-device\-info
+.SH SYNOPSIS
+\fBstart\-cli server device\-info\fR [\fB\-\-format\fR] [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+about.get\-device\-info
+.SH OPTIONS
+.TP
+\fB\-\-format\fR
+
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-cli/start-cli-server-experimental-governor.1 b/core/man/start-cli/start-cli-server-experimental-governor.1
new file mode 100644
index 000000000..cf3743f9d
--- /dev/null
+++ b/core/man/start-cli/start-cli-server-experimental-governor.1
@@ -0,0 +1,19 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-server-experimental-governor 1  "governor " 
+.SH NAME
+start\-cli\-server\-experimental\-governor \- Show CPU governors
+.SH SYNOPSIS
+\fBstart\-cli server experimental governor\fR [\fB\-\-format\fR] [\fB\-h\fR|\fB\-\-help\fR] [\fISET\fR] 
+.SH DESCRIPTION
+Show CPU governors
+.SH OPTIONS
+.TP
+\fB\-\-format\fR
+
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+[\fISET\fR]
+CPU governor name
diff --git a/core/man/start-cli/start-cli-server-experimental-zram.1 b/core/man/start-cli/start-cli-server-experimental-zram.1
new file mode 100644
index 000000000..a3472ac88
--- /dev/null
+++ b/core/man/start-cli/start-cli-server-experimental-zram.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-server-experimental-zram 1  "zram " 
+.SH NAME
+start\-cli\-server\-experimental\-zram \- Enable ZRAM
+.SH SYNOPSIS
+\fBstart\-cli server experimental zram\fR [\fB\-\-enable\fR] [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+Enable ZRAM
+.SH OPTIONS
+.TP
+\fB\-\-enable\fR
+Enable zram
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-cli/start-cli-server-experimental.1 b/core/man/start-cli/start-cli-server-experimental.1
new file mode 100644
index 000000000..f9d023cf8
--- /dev/null
+++ b/core/man/start-cli/start-cli-server-experimental.1
@@ -0,0 +1,20 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-server-experimental 1  "experimental " 
+.SH NAME
+start\-cli\-server\-experimental \- Commands related to configuring experimental options such as zram and cpu governor
+.SH SYNOPSIS
+\fBstart\-cli server experimental\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIsubcommands\fR>
+.SH DESCRIPTION
+Commands related to configuring experimental options such as zram and cpu governor
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.SH SUBCOMMANDS
+.TP
+start\-cli\-server\-experimental\-governor(1)
+Show CPU governors
+.TP
+start\-cli\-server\-experimental\-zram(1)
+Enable ZRAM
diff --git a/core/man/start-cli/start-cli-server-host-address-domain-private-add.1 b/core/man/start-cli/start-cli-server-host-address-domain-private-add.1
new file mode 100644
index 000000000..296fa09ce
--- /dev/null
+++ b/core/man/start-cli/start-cli-server-host-address-domain-private-add.1
@@ -0,0 +1,19 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-server-host-address-domain-private-add 1  "add " 
+.SH NAME
+start\-cli\-server\-host\-address\-domain\-private\-add \- Add a private domain to this host
+.SH SYNOPSIS
+\fBstart\-cli server host address domain private add\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIFQDN\fR> <\fIGATEWAY\fR> 
+.SH DESCRIPTION
+Add a private domain to this host
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIFQDN\fR>
+Fully qualified domain name
+.TP
+<\fIGATEWAY\fR>
+
diff --git a/core/man/start-cli/start-cli-server-host-address-domain-private-remove.1 b/core/man/start-cli/start-cli-server-host-address-domain-private-remove.1
new file mode 100644
index 000000000..81e9ae57c
--- /dev/null
+++ b/core/man/start-cli/start-cli-server-host-address-domain-private-remove.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-server-host-address-domain-private-remove 1  "remove " 
+.SH NAME
+start\-cli\-server\-host\-address\-domain\-private\-remove \- Remove private domain from host
+.SH SYNOPSIS
+\fBstart\-cli server host address domain private remove\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIFQDN\fR> 
+.SH DESCRIPTION
+Remove private domain from host
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIFQDN\fR>
+Fully qualified domain name
diff --git a/core/man/start-cli/start-cli-server-host-address-domain-private.1 b/core/man/start-cli/start-cli-server-host-address-domain-private.1
new file mode 100644
index 000000000..dce763f63
--- /dev/null
+++ b/core/man/start-cli/start-cli-server-host-address-domain-private.1
@@ -0,0 +1,19 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-server-host-address-domain-private 1  "private " 
+.SH NAME
+start\-cli\-server\-host\-address\-domain\-private
+.SH SYNOPSIS
+\fBstart\-cli server host address domain private\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIsubcommands\fR>
+.SH DESCRIPTION
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.SH SUBCOMMANDS
+.TP
+start\-cli\-server\-host\-address\-domain\-private\-add(1)
+Add a private domain to this host
+.TP
+start\-cli\-server\-host\-address\-domain\-private\-remove(1)
+Remove private domain from host
diff --git a/core/man/start-cli/start-cli-server-host-address-domain-public-add.1 b/core/man/start-cli/start-cli-server-host-address-domain-public-add.1
new file mode 100644
index 000000000..5b31fd5b3
--- /dev/null
+++ b/core/man/start-cli/start-cli-server-host-address-domain-public-add.1
@@ -0,0 +1,25 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-server-host-address-domain-public-add 1  "add " 
+.SH NAME
+start\-cli\-server\-host\-address\-domain\-public\-add \- Add a public domain to this host
+.SH SYNOPSIS
+\fBstart\-cli server host address domain public add\fR [\fB\-\-acme\fR] [\fB\-h\fR|\fB\-\-help\fR] <\fIFQDN\fR> <\fIGATEWAY\fR> <\fIINTERNAL_PORT\fR> 
+.SH DESCRIPTION
+Add a public domain to this host
+.SH OPTIONS
+.TP
+\fB\-\-acme\fR \fI<ACME>\fR
+ACME provider identifier or url
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIFQDN\fR>
+Fully qualified domain name
+.TP
+<\fIGATEWAY\fR>
+Gateway identifier
+.TP
+<\fIINTERNAL_PORT\fR>
+Internal port number
diff --git a/core/man/start-cli/start-cli-server-host-address-domain-public-remove.1 b/core/man/start-cli/start-cli-server-host-address-domain-public-remove.1
new file mode 100644
index 000000000..d4e4541aa
--- /dev/null
+++ b/core/man/start-cli/start-cli-server-host-address-domain-public-remove.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-server-host-address-domain-public-remove 1  "remove " 
+.SH NAME
+start\-cli\-server\-host\-address\-domain\-public\-remove \- Remove public domain from host
+.SH SYNOPSIS
+\fBstart\-cli server host address domain public remove\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIFQDN\fR> 
+.SH DESCRIPTION
+Remove public domain from host
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIFQDN\fR>
+Fully qualified domain name
diff --git a/core/man/start-cli/start-cli-server-host-address-domain-public.1 b/core/man/start-cli/start-cli-server-host-address-domain-public.1
new file mode 100644
index 000000000..7a29e2d8a
--- /dev/null
+++ b/core/man/start-cli/start-cli-server-host-address-domain-public.1
@@ -0,0 +1,19 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-server-host-address-domain-public 1  "public " 
+.SH NAME
+start\-cli\-server\-host\-address\-domain\-public
+.SH SYNOPSIS
+\fBstart\-cli server host address domain public\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIsubcommands\fR>
+.SH DESCRIPTION
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.SH SUBCOMMANDS
+.TP
+start\-cli\-server\-host\-address\-domain\-public\-add(1)
+Add a public domain to this host
+.TP
+start\-cli\-server\-host\-address\-domain\-public\-remove(1)
+Remove public domain from host
diff --git a/core/man/start-cli/start-cli-server-host-address-domain.1 b/core/man/start-cli/start-cli-server-host-address-domain.1
new file mode 100644
index 000000000..278424d07
--- /dev/null
+++ b/core/man/start-cli/start-cli-server-host-address-domain.1
@@ -0,0 +1,17 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-server-host-address-domain 1  "domain " 
+.SH NAME
+start\-cli\-server\-host\-address\-domain
+.SH SYNOPSIS
+\fBstart\-cli server host address domain\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIsubcommands\fR>
+.SH DESCRIPTION
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.SH SUBCOMMANDS
+.TP
+start\-cli\-server\-host\-address\-domain\-private(1)
+.TP
+start\-cli\-server\-host\-address\-domain\-public(1)
diff --git a/core/man/start-cli/start-cli-server-host-address-list.1 b/core/man/start-cli/start-cli-server-host-address-list.1
new file mode 100644
index 000000000..5d156d809
--- /dev/null
+++ b/core/man/start-cli/start-cli-server-host-address-list.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-server-host-address-list 1  "list " 
+.SH NAME
+start\-cli\-server\-host\-address\-list \- List addresses for a host
+.SH SYNOPSIS
+\fBstart\-cli server host address list\fR [\fB\-\-format\fR] [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+List addresses for a host
+.SH OPTIONS
+.TP
+\fB\-\-format\fR
+
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-cli/start-cli-server-host-address.1 b/core/man/start-cli/start-cli-server-host-address.1
new file mode 100644
index 000000000..35f9a5dde
--- /dev/null
+++ b/core/man/start-cli/start-cli-server-host-address.1
@@ -0,0 +1,18 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-server-host-address 1  "address " 
+.SH NAME
+start\-cli\-server\-host\-address
+.SH SYNOPSIS
+\fBstart\-cli server host address\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIsubcommands\fR>
+.SH DESCRIPTION
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.SH SUBCOMMANDS
+.TP
+start\-cli\-server\-host\-address\-domain(1)
+.TP
+start\-cli\-server\-host\-address\-list(1)
+List addresses for a host
diff --git a/core/man/start-cli/start-cli-server-host-binding-list.1 b/core/man/start-cli/start-cli-server-host-binding-list.1
new file mode 100644
index 000000000..40a4aeeed
--- /dev/null
+++ b/core/man/start-cli/start-cli-server-host-binding-list.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-server-host-binding-list 1  "list " 
+.SH NAME
+start\-cli\-server\-host\-binding\-list \- List bindings for a host
+.SH SYNOPSIS
+\fBstart\-cli server host binding list\fR [\fB\-\-format\fR] [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+List bindings for a host
+.SH OPTIONS
+.TP
+\fB\-\-format\fR
+
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-cli/start-cli-server-host-binding-set-address-enabled.1 b/core/man/start-cli/start-cli-server-host-binding-set-address-enabled.1
new file mode 100644
index 000000000..f7e67811f
--- /dev/null
+++ b/core/man/start-cli/start-cli-server-host-binding-set-address-enabled.1
@@ -0,0 +1,32 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-server-host-binding-set-address-enabled 1  "set-address-enabled " 
+.SH NAME
+start\-cli\-server\-host\-binding\-set\-address\-enabled \- about.set\-address\-enabled\-for\-binding
+.SH SYNOPSIS
+\fBstart\-cli server host binding set\-address\-enabled\fR <\fB\-\-address\fR> [\fB\-\-enabled\fR] [\fB\-h\fR|\fB\-\-help\fR] <\fIINTERNAL_PORT\fR> 
+.SH DESCRIPTION
+about.set\-address\-enabled\-for\-binding
+.SH OPTIONS
+.TP
+\fB\-\-address\fR \fI<ADDRESS>\fR
+help.arg.address
+.TP
+\fB\-\-enabled\fR \fI<ENABLED>\fR
+Enable or disable this binding
+.br
+
+.br
+\fIPossible values:\fR
+.RS 14
+.IP \(bu 2
+true
+.IP \(bu 2
+false
+.RE
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIINTERNAL_PORT\fR>
+Internal port number
diff --git a/core/man/start-cli/start-cli-server-host-binding.1 b/core/man/start-cli/start-cli-server-host-binding.1
new file mode 100644
index 000000000..0a9cd3f44
--- /dev/null
+++ b/core/man/start-cli/start-cli-server-host-binding.1
@@ -0,0 +1,19 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-server-host-binding 1  "binding " 
+.SH NAME
+start\-cli\-server\-host\-binding
+.SH SYNOPSIS
+\fBstart\-cli server host binding\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIsubcommands\fR>
+.SH DESCRIPTION
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.SH SUBCOMMANDS
+.TP
+start\-cli\-server\-host\-binding\-list(1)
+List bindings for a host
+.TP
+start\-cli\-server\-host\-binding\-set\-address\-enabled(1)
+about.set\-address\-enabled\-for\-binding
diff --git a/core/man/start-cli/start-cli-server-host.1 b/core/man/start-cli/start-cli-server-host.1
new file mode 100644
index 000000000..37e7e7320
--- /dev/null
+++ b/core/man/start-cli/start-cli-server-host.1
@@ -0,0 +1,18 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-server-host 1  "host " 
+.SH NAME
+start\-cli\-server\-host \- Commands for modifying the host for the system ui
+.SH SYNOPSIS
+\fBstart\-cli server host\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIsubcommands\fR>
+.SH DESCRIPTION
+Commands for modifying the host for the system ui
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.SH SUBCOMMANDS
+.TP
+start\-cli\-server\-host\-address(1)
+.TP
+start\-cli\-server\-host\-binding(1)
diff --git a/core/man/start-cli/start-cli-server-kernel-logs.1 b/core/man/start-cli/start-cli-server-kernel-logs.1
new file mode 100644
index 000000000..e55e695a6
--- /dev/null
+++ b/core/man/start-cli/start-cli-server-kernel-logs.1
@@ -0,0 +1,28 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-server-kernel-logs 1  "kernel-logs " 
+.SH NAME
+start\-cli\-server\-kernel\-logs \- Display kernel logs
+.SH SYNOPSIS
+\fBstart\-cli server kernel\-logs\fR [\fB\-l\fR|\fB\-\-limit\fR] [\fB\-c\fR|\fB\-\-cursor\fR] [\fB\-b\fR|\fB\-\-boot\fR] [\fB\-B\fR|\fB\-\-before\fR] [\fB\-f\fR|\fB\-\-follow\fR] [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+Display kernel logs
+.SH OPTIONS
+.TP
+\fB\-l\fR, \fB\-\-limit\fR \fI<LIMIT>\fR
+Maximum number of log entries
+.TP
+\fB\-c\fR, \fB\-\-cursor\fR \fI<CURSOR>\fR
+Start from this cursor position
+.TP
+\fB\-b\fR, \fB\-\-boot\fR \fI<BOOT>\fR
+Filter logs by boot ID
+.TP
+\fB\-B\fR, \fB\-\-before\fR
+Show logs before the cursor position
+.TP
+\fB\-f\fR, \fB\-\-follow\fR
+Follow log output in real\-time
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-cli/start-cli-server-logs.1 b/core/man/start-cli/start-cli-server-logs.1
new file mode 100644
index 000000000..944675edb
--- /dev/null
+++ b/core/man/start-cli/start-cli-server-logs.1
@@ -0,0 +1,28 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-server-logs 1  "logs " 
+.SH NAME
+start\-cli\-server\-logs \- Display OS logs
+.SH SYNOPSIS
+\fBstart\-cli server logs\fR [\fB\-l\fR|\fB\-\-limit\fR] [\fB\-c\fR|\fB\-\-cursor\fR] [\fB\-b\fR|\fB\-\-boot\fR] [\fB\-B\fR|\fB\-\-before\fR] [\fB\-f\fR|\fB\-\-follow\fR] [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+Display OS logs
+.SH OPTIONS
+.TP
+\fB\-l\fR, \fB\-\-limit\fR \fI<LIMIT>\fR
+Maximum number of log entries
+.TP
+\fB\-c\fR, \fB\-\-cursor\fR \fI<CURSOR>\fR
+Start from this cursor position
+.TP
+\fB\-b\fR, \fB\-\-boot\fR \fI<BOOT>\fR
+Filter logs by boot ID
+.TP
+\fB\-B\fR, \fB\-\-before\fR
+Show logs before the cursor position
+.TP
+\fB\-f\fR, \fB\-\-follow\fR
+Follow log output in real\-time
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-cli/start-cli-server-metrics.1 b/core/man/start-cli/start-cli-server-metrics.1
new file mode 100644
index 000000000..0f15cf788
--- /dev/null
+++ b/core/man/start-cli/start-cli-server-metrics.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-server-metrics 1  "metrics " 
+.SH NAME
+start\-cli\-server\-metrics \- Display server metrics
+.SH SYNOPSIS
+\fBstart\-cli server metrics\fR [\fB\-\-format\fR] [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+Display server metrics
+.SH OPTIONS
+.TP
+\fB\-\-format\fR
+
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-cli/start-cli-server-rebuild.1 b/core/man/start-cli/start-cli-server-rebuild.1
new file mode 100644
index 000000000..da1f23442
--- /dev/null
+++ b/core/man/start-cli/start-cli-server-rebuild.1
@@ -0,0 +1,13 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-server-rebuild 1  "rebuild " 
+.SH NAME
+start\-cli\-server\-rebuild \- Teardown and rebuild containers
+.SH SYNOPSIS
+\fBstart\-cli server rebuild\fR [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+Teardown and rebuild containers
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-cli/start-cli-server-restart.1 b/core/man/start-cli/start-cli-server-restart.1
new file mode 100644
index 000000000..8ea7cca77
--- /dev/null
+++ b/core/man/start-cli/start-cli-server-restart.1
@@ -0,0 +1,13 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-server-restart 1  "restart " 
+.SH NAME
+start\-cli\-server\-restart \- Restart the server
+.SH SYNOPSIS
+\fBstart\-cli server restart\fR [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+Restart the server
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-cli/start-cli-server-set-echoip-urls.1 b/core/man/start-cli/start-cli-server-set-echoip-urls.1
new file mode 100644
index 000000000..f97c53cde
--- /dev/null
+++ b/core/man/start-cli/start-cli-server-set-echoip-urls.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-server-set-echoip-urls 1  "set-echoip-urls " 
+.SH NAME
+start\-cli\-server\-set\-echoip\-urls \- Set the Echo IP service URLs
+.SH SYNOPSIS
+\fBstart\-cli server set\-echoip\-urls\fR [\fB\-h\fR|\fB\-\-help\fR] [\fIURLS\fR] 
+.SH DESCRIPTION
+Set the Echo IP service URLs
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+[\fIURLS\fR]
+Echo IP service URLs for external IP detection
diff --git a/core/man/start-cli/start-cli-server-set-hostname.1 b/core/man/start-cli/start-cli-server-set-hostname.1
new file mode 100644
index 000000000..7500fb159
--- /dev/null
+++ b/core/man/start-cli/start-cli-server-set-hostname.1
@@ -0,0 +1,19 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-server-set-hostname 1  "set-hostname " 
+.SH NAME
+start\-cli\-server\-set\-hostname \- Set the server hostname
+.SH SYNOPSIS
+\fBstart\-cli server set\-hostname\fR [\fB\-h\fR|\fB\-\-help\fR] [\fINAME\fR] [\fIHOSTNAME\fR] 
+.SH DESCRIPTION
+Set the server hostname
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+[\fINAME\fR]
+
+.TP
+[\fIHOSTNAME\fR]
+
diff --git a/core/man/start-cli/start-cli-server-set-keyboard.1 b/core/man/start-cli/start-cli-server-set-keyboard.1
new file mode 100644
index 000000000..764b126b9
--- /dev/null
+++ b/core/man/start-cli/start-cli-server-set-keyboard.1
@@ -0,0 +1,28 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-server-set-keyboard 1  "set-keyboard " 
+.SH NAME
+start\-cli\-server\-set\-keyboard \- Set the keyboard layout
+.SH SYNOPSIS
+\fBstart\-cli server set\-keyboard\fR [\fB\-k\fR|\fB\-\-keymap\fR] [\fB\-m\fR|\fB\-\-model\fR] [\fB\-v\fR|\fB\-\-variant\fR] [\fB\-o\fR|\fB\-\-option\fR] [\fB\-h\fR|\fB\-\-help\fR] <\fILAYOUT\fR> 
+.SH DESCRIPTION
+Set the keyboard layout
+.SH OPTIONS
+.TP
+\fB\-k\fR, \fB\-\-keymap\fR \fI<KEYMAP>\fR
+Console keymap for vconsole
+.TP
+\fB\-m\fR, \fB\-\-model\fR \fI<MODEL>\fR
+Keyboard model
+.TP
+\fB\-v\fR, \fB\-\-variant\fR \fI<VARIANT>\fR
+Keyboard layout variant
+.TP
+\fB\-o\fR, \fB\-\-option\fR \fI<OPTIONS>\fR
+Additional keyboard option
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fILAYOUT\fR>
+Keyboard layout code
diff --git a/core/man/start-cli/start-cli-server-set-language.1 b/core/man/start-cli/start-cli-server-set-language.1
new file mode 100644
index 000000000..6b75a20bb
--- /dev/null
+++ b/core/man/start-cli/start-cli-server-set-language.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-server-set-language 1  "set-language " 
+.SH NAME
+start\-cli\-server\-set\-language \- Set the system language
+.SH SYNOPSIS
+\fBstart\-cli server set\-language\fR [\fB\-h\fR|\fB\-\-help\fR] <\fILANGUAGE\fR> 
+.SH DESCRIPTION
+Set the system language
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fILANGUAGE\fR>
+Language code
diff --git a/core/man/start-cli/start-cli-server-set-smtp.1 b/core/man/start-cli/start-cli-server-set-smtp.1
new file mode 100644
index 000000000..d2f8734c2
--- /dev/null
+++ b/core/man/start-cli/start-cli-server-set-smtp.1
@@ -0,0 +1,41 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-server-set-smtp 1  "set-smtp " 
+.SH NAME
+start\-cli\-server\-set\-smtp \- Set SMTP configuration
+.SH SYNOPSIS
+\fBstart\-cli server set\-smtp\fR <\fB\-\-host\fR> <\fB\-\-port\fR> <\fB\-\-from\fR> <\fB\-\-username\fR> [\fB\-\-password\fR] <\fB\-\-security\fR> [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+Set SMTP configuration
+.SH OPTIONS
+.TP
+\fB\-\-host\fR \fI<HOST>\fR
+SMTP server hostname
+.TP
+\fB\-\-port\fR \fI<PORT>\fR
+SMTP server port
+.TP
+\fB\-\-from\fR \fI<FROM>\fR
+Email sender address
+.TP
+\fB\-\-username\fR \fI<USERNAME>\fR
+SMTP authentication username
+.TP
+\fB\-\-password\fR \fI<PASSWORD>\fR
+SMTP authentication password
+.TP
+\fB\-\-security\fR \fI<SECURITY>\fR
+Connection security mode (starttls or tls)
+.br
+
+.br
+\fIPossible values:\fR
+.RS 14
+.IP \(bu 2
+starttls
+.IP \(bu 2
+tls
+.RE
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-cli/start-cli-server-shutdown.1 b/core/man/start-cli/start-cli-server-shutdown.1
new file mode 100644
index 000000000..c3e82d5cc
--- /dev/null
+++ b/core/man/start-cli/start-cli-server-shutdown.1
@@ -0,0 +1,13 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-server-shutdown 1  "shutdown " 
+.SH NAME
+start\-cli\-server\-shutdown \- Shutdown the server
+.SH SYNOPSIS
+\fBstart\-cli server shutdown\fR [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+Shutdown the server
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-cli/start-cli-server-test-smtp.1 b/core/man/start-cli/start-cli-server-test-smtp.1
new file mode 100644
index 000000000..1e7341079
--- /dev/null
+++ b/core/man/start-cli/start-cli-server-test-smtp.1
@@ -0,0 +1,44 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-server-test-smtp 1  "test-smtp " 
+.SH NAME
+start\-cli\-server\-test\-smtp \- Test SMTP configuration
+.SH SYNOPSIS
+\fBstart\-cli server test\-smtp\fR <\fB\-\-host\fR> <\fB\-\-port\fR> <\fB\-\-from\fR> <\fB\-\-to\fR> <\fB\-\-username\fR> <\fB\-\-password\fR> <\fB\-\-security\fR> [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+Test SMTP configuration
+.SH OPTIONS
+.TP
+\fB\-\-host\fR \fI<HOST>\fR
+SMTP server hostname
+.TP
+\fB\-\-port\fR \fI<PORT>\fR
+SMTP server port
+.TP
+\fB\-\-from\fR \fI<FROM>\fR
+Email sender address
+.TP
+\fB\-\-to\fR \fI<TO>\fR
+Email recipient address
+.TP
+\fB\-\-username\fR \fI<USERNAME>\fR
+SMTP authentication username
+.TP
+\fB\-\-password\fR \fI<PASSWORD>\fR
+SMTP authentication password
+.TP
+\fB\-\-security\fR \fI<SECURITY>\fR
+Connection security mode (starttls or tls)
+.br
+
+.br
+\fIPossible values:\fR
+.RS 14
+.IP \(bu 2
+starttls
+.IP \(bu 2
+tls
+.RE
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-cli/start-cli-server-time.1 b/core/man/start-cli/start-cli-server-time.1
new file mode 100644
index 000000000..a19b71993
--- /dev/null
+++ b/core/man/start-cli/start-cli-server-time.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-server-time 1  "time " 
+.SH NAME
+start\-cli\-server\-time \- Display server time and uptime
+.SH SYNOPSIS
+\fBstart\-cli server time\fR [\fB\-\-format\fR] [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+Display server time and uptime
+.SH OPTIONS
+.TP
+\fB\-\-format\fR
+
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-cli/start-cli-server-update-firmware.1 b/core/man/start-cli/start-cli-server-update-firmware.1
new file mode 100644
index 000000000..4c463e3ed
--- /dev/null
+++ b/core/man/start-cli/start-cli-server-update-firmware.1
@@ -0,0 +1,13 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-server-update-firmware 1  "update-firmware " 
+.SH NAME
+start\-cli\-server\-update\-firmware \- Update firmware
+.SH SYNOPSIS
+\fBstart\-cli server update\-firmware\fR [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+Update firmware
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-cli/start-cli-server-update.1 b/core/man/start-cli/start-cli-server-update.1
new file mode 100644
index 000000000..4f14b41a4
--- /dev/null
+++ b/core/man/start-cli/start-cli-server-update.1
@@ -0,0 +1,22 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-server-update 1  "update " 
+.SH NAME
+start\-cli\-server\-update \- Check a given registry for StartOS updates and update if available
+.SH SYNOPSIS
+\fBstart\-cli server update\fR [\fB\-\-to\fR] [\fB\-\-no\-progress\fR] [\fB\-h\fR|\fB\-\-help\fR] <\fIREGISTRY\fR> 
+.SH DESCRIPTION
+Check a given registry for StartOS updates and update if available
+.SH OPTIONS
+.TP
+\fB\-\-to\fR \fI<TARGET>\fR
+Target version for update
+.TP
+\fB\-\-no\-progress\fR
+Disable progress display
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIREGISTRY\fR>
+URL of the registry
diff --git a/core/man/start-cli/start-cli-server.1 b/core/man/start-cli/start-cli-server.1
new file mode 100644
index 000000000..cc076f658
--- /dev/null
+++ b/core/man/start-cli/start-cli-server.1
@@ -0,0 +1,71 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-server 1  "server " 
+.SH NAME
+start\-cli\-server \- Commands related to the server i.e. restart, update, and shutdown
+.SH SYNOPSIS
+\fBstart\-cli server\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIsubcommands\fR>
+.SH DESCRIPTION
+Commands related to the server i.e. restart, update, and shutdown
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.SH SUBCOMMANDS
+.TP
+start\-cli\-server\-clear\-smtp(1)
+Remove system smtp server and credentials
+.TP
+start\-cli\-server\-device\-info(1)
+about.get\-device\-info
+.TP
+start\-cli\-server\-experimental(1)
+Commands related to configuring experimental options such as zram and cpu governor
+.TP
+start\-cli\-server\-host(1)
+Commands for modifying the host for the system ui
+.TP
+start\-cli\-server\-kernel\-logs(1)
+Display kernel logs
+.TP
+start\-cli\-server\-logs(1)
+Display OS logs
+.TP
+start\-cli\-server\-metrics(1)
+Display server metrics
+.TP
+start\-cli\-server\-rebuild(1)
+Teardown and rebuild containers
+.TP
+start\-cli\-server\-restart(1)
+Restart the server
+.TP
+start\-cli\-server\-set\-echoip\-urls(1)
+Set the Echo IP service URLs
+.TP
+start\-cli\-server\-set\-hostname(1)
+Set the server hostname
+.TP
+start\-cli\-server\-set\-keyboard(1)
+Set the keyboard layout
+.TP
+start\-cli\-server\-set\-language(1)
+Set the system language
+.TP
+start\-cli\-server\-set\-smtp(1)
+Set SMTP configuration
+.TP
+start\-cli\-server\-shutdown(1)
+Shutdown the server
+.TP
+start\-cli\-server\-test\-smtp(1)
+Test SMTP configuration
+.TP
+start\-cli\-server\-time(1)
+Display server time and uptime
+.TP
+start\-cli\-server\-update(1)
+Check a given registry for StartOS updates and update if available
+.TP
+start\-cli\-server\-update\-firmware(1)
+Update firmware
diff --git a/core/man/start-cli/start-cli-setup-cifs.1 b/core/man/start-cli/start-cli-setup-cifs.1
new file mode 100644
index 000000000..4cb102d59
--- /dev/null
+++ b/core/man/start-cli/start-cli-setup-cifs.1
@@ -0,0 +1,12 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-setup-cifs 1  "cifs " 
+.SH NAME
+start\-cli\-setup\-cifs
+.SH SYNOPSIS
+\fBstart\-cli setup cifs\fR [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-cli/start-cli-setup-disk.1 b/core/man/start-cli/start-cli-setup-disk.1
new file mode 100644
index 000000000..7fa73a28b
--- /dev/null
+++ b/core/man/start-cli/start-cli-setup-disk.1
@@ -0,0 +1,12 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-setup-disk 1  "disk " 
+.SH NAME
+start\-cli\-setup\-disk
+.SH SYNOPSIS
+\fBstart\-cli setup disk\fR [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-cli/start-cli-setup-logs.1 b/core/man/start-cli/start-cli-setup-logs.1
new file mode 100644
index 000000000..dc7e28229
--- /dev/null
+++ b/core/man/start-cli/start-cli-setup-logs.1
@@ -0,0 +1,28 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-setup-logs 1  "logs " 
+.SH NAME
+start\-cli\-setup\-logs \- Display OS logs
+.SH SYNOPSIS
+\fBstart\-cli setup logs\fR [\fB\-l\fR|\fB\-\-limit\fR] [\fB\-c\fR|\fB\-\-cursor\fR] [\fB\-b\fR|\fB\-\-boot\fR] [\fB\-B\fR|\fB\-\-before\fR] [\fB\-f\fR|\fB\-\-follow\fR] [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+Display OS logs
+.SH OPTIONS
+.TP
+\fB\-l\fR, \fB\-\-limit\fR \fI<LIMIT>\fR
+Maximum number of log entries
+.TP
+\fB\-c\fR, \fB\-\-cursor\fR \fI<CURSOR>\fR
+Start from this cursor position
+.TP
+\fB\-b\fR, \fB\-\-boot\fR \fI<BOOT>\fR
+Filter logs by boot ID
+.TP
+\fB\-B\fR, \fB\-\-before\fR
+Show logs before the cursor position
+.TP
+\fB\-f\fR, \fB\-\-follow\fR
+Follow log output in real\-time
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-cli/start-cli-setup.1 b/core/man/start-cli/start-cli-setup.1
new file mode 100644
index 000000000..ad19491fd
--- /dev/null
+++ b/core/man/start-cli/start-cli-setup.1
@@ -0,0 +1,21 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-setup 1  "setup " 
+.SH NAME
+start\-cli\-setup \- Commands related to the initial setup
+.SH SYNOPSIS
+\fBstart\-cli setup\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIsubcommands\fR>
+.SH DESCRIPTION
+Commands related to the initial setup
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.SH SUBCOMMANDS
+.TP
+start\-cli\-setup\-cifs(1)
+.TP
+start\-cli\-setup\-disk(1)
+.TP
+start\-cli\-setup\-logs(1)
+Display OS logs
diff --git a/core/man/start-cli/start-cli-ssh-add.1 b/core/man/start-cli/start-cli-ssh-add.1
new file mode 100644
index 000000000..0cb2e46cf
--- /dev/null
+++ b/core/man/start-cli/start-cli-ssh-add.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-ssh-add 1  "add " 
+.SH NAME
+start\-cli\-ssh\-add \- Add ssh key
+.SH SYNOPSIS
+\fBstart\-cli ssh add\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIKEY\fR> 
+.SH DESCRIPTION
+Add ssh key
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIKEY\fR>
+SSH public key
diff --git a/core/man/start-cli/start-cli-ssh-list.1 b/core/man/start-cli/start-cli-ssh-list.1
new file mode 100644
index 000000000..9b649e9ff
--- /dev/null
+++ b/core/man/start-cli/start-cli-ssh-list.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-ssh-list 1  "list " 
+.SH NAME
+start\-cli\-ssh\-list \- List SSH keys
+.SH SYNOPSIS
+\fBstart\-cli ssh list\fR [\fB\-\-format\fR] [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+List SSH keys
+.SH OPTIONS
+.TP
+\fB\-\-format\fR
+
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-cli/start-cli-ssh-remove.1 b/core/man/start-cli/start-cli-ssh-remove.1
new file mode 100644
index 000000000..702d6a920
--- /dev/null
+++ b/core/man/start-cli/start-cli-ssh-remove.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-ssh-remove 1  "remove " 
+.SH NAME
+start\-cli\-ssh\-remove \- Remove an SSH key
+.SH SYNOPSIS
+\fBstart\-cli ssh remove\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIFINGERPRINT\fR> 
+.SH DESCRIPTION
+Remove an SSH key
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIFINGERPRINT\fR>
+SSH key fingerprint
diff --git a/core/man/start-cli/start-cli-ssh.1 b/core/man/start-cli/start-cli-ssh.1
new file mode 100644
index 000000000..6f10ebc7c
--- /dev/null
+++ b/core/man/start-cli/start-cli-ssh.1
@@ -0,0 +1,23 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-ssh 1  "ssh " 
+.SH NAME
+start\-cli\-ssh \- Commands for interacting with ssh keys i.e. add, delete, list
+.SH SYNOPSIS
+\fBstart\-cli ssh\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIsubcommands\fR>
+.SH DESCRIPTION
+Commands for interacting with ssh keys i.e. add, delete, list
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.SH SUBCOMMANDS
+.TP
+start\-cli\-ssh\-add(1)
+Add ssh key
+.TP
+start\-cli\-ssh\-list(1)
+List SSH keys
+.TP
+start\-cli\-ssh\-remove(1)
+Remove an SSH key
diff --git a/core/man/start-cli/start-cli-state.1 b/core/man/start-cli/start-cli-state.1
new file mode 100644
index 000000000..39a0872c9
--- /dev/null
+++ b/core/man/start-cli/start-cli-state.1
@@ -0,0 +1,13 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-state 1  "state " 
+.SH NAME
+start\-cli\-state \- Display the current api specification
+.SH SYNOPSIS
+\fBstart\-cli state\fR [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+Display the current api specification
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-cli/start-cli-tunnel-auth-get-pubkey.1 b/core/man/start-cli/start-cli-tunnel-auth-get-pubkey.1
new file mode 100644
index 000000000..6eda0cf45
--- /dev/null
+++ b/core/man/start-cli/start-cli-tunnel-auth-get-pubkey.1
@@ -0,0 +1,13 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-tunnel-auth-get-pubkey 1  "get-pubkey " 
+.SH NAME
+start\-cli\-tunnel\-auth\-get\-pubkey \- Get the public key from the server
+.SH SYNOPSIS
+\fBstart\-cli tunnel auth get\-pubkey\fR [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+Get the public key from the server
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-cli/start-cli-tunnel-auth-key-add.1 b/core/man/start-cli/start-cli-tunnel-auth-key-add.1
new file mode 100644
index 000000000..12137fabe
--- /dev/null
+++ b/core/man/start-cli/start-cli-tunnel-auth-key-add.1
@@ -0,0 +1,19 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-tunnel-auth-key-add 1  "add " 
+.SH NAME
+start\-cli\-tunnel\-auth\-key\-add \- Add a new authorized key
+.SH SYNOPSIS
+\fBstart\-cli tunnel auth key add\fR [\fB\-h\fR|\fB\-\-help\fR] <\fINAME\fR> <\fIKEY\fR> 
+.SH DESCRIPTION
+Add a new authorized key
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fINAME\fR>
+
+.TP
+<\fIKEY\fR>
+
diff --git a/core/man/start-cli/start-cli-tunnel-auth-key-list.1 b/core/man/start-cli/start-cli-tunnel-auth-key-list.1
new file mode 100644
index 000000000..8026a23f1
--- /dev/null
+++ b/core/man/start-cli/start-cli-tunnel-auth-key-list.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-tunnel-auth-key-list 1  "list " 
+.SH NAME
+start\-cli\-tunnel\-auth\-key\-list \- List authorized keys
+.SH SYNOPSIS
+\fBstart\-cli tunnel auth key list\fR [\fB\-\-format\fR] [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+List authorized keys
+.SH OPTIONS
+.TP
+\fB\-\-format\fR
+
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-cli/start-cli-tunnel-auth-key-remove.1 b/core/man/start-cli/start-cli-tunnel-auth-key-remove.1
new file mode 100644
index 000000000..7ce90b583
--- /dev/null
+++ b/core/man/start-cli/start-cli-tunnel-auth-key-remove.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-tunnel-auth-key-remove 1  "remove " 
+.SH NAME
+start\-cli\-tunnel\-auth\-key\-remove \- Remove authorized key
+.SH SYNOPSIS
+\fBstart\-cli tunnel auth key remove\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIKEY\fR> 
+.SH DESCRIPTION
+Remove authorized key
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIKEY\fR>
+
diff --git a/core/man/start-cli/start-cli-tunnel-auth-key.1 b/core/man/start-cli/start-cli-tunnel-auth-key.1
new file mode 100644
index 000000000..c130b60ba
--- /dev/null
+++ b/core/man/start-cli/start-cli-tunnel-auth-key.1
@@ -0,0 +1,22 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-tunnel-auth-key 1  "key " 
+.SH NAME
+start\-cli\-tunnel\-auth\-key
+.SH SYNOPSIS
+\fBstart\-cli tunnel auth key\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIsubcommands\fR>
+.SH DESCRIPTION
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.SH SUBCOMMANDS
+.TP
+start\-cli\-tunnel\-auth\-key\-add(1)
+Add a new authorized key
+.TP
+start\-cli\-tunnel\-auth\-key\-list(1)
+List authorized keys
+.TP
+start\-cli\-tunnel\-auth\-key\-remove(1)
+Remove authorized key
diff --git a/core/man/start-cli/start-cli-tunnel-auth-login.1 b/core/man/start-cli/start-cli-tunnel-auth-login.1
new file mode 100644
index 000000000..51d81780a
--- /dev/null
+++ b/core/man/start-cli/start-cli-tunnel-auth-login.1
@@ -0,0 +1,13 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-tunnel-auth-login 1  "login " 
+.SH NAME
+start\-cli\-tunnel\-auth\-login \- Login to a new auth session
+.SH SYNOPSIS
+\fBstart\-cli tunnel auth login\fR [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+Login to a new auth session
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-cli/start-cli-tunnel-auth-logout.1 b/core/man/start-cli/start-cli-tunnel-auth-logout.1
new file mode 100644
index 000000000..ec78cc38f
--- /dev/null
+++ b/core/man/start-cli/start-cli-tunnel-auth-logout.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-tunnel-auth-logout 1  "logout " 
+.SH NAME
+start\-cli\-tunnel\-auth\-logout \- Logout from current auth session
+.SH SYNOPSIS
+\fBstart\-cli tunnel auth logout\fR [\fB\-h\fR|\fB\-\-help\fR] <\fISESSION\fR> 
+.SH DESCRIPTION
+Logout from current auth session
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fISESSION\fR>
+
diff --git a/core/man/start-cli/start-cli-tunnel-auth-reset-password.1 b/core/man/start-cli/start-cli-tunnel-auth-reset-password.1
new file mode 100644
index 000000000..34f867dff
--- /dev/null
+++ b/core/man/start-cli/start-cli-tunnel-auth-reset-password.1
@@ -0,0 +1,13 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-tunnel-auth-reset-password 1  "reset-password " 
+.SH NAME
+start\-cli\-tunnel\-auth\-reset\-password \- Reset user interface password
+.SH SYNOPSIS
+\fBstart\-cli tunnel auth reset\-password\fR [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+Reset user interface password
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-cli/start-cli-tunnel-auth-session-kill.1 b/core/man/start-cli/start-cli-tunnel-auth-session-kill.1
new file mode 100644
index 000000000..cd0d769db
--- /dev/null
+++ b/core/man/start-cli/start-cli-tunnel-auth-session-kill.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-tunnel-auth-session-kill 1  "kill " 
+.SH NAME
+start\-cli\-tunnel\-auth\-session\-kill \- Terminate auth sessions
+.SH SYNOPSIS
+\fBstart\-cli tunnel auth session kill\fR [\fB\-h\fR|\fB\-\-help\fR] [\fIIDS\fR] 
+.SH DESCRIPTION
+Terminate auth sessions
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+[\fIIDS\fR]
+Session identifiers
diff --git a/core/man/start-cli/start-cli-tunnel-auth-session-list.1 b/core/man/start-cli/start-cli-tunnel-auth-session-list.1
new file mode 100644
index 000000000..ddc58143e
--- /dev/null
+++ b/core/man/start-cli/start-cli-tunnel-auth-session-list.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-tunnel-auth-session-list 1  "list " 
+.SH NAME
+start\-cli\-tunnel\-auth\-session\-list \- Display all auth sessions
+.SH SYNOPSIS
+\fBstart\-cli tunnel auth session list\fR [\fB\-\-format\fR] [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+Display all auth sessions
+.SH OPTIONS
+.TP
+\fB\-\-format\fR
+
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-cli/start-cli-tunnel-auth-session.1 b/core/man/start-cli/start-cli-tunnel-auth-session.1
new file mode 100644
index 000000000..0b221de32
--- /dev/null
+++ b/core/man/start-cli/start-cli-tunnel-auth-session.1
@@ -0,0 +1,20 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-tunnel-auth-session 1  "session " 
+.SH NAME
+start\-cli\-tunnel\-auth\-session \- List or kill auth sessions
+.SH SYNOPSIS
+\fBstart\-cli tunnel auth session\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIsubcommands\fR>
+.SH DESCRIPTION
+List or kill auth sessions
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.SH SUBCOMMANDS
+.TP
+start\-cli\-tunnel\-auth\-session\-kill(1)
+Terminate auth sessions
+.TP
+start\-cli\-tunnel\-auth\-session\-list(1)
+Display all auth sessions
diff --git a/core/man/start-cli/start-cli-tunnel-auth-set-password.1 b/core/man/start-cli/start-cli-tunnel-auth-set-password.1
new file mode 100644
index 000000000..01ef0c493
--- /dev/null
+++ b/core/man/start-cli/start-cli-tunnel-auth-set-password.1
@@ -0,0 +1,13 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-tunnel-auth-set-password 1  "set-password " 
+.SH NAME
+start\-cli\-tunnel\-auth\-set\-password \- Set user interface password
+.SH SYNOPSIS
+\fBstart\-cli tunnel auth set\-password\fR [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+Set user interface password
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-cli/start-cli-tunnel-auth.1 b/core/man/start-cli/start-cli-tunnel-auth.1
new file mode 100644
index 000000000..59aa3f74f
--- /dev/null
+++ b/core/man/start-cli/start-cli-tunnel-auth.1
@@ -0,0 +1,34 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-tunnel-auth 1  "auth " 
+.SH NAME
+start\-cli\-tunnel\-auth \- Add or remove authorized clients
+.SH SYNOPSIS
+\fBstart\-cli tunnel auth\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIsubcommands\fR>
+.SH DESCRIPTION
+Add or remove authorized clients
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.SH SUBCOMMANDS
+.TP
+start\-cli\-tunnel\-auth\-get\-pubkey(1)
+Get the public key from the server
+.TP
+start\-cli\-tunnel\-auth\-key(1)
+.TP
+start\-cli\-tunnel\-auth\-login(1)
+Login to a new auth session
+.TP
+start\-cli\-tunnel\-auth\-logout(1)
+Logout from current auth session
+.TP
+start\-cli\-tunnel\-auth\-reset\-password(1)
+Reset user interface password
+.TP
+start\-cli\-tunnel\-auth\-session(1)
+List or kill auth sessions
+.TP
+start\-cli\-tunnel\-auth\-set\-password(1)
+Set user interface password
diff --git a/core/man/start-cli/start-cli-tunnel-db-apply.1 b/core/man/start-cli/start-cli-tunnel-db-apply.1
new file mode 100644
index 000000000..28f9b523e
--- /dev/null
+++ b/core/man/start-cli/start-cli-tunnel-db-apply.1
@@ -0,0 +1,19 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-tunnel-db-apply 1  "apply " 
+.SH NAME
+start\-cli\-tunnel\-db\-apply \- Update a database record
+.SH SYNOPSIS
+\fBstart\-cli tunnel db apply\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIEXPR\fR> [\fIPATH\fR] 
+.SH DESCRIPTION
+Update a database record
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIEXPR\fR>
+Database patch expression to apply
+.TP
+[\fIPATH\fR]
+Path to the database file
diff --git a/core/man/start-cli/start-cli-tunnel-db-dump.1 b/core/man/start-cli/start-cli-tunnel-db-dump.1
new file mode 100644
index 000000000..1b489a495
--- /dev/null
+++ b/core/man/start-cli/start-cli-tunnel-db-dump.1
@@ -0,0 +1,22 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-tunnel-db-dump 1  "dump " 
+.SH NAME
+start\-cli\-tunnel\-db\-dump \- Filter and query the database, display tables and records
+.SH SYNOPSIS
+\fBstart\-cli tunnel db dump\fR [\fB\-p\fR|\fB\-\-pointer\fR] [\fB\-\-format\fR] [\fB\-h\fR|\fB\-\-help\fR] [\fIPATH\fR] 
+.SH DESCRIPTION
+Filter and query the database, display tables and records
+.SH OPTIONS
+.TP
+\fB\-p\fR, \fB\-\-pointer\fR \fI<POINTER>\fR
+JSON pointer to specific value
+.TP
+\fB\-\-format\fR
+
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+[\fIPATH\fR]
+Path to the database file
diff --git a/core/man/start-cli/start-cli-tunnel-db.1 b/core/man/start-cli/start-cli-tunnel-db.1
new file mode 100644
index 000000000..f163d0119
--- /dev/null
+++ b/core/man/start-cli/start-cli-tunnel-db.1
@@ -0,0 +1,20 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-tunnel-db 1  "db " 
+.SH NAME
+start\-cli\-tunnel\-db \- Commands to interact with the db i.e. dump and apply
+.SH SYNOPSIS
+\fBstart\-cli tunnel db\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIsubcommands\fR>
+.SH DESCRIPTION
+Commands to interact with the db i.e. dump and apply
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.SH SUBCOMMANDS
+.TP
+start\-cli\-tunnel\-db\-apply(1)
+Update a database record
+.TP
+start\-cli\-tunnel\-db\-dump(1)
+Filter and query the database, display tables and records
diff --git a/core/man/start-cli/start-cli-tunnel-device-add.1 b/core/man/start-cli/start-cli-tunnel-device-add.1
new file mode 100644
index 000000000..7696c1157
--- /dev/null
+++ b/core/man/start-cli/start-cli-tunnel-device-add.1
@@ -0,0 +1,22 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-tunnel-device-add 1  "add " 
+.SH NAME
+start\-cli\-tunnel\-device\-add \- Add a device to a subnet
+.SH SYNOPSIS
+\fBstart\-cli tunnel device add\fR [\fB\-h\fR|\fB\-\-help\fR] <\fISUBNET\fR> <\fINAME\fR> [\fIIP\fR] 
+.SH DESCRIPTION
+Add a device to a subnet
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fISUBNET\fR>
+
+.TP
+<\fINAME\fR>
+
+.TP
+[\fIIP\fR]
+
diff --git a/core/man/start-cli/start-cli-tunnel-device-list.1 b/core/man/start-cli/start-cli-tunnel-device-list.1
new file mode 100644
index 000000000..f92f38c77
--- /dev/null
+++ b/core/man/start-cli/start-cli-tunnel-device-list.1
@@ -0,0 +1,19 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-tunnel-device-list 1  "list " 
+.SH NAME
+start\-cli\-tunnel\-device\-list \- List devices in a subnet
+.SH SYNOPSIS
+\fBstart\-cli tunnel device list\fR [\fB\-\-format\fR] [\fB\-h\fR|\fB\-\-help\fR] <\fISUBNET\fR> 
+.SH DESCRIPTION
+List devices in a subnet
+.SH OPTIONS
+.TP
+\fB\-\-format\fR
+
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fISUBNET\fR>
+
diff --git a/core/man/start-cli/start-cli-tunnel-device-remove.1 b/core/man/start-cli/start-cli-tunnel-device-remove.1
new file mode 100644
index 000000000..f9e375b3f
--- /dev/null
+++ b/core/man/start-cli/start-cli-tunnel-device-remove.1
@@ -0,0 +1,19 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-tunnel-device-remove 1  "remove " 
+.SH NAME
+start\-cli\-tunnel\-device\-remove \- Remove device from subnet
+.SH SYNOPSIS
+\fBstart\-cli tunnel device remove\fR [\fB\-h\fR|\fB\-\-help\fR] <\fISUBNET\fR> <\fIIP\fR> 
+.SH DESCRIPTION
+Remove device from subnet
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fISUBNET\fR>
+
+.TP
+<\fIIP\fR>
+
diff --git a/core/man/start-cli/start-cli-tunnel-device-show-config.1 b/core/man/start-cli/start-cli-tunnel-device-show-config.1
new file mode 100644
index 000000000..29ca6b371
--- /dev/null
+++ b/core/man/start-cli/start-cli-tunnel-device-show-config.1
@@ -0,0 +1,22 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-tunnel-device-show-config 1  "show-config " 
+.SH NAME
+start\-cli\-tunnel\-device\-show\-config \- Show WireGuard configuration for device
+.SH SYNOPSIS
+\fBstart\-cli tunnel device show\-config\fR [\fB\-h\fR|\fB\-\-help\fR] <\fISUBNET\fR> <\fIIP\fR> [\fIWAN_ADDR\fR] 
+.SH DESCRIPTION
+Show WireGuard configuration for device
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fISUBNET\fR>
+
+.TP
+<\fIIP\fR>
+
+.TP
+[\fIWAN_ADDR\fR]
+
diff --git a/core/man/start-cli/start-cli-tunnel-device.1 b/core/man/start-cli/start-cli-tunnel-device.1
new file mode 100644
index 000000000..f3d469834
--- /dev/null
+++ b/core/man/start-cli/start-cli-tunnel-device.1
@@ -0,0 +1,26 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-tunnel-device 1  "device " 
+.SH NAME
+start\-cli\-tunnel\-device \- Add, remove, or list devices in subnets
+.SH SYNOPSIS
+\fBstart\-cli tunnel device\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIsubcommands\fR>
+.SH DESCRIPTION
+Add, remove, or list devices in subnets
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.SH SUBCOMMANDS
+.TP
+start\-cli\-tunnel\-device\-add(1)
+Add a device to a subnet
+.TP
+start\-cli\-tunnel\-device\-list(1)
+List devices in a subnet
+.TP
+start\-cli\-tunnel\-device\-remove(1)
+Remove device from subnet
+.TP
+start\-cli\-tunnel\-device\-show\-config(1)
+Show WireGuard configuration for device
diff --git a/core/man/start-cli/start-cli-tunnel-port-forward-add.1 b/core/man/start-cli/start-cli-tunnel-port-forward-add.1
new file mode 100644
index 000000000..14e966d87
--- /dev/null
+++ b/core/man/start-cli/start-cli-tunnel-port-forward-add.1
@@ -0,0 +1,22 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-tunnel-port-forward-add 1  "add " 
+.SH NAME
+start\-cli\-tunnel\-port\-forward\-add \- Add a new port forward
+.SH SYNOPSIS
+\fBstart\-cli tunnel port\-forward add\fR [\fB\-\-label\fR] [\fB\-h\fR|\fB\-\-help\fR] <\fISOURCE\fR> <\fITARGET\fR> 
+.SH DESCRIPTION
+Add a new port forward
+.SH OPTIONS
+.TP
+\fB\-\-label\fR \fI<LABEL>\fR
+
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fISOURCE\fR>
+
+.TP
+<\fITARGET\fR>
+
diff --git a/core/man/start-cli/start-cli-tunnel-port-forward-remove.1 b/core/man/start-cli/start-cli-tunnel-port-forward-remove.1
new file mode 100644
index 000000000..0bd78a871
--- /dev/null
+++ b/core/man/start-cli/start-cli-tunnel-port-forward-remove.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-tunnel-port-forward-remove 1  "remove " 
+.SH NAME
+start\-cli\-tunnel\-port\-forward\-remove \- Remove port forward
+.SH SYNOPSIS
+\fBstart\-cli tunnel port\-forward remove\fR [\fB\-h\fR|\fB\-\-help\fR] <\fISOURCE\fR> 
+.SH DESCRIPTION
+Remove port forward
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fISOURCE\fR>
+
diff --git a/core/man/start-cli/start-cli-tunnel-port-forward-set-enabled.1 b/core/man/start-cli/start-cli-tunnel-port-forward-set-enabled.1
new file mode 100644
index 000000000..bf4bec64e
--- /dev/null
+++ b/core/man/start-cli/start-cli-tunnel-port-forward-set-enabled.1
@@ -0,0 +1,19 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-tunnel-port-forward-set-enabled 1  "set-enabled " 
+.SH NAME
+start\-cli\-tunnel\-port\-forward\-set\-enabled \- about.enable\-or\-disable\-port\-forward
+.SH SYNOPSIS
+\fBstart\-cli tunnel port\-forward set\-enabled\fR [\fB\-\-enabled\fR] [\fB\-h\fR|\fB\-\-help\fR] <\fISOURCE\fR> 
+.SH DESCRIPTION
+about.enable\-or\-disable\-port\-forward
+.SH OPTIONS
+.TP
+\fB\-\-enabled\fR
+
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fISOURCE\fR>
+
diff --git a/core/man/start-cli/start-cli-tunnel-port-forward-update-label.1 b/core/man/start-cli/start-cli-tunnel-port-forward-update-label.1
new file mode 100644
index 000000000..5b3c767e0
--- /dev/null
+++ b/core/man/start-cli/start-cli-tunnel-port-forward-update-label.1
@@ -0,0 +1,19 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-tunnel-port-forward-update-label 1  "update-label " 
+.SH NAME
+start\-cli\-tunnel\-port\-forward\-update\-label \- about.update\-port\-forward\-label
+.SH SYNOPSIS
+\fBstart\-cli tunnel port\-forward update\-label\fR [\fB\-h\fR|\fB\-\-help\fR] <\fISOURCE\fR> [\fILABEL\fR] 
+.SH DESCRIPTION
+about.update\-port\-forward\-label
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fISOURCE\fR>
+
+.TP
+[\fILABEL\fR]
+
diff --git a/core/man/start-cli/start-cli-tunnel-port-forward.1 b/core/man/start-cli/start-cli-tunnel-port-forward.1
new file mode 100644
index 000000000..d8024ae99
--- /dev/null
+++ b/core/man/start-cli/start-cli-tunnel-port-forward.1
@@ -0,0 +1,25 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-tunnel-port-forward 1  "port-forward " 
+.SH NAME
+start\-cli\-tunnel\-port\-forward
+.SH SYNOPSIS
+\fBstart\-cli tunnel port\-forward\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIsubcommands\fR>
+.SH DESCRIPTION
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.SH SUBCOMMANDS
+.TP
+start\-cli\-tunnel\-port\-forward\-add(1)
+Add a new port forward
+.TP
+start\-cli\-tunnel\-port\-forward\-remove(1)
+Remove port forward
+.TP
+start\-cli\-tunnel\-port\-forward\-set\-enabled(1)
+about.enable\-or\-disable\-port\-forward
+.TP
+start\-cli\-tunnel\-port\-forward\-update\-label(1)
+about.update\-port\-forward\-label
diff --git a/core/man/start-cli/start-cli-tunnel-restart.1 b/core/man/start-cli/start-cli-tunnel-restart.1
new file mode 100644
index 000000000..5f2e073e4
--- /dev/null
+++ b/core/man/start-cli/start-cli-tunnel-restart.1
@@ -0,0 +1,13 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-tunnel-restart 1  "restart " 
+.SH NAME
+start\-cli\-tunnel\-restart \- Reboot the tunnel server
+.SH SYNOPSIS
+\fBstart\-cli tunnel restart\fR [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+Reboot the tunnel server
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-cli/start-cli-tunnel-subnet-add.1 b/core/man/start-cli/start-cli-tunnel-subnet-add.1
new file mode 100644
index 000000000..18c52867a
--- /dev/null
+++ b/core/man/start-cli/start-cli-tunnel-subnet-add.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-tunnel-subnet-add 1  "add " 
+.SH NAME
+start\-cli\-tunnel\-subnet\-add \- Add a new subnet
+.SH SYNOPSIS
+\fBstart\-cli tunnel subnet add\fR [\fB\-h\fR|\fB\-\-help\fR] <\fINAME\fR> 
+.SH DESCRIPTION
+Add a new subnet
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fINAME\fR>
+
diff --git a/core/man/start-cli/start-cli-tunnel-subnet-remove.1 b/core/man/start-cli/start-cli-tunnel-subnet-remove.1
new file mode 100644
index 000000000..552599b75
--- /dev/null
+++ b/core/man/start-cli/start-cli-tunnel-subnet-remove.1
@@ -0,0 +1,13 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-tunnel-subnet-remove 1  "remove " 
+.SH NAME
+start\-cli\-tunnel\-subnet\-remove \- Remove a subnet
+.SH SYNOPSIS
+\fBstart\-cli tunnel subnet remove\fR [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+Remove a subnet
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-cli/start-cli-tunnel-subnet.1 b/core/man/start-cli/start-cli-tunnel-subnet.1
new file mode 100644
index 000000000..3c13e8344
--- /dev/null
+++ b/core/man/start-cli/start-cli-tunnel-subnet.1
@@ -0,0 +1,23 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-tunnel-subnet 1  "subnet " 
+.SH NAME
+start\-cli\-tunnel\-subnet \- Add, remove, or modify subnets
+.SH SYNOPSIS
+\fBstart\-cli tunnel subnet\fR [\fB\-h\fR|\fB\-\-help\fR] <\fISUBNET\fR> <\fIsubcommands\fR>
+.SH DESCRIPTION
+Add, remove, or modify subnets
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fISUBNET\fR>
+
+.SH SUBCOMMANDS
+.TP
+start\-cli\-tunnel\-subnet\-add(1)
+Add a new subnet
+.TP
+start\-cli\-tunnel\-subnet\-remove(1)
+Remove a subnet
diff --git a/core/man/start-cli/start-cli-tunnel-update-apply.1 b/core/man/start-cli/start-cli-tunnel-update-apply.1
new file mode 100644
index 000000000..10e2f8109
--- /dev/null
+++ b/core/man/start-cli/start-cli-tunnel-update-apply.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-tunnel-update-apply 1  "apply " 
+.SH NAME
+start\-cli\-tunnel\-update\-apply \- Apply available update
+.SH SYNOPSIS
+\fBstart\-cli tunnel update apply\fR [\fB\-\-format\fR] [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+Apply available update
+.SH OPTIONS
+.TP
+\fB\-\-format\fR
+
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-cli/start-cli-tunnel-update-check.1 b/core/man/start-cli/start-cli-tunnel-update-check.1
new file mode 100644
index 000000000..4d0b78b02
--- /dev/null
+++ b/core/man/start-cli/start-cli-tunnel-update-check.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-tunnel-update-check 1  "check " 
+.SH NAME
+start\-cli\-tunnel\-update\-check \- Check for available updates
+.SH SYNOPSIS
+\fBstart\-cli tunnel update check\fR [\fB\-\-format\fR] [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+Check for available updates
+.SH OPTIONS
+.TP
+\fB\-\-format\fR
+
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-cli/start-cli-tunnel-update.1 b/core/man/start-cli/start-cli-tunnel-update.1
new file mode 100644
index 000000000..e2fadb260
--- /dev/null
+++ b/core/man/start-cli/start-cli-tunnel-update.1
@@ -0,0 +1,19 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-tunnel-update 1  "update " 
+.SH NAME
+start\-cli\-tunnel\-update
+.SH SYNOPSIS
+\fBstart\-cli tunnel update\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIsubcommands\fR>
+.SH DESCRIPTION
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.SH SUBCOMMANDS
+.TP
+start\-cli\-tunnel\-update\-apply(1)
+Apply available update
+.TP
+start\-cli\-tunnel\-update\-check(1)
+Check for available updates
diff --git a/core/man/start-cli/start-cli-tunnel-web-disable.1 b/core/man/start-cli/start-cli-tunnel-web-disable.1
new file mode 100644
index 000000000..d81258793
--- /dev/null
+++ b/core/man/start-cli/start-cli-tunnel-web-disable.1
@@ -0,0 +1,13 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-tunnel-web-disable 1  "disable " 
+.SH NAME
+start\-cli\-tunnel\-web\-disable \- Disable the webserver
+.SH SYNOPSIS
+\fBstart\-cli tunnel web disable\fR [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+Disable the webserver
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-cli/start-cli-tunnel-web-enable.1 b/core/man/start-cli/start-cli-tunnel-web-enable.1
new file mode 100644
index 000000000..579ab383a
--- /dev/null
+++ b/core/man/start-cli/start-cli-tunnel-web-enable.1
@@ -0,0 +1,13 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-tunnel-web-enable 1  "enable " 
+.SH NAME
+start\-cli\-tunnel\-web\-enable \- Enable the webserver
+.SH SYNOPSIS
+\fBstart\-cli tunnel web enable\fR [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+Enable the webserver
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-cli/start-cli-tunnel-web-generate-certificate.1 b/core/man/start-cli/start-cli-tunnel-web-generate-certificate.1
new file mode 100644
index 000000000..4fb220243
--- /dev/null
+++ b/core/man/start-cli/start-cli-tunnel-web-generate-certificate.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-tunnel-web-generate-certificate 1  "generate-certificate " 
+.SH NAME
+start\-cli\-tunnel\-web\-generate\-certificate \- Generate a certificate for the webserver
+.SH SYNOPSIS
+\fBstart\-cli tunnel web generate\-certificate\fR [\fB\-h\fR|\fB\-\-help\fR] [\fISUBJECT\fR] 
+.SH DESCRIPTION
+Generate a certificate for the webserver
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+[\fISUBJECT\fR]
+Subject Alternative Name(s) for certificate
diff --git a/core/man/start-cli/start-cli-tunnel-web-get-available-ips.1 b/core/man/start-cli/start-cli-tunnel-web-get-available-ips.1
new file mode 100644
index 000000000..0a839eef6
--- /dev/null
+++ b/core/man/start-cli/start-cli-tunnel-web-get-available-ips.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-tunnel-web-get-available-ips 1  "get-available-ips " 
+.SH NAME
+start\-cli\-tunnel\-web\-get\-available\-ips \- Get available IP addresses to bind
+.SH SYNOPSIS
+\fBstart\-cli tunnel web get\-available\-ips\fR [\fB\-\-format\fR] [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+Get available IP addresses to bind
+.SH OPTIONS
+.TP
+\fB\-\-format\fR
+
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-cli/start-cli-tunnel-web-get-certificate.1 b/core/man/start-cli/start-cli-tunnel-web-get-certificate.1
new file mode 100644
index 000000000..fc77b2b74
--- /dev/null
+++ b/core/man/start-cli/start-cli-tunnel-web-get-certificate.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-tunnel-web-get-certificate 1  "get-certificate " 
+.SH NAME
+start\-cli\-tunnel\-web\-get\-certificate \- Get the certificate for the webserver
+.SH SYNOPSIS
+\fBstart\-cli tunnel web get\-certificate\fR [\fB\-\-format\fR] [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+Get the certificate for the webserver
+.SH OPTIONS
+.TP
+\fB\-\-format\fR
+
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-cli/start-cli-tunnel-web-get-listen.1 b/core/man/start-cli/start-cli-tunnel-web-get-listen.1
new file mode 100644
index 000000000..8ed3b31aa
--- /dev/null
+++ b/core/man/start-cli/start-cli-tunnel-web-get-listen.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-tunnel-web-get-listen 1  "get-listen " 
+.SH NAME
+start\-cli\-tunnel\-web\-get\-listen \- Get the listen address for the webserver
+.SH SYNOPSIS
+\fBstart\-cli tunnel web get\-listen\fR [\fB\-\-format\fR] [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+Get the listen address for the webserver
+.SH OPTIONS
+.TP
+\fB\-\-format\fR
+
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-cli/start-cli-tunnel-web-import-certificate.1 b/core/man/start-cli/start-cli-tunnel-web-import-certificate.1
new file mode 100644
index 000000000..f14b0ea6e
--- /dev/null
+++ b/core/man/start-cli/start-cli-tunnel-web-import-certificate.1
@@ -0,0 +1,13 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-tunnel-web-import-certificate 1  "import-certificate " 
+.SH NAME
+start\-cli\-tunnel\-web\-import\-certificate \- Import a certificate for the webserver
+.SH SYNOPSIS
+\fBstart\-cli tunnel web import\-certificate\fR [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+Import a certificate for the webserver
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-cli/start-cli-tunnel-web-init.1 b/core/man/start-cli/start-cli-tunnel-web-init.1
new file mode 100644
index 000000000..9a6bceaae
--- /dev/null
+++ b/core/man/start-cli/start-cli-tunnel-web-init.1
@@ -0,0 +1,13 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-tunnel-web-init 1  "init " 
+.SH NAME
+start\-cli\-tunnel\-web\-init \- Initialize the webserver
+.SH SYNOPSIS
+\fBstart\-cli tunnel web init\fR [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+Initialize the webserver
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-cli/start-cli-tunnel-web-set-listen.1 b/core/man/start-cli/start-cli-tunnel-web-set-listen.1
new file mode 100644
index 000000000..893ade0b2
--- /dev/null
+++ b/core/man/start-cli/start-cli-tunnel-web-set-listen.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-tunnel-web-set-listen 1  "set-listen " 
+.SH NAME
+start\-cli\-tunnel\-web\-set\-listen \- Set the listen address for the webserver
+.SH SYNOPSIS
+\fBstart\-cli tunnel web set\-listen\fR [\fB\-h\fR|\fB\-\-help\fR] <\fILISTEN\fR> 
+.SH DESCRIPTION
+Set the listen address for the webserver
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fILISTEN\fR>
+Address to listen on
diff --git a/core/man/start-cli/start-cli-tunnel-web-uninit.1 b/core/man/start-cli/start-cli-tunnel-web-uninit.1
new file mode 100644
index 000000000..97815b569
--- /dev/null
+++ b/core/man/start-cli/start-cli-tunnel-web-uninit.1
@@ -0,0 +1,13 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-tunnel-web-uninit 1  "uninit " 
+.SH NAME
+start\-cli\-tunnel\-web\-uninit \- Uninitialize the webserver
+.SH SYNOPSIS
+\fBstart\-cli tunnel web uninit\fR [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+Uninitialize the webserver
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-cli/start-cli-tunnel-web.1 b/core/man/start-cli/start-cli-tunnel-web.1
new file mode 100644
index 000000000..1c4c5debf
--- /dev/null
+++ b/core/man/start-cli/start-cli-tunnel-web.1
@@ -0,0 +1,43 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-tunnel-web 1  "web " 
+.SH NAME
+start\-cli\-tunnel\-web
+.SH SYNOPSIS
+\fBstart\-cli tunnel web\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIsubcommands\fR>
+.SH DESCRIPTION
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.SH SUBCOMMANDS
+.TP
+start\-cli\-tunnel\-web\-disable(1)
+Disable the webserver
+.TP
+start\-cli\-tunnel\-web\-enable(1)
+Enable the webserver
+.TP
+start\-cli\-tunnel\-web\-generate\-certificate(1)
+Generate a certificate for the webserver
+.TP
+start\-cli\-tunnel\-web\-get\-available\-ips(1)
+Get available IP addresses to bind
+.TP
+start\-cli\-tunnel\-web\-get\-certificate(1)
+Get the certificate for the webserver
+.TP
+start\-cli\-tunnel\-web\-get\-listen(1)
+Get the listen address for the webserver
+.TP
+start\-cli\-tunnel\-web\-import\-certificate(1)
+Import a certificate for the webserver
+.TP
+start\-cli\-tunnel\-web\-init(1)
+Initialize the webserver
+.TP
+start\-cli\-tunnel\-web\-set\-listen(1)
+Set the listen address for the webserver
+.TP
+start\-cli\-tunnel\-web\-uninit(1)
+Uninitialize the webserver
diff --git a/core/man/start-cli/start-cli-tunnel.1 b/core/man/start-cli/start-cli-tunnel.1
new file mode 100644
index 000000000..f41de599c
--- /dev/null
+++ b/core/man/start-cli/start-cli-tunnel.1
@@ -0,0 +1,35 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-tunnel 1  "tunnel " 
+.SH NAME
+start\-cli\-tunnel \- Commands related to StartTunnel
+.SH SYNOPSIS
+\fBstart\-cli tunnel\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIsubcommands\fR>
+.SH DESCRIPTION
+Commands related to StartTunnel
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.SH SUBCOMMANDS
+.TP
+start\-cli\-tunnel\-auth(1)
+Add or remove authorized clients
+.TP
+start\-cli\-tunnel\-db(1)
+Commands to interact with the db i.e. dump and apply
+.TP
+start\-cli\-tunnel\-device(1)
+Add, remove, or list devices in subnets
+.TP
+start\-cli\-tunnel\-port\-forward(1)
+.TP
+start\-cli\-tunnel\-restart(1)
+Reboot the tunnel server
+.TP
+start\-cli\-tunnel\-subnet(1)
+Add, remove, or modify subnets
+.TP
+start\-cli\-tunnel\-update(1)
+.TP
+start\-cli\-tunnel\-web(1)
diff --git a/core/man/start-cli/start-cli-util-b3sum.1 b/core/man/start-cli/start-cli-util-b3sum.1
new file mode 100644
index 000000000..eb0b01c16
--- /dev/null
+++ b/core/man/start-cli/start-cli-util-b3sum.1
@@ -0,0 +1,19 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-util-b3sum 1  "b3sum " 
+.SH NAME
+start\-cli\-util\-b3sum \- Calculate blake3 hash for a file
+.SH SYNOPSIS
+\fBstart\-cli util b3sum\fR [\fB\-\-no\-mmap\fR] [\fB\-h\fR|\fB\-\-help\fR] <\fIFILE\fR> 
+.SH DESCRIPTION
+Calculate blake3 hash for a file
+.SH OPTIONS
+.TP
+\fB\-\-no\-mmap\fR
+Disable memory\-mapped file I/O
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIFILE\fR>
+
diff --git a/core/man/start-cli/start-cli-util.1 b/core/man/start-cli/start-cli-util.1
new file mode 100644
index 000000000..268ff01ac
--- /dev/null
+++ b/core/man/start-cli/start-cli-util.1
@@ -0,0 +1,17 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-util 1  "util " 
+.SH NAME
+start\-cli\-util \- Command for calculating the blake3 hash of a file
+.SH SYNOPSIS
+\fBstart\-cli util\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIsubcommands\fR>
+.SH DESCRIPTION
+Command for calculating the blake3 hash of a file
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.SH SUBCOMMANDS
+.TP
+start\-cli\-util\-b3sum(1)
+Calculate blake3 hash for a file
diff --git a/core/man/start-cli/start-cli-wifi-add.1 b/core/man/start-cli/start-cli-wifi-add.1
new file mode 100644
index 000000000..07ecd3fdb
--- /dev/null
+++ b/core/man/start-cli/start-cli-wifi-add.1
@@ -0,0 +1,19 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-wifi-add 1  "add " 
+.SH NAME
+start\-cli\-wifi\-add \- Add wifi ssid and password
+.SH SYNOPSIS
+\fBstart\-cli wifi add\fR [\fB\-h\fR|\fB\-\-help\fR] <\fISSID\fR> <\fIPASSWORD\fR> 
+.SH DESCRIPTION
+Add wifi ssid and password
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fISSID\fR>
+WiFi network SSID
+.TP
+<\fIPASSWORD\fR>
+WiFi network password
diff --git a/core/man/start-cli/start-cli-wifi-available-get.1 b/core/man/start-cli/start-cli-wifi-available-get.1
new file mode 100644
index 000000000..b5ad55f28
--- /dev/null
+++ b/core/man/start-cli/start-cli-wifi-available-get.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-wifi-available-get 1  "get " 
+.SH NAME
+start\-cli\-wifi\-available\-get \- List available wifi networks
+.SH SYNOPSIS
+\fBstart\-cli wifi available get\fR [\fB\-\-format\fR] [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+List available wifi networks
+.SH OPTIONS
+.TP
+\fB\-\-format\fR
+
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-cli/start-cli-wifi-available.1 b/core/man/start-cli/start-cli-wifi-available.1
new file mode 100644
index 000000000..769a597c2
--- /dev/null
+++ b/core/man/start-cli/start-cli-wifi-available.1
@@ -0,0 +1,17 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-wifi-available 1  "available " 
+.SH NAME
+start\-cli\-wifi\-available \- Command to list available wifi networks
+.SH SYNOPSIS
+\fBstart\-cli wifi available\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIsubcommands\fR>
+.SH DESCRIPTION
+Command to list available wifi networks
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.SH SUBCOMMANDS
+.TP
+start\-cli\-wifi\-available\-get(1)
+List available wifi networks
diff --git a/core/man/start-cli/start-cli-wifi-connect.1 b/core/man/start-cli/start-cli-wifi-connect.1
new file mode 100644
index 000000000..36dc7f6b3
--- /dev/null
+++ b/core/man/start-cli/start-cli-wifi-connect.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-wifi-connect 1  "connect " 
+.SH NAME
+start\-cli\-wifi\-connect \- Connect to a wifi network
+.SH SYNOPSIS
+\fBstart\-cli wifi connect\fR [\fB\-h\fR|\fB\-\-help\fR] <\fISSID\fR> 
+.SH DESCRIPTION
+Connect to a wifi network
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fISSID\fR>
+WiFi network SSID
diff --git a/core/man/start-cli/start-cli-wifi-country-set.1 b/core/man/start-cli/start-cli-wifi-country-set.1
new file mode 100644
index 000000000..519de8502
--- /dev/null
+++ b/core/man/start-cli/start-cli-wifi-country-set.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-wifi-country-set 1  "set " 
+.SH NAME
+start\-cli\-wifi\-country\-set \- Set the country
+.SH SYNOPSIS
+\fBstart\-cli wifi country set\fR [\fB\-h\fR|\fB\-\-help\fR] <\fICOUNTRY\fR> 
+.SH DESCRIPTION
+Set the country
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fICOUNTRY\fR>
+ISO 3166\-1 alpha\-2 WiFi country code
diff --git a/core/man/start-cli/start-cli-wifi-country.1 b/core/man/start-cli/start-cli-wifi-country.1
new file mode 100644
index 000000000..19ab7d2e1
--- /dev/null
+++ b/core/man/start-cli/start-cli-wifi-country.1
@@ -0,0 +1,17 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-wifi-country 1  "country " 
+.SH NAME
+start\-cli\-wifi\-country \- Command to set country
+.SH SYNOPSIS
+\fBstart\-cli wifi country\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIsubcommands\fR>
+.SH DESCRIPTION
+Command to set country
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.SH SUBCOMMANDS
+.TP
+start\-cli\-wifi\-country\-set(1)
+Set the country
diff --git a/core/man/start-cli/start-cli-wifi-get.1 b/core/man/start-cli/start-cli-wifi-get.1
new file mode 100644
index 000000000..89f77c4e8
--- /dev/null
+++ b/core/man/start-cli/start-cli-wifi-get.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-wifi-get 1  "get " 
+.SH NAME
+start\-cli\-wifi\-get \- List wifi information
+.SH SYNOPSIS
+\fBstart\-cli wifi get\fR [\fB\-\-format\fR] [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+List wifi information
+.SH OPTIONS
+.TP
+\fB\-\-format\fR
+
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-cli/start-cli-wifi-remove.1 b/core/man/start-cli/start-cli-wifi-remove.1
new file mode 100644
index 000000000..aef22eb92
--- /dev/null
+++ b/core/man/start-cli/start-cli-wifi-remove.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-wifi-remove 1  "remove " 
+.SH NAME
+start\-cli\-wifi\-remove \- Remove a wifi network
+.SH SYNOPSIS
+\fBstart\-cli wifi remove\fR [\fB\-h\fR|\fB\-\-help\fR] <\fISSID\fR> 
+.SH DESCRIPTION
+Remove a wifi network
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fISSID\fR>
+WiFi network SSID
diff --git a/core/man/start-cli/start-cli-wifi-set-enabled.1 b/core/man/start-cli/start-cli-wifi-set-enabled.1
new file mode 100644
index 000000000..cfdb04ace
--- /dev/null
+++ b/core/man/start-cli/start-cli-wifi-set-enabled.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-wifi-set-enabled 1  "set-enabled " 
+.SH NAME
+start\-cli\-wifi\-set\-enabled \- Enable or disable wifi
+.SH SYNOPSIS
+\fBstart\-cli wifi set\-enabled\fR [\fB\-\-enabled\fR] [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+Enable or disable wifi
+.SH OPTIONS
+.TP
+\fB\-\-enabled\fR
+Enable or disable WiFi
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-cli/start-cli-wifi.1 b/core/man/start-cli/start-cli-wifi.1
new file mode 100644
index 000000000..0369d02a0
--- /dev/null
+++ b/core/man/start-cli/start-cli-wifi.1
@@ -0,0 +1,35 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli-wifi 1  "wifi " 
+.SH NAME
+start\-cli\-wifi \- Commands related to wifi networks i.e. add, connect, delete
+.SH SYNOPSIS
+\fBstart\-cli wifi\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIsubcommands\fR>
+.SH DESCRIPTION
+Commands related to wifi networks i.e. add, connect, delete
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.SH SUBCOMMANDS
+.TP
+start\-cli\-wifi\-add(1)
+Add wifi ssid and password
+.TP
+start\-cli\-wifi\-available(1)
+Command to list available wifi networks
+.TP
+start\-cli\-wifi\-connect(1)
+Connect to a wifi network
+.TP
+start\-cli\-wifi\-country(1)
+Command to set country
+.TP
+start\-cli\-wifi\-get(1)
+List wifi information
+.TP
+start\-cli\-wifi\-remove(1)
+Remove a wifi network
+.TP
+start\-cli\-wifi\-set\-enabled(1)
+Enable or disable wifi
diff --git a/core/man/start-cli/start-cli.1 b/core/man/start-cli/start-cli.1
new file mode 100644
index 000000000..b10d110f9
--- /dev/null
+++ b/core/man/start-cli/start-cli.1
@@ -0,0 +1,120 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-cli 1  "start-cli 0.4.0-alpha.21" 
+.SH NAME
+start\-cli
+.SH SYNOPSIS
+\fBstart\-cli\fR [\fB\-c\fR|\fB\-\-config\fR] [\fB\-H\fR|\fB\-\-host\fR] [\fB\-r\fR|\fB\-\-registry\fR] [\fB\-\-registry\-hostname\fR] [\fB\-\-s9pk\-s3base\fR] [\fB\-\-s9pk\-s3bucket\fR] [\fB\-t\fR|\fB\-\-tunnel\fR] [\fB\-p\fR|\fB\-\-proxy\fR] [\fB\-\-cookie\-path\fR] [\fB\-\-developer\-key\-path\fR] [\fB\-h\fR|\fB\-\-help\fR] [\fB\-V\fR|\fB\-\-version\fR] [\fIsubcommands\fR]
+.SH DESCRIPTION
+.SH OPTIONS
+.TP
+\fB\-c\fR, \fB\-\-config\fR \fI<CONFIG>\fR
+Path to configuration file
+.TP
+\fB\-H\fR, \fB\-\-host\fR \fI<HOST>\fR
+URL of the StartOS server
+.TP
+\fB\-r\fR, \fB\-\-registry\fR \fI<REGISTRY>\fR
+URL of the registry
+.TP
+\fB\-\-registry\-hostname\fR \fI<REGISTRY_HOSTNAME>\fR
+Registry server hostname
+.TP
+\fB\-\-s9pk\-s3base\fR \fI<S9PK_S3BASE>\fR
+Base URL for publishing s9pks
+.TP
+\fB\-\-s9pk\-s3bucket\fR \fI<S9PK_S3BUCKET>\fR
+S3 bucket to publish s9pks to (should correspond to s3base)
+.TP
+\fB\-t\fR, \fB\-\-tunnel\fR \fI<TUNNEL>\fR
+Tunnel server address
+.TP
+\fB\-p\fR, \fB\-\-proxy\fR \fI<PROXY>\fR
+HTTP/SOCKS proxy URL
+.TP
+\fB\-\-cookie\-path\fR \fI<COOKIE_PATH>\fR
+Path to cookie file
+.TP
+\fB\-\-developer\-key\-path\fR \fI<DEVELOPER_KEY_PATH>\fR
+Path to developer signing key
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+\fB\-V\fR, \fB\-\-version\fR
+Print version
+.SH SUBCOMMANDS
+.TP
+start\-cli\-auth(1)
+Commands related to Authentication i.e. login, logout
+.TP
+start\-cli\-backup(1)
+Commands related to backup creation and backup targets
+.TP
+start\-cli\-db(1)
+Commands to interact with the db i.e. dump, put, apply
+.TP
+start\-cli\-diagnostic(1)
+Commands to display logs, restart the server, etc
+.TP
+start\-cli\-disk(1)
+Commands for listing disk info and repairing
+.TP
+start\-cli\-echo(1)
+Echo a message back
+.TP
+start\-cli\-flash\-os(1)
+Flash StartOS to a drive
+.TP
+start\-cli\-git\-info(1)
+Display the git hash of this build
+.TP
+start\-cli\-init(1)
+Commands for initialization
+.TP
+start\-cli\-init\-key(1)
+Create a new developer key
+.TP
+start\-cli\-kiosk(1)
+Commands for kiosk mode
+.TP
+start\-cli\-net(1)
+Network commands
+.TP
+start\-cli\-notification(1)
+Create, delete, or list notifications
+.TP
+start\-cli\-package(1)
+Commands related to packages
+.TP
+start\-cli\-pubkey(1)
+Get the developer public key
+.TP
+start\-cli\-registry(1)
+Commands related to the registry
+.TP
+start\-cli\-s9pk(1)
+Commands for interacting with s9pk files
+.TP
+start\-cli\-server(1)
+Commands related to the server i.e. restart, update, and shutdown
+.TP
+start\-cli\-setup(1)
+Commands related to the initial setup
+.TP
+start\-cli\-ssh(1)
+Commands for interacting with ssh keys i.e. add, delete, list
+.TP
+start\-cli\-state(1)
+Display the current api specification
+.TP
+start\-cli\-tunnel(1)
+Commands related to StartTunnel
+.TP
+start\-cli\-util(1)
+Command for calculating the blake3 hash of a file
+.TP
+start\-cli\-wifi(1)
+Commands related to wifi networks i.e. add, connect, delete
+.SH VERSION
+v0.4.0\-alpha.21
diff --git a/core/man/start-container/start-container-action-clear-tasks.1 b/core/man/start-container/start-container-action-clear-tasks.1
new file mode 100644
index 000000000..23285d8c7
--- /dev/null
+++ b/core/man/start-container/start-container-action-clear-tasks.1
@@ -0,0 +1,18 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-container-action-clear-tasks 1  "clear-tasks " 
+.SH NAME
+start\-container\-action\-clear\-tasks
+.SH SYNOPSIS
+\fBstart\-container action clear\-tasks\fR [\fB\-\-only\fR] [\fB\-\-except\fR] [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+.SH OPTIONS
+.TP
+\fB\-\-only\fR \fI<ONLY>\fR
+Only clear these task IDs
+.TP
+\fB\-\-except\fR \fI<EXCEPT>\fR
+Task IDs to exclude
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-container/start-container-action-clear.1 b/core/man/start-container/start-container-action-clear.1
new file mode 100644
index 000000000..cb0d05df5
--- /dev/null
+++ b/core/man/start-container/start-container-action-clear.1
@@ -0,0 +1,15 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-container-action-clear 1  "clear " 
+.SH NAME
+start\-container\-action\-clear
+.SH SYNOPSIS
+\fBstart\-container action clear\fR [\fB\-\-except\fR] [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+.SH OPTIONS
+.TP
+\fB\-\-except\fR \fI<EXCEPT>\fR
+Action IDs to exclude
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-container/start-container-action-get-input.1 b/core/man/start-container/start-container-action-get-input.1
new file mode 100644
index 000000000..2ab64b7aa
--- /dev/null
+++ b/core/man/start-container/start-container-action-get-input.1
@@ -0,0 +1,21 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-container-action-get-input 1  "get-input " 
+.SH NAME
+start\-container\-action\-get\-input
+.SH SYNOPSIS
+\fBstart\-container action get\-input\fR [\fB\-p\fR|\fB\-\-package\-id\fR] [\fB\-\-format\fR] [\fB\-h\fR|\fB\-\-help\fR] <\fIACTION_ID\fR> 
+.SH DESCRIPTION
+.SH OPTIONS
+.TP
+\fB\-p\fR, \fB\-\-package\-id\fR \fI<PACKAGE_ID>\fR
+Package identifier
+.TP
+\fB\-\-format\fR
+
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIACTION_ID\fR>
+Action identifier
diff --git a/core/man/start-container/start-container-action-run.1 b/core/man/start-container/start-container-action-run.1
new file mode 100644
index 000000000..ea8941646
--- /dev/null
+++ b/core/man/start-container/start-container-action-run.1
@@ -0,0 +1,24 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-container-action-run 1  "run " 
+.SH NAME
+start\-container\-action\-run
+.SH SYNOPSIS
+\fBstart\-container action run\fR [\fB\-p\fR|\fB\-\-package\-id\fR] [\fB\-\-format\fR] [\fB\-h\fR|\fB\-\-help\fR] <\fIACTION_ID\fR> <\fIINPUT\fR> 
+.SH DESCRIPTION
+.SH OPTIONS
+.TP
+\fB\-p\fR, \fB\-\-package\-id\fR \fI<PACKAGE_ID>\fR
+Package identifier
+.TP
+\fB\-\-format\fR
+
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIACTION_ID\fR>
+Action identifier
+.TP
+<\fIINPUT\fR>
+Input data for the action
diff --git a/core/man/start-container/start-container-action.1 b/core/man/start-container/start-container-action.1
new file mode 100644
index 000000000..5ac56b098
--- /dev/null
+++ b/core/man/start-container/start-container-action.1
@@ -0,0 +1,21 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-container-action 1  "action " 
+.SH NAME
+start\-container\-action
+.SH SYNOPSIS
+\fBstart\-container action\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIsubcommands\fR>
+.SH DESCRIPTION
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.SH SUBCOMMANDS
+.TP
+start\-container\-action\-clear(1)
+.TP
+start\-container\-action\-clear\-tasks(1)
+.TP
+start\-container\-action\-get\-input(1)
+.TP
+start\-container\-action\-run(1)
diff --git a/core/man/start-container/start-container-check-dependencies.1 b/core/man/start-container/start-container-check-dependencies.1
new file mode 100644
index 000000000..967058708
--- /dev/null
+++ b/core/man/start-container/start-container-check-dependencies.1
@@ -0,0 +1,15 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-container-check-dependencies 1  "check-dependencies " 
+.SH NAME
+start\-container\-check\-dependencies
+.SH SYNOPSIS
+\fBstart\-container check\-dependencies\fR [\fB\-h\fR|\fB\-\-help\fR] [\fIPACKAGE_IDS\fR] 
+.SH DESCRIPTION
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+[\fIPACKAGE_IDS\fR]
+
diff --git a/core/man/start-container/start-container-echo.1 b/core/man/start-container/start-container-echo.1
new file mode 100644
index 000000000..e9d805f4c
--- /dev/null
+++ b/core/man/start-container/start-container-echo.1
@@ -0,0 +1,15 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-container-echo 1  "echo " 
+.SH NAME
+start\-container\-echo
+.SH SYNOPSIS
+\fBstart\-container echo\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIMESSAGE\fR> 
+.SH DESCRIPTION
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIMESSAGE\fR>
+Message to echo back
diff --git a/core/man/start-container/start-container-get-data-version.1 b/core/man/start-container/start-container-get-data-version.1
new file mode 100644
index 000000000..dcfc974c2
--- /dev/null
+++ b/core/man/start-container/start-container-get-data-version.1
@@ -0,0 +1,12 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-container-get-data-version 1  "get-data-version " 
+.SH NAME
+start\-container\-get\-data\-version
+.SH SYNOPSIS
+\fBstart\-container get\-data\-version\fR [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-container/start-container-get-dependencies.1 b/core/man/start-container/start-container-get-dependencies.1
new file mode 100644
index 000000000..5edbb4ba8
--- /dev/null
+++ b/core/man/start-container/start-container-get-dependencies.1
@@ -0,0 +1,12 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-container-get-dependencies 1  "get-dependencies " 
+.SH NAME
+start\-container\-get\-dependencies
+.SH SYNOPSIS
+\fBstart\-container get\-dependencies\fR [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-container/start-container-get-os-ip.1 b/core/man/start-container/start-container-get-os-ip.1
new file mode 100644
index 000000000..fa9c73a61
--- /dev/null
+++ b/core/man/start-container/start-container-get-os-ip.1
@@ -0,0 +1,12 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-container-get-os-ip 1  "get-os-ip " 
+.SH NAME
+start\-container\-get\-os\-ip
+.SH SYNOPSIS
+\fBstart\-container get\-os\-ip\fR [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-container/start-container-get-status.1 b/core/man/start-container/start-container-get-status.1
new file mode 100644
index 000000000..c5c85bd8f
--- /dev/null
+++ b/core/man/start-container/start-container-get-status.1
@@ -0,0 +1,15 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-container-get-status 1  "get-status " 
+.SH NAME
+start\-container\-get\-status
+.SH SYNOPSIS
+\fBstart\-container get\-status\fR [\fB\-h\fR|\fB\-\-help\fR] [\fIPACKAGE_ID\fR] 
+.SH DESCRIPTION
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+[\fIPACKAGE_ID\fR]
+
diff --git a/core/man/start-container/start-container-git-info.1 b/core/man/start-container/start-container-git-info.1
new file mode 100644
index 000000000..a572da857
--- /dev/null
+++ b/core/man/start-container/start-container-git-info.1
@@ -0,0 +1,12 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-container-git-info 1  "git-info " 
+.SH NAME
+start\-container\-git\-info
+.SH SYNOPSIS
+\fBstart\-container git\-info\fR [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-container/start-container-plugin-url.1 b/core/man/start-container/start-container-plugin-url.1
new file mode 100644
index 000000000..c7fa72fa7
--- /dev/null
+++ b/core/man/start-container/start-container-plugin-url.1
@@ -0,0 +1,12 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-container-plugin-url 1  "url " 
+.SH NAME
+start\-container\-plugin\-url
+.SH SYNOPSIS
+\fBstart\-container plugin url\fR [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-container/start-container-plugin.1 b/core/man/start-container/start-container-plugin.1
new file mode 100644
index 000000000..34178b5ca
--- /dev/null
+++ b/core/man/start-container/start-container-plugin.1
@@ -0,0 +1,15 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-container-plugin 1  "plugin " 
+.SH NAME
+start\-container\-plugin
+.SH SYNOPSIS
+\fBstart\-container plugin\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIsubcommands\fR>
+.SH DESCRIPTION
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.SH SUBCOMMANDS
+.TP
+start\-container\-plugin\-url(1)
diff --git a/core/man/start-container/start-container-rebuild.1 b/core/man/start-container/start-container-rebuild.1
new file mode 100644
index 000000000..e2aedb441
--- /dev/null
+++ b/core/man/start-container/start-container-rebuild.1
@@ -0,0 +1,12 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-container-rebuild 1  "rebuild " 
+.SH NAME
+start\-container\-rebuild
+.SH SYNOPSIS
+\fBstart\-container rebuild\fR [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-container/start-container-restart.1 b/core/man/start-container/start-container-restart.1
new file mode 100644
index 000000000..82e644f7e
--- /dev/null
+++ b/core/man/start-container/start-container-restart.1
@@ -0,0 +1,12 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-container-restart 1  "restart " 
+.SH NAME
+start\-container\-restart
+.SH SYNOPSIS
+\fBstart\-container restart\fR [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-container/start-container-set-data-version.1 b/core/man/start-container/start-container-set-data-version.1
new file mode 100644
index 000000000..5bcb4078b
--- /dev/null
+++ b/core/man/start-container/start-container-set-data-version.1
@@ -0,0 +1,15 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-container-set-data-version 1  "set-data-version " 
+.SH NAME
+start\-container\-set\-data\-version
+.SH SYNOPSIS
+\fBstart\-container set\-data\-version\fR [\fB\-h\fR|\fB\-\-help\fR] [\fIVERSION\fR] 
+.SH DESCRIPTION
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+[\fIVERSION\fR]
+
diff --git a/core/man/start-container/start-container-set-dependencies.1 b/core/man/start-container/start-container-set-dependencies.1
new file mode 100644
index 000000000..dedd21c4f
--- /dev/null
+++ b/core/man/start-container/start-container-set-dependencies.1
@@ -0,0 +1,15 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-container-set-dependencies 1  "set-dependencies " 
+.SH NAME
+start\-container\-set\-dependencies
+.SH SYNOPSIS
+\fBstart\-container set\-dependencies\fR [\fB\-h\fR|\fB\-\-help\fR] [\fIDEPENDENCIES\fR] 
+.SH DESCRIPTION
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+[\fIDEPENDENCIES\fR]
+
diff --git a/core/man/start-container/start-container-set-main-status.1 b/core/man/start-container/start-container-set-main-status.1
new file mode 100644
index 000000000..96aa6afe9
--- /dev/null
+++ b/core/man/start-container/start-container-set-main-status.1
@@ -0,0 +1,15 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-container-set-main-status 1  "set-main-status " 
+.SH NAME
+start\-container\-set\-main\-status
+.SH SYNOPSIS
+\fBstart\-container set\-main\-status\fR [\fB\-h\fR|\fB\-\-help\fR] <\fISTATUS\fR> 
+.SH DESCRIPTION
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fISTATUS\fR>
+
diff --git a/core/man/start-container/start-container-shutdown.1 b/core/man/start-container/start-container-shutdown.1
new file mode 100644
index 000000000..f0fd700f0
--- /dev/null
+++ b/core/man/start-container/start-container-shutdown.1
@@ -0,0 +1,12 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-container-shutdown 1  "shutdown " 
+.SH NAME
+start\-container\-shutdown
+.SH SYNOPSIS
+\fBstart\-container shutdown\fR [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-container/start-container-subcontainer-create-fs.1 b/core/man/start-container/start-container-subcontainer-create-fs.1
new file mode 100644
index 000000000..4e5e6333a
--- /dev/null
+++ b/core/man/start-container/start-container-subcontainer-create-fs.1
@@ -0,0 +1,18 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-container-subcontainer-create-fs 1  "create-fs " 
+.SH NAME
+start\-container\-subcontainer\-create\-fs
+.SH SYNOPSIS
+\fBstart\-container subcontainer create\-fs\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIIMAGE_ID\fR> [\fINAME\fR] 
+.SH DESCRIPTION
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIIMAGE_ID\fR>
+
+.TP
+[\fINAME\fR]
+
diff --git a/core/man/start-container/start-container-subcontainer-destroy-fs.1 b/core/man/start-container/start-container-subcontainer-destroy-fs.1
new file mode 100644
index 000000000..aee2823a4
--- /dev/null
+++ b/core/man/start-container/start-container-subcontainer-destroy-fs.1
@@ -0,0 +1,15 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-container-subcontainer-destroy-fs 1  "destroy-fs " 
+.SH NAME
+start\-container\-subcontainer\-destroy\-fs
+.SH SYNOPSIS
+\fBstart\-container subcontainer destroy\-fs\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIGUID\fR> 
+.SH DESCRIPTION
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIGUID\fR>
+
diff --git a/core/man/start-container/start-container-subcontainer-exec-command.1 b/core/man/start-container/start-container-subcontainer-exec-command.1
new file mode 100644
index 000000000..313a40b01
--- /dev/null
+++ b/core/man/start-container/start-container-subcontainer-exec-command.1
@@ -0,0 +1,39 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-container-subcontainer-exec-command 1  "exec-command " 
+.SH NAME
+start\-container\-subcontainer\-exec\-command
+.SH SYNOPSIS
+\fBstart\-container subcontainer exec\-command\fR [\fB\-\-force\-tty\fR] [\fB\-\-force\-stderr\-tty\fR] [\fB\-\-pty\-size\fR] [\fB\-e\fR|\fB\-\-env\fR] [\fB\-\-env\-file\fR] [\fB\-w\fR|\fB\-\-workdir\fR] [\fB\-u\fR|\fB\-\-user\fR] [\fB\-h\fR|\fB\-\-help\fR] <\fICHROOT\fR> [\fICOMMAND\fR] 
+.SH DESCRIPTION
+.SH OPTIONS
+.TP
+\fB\-\-force\-tty\fR
+Force TTY mode for I/O
+.TP
+\fB\-\-force\-stderr\-tty\fR
+Force stderr to be treated as a TTY
+.TP
+\fB\-\-pty\-size\fR \fI<PTY_SIZE>\fR
+PTY terminal size (<rows>:<cols>[:<x>:<y>])
+.TP
+\fB\-e\fR, \fB\-\-env\fR \fI<ENV>\fR
+Environment variable (KEY=VALUE)
+.TP
+\fB\-\-env\-file\fR \fI<ENV_FILE>\fR
+Path to environment file
+.TP
+\fB\-w\fR, \fB\-\-workdir\fR \fI<WORKDIR>\fR
+Working directory path
+.TP
+\fB\-u\fR, \fB\-\-user\fR \fI<USER>\fR
+User name to run as
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fICHROOT\fR>
+Path for chroot environment
+.TP
+[\fICOMMAND\fR]
+Command to execute in the container
diff --git a/core/man/start-container/start-container-subcontainer-exec.1 b/core/man/start-container/start-container-subcontainer-exec.1
new file mode 100644
index 000000000..d50f09a55
--- /dev/null
+++ b/core/man/start-container/start-container-subcontainer-exec.1
@@ -0,0 +1,39 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-container-subcontainer-exec 1  "exec " 
+.SH NAME
+start\-container\-subcontainer\-exec
+.SH SYNOPSIS
+\fBstart\-container subcontainer exec\fR [\fB\-\-force\-tty\fR] [\fB\-\-force\-stderr\-tty\fR] [\fB\-\-pty\-size\fR] [\fB\-e\fR|\fB\-\-env\fR] [\fB\-\-env\-file\fR] [\fB\-w\fR|\fB\-\-workdir\fR] [\fB\-u\fR|\fB\-\-user\fR] [\fB\-h\fR|\fB\-\-help\fR] <\fICHROOT\fR> [\fICOMMAND\fR] 
+.SH DESCRIPTION
+.SH OPTIONS
+.TP
+\fB\-\-force\-tty\fR
+Force TTY mode for I/O
+.TP
+\fB\-\-force\-stderr\-tty\fR
+Force stderr to be treated as a TTY
+.TP
+\fB\-\-pty\-size\fR \fI<PTY_SIZE>\fR
+PTY terminal size (<rows>:<cols>[:<x>:<y>])
+.TP
+\fB\-e\fR, \fB\-\-env\fR \fI<ENV>\fR
+Environment variable (KEY=VALUE)
+.TP
+\fB\-\-env\-file\fR \fI<ENV_FILE>\fR
+Path to environment file
+.TP
+\fB\-w\fR, \fB\-\-workdir\fR \fI<WORKDIR>\fR
+Working directory path
+.TP
+\fB\-u\fR, \fB\-\-user\fR \fI<USER>\fR
+User name to run as
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fICHROOT\fR>
+Path for chroot environment
+.TP
+[\fICOMMAND\fR]
+Command to execute in the container
diff --git a/core/man/start-container/start-container-subcontainer-launch-init.1 b/core/man/start-container/start-container-subcontainer-launch-init.1
new file mode 100644
index 000000000..222e6208c
--- /dev/null
+++ b/core/man/start-container/start-container-subcontainer-launch-init.1
@@ -0,0 +1,39 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-container-subcontainer-launch-init 1  "launch-init " 
+.SH NAME
+start\-container\-subcontainer\-launch\-init
+.SH SYNOPSIS
+\fBstart\-container subcontainer launch\-init\fR [\fB\-\-force\-tty\fR] [\fB\-\-force\-stderr\-tty\fR] [\fB\-\-pty\-size\fR] [\fB\-e\fR|\fB\-\-env\fR] [\fB\-\-env\-file\fR] [\fB\-w\fR|\fB\-\-workdir\fR] [\fB\-u\fR|\fB\-\-user\fR] [\fB\-h\fR|\fB\-\-help\fR] <\fICHROOT\fR> [\fICOMMAND\fR] 
+.SH DESCRIPTION
+.SH OPTIONS
+.TP
+\fB\-\-force\-tty\fR
+Force TTY mode for I/O
+.TP
+\fB\-\-force\-stderr\-tty\fR
+Force stderr to be treated as a TTY
+.TP
+\fB\-\-pty\-size\fR \fI<PTY_SIZE>\fR
+PTY terminal size (<rows>:<cols>[:<x>:<y>])
+.TP
+\fB\-e\fR, \fB\-\-env\fR \fI<ENV>\fR
+Environment variable (KEY=VALUE)
+.TP
+\fB\-\-env\-file\fR \fI<ENV_FILE>\fR
+Path to environment file
+.TP
+\fB\-w\fR, \fB\-\-workdir\fR \fI<WORKDIR>\fR
+Working directory path
+.TP
+\fB\-u\fR, \fB\-\-user\fR \fI<USER>\fR
+User name to run as
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fICHROOT\fR>
+Path for chroot environment
+.TP
+[\fICOMMAND\fR]
+Command to execute in the container
diff --git a/core/man/start-container/start-container-subcontainer-launch.1 b/core/man/start-container/start-container-subcontainer-launch.1
new file mode 100644
index 000000000..63a637f2c
--- /dev/null
+++ b/core/man/start-container/start-container-subcontainer-launch.1
@@ -0,0 +1,39 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-container-subcontainer-launch 1  "launch " 
+.SH NAME
+start\-container\-subcontainer\-launch
+.SH SYNOPSIS
+\fBstart\-container subcontainer launch\fR [\fB\-\-force\-tty\fR] [\fB\-\-force\-stderr\-tty\fR] [\fB\-\-pty\-size\fR] [\fB\-e\fR|\fB\-\-env\fR] [\fB\-\-env\-file\fR] [\fB\-w\fR|\fB\-\-workdir\fR] [\fB\-u\fR|\fB\-\-user\fR] [\fB\-h\fR|\fB\-\-help\fR] <\fICHROOT\fR> [\fICOMMAND\fR] 
+.SH DESCRIPTION
+.SH OPTIONS
+.TP
+\fB\-\-force\-tty\fR
+Force TTY mode for I/O
+.TP
+\fB\-\-force\-stderr\-tty\fR
+Force stderr to be treated as a TTY
+.TP
+\fB\-\-pty\-size\fR \fI<PTY_SIZE>\fR
+PTY terminal size (<rows>:<cols>[:<x>:<y>])
+.TP
+\fB\-e\fR, \fB\-\-env\fR \fI<ENV>\fR
+Environment variable (KEY=VALUE)
+.TP
+\fB\-\-env\-file\fR \fI<ENV_FILE>\fR
+Path to environment file
+.TP
+\fB\-w\fR, \fB\-\-workdir\fR \fI<WORKDIR>\fR
+Working directory path
+.TP
+\fB\-u\fR, \fB\-\-user\fR \fI<USER>\fR
+User name to run as
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fICHROOT\fR>
+Path for chroot environment
+.TP
+[\fICOMMAND\fR]
+Command to execute in the container
diff --git a/core/man/start-container/start-container-subcontainer.1 b/core/man/start-container/start-container-subcontainer.1
new file mode 100644
index 000000000..e07e0eece
--- /dev/null
+++ b/core/man/start-container/start-container-subcontainer.1
@@ -0,0 +1,25 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-container-subcontainer 1  "subcontainer " 
+.SH NAME
+start\-container\-subcontainer
+.SH SYNOPSIS
+\fBstart\-container subcontainer\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIsubcommands\fR>
+.SH DESCRIPTION
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.SH SUBCOMMANDS
+.TP
+start\-container\-subcontainer\-create\-fs(1)
+.TP
+start\-container\-subcontainer\-destroy\-fs(1)
+.TP
+start\-container\-subcontainer\-exec(1)
+.TP
+start\-container\-subcontainer\-exec\-command(1)
+.TP
+start\-container\-subcontainer\-launch(1)
+.TP
+start\-container\-subcontainer\-launch\-init(1)
diff --git a/core/man/start-container/start-container.1 b/core/man/start-container/start-container.1
new file mode 100644
index 000000000..0ae9b903a
--- /dev/null
+++ b/core/man/start-container/start-container.1
@@ -0,0 +1,53 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-container 1  "start-container 0.4.0-alpha.21" 
+.SH NAME
+start\-container
+.SH SYNOPSIS
+\fBstart\-container\fR [\fB\-\-socket\fR] [\fB\-h\fR|\fB\-\-help\fR] [\fB\-V\fR|\fB\-\-version\fR] [\fIsubcommands\fR]
+.SH DESCRIPTION
+.SH OPTIONS
+.TP
+\fB\-\-socket\fR \fI<SOCKET>\fR
+Path to Unix socket
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+\fB\-V\fR, \fB\-\-version\fR
+Print version
+.SH SUBCOMMANDS
+.TP
+start\-container\-action(1)
+.TP
+start\-container\-check\-dependencies(1)
+.TP
+start\-container\-echo(1)
+.TP
+start\-container\-get\-data\-version(1)
+.TP
+start\-container\-get\-dependencies(1)
+.TP
+start\-container\-get\-os\-ip(1)
+.TP
+start\-container\-get\-status(1)
+.TP
+start\-container\-git\-info(1)
+.TP
+start\-container\-plugin(1)
+.TP
+start\-container\-rebuild(1)
+.TP
+start\-container\-restart(1)
+.TP
+start\-container\-set\-data\-version(1)
+.TP
+start\-container\-set\-dependencies(1)
+.TP
+start\-container\-set\-main\-status(1)
+.TP
+start\-container\-shutdown(1)
+.TP
+start\-container\-subcontainer(1)
+.SH VERSION
+v0.4.0\-alpha.21
diff --git a/core/man/start-registry/start-registry-admin-add.1 b/core/man/start-registry/start-registry-admin-add.1
new file mode 100644
index 000000000..210a982c2
--- /dev/null
+++ b/core/man/start-registry/start-registry-admin-add.1
@@ -0,0 +1,19 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-registry-admin-add 1  "add " 
+.SH NAME
+start\-registry\-admin\-add \- Add admin signer
+.SH SYNOPSIS
+\fBstart\-registry admin add\fR [\fB\-h\fR|\fB\-\-help\fR] <\fISIGNER\fR> [\fIDATABASE\fR] 
+.SH DESCRIPTION
+Add admin signer
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fISIGNER\fR>
+Signer identifier
+.TP
+[\fIDATABASE\fR]
+Path to the database file
diff --git a/core/man/start-registry/start-registry-admin-list.1 b/core/man/start-registry/start-registry-admin-list.1
new file mode 100644
index 000000000..5d3fc668f
--- /dev/null
+++ b/core/man/start-registry/start-registry-admin-list.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-registry-admin-list 1  "list " 
+.SH NAME
+start\-registry\-admin\-list \- List admin signers
+.SH SYNOPSIS
+\fBstart\-registry admin list\fR [\fB\-\-format\fR] [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+List admin signers
+.SH OPTIONS
+.TP
+\fB\-\-format\fR
+
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-registry/start-registry-admin-remove.1 b/core/man/start-registry/start-registry-admin-remove.1
new file mode 100644
index 000000000..4c4ac020f
--- /dev/null
+++ b/core/man/start-registry/start-registry-admin-remove.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-registry-admin-remove 1  "remove " 
+.SH NAME
+start\-registry\-admin\-remove \- Remove admin signer
+.SH SYNOPSIS
+\fBstart\-registry admin remove\fR [\fB\-h\fR|\fB\-\-help\fR] <\fISIGNER\fR> 
+.SH DESCRIPTION
+Remove admin signer
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fISIGNER\fR>
+Signer identifier
diff --git a/core/man/start-registry/start-registry-admin-signer-add.1 b/core/man/start-registry/start-registry-admin-signer-add.1
new file mode 100644
index 000000000..0f76e839a
--- /dev/null
+++ b/core/man/start-registry/start-registry-admin-signer-add.1
@@ -0,0 +1,25 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-registry-admin-signer-add 1  "add " 
+.SH NAME
+start\-registry\-admin\-signer\-add \- Add signer
+.SH SYNOPSIS
+\fBstart\-registry admin signer add\fR <\fB\-n\fR|\fB\-\-name\fR> [\fB\-c\fR|\fB\-\-contact\fR] [\fB\-\-key\fR] [\fB\-h\fR|\fB\-\-help\fR] [\fIDATABASE\fR] 
+.SH DESCRIPTION
+Add signer
+.SH OPTIONS
+.TP
+\fB\-n\fR, \fB\-\-name\fR \fI<NAME>\fR
+Name of the signer
+.TP
+\fB\-c\fR, \fB\-\-contact\fR \fI<CONTACT>\fR
+Contact information for signer
+.TP
+\fB\-\-key\fR \fI<KEYS>\fR
+Public key for signer
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+[\fIDATABASE\fR]
+Path to the database file
diff --git a/core/man/start-registry/start-registry-admin-signer-edit.1 b/core/man/start-registry/start-registry-admin-signer-edit.1
new file mode 100644
index 000000000..3ac25be8a
--- /dev/null
+++ b/core/man/start-registry/start-registry-admin-signer-edit.1
@@ -0,0 +1,31 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-registry-admin-signer-edit 1  "edit " 
+.SH NAME
+start\-registry\-admin\-signer\-edit \- Edit signer information
+.SH SYNOPSIS
+\fBstart\-registry admin signer edit\fR [\fB\-n\fR|\fB\-\-set\-name\fR] [\fB\-c\fR|\fB\-\-add\-contact\fR] [\fB\-k\fR|\fB\-\-add\-key\fR] [\fB\-C\fR|\fB\-\-remove\-contact\fR] [\fB\-K\fR|\fB\-\-remove\-key\fR] [\fB\-h\fR|\fB\-\-help\fR] <\fIID\fR> 
+.SH DESCRIPTION
+Edit signer information
+.SH OPTIONS
+.TP
+\fB\-n\fR, \fB\-\-set\-name\fR \fI<SET_NAME>\fR
+Set the signer name
+.TP
+\fB\-c\fR, \fB\-\-add\-contact\fR \fI<ADD_CONTACT>\fR
+Add contact information to signer
+.TP
+\fB\-k\fR, \fB\-\-add\-key\fR \fI<ADD_KEY>\fR
+Add a public key to signer
+.TP
+\fB\-C\fR, \fB\-\-remove\-contact\fR \fI<REMOVE_CONTACT>\fR
+Remove contact from signer
+.TP
+\fB\-K\fR, \fB\-\-remove\-key\fR \fI<REMOVE_KEY>\fR
+Remove public key from signer
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIID\fR>
+Signer identifier
diff --git a/core/man/start-registry/start-registry-admin-signer-list.1 b/core/man/start-registry/start-registry-admin-signer-list.1
new file mode 100644
index 000000000..7eb546a32
--- /dev/null
+++ b/core/man/start-registry/start-registry-admin-signer-list.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-registry-admin-signer-list 1  "list " 
+.SH NAME
+start\-registry\-admin\-signer\-list \- List signers
+.SH SYNOPSIS
+\fBstart\-registry admin signer list\fR [\fB\-\-format\fR] [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+List signers
+.SH OPTIONS
+.TP
+\fB\-\-format\fR
+
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-registry/start-registry-admin-signer.1 b/core/man/start-registry/start-registry-admin-signer.1
new file mode 100644
index 000000000..8fa6f2bd0
--- /dev/null
+++ b/core/man/start-registry/start-registry-admin-signer.1
@@ -0,0 +1,23 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-registry-admin-signer 1  "signer " 
+.SH NAME
+start\-registry\-admin\-signer \- Commands to add or list signers
+.SH SYNOPSIS
+\fBstart\-registry admin signer\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIsubcommands\fR>
+.SH DESCRIPTION
+Commands to add or list signers
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.SH SUBCOMMANDS
+.TP
+start\-registry\-admin\-signer\-add(1)
+Add signer
+.TP
+start\-registry\-admin\-signer\-edit(1)
+Edit signer information
+.TP
+start\-registry\-admin\-signer\-list(1)
+List signers
diff --git a/core/man/start-registry/start-registry-admin.1 b/core/man/start-registry/start-registry-admin.1
new file mode 100644
index 000000000..0f6c4ba23
--- /dev/null
+++ b/core/man/start-registry/start-registry-admin.1
@@ -0,0 +1,26 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-registry-admin 1  "admin " 
+.SH NAME
+start\-registry\-admin \- Commands to add or list admins or signers
+.SH SYNOPSIS
+\fBstart\-registry admin\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIsubcommands\fR>
+.SH DESCRIPTION
+Commands to add or list admins or signers
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.SH SUBCOMMANDS
+.TP
+start\-registry\-admin\-add(1)
+Add admin signer
+.TP
+start\-registry\-admin\-list(1)
+List admin signers
+.TP
+start\-registry\-admin\-remove(1)
+Remove admin signer
+.TP
+start\-registry\-admin\-signer(1)
+Commands to add or list signers
diff --git a/core/man/start-registry/start-registry-db-apply.1 b/core/man/start-registry/start-registry-db-apply.1
new file mode 100644
index 000000000..d2b24cd2f
--- /dev/null
+++ b/core/man/start-registry/start-registry-db-apply.1
@@ -0,0 +1,19 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-registry-db-apply 1  "apply " 
+.SH NAME
+start\-registry\-db\-apply \- Update a database record
+.SH SYNOPSIS
+\fBstart\-registry db apply\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIEXPR\fR> [\fIPATH\fR] 
+.SH DESCRIPTION
+Update a database record
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIEXPR\fR>
+Database patch expression to apply
+.TP
+[\fIPATH\fR]
+Path to the database file
diff --git a/core/man/start-registry/start-registry-db-dump.1 b/core/man/start-registry/start-registry-db-dump.1
new file mode 100644
index 000000000..5a6bf11fe
--- /dev/null
+++ b/core/man/start-registry/start-registry-db-dump.1
@@ -0,0 +1,22 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-registry-db-dump 1  "dump " 
+.SH NAME
+start\-registry\-db\-dump \- Filter and query the database
+.SH SYNOPSIS
+\fBstart\-registry db dump\fR [\fB\-p\fR|\fB\-\-pointer\fR] [\fB\-\-format\fR] [\fB\-h\fR|\fB\-\-help\fR] [\fIPATH\fR] 
+.SH DESCRIPTION
+Filter and query the database
+.SH OPTIONS
+.TP
+\fB\-p\fR, \fB\-\-pointer\fR \fI<POINTER>\fR
+JSON pointer to object in database to dump
+.TP
+\fB\-\-format\fR
+
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+[\fIPATH\fR]
+Path to the database file
diff --git a/core/man/start-registry/start-registry-db.1 b/core/man/start-registry/start-registry-db.1
new file mode 100644
index 000000000..c57bd858d
--- /dev/null
+++ b/core/man/start-registry/start-registry-db.1
@@ -0,0 +1,20 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-registry-db 1  "db " 
+.SH NAME
+start\-registry\-db \- Commands to interact with the db i.e. dump and apply
+.SH SYNOPSIS
+\fBstart\-registry db\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIsubcommands\fR>
+.SH DESCRIPTION
+Commands to interact with the db i.e. dump and apply
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.SH SUBCOMMANDS
+.TP
+start\-registry\-db\-apply(1)
+Update a database record
+.TP
+start\-registry\-db\-dump(1)
+Filter and query the database
diff --git a/core/man/start-registry/start-registry-index.1 b/core/man/start-registry/start-registry-index.1
new file mode 100644
index 000000000..379946168
--- /dev/null
+++ b/core/man/start-registry/start-registry-index.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-registry-index 1  "index " 
+.SH NAME
+start\-registry\-index \- List registry info and packages
+.SH SYNOPSIS
+\fBstart\-registry index\fR [\fB\-\-format\fR] [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+List registry info and packages
+.SH OPTIONS
+.TP
+\fB\-\-format\fR
+
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-registry/start-registry-info-set-icon.1 b/core/man/start-registry/start-registry-info-set-icon.1
new file mode 100644
index 000000000..420563d1f
--- /dev/null
+++ b/core/man/start-registry/start-registry-info-set-icon.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-registry-info-set-icon 1  "set-icon " 
+.SH NAME
+start\-registry\-info\-set\-icon \- Set the registry icon
+.SH SYNOPSIS
+\fBstart\-registry info set\-icon\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIICON\fR> 
+.SH DESCRIPTION
+Set the registry icon
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIICON\fR>
+Path to service icon file
diff --git a/core/man/start-registry/start-registry-info-set-name.1 b/core/man/start-registry/start-registry-info-set-name.1
new file mode 100644
index 000000000..b80ef698e
--- /dev/null
+++ b/core/man/start-registry/start-registry-info-set-name.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-registry-info-set-name 1  "set-name " 
+.SH NAME
+start\-registry\-info\-set\-name \- Set the registry name
+.SH SYNOPSIS
+\fBstart\-registry info set\-name\fR [\fB\-h\fR|\fB\-\-help\fR] <\fINAME\fR> 
+.SH DESCRIPTION
+Set the registry name
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fINAME\fR>
+Name of the registry
diff --git a/core/man/start-registry/start-registry-info.1 b/core/man/start-registry/start-registry-info.1
new file mode 100644
index 000000000..2db97418b
--- /dev/null
+++ b/core/man/start-registry/start-registry-info.1
@@ -0,0 +1,23 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-registry-info 1  "info " 
+.SH NAME
+start\-registry\-info \- Display registry info
+.SH SYNOPSIS
+\fBstart\-registry info\fR [\fB\-\-format\fR] [\fB\-h\fR|\fB\-\-help\fR] [\fIsubcommands\fR]
+.SH DESCRIPTION
+Display registry info
+.SH OPTIONS
+.TP
+\fB\-\-format\fR
+
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.SH SUBCOMMANDS
+.TP
+start\-registry\-info\-set\-icon(1)
+Set the registry icon
+.TP
+start\-registry\-info\-set\-name(1)
+Set the registry name
diff --git a/core/man/start-registry/start-registry-os-asset-add.1 b/core/man/start-registry/start-registry-os-asset-add.1
new file mode 100644
index 000000000..68509e04d
--- /dev/null
+++ b/core/man/start-registry/start-registry-os-asset-add.1
@@ -0,0 +1,25 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-registry-os-asset-add 1  "add " 
+.SH NAME
+start\-registry\-os\-asset\-add \- Add asset to registry
+.SH SYNOPSIS
+\fBstart\-registry os asset add\fR <\fB\-p\fR|\fB\-\-platform\fR> <\fB\-v\fR|\fB\-\-version\fR> [\fB\-h\fR|\fB\-\-help\fR] <\fIFILE\fR> <\fIURL\fR> 
+.SH DESCRIPTION
+Add asset to registry
+.SH OPTIONS
+.TP
+\fB\-p\fR, \fB\-\-platform\fR \fI<PLATFORM>\fR
+Target platform identifier
+.TP
+\fB\-v\fR, \fB\-\-version\fR \fI<VERSION>\fR
+StartOS version number
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIFILE\fR>
+Path to the asset file
+.TP
+<\fIURL\fR>
+URL of the asset
diff --git a/core/man/start-registry/start-registry-os-asset-get-img.1 b/core/man/start-registry/start-registry-os-asset-get-img.1
new file mode 100644
index 000000000..1768d6542
--- /dev/null
+++ b/core/man/start-registry/start-registry-os-asset-get-img.1
@@ -0,0 +1,25 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-registry-os-asset-get-img 1  "img " 
+.SH NAME
+start\-registry\-os\-asset\-get\-img \- Download IMG file
+.SH SYNOPSIS
+\fBstart\-registry os asset get img\fR [\fB\-d\fR|\fB\-\-download\fR] [\fB\-r\fR|\fB\-\-reverify\fR] [\fB\-h\fR|\fB\-\-help\fR] <\fIVERSION\fR> <\fIPLATFORM\fR> 
+.SH DESCRIPTION
+Download IMG file
+.SH OPTIONS
+.TP
+\fB\-d\fR, \fB\-\-download\fR \fI<DOWNLOAD>\fR
+Directory path to download to
+.TP
+\fB\-r\fR, \fB\-\-reverify\fR
+Verify hash after download completes
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIVERSION\fR>
+StartOS version number
+.TP
+<\fIPLATFORM\fR>
+Target platform identifier
diff --git a/core/man/start-registry/start-registry-os-asset-get-iso.1 b/core/man/start-registry/start-registry-os-asset-get-iso.1
new file mode 100644
index 000000000..4f88b66f6
--- /dev/null
+++ b/core/man/start-registry/start-registry-os-asset-get-iso.1
@@ -0,0 +1,25 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-registry-os-asset-get-iso 1  "iso " 
+.SH NAME
+start\-registry\-os\-asset\-get\-iso \- Download ISO file
+.SH SYNOPSIS
+\fBstart\-registry os asset get iso\fR [\fB\-d\fR|\fB\-\-download\fR] [\fB\-r\fR|\fB\-\-reverify\fR] [\fB\-h\fR|\fB\-\-help\fR] <\fIVERSION\fR> <\fIPLATFORM\fR> 
+.SH DESCRIPTION
+Download ISO file
+.SH OPTIONS
+.TP
+\fB\-d\fR, \fB\-\-download\fR \fI<DOWNLOAD>\fR
+Directory path to download to
+.TP
+\fB\-r\fR, \fB\-\-reverify\fR
+Verify hash after download completes
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIVERSION\fR>
+StartOS version number
+.TP
+<\fIPLATFORM\fR>
+Target platform identifier
diff --git a/core/man/start-registry/start-registry-os-asset-get-squashfs.1 b/core/man/start-registry/start-registry-os-asset-get-squashfs.1
new file mode 100644
index 000000000..36401a756
--- /dev/null
+++ b/core/man/start-registry/start-registry-os-asset-get-squashfs.1
@@ -0,0 +1,25 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-registry-os-asset-get-squashfs 1  "squashfs " 
+.SH NAME
+start\-registry\-os\-asset\-get\-squashfs \- Download squashfs file
+.SH SYNOPSIS
+\fBstart\-registry os asset get squashfs\fR [\fB\-d\fR|\fB\-\-download\fR] [\fB\-r\fR|\fB\-\-reverify\fR] [\fB\-h\fR|\fB\-\-help\fR] <\fIVERSION\fR> <\fIPLATFORM\fR> 
+.SH DESCRIPTION
+Download squashfs file
+.SH OPTIONS
+.TP
+\fB\-d\fR, \fB\-\-download\fR \fI<DOWNLOAD>\fR
+Directory path to download to
+.TP
+\fB\-r\fR, \fB\-\-reverify\fR
+Verify hash after download completes
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIVERSION\fR>
+StartOS version number
+.TP
+<\fIPLATFORM\fR>
+Target platform identifier
diff --git a/core/man/start-registry/start-registry-os-asset-get.1 b/core/man/start-registry/start-registry-os-asset-get.1
new file mode 100644
index 000000000..e0cc23d1b
--- /dev/null
+++ b/core/man/start-registry/start-registry-os-asset-get.1
@@ -0,0 +1,23 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-registry-os-asset-get 1  "get " 
+.SH NAME
+start\-registry\-os\-asset\-get \- Commands to download image, iso, or squashfs files
+.SH SYNOPSIS
+\fBstart\-registry os asset get\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIsubcommands\fR>
+.SH DESCRIPTION
+Commands to download image, iso, or squashfs files
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.SH SUBCOMMANDS
+.TP
+start\-registry\-os\-asset\-get\-img(1)
+Download IMG file
+.TP
+start\-registry\-os\-asset\-get\-iso(1)
+Download ISO file
+.TP
+start\-registry\-os\-asset\-get\-squashfs(1)
+Download squashfs file
diff --git a/core/man/start-registry/start-registry-os-asset-remove.1 b/core/man/start-registry/start-registry-os-asset-remove.1
new file mode 100644
index 000000000..962e6c2b4
--- /dev/null
+++ b/core/man/start-registry/start-registry-os-asset-remove.1
@@ -0,0 +1,12 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-registry-os-asset-remove 1  "remove " 
+.SH NAME
+start\-registry\-os\-asset\-remove
+.SH SYNOPSIS
+\fBstart\-registry os asset remove\fR [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-registry/start-registry-os-asset-sign.1 b/core/man/start-registry/start-registry-os-asset-sign.1
new file mode 100644
index 000000000..c092dc36b
--- /dev/null
+++ b/core/man/start-registry/start-registry-os-asset-sign.1
@@ -0,0 +1,22 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-registry-os-asset-sign 1  "sign " 
+.SH NAME
+start\-registry\-os\-asset\-sign \- Sign file and add to registry
+.SH SYNOPSIS
+\fBstart\-registry os asset sign\fR <\fB\-p\fR|\fB\-\-platform\fR> <\fB\-v\fR|\fB\-\-version\fR> [\fB\-h\fR|\fB\-\-help\fR] <\fIFILE\fR> 
+.SH DESCRIPTION
+Sign file and add to registry
+.SH OPTIONS
+.TP
+\fB\-p\fR, \fB\-\-platform\fR \fI<PLATFORM>\fR
+Target platform identifier
+.TP
+\fB\-v\fR, \fB\-\-version\fR \fI<VERSION>\fR
+StartOS version number
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIFILE\fR>
+Path to the asset file
diff --git a/core/man/start-registry/start-registry-os-asset.1 b/core/man/start-registry/start-registry-os-asset.1
new file mode 100644
index 000000000..a292fd59b
--- /dev/null
+++ b/core/man/start-registry/start-registry-os-asset.1
@@ -0,0 +1,25 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-registry-os-asset 1  "asset " 
+.SH NAME
+start\-registry\-os\-asset \- Commands to add, sign, or get registry assets
+.SH SYNOPSIS
+\fBstart\-registry os asset\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIsubcommands\fR>
+.SH DESCRIPTION
+Commands to add, sign, or get registry assets
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.SH SUBCOMMANDS
+.TP
+start\-registry\-os\-asset\-add(1)
+Add asset to registry
+.TP
+start\-registry\-os\-asset\-get(1)
+Commands to download image, iso, or squashfs files
+.TP
+start\-registry\-os\-asset\-remove(1)
+.TP
+start\-registry\-os\-asset\-sign(1)
+Sign file and add to registry
diff --git a/core/man/start-registry/start-registry-os-index.1 b/core/man/start-registry/start-registry-os-index.1
new file mode 100644
index 000000000..0a18e236e
--- /dev/null
+++ b/core/man/start-registry/start-registry-os-index.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-registry-os-index 1  "index " 
+.SH NAME
+start\-registry\-os\-index \- List OS versions index
+.SH SYNOPSIS
+\fBstart\-registry os index\fR [\fB\-\-format\fR] [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+List OS versions index
+.SH OPTIONS
+.TP
+\fB\-\-format\fR
+
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-registry/start-registry-os-version-add.1 b/core/man/start-registry/start-registry-os-version-add.1
new file mode 100644
index 000000000..1dd469a80
--- /dev/null
+++ b/core/man/start-registry/start-registry-os-version-add.1
@@ -0,0 +1,25 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-registry-os-version-add 1  "add " 
+.SH NAME
+start\-registry\-os\-version\-add \- Add OS version
+.SH SYNOPSIS
+\fBstart\-registry os version add\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIVERSION\fR> <\fIHEADLINE\fR> <\fIRELEASE_NOTES\fR> <\fISOURCE_VERSION\fR> 
+.SH DESCRIPTION
+Add OS version
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIVERSION\fR>
+StartOS version number
+.TP
+<\fIHEADLINE\fR>
+Short headline for the version
+.TP
+<\fIRELEASE_NOTES\fR>
+Release notes for this version
+.TP
+<\fISOURCE_VERSION\fR>
+Source version range for migration
diff --git a/core/man/start-registry/start-registry-os-version-get.1 b/core/man/start-registry/start-registry-os-version-get.1
new file mode 100644
index 000000000..6b3346381
--- /dev/null
+++ b/core/man/start-registry/start-registry-os-version-get.1
@@ -0,0 +1,28 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-registry-os-version-get 1  "get " 
+.SH NAME
+start\-registry\-os\-version\-get \- Get OS versions info
+.SH SYNOPSIS
+\fBstart\-registry os version get\fR [\fB\-\-src\fR] [\fB\-\-target\-version\fR] [\fB\-\-id\fR] [\fB\-\-platform\fR] [\fB\-\-format\fR] [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+Get OS versions info
+.SH OPTIONS
+.TP
+\fB\-\-src\fR \fI<SOURCE_VERSION>\fR
+Source version to upgrade from
+.TP
+\fB\-\-target\-version\fR \fI<TARGET_VERSION>\fR
+Target version range constraint
+.TP
+\fB\-\-id\fR \fI<SERVER_ID>\fR
+Unique server identifier
+.TP
+\fB\-\-platform\fR \fI<PLATFORM>\fR
+Target platform identifier
+.TP
+\fB\-\-format\fR
+
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-registry/start-registry-os-version-remove.1 b/core/man/start-registry/start-registry-os-version-remove.1
new file mode 100644
index 000000000..0d4822dde
--- /dev/null
+++ b/core/man/start-registry/start-registry-os-version-remove.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-registry-os-version-remove 1  "remove " 
+.SH NAME
+start\-registry\-os\-version\-remove \- Remove OS version
+.SH SYNOPSIS
+\fBstart\-registry os version remove\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIVERSION\fR> 
+.SH DESCRIPTION
+Remove OS version
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIVERSION\fR>
+StartOS version number
diff --git a/core/man/start-registry/start-registry-os-version-signer-add.1 b/core/man/start-registry/start-registry-os-version-signer-add.1
new file mode 100644
index 000000000..d21a7ad82
--- /dev/null
+++ b/core/man/start-registry/start-registry-os-version-signer-add.1
@@ -0,0 +1,19 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-registry-os-version-signer-add 1  "add " 
+.SH NAME
+start\-registry\-os\-version\-signer\-add \- Add version signer
+.SH SYNOPSIS
+\fBstart\-registry os version signer add\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIVERSION\fR> <\fISIGNER\fR> 
+.SH DESCRIPTION
+Add version signer
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIVERSION\fR>
+
+.TP
+<\fISIGNER\fR>
+
diff --git a/core/man/start-registry/start-registry-os-version-signer-list.1 b/core/man/start-registry/start-registry-os-version-signer-list.1
new file mode 100644
index 000000000..fff2a296b
--- /dev/null
+++ b/core/man/start-registry/start-registry-os-version-signer-list.1
@@ -0,0 +1,19 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-registry-os-version-signer-list 1  "list " 
+.SH NAME
+start\-registry\-os\-version\-signer\-list \- List version signers
+.SH SYNOPSIS
+\fBstart\-registry os version signer list\fR [\fB\-\-format\fR] [\fB\-h\fR|\fB\-\-help\fR] <\fIVERSION\fR> 
+.SH DESCRIPTION
+List version signers
+.SH OPTIONS
+.TP
+\fB\-\-format\fR
+
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIVERSION\fR>
+
diff --git a/core/man/start-registry/start-registry-os-version-signer-remove.1 b/core/man/start-registry/start-registry-os-version-signer-remove.1
new file mode 100644
index 000000000..743ad2525
--- /dev/null
+++ b/core/man/start-registry/start-registry-os-version-signer-remove.1
@@ -0,0 +1,19 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-registry-os-version-signer-remove 1  "remove " 
+.SH NAME
+start\-registry\-os\-version\-signer\-remove \- Remove version signer
+.SH SYNOPSIS
+\fBstart\-registry os version signer remove\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIVERSION\fR> <\fISIGNER\fR> 
+.SH DESCRIPTION
+Remove version signer
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIVERSION\fR>
+
+.TP
+<\fISIGNER\fR>
+
diff --git a/core/man/start-registry/start-registry-os-version-signer.1 b/core/man/start-registry/start-registry-os-version-signer.1
new file mode 100644
index 000000000..fd3561f33
--- /dev/null
+++ b/core/man/start-registry/start-registry-os-version-signer.1
@@ -0,0 +1,23 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-registry-os-version-signer 1  "signer " 
+.SH NAME
+start\-registry\-os\-version\-signer \- Add, remove, and list version signers
+.SH SYNOPSIS
+\fBstart\-registry os version signer\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIsubcommands\fR>
+.SH DESCRIPTION
+Add, remove, and list version signers
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.SH SUBCOMMANDS
+.TP
+start\-registry\-os\-version\-signer\-add(1)
+Add version signer
+.TP
+start\-registry\-os\-version\-signer\-list(1)
+List version signers
+.TP
+start\-registry\-os\-version\-signer\-remove(1)
+Remove version signer
diff --git a/core/man/start-registry/start-registry-os-version.1 b/core/man/start-registry/start-registry-os-version.1
new file mode 100644
index 000000000..944273955
--- /dev/null
+++ b/core/man/start-registry/start-registry-os-version.1
@@ -0,0 +1,26 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-registry-os-version 1  "version " 
+.SH NAME
+start\-registry\-os\-version \- Commands to add, remove, or list versions or version signers
+.SH SYNOPSIS
+\fBstart\-registry os version\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIsubcommands\fR>
+.SH DESCRIPTION
+Commands to add, remove, or list versions or version signers
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.SH SUBCOMMANDS
+.TP
+start\-registry\-os\-version\-add(1)
+Add OS version
+.TP
+start\-registry\-os\-version\-get(1)
+Get OS versions info
+.TP
+start\-registry\-os\-version\-remove(1)
+Remove OS version
+.TP
+start\-registry\-os\-version\-signer(1)
+Add, remove, and list version signers
diff --git a/core/man/start-registry/start-registry-os.1 b/core/man/start-registry/start-registry-os.1
new file mode 100644
index 000000000..ed572f0b1
--- /dev/null
+++ b/core/man/start-registry/start-registry-os.1
@@ -0,0 +1,23 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-registry-os 1  "os " 
+.SH NAME
+start\-registry\-os \- Commands related to OS assets and versions
+.SH SYNOPSIS
+\fBstart\-registry os\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIsubcommands\fR>
+.SH DESCRIPTION
+Commands related to OS assets and versions
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.SH SUBCOMMANDS
+.TP
+start\-registry\-os\-asset(1)
+Commands to add, sign, or get registry assets
+.TP
+start\-registry\-os\-index(1)
+List OS versions index
+.TP
+start\-registry\-os\-version(1)
+Commands to add, remove, or list versions or version signers
diff --git a/core/man/start-registry/start-registry-package-add-mirror.1 b/core/man/start-registry/start-registry-package-add-mirror.1
new file mode 100644
index 000000000..93ce3f5d7
--- /dev/null
+++ b/core/man/start-registry/start-registry-package-add-mirror.1
@@ -0,0 +1,22 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-registry-package-add-mirror 1  "add-mirror " 
+.SH NAME
+start\-registry\-package\-add\-mirror \- Add a mirror for an s9pk
+.SH SYNOPSIS
+\fBstart\-registry package add\-mirror\fR [\fB\-\-no\-verify\fR] [\fB\-h\fR|\fB\-\-help\fR] <\fIFILE\fR> <\fIURL\fR> 
+.SH DESCRIPTION
+Add a mirror for an s9pk
+.SH OPTIONS
+.TP
+\fB\-\-no\-verify\fR
+Skip signature verification
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIFILE\fR>
+Path to s9pk package file
+.TP
+<\fIURL\fR>
+URL of the mirror
diff --git a/core/man/start-registry/start-registry-package-add.1 b/core/man/start-registry/start-registry-package-add.1
new file mode 100644
index 000000000..7351c16f1
--- /dev/null
+++ b/core/man/start-registry/start-registry-package-add.1
@@ -0,0 +1,22 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-registry-package-add 1  "add " 
+.SH NAME
+start\-registry\-package\-add \- Add package to registry index
+.SH SYNOPSIS
+\fBstart\-registry package add\fR [\fB\-\-url\fR] [\fB\-\-no\-verify\fR] [\fB\-h\fR|\fB\-\-help\fR] <\fIFILE\fR> 
+.SH DESCRIPTION
+Add package to registry index
+.SH OPTIONS
+.TP
+\fB\-\-url\fR \fI<URL>\fR
+URL of the package
+.TP
+\fB\-\-no\-verify\fR
+Skip signature verification
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIFILE\fR>
+Path to s9pk package file
diff --git a/core/man/start-registry/start-registry-package-category-add-package.1 b/core/man/start-registry/start-registry-package-category-add-package.1
new file mode 100644
index 000000000..c2befe25d
--- /dev/null
+++ b/core/man/start-registry/start-registry-package-category-add-package.1
@@ -0,0 +1,19 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-registry-package-category-add-package 1  "add-package " 
+.SH NAME
+start\-registry\-package\-category\-add\-package \- Add a package to a category
+.SH SYNOPSIS
+\fBstart\-registry package category add\-package\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIID\fR> <\fIPACKAGE\fR> 
+.SH DESCRIPTION
+Add a package to a category
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIID\fR>
+
+.TP
+<\fIPACKAGE\fR>
+
diff --git a/core/man/start-registry/start-registry-package-category-add.1 b/core/man/start-registry/start-registry-package-category-add.1
new file mode 100644
index 000000000..b78bd3c20
--- /dev/null
+++ b/core/man/start-registry/start-registry-package-category-add.1
@@ -0,0 +1,19 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-registry-package-category-add 1  "add " 
+.SH NAME
+start\-registry\-package\-category\-add \- Add a category to the registry
+.SH SYNOPSIS
+\fBstart\-registry package category add\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIID\fR> <\fINAME\fR> 
+.SH DESCRIPTION
+Add a category to the registry
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIID\fR>
+
+.TP
+<\fINAME\fR>
+
diff --git a/core/man/start-registry/start-registry-package-category-list.1 b/core/man/start-registry/start-registry-package-category-list.1
new file mode 100644
index 000000000..3232dc8ac
--- /dev/null
+++ b/core/man/start-registry/start-registry-package-category-list.1
@@ -0,0 +1,15 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-registry-package-category-list 1  "list " 
+.SH NAME
+start\-registry\-package\-category\-list
+.SH SYNOPSIS
+\fBstart\-registry package category list\fR [\fB\-\-format\fR] [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+.SH OPTIONS
+.TP
+\fB\-\-format\fR
+
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-registry/start-registry-package-category-remove-package.1 b/core/man/start-registry/start-registry-package-category-remove-package.1
new file mode 100644
index 000000000..c625d06e1
--- /dev/null
+++ b/core/man/start-registry/start-registry-package-category-remove-package.1
@@ -0,0 +1,19 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-registry-package-category-remove-package 1  "remove-package " 
+.SH NAME
+start\-registry\-package\-category\-remove\-package \- Remove package from category
+.SH SYNOPSIS
+\fBstart\-registry package category remove\-package\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIID\fR> <\fIPACKAGE\fR> 
+.SH DESCRIPTION
+Remove package from category
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIID\fR>
+
+.TP
+<\fIPACKAGE\fR>
+
diff --git a/core/man/start-registry/start-registry-package-category-remove.1 b/core/man/start-registry/start-registry-package-category-remove.1
new file mode 100644
index 000000000..cc3047992
--- /dev/null
+++ b/core/man/start-registry/start-registry-package-category-remove.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-registry-package-category-remove 1  "remove " 
+.SH NAME
+start\-registry\-package\-category\-remove \- Remove category from registry
+.SH SYNOPSIS
+\fBstart\-registry package category remove\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIID\fR> 
+.SH DESCRIPTION
+Remove category from registry
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIID\fR>
+
diff --git a/core/man/start-registry/start-registry-package-category.1 b/core/man/start-registry/start-registry-package-category.1
new file mode 100644
index 000000000..53b0ab7fb
--- /dev/null
+++ b/core/man/start-registry/start-registry-package-category.1
@@ -0,0 +1,28 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-registry-package-category 1  "category " 
+.SH NAME
+start\-registry\-package\-category \- Update categories in registry
+.SH SYNOPSIS
+\fBstart\-registry package category\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIsubcommands\fR>
+.SH DESCRIPTION
+Update categories in registry
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.SH SUBCOMMANDS
+.TP
+start\-registry\-package\-category\-add(1)
+Add a category to the registry
+.TP
+start\-registry\-package\-category\-add\-package(1)
+Add a package to a category
+.TP
+start\-registry\-package\-category\-list(1)
+.TP
+start\-registry\-package\-category\-remove(1)
+Remove category from registry
+.TP
+start\-registry\-package\-category\-remove\-package(1)
+Remove package from category
diff --git a/core/man/start-registry/start-registry-package-download.1 b/core/man/start-registry/start-registry-package-download.1
new file mode 100644
index 000000000..81b0bbe3e
--- /dev/null
+++ b/core/man/start-registry/start-registry-package-download.1
@@ -0,0 +1,22 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-registry-package-download 1  "download " 
+.SH NAME
+start\-registry\-package\-download \- Download s9pk package
+.SH SYNOPSIS
+\fBstart\-registry package download\fR [\fB\-v\fR|\fB\-\-target\-version\fR] [\fB\-d\fR|\fB\-\-dest\fR] [\fB\-h\fR|\fB\-\-help\fR] <\fIID\fR> 
+.SH DESCRIPTION
+Download s9pk package
+.SH OPTIONS
+.TP
+\fB\-v\fR, \fB\-\-target\-version\fR \fI<TARGET_VERSION>\fR
+Target version range constraint
+.TP
+\fB\-d\fR, \fB\-\-dest\fR \fI<DEST>\fR
+Destination path for download
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIID\fR>
+Package identifier
diff --git a/core/man/start-registry/start-registry-package-get.1 b/core/man/start-registry/start-registry-package-get.1
new file mode 100644
index 000000000..3bebdfd5d
--- /dev/null
+++ b/core/man/start-registry/start-registry-package-get.1
@@ -0,0 +1,40 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-registry-package-get 1  "get " 
+.SH NAME
+start\-registry\-package\-get \- List installation candidates
+.SH SYNOPSIS
+\fBstart\-registry package get\fR [\fB\-v\fR|\fB\-\-target\-version\fR] [\fB\-\-source\-version\fR] [\fB\-\-format\fR] [\fB\-h\fR|\fB\-\-help\fR] [\fIID\fR] [\fIOTHER_VERSIONS\fR] 
+.SH DESCRIPTION
+List installation candidates
+.SH OPTIONS
+.TP
+\fB\-v\fR, \fB\-\-target\-version\fR \fI<TARGET_VERSION>\fR
+Target version range constraint
+.TP
+\fB\-\-source\-version\fR \fI<SOURCE_VERSION>\fR
+Source version to upgrade from
+.TP
+\fB\-\-format\fR
+
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+[\fIID\fR]
+Package identifier
+.TP
+[\fIOTHER_VERSIONS\fR] [default: none]
+Detail level for other versions
+.br
+
+.br
+\fIPossible values:\fR
+.RS 14
+.IP \(bu 2
+none
+.IP \(bu 2
+short
+.IP \(bu 2
+full
+.RE
diff --git a/core/man/start-registry/start-registry-package-index.1 b/core/man/start-registry/start-registry-package-index.1
new file mode 100644
index 000000000..0f86e66d2
--- /dev/null
+++ b/core/man/start-registry/start-registry-package-index.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-registry-package-index 1  "index " 
+.SH NAME
+start\-registry\-package\-index \- List packages and categories
+.SH SYNOPSIS
+\fBstart\-registry package index\fR [\fB\-\-format\fR] [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+List packages and categories
+.SH OPTIONS
+.TP
+\fB\-\-format\fR
+
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-registry/start-registry-package-remove-mirror.1 b/core/man/start-registry/start-registry-package-remove-mirror.1
new file mode 100644
index 000000000..fd8bee2e3
--- /dev/null
+++ b/core/man/start-registry/start-registry-package-remove-mirror.1
@@ -0,0 +1,22 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-registry-package-remove-mirror 1  "remove-mirror " 
+.SH NAME
+start\-registry\-package\-remove\-mirror \- Remove mirror package
+.SH SYNOPSIS
+\fBstart\-registry package remove\-mirror\fR <\fB\-\-url\fR> [\fB\-h\fR|\fB\-\-help\fR] <\fIID\fR> <\fIVERSION\fR> 
+.SH DESCRIPTION
+Remove mirror package
+.SH OPTIONS
+.TP
+\fB\-\-url\fR \fI<URL>\fR
+URL of the mirror
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIID\fR>
+Package identifier
+.TP
+<\fIVERSION\fR>
+Package version
diff --git a/core/man/start-registry/start-registry-package-remove.1 b/core/man/start-registry/start-registry-package-remove.1
new file mode 100644
index 000000000..8a5f352da
--- /dev/null
+++ b/core/man/start-registry/start-registry-package-remove.1
@@ -0,0 +1,22 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-registry-package-remove 1  "remove " 
+.SH NAME
+start\-registry\-package\-remove \- Remove package from registry
+.SH SYNOPSIS
+\fBstart\-registry package remove\fR [\fB\-\-sighash\fR] [\fB\-h\fR|\fB\-\-help\fR] <\fIID\fR> <\fIVERSION\fR> 
+.SH DESCRIPTION
+Remove package from registry
+.SH OPTIONS
+.TP
+\fB\-\-sighash\fR \fI<SIGHASH>\fR
+Hash for signature verification
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIID\fR>
+Package identifier
+.TP
+<\fIVERSION\fR>
+Package version
diff --git a/core/man/start-registry/start-registry-package-signer-add.1 b/core/man/start-registry/start-registry-package-signer-add.1
new file mode 100644
index 000000000..73c807749
--- /dev/null
+++ b/core/man/start-registry/start-registry-package-signer-add.1
@@ -0,0 +1,25 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-registry-package-signer-add 1  "add " 
+.SH NAME
+start\-registry\-package\-signer\-add \- Add package signer
+.SH SYNOPSIS
+\fBstart\-registry package signer add\fR [\fB\-\-versions\fR] [\fB\-\-merge\fR] [\fB\-h\fR|\fB\-\-help\fR] <\fIID\fR> <\fISIGNER\fR> 
+.SH DESCRIPTION
+Add package signer
+.SH OPTIONS
+.TP
+\fB\-\-versions\fR \fI<VERSIONS>\fR
+Version range constraint
+.TP
+\fB\-\-merge\fR
+Merge with existing version range instead of replacing
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIID\fR>
+Package identifier
+.TP
+<\fISIGNER\fR>
+Signer identifier
diff --git a/core/man/start-registry/start-registry-package-signer-list.1 b/core/man/start-registry/start-registry-package-signer-list.1
new file mode 100644
index 000000000..4ccb7b144
--- /dev/null
+++ b/core/man/start-registry/start-registry-package-signer-list.1
@@ -0,0 +1,19 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-registry-package-signer-list 1  "list " 
+.SH NAME
+start\-registry\-package\-signer\-list \- List package signers
+.SH SYNOPSIS
+\fBstart\-registry package signer list\fR [\fB\-\-format\fR] [\fB\-h\fR|\fB\-\-help\fR] <\fIID\fR> 
+.SH DESCRIPTION
+List package signers
+.SH OPTIONS
+.TP
+\fB\-\-format\fR
+
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIID\fR>
+Package identifier
diff --git a/core/man/start-registry/start-registry-package-signer-remove.1 b/core/man/start-registry/start-registry-package-signer-remove.1
new file mode 100644
index 000000000..b8b6519cd
--- /dev/null
+++ b/core/man/start-registry/start-registry-package-signer-remove.1
@@ -0,0 +1,19 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-registry-package-signer-remove 1  "remove " 
+.SH NAME
+start\-registry\-package\-signer\-remove \- Remove package signer
+.SH SYNOPSIS
+\fBstart\-registry package signer remove\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIID\fR> <\fISIGNER\fR> 
+.SH DESCRIPTION
+Remove package signer
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIID\fR>
+Package identifier
+.TP
+<\fISIGNER\fR>
+Signer identifier
diff --git a/core/man/start-registry/start-registry-package-signer.1 b/core/man/start-registry/start-registry-package-signer.1
new file mode 100644
index 000000000..6efffbe1f
--- /dev/null
+++ b/core/man/start-registry/start-registry-package-signer.1
@@ -0,0 +1,23 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-registry-package-signer 1  "signer " 
+.SH NAME
+start\-registry\-package\-signer \- Add, remove, and list package signers
+.SH SYNOPSIS
+\fBstart\-registry package signer\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIsubcommands\fR>
+.SH DESCRIPTION
+Add, remove, and list package signers
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.SH SUBCOMMANDS
+.TP
+start\-registry\-package\-signer\-add(1)
+Add package signer
+.TP
+start\-registry\-package\-signer\-list(1)
+List package signers
+.TP
+start\-registry\-package\-signer\-remove(1)
+Remove package signer
diff --git a/core/man/start-registry/start-registry-package.1 b/core/man/start-registry/start-registry-package.1
new file mode 100644
index 000000000..45d39880e
--- /dev/null
+++ b/core/man/start-registry/start-registry-package.1
@@ -0,0 +1,41 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-registry-package 1  "package " 
+.SH NAME
+start\-registry\-package \- Commands to index, add, or get packages
+.SH SYNOPSIS
+\fBstart\-registry package\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIsubcommands\fR>
+.SH DESCRIPTION
+Commands to index, add, or get packages
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.SH SUBCOMMANDS
+.TP
+start\-registry\-package\-add(1)
+Add package to registry index
+.TP
+start\-registry\-package\-add\-mirror(1)
+Add a mirror for an s9pk
+.TP
+start\-registry\-package\-category(1)
+Update categories in registry
+.TP
+start\-registry\-package\-download(1)
+Download s9pk package
+.TP
+start\-registry\-package\-get(1)
+List installation candidates
+.TP
+start\-registry\-package\-index(1)
+List packages and categories
+.TP
+start\-registry\-package\-remove(1)
+Remove package from registry
+.TP
+start\-registry\-package\-remove\-mirror(1)
+Remove mirror package
+.TP
+start\-registry\-package\-signer(1)
+Add, remove, and list package signers
diff --git a/core/man/start-registry/start-registry.1 b/core/man/start-registry/start-registry.1
new file mode 100644
index 000000000..52b56ddb6
--- /dev/null
+++ b/core/man/start-registry/start-registry.1
@@ -0,0 +1,66 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-registry 1  "start-registry 0.4.0-alpha.21" 
+.SH NAME
+start\-registry
+.SH SYNOPSIS
+\fBstart\-registry\fR [\fB\-c\fR|\fB\-\-config\fR] [\fB\-H\fR|\fB\-\-host\fR] [\fB\-r\fR|\fB\-\-registry\fR] [\fB\-\-registry\-hostname\fR] [\fB\-\-s9pk\-s3base\fR] [\fB\-\-s9pk\-s3bucket\fR] [\fB\-t\fR|\fB\-\-tunnel\fR] [\fB\-p\fR|\fB\-\-proxy\fR] [\fB\-\-cookie\-path\fR] [\fB\-\-developer\-key\-path\fR] [\fB\-h\fR|\fB\-\-help\fR] [\fB\-V\fR|\fB\-\-version\fR] [\fIsubcommands\fR]
+.SH DESCRIPTION
+.SH OPTIONS
+.TP
+\fB\-c\fR, \fB\-\-config\fR \fI<CONFIG>\fR
+Path to configuration file
+.TP
+\fB\-H\fR, \fB\-\-host\fR \fI<HOST>\fR
+URL of the StartOS server
+.TP
+\fB\-r\fR, \fB\-\-registry\fR \fI<REGISTRY>\fR
+URL of the registry
+.TP
+\fB\-\-registry\-hostname\fR \fI<REGISTRY_HOSTNAME>\fR
+Registry server hostname
+.TP
+\fB\-\-s9pk\-s3base\fR \fI<S9PK_S3BASE>\fR
+Base URL for publishing s9pks
+.TP
+\fB\-\-s9pk\-s3bucket\fR \fI<S9PK_S3BUCKET>\fR
+S3 bucket to publish s9pks to (should correspond to s3base)
+.TP
+\fB\-t\fR, \fB\-\-tunnel\fR \fI<TUNNEL>\fR
+Tunnel server address
+.TP
+\fB\-p\fR, \fB\-\-proxy\fR \fI<PROXY>\fR
+HTTP/SOCKS proxy URL
+.TP
+\fB\-\-cookie\-path\fR \fI<COOKIE_PATH>\fR
+Path to cookie file
+.TP
+\fB\-\-developer\-key\-path\fR \fI<DEVELOPER_KEY_PATH>\fR
+Path to developer signing key
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+\fB\-V\fR, \fB\-\-version\fR
+Print version
+.SH SUBCOMMANDS
+.TP
+start\-registry\-admin(1)
+Commands to add or list admins or signers
+.TP
+start\-registry\-db(1)
+Commands to interact with the db i.e. dump and apply
+.TP
+start\-registry\-index(1)
+List registry info and packages
+.TP
+start\-registry\-info(1)
+Display registry info
+.TP
+start\-registry\-os(1)
+Commands related to OS assets and versions
+.TP
+start\-registry\-package(1)
+Commands to index, add, or get packages
+.SH VERSION
+v0.4.0\-alpha.21
diff --git a/core/man/start-tunnel/start-tunnel-auth-get-pubkey.1 b/core/man/start-tunnel/start-tunnel-auth-get-pubkey.1
new file mode 100644
index 000000000..6a8df21f8
--- /dev/null
+++ b/core/man/start-tunnel/start-tunnel-auth-get-pubkey.1
@@ -0,0 +1,13 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-tunnel-auth-get-pubkey 1  "get-pubkey " 
+.SH NAME
+start\-tunnel\-auth\-get\-pubkey \- Get the public key from the server
+.SH SYNOPSIS
+\fBstart\-tunnel auth get\-pubkey\fR [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+Get the public key from the server
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-tunnel/start-tunnel-auth-key-add.1 b/core/man/start-tunnel/start-tunnel-auth-key-add.1
new file mode 100644
index 000000000..7898e27fd
--- /dev/null
+++ b/core/man/start-tunnel/start-tunnel-auth-key-add.1
@@ -0,0 +1,19 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-tunnel-auth-key-add 1  "add " 
+.SH NAME
+start\-tunnel\-auth\-key\-add \- Add a new authorized key
+.SH SYNOPSIS
+\fBstart\-tunnel auth key add\fR [\fB\-h\fR|\fB\-\-help\fR] <\fINAME\fR> <\fIKEY\fR> 
+.SH DESCRIPTION
+Add a new authorized key
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fINAME\fR>
+
+.TP
+<\fIKEY\fR>
+
diff --git a/core/man/start-tunnel/start-tunnel-auth-key-list.1 b/core/man/start-tunnel/start-tunnel-auth-key-list.1
new file mode 100644
index 000000000..0f81035ff
--- /dev/null
+++ b/core/man/start-tunnel/start-tunnel-auth-key-list.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-tunnel-auth-key-list 1  "list " 
+.SH NAME
+start\-tunnel\-auth\-key\-list \- List authorized keys
+.SH SYNOPSIS
+\fBstart\-tunnel auth key list\fR [\fB\-\-format\fR] [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+List authorized keys
+.SH OPTIONS
+.TP
+\fB\-\-format\fR
+
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-tunnel/start-tunnel-auth-key-remove.1 b/core/man/start-tunnel/start-tunnel-auth-key-remove.1
new file mode 100644
index 000000000..597875908
--- /dev/null
+++ b/core/man/start-tunnel/start-tunnel-auth-key-remove.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-tunnel-auth-key-remove 1  "remove " 
+.SH NAME
+start\-tunnel\-auth\-key\-remove \- Remove authorized key
+.SH SYNOPSIS
+\fBstart\-tunnel auth key remove\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIKEY\fR> 
+.SH DESCRIPTION
+Remove authorized key
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIKEY\fR>
+
diff --git a/core/man/start-tunnel/start-tunnel-auth-key.1 b/core/man/start-tunnel/start-tunnel-auth-key.1
new file mode 100644
index 000000000..2fd668b0e
--- /dev/null
+++ b/core/man/start-tunnel/start-tunnel-auth-key.1
@@ -0,0 +1,22 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-tunnel-auth-key 1  "key " 
+.SH NAME
+start\-tunnel\-auth\-key
+.SH SYNOPSIS
+\fBstart\-tunnel auth key\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIsubcommands\fR>
+.SH DESCRIPTION
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.SH SUBCOMMANDS
+.TP
+start\-tunnel\-auth\-key\-add(1)
+Add a new authorized key
+.TP
+start\-tunnel\-auth\-key\-list(1)
+List authorized keys
+.TP
+start\-tunnel\-auth\-key\-remove(1)
+Remove authorized key
diff --git a/core/man/start-tunnel/start-tunnel-auth-login.1 b/core/man/start-tunnel/start-tunnel-auth-login.1
new file mode 100644
index 000000000..f627bdd2b
--- /dev/null
+++ b/core/man/start-tunnel/start-tunnel-auth-login.1
@@ -0,0 +1,13 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-tunnel-auth-login 1  "login " 
+.SH NAME
+start\-tunnel\-auth\-login \- Login to a new auth session
+.SH SYNOPSIS
+\fBstart\-tunnel auth login\fR [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+Login to a new auth session
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-tunnel/start-tunnel-auth-logout.1 b/core/man/start-tunnel/start-tunnel-auth-logout.1
new file mode 100644
index 000000000..52b7e8607
--- /dev/null
+++ b/core/man/start-tunnel/start-tunnel-auth-logout.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-tunnel-auth-logout 1  "logout " 
+.SH NAME
+start\-tunnel\-auth\-logout \- Logout from current auth session
+.SH SYNOPSIS
+\fBstart\-tunnel auth logout\fR [\fB\-h\fR|\fB\-\-help\fR] <\fISESSION\fR> 
+.SH DESCRIPTION
+Logout from current auth session
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fISESSION\fR>
+
diff --git a/core/man/start-tunnel/start-tunnel-auth-reset-password.1 b/core/man/start-tunnel/start-tunnel-auth-reset-password.1
new file mode 100644
index 000000000..82caf0e99
--- /dev/null
+++ b/core/man/start-tunnel/start-tunnel-auth-reset-password.1
@@ -0,0 +1,13 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-tunnel-auth-reset-password 1  "reset-password " 
+.SH NAME
+start\-tunnel\-auth\-reset\-password \- Reset user interface password
+.SH SYNOPSIS
+\fBstart\-tunnel auth reset\-password\fR [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+Reset user interface password
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-tunnel/start-tunnel-auth-session-kill.1 b/core/man/start-tunnel/start-tunnel-auth-session-kill.1
new file mode 100644
index 000000000..9548bfa1a
--- /dev/null
+++ b/core/man/start-tunnel/start-tunnel-auth-session-kill.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-tunnel-auth-session-kill 1  "kill " 
+.SH NAME
+start\-tunnel\-auth\-session\-kill \- Terminate auth sessions
+.SH SYNOPSIS
+\fBstart\-tunnel auth session kill\fR [\fB\-h\fR|\fB\-\-help\fR] [\fIIDS\fR] 
+.SH DESCRIPTION
+Terminate auth sessions
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+[\fIIDS\fR]
+Session identifiers
diff --git a/core/man/start-tunnel/start-tunnel-auth-session-list.1 b/core/man/start-tunnel/start-tunnel-auth-session-list.1
new file mode 100644
index 000000000..3b6821de3
--- /dev/null
+++ b/core/man/start-tunnel/start-tunnel-auth-session-list.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-tunnel-auth-session-list 1  "list " 
+.SH NAME
+start\-tunnel\-auth\-session\-list \- Display all auth sessions
+.SH SYNOPSIS
+\fBstart\-tunnel auth session list\fR [\fB\-\-format\fR] [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+Display all auth sessions
+.SH OPTIONS
+.TP
+\fB\-\-format\fR
+
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-tunnel/start-tunnel-auth-session.1 b/core/man/start-tunnel/start-tunnel-auth-session.1
new file mode 100644
index 000000000..1f16a9d80
--- /dev/null
+++ b/core/man/start-tunnel/start-tunnel-auth-session.1
@@ -0,0 +1,20 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-tunnel-auth-session 1  "session " 
+.SH NAME
+start\-tunnel\-auth\-session \- List or kill auth sessions
+.SH SYNOPSIS
+\fBstart\-tunnel auth session\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIsubcommands\fR>
+.SH DESCRIPTION
+List or kill auth sessions
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.SH SUBCOMMANDS
+.TP
+start\-tunnel\-auth\-session\-kill(1)
+Terminate auth sessions
+.TP
+start\-tunnel\-auth\-session\-list(1)
+Display all auth sessions
diff --git a/core/man/start-tunnel/start-tunnel-auth-set-password.1 b/core/man/start-tunnel/start-tunnel-auth-set-password.1
new file mode 100644
index 000000000..cb1935312
--- /dev/null
+++ b/core/man/start-tunnel/start-tunnel-auth-set-password.1
@@ -0,0 +1,13 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-tunnel-auth-set-password 1  "set-password " 
+.SH NAME
+start\-tunnel\-auth\-set\-password \- Set user interface password
+.SH SYNOPSIS
+\fBstart\-tunnel auth set\-password\fR [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+Set user interface password
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-tunnel/start-tunnel-auth.1 b/core/man/start-tunnel/start-tunnel-auth.1
new file mode 100644
index 000000000..bb2c46575
--- /dev/null
+++ b/core/man/start-tunnel/start-tunnel-auth.1
@@ -0,0 +1,34 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-tunnel-auth 1  "auth " 
+.SH NAME
+start\-tunnel\-auth \- Add or remove authorized clients
+.SH SYNOPSIS
+\fBstart\-tunnel auth\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIsubcommands\fR>
+.SH DESCRIPTION
+Add or remove authorized clients
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.SH SUBCOMMANDS
+.TP
+start\-tunnel\-auth\-get\-pubkey(1)
+Get the public key from the server
+.TP
+start\-tunnel\-auth\-key(1)
+.TP
+start\-tunnel\-auth\-login(1)
+Login to a new auth session
+.TP
+start\-tunnel\-auth\-logout(1)
+Logout from current auth session
+.TP
+start\-tunnel\-auth\-reset\-password(1)
+Reset user interface password
+.TP
+start\-tunnel\-auth\-session(1)
+List or kill auth sessions
+.TP
+start\-tunnel\-auth\-set\-password(1)
+Set user interface password
diff --git a/core/man/start-tunnel/start-tunnel-db-apply.1 b/core/man/start-tunnel/start-tunnel-db-apply.1
new file mode 100644
index 000000000..62880a1af
--- /dev/null
+++ b/core/man/start-tunnel/start-tunnel-db-apply.1
@@ -0,0 +1,19 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-tunnel-db-apply 1  "apply " 
+.SH NAME
+start\-tunnel\-db\-apply \- Update a database record
+.SH SYNOPSIS
+\fBstart\-tunnel db apply\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIEXPR\fR> [\fIPATH\fR] 
+.SH DESCRIPTION
+Update a database record
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fIEXPR\fR>
+Database patch expression to apply
+.TP
+[\fIPATH\fR]
+Path to the database file
diff --git a/core/man/start-tunnel/start-tunnel-db-dump.1 b/core/man/start-tunnel/start-tunnel-db-dump.1
new file mode 100644
index 000000000..3d1620334
--- /dev/null
+++ b/core/man/start-tunnel/start-tunnel-db-dump.1
@@ -0,0 +1,22 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-tunnel-db-dump 1  "dump " 
+.SH NAME
+start\-tunnel\-db\-dump \- Filter and query the database, display tables and records
+.SH SYNOPSIS
+\fBstart\-tunnel db dump\fR [\fB\-p\fR|\fB\-\-pointer\fR] [\fB\-\-format\fR] [\fB\-h\fR|\fB\-\-help\fR] [\fIPATH\fR] 
+.SH DESCRIPTION
+Filter and query the database, display tables and records
+.SH OPTIONS
+.TP
+\fB\-p\fR, \fB\-\-pointer\fR \fI<POINTER>\fR
+JSON pointer to specific value
+.TP
+\fB\-\-format\fR
+
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+[\fIPATH\fR]
+Path to the database file
diff --git a/core/man/start-tunnel/start-tunnel-db.1 b/core/man/start-tunnel/start-tunnel-db.1
new file mode 100644
index 000000000..ec2cf34bd
--- /dev/null
+++ b/core/man/start-tunnel/start-tunnel-db.1
@@ -0,0 +1,20 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-tunnel-db 1  "db " 
+.SH NAME
+start\-tunnel\-db \- Commands to interact with the db i.e. dump and apply
+.SH SYNOPSIS
+\fBstart\-tunnel db\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIsubcommands\fR>
+.SH DESCRIPTION
+Commands to interact with the db i.e. dump and apply
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.SH SUBCOMMANDS
+.TP
+start\-tunnel\-db\-apply(1)
+Update a database record
+.TP
+start\-tunnel\-db\-dump(1)
+Filter and query the database, display tables and records
diff --git a/core/man/start-tunnel/start-tunnel-device-add.1 b/core/man/start-tunnel/start-tunnel-device-add.1
new file mode 100644
index 000000000..eff42352e
--- /dev/null
+++ b/core/man/start-tunnel/start-tunnel-device-add.1
@@ -0,0 +1,22 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-tunnel-device-add 1  "add " 
+.SH NAME
+start\-tunnel\-device\-add \- Add a device to a subnet
+.SH SYNOPSIS
+\fBstart\-tunnel device add\fR [\fB\-h\fR|\fB\-\-help\fR] <\fISUBNET\fR> <\fINAME\fR> [\fIIP\fR] 
+.SH DESCRIPTION
+Add a device to a subnet
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fISUBNET\fR>
+
+.TP
+<\fINAME\fR>
+
+.TP
+[\fIIP\fR]
+
diff --git a/core/man/start-tunnel/start-tunnel-device-list.1 b/core/man/start-tunnel/start-tunnel-device-list.1
new file mode 100644
index 000000000..34f4b6c16
--- /dev/null
+++ b/core/man/start-tunnel/start-tunnel-device-list.1
@@ -0,0 +1,19 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-tunnel-device-list 1  "list " 
+.SH NAME
+start\-tunnel\-device\-list \- List devices in a subnet
+.SH SYNOPSIS
+\fBstart\-tunnel device list\fR [\fB\-\-format\fR] [\fB\-h\fR|\fB\-\-help\fR] <\fISUBNET\fR> 
+.SH DESCRIPTION
+List devices in a subnet
+.SH OPTIONS
+.TP
+\fB\-\-format\fR
+
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fISUBNET\fR>
+
diff --git a/core/man/start-tunnel/start-tunnel-device-remove.1 b/core/man/start-tunnel/start-tunnel-device-remove.1
new file mode 100644
index 000000000..e572ed23b
--- /dev/null
+++ b/core/man/start-tunnel/start-tunnel-device-remove.1
@@ -0,0 +1,19 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-tunnel-device-remove 1  "remove " 
+.SH NAME
+start\-tunnel\-device\-remove \- Remove device from subnet
+.SH SYNOPSIS
+\fBstart\-tunnel device remove\fR [\fB\-h\fR|\fB\-\-help\fR] <\fISUBNET\fR> <\fIIP\fR> 
+.SH DESCRIPTION
+Remove device from subnet
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fISUBNET\fR>
+
+.TP
+<\fIIP\fR>
+
diff --git a/core/man/start-tunnel/start-tunnel-device-show-config.1 b/core/man/start-tunnel/start-tunnel-device-show-config.1
new file mode 100644
index 000000000..42dbaadc6
--- /dev/null
+++ b/core/man/start-tunnel/start-tunnel-device-show-config.1
@@ -0,0 +1,22 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-tunnel-device-show-config 1  "show-config " 
+.SH NAME
+start\-tunnel\-device\-show\-config \- Show WireGuard configuration for device
+.SH SYNOPSIS
+\fBstart\-tunnel device show\-config\fR [\fB\-h\fR|\fB\-\-help\fR] <\fISUBNET\fR> <\fIIP\fR> [\fIWAN_ADDR\fR] 
+.SH DESCRIPTION
+Show WireGuard configuration for device
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fISUBNET\fR>
+
+.TP
+<\fIIP\fR>
+
+.TP
+[\fIWAN_ADDR\fR]
+
diff --git a/core/man/start-tunnel/start-tunnel-device.1 b/core/man/start-tunnel/start-tunnel-device.1
new file mode 100644
index 000000000..878454d92
--- /dev/null
+++ b/core/man/start-tunnel/start-tunnel-device.1
@@ -0,0 +1,26 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-tunnel-device 1  "device " 
+.SH NAME
+start\-tunnel\-device \- Add, remove, or list devices in subnets
+.SH SYNOPSIS
+\fBstart\-tunnel device\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIsubcommands\fR>
+.SH DESCRIPTION
+Add, remove, or list devices in subnets
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.SH SUBCOMMANDS
+.TP
+start\-tunnel\-device\-add(1)
+Add a device to a subnet
+.TP
+start\-tunnel\-device\-list(1)
+List devices in a subnet
+.TP
+start\-tunnel\-device\-remove(1)
+Remove device from subnet
+.TP
+start\-tunnel\-device\-show\-config(1)
+Show WireGuard configuration for device
diff --git a/core/man/start-tunnel/start-tunnel-port-forward-add.1 b/core/man/start-tunnel/start-tunnel-port-forward-add.1
new file mode 100644
index 000000000..e3f3e1210
--- /dev/null
+++ b/core/man/start-tunnel/start-tunnel-port-forward-add.1
@@ -0,0 +1,22 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-tunnel-port-forward-add 1  "add " 
+.SH NAME
+start\-tunnel\-port\-forward\-add \- Add a new port forward
+.SH SYNOPSIS
+\fBstart\-tunnel port\-forward add\fR [\fB\-\-label\fR] [\fB\-h\fR|\fB\-\-help\fR] <\fISOURCE\fR> <\fITARGET\fR> 
+.SH DESCRIPTION
+Add a new port forward
+.SH OPTIONS
+.TP
+\fB\-\-label\fR \fI<LABEL>\fR
+
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fISOURCE\fR>
+
+.TP
+<\fITARGET\fR>
+
diff --git a/core/man/start-tunnel/start-tunnel-port-forward-remove.1 b/core/man/start-tunnel/start-tunnel-port-forward-remove.1
new file mode 100644
index 000000000..ee6c411df
--- /dev/null
+++ b/core/man/start-tunnel/start-tunnel-port-forward-remove.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-tunnel-port-forward-remove 1  "remove " 
+.SH NAME
+start\-tunnel\-port\-forward\-remove \- Remove port forward
+.SH SYNOPSIS
+\fBstart\-tunnel port\-forward remove\fR [\fB\-h\fR|\fB\-\-help\fR] <\fISOURCE\fR> 
+.SH DESCRIPTION
+Remove port forward
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fISOURCE\fR>
+
diff --git a/core/man/start-tunnel/start-tunnel-port-forward-set-enabled.1 b/core/man/start-tunnel/start-tunnel-port-forward-set-enabled.1
new file mode 100644
index 000000000..64bf41ff9
--- /dev/null
+++ b/core/man/start-tunnel/start-tunnel-port-forward-set-enabled.1
@@ -0,0 +1,19 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-tunnel-port-forward-set-enabled 1  "set-enabled " 
+.SH NAME
+start\-tunnel\-port\-forward\-set\-enabled \- about.enable\-or\-disable\-port\-forward
+.SH SYNOPSIS
+\fBstart\-tunnel port\-forward set\-enabled\fR [\fB\-\-enabled\fR] [\fB\-h\fR|\fB\-\-help\fR] <\fISOURCE\fR> 
+.SH DESCRIPTION
+about.enable\-or\-disable\-port\-forward
+.SH OPTIONS
+.TP
+\fB\-\-enabled\fR
+
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fISOURCE\fR>
+
diff --git a/core/man/start-tunnel/start-tunnel-port-forward-update-label.1 b/core/man/start-tunnel/start-tunnel-port-forward-update-label.1
new file mode 100644
index 000000000..e8bfbb525
--- /dev/null
+++ b/core/man/start-tunnel/start-tunnel-port-forward-update-label.1
@@ -0,0 +1,19 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-tunnel-port-forward-update-label 1  "update-label " 
+.SH NAME
+start\-tunnel\-port\-forward\-update\-label \- about.update\-port\-forward\-label
+.SH SYNOPSIS
+\fBstart\-tunnel port\-forward update\-label\fR [\fB\-h\fR|\fB\-\-help\fR] <\fISOURCE\fR> [\fILABEL\fR] 
+.SH DESCRIPTION
+about.update\-port\-forward\-label
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fISOURCE\fR>
+
+.TP
+[\fILABEL\fR]
+
diff --git a/core/man/start-tunnel/start-tunnel-port-forward.1 b/core/man/start-tunnel/start-tunnel-port-forward.1
new file mode 100644
index 000000000..f2eaee723
--- /dev/null
+++ b/core/man/start-tunnel/start-tunnel-port-forward.1
@@ -0,0 +1,25 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-tunnel-port-forward 1  "port-forward " 
+.SH NAME
+start\-tunnel\-port\-forward
+.SH SYNOPSIS
+\fBstart\-tunnel port\-forward\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIsubcommands\fR>
+.SH DESCRIPTION
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.SH SUBCOMMANDS
+.TP
+start\-tunnel\-port\-forward\-add(1)
+Add a new port forward
+.TP
+start\-tunnel\-port\-forward\-remove(1)
+Remove port forward
+.TP
+start\-tunnel\-port\-forward\-set\-enabled(1)
+about.enable\-or\-disable\-port\-forward
+.TP
+start\-tunnel\-port\-forward\-update\-label(1)
+about.update\-port\-forward\-label
diff --git a/core/man/start-tunnel/start-tunnel-restart.1 b/core/man/start-tunnel/start-tunnel-restart.1
new file mode 100644
index 000000000..702e4dad4
--- /dev/null
+++ b/core/man/start-tunnel/start-tunnel-restart.1
@@ -0,0 +1,13 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-tunnel-restart 1  "restart " 
+.SH NAME
+start\-tunnel\-restart \- Reboot the tunnel server
+.SH SYNOPSIS
+\fBstart\-tunnel restart\fR [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+Reboot the tunnel server
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-tunnel/start-tunnel-subnet-add.1 b/core/man/start-tunnel/start-tunnel-subnet-add.1
new file mode 100644
index 000000000..fa376d58d
--- /dev/null
+++ b/core/man/start-tunnel/start-tunnel-subnet-add.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-tunnel-subnet-add 1  "add " 
+.SH NAME
+start\-tunnel\-subnet\-add \- Add a new subnet
+.SH SYNOPSIS
+\fBstart\-tunnel subnet add\fR [\fB\-h\fR|\fB\-\-help\fR] <\fINAME\fR> 
+.SH DESCRIPTION
+Add a new subnet
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fINAME\fR>
+
diff --git a/core/man/start-tunnel/start-tunnel-subnet-remove.1 b/core/man/start-tunnel/start-tunnel-subnet-remove.1
new file mode 100644
index 000000000..0ab7f0a01
--- /dev/null
+++ b/core/man/start-tunnel/start-tunnel-subnet-remove.1
@@ -0,0 +1,13 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-tunnel-subnet-remove 1  "remove " 
+.SH NAME
+start\-tunnel\-subnet\-remove \- Remove a subnet
+.SH SYNOPSIS
+\fBstart\-tunnel subnet remove\fR [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+Remove a subnet
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-tunnel/start-tunnel-subnet.1 b/core/man/start-tunnel/start-tunnel-subnet.1
new file mode 100644
index 000000000..0a7794aac
--- /dev/null
+++ b/core/man/start-tunnel/start-tunnel-subnet.1
@@ -0,0 +1,23 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-tunnel-subnet 1  "subnet " 
+.SH NAME
+start\-tunnel\-subnet \- Add, remove, or modify subnets
+.SH SYNOPSIS
+\fBstart\-tunnel subnet\fR [\fB\-h\fR|\fB\-\-help\fR] <\fISUBNET\fR> <\fIsubcommands\fR>
+.SH DESCRIPTION
+Add, remove, or modify subnets
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fISUBNET\fR>
+
+.SH SUBCOMMANDS
+.TP
+start\-tunnel\-subnet\-add(1)
+Add a new subnet
+.TP
+start\-tunnel\-subnet\-remove(1)
+Remove a subnet
diff --git a/core/man/start-tunnel/start-tunnel-update-apply.1 b/core/man/start-tunnel/start-tunnel-update-apply.1
new file mode 100644
index 000000000..830372301
--- /dev/null
+++ b/core/man/start-tunnel/start-tunnel-update-apply.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-tunnel-update-apply 1  "apply " 
+.SH NAME
+start\-tunnel\-update\-apply \- Apply available update
+.SH SYNOPSIS
+\fBstart\-tunnel update apply\fR [\fB\-\-format\fR] [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+Apply available update
+.SH OPTIONS
+.TP
+\fB\-\-format\fR
+
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-tunnel/start-tunnel-update-check.1 b/core/man/start-tunnel/start-tunnel-update-check.1
new file mode 100644
index 000000000..9aebc15ec
--- /dev/null
+++ b/core/man/start-tunnel/start-tunnel-update-check.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-tunnel-update-check 1  "check " 
+.SH NAME
+start\-tunnel\-update\-check \- Check for available updates
+.SH SYNOPSIS
+\fBstart\-tunnel update check\fR [\fB\-\-format\fR] [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+Check for available updates
+.SH OPTIONS
+.TP
+\fB\-\-format\fR
+
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-tunnel/start-tunnel-update.1 b/core/man/start-tunnel/start-tunnel-update.1
new file mode 100644
index 000000000..f58d149a3
--- /dev/null
+++ b/core/man/start-tunnel/start-tunnel-update.1
@@ -0,0 +1,19 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-tunnel-update 1  "update " 
+.SH NAME
+start\-tunnel\-update
+.SH SYNOPSIS
+\fBstart\-tunnel update\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIsubcommands\fR>
+.SH DESCRIPTION
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.SH SUBCOMMANDS
+.TP
+start\-tunnel\-update\-apply(1)
+Apply available update
+.TP
+start\-tunnel\-update\-check(1)
+Check for available updates
diff --git a/core/man/start-tunnel/start-tunnel-web-disable.1 b/core/man/start-tunnel/start-tunnel-web-disable.1
new file mode 100644
index 000000000..8e8462e48
--- /dev/null
+++ b/core/man/start-tunnel/start-tunnel-web-disable.1
@@ -0,0 +1,13 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-tunnel-web-disable 1  "disable " 
+.SH NAME
+start\-tunnel\-web\-disable \- Disable the webserver
+.SH SYNOPSIS
+\fBstart\-tunnel web disable\fR [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+Disable the webserver
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-tunnel/start-tunnel-web-enable.1 b/core/man/start-tunnel/start-tunnel-web-enable.1
new file mode 100644
index 000000000..3055286c2
--- /dev/null
+++ b/core/man/start-tunnel/start-tunnel-web-enable.1
@@ -0,0 +1,13 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-tunnel-web-enable 1  "enable " 
+.SH NAME
+start\-tunnel\-web\-enable \- Enable the webserver
+.SH SYNOPSIS
+\fBstart\-tunnel web enable\fR [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+Enable the webserver
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-tunnel/start-tunnel-web-generate-certificate.1 b/core/man/start-tunnel/start-tunnel-web-generate-certificate.1
new file mode 100644
index 000000000..6b8662405
--- /dev/null
+++ b/core/man/start-tunnel/start-tunnel-web-generate-certificate.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-tunnel-web-generate-certificate 1  "generate-certificate " 
+.SH NAME
+start\-tunnel\-web\-generate\-certificate \- Generate a certificate for the webserver
+.SH SYNOPSIS
+\fBstart\-tunnel web generate\-certificate\fR [\fB\-h\fR|\fB\-\-help\fR] [\fISUBJECT\fR] 
+.SH DESCRIPTION
+Generate a certificate for the webserver
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+[\fISUBJECT\fR]
+Subject Alternative Name(s) for certificate
diff --git a/core/man/start-tunnel/start-tunnel-web-get-available-ips.1 b/core/man/start-tunnel/start-tunnel-web-get-available-ips.1
new file mode 100644
index 000000000..234a89b46
--- /dev/null
+++ b/core/man/start-tunnel/start-tunnel-web-get-available-ips.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-tunnel-web-get-available-ips 1  "get-available-ips " 
+.SH NAME
+start\-tunnel\-web\-get\-available\-ips \- Get available IP addresses to bind
+.SH SYNOPSIS
+\fBstart\-tunnel web get\-available\-ips\fR [\fB\-\-format\fR] [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+Get available IP addresses to bind
+.SH OPTIONS
+.TP
+\fB\-\-format\fR
+
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-tunnel/start-tunnel-web-get-certificate.1 b/core/man/start-tunnel/start-tunnel-web-get-certificate.1
new file mode 100644
index 000000000..76802afe2
--- /dev/null
+++ b/core/man/start-tunnel/start-tunnel-web-get-certificate.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-tunnel-web-get-certificate 1  "get-certificate " 
+.SH NAME
+start\-tunnel\-web\-get\-certificate \- Get the certificate for the webserver
+.SH SYNOPSIS
+\fBstart\-tunnel web get\-certificate\fR [\fB\-\-format\fR] [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+Get the certificate for the webserver
+.SH OPTIONS
+.TP
+\fB\-\-format\fR
+
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-tunnel/start-tunnel-web-get-listen.1 b/core/man/start-tunnel/start-tunnel-web-get-listen.1
new file mode 100644
index 000000000..36fe41e8f
--- /dev/null
+++ b/core/man/start-tunnel/start-tunnel-web-get-listen.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-tunnel-web-get-listen 1  "get-listen " 
+.SH NAME
+start\-tunnel\-web\-get\-listen \- Get the listen address for the webserver
+.SH SYNOPSIS
+\fBstart\-tunnel web get\-listen\fR [\fB\-\-format\fR] [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+Get the listen address for the webserver
+.SH OPTIONS
+.TP
+\fB\-\-format\fR
+
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-tunnel/start-tunnel-web-import-certificate.1 b/core/man/start-tunnel/start-tunnel-web-import-certificate.1
new file mode 100644
index 000000000..7fd206e65
--- /dev/null
+++ b/core/man/start-tunnel/start-tunnel-web-import-certificate.1
@@ -0,0 +1,13 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-tunnel-web-import-certificate 1  "import-certificate " 
+.SH NAME
+start\-tunnel\-web\-import\-certificate \- Import a certificate for the webserver
+.SH SYNOPSIS
+\fBstart\-tunnel web import\-certificate\fR [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+Import a certificate for the webserver
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-tunnel/start-tunnel-web-init.1 b/core/man/start-tunnel/start-tunnel-web-init.1
new file mode 100644
index 000000000..679ae3d3f
--- /dev/null
+++ b/core/man/start-tunnel/start-tunnel-web-init.1
@@ -0,0 +1,13 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-tunnel-web-init 1  "init " 
+.SH NAME
+start\-tunnel\-web\-init \- Initialize the webserver
+.SH SYNOPSIS
+\fBstart\-tunnel web init\fR [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+Initialize the webserver
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-tunnel/start-tunnel-web-set-listen.1 b/core/man/start-tunnel/start-tunnel-web-set-listen.1
new file mode 100644
index 000000000..740de84c7
--- /dev/null
+++ b/core/man/start-tunnel/start-tunnel-web-set-listen.1
@@ -0,0 +1,16 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-tunnel-web-set-listen 1  "set-listen " 
+.SH NAME
+start\-tunnel\-web\-set\-listen \- Set the listen address for the webserver
+.SH SYNOPSIS
+\fBstart\-tunnel web set\-listen\fR [\fB\-h\fR|\fB\-\-help\fR] <\fILISTEN\fR> 
+.SH DESCRIPTION
+Set the listen address for the webserver
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+<\fILISTEN\fR>
+Address to listen on
diff --git a/core/man/start-tunnel/start-tunnel-web-uninit.1 b/core/man/start-tunnel/start-tunnel-web-uninit.1
new file mode 100644
index 000000000..d92b687fb
--- /dev/null
+++ b/core/man/start-tunnel/start-tunnel-web-uninit.1
@@ -0,0 +1,13 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-tunnel-web-uninit 1  "uninit " 
+.SH NAME
+start\-tunnel\-web\-uninit \- Uninitialize the webserver
+.SH SYNOPSIS
+\fBstart\-tunnel web uninit\fR [\fB\-h\fR|\fB\-\-help\fR] 
+.SH DESCRIPTION
+Uninitialize the webserver
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
diff --git a/core/man/start-tunnel/start-tunnel-web.1 b/core/man/start-tunnel/start-tunnel-web.1
new file mode 100644
index 000000000..842cc7b8f
--- /dev/null
+++ b/core/man/start-tunnel/start-tunnel-web.1
@@ -0,0 +1,43 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-tunnel-web 1  "web " 
+.SH NAME
+start\-tunnel\-web
+.SH SYNOPSIS
+\fBstart\-tunnel web\fR [\fB\-h\fR|\fB\-\-help\fR] <\fIsubcommands\fR>
+.SH DESCRIPTION
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.SH SUBCOMMANDS
+.TP
+start\-tunnel\-web\-disable(1)
+Disable the webserver
+.TP
+start\-tunnel\-web\-enable(1)
+Enable the webserver
+.TP
+start\-tunnel\-web\-generate\-certificate(1)
+Generate a certificate for the webserver
+.TP
+start\-tunnel\-web\-get\-available\-ips(1)
+Get available IP addresses to bind
+.TP
+start\-tunnel\-web\-get\-certificate(1)
+Get the certificate for the webserver
+.TP
+start\-tunnel\-web\-get\-listen(1)
+Get the listen address for the webserver
+.TP
+start\-tunnel\-web\-import\-certificate(1)
+Import a certificate for the webserver
+.TP
+start\-tunnel\-web\-init(1)
+Initialize the webserver
+.TP
+start\-tunnel\-web\-set\-listen(1)
+Set the listen address for the webserver
+.TP
+start\-tunnel\-web\-uninit(1)
+Uninitialize the webserver
diff --git a/core/man/start-tunnel/start-tunnel.1 b/core/man/start-tunnel/start-tunnel.1
new file mode 100644
index 000000000..14f8a21d4
--- /dev/null
+++ b/core/man/start-tunnel/start-tunnel.1
@@ -0,0 +1,69 @@
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.TH start-tunnel 1  "start-tunnel 0.4.0-alpha.21" 
+.SH NAME
+start\-tunnel
+.SH SYNOPSIS
+\fBstart\-tunnel\fR [\fB\-c\fR|\fB\-\-config\fR] [\fB\-H\fR|\fB\-\-host\fR] [\fB\-r\fR|\fB\-\-registry\fR] [\fB\-\-registry\-hostname\fR] [\fB\-\-s9pk\-s3base\fR] [\fB\-\-s9pk\-s3bucket\fR] [\fB\-t\fR|\fB\-\-tunnel\fR] [\fB\-p\fR|\fB\-\-proxy\fR] [\fB\-\-cookie\-path\fR] [\fB\-\-developer\-key\-path\fR] [\fB\-h\fR|\fB\-\-help\fR] [\fB\-V\fR|\fB\-\-version\fR] [\fIsubcommands\fR]
+.SH DESCRIPTION
+.SH OPTIONS
+.TP
+\fB\-c\fR, \fB\-\-config\fR \fI<CONFIG>\fR
+Path to configuration file
+.TP
+\fB\-H\fR, \fB\-\-host\fR \fI<HOST>\fR
+URL of the StartOS server
+.TP
+\fB\-r\fR, \fB\-\-registry\fR \fI<REGISTRY>\fR
+URL of the registry
+.TP
+\fB\-\-registry\-hostname\fR \fI<REGISTRY_HOSTNAME>\fR
+Registry server hostname
+.TP
+\fB\-\-s9pk\-s3base\fR \fI<S9PK_S3BASE>\fR
+Base URL for publishing s9pks
+.TP
+\fB\-\-s9pk\-s3bucket\fR \fI<S9PK_S3BUCKET>\fR
+S3 bucket to publish s9pks to (should correspond to s3base)
+.TP
+\fB\-t\fR, \fB\-\-tunnel\fR \fI<TUNNEL>\fR
+Tunnel server address
+.TP
+\fB\-p\fR, \fB\-\-proxy\fR \fI<PROXY>\fR
+HTTP/SOCKS proxy URL
+.TP
+\fB\-\-cookie\-path\fR \fI<COOKIE_PATH>\fR
+Path to cookie file
+.TP
+\fB\-\-developer\-key\-path\fR \fI<DEVELOPER_KEY_PATH>\fR
+Path to developer signing key
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help
+.TP
+\fB\-V\fR, \fB\-\-version\fR
+Print version
+.SH SUBCOMMANDS
+.TP
+start\-tunnel\-auth(1)
+Add or remove authorized clients
+.TP
+start\-tunnel\-db(1)
+Commands to interact with the db i.e. dump and apply
+.TP
+start\-tunnel\-device(1)
+Add, remove, or list devices in subnets
+.TP
+start\-tunnel\-port\-forward(1)
+.TP
+start\-tunnel\-restart(1)
+Reboot the tunnel server
+.TP
+start\-tunnel\-subnet(1)
+Add, remove, or modify subnets
+.TP
+start\-tunnel\-update(1)
+.TP
+start\-tunnel\-web(1)
+.SH VERSION
+v0.4.0\-alpha.21
diff --git a/core/src/action.rs b/core/src/action.rs
index 5fa65c961..6782c8857 100644
--- a/core/src/action.rs
+++ b/core/src/action.rs
@@ -61,6 +61,7 @@ pub struct ActionInput {
 }
 
 #[derive(Deserialize, Serialize, TS, Parser)]
+#[group(skip)]
 #[serde(rename_all = "camelCase")]
 pub struct GetActionInputParams {
     #[arg(help = "help.arg.package-id")]
@@ -287,10 +288,11 @@ pub struct RunActionParams {
 }
 
 #[derive(Parser)]
+#[group(skip)]
 struct CliRunActionParams {
     #[arg(help = "help.arg.package-id")]
     pub package_id: PackageId,
-    #[arg(help = "help.arg.event-id")]
+    #[arg(long, help = "help.arg.event-id")]
     pub event_id: Option<Guid>,
     #[arg(help = "help.arg.action-id")]
     pub action_id: ActionId,
@@ -368,6 +370,7 @@ pub async fn run_action(
 }
 
 #[derive(Deserialize, Serialize, Parser, TS)]
+#[group(skip)]
 #[ts(export)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
diff --git a/core/src/auth.rs b/core/src/auth.rs
index 402d5d9c2..f0b8c2ee0 100644
--- a/core/src/auth.rs
+++ b/core/src/auth.rs
@@ -282,6 +282,7 @@ pub async fn login_impl<C: SessionAuthContext>(
 }
 
 #[derive(Deserialize, Serialize, Parser, TS)]
+#[group(skip)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct LogoutParams {
@@ -375,6 +376,7 @@ fn display_sessions(params: WithIoFormat<ListParams>, arg: SessionList) -> Resul
 }
 
 #[derive(Deserialize, Serialize, Parser, TS)]
+#[group(skip)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct ListParams {
@@ -418,6 +420,7 @@ impl AsLogoutSessionId for KillSessionId {
 }
 
 #[derive(Deserialize, Serialize, Parser, TS)]
+#[group(skip)]
 #[ts(export)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
@@ -436,6 +439,7 @@ pub async fn kill<C: SessionAuthContext>(
 }
 
 #[derive(Deserialize, Serialize, Parser, TS)]
+#[group(skip)]
 #[ts(export)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
diff --git a/core/src/backup/backup_bulk.rs b/core/src/backup/backup_bulk.rs
index cb70a77a1..79584c669 100644
--- a/core/src/backup/backup_bulk.rs
+++ b/core/src/backup/backup_bulk.rs
@@ -30,6 +30,7 @@ use crate::util::serde::IoFormat;
 use crate::version::VersionT;
 
 #[derive(Deserialize, Serialize, Parser, TS)]
+#[group(skip)]
 #[ts(export)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
diff --git a/core/src/backup/restore.rs b/core/src/backup/restore.rs
index 77e7181f5..fc850ef8c 100644
--- a/core/src/backup/restore.rs
+++ b/core/src/backup/restore.rs
@@ -29,16 +29,17 @@ use crate::system::{save_language, sync_kiosk};
 use crate::util::serde::{IoFormat, Pem};
 
 #[derive(Deserialize, Serialize, Parser, TS)]
+#[group(skip)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 #[ts(export)]
 pub struct RestorePackageParams {
-    #[arg(help = "help.arg.package-ids")]
-    pub ids: Vec<PackageId>,
     #[arg(help = "help.arg.backup-target-id")]
     pub target_id: BackupTargetId,
     #[arg(help = "help.arg.backup-password")]
     pub password: String,
+    #[arg(help = "help.arg.package-ids")]
+    pub ids: Vec<PackageId>,
 }
 
 // #[command(rename = "restore", display(display_none))]
diff --git a/core/src/backup/target/cifs.rs b/core/src/backup/target/cifs.rs
index f5fa74862..b785ca05d 100644
--- a/core/src/backup/target/cifs.rs
+++ b/core/src/backup/target/cifs.rs
@@ -73,6 +73,7 @@ pub fn cifs<C: Context>() -> ParentHandler<C> {
 }
 
 #[derive(Deserialize, Serialize, Parser, TS)]
+#[group(skip)]
 #[ts(export)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
@@ -133,6 +134,7 @@ pub async fn add(
 }
 
 #[derive(Deserialize, Serialize, Parser, TS)]
+#[group(skip)]
 #[ts(export)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
@@ -210,6 +212,7 @@ pub async fn update(
 }
 
 #[derive(Deserialize, Serialize, Parser, TS)]
+#[group(skip)]
 #[ts(export)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
diff --git a/core/src/backup/target/mod.rs b/core/src/backup/target/mod.rs
index 86a006cdd..a32ef2e22 100644
--- a/core/src/backup/target/mod.rs
+++ b/core/src/backup/target/mod.rs
@@ -273,6 +273,7 @@ fn display_backup_info(params: WithIoFormat<InfoParams>, info: BackupInfo) -> Re
 }
 
 #[derive(Deserialize, Serialize, Parser, TS)]
+#[group(skip)]
 #[ts(export)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
@@ -314,6 +315,7 @@ lazy_static::lazy_static! {
 }
 
 #[derive(Deserialize, Serialize, Parser)]
+#[group(skip)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct MountParams {
@@ -396,6 +398,7 @@ pub async fn mount(
 }
 
 #[derive(Deserialize, Serialize, Parser, TS)]
+#[group(skip)]
 #[ts(export)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
diff --git a/core/src/bins/container_cli.rs b/core/src/bins/container_cli.rs
index 0f5c65226..cc4b8c14d 100644
--- a/core/src/bins/container_cli.rs
+++ b/core/src/bins/container_cli.rs
@@ -7,9 +7,8 @@ use crate::service::cli::{ContainerCliContext, ContainerClientConfig};
 use crate::util::logger::LOGGER;
 use crate::version::{Current, VersionT};
 
-pub fn main(args: impl IntoIterator<Item = OsString>) {
-    LOGGER.enable();
-    if let Err(e) = CliApp::new(
+fn app() -> CliApp<ContainerCliContext, ContainerClientConfig> {
+    CliApp::new(
         |cfg: ContainerClientConfig| Ok(ContainerCliContext::init(cfg)),
         crate::service::effects::handler(),
     )
@@ -18,8 +17,11 @@ pub fn main(args: impl IntoIterator<Item = OsString>) {
         cmd.name("start-container")
             .version(Current::default().semver().to_string())
     })
-    .run(args)
-    {
+}
+
+pub fn main(args: impl IntoIterator<Item = OsString>) {
+    LOGGER.enable();
+    if let Err(e) = app().run(args) {
         match e.data {
             Some(Value::String(s)) => eprintln!("{}: {}", e.message, s),
             Some(Value::Object(o)) => {
@@ -37,3 +39,9 @@ pub fn main(args: impl IntoIterator<Item = OsString>) {
         std::process::exit(e.code);
     }
 }
+
+#[test]
+fn export_manpage_start_container() {
+    std::fs::create_dir_all("./man/start-container").unwrap();
+    clap_mangen::generate_to(app().into_command(), "./man/start-container").unwrap();
+}
diff --git a/core/src/bins/registry.rs b/core/src/bins/registry.rs
index 49892247c..9daa5f22a 100644
--- a/core/src/bins/registry.rs
+++ b/core/src/bins/registry.rs
@@ -8,13 +8,13 @@ use tokio::signal::unix::signal;
 use tracing::instrument;
 
 use crate::context::CliContext;
-use crate::version::{Current, VersionT};
 use crate::context::config::ClientConfig;
 use crate::net::web_server::{Acceptor, WebServer};
 use crate::prelude::*;
 use crate::registry::context::{RegistryConfig, RegistryContext};
 use crate::registry::registry_router;
 use crate::util::logger::LOGGER;
+use crate::version::{Current, VersionT};
 
 #[instrument(skip_all)]
 async fn inner_main(config: &RegistryConfig) -> Result<(), Error> {
@@ -94,10 +94,8 @@ pub fn main(args: impl IntoIterator<Item = OsString>) {
     }
 }
 
-pub fn cli(args: impl IntoIterator<Item = OsString>) {
-    LOGGER.enable();
-
-    if let Err(e) = CliApp::new(
+fn app() -> CliApp<CliContext, ClientConfig> {
+    CliApp::new(
         |cfg: ClientConfig| Ok(CliContext::init(cfg.load()?)?),
         crate::registry::registry_api(),
     )
@@ -106,8 +104,12 @@ pub fn cli(args: impl IntoIterator<Item = OsString>) {
         cmd.name("start-registry")
             .version(Current::default().semver().to_string())
     })
-    .run(args)
-    {
+}
+
+pub fn cli(args: impl IntoIterator<Item = OsString>) {
+    LOGGER.enable();
+
+    if let Err(e) = app().run(args) {
         match e.data {
             Some(serde_json::Value::String(s)) => eprintln!("{}: {}", e.message, s),
             Some(serde_json::Value::Object(o)) => {
@@ -125,3 +127,9 @@ pub fn cli(args: impl IntoIterator<Item = OsString>) {
         std::process::exit(e.code);
     }
 }
+
+#[test]
+fn export_manpage_start_registry() {
+    std::fs::create_dir_all("./man/start-registry").unwrap();
+    clap_mangen::generate_to(app().into_command(), "./man/start-registry").unwrap();
+}
diff --git a/core/src/bins/start_cli.rs b/core/src/bins/start_cli.rs
index 85847f110..937252d2d 100644
--- a/core/src/bins/start_cli.rs
+++ b/core/src/bins/start_cli.rs
@@ -8,10 +8,8 @@ use crate::context::config::ClientConfig;
 use crate::util::logger::LOGGER;
 use crate::version::{Current, VersionT};
 
-pub fn main(args: impl IntoIterator<Item = OsString>) {
-    LOGGER.enable();
-
-    if let Err(e) = CliApp::new(
+fn app() -> CliApp<CliContext, ClientConfig> {
+    CliApp::new(
         |cfg: ClientConfig| Ok(CliContext::init(cfg.load()?)?),
         crate::main_api(),
     )
@@ -20,8 +18,12 @@ pub fn main(args: impl IntoIterator<Item = OsString>) {
         cmd.name("start-cli")
             .version(Current::default().semver().to_string())
     })
-    .run(args)
-    {
+}
+
+pub fn main(args: impl IntoIterator<Item = OsString>) {
+    LOGGER.enable();
+
+    if let Err(e) = app().run(args) {
         match e.data {
             Some(Value::String(s)) => eprintln!("{}: {}", e.message, s),
             Some(Value::Object(o)) => {
@@ -39,3 +41,9 @@ pub fn main(args: impl IntoIterator<Item = OsString>) {
         std::process::exit(e.code);
     }
 }
+
+#[test]
+fn export_manpage_start_cli() {
+    std::fs::create_dir_all("./man/start-cli").unwrap();
+    clap_mangen::generate_to(app().into_command(), "./man/start-cli").unwrap();
+}
diff --git a/core/src/bins/tunnel.rs b/core/src/bins/tunnel.rs
index 3c72e556a..f764ee993 100644
--- a/core/src/bins/tunnel.rs
+++ b/core/src/bins/tunnel.rs
@@ -1,5 +1,6 @@
 use std::ffi::OsString;
 use std::net::SocketAddr;
+use std::process::Command;
 use std::sync::Arc;
 use std::time::Duration;
 
@@ -13,7 +14,6 @@ use tracing::instrument;
 use visit_rs::Visit;
 
 use crate::context::CliContext;
-use crate::version::{Current, VersionT};
 use crate::context::config::ClientConfig;
 use crate::net::tls::TlsListener;
 use crate::net::web_server::{Accept, Acceptor, MetadataVisitor, WebServer};
@@ -23,6 +23,7 @@ use crate::tunnel::tunnel_router;
 use crate::tunnel::web::TunnelCertHandler;
 use crate::util::future::NonDetachingJoinHandle;
 use crate::util::logger::LOGGER;
+use crate::version::{Current, VersionT};
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord)]
 enum WebserverListener {
@@ -36,7 +37,9 @@ impl<V: MetadataVisitor> Visit<V> for WebserverListener {
 }
 
 #[instrument(skip_all)]
-async fn inner_main(config: &TunnelConfig) -> Result<(), Error> {
+async fn inner_main(config: &TunnelConfig) -> Result<Option<bool>, Error> {
+    let mut shutdown = None;
+
     let server = async {
         let ctx = TunnelContext::init(config).await?;
         let listen = ctx.listen;
@@ -133,13 +136,13 @@ async fn inner_main(config: &TunnelConfig) -> Result<(), Error> {
             .await;
             sig_handler_ctx
                 .shutdown
-                .send(())
+                .send(None)
                 .map_err(|_| ())
                 .expect("send shutdown signal");
         })
         .into();
 
-        shutdown_recv
+        shutdown = shutdown_recv
             .recv()
             .await
             .with_kind(crate::ErrorKind::Unknown)?;
@@ -152,7 +155,7 @@ async fn inner_main(config: &TunnelConfig) -> Result<(), Error> {
     .await?;
     server.shutdown().await;
 
-    Ok(())
+    Ok(shutdown)
 }
 
 pub fn main(args: impl IntoIterator<Item = OsString>) {
@@ -169,7 +172,13 @@ pub fn main(args: impl IntoIterator<Item = OsString>) {
     };
 
     match res {
-        Ok(()) => (),
+        Ok(None) => (),
+        Ok(Some(true)) => {
+            Command::new("reboot").status().unwrap();
+        }
+        Ok(Some(false)) => {
+            Command::new("poweroff").status().unwrap();
+        }
         Err(e) => {
             eprintln!("{}", e.source);
             tracing::debug!("{:?}", e.source);
@@ -179,10 +188,8 @@ pub fn main(args: impl IntoIterator<Item = OsString>) {
     }
 }
 
-pub fn cli(args: impl IntoIterator<Item = OsString>) {
-    LOGGER.enable();
-
-    if let Err(e) = CliApp::new(
+fn app() -> CliApp<CliContext, ClientConfig> {
+    CliApp::new(
         |cfg: ClientConfig| Ok(CliContext::init(cfg.load()?)?),
         crate::tunnel::api::tunnel_api(),
     )
@@ -191,8 +198,12 @@ pub fn cli(args: impl IntoIterator<Item = OsString>) {
         cmd.name("start-tunnel")
             .version(Current::default().semver().to_string())
     })
-    .run(args)
-    {
+}
+
+pub fn cli(args: impl IntoIterator<Item = OsString>) {
+    LOGGER.enable();
+
+    if let Err(e) = app().run(args) {
         match e.data {
             Some(serde_json::Value::String(s)) => eprintln!("{}: {}", e.message, s),
             Some(serde_json::Value::Object(o)) => {
@@ -210,3 +221,9 @@ pub fn cli(args: impl IntoIterator<Item = OsString>) {
         std::process::exit(e.code);
     }
 }
+
+#[test]
+fn export_manpage_start_tunnel() {
+    std::fs::create_dir_all("./man/start-tunnel").unwrap();
+    clap_mangen::generate_to(app().into_command(), "./man/start-tunnel").unwrap();
+}
diff --git a/core/src/context/config.rs b/core/src/context/config.rs
index 4e1dd4827..0709865ea 100644
--- a/core/src/context/config.rs
+++ b/core/src/context/config.rs
@@ -53,6 +53,7 @@ pub trait ContextConfig: DeserializeOwned + Default {
 }
 
 #[derive(Debug, Default, Deserialize, Serialize, Parser)]
+#[group(skip)]
 #[serde(rename_all = "kebab-case")]
 #[command(rename_all = "kebab-case")]
 #[command(version = crate::version::Current::default().semver().to_string())]
@@ -114,6 +115,7 @@ impl ClientConfig {
 }
 
 #[derive(Debug, Clone, Default, Deserialize, Serialize, Parser)]
+#[group(skip)]
 #[serde(rename_all = "kebab-case")]
 #[command(rename_all = "kebab-case")]
 pub struct ServerConfig {
diff --git a/core/src/control.rs b/core/src/control.rs
index 63b4ea889..5cf9396a8 100644
--- a/core/src/control.rs
+++ b/core/src/control.rs
@@ -8,6 +8,7 @@ use crate::prelude::*;
 use crate::{Error, PackageId};
 
 #[derive(Deserialize, Serialize, Parser, TS)]
+#[group(skip)]
 #[ts(export)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
diff --git a/core/src/db/mod.rs b/core/src/db/mod.rs
index 67653b389..7f2b0940f 100644
--- a/core/src/db/mod.rs
+++ b/core/src/db/mod.rs
@@ -84,6 +84,7 @@ pub enum RevisionsRes {
 }
 
 #[derive(Deserialize, Serialize, Parser)]
+#[group(skip)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct CliDumpParams {
@@ -260,6 +261,7 @@ pub async fn subscribe(
 }
 
 #[derive(Deserialize, Serialize, Parser)]
+#[group(skip)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct CliApplyParams {
@@ -331,6 +333,7 @@ async fn cli_apply(
 }
 
 #[derive(Deserialize, Serialize, Parser, TS)]
+#[group(skip)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct ApplyParams {
@@ -371,6 +374,7 @@ pub fn put<C: Context>() -> ParentHandler<C> {
     )
 }
 #[derive(Deserialize, Serialize, Parser, TS)]
+#[group(skip)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct UiParams {
diff --git a/core/src/disk/mount/filesystem/idmapped.rs b/core/src/disk/mount/filesystem/idmapped.rs
index 87a59760c..d5439100a 100644
--- a/core/src/disk/mount/filesystem/idmapped.rs
+++ b/core/src/disk/mount/filesystem/idmapped.rs
@@ -19,6 +19,7 @@ use crate::prelude::*;
 use crate::util::{FromStrParser, Invoke};
 
 #[derive(Clone, Copy, Debug, Deserialize, Serialize, Parser, TS)]
+#[group(skip)]
 #[serde(rename_all = "camelCase")]
 pub struct IdMap {
     pub from_id: u32,
diff --git a/core/src/hostname.rs b/core/src/hostname.rs
index 0113afe75..9e299b679 100644
--- a/core/src/hostname.rs
+++ b/core/src/hostname.rs
@@ -239,6 +239,7 @@ pub async fn sync_hostname(hostname: &ServerHostname) -> Result<(), Error> {
 }
 
 #[derive(Deserialize, Serialize, Parser, TS)]
+#[group(skip)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 #[ts(export)]
diff --git a/core/src/install/mod.rs b/core/src/install/mod.rs
index 80687c0c2..42d17fe54 100644
--- a/core/src/install/mod.rs
+++ b/core/src/install/mod.rs
@@ -286,6 +286,7 @@ pub async fn sideload(
 }
 
 #[derive(Debug, Clone, Deserialize, Serialize, Parser, TS)]
+#[group(skip)]
 #[ts(export)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
@@ -306,6 +307,7 @@ pub fn cancel_install(
 }
 
 #[derive(Deserialize, Serialize, Parser)]
+#[group(skip)]
 pub struct QueryPackageParams {
     #[arg(help = "help.arg.package-id")]
     id: PackageId,
@@ -365,6 +367,7 @@ impl FromArgMatches for CliInstallParams {
 }
 
 #[derive(Deserialize, Serialize, Parser, TS)]
+#[group(skip)]
 #[ts(export)]
 pub struct InstalledVersionParams {
     #[arg(help = "help.arg.package-id")]
@@ -524,6 +527,7 @@ pub async fn cli_install(
 }
 
 #[derive(Deserialize, Serialize, Parser, TS)]
+#[group(skip)]
 #[ts(export)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
diff --git a/core/src/lib.rs b/core/src/lib.rs
index bf5805e88..3e1d98d28 100644
--- a/core/src/lib.rs
+++ b/core/src/lib.rs
@@ -109,6 +109,7 @@ use crate::tunnel::context::TunnelUrlParams;
 use crate::util::serde::{HandlerExtSerde, WithIoFormat, display_serializable};
 
 #[derive(Deserialize, Serialize, Parser, TS)]
+#[group(skip)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 #[ts(export)]
diff --git a/core/src/logs.rs b/core/src/logs.rs
index 7c72415f5..f936b2883 100644
--- a/core/src/logs.rs
+++ b/core/src/logs.rs
@@ -235,6 +235,7 @@ pub enum LogSource {
 pub const SYSTEM_UNIT: &str = "startd";
 
 #[derive(Deserialize, Serialize, Parser)]
+#[group(skip)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct PackageIdParams {
@@ -328,6 +329,7 @@ impl From<BootIdentifier> for String {
 }
 
 #[derive(Deserialize, Serialize, Parser, TS)]
+#[group(skip)]
 #[ts(export, concrete(Extra = Empty), bound = "")]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
@@ -362,6 +364,7 @@ pub struct LogsParams<Extra: FromArgMatches + Args = Empty> {
 }
 
 #[derive(Deserialize, Serialize, Parser)]
+#[group(skip)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct CliLogsParams<Extra: FromArgMatches + Args = Empty> {
diff --git a/core/src/net/dns.rs b/core/src/net/dns.rs
index 49c667297..0930c805c 100644
--- a/core/src/net/dns.rs
+++ b/core/src/net/dns.rs
@@ -97,6 +97,7 @@ pub fn dns_api<C: Context>() -> ParentHandler<C> {
 }
 
 #[derive(Deserialize, Serialize, Parser, TS)]
+#[group(skip)]
 #[ts(export)]
 pub struct QueryDnsParams {
     #[arg(help = "help.arg.fqdn")]
@@ -138,6 +139,7 @@ pub fn query_dns<C: Context>(
 }
 
 #[derive(Deserialize, Serialize, Parser, TS)]
+#[group(skip)]
 #[ts(export)]
 pub struct SetStaticDnsParams {
     #[arg(help = "help.arg.dns-servers")]
diff --git a/core/src/net/gateway.rs b/core/src/net/gateway.rs
index a4959b796..e6e731440 100644
--- a/core/src/net/gateway.rs
+++ b/core/src/net/gateway.rs
@@ -143,6 +143,7 @@ async fn list_interfaces(
 }
 
 #[derive(Debug, Clone, Deserialize, Serialize, Parser, TS)]
+#[group(skip)]
 #[ts(export)]
 struct ForgetGatewayParams {
     #[arg(help = "help.arg.gateway-id")]
@@ -157,6 +158,7 @@ async fn forget_iface(
 }
 
 #[derive(Debug, Clone, Deserialize, Serialize, Parser, TS)]
+#[group(skip)]
 #[ts(export)]
 struct RenameGatewayParams {
     #[arg(help = "help.arg.gateway-id")]
@@ -173,6 +175,7 @@ async fn set_name(
 }
 
 #[derive(Debug, Clone, Deserialize, Serialize, Parser, TS)]
+#[group(skip)]
 #[serde(rename_all = "camelCase")]
 #[ts(export)]
 pub struct CheckPortParams {
@@ -240,7 +243,9 @@ pub async fn check_port(
 
     let client = reqwest::Client::builder();
     #[cfg(target_os = "linux")]
-    let client = client.interface(gateway.as_str());
+    let client = client
+        .interface(gateway.as_str())
+        .local_address(IpAddr::V4(Ipv4Addr::UNSPECIFIED));
     let client = client.build()?;
 
     let mut res = None;
@@ -294,6 +299,7 @@ pub async fn check_port(
 }
 
 #[derive(Debug, Clone, Deserialize, Serialize, Parser, TS)]
+#[group(skip)]
 #[serde(rename_all = "camelCase")]
 #[ts(export)]
 pub struct CheckDnsParams {
@@ -373,6 +379,7 @@ pub async fn check_dns(
 }
 
 #[derive(Debug, Clone, Deserialize, Serialize, Parser, TS)]
+#[group(skip)]
 #[serde(rename_all = "camelCase")]
 #[ts(export)]
 struct SetDefaultOutboundParams {
@@ -408,6 +415,7 @@ async fn set_default_outbound(
 }
 
 #[derive(Debug, Clone, Deserialize, Serialize, Parser, TS)]
+#[group(skip)]
 #[serde(rename_all = "camelCase")]
 #[ts(export)]
 pub struct SetOutboundGatewayParams {
diff --git a/core/src/net/host/address.rs b/core/src/net/host/address.rs
index 8cb6da743..ffc9abaac 100644
--- a/core/src/net/host/address.rs
+++ b/core/src/net/host/address.rs
@@ -161,6 +161,7 @@ pub fn address_api<C: Context, Kind: HostApiKind>()
 }
 
 #[derive(Deserialize, Serialize, Parser, TS)]
+#[group(skip)]
 #[serde(rename_all = "camelCase")]
 #[ts(export)]
 pub struct AddPublicDomainParams {
@@ -299,6 +300,7 @@ pub async fn add_public_domain<Kind: HostApiKind>(
 }
 
 #[derive(Deserialize, Serialize, Parser, TS)]
+#[group(skip)]
 #[ts(export)]
 pub struct RemoveDomainParams {
     #[arg(help = "help.arg.fqdn")]
@@ -332,6 +334,7 @@ pub async fn remove_public_domain<Kind: HostApiKind>(
 }
 
 #[derive(Deserialize, Serialize, Parser, TS)]
+#[group(skip)]
 #[ts(export)]
 pub struct AddPrivateDomainParams {
     #[arg(help = "help.arg.fqdn")]
diff --git a/core/src/net/host/binding.rs b/core/src/net/host/binding.rs
index 54020d865..0ee00bfe8 100644
--- a/core/src/net/host/binding.rs
+++ b/core/src/net/host/binding.rs
@@ -301,6 +301,7 @@ pub async fn list_bindings<Kind: HostApiKind>(
 }
 
 #[derive(Deserialize, Serialize, Parser, TS)]
+#[group(skip)]
 #[serde(rename_all = "camelCase")]
 #[ts(export)]
 pub struct BindingSetAddressEnabledParams {
diff --git a/core/src/net/host/mod.rs b/core/src/net/host/mod.rs
index 941cc15f3..3661ea22f 100644
--- a/core/src/net/host/mod.rs
+++ b/core/src/net/host/mod.rs
@@ -447,12 +447,14 @@ impl Model<Host> {
 }
 
 #[derive(Deserialize, Serialize, Parser)]
+#[group(skip)]
 pub struct RequiresPackageId {
     #[arg(help = "help.arg.package-id")]
     package: PackageId,
 }
 
 #[derive(Deserialize, Serialize, Parser)]
+#[group(skip)]
 pub struct RequiresHostId {
     #[arg(help = "help.arg.host-id")]
     host: HostId,
diff --git a/core/src/net/tunnel.rs b/core/src/net/tunnel.rs
index 694434514..146f66584 100644
--- a/core/src/net/tunnel.rs
+++ b/core/src/net/tunnel.rs
@@ -36,6 +36,7 @@ pub fn tunnel_api<C: Context>() -> ParentHandler<C> {
 }
 
 #[derive(Debug, Clone, Deserialize, Serialize, Parser, TS)]
+#[group(skip)]
 #[serde(rename_all = "camelCase")]
 #[ts(export)]
 pub struct AddTunnelParams {
@@ -46,8 +47,7 @@ pub struct AddTunnelParams {
     #[arg(help = "help.arg.gateway-type")]
     #[serde(default, rename = "type")]
     gateway_type: Option<GatewayType>,
-    #[arg(help = "help.arg.set-as-default-outbound")]
-    #[serde(default)]
+    #[arg(long, help = "help.arg.set-as-default-outbound")]
     set_as_default_outbound: bool,
 }
 
@@ -168,13 +168,20 @@ pub async fn add_tunnel(
     .await
     .is_err()
     {
-        tracing::warn!("{}", t!("net.tunnel.timeout-waiting-for-add", gateway = iface.as_str()));
+        tracing::warn!(
+            "{}",
+            t!(
+                "net.tunnel.timeout-waiting-for-add",
+                gateway = iface.as_str()
+            )
+        );
     }
 
     Ok(iface)
 }
 
 #[derive(Debug, Clone, Deserialize, Serialize, Parser, TS)]
+#[group(skip)]
 #[ts(export)]
 pub struct RemoveTunnelParams {
     #[arg(help = "help.arg.gateway-id")]
@@ -275,7 +282,13 @@ pub async fn remove_tunnel(
     .await
     .is_err()
     {
-        tracing::warn!("{}", t!("net.tunnel.timeout-waiting-for-remove", gateway = id.as_str()));
+        tracing::warn!(
+            "{}",
+            t!(
+                "net.tunnel.timeout-waiting-for-remove",
+                gateway = id.as_str()
+            )
+        );
     }
 
     Ok(())
diff --git a/core/src/net/wifi.rs b/core/src/net/wifi.rs
index cead621bb..1c91651bb 100644
--- a/core/src/net/wifi.rs
+++ b/core/src/net/wifi.rs
@@ -154,11 +154,12 @@ pub fn wifi<C: Context>() -> ParentHandler<C> {
 }
 
 #[derive(Deserialize, Serialize, Parser, TS)]
+#[group(skip)]
 #[ts(export)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct SetWifiEnabledParams {
-    #[arg(help = "help.arg.wifi-enabled")]
+    #[arg(long, help = "help.arg.wifi-enabled")]
     pub enabled: bool,
 }
 
@@ -220,6 +221,7 @@ pub fn country<C: Context>() -> ParentHandler<C> {
 }
 
 #[derive(Deserialize, Serialize, Parser, TS)]
+#[group(skip)]
 #[ts(export)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
@@ -283,6 +285,7 @@ pub async fn add(
     Ok(())
 }
 #[derive(Deserialize, Serialize, Parser, TS)]
+#[group(skip)]
 #[ts(export)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
@@ -590,6 +593,7 @@ pub async fn get_available(ctx: RpcContext, _: Empty) -> Result<Vec<WifiListOut>
 }
 
 #[derive(Deserialize, Serialize, Parser, TS)]
+#[group(skip)]
 #[ts(export)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
diff --git a/core/src/notifications.rs b/core/src/notifications.rs
index 2e5ca39ac..880cb9ec4 100644
--- a/core/src/notifications.rs
+++ b/core/src/notifications.rs
@@ -75,6 +75,7 @@ pub fn notification<C: Context>() -> ParentHandler<C> {
 }
 
 #[derive(Deserialize, Serialize, Parser, TS)]
+#[group(skip)]
 #[ts(export)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
@@ -141,6 +142,7 @@ pub async fn list(
 }
 
 #[derive(Deserialize, Serialize, Parser, TS)]
+#[group(skip)]
 #[ts(export)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
@@ -177,6 +179,7 @@ pub async fn remove(
 }
 
 #[derive(Deserialize, Serialize, Parser, TS)]
+#[group(skip)]
 #[ts(export)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
@@ -300,10 +303,11 @@ pub async fn mark_unseen(
 }
 
 #[derive(Deserialize, Serialize, Parser, TS)]
+#[group(skip)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct CreateParams {
-    #[arg(help = "help.arg.package-id")]
+    #[arg(long, short, help = "help.arg.package-id")]
     package: Option<PackageId>,
     #[arg(help = "help.arg.notification-level")]
     level: NotificationLevel,
diff --git a/core/src/os_install/mod.rs b/core/src/os_install/mod.rs
index 72918042d..a2e61ca8c 100644
--- a/core/src/os_install/mod.rs
+++ b/core/src/os_install/mod.rs
@@ -103,6 +103,7 @@ async fn get_block_device_size(path: impl AsRef<Path>) -> Result<u64, Error> {
 }
 
 #[derive(Deserialize, Serialize, Parser, TS)]
+#[group(skip)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct InstallOsParams {
@@ -113,6 +114,7 @@ pub struct InstallOsParams {
 }
 
 #[derive(Deserialize, Serialize, Parser, TS)]
+#[group(skip)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 struct DataDrive {
@@ -526,6 +528,7 @@ pub async fn install_os(
 }
 
 #[derive(Deserialize, Serialize, Parser)]
+#[group(skip)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct CliInstallOsParams {
diff --git a/core/src/registry/admin.rs b/core/src/registry/admin.rs
index e71112eaa..3312724e5 100644
--- a/core/src/registry/admin.rs
+++ b/core/src/registry/admin.rs
@@ -216,6 +216,7 @@ pub async fn add_signer(ctx: RegistryContext, signer: SignerInfo) -> Result<Guid
 }
 
 #[derive(Debug, Deserialize, Serialize, Parser, TS)]
+#[group(skip)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 #[ts(export)]
@@ -276,6 +277,7 @@ pub async fn edit_signer(
 }
 
 #[derive(Debug, Deserialize, Serialize, Parser)]
+#[group(skip)]
 #[command(rename_all = "kebab-case")]
 #[serde(rename_all = "camelCase")]
 pub struct CliAddSignerParams {
@@ -352,6 +354,7 @@ pub async fn add_admin(
 }
 
 #[derive(Debug, Deserialize, Serialize, Parser, TS)]
+#[group(skip)]
 #[serde(rename_all = "camelCase")]
 #[ts(export)]
 pub struct RemoveAdminParams {
@@ -374,6 +377,7 @@ pub async fn remove_admin(
 }
 
 #[derive(Debug, Deserialize, Serialize, Parser)]
+#[group(skip)]
 #[command(rename_all = "kebab-case")]
 #[serde(rename_all = "camelCase")]
 pub struct CliAddAdminParams {
diff --git a/core/src/registry/context.rs b/core/src/registry/context.rs
index 2aa5739f2..8d0839cd8 100644
--- a/core/src/registry/context.rs
+++ b/core/src/registry/context.rs
@@ -39,6 +39,7 @@ const DEFAULT_REGISTRY_LISTEN: SocketAddr =
     SocketAddr::new(std::net::IpAddr::V4(Ipv4Addr::LOCALHOST), 5959);
 
 #[derive(Debug, Clone, Default, Deserialize, Serialize, Parser)]
+#[group(skip)]
 #[serde(rename_all = "kebab-case")]
 #[command(rename_all = "kebab-case")]
 pub struct RegistryConfig {
@@ -172,6 +173,7 @@ impl Deref for RegistryContext {
 }
 
 #[derive(Debug, Deserialize, Serialize, Parser)]
+#[group(skip)]
 pub struct RegistryUrlParams {
     #[arg(help = "help.arg.registry-url")]
     pub registry: Url,
diff --git a/core/src/registry/db.rs b/core/src/registry/db.rs
index 2d3498cac..866383b43 100644
--- a/core/src/registry/db.rs
+++ b/core/src/registry/db.rs
@@ -45,6 +45,7 @@ pub fn db_api<C: Context>() -> ParentHandler<C> {
 }
 
 #[derive(Deserialize, Serialize, Parser)]
+#[group(skip)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct CliDumpParams {
@@ -79,6 +80,7 @@ async fn cli_dump(
 }
 
 #[derive(Deserialize, Serialize, Parser, TS)]
+#[group(skip)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct DumpParams {
@@ -95,6 +97,7 @@ pub async fn dump(ctx: RegistryContext, DumpParams { pointer }: DumpParams) -> R
 }
 
 #[derive(Deserialize, Serialize, Parser)]
+#[group(skip)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct CliApplyParams {
@@ -152,6 +155,7 @@ async fn cli_apply(
 }
 
 #[derive(Deserialize, Serialize, Parser, TS)]
+#[group(skip)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct ApplyParams {
diff --git a/core/src/registry/info.rs b/core/src/registry/info.rs
index 83742fa0c..c6c9ae81e 100644
--- a/core/src/registry/info.rs
+++ b/core/src/registry/info.rs
@@ -65,6 +65,7 @@ pub async fn get_info(ctx: RegistryContext) -> Result<RegistryInfo, Error> {
 }
 
 #[derive(Debug, Deserialize, Serialize, Parser, TS)]
+#[group(skip)]
 #[command(rename_all = "kebab-case")]
 #[serde(rename_all = "camelCase")]
 #[ts(export)]
@@ -101,6 +102,7 @@ pub async fn set_icon(
 }
 
 #[derive(Debug, Deserialize, Serialize, Parser, TS)]
+#[group(skip)]
 #[command(rename_all = "kebab-case")]
 #[serde(rename_all = "camelCase")]
 #[ts(export)]
diff --git a/core/src/registry/os/asset/add.rs b/core/src/registry/os/asset/add.rs
index 1b39c3ced..14ab7e32b 100644
--- a/core/src/registry/os/asset/add.rs
+++ b/core/src/registry/os/asset/add.rs
@@ -179,6 +179,7 @@ pub async fn add_squashfs(ctx: RegistryContext, params: AddAssetParams) -> Resul
 }
 
 #[derive(Debug, Deserialize, Serialize, Parser)]
+#[group(skip)]
 #[command(rename_all = "kebab-case")]
 #[serde(rename_all = "camelCase")]
 pub struct CliAddAssetParams {
diff --git a/core/src/registry/os/asset/get.rs b/core/src/registry/os/asset/get.rs
index 84e1dabbc..37515b528 100644
--- a/core/src/registry/os/asset/get.rs
+++ b/core/src/registry/os/asset/get.rs
@@ -118,6 +118,7 @@ pub async fn get_squashfs(
 }
 
 #[derive(Debug, Deserialize, Serialize, Parser)]
+#[group(skip)]
 #[command(rename_all = "kebab-case")]
 #[serde(rename_all = "camelCase")]
 pub struct CliGetOsAssetParams {
diff --git a/core/src/registry/os/asset/sign.rs b/core/src/registry/os/asset/sign.rs
index 21d580e15..c7cd80037 100644
--- a/core/src/registry/os/asset/sign.rs
+++ b/core/src/registry/os/asset/sign.rs
@@ -136,6 +136,7 @@ pub async fn sign_squashfs(ctx: RegistryContext, params: SignAssetParams) -> Res
 }
 
 #[derive(Debug, Deserialize, Serialize, Parser)]
+#[group(skip)]
 #[command(rename_all = "kebab-case")]
 #[serde(rename_all = "camelCase")]
 pub struct CliSignAssetParams {
diff --git a/core/src/registry/os/version/mod.rs b/core/src/registry/os/version/mod.rs
index 786d33277..6677959e1 100644
--- a/core/src/registry/os/version/mod.rs
+++ b/core/src/registry/os/version/mod.rs
@@ -57,6 +57,7 @@ pub fn version_api<C: Context>() -> ParentHandler<C> {
 }
 
 #[derive(Debug, Deserialize, Serialize, Parser, TS)]
+#[group(skip)]
 #[command(rename_all = "kebab-case")]
 #[serde(rename_all = "camelCase")]
 #[ts(export)]
@@ -109,6 +110,7 @@ pub async fn add_version(
 }
 
 #[derive(Debug, Deserialize, Serialize, Parser, TS)]
+#[group(skip)]
 #[command(rename_all = "kebab-case")]
 #[serde(rename_all = "camelCase")]
 #[ts(export)]
@@ -135,6 +137,7 @@ pub async fn remove_version(
 }
 
 #[derive(Debug, Deserialize, Serialize, Parser, TS)]
+#[group(skip)]
 #[command(rename_all = "kebab-case")]
 #[serde(rename_all = "camelCase")]
 #[ts(export)]
diff --git a/core/src/registry/os/version/signer.rs b/core/src/registry/os/version/signer.rs
index bd2e1597b..2aa6c27a9 100644
--- a/core/src/registry/os/version/signer.rs
+++ b/core/src/registry/os/version/signer.rs
@@ -44,6 +44,7 @@ pub fn signer_api<C: Context>() -> ParentHandler<C> {
 }
 
 #[derive(Debug, Deserialize, Serialize, Parser, TS)]
+#[group(skip)]
 #[command(rename_all = "kebab-case")]
 #[serde(rename_all = "camelCase")]
 #[ts(export)]
@@ -114,6 +115,7 @@ pub async fn remove_version_signer(
 }
 
 #[derive(Debug, Deserialize, Serialize, Parser, TS)]
+#[group(skip)]
 #[command(rename_all = "kebab-case")]
 #[serde(rename_all = "camelCase")]
 #[ts(export)]
diff --git a/core/src/registry/package/add.rs b/core/src/registry/package/add.rs
index b8ab5c5c8..49229b92c 100644
--- a/core/src/registry/package/add.rs
+++ b/core/src/registry/package/add.rs
@@ -123,6 +123,7 @@ pub async fn add_package(
 }
 
 #[derive(Debug, Deserialize, Serialize, Parser)]
+#[group(skip)]
 #[command(rename_all = "kebab-case")]
 #[serde(rename_all = "camelCase")]
 pub struct CliAddPackageParams {
@@ -218,6 +219,7 @@ pub async fn cli_add_package_impl(
 }
 
 #[derive(Debug, Deserialize, Serialize, Parser, TS)]
+#[group(skip)]
 #[serde(rename_all = "camelCase")]
 #[ts(export)]
 pub struct RemovePackageParams {
@@ -378,6 +380,7 @@ pub async fn add_mirror(
 }
 
 #[derive(Debug, Deserialize, Serialize, Parser)]
+#[group(skip)]
 #[command(rename_all = "kebab-case")]
 #[serde(rename_all = "camelCase")]
 pub struct CliAddMirrorParams {
@@ -460,6 +463,7 @@ pub async fn cli_add_mirror(
 }
 
 #[derive(Debug, Deserialize, Serialize, Parser, TS)]
+#[group(skip)]
 #[serde(rename_all = "camelCase")]
 #[ts(export)]
 pub struct RemoveMirrorParams {
diff --git a/core/src/registry/package/category.rs b/core/src/registry/package/category.rs
index f41ae9363..d6a0c16a2 100644
--- a/core/src/registry/package/category.rs
+++ b/core/src/registry/package/category.rs
@@ -61,6 +61,7 @@ pub fn category_api<C: Context>() -> ParentHandler<C> {
 }
 
 #[derive(Debug, Deserialize, Serialize, Parser, TS)]
+#[group(skip)]
 #[command(rename_all = "kebab-case")]
 #[serde(rename_all = "camelCase")]
 #[ts(export)]
@@ -87,6 +88,7 @@ pub async fn add_category(
 }
 
 #[derive(Debug, Deserialize, Serialize, Parser, TS)]
+#[group(skip)]
 #[command(rename_all = "kebab-case")]
 #[serde(rename_all = "camelCase")]
 #[ts(export)]
@@ -112,6 +114,7 @@ pub async fn remove_category(
 }
 
 #[derive(Debug, Deserialize, Serialize, Parser, TS)]
+#[group(skip)]
 #[command(rename_all = "kebab-case")]
 #[serde(rename_all = "camelCase")]
 #[ts(export)]
@@ -141,6 +144,7 @@ pub async fn add_package(
 }
 
 #[derive(Debug, Deserialize, Serialize, Parser, TS)]
+#[group(skip)]
 #[command(rename_all = "kebab-case")]
 #[serde(rename_all = "camelCase")]
 #[ts(export)]
diff --git a/core/src/registry/package/get.rs b/core/src/registry/package/get.rs
index b18ee54c1..8ad7bcceb 100644
--- a/core/src/registry/package/get.rs
+++ b/core/src/registry/package/get.rs
@@ -47,6 +47,7 @@ pub struct PackageInfoShort {
 }
 
 #[derive(Debug, Deserialize, Serialize, TS, Parser, HasModel)]
+#[group(skip)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 #[ts(export)]
@@ -407,6 +408,7 @@ pub fn display_package_info(
 }
 
 #[derive(Debug, Deserialize, Serialize, TS, Parser)]
+#[group(skip)]
 #[serde(rename_all = "camelCase")]
 pub struct CliDownloadParams {
     #[arg(help = "help.arg.package-id")]
diff --git a/core/src/registry/package/signer.rs b/core/src/registry/package/signer.rs
index ee1cbc47a..f39e6d302 100644
--- a/core/src/registry/package/signer.rs
+++ b/core/src/registry/package/signer.rs
@@ -47,6 +47,7 @@ pub fn signer_api<C: Context>() -> ParentHandler<C> {
 }
 
 #[derive(Debug, Deserialize, Serialize, Parser, TS)]
+#[group(skip)]
 #[command(rename_all = "kebab-case")]
 #[serde(rename_all = "camelCase")]
 #[ts(export)]
@@ -103,6 +104,7 @@ pub async fn add_package_signer(
 }
 
 #[derive(Debug, Deserialize, Serialize, Parser, TS)]
+#[group(skip)]
 #[command(rename_all = "kebab-case")]
 #[serde(rename_all = "camelCase")]
 #[ts(export)]
@@ -149,6 +151,7 @@ pub async fn remove_package_signer(
 }
 
 #[derive(Debug, Deserialize, Serialize, Parser, TS)]
+#[group(skip)]
 #[command(rename_all = "kebab-case")]
 #[serde(rename_all = "camelCase")]
 #[ts(export)]
diff --git a/core/src/s9pk/rpc.rs b/core/src/s9pk/rpc.rs
index e84be8406..f32890cba 100644
--- a/core/src/s9pk/rpc.rs
+++ b/core/src/s9pk/rpc.rs
@@ -84,6 +84,7 @@ pub fn s9pk() -> ParentHandler<CliContext> {
 }
 
 #[derive(Deserialize, Serialize, Parser)]
+#[group(skip)]
 struct S9pkPath {
     #[arg(help = "help.arg.s9pk-file-path")]
     s9pk: PathBuf,
@@ -142,6 +143,7 @@ fn inspect() -> ParentHandler<CliContext, S9pkPath> {
 }
 
 #[derive(Deserialize, Serialize, Parser, TS)]
+#[group(skip)]
 struct AddImageParams {
     #[arg(help = "help.arg.image-id")]
     id: ImageId,
@@ -176,6 +178,7 @@ async fn add_image(
 }
 
 #[derive(Deserialize, Serialize, Parser, TS)]
+#[group(skip)]
 struct EditManifestParams {
     #[arg(help = "help.arg.db-apply-expr")]
     expression: String,
@@ -221,6 +224,7 @@ async fn file_tree(
 }
 
 #[derive(Deserialize, Serialize, Parser, TS)]
+#[group(skip)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 struct CatParams {
@@ -352,6 +356,7 @@ async fn publish(ctx: CliContext, S9pkPath { s9pk: s9pk_path }: S9pkPath) -> Res
 }
 
 #[derive(Deserialize, Serialize, Parser)]
+#[group(skip)]
 struct SelectParams {
     #[arg(help = "help.arg.s9pk-file-paths")]
     s9pks: Vec<PathBuf>,
diff --git a/core/src/s9pk/v1/mod.rs b/core/src/s9pk/v1/mod.rs
index 3773bac81..2d0ba08fc 100644
--- a/core/src/s9pk/v1/mod.rs
+++ b/core/src/s9pk/v1/mod.rs
@@ -13,6 +13,7 @@ pub mod reader;
 pub const SIG_CONTEXT: &[u8] = b"s9pk";
 
 #[derive(Deserialize, Serialize, Parser, TS)]
+#[group(skip)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct VerifyParams {
diff --git a/core/src/s9pk/v2/pack.rs b/core/src/s9pk/v2/pack.rs
index cffd32d3d..1bb0dbbd2 100644
--- a/core/src/s9pk/v2/pack.rs
+++ b/core/src/s9pk/v2/pack.rs
@@ -155,6 +155,7 @@ impl From<PackSource> for DynFileSource {
 }
 
 #[derive(Deserialize, Serialize, Parser)]
+#[group(skip)]
 pub struct PackParams {
     #[arg(help = "help.arg.input-path")]
     pub path: Option<PathBuf>,
@@ -166,7 +167,7 @@ pub struct PackParams {
     pub icon: Option<PathBuf>,
     #[arg(long, help = "help.arg.license-path")]
     pub license: Option<PathBuf>,
-    #[arg(long, conflicts_with = "no-assets", help = "help.arg.assets-path")]
+    #[arg(long, conflicts_with = "no_assets", help = "help.arg.assets-path")]
     pub assets: Option<PathBuf>,
     #[arg(long, conflicts_with = "assets", help = "help.arg.no-assets")]
     pub no_assets: bool,
@@ -281,12 +282,13 @@ pub struct ImageConfig {
 }
 
 #[derive(Parser)]
+#[group(skip)]
 struct CliImageConfig {
-    #[arg(long, conflicts_with("docker-tag"), help = "help.arg.docker-build")]
+    #[arg(long, conflicts_with("docker_tag"), help = "help.arg.docker-build")]
     docker_build: bool,
-    #[arg(long, requires("docker-build"), help = "help.arg.dockerfile-path")]
+    #[arg(long, requires("docker_build"), help = "help.arg.dockerfile-path")]
     dockerfile: Option<PathBuf>,
-    #[arg(long, requires("docker-build"), help = "help.arg.workdir-path")]
+    #[arg(long, requires("docker_build"), help = "help.arg.workdir-path")]
     workdir: Option<PathBuf>,
     #[arg(long, conflicts_with_all(["dockerfile", "workdir"]), help = "help.arg.docker-tag")]
     docker_tag: Option<String>,
diff --git a/core/src/service/cli.rs b/core/src/service/cli.rs
index c2b6c2af3..bf55b0ee8 100644
--- a/core/src/service/cli.rs
+++ b/core/src/service/cli.rs
@@ -13,6 +13,7 @@ use crate::lxc::HOST_RPC_SERVER_SOCKET;
 use crate::service::effects::context::EffectContext;
 
 #[derive(Debug, Default, Parser)]
+#[group(skip)]
 pub struct ContainerClientConfig {
     #[arg(long = "socket", help = "help.arg.socket-path")]
     pub socket: Option<PathBuf>,
diff --git a/core/src/service/effects/action.rs b/core/src/service/effects/action.rs
index e01fd0318..745230d2e 100644
--- a/core/src/service/effects/action.rs
+++ b/core/src/service/effects/action.rs
@@ -78,6 +78,7 @@ pub async fn export_action(
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize, TS, Parser)]
+#[group(skip)]
 #[ts(export)]
 #[serde(rename_all = "camelCase")]
 pub struct ClearActionsParams {
@@ -110,6 +111,7 @@ async fn clear_actions(
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize, TS, Parser)]
+#[group(skip)]
 #[serde(rename_all = "camelCase")]
 #[ts(export)]
 pub struct GetActionInputParams {
@@ -118,7 +120,7 @@ pub struct GetActionInputParams {
     #[arg(skip)]
     procedure_id: Guid,
     #[ts(optional)]
-    #[arg(help = "help.arg.package-id")]
+    #[arg(short, long, help = "help.arg.package-id")]
     package_id: Option<PackageId>,
     #[arg(help = "help.arg.action-id")]
     action_id: ActionId,
@@ -158,6 +160,7 @@ async fn get_action_input(
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize, TS, Parser)]
+#[group(skip)]
 #[serde(rename_all = "camelCase")]
 #[ts(export, rename = "EffectsRunActionParams")]
 pub struct RunActionParams {
@@ -166,7 +169,7 @@ pub struct RunActionParams {
     #[arg(skip)]
     procedure_id: Guid,
     #[ts(optional)]
-    #[arg(help = "help.arg.package-id")]
+    #[arg(short, long, help = "help.arg.package-id")]
     package_id: Option<PackageId>,
     #[arg(help = "help.arg.action-id")]
     action_id: ActionId,
@@ -309,6 +312,7 @@ async fn create_task(
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize, TS, Parser)]
+#[group(skip)]
 #[ts(type = "{ only: string[] } | { except: string[] }")]
 #[ts(export)]
 pub struct ClearTasksParams {
diff --git a/core/src/service/effects/callbacks.rs b/core/src/service/effects/callbacks.rs
index a3acc5b18..0661cb303 100644
--- a/core/src/service/effects/callbacks.rs
+++ b/core/src/service/effects/callbacks.rs
@@ -384,6 +384,7 @@ impl CallbackHandlers {
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize, TS, Parser)]
+#[group(skip)]
 #[ts(type = "{ only: number[] } | { except: number[] }")]
 #[ts(export)]
 pub struct ClearCallbacksParams {
diff --git a/core/src/service/effects/control.rs b/core/src/service/effects/control.rs
index 4333cf907..e563d9d95 100644
--- a/core/src/service/effects/control.rs
+++ b/core/src/service/effects/control.rs
@@ -64,6 +64,7 @@ pub async fn shutdown(context: EffectContext) -> Result<(), Error> {
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize, TS, Parser)]
+#[group(skip)]
 #[serde(rename_all = "camelCase")]
 #[ts(export)]
 pub struct GetStatusParams {
@@ -134,6 +135,7 @@ impl ValueParserFactory for SetMainStatusStatus {
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize, Parser, TS)]
+#[group(skip)]
 #[serde(rename_all = "camelCase")]
 #[ts(export)]
 pub struct SetMainStatus {
diff --git a/core/src/service/effects/dependency.rs b/core/src/service/effects/dependency.rs
index cf50c8674..4c054baa7 100644
--- a/core/src/service/effects/dependency.rs
+++ b/core/src/service/effects/dependency.rs
@@ -192,6 +192,7 @@ impl ValueParserFactory for DependencyRequirement {
     }
 }
 #[derive(Deserialize, Serialize, Parser, TS)]
+#[group(skip)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "camelCase")]
 #[ts(export)]
@@ -294,6 +295,7 @@ pub async fn get_dependencies(context: EffectContext) -> Result<Vec<DependencyRe
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize, Parser, TS)]
+#[group(skip)]
 #[serde(rename_all = "camelCase")]
 #[ts(export)]
 pub struct CheckDependenciesParam {
@@ -383,6 +385,7 @@ pub async fn check_dependencies(
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize, TS, Parser)]
+#[group(skip)]
 #[serde(rename_all = "camelCase")]
 #[ts(export)]
 pub struct GetServiceManifestParams {
diff --git a/core/src/service/effects/net/bind.rs b/core/src/service/effects/net/bind.rs
index f25b22bd4..2ae9461e7 100644
--- a/core/src/service/effects/net/bind.rs
+++ b/core/src/service/effects/net/bind.rs
@@ -29,6 +29,7 @@ pub async fn bind(
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize, TS, Parser)]
+#[group(skip)]
 #[ts(export)]
 #[serde(rename_all = "camelCase")]
 pub struct ClearBindingsParams {
diff --git a/core/src/service/effects/net/interface.rs b/core/src/service/effects/net/interface.rs
index 0716efffc..4fb804a21 100644
--- a/core/src/service/effects/net/interface.rs
+++ b/core/src/service/effects/net/interface.rs
@@ -150,6 +150,7 @@ pub async fn list_service_interfaces(
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize, TS, Parser)]
+#[group(skip)]
 #[ts(export)]
 #[serde(rename_all = "camelCase")]
 pub struct ClearServiceInterfacesParams {
diff --git a/core/src/service/effects/prelude.rs b/core/src/service/effects/prelude.rs
index 60b0ecc9d..efcf2ae87 100644
--- a/core/src/service/effects/prelude.rs
+++ b/core/src/service/effects/prelude.rs
@@ -7,6 +7,7 @@ use crate::rpc_continuations::Guid;
 pub(super) use crate::service::effects::context::EffectContext;
 
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize, Parser, TS)]
+#[group(skip)]
 #[serde(rename_all = "camelCase")]
 #[ts(export)]
 pub struct EventId {
diff --git a/core/src/service/effects/subcontainer/mod.rs b/core/src/service/effects/subcontainer/mod.rs
index a36cf6e87..c6bcff53a 100644
--- a/core/src/service/effects/subcontainer/mod.rs
+++ b/core/src/service/effects/subcontainer/mod.rs
@@ -27,6 +27,7 @@ pub use sync::*;
 use sync_dummy as sync;
 
 #[derive(Debug, Deserialize, Serialize, Parser, TS)]
+#[group(skip)]
 #[serde(rename_all = "camelCase")]
 #[ts(export)]
 pub struct DestroySubcontainerFsParams {
@@ -74,6 +75,7 @@ pub async fn destroy_subcontainer_fs(
 }
 
 #[derive(Debug, Deserialize, Serialize, Parser, TS)]
+#[group(skip)]
 #[serde(rename_all = "camelCase")]
 #[ts(export)]
 pub struct CreateSubcontainerFsParams {
diff --git a/core/src/service/effects/subcontainer/sync.rs b/core/src/service/effects/subcontainer/sync.rs
index 6bd569cab..3999a0cd9 100644
--- a/core/src/service/effects/subcontainer/sync.rs
+++ b/core/src/service/effects/subcontainer/sync.rs
@@ -105,6 +105,7 @@ fn open_file_read(path: impl AsRef<Path>) -> Result<File, Error> {
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize, Parser)]
+#[group(skip)]
 pub struct ExecParams {
     #[arg(long, help = "help.arg.force-tty")]
     force_tty: bool,
diff --git a/core/src/service/effects/system.rs b/core/src/service/effects/system.rs
index e6a9afcba..d5650031d 100644
--- a/core/src/service/effects/system.rs
+++ b/core/src/service/effects/system.rs
@@ -4,6 +4,7 @@ use crate::service::rpc::CallbackId;
 use crate::system::SmtpValue;
 
 #[derive(Debug, Clone, Serialize, Deserialize, TS, Parser)]
+#[group(skip)]
 #[ts(export)]
 #[serde(rename_all = "camelCase")]
 pub struct GetSystemSmtpParams {
diff --git a/core/src/service/effects/version.rs b/core/src/service/effects/version.rs
index 7b82e060c..1e64a0cfa 100644
--- a/core/src/service/effects/version.rs
+++ b/core/src/service/effects/version.rs
@@ -6,6 +6,7 @@ use crate::util::io::{delete_file, write_file_atomic};
 use crate::volume::PKG_VOLUME_DIR;
 
 #[derive(Debug, Clone, Serialize, Deserialize, TS, Parser)]
+#[group(skip)]
 #[serde(rename_all = "camelCase")]
 #[ts(export)]
 pub struct SetDataVersionParams {
diff --git a/core/src/service/mod.rs b/core/src/service/mod.rs
index e490130bd..9fbcfa300 100644
--- a/core/src/service/mod.rs
+++ b/core/src/service/mod.rs
@@ -756,6 +756,7 @@ struct ServiceActorSeed {
 }
 
 #[derive(Deserialize, Serialize, Parser, TS)]
+#[group(skip)]
 #[ts(export)]
 pub struct RebuildParams {
     #[arg(help = "help.arg.package-id")]
@@ -1189,6 +1190,7 @@ async fn get_passwd_command(etc_passwd_path: PathBuf, user: &str) -> RootCommand
 }
 
 #[derive(Deserialize, Serialize, Parser)]
+#[group(skip)]
 pub struct CliAttachParams {
     #[arg(help = "help.arg.package-id")]
     pub id: PackageId,
diff --git a/core/src/ssh.rs b/core/src/ssh.rs
index 69602e806..9910721b5 100644
--- a/core/src/ssh.rs
+++ b/core/src/ssh.rs
@@ -116,6 +116,7 @@ pub fn ssh<C: Context>() -> ParentHandler<C> {
 }
 
 #[derive(Deserialize, Serialize, Parser, TS)]
+#[group(skip)]
 #[ts(export)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
@@ -155,6 +156,7 @@ pub async fn add(
 }
 
 #[derive(Deserialize, Serialize, Parser, TS)]
+#[group(skip)]
 #[ts(export)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
diff --git a/core/src/system/mod.rs b/core/src/system/mod.rs
index 4bb404e8b..0990534b1 100644
--- a/core/src/system/mod.rs
+++ b/core/src/system/mod.rs
@@ -79,10 +79,11 @@ pub async fn enable_zram() -> Result<(), Error> {
 }
 
 #[derive(Deserialize, Serialize, Parser, TS)]
+#[group(skip)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct ZramParams {
-    #[arg(help = "help.arg.enable-zram")]
+    #[arg(long, help = "help.arg.enable-zram")]
     enable: bool,
 }
 
@@ -147,6 +148,7 @@ fn display_governor_info(
 }
 
 #[derive(Deserialize, Serialize, Parser, TS)]
+#[group(skip)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct GovernorParams {
@@ -559,6 +561,7 @@ pub struct MetricsFollowResponse {
 }
 
 #[derive(Deserialize, Serialize, Parser, TS)]
+#[group(skip)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct MetricsFollowParams {
@@ -1117,6 +1120,7 @@ pub enum SmtpSecurity {
 }
 
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize, Parser, TS)]
+#[group(skip)]
 #[ts(export)]
 #[serde(rename_all = "camelCase")]
 pub struct SmtpValue {
@@ -1163,6 +1167,7 @@ pub async fn clear_system_smtp(ctx: RpcContext) -> Result<(), Error> {
 }
 
 #[derive(Debug, Clone, Deserialize, Serialize, Parser)]
+#[group(skip)]
 pub struct SetEchoipUrlsParams {
     #[arg(help = "help.arg.echoip-urls")]
     pub urls: Vec<url::Url>,
@@ -1184,6 +1189,7 @@ pub async fn set_echoip_urls(
 }
 
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize, Parser, TS)]
+#[group(skip)]
 #[ts(export)]
 #[serde(rename_all = "camelCase")]
 pub struct TestSmtpParams {
@@ -1242,6 +1248,7 @@ pub async fn test_smtp(
 }
 
 #[derive(Debug, Clone, Deserialize, Serialize, TS, Parser)]
+#[group(skip)]
 #[serde(rename_all = "camelCase")]
 pub struct KeyboardOptions {
     #[arg(help = "help.arg.keyboard-layout")]
@@ -1316,6 +1323,7 @@ pub async fn set_keyboard(ctx: RpcContext, options: KeyboardOptions) -> Result<(
 }
 
 #[derive(Debug, Clone, Deserialize, Serialize, TS, Parser)]
+#[group(skip)]
 #[ts(export)]
 #[serde(rename_all = "camelCase")]
 pub struct SetLanguageParams {
diff --git a/core/src/tunnel/auth.rs b/core/src/tunnel/auth.rs
index 758617686..727728bd2 100644
--- a/core/src/tunnel/auth.rs
+++ b/core/src/tunnel/auth.rs
@@ -117,6 +117,7 @@ impl SessionAuthContext for TunnelContext {
 }
 
 #[derive(Clone, Debug, Deserialize, Serialize, HasModel, TS, Parser)]
+#[group(skip)]
 #[serde(rename_all = "camelCase")]
 #[model = "Model<Self>"]
 pub struct SignerInfo {
@@ -182,6 +183,7 @@ pub fn auth_api<C: Context>() -> ParentHandler<C> {
 }
 
 #[derive(Debug, Deserialize, Serialize, Parser, TS)]
+#[group(skip)]
 #[serde(rename_all = "camelCase")]
 pub struct AddKeyParams {
     pub name: InternedString,
@@ -204,6 +206,7 @@ pub async fn add_key(
 }
 
 #[derive(Debug, Deserialize, Serialize, Parser, TS)]
+#[group(skip)]
 #[serde(rename_all = "camelCase")]
 pub struct RemoveKeyParams {
     pub key: AnyVerifyingKey,
diff --git a/core/src/tunnel/db.rs b/core/src/tunnel/db.rs
index 46197ce84..902503b83 100644
--- a/core/src/tunnel/db.rs
+++ b/core/src/tunnel/db.rs
@@ -172,6 +172,7 @@ pub fn db_api<C: Context>() -> ParentHandler<C> {
 }
 
 #[derive(Deserialize, Serialize, Parser)]
+#[group(skip)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct CliDumpParams {
@@ -206,6 +207,7 @@ async fn cli_dump(
 }
 
 #[derive(Deserialize, Serialize, Parser, TS)]
+#[group(skip)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct DumpParams {
@@ -222,6 +224,7 @@ pub async fn dump(ctx: TunnelContext, DumpParams { pointer }: DumpParams) -> Res
 }
 
 #[derive(Deserialize, Serialize, Parser)]
+#[group(skip)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct CliApplyParams {
@@ -279,6 +282,7 @@ async fn cli_apply(
 }
 
 #[derive(Deserialize, Serialize, Parser, TS)]
+#[group(skip)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct ApplyParams {
diff --git a/core/src/tunnel/web.rs b/core/src/tunnel/web.rs
index 05be63c5b..feacd199e 100644
--- a/core/src/tunnel/web.rs
+++ b/core/src/tunnel/web.rs
@@ -278,6 +278,7 @@ pub async fn import_certificate_cli(
 }
 
 #[derive(Debug, Deserialize, Serialize, Parser)]
+#[group(skip)]
 pub struct GenerateCertParams {
     #[arg(help = "help.arg.cert-subject-alt-names")]
     pub subject: Vec<InternedString>,
@@ -329,6 +330,7 @@ pub async fn get_certificate(ctx: TunnelContext) -> Result<Option<Pem<Vec<X509>>
 }
 
 #[derive(Debug, Deserialize, Serialize, Parser)]
+#[group(skip)]
 #[serde(rename_all = "camelCase")]
 pub struct SetListenParams {
     #[arg(help = "help.arg.listen-address")]
diff --git a/core/src/update/mod.rs b/core/src/update/mod.rs
index fc75b96b2..f0c9d0f48 100644
--- a/core/src/update/mod.rs
+++ b/core/src/update/mod.rs
@@ -40,6 +40,7 @@ use crate::util::future::NonDetachingJoinHandle;
 use crate::util::io::AtomicFile;
 
 #[derive(Deserialize, Serialize, Parser, TS)]
+#[group(skip)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct UpdateSystemParams {
diff --git a/core/src/util/rpc.rs b/core/src/util/rpc.rs
index 5376dfe35..1ca2cbf28 100644
--- a/core/src/util/rpc.rs
+++ b/core/src/util/rpc.rs
@@ -22,6 +22,7 @@ pub fn util<C: Context>() -> ParentHandler<C> {
 }
 
 #[derive(Debug, Deserialize, Serialize, Parser)]
+#[group(skip)]
 pub struct B3sumParams {
     #[arg(long = "no-mmap", action = clap::ArgAction::SetFalse, help = "help.arg.no-mmap")]
     allow_mmap: bool,
diff --git a/core/src/version/v0_3_6_alpha_0.rs b/core/src/version/v0_3_6_alpha_0.rs
index e9c623bad..c924a50a0 100644
--- a/core/src/version/v0_3_6_alpha_0.rs
+++ b/core/src/version/v0_3_6_alpha_0.rs
@@ -144,7 +144,12 @@ pub struct Version;
 impl VersionT for Version {
     type Previous = v0_3_5_2::Version;
     /// (package_id, host_id, expanded_key)
-    type PreUpRes = (AccountInfo, SshKeys, CifsTargets, Vec<(String, String, [u8; 64])>);
+    type PreUpRes = (
+        AccountInfo,
+        SshKeys,
+        CifsTargets,
+        Vec<(String, String, [u8; 64])>,
+    );
     fn semver(self) -> exver::Version {
         V0_3_6_alpha_0.clone()
     }
@@ -169,7 +174,11 @@ impl VersionT for Version {
 
         Ok((account, ssh_keys, cifs, tor_keys))
     }
-    fn up(self, db: &mut Value, (account, ssh_keys, cifs, tor_keys): Self::PreUpRes) -> Result<Value, Error> {
+    fn up(
+        self,
+        db: &mut Value,
+        (account, ssh_keys, cifs, tor_keys): Self::PreUpRes,
+    ) -> Result<Value, Error> {
         let prev_package_data = db["package-data"].clone();
 
         let wifi = json!({
@@ -234,7 +243,7 @@ impl VersionT for Version {
 
         let private = {
             let mut value = json!({});
-            value["keyStore"] = crate::dbg!(to_value(&keystore)?);
+            value["keyStore"] = to_value(&keystore)?;
             // Preserve tor onion keys so later migrations (v0_4_0_alpha_20) can
             // include them in onion-migration.json for the tor service.
             if !tor_keys.is_empty() {