diff --git a/docs/manual.html b/docs/manual.html index 4d19d2ff3..1534e6c3e 100755 --- a/docs/manual.html +++ b/docs/manual.html @@ -132,11 +132,11 @@ example client.
The current state includes the following features:-
- multitracker extension support (as described by TheShadow)
+- multitracker extension support (as described by John Hoffman)
- serves multiple torrents on a single port and a single thread
- supports http proxies and proxy authentication
- gzipped tracker-responses
-- piece picking on block-level (as opposed to piece-level) like in Azureus
+- piece picking on block-level like in Azureus (as opposed to piece-level).
- queues torrents for file check, instead of checking all of them in parallel.
- uses separate threads for checking files and for main downloader, with a fool-proof thread-safe library interface. (i.e. There's no way for the user to cause a deadlock).
@@ -598,7 +598,7 @@ dictionary_type const& dict() const;
The integer(), string(), list() and dict() functions -are accessorts that return the respecive type. If the entry object isn't of the +are accessors that return the respecive type. If the entry object isn't of the type you request, the accessor will throw type_error (which derives from std::runtime_error). You can ask an entry for its type through the type() function.
@@ -892,7 +892,7 @@ void set_download_limit(int limit);set_upload_limit will limit the upload bandwidth used by this particular torrent to the limit you set. It is given as the number of bytes per second the torrent is allowed to upload. set_download_limit works the same way but for download bandwidth instead of upload bandwidth. -Note that setting i higher limit on a torrent then the global limit (session::set_upload_rate_limit) +Note that setting a higher limit on a torrent then the global limit (session::set_upload_rate_limit) will not override the global rate limit. The torrent can never upload more than the global rate limit.
diff --git a/docs/manual.rst b/docs/manual.rst index 0a9e1514b..7ca2c1f6b 100755 --- a/docs/manual.rst +++ b/docs/manual.rst @@ -21,11 +21,11 @@ The main goals of libtorrent are: libtorrent is not finished. It is an ongoing project (including this documentation). The current state includes the following features: - * multitracker extension support (as `described by TheShadow`__) + * multitracker extension support (as `described by John Hoffman`__) * serves multiple torrents on a single port and a single thread * supports http proxies and proxy authentication * gzipped tracker-responses - * piece picking on block-level (as opposed to piece-level) like in Azureus_ + * piece picking on block-level like in Azureus_ (as opposed to piece-level). * queues torrents for file check, instead of checking all of them in parallel. * uses separate threads for checking files and for main downloader, with a fool-proof thread-safe library interface. (i.e. There's no way for the user to cause a deadlock). @@ -521,7 +521,7 @@ integer() string() list() dict() type() dictionary_type const& dict() const; The ``integer()``, ``string()``, ``list()`` and ``dict()`` functions -are accessorts that return the respecive type. If the ``entry`` object isn't of the +are accessors that return the respecive type. If the ``entry`` object isn't of the type you request, the accessor will throw type_error_ (which derives from ``std::runtime_error``). You can ask an ``entry`` for its type through the ``type()`` function.