diff --git a/docs/index.html b/docs/index.html
index 0dcd1d946..c923bf491 100755
--- a/docs/index.html
+++ b/docs/index.html
@@ -345,6 +345,8 @@ const char* buf;
entry e = bdecode(buf, buf + data_size);
@@ -392,7 +394,7 @@ public:
The integer(), string(), list() and dict() functions
are accessorts 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
+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.
The print() function is there for debug purposes only.
@@ -541,7 +543,7 @@ was started.
set_max_uploads() sets the maximum number of peers that's unchoked at the same time on this
torrent. If you set this to -1, there will be no limit.
write_resume_data() takes a non-const reference to a char-vector, that vector will be filled
-with the fast-resume data. For more information about hpw fast-resume works, see fast resume.
+with the fast-resume data. For more information about how fast-resume works, see
fast resume.
status() will return a structure with information about the status of this
@@ -1140,8 +1142,8 @@ for each slot
4 bytes, the number of unfinished pieces
for each unfinished piece
4 bytes, index of the unfinished piece
- blocks_per_piece / 32 bytes, the bitmask describing which
- blocks are finished in this piece.
+ blocks_per_piece / 8 bytes, the bitmask describing which
+ blocks are finished in this piece.
diff --git a/docs/index.rst b/docs/index.rst
index 638c5065b..75c83ef4f 100755
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -325,6 +325,8 @@ Or, if you have a raw char buffer::
Now we just need to know how to retrieve information from the ``entry``.
+If ``bdecode()`` encounters invalid encoded data in the range given to it
+it will throw invalid_encoding_.
@@ -375,7 +377,7 @@ or a string. This is its synopsis::
The ``integer()``, ``string()``, ``list()`` and ``dict()`` functions
are accessorts 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
+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.
@@ -551,7 +553,7 @@ was started.
torrent. If you set this to -1, there will be no limit.
``write_resume_data()`` takes a non-const reference to a char-vector, that vector will be filled
-with the fast-resume data. For more information about hpw fast-resume works, see `fast resume`_.
+with the fast-resume data. For more information about how fast-resume works, see `fast resume`_.
status()
~~~~~~~~
@@ -1211,8 +1213,8 @@ The format of the fast-resume data is as follows, given that all
4 bytes, the number of unfinished pieces
for each unfinished piece
4 bytes, index of the unfinished piece
- blocks_per_piece / 32 bytes, the bitmask describing which
- blocks are finished in this piece.
+ blocks_per_piece / 8 bytes, the bitmask describing which
+ blocks are finished in this piece.
Feedback
========
diff --git a/examples/client_test.cpp b/examples/client_test.cpp
index 630514844..ede34a098 100755
--- a/examples/client_test.cpp
+++ b/examples/client_test.cpp
@@ -319,7 +319,9 @@ int main(int argc, char* argv[])
<< static_cast