merged RC_1_1 into master

examples/client_test.cpp

@@ -483,6 +483,7 @@ std::string monitor_dir;
 int poll_interval = 5;
 int max_connections_per_torrent = 50;
 bool seed_mode = false;
+bool stats_enabled = false;
 int cache_size = 1024;
 
 bool share_mode = false;
@@ -725,7 +726,7 @@ bool handle_alert(torrent_view& view, session_view& ses_view
 	{
 		ses_view.update_counters(s->counters()
 			, duration_cast<microseconds>(s->timestamp().time_since_epoch()).count());
-		return true;
+		return !stats_enabled;
 	}
 
 #ifndef TORRENT_DISABLE_DHT
@@ -1021,6 +1022,7 @@ CLIENT OPTIONS
                         previous command line options, so be sure to specify this first
   -G                    Add torrents in seed-mode (i.e. assume all pieces
                         are present and check hashes on-demand)
+  -O                    print session stats counters to the log
 
 LIBTORRENT SETTINGS
   --<name-of-setting>=<value>
@@ -1188,6 +1190,7 @@ example alert_masks:
 			case 'k': settings = lt::high_performance_seed(); --i; break;
 			case 'G': seed_mode = true; --i; break;
 			case 's': save_path = make_absolute_path(arg); break;
+			case 'O': stats_enabled = true; --i; break;
 			case 'U': torrent_upload_limit = atoi(arg) * 1000; break;
 			case 'D': torrent_download_limit = atoi(arg) * 1000; break;
 			case 'm': monitor_dir = make_absolute_path(arg); break;
@@ -1623,7 +1626,11 @@ COLUMN OPTIONS
 				}
 
 			} while (sleep_and_input(&c, lt::milliseconds(0)));
-			if (c == 'q') break;
+			if (c == 'q')
+			{
+				quit = true;
+				break;
+			}
 		}
 
 		pop_alerts(view, ses_view, ses, events);

include/libtorrent/torrent_handle.hpp

@@ -1167,9 +1167,13 @@ TORRENT_IPV6_NAMESPACE_END
 		// fails, ask the user which mode to use. The client may then re-issue
 		// the ``move_storage`` call with one of the other modes.
 		//
-		// ``dont_replace`` always takes the existing file in the target
+		// ``dont_replace`` always keeps the existing file in the target
 		// directory, if there is one. The source files will still be removed in
-		// that case.
+		// that case. Note that it won't automatically re-check files. If an
+		// incomplete torrent is moved into a directory with the complete files,
+		// pause, move, force-recheck and resume. Without the re-checking, the
+		// torrent will keep downloading and files in the new download directory
+		// will be overwritten.
 		//
 		// Files that have been renamed to have absolute paths are not moved by
 		// this function. Keep in mind that files that don't belong to the