From 0d620e77db53b28b1c15bcfe92bf0ede66974946 Mon Sep 17 00:00:00 2001 From: Ramkumar Ramachandra Date: Sun, 17 Nov 2013 12:15:08 +0530 Subject: [PATCH 1/7] rtorrent.1.xml: remove schedule and schedule_remove They were deprecated a long time ago. Signed-off-by: Ramkumar Ramachandra --- doc/old/rtorrent.1.xml | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/doc/old/rtorrent.1.xml b/doc/old/rtorrent.1.xml index 9c455859..76d2401d 100644 --- a/doc/old/rtorrent.1.xml +++ b/doc/old/rtorrent.1.xml @@ -507,29 +507,6 @@ Enable/disable peer exchange for torrents that aren't marked private. Disabled b - - schedule = id,start,interval,command - -Call command every interval -seconds, starting from start. An -interval of zero calls the task once, while a -start of zero calls it immediately. Currently -command is forwarded to the option handler. - -start and interval may -optionally use a time format, dd:hh:mm:ss. F.ex to -start a task every day at 18:00, use -18:00:00,24:00:00. - - - - - schedule_remove = id - -Delete id from the scheduler. - - - start_tied = From 89dfa3a2682b558a741f1af60d6ff968f09ff508 Mon Sep 17 00:00:00 2001 From: Ramkumar Ramachandra Date: Sun, 17 Nov 2013 12:20:02 +0530 Subject: [PATCH 2/7] rtorrent.1.xml: clearly demarcate DHT settings DHT stuff is clearly demarcated in the code, so let the manual also follow along. Signed-off-by: Ramkumar Ramachandra --- doc/old/rtorrent.1.xml | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/doc/old/rtorrent.1.xml b/doc/old/rtorrent.1.xml index 76d2401d..f14c3566 100644 --- a/doc/old/rtorrent.1.xml +++ b/doc/old/rtorrent.1.xml @@ -723,6 +723,27 @@ not allow connections to UDP trackers. + + http_capath = path + http_cacert = filename + +Set the certificates to use in http requests. See Curl's +CURLOPT_CAPATH and CURLOPT_CAINFO options for further information. + + + + + + + + + DHT-RELATED SETTINGS + + Settings related to DHT + + + + dht = disabled|off|auto|on @@ -755,20 +776,10 @@ The port is optional, with port 6881 being used by default. - - http_capath = path - http_cacert = filename - -Set the certificates to use in http requests. See Curl's -CURLOPT_CAPATH and CURLOPT_CAINFO options for further information. - - - - USER-INTERFACE SETTINGS From 58fba68aff785b7a9f83c58ef92cbf6feb6ff37f Mon Sep 17 00:00:00 2001 From: Ramkumar Ramachandra Date: Sun, 17 Nov 2013 12:25:39 +0530 Subject: [PATCH 3/7] rtorrent.1.xml: add more DHT variables Use TODO placeholders for the moment. Signed-off-by: Ramkumar Ramachandra --- doc/old/rtorrent.1.xml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/doc/old/rtorrent.1.xml b/doc/old/rtorrent.1.xml index f14c3566..8239229a 100644 --- a/doc/old/rtorrent.1.xml +++ b/doc/old/rtorrent.1.xml @@ -776,6 +776,27 @@ The port is optional, with port 6881 being used by default. + + dht_statistics = TODO + +TODO + + + + + set_dht_port = TODO + +TODO + + + + + set_dht_throttle = TODO + +TODO + + + From fe5439f6a06b313dc0134b178608f0d4e7c4e173 Mon Sep 17 00:00:00 2001 From: Ramkumar Ramachandra Date: Sun, 17 Nov 2013 12:39:45 +0530 Subject: [PATCH 4/7] rtorrent.1.xml: document set_* functions for throttle Signed-off-by: Ramkumar Ramachandra --- doc/old/rtorrent.1.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/doc/old/rtorrent.1.xml b/doc/old/rtorrent.1.xml index 8239229a..57dfd0b4 100644 --- a/doc/old/rtorrent.1.xml +++ b/doc/old/rtorrent.1.xml @@ -606,6 +606,8 @@ commands are available. upload_rate = KB download_rate = KB + set_upload_rate = TODO + set_download_rate = TODO Set the maximum global uploand and download rates. @@ -638,6 +640,8 @@ Set the maximum number of simultaneous uploads per download. max_uploads_div = value max_downloads_div = value + set_max_uploads_div = value + set_max_downloads_div = value Change the divider used to calculate the max upload and download slots to use when the throttle is changed. Disable by @@ -648,6 +652,8 @@ setting 0. max_uploads_global = value max_downloads_global = value + set_max_uploads_global = value + set_max_downloads_global = value Max upload and download slots allowed. Disable by setting 0. From effdc5642d704b4900cd3ebaf8fd120db6a767a9 Mon Sep 17 00:00:00 2001 From: Ramkumar Ramachandra Date: Sun, 17 Nov 2013 12:40:40 +0530 Subject: [PATCH 5/7] rtorrent.1.xml: document (max|min)_(uploads|downloads) Only max_uploads was documented previously. Signed-off-by: Ramkumar Ramachandra --- doc/old/rtorrent.1.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/doc/old/rtorrent.1.xml b/doc/old/rtorrent.1.xml index 57dfd0b4..17de1237 100644 --- a/doc/old/rtorrent.1.xml +++ b/doc/old/rtorrent.1.xml @@ -632,8 +632,11 @@ Set the minimum nad maximum number of peers to allow while seeding, or max_uploads = value + max_downloads = value + min_uploads = value + min_downloads = value -Set the maximum number of simultaneous uploads per download. +Set the maximum/minimum number of simultaneous uploads/downloads per download/upload. From 9fcef7fbd61fbd4b23dc3045363cc4b3ca0f140c Mon Sep 17 00:00:00 2001 From: Ramkumar Ramachandra Date: Sun, 17 Nov 2013 12:43:20 +0530 Subject: [PATCH 6/7] rtorrent.1.xml: nuke a bunch of deprecated on_* functions Signed-off-by: Ramkumar Ramachandra --- doc/old/rtorrent.1.xml | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/doc/old/rtorrent.1.xml b/doc/old/rtorrent.1.xml index 17de1237..bca55f9c 100644 --- a/doc/old/rtorrent.1.xml +++ b/doc/old/rtorrent.1.xml @@ -574,23 +574,6 @@ Use with the schedule option. - - on_insert = id,command - on_erase = id,command - on_open = id,command - on_close = id,command - on_start = id,command - on_stop = id,command - on_hash_queued = id,command - on_hash_removed = id,command - on_hash_done = id,command - on_finished = id,command - -Call a command on a download when its state changes. Only a subset of -commands are available. - - - From a5d92cc9400ddf5e560806e2a7969414e30e885b Mon Sep 17 00:00:00 2001 From: Ramkumar Ramachandra Date: Sun, 17 Nov 2013 12:45:03 +0530 Subject: [PATCH 7/7] rtorrent.1.xml: nuke deprecated stop_on_ratio Signed-off-by: Ramkumar Ramachandra --- doc/old/rtorrent.1.xml | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/doc/old/rtorrent.1.xml b/doc/old/rtorrent.1.xml index bca55f9c..e8093896 100644 --- a/doc/old/rtorrent.1.xml +++ b/doc/old/rtorrent.1.xml @@ -557,23 +557,6 @@ torrent::input_error exception on bad input. - - stop_on_ratio = min_ratio - stop_on_ratio = min_ratio,min_upload - stop_on_ratio = min_ratio,min_upload,max_ratio - -Stop torrents when they reach the given upload ratio -min_ratio in percent. If the optional -min_upload is given, require a total -upload amount of this many bytes as well. If the optional -max_ratio is given, stop the torrent -when reaching this ratio regardless of the total upload -amount. Exclude certain torrent by pressing -Shift+I in the downlist list. -Use with the schedule option. - - -