ftpd: stop unconditional logging to syslog. This was the only applet

[oweals/busybox.git] / include / usage.h

diff --git a/include/usage.h b/include/usage.h
index d5cf4cc1d0d689720d3df9261df4df4ca6ef46b3..e945840b846ab28d42049bffd5cadf895764a523 100644 (file)
--- a/include/usage.h
+++ b/include/usage.h
@@ -1280,6 +1280,22 @@
      "\n       -m      Show \"mode not cleared\" warnings" \
      "\n       -f      Force file system check" \
 
+#define ftpd_trivial_usage \
+       "[-wvS] [DIR]"
+#define ftpd_full_usage "\n\n" \
+       "FTP server\n" \
+       "\n" \
+       "ftpd should be used as an inetd service.\n" \
+       "ftpd's line for inetd.conf:\n" \
+       "       21 stream tcp nowait root ftpd ftpd /files/to/serve\n" \
+       "It also can be ran from tcpsvd:\n" \
+       "       tcpsvd -vE 0.0.0.0 21 ftpd /files/to/serve\n" \
+     "\nOptions:" \
+     "\n       -w      Allow upload" \
+     "\n       -v      Log to stderr" \
+     "\n       -S      Log to syslog" \
+     "\n       DIR     Change root to this directory" \
+
 #define ftpget_trivial_usage \
        "[options] remote-host local-file remote-file"
 #define ftpget_full_usage "\n\n" \
@@ -3647,12 +3663,15 @@
        USE_FEATURE_SENDMAIL_MAILX( \
      "\n       -s subject      Subject" \
      "\n       -j charset      Assume charset for body and subject (" CONFIG_FEATURE_MIME_CHARSET ")" \
-     "\n       -a file         File to attach. May be multiple" \
-     "\n       -H \"prog args...\" Use external connection helper. E.g. openssl for secure servers" \
+     "\n       -a file         File to attach. May be repeated" \
+     "\n       -H 'prog args'  Run connection helper. E.g. openssl for encryption:" \
+     "\n                       -H 'exec openssl s_client -quiet -tls1 -starttls smtp" \
+     "\n                                       -connect smtp.gmail.com:25' <email.txt" \
+     "\n                                       [4<username_and_passwd.txt]" \
      "\n       -S server[:port] Server" \
        ) \
        USE_FEATURE_SENDMAIL_MAILXX( \
-     "\n       -c rcpt         Cc: recipient. May be multiple" \
+     "\n       -c rcpt         Cc: recipient. May be repeated" \
      "\n       -e rcpt         Errors-To: recipient" \
                ) \
      "\n       -t              Read recipients and subject from body" \