aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2009-04-22 00:26:39 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2009-04-22 00:26:39 +0000
commitb029154a2a002ff4116a21c43aeb942078708838 (patch)
tree268d1d3e663d67c2f0ce8c19de2e807bb79af71f
parent8ed1945a9161bae257c0d2570676177d0bdac5fc (diff)
downloadbusybox-b029154a2a002ff4116a21c43aeb942078708838.tar.gz
httpd: improve help text
-rw-r--r--include/usage.h23
1 files changed, 11 insertions, 12 deletions
diff --git a/include/usage.h b/include/usage.h
index 84da445f2..9294e892c 100644
--- a/include/usage.h
+++ b/include/usage.h
@@ -1631,29 +1631,28 @@
"sage\n"
#define httpd_trivial_usage \
- "[-c conffile]" \
- " [-p [ip:]port]" \
- " [-i] [-f] [-v[v]]" \
- IF_FEATURE_HTTPD_SETUID(" [-u user[:grp]]") \
- IF_FEATURE_HTTPD_BASIC_AUTH(" [-r realm]") \
- IF_FEATURE_HTTPD_AUTH_MD5(" [-m pass]") \
- " [-h home]" \
- " [-d/-e string]"
+ "[-ifv[v]]" \
+ " [-c CONFFILE]" \
+ " [-p [IP:]PORT]" \
+ IF_FEATURE_HTTPD_SETUID(" [-u USER[:GRP]]") \
+ IF_FEATURE_HTTPD_BASIC_AUTH(" [-r REALM]") \
+ " [-h HOME]\n" \
+ "or httpd -d/-e" IF_FEATURE_HTTPD_AUTH_MD5("/-m") " STRING"
#define httpd_full_usage "\n\n" \
"Listen for incoming HTTP requests\n" \
"\nOptions:" \
- "\n -c FILE Configuration file (default httpd.conf)" \
- "\n -p [IP:]PORT Bind to ip:port (default *:80)" \
"\n -i Inetd mode" \
"\n -f Do not daemonize" \
"\n -v[v] Verbose" \
+ "\n -c FILE Configuration file (default httpd.conf)" \
+ "\n -p [IP:]PORT Bind to ip:port (default *:80)" \
IF_FEATURE_HTTPD_SETUID( \
"\n -u USER[:GRP] Set uid/gid after binding to port") \
IF_FEATURE_HTTPD_BASIC_AUTH( \
"\n -r REALM Authentication Realm for Basic Authentication") \
- IF_FEATURE_HTTPD_AUTH_MD5( \
- "\n -m PASS Crypt PASS with md5 algorithm") \
"\n -h HOME Home directory (default .)" \
+ IF_FEATURE_HTTPD_AUTH_MD5( \
+ "\n -m STRING MD5 crypt STRING") \
"\n -e STRING HTML encode STRING" \
"\n -d STRING URL decode STRING" \