(daemon) #5260 'conflicting documentation for -w argument': fixed.

diff --git a/NEWS b/NEWS
index b45f0b5d163d37ca9aa1337225239a1677aa58d4..071de98339c69317bd157a9f58acf6ad07bcad1d 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -43,6 +43,8 @@
   #5215 fix a transmission-cli regression from 2.76
   #5248 'fails to create torrent with multiple trackers'
   #5249 'error parsing json in some locales'
+  #5259 minor memory leak in tr_torrentDeleteLocalData()
+  #5260 improved documentation for -w argument in transmission-remote
 
 
 === Transmission 2.76 (2013/01/08) ===

diff --git a/daemon/remote.c b/daemon/remote.c
index b063d66e524fe43567f7ea4ecf8b64673b4fa319..651ca24d8b024d33c5d97eff98ef1e3ba6b6959c 100644 (file)
--- a/daemon/remote.c
+++ b/daemon/remote.c
@@ -306,7 +306,7 @@ static tr_option opts[] =
     { 831, "no-utp",                 "Disable uTP for peer connections", NULL, 0, NULL },
     { 'v', "verify",                 "Verify the current torrent(s)", "v",  0, NULL },
     { 'V', "version",                "Show version number and exit", "V", 0, NULL },
-    { 'w', "download-dir",           "When adding a new torrent, set its download folder. Otherwise, set the default download folder", "w",  1, "<path>" },
+    { 'w', "download-dir",           "When used in conjunction with --add, set the new torrent's download folder. Otherwise, set the default download folder", "w",  1, "<path>" },
     { 'x', "pex",                    "Enable peer exchange (PEX)", "x",  0, NULL },
     { 'X', "no-pex",                 "Disable peer exchange (PEX)", "X",  0, NULL },
     { 'y', "lpd",                    "Enable local peer discovery (LPD)", "y",  0, NULL },

diff --git a/daemon/transmission-remote.1 b/daemon/transmission-remote.1
index 6216088832f1794bcac7b6babc3b9dad1480e094..a537c5ea67747f5c7ee35720e7717a26b78d73dc 100644 (file)
--- a/daemon/transmission-remote.1
+++ b/daemon/transmission-remote.1
@@ -292,9 +292,7 @@ Verify the current torrent(s)
 .It Fl V Fl -version
 Show version number and exit
 .It Fl w Fl -download-dir Ar directory
-Use
-.Ar directory
-as the default location for newly added torrents to download files to.
+When used in conjunction with --add, set the new torrent's download folder. Otherwise, set the default download folder.
 .It Fl x Fl -pex
 Enable peer exchange (PEX).
 .It Fl X Fl -no-pex