Merge pull request #364 from aldenml/doc-typos

More documentation typos
This commit is contained in:
Arvid Norberg 2016-01-05 22:40:52 -05:00
commit c36d1d1051
4 changed files with 13 additions and 14 deletions

View File

@ -173,7 +173,7 @@ namespace libtorrent
// determines if the torrent should be added in *share mode* or not.
// Share mode indicates that we are not interested in downloading the
// torrent, but merley want to improve our share ratio (i.e. increase
// torrent, but merely want to improve our share ratio (i.e. increase
// it). A torrent started in share mode will do its best to never
// download more than it uploads to the swarm. If the swarm does not
// have enough demand for upload capacity, the torrent will not
@ -194,7 +194,7 @@ namespace libtorrent
// determines if the IP filter should apply to this torrent or not. By
// default all torrents are subject to filtering by the IP filter
// (i.e. this flag is set by default). This is useful if certain
// torrents needs to be excempt for some reason, being an auto-update
// torrents needs to be exempt for some reason, being an auto-update
// torrent for instance.
flag_apply_ip_filter = 0x010,
@ -263,7 +263,7 @@ namespace libtorrent
// of web seeds (`BEP 17`_ and `BEP 19`_). When replacing web seeds
// (i.e. when this flag is not set), any web seeds passed in via
// add_torrent_params are also replaced. The default behavior is to
// have any web seeds in the resume data take presedence over whatever
// have any web seeds in the resume data take precedence over whatever
// is passed in here as well as the .torrent file.
flag_merge_resume_http_seeds = 0x2000,
@ -284,7 +284,7 @@ namespace libtorrent
// for forward binary compatibility.
int version;
// torrent_info object with the torrent to add. Unless the url or
// info_hash is set, this is required to be initiazlied.
// info_hash is set, this is required to be initialized.
boost::shared_ptr<torrent_info> ti;
#ifndef TORRENT_NO_DEPRECATE

View File

@ -405,8 +405,8 @@ namespace libtorrent
incoming_starts_queued_torrents,
// when set to true, the downloaded counter sent to trackers will
// include the actual number of payload bytes donwnloaded including
// redundant bytes. If set to false, it will not include any redundany
// include the actual number of payload bytes downloaded including
// redundant bytes. If set to false, it will not include any redundancy
// bytes
report_true_downloaded,
@ -487,7 +487,7 @@ namespace libtorrent
// if this is true, the ``&ip=`` argument in tracker requests (unless
// otherwise specified) will be set to the intermediate IP address if
// the user is double NATed. If ther user is not double NATed, this
// the user is double NATed. If the user is not double NATed, this
// option does not have an affect
announce_double_nat,
@ -510,7 +510,7 @@ namespace libtorrent
// ``connection_speed``, in case we're close to bump up against the
// limit of number of connections. The intention of this setting is to
// more evenly distribute our connection attempts over time, instead
// of attempting to connectin in batches, and timing them out in
// of attempting to connect in batches, and timing them out in
// batches.
smooth_connects,
@ -647,7 +647,7 @@ namespace libtorrent
// unlikely to matter anyway
auto_sequential,
// if true, trackerconnections are made over the configured proxy, if
// if true, tracker connections are made over the configured proxy, if
// any.
proxy_tracker_connections,
@ -1405,7 +1405,7 @@ namespace libtorrent
// ``async_write_some`` (i.e. send) on peer connection sockets. When
// seeding at extremely high rates, this may become a bottleneck, and
// setting this to 2 or more may parallelize that cost. When using SSL
// torrents, all encryption for outgoing traffic is done withint the
// torrents, all encryption for outgoing traffic is done within the
// socket send functions, and this will help parallelizing the cost of
// SSL encryption as well.
network_threads,
@ -1428,7 +1428,7 @@ namespace libtorrent
// aggressive in hitting trackers.
tracker_backoff,
// when a seeding torrent reaches eaither the share ratio (bytes up /
// when a seeding torrent reaches either the share ratio (bytes up /
// bytes down) or the seed time ratio (seconds as seed / seconds as
// downloader) or the seed time limit (seconds as seed) it is
// considered done, and it will leave room for other torrents these
@ -1502,7 +1502,7 @@ namespace libtorrent
// active by the queuing mechanism. A torrent whose download rate is
// less than ``inactive_down_rate`` and whose upload rate is less than
// ``inactive_up_rate`` for ``auto_manage_startup`` seconds, is
// considered inactive, and another queued torrent may be startert.
// considered inactive, and another queued torrent may be started.
// This logic is disabled if ``dont_count_slow_torrents`` is false.
inactive_down_rate,
inactive_up_rate,

View File

@ -35,7 +35,6 @@ POSSIBILITY OF SUCH DAMAGE.
#include "libtorrent/assert.hpp"
#include "libtorrent/settings_pack.hpp"
#include "libtorrent/aux_/session_impl.hpp"
//#include "libtorrent/platform_util.hpp" // for total_physical_ram
#include <algorithm>

View File

@ -205,7 +205,7 @@ namespace libtorrent { namespace
{ return num_requests < rhs.num_requests; }
};
// this vector keeps track of how many times each meatdata
// this vector keeps track of how many times each metadata
// block has been requested and who we ended up getting it from
// std::numeric_limits<int>::max() means we have the piece
std::vector<metadata_piece> m_requested_metadata;