aboutsummaryrefslogtreecommitdiffstats
path: root/man
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-09-04 10:08:04 +0200
committerKim Alvefur <zash@zash.se>2017-09-04 10:08:04 +0200
commit4ae9ee61305716a0dbbb02d1f4977dbe3dc0de6d (patch)
treefc5e28b3a1a7589baf2085ec160cc91b1b9ae6b2 /man
parent83e34ec9f7610238ae92dcbd5354ecfae0d48bbe (diff)
parentaa580c29113d93ea21bef84a2fa56bf8d259de74 (diff)
downloadprosody-4ae9ee61305716a0dbbb02d1f4977dbe3dc0de6d.tar.gz
prosody-4ae9ee61305716a0dbbb02d1f4977dbe3dc0de6d.zip
Merge 0.10->trunk
Diffstat (limited to 'man')
-rw-r--r--man/prosodyctl.man8
-rw-r--r--man/prosodyctl.markdown10
2 files changed, 14 insertions, 4 deletions
diff --git a/man/prosodyctl.man b/man/prosodyctl.man
index f7bf44d1..3ea42cdd 100644
--- a/man/prosodyctl.man
+++ b/man/prosodyctl.man
@@ -1,6 +1,6 @@
.\" Automatically generated by Pandoc 1.19.2.1
.\"
-.TH "PROSODYCTL" "1" "2015\-12\-23" "" ""
+.TH "PROSODYCTL" "1" "2017\-09\-02" "" ""
.hy
.SH NAME
.PP
@@ -118,6 +118,12 @@ Invoked automatically by \[aq]request\[aq] and \[aq]generate\[aq] if
needed.
.RS
.RE
+.TP
+.B import hosts paths
+Copy certificates for hosts into the certificate path and reload
+prosody.
+.RS
+.RE
.SS Debugging
.PP
prosodyctl can also show some information about the environment,
diff --git a/man/prosodyctl.markdown b/man/prosodyctl.markdown
index 4dde284f..9cc15985 100644
--- a/man/prosodyctl.markdown
+++ b/man/prosodyctl.markdown
@@ -2,7 +2,7 @@
author:
- 'Dwayne Bent <dbb.1@liqd.org>'
- Kim Alvefur
-date: '2015-12-23'
+date: '2017-09-02'
section: 1
title: PROSODYCTL
---
@@ -104,6 +104,10 @@ config hosts
: Produce a config file for the list of hosts. Invoked automatically
by 'request' and 'generate' if needed.
+import hosts paths
+: Copy certificates for hosts into the certificate path and reload
+ prosody.
+
Debugging
---------
@@ -111,8 +115,8 @@ prosodyctl can also show some information about the environment,
dependencies and such to aid in debugging.
about
-: Shows environment, various paths used by Prosody and
- installed dependencies.
+: Shows environment, various paths used by Prosody and installed
+ dependencies.
check \[what\]
: Performs various sanity checks on the configuration, DNS setup and