Merge branch '2.1' into develop

This commit is contained in:
Markus Mäkelä
2017-06-05 13:25:27 +03:00
39 changed files with 300 additions and 257 deletions

View File

@ -1575,8 +1575,8 @@ struct subcommand alteroptions[] =
"\n"
"address Server address\n"
"port Server port\n"
"monuser Monitor user for this server\n"
"monpw Monitor password for this server\n"
"monitoruser Monitor user for this server\n"
"monitorpw Monitor password for this server\n"
"ssl Enable SSL, value must be 'required'\n"
"ssl_key Path to SSL private key\n"
"ssl_cert Path to SSL certificate\n"