From 134df85eb9558f071f1a7a4d3b40d5cf11ba2ab9 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Thu, 3 Jun 2010 23:21:31 +0000 Subject: [PATCH] (trunk daemon) sync the manpage with the --help page wrt file & priority args --- daemon/remote.c | 10 +++++----- daemon/transmission-remote.1 | 37 ++++++++++++++++++------------------ 2 files changed, 24 insertions(+), 23 deletions(-) diff --git a/daemon/remote.c b/daemon/remote.c index 67862f169..b6dfbd3cd 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -228,12 +228,12 @@ static tr_option opts[] = { 'p', "port", "Port for incoming peers (Default: " TR_DEFAULT_PEER_PORT_STR ")", "p", 1, "" }, { 962, "port-test", "Port testing", "pt", 0, NULL }, { 'P', "random-port", "Random port for incomping peers", "P", 0, NULL }, - { 900, "priority-high", "Try to download the specified files first", "ph", 1, "" }, - { 901, "priority-normal", "Try to download the specified files normally", "pn", 1, "" }, - { 902, "priority-low", "Try to download the specified files last", "pl", 1, "" }, + { 900, "priority-high", "Try to download the specified file(s) first", "ph", 1, "" }, + { 901, "priority-normal", "Try to download the specified file(s) normally", "pn", 1, "" }, + { 902, "priority-low", "Try to download the specified file(s) last", "pl", 1, "" }, { 700, "bandwidth-high", "Give this torrent first chance at available bandwidth", "Bh", 0, NULL }, - { 701, "bandwidth-normal", "Give this torrent the bandwidth left over from high priority torrents", "Bn", 0, NULL }, - { 702, "bandwidth-low", "Give this torrent the bandwidth left over from high and normal priority torrents", "Bl", 0, NULL }, + { 701, "bandwidth-normal", "Give this torrent the bandwidth left over by high priority torrents", "Bn", 0, NULL }, + { 702, "bandwidth-low", "Give this torrent the bandwidth left over by high and normal priority torrents", "Bl", 0, NULL }, { 'r', "remove", "Remove the current torrent(s)", "r", 0, NULL }, { 930, "peers", "Set the maximum number of peers for the current torrent(s) or globally", "pr", 1, "" }, { 'R', "remove-and-delete", "Remove the current torrent(s) and delete local data", NULL, 0, NULL }, diff --git a/daemon/transmission-remote.1 b/daemon/transmission-remote.1 index 3dbf8f23c..4c4cdb008 100644 --- a/daemon/transmission-remote.1 +++ b/daemon/transmission-remote.1 @@ -35,12 +35,12 @@ and .Op Fl N Ar netrc .Op Fl o | O .Op Fl p Ar port -.Op Fl th -.Op Fl tn -.Op Fl tl -.Op Fl fh Ar files -.Op Fl fl Ar files -.Op Fl fn Ar files +.Op Fl Bh +.Op Fl Bn +.Op Fl Bl +.Op Fl ph Ar files +.Op Fl pl Ar files +.Op Fl pn Ar files .Op Fl pr Ar peers .Op Fl r .Op Fl R @@ -180,14 +180,15 @@ Disable distribued hash table (DHT). Set the .Ar port for use when listening for incoming peer connections -.It Fl tn Fl -torrent-priority-normal -Mark the current torrent(s) as normal priority. -.It Fl tn Fl -torrent-priority-high -Mark the current torrent(s) as high priority. -.It Fl tn Fl -torrent-priority-low -Mark the current torrent(s) as low priority. -.It Fl fn Fl -file-priority-normal Ar all | file-index | files -Mark file(s) as normal priority. +.It Fl Bh Fl -bandwidth-high +Give this torrent first chance at available bandwidth +.It Fl Bn Fl -bandwidth-normal +Give this torrent the bandwidth left over by high priority torrents +.It Fl Bl Fl -bandwidth-low +Give this torrent the bandwidth left over by high and normal priority torrents + +.It Fl ph Fl -priority-high Ar all | file-index | files +Try to download the specified file(s) first. .Ar all marks all of the torrent's files as normal priority, .Ar file-index @@ -195,10 +196,10 @@ sets a single file's priority as normal, and .Ar files sets multiple files' priorities as normal, such as "\-pn1,3-5" to normalize files #1, #3, #4, and #5. -.It Fl fh Fl -file-priority-high Ar all | file-index | files -Mark file(s) as high priority. -.It Fl fl Fl -file-priority-low Ar all | file-index | files -Mark file(s) as low priority. +.It Fl pn Fl -priority-normal Ar all | file-index | files +Try to download the specified files normally. +.It Fl pl Fl -priority-low Ar all | file-index | files +Try to download the specified files last .It Fl pr Fl -peers Ar number Set the maximum number of peers. If current torrent(s) are selected this operates on them. Otherwise, it changes the global setting.