(trunk, daemon) #5743 'unknown option: -R': revert previous commit, sync manpage

diff --git a/daemon/remote.c b/daemon/remote.c
index 33b8e3bc6cc1ac937575625e34d6cc9eaaab963a..0e8a02546106968a77664833d4712506842e050f 100644 (file)
--- a/daemon/remote.c
+++ b/daemon/remote.c
@@ -278,7 +278,7 @@ static tr_option opts[] =
     { 600, "reannounce",             "Reannounce the current torrent(s)", NULL,  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, "<max>" },
-    { 'R', "remove-and-delete",      "Remove the current torrent(s) and delete local data", "R", 0, NULL },
+    { 'R', "remove-and-delete",      "Remove the current torrent(s) and delete local data", NULL, 0, NULL },
     { 800, "torrent-done-script",    "Specify a script to run when a torrent finishes", NULL, 1, "<file>" },
     { 801, "no-torrent-done-script", "Don't run a script when torrents finish", NULL, 0, NULL },
     { 950, "seedratio",              "Let the current torrent(s) seed until a specific ratio", "sr", 1, "ratio" },

diff --git a/daemon/transmission-remote.1 b/daemon/transmission-remote.1
index b5482a1510d634e4e18be45624e916c372798678..a537c5ea67747f5c7ee35720e7717a26b78d73dc 100644 (file)
--- a/daemon/transmission-remote.1
+++ b/daemon/transmission-remote.1
@@ -229,7 +229,7 @@ Set the maximum number of peers.
 If current torrent(s) are selected this operates on them. Otherwise, it changes the global setting.
 .It Fl r Fl -remove
 Remove the current torrent(s). This does not delete the downloaded data.
-.It Fl R Fl -remove-and-delete
+.It Fl -remove-and-delete
 Remove the current torrent(s) and delete their downloaded data.
 .It Fl -reannounce
 Reannounce the current torrent(s). This is the same as the GUI's "ask tracker for more peers" button.