aboutsummaryrefslogtreecommitdiffstats
path: root/man
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-07-06 11:24:36 +0200
committerKim Alvefur <zash@zash.se>2017-07-06 11:24:36 +0200
commita65cd04e353b849f6a3cda6ca746378dd309ee28 (patch)
treed54d6743becde2246fed6859f25ec6ee72e0d080 /man
parent87805f6e4ed7b0eef2c92cea969da097a53912fe (diff)
parent39bcea0025949af9de9555dee3c2c3f9a5cb7249 (diff)
downloadprosody-a65cd04e353b849f6a3cda6ca746378dd309ee28.tar.gz
prosody-a65cd04e353b849f6a3cda6ca746378dd309ee28.zip
Merge 0.10->trunk
Diffstat (limited to 'man')
-rw-r--r--man/prosodyctl.man5
-rw-r--r--man/prosodyctl.markdown3
2 files changed, 8 insertions, 0 deletions
diff --git a/man/prosodyctl.man b/man/prosodyctl.man
index 4854a0a7..f7bf44d1 100644
--- a/man/prosodyctl.man
+++ b/man/prosodyctl.man
@@ -158,6 +158,11 @@ Use the specified config file instead of the default.
.RS
.RE
.TP
+.B \f[C]\-\-root\f[]
+Don\[aq]t drop root privileges.
+.RS
+.RE
+.TP
.B \f[C]\-\-help\f[]
Display help text for the specified command.
.RS
diff --git a/man/prosodyctl.markdown b/man/prosodyctl.markdown
index e4c355a2..4dde284f 100644
--- a/man/prosodyctl.markdown
+++ b/man/prosodyctl.markdown
@@ -137,6 +137,9 @@ OPTIONS
`--config filename`
: Use the specified config file instead of the default.
+`--root`
+: Don't drop root privileges.
+
`--help`
: Display help text for the specified command.