make the help daemon/remote/cli help pages a little more consistent

diff --git a/cli/cli.c b/cli/cli.c
index 53dc0f444b302865d9230111f4584de9876ea590..88078c0a5db37037f88b49897104df4407cd65a5 100644 (file)
--- a/cli/cli.c
+++ b/cli/cli.c
@@ -442,29 +442,29 @@ const struct tr_option options[] = {
     { 'b', "blocklist", "Enable peer blocklists", "b", 0, NULL },
     { 'B', "no-blocklist", "Disable peer blocklists", "B", 0, NULL },
     { 'c', "comment", "Set the new torrent's comment", "c", 1, "<comment>" },
-    { 'd', "downlimit", "Set max download speed in KB/s", "d", 1, "<number>" },
+    { 'd', "downlimit", "Set max download speed in KB/s", "d", 1, "<speed>" },
     { 'D', "no-downlimit", "Don't limit the download speed", "D", 0, NULL },
     { 910, "encryption-required", "Encrypt all peer connections", "er", 0, NULL },
     { 911, "encryption-preferred", "Prefer encrypted peer connections", "ep", 0, NULL },
     { 912, "encryption-tolerated", "Prefer unencrypted peer connections", "et", 0, NULL },
-    { 'f', "finish", "Set a script to run when the torrent finishes",
+    { 'f', "finish", "Run a script when the torrent finishes",
       "f", 1, "<script>" },
     { 'g', "config-dir", "Where to find configuration files",
       "g", 1, "<path>" },
     { 'i', "info", "Show torrent details and exit", "i", 0, NULL },
     { 'm', "portmap", "Enable portmapping via NAT-PMP or UPnP", "m", 0, NULL },
     { 'M', "no-portmap", "Disable portmapping", "M", 0, NULL },
-    { 'n', "new", "Create a new torrent from a file or directory",
-      "n", 1, "<path>" },
+    { 'n', "new", "Create a new torrent",
+      "n", 1, "<source>" },
     { 'p', "port",
-      "Port to listen for incoming peers (Default: "TR_DEFAULT_PORT_STR")",
+      "Port for incoming peers (Default: "TR_DEFAULT_PORT_STR")",
       "p", 1, "<port>" },
     { 'r', "private", "Set the new torrent's 'private' flag", "r", 0, NULL },
     { 's', "scrape", "Scrape the torrent and exit", "s", 0, NULL },
     { 't', "tos",
       "Peer socket TOS (0 to 255, default="TR_DEFAULT_PEER_SOCKET_TOS_STR")",
-      "t", 1, "<number>" },
-    { 'u', "uplimit", "Set max upload speed in KB/s", "u", 1, "<number>" },
+      "t", 1, "<tos>" },
+    { 'u', "uplimit", "Set max upload speed in KB/s", "u", 1, "<speed>" },
     { 'U', "no-uplimit", "Don't limit the upload speed", "U", 0, NULL },
     { 'v', "verify", "Verify the specified torrent", "v", 0, NULL },
     { 'w', "download-dir", "Where to save downloaded data", "w", 1, "<path>" },

diff --git a/daemon/daemon.c b/daemon/daemon.c
index a630429f945fca05b5d50d66ca2883b1afea84d7..6376340d8a5f0d184886fa8b6aa43c56475d513e 100644 (file)
--- a/daemon/daemon.c
+++ b/daemon/daemon.c
@@ -237,7 +237,9 @@ const struct tr_option options[] = {
     { 'B', "no-blocklist", "Disable peer blocklists",         "B", 0, NULL },
     { 'f', "foreground", "Run in the foreground instead of daemonizing", "f", 0, NULL },
     { 'g', "config-dir",   "Where to look for configuration files", "g", 1, "<path>" },
-    { 'p', "port",         "Port to listen for incoming peers (Default: "TR_DEFAULT_PORT_STR")", "p", 1, "<port>" },
+    { 'p', "port",
+      "Port for incoming peers (Default: "TR_DEFAULT_PORT_STR")",
+      "p", 1, "<port>" },
     { 't', "auth",         "Requre authentication",           "t", 0, NULL },
     { 'T', "no-auth",      "Don't require authentication",    "T", 0, NULL },
     { 'u', "username",     "Set username for authentication", "u", 1, "<username>" },

diff --git a/daemon/remote.c b/daemon/remote.c
index d6bb454c1557ab721072d917201ed252a32d2c49..9d1f1219256983c9c9b10541af20b501952e6edb 100644 (file)
--- a/daemon/remote.c
+++ b/daemon/remote.c
@@ -52,7 +52,7 @@ static tr_option opts[] =
 {
     { 'a', "add",          "Add torrent files", "a", 0, NULL },
     { 'b', "debug",        "Print debugging information", "b", 0, NULL },
-    { 'd', "downlimit",    "Set the maximum download speed in KB/s", "d", 1, "<number>" },
+    { 'd', "downlimit",    "Set the maximum download speed in KB/s", "d", 1, "<speed>" },
     { 'D', "no-downlimit", "Don't limit the download speed", "D", 0, NULL },
     { 910, "encryption-required", "Encrypt all peer connections", "er", 0, NULL },
     { 911, "encryption-preferred", "Prefer encrypted peer connections", "ep", 0, NULL },
@@ -66,15 +66,17 @@ static tr_option opts[] =
     { 'm', "portmap",      "Enable portmapping via NAT-PMP or UPnP", "m", 0, NULL },
     { 'M', "no-portmap",   "Disable portmapping", "M", 0, NULL },
     { 'n', "auth",         "Set username for authentication", "n", 1, "<auth>" },
-    { 'p', "port",         "Port to listen for incoming peers", "p", 1, "<port>" },
+    { 'p', "port",
+      "Port for incoming peers (Default: "TR_DEFAULT_PORT_STR")",
+      "p", 1, "<port>" },
     { 900, "priority-high", "Set the files' priorities as high", "ph", 1, "<files>" },
     { 901, "priority-normal", "Set the files' priorities as normal", "pn", 1, "<files>" },
     { 902, "priority-normal", "Set the files' priorities as low", "pl", 1, "<files>" },
     { 'r', "remove",       "Remove the current torrent(s)", "r", 0, NULL },
     { 's', "start",        "Start the current torrent(s)", "s", 0, NULL },
     { 'S', "stop",         "Stop the current torrent(s)", "S", 0, NULL },
-    { 't', "torrent",      "Set the current torrent(s)", "t", 1, "<torrents>" },
-    { 'u', "uplimit",      "Set the maximum upload speed in KB/s", "u", 1, "<number>" },
+    { 't', "torrent",      "Set the current torrent(s)", "t", 1, "<torrent>" },
+    { 'u', "uplimit",      "Set the maximum upload speed in KB/s", "u", 1, "<speed>" },
     { 'U', "no-uplimit",   "Don't limit the upload speed", "U", 0, NULL },
     { 'v', "verify",       "Verify the current torrent(s)", "v", 0, NULL },
     { 'w', "download-dir", "Set the default download folder", "w", 1, "<path>" },