diff --git a/ChangeLog b/ChangeLog
index 935fb06b0..85165ddcf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 
 1.1.0 release
 
+	* deprecate support for adding torrents by HTTP URL
 	* allow specifying which tracker to scrape in scrape_tracker
 	* tracker response alerts from user initiated announces/scrapes are now
 	  posted regardless of alert mask
diff --git a/include/libtorrent/add_torrent_params.hpp b/include/libtorrent/add_torrent_params.hpp
index 31eedd278..00d1f8c7b 100644
--- a/include/libtorrent/add_torrent_params.hpp
+++ b/include/libtorrent/add_torrent_params.hpp
@@ -51,7 +51,7 @@ namespace libtorrent
 	// session. The key fields when adding a torrent are:
 	//
 	// * ti - when you have a .torrent file
-	// * url - when you have a magnet link or http URL to the .torrent file
+	// * url - when you have a magnet link
 	// * info_hash - when all you have is an info-hash (this is similar to a
 	//   magnet link)
 	//
@@ -362,15 +362,7 @@ namespace libtorrent
 		// ``downloading_metadata`` state until the .torrent file has been
 		// downloaded. If there's any error while downloading, the torrent will
 		// be stopped and the torrent error state (``torrent_status::error``)
-		// will indicate what went wrong. The ``url`` may refer to a magnet link
-		// or a regular http URL.
-		// 
-		// If it refers to an HTTP URL, the info-hash for the added torrent will
-		// not be the true info-hash of the .torrent. Instead a placeholder,
-		// unique, info-hash is used which is later updated once the .torrent
-		// file has been downloaded.
-		// 
-		// Once the info-hash change happens, a torrent_update_alert is posted.
+		// will indicate what went wrong. The ``url`` may be set to a magnet link.
 		std::string url;
 
 		// if ``uuid`` is specified, it is used to find duplicates. If another
diff --git a/include/libtorrent/alert_types.hpp b/include/libtorrent/alert_types.hpp
index f233d185b..6b995ddba 100644
--- a/include/libtorrent/alert_types.hpp
+++ b/include/libtorrent/alert_types.hpp
@@ -1887,6 +1887,7 @@ namespace libtorrent
 		boost::uint64_t values[counters::num_counters];
 	};
 
+	// hidden
 	// When a torrent changes its info-hash, this alert is posted. This only
 	// happens in very specific cases. For instance, when a torrent is
 	// downloaded from a URL, the true info hash is not known immediately. First