From 59e66e9c36b486723b652ae67b21b6d5398df5f2 Mon Sep 17 00:00:00 2001 From: Arvid Norberg Date: Wed, 23 Feb 2005 23:12:29 +0000 Subject: [PATCH] *** empty log message *** --- docs/manual.html | 10 +++++----- docs/manual.rst | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/docs/manual.html b/docs/manual.html index 5ec003705..741f4a05c 100755 --- a/docs/manual.html +++ b/docs/manual.html @@ -1465,7 +1465,7 @@ an empty string, no http proxy will be used.

proxy_port is the port on which the http proxy listens. If proxy_ip is empty, this will be ignored.

proxy_login should be the login username for the http proxy, if this -empty, the http proxy will be trid to be used without authentication.

+empty, the http proxy will be tried to be used without authentication.

proxy_password the password string for the http proxy.

user_agent this is the client identification to the tracker. It will be followed by the string "(libtorrent)" to identify that this library @@ -1614,15 +1614,15 @@ and it can be used to retreive information, an bencode() to encode it into the OutIt iterator.

The OutIt and InIt are iterators -(InputIterator_ and OutputIterator_ respectively). They -are templates and are usually instantiated as ostream_iterator_, -back_insert_iterator_ or istream_iterator_. These +(InputIterator and OutputIterator respectively). They +are templates and are usually instantiated as ostream_iterator, +back_insert_iterator or istream_iterator. These functions will assume that the iterator refers to a character (char). So, if you want to encode entry e into a buffer in memory, you can do it like this:

 std::vector<char> buffer;
-bencode(std::back_insert_iterator<std::vector<char> >(buf), e);
+bencode(std::back_inserter(buf), e);

If you want to decode a torrent file from a buffer in memory, you can do it like this:

diff --git a/docs/manual.rst b/docs/manual.rst
index 385a99d51..73e4574e1 100755
--- a/docs/manual.rst
+++ b/docs/manual.rst
@@ -1445,7 +1445,7 @@ an empty string, no http proxy will be used.
 is empty, this will be ignored.
 
 ``proxy_login`` should be the login username for the http proxy, if this
-empty, the http proxy will be trid to be used without authentication.
+empty, the http proxy will be tried to be used without authentication.
 
 ``proxy_password`` the password string for the http proxy.
 
@@ -1604,15 +1604,15 @@ the program and given to ``bencode()`` to encode it into the ``OutIt``
 iterator.
 
 The ``OutIt`` and ``InIt`` are iterators
-(``InputIterator_`` and ``OutputIterator_`` respectively). They
-are templates and are usually instantiated as ``ostream_iterator_``,
-``back_insert_iterator_`` or ``istream_iterator_``. These
+(InputIterator_ and OutputIterator_ respectively). They
+are templates and are usually instantiated as ostream_iterator_,
+back_insert_iterator_ or istream_iterator_. These
 functions will assume that the iterator refers to a character
 (``char``). So, if you want to encode entry ``e`` into a buffer
 in memory, you can do it like this::
 
 	std::vector buffer;
-	bencode(std::back_insert_iterator >(buf), e);
+	bencode(std::back_inserter(buf), e);
 
 .. _InputIterator: http://www.sgi.com/tech/stl/InputIterator.html
 .. _OutputIterator: http://www.sgi.com/tech/stl/OutputIterator.html