Merge 0.10->trunk

[prosody.git] / man / prosodyctl.markdown

diff --git a/man/prosodyctl.markdown b/man/prosodyctl.markdown
index e4cd8e915a484d5a6c0bf5ca9ca77ce0c7b45e33..217dfd3d21242d38879ec2e48e7c4466f370a1c9 100644 (file)
--- a/man/prosodyctl.markdown
+++ b/man/prosodyctl.markdown
@@ -1,6 +1,7 @@
 ---
 author:
 - 'Dwayne Bent <dbb.1@liqd.org>'
+- Kim Alvefur
 date: '2015-12-23'
 section: 1
 title: PROSODYCTL
@@ -72,9 +73,28 @@ restart
 :   Restarts the prosody server daemon. Equivalent to running prosodyctl
     stop followed by prosodyctl start.
 
+reload
+:   Signals the prosody server daemon to reload configuration and reopen
+    log files.
+
 status
 :   Prints the current execution status of the prosody server daemon.
 
+Debugging
+---------
+
+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.
+
+check \[what\]
+:   Performs various sanity checks on the configuration, DNS setup and
+    configured TLS certificates. `what` can be one of `config`, `dns`
+    and `certs` to run only that check.
+
 Ejabberd Compatibility
 ----------------------