diff --git a/docs/building.html b/docs/building.html
index 923bacbcf..1aae861bd 100644
--- a/docs/building.html
+++ b/docs/building.html
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.10: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.11: http://docutils.sourceforge.net/" />
 <title>libtorrent manual</title>
 <meta name="author" content="Arvid Norberg, arvid&#64;rasterbar.com" />
 <link rel="stylesheet" type="text/css" href="../../css/base.css" />
@@ -37,8 +37,8 @@
     </ul>
     </div>
     <div id="header">
-    <h1><span>Rasterbar Software</span></h1>
-    <h2><span>Software developement and consulting</span></h2>
+    <div id="orange"></div>
+    <div id="logo"></div>
     </div>
     <div id="main">
 <h1 class="title">libtorrent manual</h1>
@@ -803,7 +803,7 @@ be picked up by libtorrent.</p>
 </div>
     </div>
     <div id="footer">
-    <span>Copyright &copy; 2005 Rasterbar Software.</span>
+    <span>Copyright &copy; 2005-2013 Rasterbar Software.</span>
     </div>
     </div>
     <script src="http://www.google-analytics.com/urchin.js" type="text/javascript">
diff --git a/docs/client_test.html b/docs/client_test.html
index e284688e7..9004c3c77 100644
--- a/docs/client_test.html
+++ b/docs/client_test.html
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.10: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.11: http://docutils.sourceforge.net/" />
 <title>client_test example program</title>
 <link rel="stylesheet" type="text/css" href="../../css/base.css" />
 <link rel="stylesheet" type="text/css" href="../../css/rst.css" />
@@ -36,8 +36,8 @@
     </ul>
     </div>
     <div id="header">
-    <h1><span>Rasterbar Software</span></h1>
-    <h2><span>Software developement and consulting</span></h2>
+    <div id="orange"></div>
+    <div id="logo"></div>
     </div>
     <div id="main">
 <h1 class="title">client_test example program</h1>
@@ -83,7 +83,7 @@ which peer that sent the corrupt data if a piece fails the hash test.</p>
 <p>There's unicode support on linux, MacOS X and Windows.</p>
     </div>
     <div id="footer">
-    <span>Copyright &copy; 2005 Rasterbar Software.</span>
+    <span>Copyright &copy; 2005-2013 Rasterbar Software.</span>
     </div>
     </div>
     <script src="http://www.google-analytics.com/urchin.js" type="text/javascript">
diff --git a/docs/contributing.html b/docs/contributing.html
index e43c9ccee..50bf3c307 100644
--- a/docs/contributing.html
+++ b/docs/contributing.html
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.10: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.11: http://docutils.sourceforge.net/" />
 <title>libtorrent manual</title>
 <meta name="author" content="Arvid Norberg, arvid&#64;rasterbar.com" />
 <link rel="stylesheet" type="text/css" href="../../css/base.css" />
@@ -37,8 +37,8 @@
     </ul>
     </div>
     <div id="header">
-    <h1><span>Rasterbar Software</span></h1>
-    <h2><span>Software developement and consulting</span></h2>
+    <div id="orange"></div>
+    <div id="logo"></div>
     </div>
     <div id="main">
 <h1 class="title">libtorrent manual</h1>
@@ -102,7 +102,7 @@ algorithms, seeding policies, ports to new platforms etc.</p>
 </div>
     </div>
     <div id="footer">
-    <span>Copyright &copy; 2005 Rasterbar Software.</span>
+    <span>Copyright &copy; 2005-2013 Rasterbar Software.</span>
     </div>
     </div>
     <script src="http://www.google-analytics.com/urchin.js" type="text/javascript">
diff --git a/docs/dht_extensions.html b/docs/dht_extensions.html
index b17e798d4..e2ac67cf7 100644
--- a/docs/dht_extensions.html
+++ b/docs/dht_extensions.html
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.10: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.11: http://docutils.sourceforge.net/" />
 <title></title>
 <meta name="author" content="Arvid Norberg, arvid&#64;rasterbar.com" />
 <link rel="stylesheet" type="text/css" href="../../css/base.css" />
@@ -37,8 +37,8 @@
     </ul>
     </div>
     <div id="header">
-    <h1><span>Rasterbar Software</span></h1>
-    <h2><span>Software developement and consulting</span></h2>
+    <div id="orange"></div>
+    <div id="logo"></div>
     </div>
     <div id="main">
 
@@ -117,7 +117,7 @@ only IPv4 nodes present.</p>
 </div>
     </div>
     <div id="footer">
-    <span>Copyright &copy; 2005 Rasterbar Software.</span>
+    <span>Copyright &copy; 2005-2013 Rasterbar Software.</span>
     </div>
     </div>
     <script src="http://www.google-analytics.com/urchin.js" type="text/javascript">
diff --git a/docs/dht_rss.html b/docs/dht_rss.html
index b65d2ebce..8e10d668a 100644
--- a/docs/dht_rss.html
+++ b/docs/dht_rss.html
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.10: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.11: http://docutils.sourceforge.net/" />
 <title>BitTorrent extension for DHT RSS feeds</title>
 <meta name="author" content="Arvid Norberg, arvid&#64;rasterbar.com" />
 <link rel="stylesheet" type="text/css" href="../../css/base.css" />
@@ -37,8 +37,8 @@
     </ul>
     </div>
     <div id="header">
-    <h1><span>Rasterbar Software</span></h1>
-    <h2><span>Software developement and consulting</span></h2>
+    <div id="orange"></div>
+    <div id="logo"></div>
     </div>
     <div id="main">
 <h1 class="title">BitTorrent extension for DHT RSS feeds</h1>
@@ -404,7 +404,7 @@ in both C and Java.</p>
 </div>
     </div>
     <div id="footer">
-    <span>Copyright &copy; 2005 Rasterbar Software.</span>
+    <span>Copyright &copy; 2005-2013 Rasterbar Software.</span>
     </div>
     </div>
     <script src="http://www.google-analytics.com/urchin.js" type="text/javascript">
diff --git a/docs/dht_sec.html b/docs/dht_sec.html
index 39dae9a92..add59c351 100644
--- a/docs/dht_sec.html
+++ b/docs/dht_sec.html
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.10: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.11: http://docutils.sourceforge.net/" />
 <title>BitTorrent DHT security extension</title>
 <meta name="author" content="Arvid Norberg, arvid&#64;rasterbar.com" />
 <link rel="stylesheet" type="text/css" href="../../css/base.css" />
@@ -37,8 +37,8 @@
     </ul>
     </div>
     <div id="header">
-    <h1><span>Rasterbar Software</span></h1>
-    <h2><span>Software developement and consulting</span></h2>
+    <div id="orange"></div>
+    <div id="logo"></div>
     </div>
     <div id="main">
 <h1 class="title">BitTorrent DHT security extension</h1>
@@ -217,7 +217,7 @@ are accepted.</p>
 </div>
     </div>
     <div id="footer">
-    <span>Copyright &copy; 2005 Rasterbar Software.</span>
+    <span>Copyright &copy; 2005-2013 Rasterbar Software.</span>
     </div>
     </div>
     <script src="http://www.google-analytics.com/urchin.js" type="text/javascript">
diff --git a/docs/dht_store.html b/docs/dht_store.html
index 9f209e6bb..a1d21e85f 100644
--- a/docs/dht_store.html
+++ b/docs/dht_store.html
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.10: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.11: http://docutils.sourceforge.net/" />
 <title>BitTorrent extension for arbitrary DHT store</title>
 <meta name="author" content="Arvid Norberg, arvid&#64;rasterbar.com" />
 <link rel="stylesheet" type="text/css" href="../../css/base.css" />
@@ -37,8 +37,8 @@
     </ul>
     </div>
     <div id="header">
-    <h1><span>Rasterbar Software</span></h1>
-    <h2><span>Software developement and consulting</span></h2>
+    <div id="orange"></div>
+    <div id="logo"></div>
     </div>
     <div id="main">
 <h1 class="title">BitTorrent extension for arbitrary DHT store</h1>
@@ -288,7 +288,7 @@ to keep them alive.</p>
 </div>
     </div>
     <div id="footer">
-    <span>Copyright &copy; 2005 Rasterbar Software.</span>
+    <span>Copyright &copy; 2005-2013 Rasterbar Software.</span>
     </div>
     </div>
     <script src="http://www.google-analytics.com/urchin.js" type="text/javascript">
diff --git a/docs/examples.html b/docs/examples.html
index 617d8d981..b34057fba 100644
--- a/docs/examples.html
+++ b/docs/examples.html
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.10: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.11: http://docutils.sourceforge.net/" />
 <title>libtorrent Examples</title>
 <meta name="author" content="Arvid Norberg, arvid&#64;rasterbar.com" />
 <link rel="stylesheet" type="text/css" href="../../css/base.css" />
@@ -37,8 +37,8 @@
     </ul>
     </div>
     <div id="header">
-    <h1><span>Rasterbar Software</span></h1>
-    <h2><span>Software developement and consulting</span></h2>
+    <div id="orange"></div>
+    <div id="logo"></div>
     </div>
     <div id="main">
 <h1 class="title">libtorrent Examples</h1>
@@ -310,7 +310,7 @@ int main(int argc, char* argv[])
 </div>
     </div>
     <div id="footer">
-    <span>Copyright &copy; 2005 Rasterbar Software.</span>
+    <span>Copyright &copy; 2005-2013 Rasterbar Software.</span>
     </div>
     </div>
     <script src="http://www.google-analytics.com/urchin.js" type="text/javascript">
diff --git a/docs/extension_protocol.html b/docs/extension_protocol.html
index afa43972f..1ebc3a258 100644
--- a/docs/extension_protocol.html
+++ b/docs/extension_protocol.html
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.10: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.11: http://docutils.sourceforge.net/" />
 <title></title>
 <meta name="author" content="Arvid Norberg, arvid&#64;rasterbar.com Ludvig Strigeus, ludde&#64;utorrent.com" />
 <link rel="stylesheet" type="text/css" href="../../css/base.css" />
@@ -37,8 +37,8 @@
     </ul>
     </div>
     <div id="header">
-    <h1><span>Rasterbar Software</span></h1>
-    <h2><span>Software developement and consulting</span></h2>
+    <div id="orange"></div>
+    <div id="logo"></div>
     </div>
     <div id="main">
 
@@ -298,7 +298,7 @@ be a human readable protocol, so why bother.</p>
 </div>
     </div>
     <div id="footer">
-    <span>Copyright &copy; 2005 Rasterbar Software.</span>
+    <span>Copyright &copy; 2005-2013 Rasterbar Software.</span>
     </div>
     </div>
     <script src="http://www.google-analytics.com/urchin.js" type="text/javascript">
diff --git a/docs/features.html b/docs/features.html
index f733f9eed..95d512c8d 100644
--- a/docs/features.html
+++ b/docs/features.html
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.10: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.11: http://docutils.sourceforge.net/" />
 <title>libtorrent manual</title>
 <meta name="author" content="Arvid Norberg, arvid&#64;rasterbar.com" />
 <link rel="stylesheet" type="text/css" href="../../css/base.css" />
@@ -37,8 +37,8 @@
     </ul>
     </div>
     <div id="header">
-    <h1><span>Rasterbar Software</span></h1>
-    <h2><span>Software developement and consulting</span></h2>
+    <div id="orange"></div>
+    <div id="logo"></div>
     </div>
     <div id="main">
 <h1 class="title">libtorrent manual</h1>
@@ -390,7 +390,7 @@ epoll on linux and kqueue on MacOS X and BSD.</p>
 </div>
     </div>
     <div id="footer">
-    <span>Copyright &copy; 2005 Rasterbar Software.</span>
+    <span>Copyright &copy; 2005-2013 Rasterbar Software.</span>
     </div>
     </div>
     <script src="http://www.google-analytics.com/urchin.js" type="text/javascript">
diff --git a/docs/gen_reference_doc.py b/docs/gen_reference_doc.py
index daafb34d6..267d42c15 100644
--- a/docs/gen_reference_doc.py
+++ b/docs/gen_reference_doc.py
@@ -293,6 +293,7 @@ def parse_enum(lno, lines, filename):
 		if verbose: print 'enum  %s' % lines[lno]
 		lno += 1
 
+	val = 0
 	while lno < len(lines):
 		l = lines[lno].strip()
 		lno += 1
@@ -318,10 +319,21 @@ def parse_enum(lno, lines, filename):
 		if len(l):
 			if verbose: print 'enumv %s' % lines[lno-1]
 			for v in l.split(','):
+				v = v.strip();
+				if v.startswith('//'): break
 				if v == '': continue
+				valstr = ''
+				try:
+					if '=' in v: val = int(v.split('=')[1].strip(), 0)
+					valstr = str(val)
+				except: pass
+
+				if '=' in v: v = v.split('=')[0].strip()
 				if is_visible(context):
-					values.append({'name': v.strip(), 'desc': context})
+					values.append({'name': v.strip(), 'desc': context, 'val': valstr})
+					if verbose: print 'enumv %s' % valstr
 				context = ''
+				val += 1
 		else:
 			if verbose: print '??    %s' % lines[lno-1]
 
@@ -674,27 +686,27 @@ for cat in categories:
 			print >>out, '%s' % f['desc']
 
 		for e in c['enums']:
-			if e['desc'] == '': continue
 			print >>out, '.. raw:: html\n'
 			print >>out, '\t<a name="%s"></a>' % e['name']
 			print >>out, ''
 			print >>out, heading('enum %s' % e['name'], '.')
-			width = [len('value'), len('description')]
+			width = [len('name'), len('value'), len('description')]
 			for v in e['values']:
 				width[0] = max(width[0], len(v['name']))
+				width[1] = max(width[1], len(v['val']))
 				for d in v['desc'].split('\n'):
-					width[1] = max(width[1], len(d))
+					width[2] = max(width[2], len(d))
 
-			print >>out, '+-' + ('-' * width[0]) + '-+-' + ('-' * width[1]) + '-+'
-			print >>out, '| ' + 'value'.ljust(width[0]) + ' | ' + 'description'.ljust(width[1]) + ' |'
-			print >>out, '+=' + ('=' * width[0]) + '=+=' + ('=' * width[1]) + '=+'
+			print >>out, '+-' + ('-' * width[0]) + '-+-' + ('-' * width[1]) + '-+-' + ('-' * width[2]) + '-+'
+			print >>out, '| ' + 'name'.ljust(width[0]) + ' | '  + 'value'.ljust(width[1]) + ' | ' + 'description'.ljust(width[2]) + ' |'
+			print >>out, '+=' + ('=' * width[0]) + '=+=' + ('=' * width[1]) + '=+=' + ('=' * width[2]) + '=+'
 			for v in e['values']:
 				d = v['desc'].split('\n')
 				if len(d) == 0: d = ['']
-				print >>out, '| ' + v['name'].ljust(width[0]) + ' | ' + d[0].ljust(width[1]) + ' |'
+				print >>out, '| ' + v['name'].ljust(width[0]) + ' | '  + v['val'].ljust(width[1]) + ' | ' + d[0].ljust(width[2]) + ' |'
 				for s in d[1:]:
-					print >>out, '| ' + (' ' * width[0]) + ' | ' + s.ljust(width[1]) + ' |'
-				print >>out, '+-' + ('-' * width[0]) + '-+-' + ('-' * width[1]) + '-+'
+					print >>out, '| ' + (' ' * width[0]) + ' | '  + (' ' * width[1]) + ' | ' + s.ljust(width[2]) + ' |'
+				print >>out, '+-' + ('-' * width[0]) + '-+-' + ('-' * width[1]) + '-+-' + ('-' * width[2]) + '-+'
 			print >>out, ''
 
 		for f in c['fields']:
@@ -733,26 +745,24 @@ for cat in categories:
 		print >>out, '.. raw:: html\n'
 		print >>out, '\t<a name="%s"></a>' % e['name']
 		print >>out, ''
-
 		print >>out, heading('enum %s' % e['name'], '.')
-		print_declared_in(out, e)
-
-		width = [len('value'), len('description')]
+		width = [len('name'), len('value'), len('description')]
 		for v in e['values']:
 			width[0] = max(width[0], len(v['name']))
+			width[1] = max(width[1], len(v['val']))
 			for d in v['desc'].split('\n'):
-				width[1] = max(width[1], len(d))
+				width[2] = max(width[2], len(d))
 
-		print >>out, '+-' + ('-' * width[0]) + '-+-' + ('-' * width[1]) + '-+'
-		print >>out, '| ' + 'value'.ljust(width[0]) + ' | ' + 'description'.ljust(width[1]) + ' |'
-		print >>out, '+=' + ('=' * width[0]) + '=+=' + ('=' * width[1]) + '=+'
+		print >>out, '+-' + ('-' * width[0]) + '-+-' + ('-' * width[1]) + '-+-' + ('-' * width[2]) + '-+'
+		print >>out, '| ' + 'name'.ljust(width[0]) + ' | '  + 'value'.ljust(width[1]) + ' | ' + 'description'.ljust(width[2]) + ' |'
+		print >>out, '+=' + ('=' * width[0]) + '=+=' + ('=' * width[1]) + '=+=' + ('=' * width[2]) + '=+'
 		for v in e['values']:
 			d = v['desc'].split('\n')
 			if len(d) == 0: d = ['']
-			print >>out, '| ' + v['name'].ljust(width[0]) + ' | ' + d[0].ljust(width[1]) + ' |'
+			print >>out, '| ' + v['name'].ljust(width[0]) + ' | '  + v['val'].ljust(width[1]) + ' | ' + d[0].ljust(width[2]) + ' |'
 			for s in d[1:]:
-				print >>out, '| ' + (' ' * width[0]) + ' | ' + s.ljust(width[1]) + ' |'
-			print >>out, '+-' + ('-' * width[0]) + '-+-' + ('-' * width[1]) + '-+'
+				print >>out, '| ' + (' ' * width[0]) + ' | '  + (' ' * width[1]) + ' | ' + s.ljust(width[2]) + ' |'
+			print >>out, '+-' + ('-' * width[0]) + '-+-' + ('-' * width[1]) + '-+-' + ('-' * width[2]) + '-+'
 		print >>out, ''
 
 	print >>out, dump_link_targets()
diff --git a/docs/index.html b/docs/index.html
index 10b2cb2f6..fcca5e826 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.10: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.11: http://docutils.sourceforge.net/" />
 <title></title>
 <link rel="stylesheet" type="text/css" href="../../css/base.css" />
 <link rel="stylesheet" type="text/css" href="../../css/rst.css" />
@@ -36,8 +36,8 @@
     </ul>
     </div>
     <div id="header">
-    <h1><span>Rasterbar Software</span></h1>
-    <h2><span>Software developement and consulting</span></h2>
+    <div id="orange"></div>
+    <div id="logo"></div>
     </div>
     <div id="main">
 
@@ -131,7 +131,7 @@ list or posted to the <a class="reference external" href="http://code.rasterbar.
 </div>
     </div>
     <div id="footer">
-    <span>Copyright &copy; 2005 Rasterbar Software.</span>
+    <span>Copyright &copy; 2005-2013 Rasterbar Software.</span>
     </div>
     </div>
     <script src="http://www.google-analytics.com/urchin.js" type="text/javascript">
diff --git a/docs/libtorrent_plugins.html b/docs/libtorrent_plugins.html
index b6ad8e58f..92769c0ad 100644
--- a/docs/libtorrent_plugins.html
+++ b/docs/libtorrent_plugins.html
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.10: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.11: http://docutils.sourceforge.net/" />
 <title></title>
 <meta name="author" content="Arvid Norberg, arvid&#64;rasterbar.com" />
 <link rel="stylesheet" type="text/css" href="../../css/base.css" />
@@ -37,8 +37,8 @@
     </ul>
     </div>
     <div id="header">
-    <h1><span>Rasterbar Software</span></h1>
-    <h2><span>Software developement and consulting</span></h2>
+    <div id="orange"></div>
+    <div id="logo"></div>
     </div>
     <div id="main">
 
@@ -381,7 +381,7 @@ your alert.</p>
 </div>
     </div>
     <div id="footer">
-    <span>Copyright &copy; 2005 Rasterbar Software.</span>
+    <span>Copyright &copy; 2005-2013 Rasterbar Software.</span>
     </div>
     </div>
     <script src="http://www.google-analytics.com/urchin.js" type="text/javascript">
diff --git a/docs/make_torrent.html b/docs/make_torrent.html
index c5cc0e6ed..98142feea 100644
--- a/docs/make_torrent.html
+++ b/docs/make_torrent.html
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.10: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.11: http://docutils.sourceforge.net/" />
 <title>creating torrents</title>
 <meta name="author" content="Arvid Norberg, arvid&#64;rasterbar.com" />
 <link rel="stylesheet" type="text/css" href="../../css/base.css" />
@@ -37,8 +37,8 @@
     </ul>
     </div>
     <div id="header">
-    <h1><span>Rasterbar Software</span></h1>
-    <h2><span>Software developement and consulting</span></h2>
+    <div id="orange"></div>
+    <div id="logo"></div>
     </div>
     <div id="main">
 <h1 class="title">creating torrents</h1>
@@ -595,7 +595,7 @@ tree will be saved in the resume data.</p>
 </div>
     </div>
     <div id="footer">
-    <span>Copyright &copy; 2005 Rasterbar Software.</span>
+    <span>Copyright &copy; 2005-2013 Rasterbar Software.</span>
     </div>
     </div>
     <script src="http://www.google-analytics.com/urchin.js" type="text/javascript">
diff --git a/docs/makefile b/docs/makefile
index dec82f352..4b30a6a0e 100644
--- a/docs/makefile
+++ b/docs/makefile
@@ -51,7 +51,7 @@ all: html
 todo.html:gen_todo.py ../src/*.cpp ../include/libtorrent/*.hpp
 	python gen_todo.py
 
-reference.rst reference-Plugins reference-Core.rst reference-String.rst reference-Storage.rst:gen_reference_doc.py ../include/libtorrent/*.hpp
+reference.rst reference-Create_Torrents.rst reference-Error_Codes.rst reference-Plugins.rst reference-Core.rst reference-String.rst reference-Storage.rst:gen_reference_doc.py ../include/libtorrent/*.hpp
 	python gen_reference_doc.py
 
 %.epub:%.rst
diff --git a/docs/projects.html b/docs/projects.html
index cb30515f7..5fa81309f 100644
--- a/docs/projects.html
+++ b/docs/projects.html
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.10: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.11: http://docutils.sourceforge.net/" />
 <title>projects using libtorrent</title>
 <link rel="stylesheet" type="text/css" href="../../css/base.css" />
 <link rel="stylesheet" type="text/css" href="../../css/rst.css" />
@@ -36,8 +36,8 @@
     </ul>
     </div>
     <div id="header">
-    <h1><span>Rasterbar Software</span></h1>
-    <h2><span>Software developement and consulting</span></h2>
+    <div id="orange"></div>
+    <div id="logo"></div>
     </div>
     <div id="main">
 <h1 class="title">projects using libtorrent</h1>
@@ -254,7 +254,7 @@ Written by Cory Nelson.</p>
 for Windows and Mac OSX.</p>
     </div>
     <div id="footer">
-    <span>Copyright &copy; 2005 Rasterbar Software.</span>
+    <span>Copyright &copy; 2005-2013 Rasterbar Software.</span>
     </div>
     </div>
     <script src="http://www.google-analytics.com/urchin.js" type="text/javascript">
diff --git a/docs/python_binding.html b/docs/python_binding.html
index f67883603..3d6370842 100644
--- a/docs/python_binding.html
+++ b/docs/python_binding.html
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.10: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.11: http://docutils.sourceforge.net/" />
 <title>libtorrent python binding</title>
 <meta name="author" content="Arvid Norberg, arvid&#64;rasterbar.com" />
 <link rel="stylesheet" type="text/css" href="../../css/base.css" />
@@ -37,8 +37,8 @@
     </ul>
     </div>
     <div id="header">
-    <h1><span>Rasterbar Software</span></h1>
-    <h2><span>Software developement and consulting</span></h2>
+    <div id="orange"></div>
+    <div id="logo"></div>
     </div>
     <div id="main">
 <h1 class="title">libtorrent python binding</h1>
@@ -174,7 +174,7 @@ while (not h.is_seed()):
 </div>
     </div>
     <div id="footer">
-    <span>Copyright &copy; 2005 Rasterbar Software.</span>
+    <span>Copyright &copy; 2005-2013 Rasterbar Software.</span>
     </div>
     </div>
     <script src="http://www.google-analytics.com/urchin.js" type="text/javascript">
diff --git a/docs/running_tests.html b/docs/running_tests.html
index 1d9c1cb04..1ebe173e3 100644
--- a/docs/running_tests.html
+++ b/docs/running_tests.html
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.10: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.11: http://docutils.sourceforge.net/" />
 <title>libtorrent manual</title>
 <meta name="author" content="Arvid Norberg, arvid&#64;rasterbar.com" />
 <link rel="stylesheet" type="text/css" href="../../css/base.css" />
@@ -37,8 +37,8 @@
     </ul>
     </div>
     <div id="header">
-    <h1><span>Rasterbar Software</span></h1>
-    <h2><span>Software developement and consulting</span></h2>
+    <div id="orange"></div>
+    <div id="logo"></div>
     </div>
     <div id="main">
 <h1 class="title">libtorrent manual</h1>
@@ -111,7 +111,7 @@ You can download it from <a class="reference external" href="http://www.openssl.
 </div>
     </div>
     <div id="footer">
-    <span>Copyright &copy; 2005 Rasterbar Software.</span>
+    <span>Copyright &copy; 2005-2013 Rasterbar Software.</span>
     </div>
     </div>
     <script src="http://www.google-analytics.com/urchin.js" type="text/javascript">
diff --git a/docs/style.css b/docs/style.css
index 023cb6e6c..aa325eb0a 100644
--- a/docs/style.css
+++ b/docs/style.css
@@ -9,7 +9,7 @@
 /* Base elements */
 
 * {margin: 0; padding: 0;}
-body, table { font: 1em Verdana, sans-serif;}
+body, table { font: 0.8em Verdana, sans-serif;}
 
 h1, h2, h3 {
     font: 1.5em Georgia "Times New Roman", serif;
@@ -77,7 +77,7 @@ div.section p, div.section ul, div.section dl {
 
 #container {
     text-align: left;
-    width: 70em;
+    width: 65em;
     margin: 0 auto;
     position: relative;
 }
@@ -118,26 +118,37 @@ div.section p, div.section ul, div.section dl {
 
 #header {
     height: 116px;
-    background: url(../img/orange.png) #FDA72A no-repeat top left;
+    background: url(../img/bg.png) #1f5c85;
+    -moz-border-radius: 6pt;
+    border-radius: 6pt;
 }
 
-#header h1 {
+#orange {
+    margin: 0;
+    padding: 0;
+    float: left;
+    width: 159px;
+    height: 116px;
+    background: url(../img/orange.png) no-repeat top left;
+}
+
+#logo {
     margin: 0;
     padding: 0;
     float: right;
-    width: 536px;
+    width: 535px;
     height: 116px;
     background: url(../img/logo.png);
 }
 
-#header h1 span, #header h2 { display: none; }
-
 #footer {
     clear: both;
     height: 49px;
-    background: #D3D3D3 url(../img/footer.png) no-repeat left top;
+    background: #D3D3D3;
     text-align: center;
     margin-bottom: 1em;
+    -moz-border-radius: 6pt;
+    border-radius: 6pt;
 }
 
 #footer span {
@@ -238,10 +249,6 @@ div.sidebar p.sidebar-title {
     margin: 0 0 0.5em 0;
 }
 
-h1 { font-size: 230%; }
-h2 { font-size: 180%; }
-h3 { font-size: 130%; }
-
 table { margin-bottom: 1em; border-collapse: collapse; }
 table, th, td { border: none; }
 
diff --git a/docs/template.txt b/docs/template.txt
index 7626cb5de..2b8824ede 100644
--- a/docs/template.txt
+++ b/docs/template.txt
@@ -29,8 +29,8 @@
     </ul>
     </div>
     <div id="header">
-    <h1><span>Rasterbar Software</span></h1>
-    <h2><span>Software developement and consulting</span></h2>
+    <div id="orange"></div>
+    <div id="logo"></div>
     </div>
     <div id="main">
 %(body_pre_docinfo)s
@@ -38,7 +38,7 @@
 %(body)s
     </div>
     <div id="footer">
-    <span>Copyright &copy; 2005 Rasterbar Software.</span>
+    <span>Copyright &copy; 2005-2013 Rasterbar Software.</span>
     </div>
     </div>
     <script src="http://www.google-analytics.com/urchin.js" type="text/javascript">
diff --git a/docs/tuning.html b/docs/tuning.html
index 500722d48..ea96bf8e0 100644
--- a/docs/tuning.html
+++ b/docs/tuning.html
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.10: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.11: http://docutils.sourceforge.net/" />
 <title>libtorrent manual</title>
 <meta name="author" content="Arvid Norberg, arvid&#64;rasterbar.com" />
 <link rel="stylesheet" type="text/css" href="../../css/base.css" />
@@ -37,8 +37,8 @@
     </ul>
     </div>
     <div id="header">
-    <h1><span>Rasterbar Software</span></h1>
-    <h2><span>Software developement and consulting</span></h2>
+    <div id="orange"></div>
+    <div id="logo"></div>
     </div>
     <div id="main">
 <h1 class="title">libtorrent manual</h1>
@@ -614,7 +614,7 @@ please let us know and we'll update this document.</p>
 </div>
     </div>
     <div id="footer">
-    <span>Copyright &copy; 2005 Rasterbar Software.</span>
+    <span>Copyright &copy; 2005-2013 Rasterbar Software.</span>
     </div>
     </div>
     <script src="http://www.google-analytics.com/urchin.js" type="text/javascript">
diff --git a/docs/udp_tracker_protocol.html b/docs/udp_tracker_protocol.html
index 272820173..580821bab 100644
--- a/docs/udp_tracker_protocol.html
+++ b/docs/udp_tracker_protocol.html
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.10: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.11: http://docutils.sourceforge.net/" />
 <title>Bittorrent udp-tracker protocol extension</title>
 <meta name="author" content="Arvid Norberg, arvid&#64;rasterbar.com" />
 <link rel="stylesheet" type="text/css" href="../../css/base.css" />
@@ -37,8 +37,8 @@
     </ul>
     </div>
     <div id="header">
-    <h1><span>Rasterbar Software</span></h1>
-    <h2><span>Software developement and consulting</span></h2>
+    <div id="orange"></div>
+    <div id="logo"></div>
     </div>
     <div id="main">
 <h1 class="title">Bittorrent udp-tracker protocol extension</h1>
@@ -574,7 +574,7 @@ arguments as extensions.</td>
 </div>
     </div>
     <div id="footer">
-    <span>Copyright &copy; 2005 Rasterbar Software.</span>
+    <span>Copyright &copy; 2005-2013 Rasterbar Software.</span>
     </div>
     </div>
     <script src="http://www.google-analytics.com/urchin.js" type="text/javascript">
diff --git a/docs/utp.html b/docs/utp.html
index 842d86a00..5e38ab9d3 100644
--- a/docs/utp.html
+++ b/docs/utp.html
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.10: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.11: http://docutils.sourceforge.net/" />
 <title>libtorrent manual</title>
 <meta name="author" content="Arvid Norberg, arvid&#64;rasterbar.com" />
 <link rel="stylesheet" type="text/css" href="../../css/base.css" />
@@ -37,8 +37,8 @@
     </ul>
     </div>
     <div id="header">
-    <h1><span>Rasterbar Software</span></h1>
-    <h2><span>Software developement and consulting</span></h2>
+    <div id="orange"></div>
+    <div id="logo"></div>
     </div>
     <div id="main">
 <h1 class="title">libtorrent manual</h1>
@@ -339,7 +339,7 @@ and socket buffers.</li>
 </div>
     </div>
     <div id="footer">
-    <span>Copyright &copy; 2005 Rasterbar Software.</span>
+    <span>Copyright &copy; 2005-2013 Rasterbar Software.</span>
     </div>
     </div>
     <script src="http://www.google-analytics.com/urchin.js" type="text/javascript">
diff --git a/include/libtorrent/disk_io_thread.hpp b/include/libtorrent/disk_io_thread.hpp
index 4d172eb2a..ccce2bb56 100644
--- a/include/libtorrent/disk_io_thread.hpp
+++ b/include/libtorrent/disk_io_thread.hpp
@@ -167,7 +167,7 @@ namespace libtorrent
 	// points to a disk buffer
 	bool operation_has_buffer(disk_io_job const& j);
 
-	struct cache_status
+	struct TORRENT_EXPORT cache_status
 	{
 		cache_status()
 			: blocks_written(0)
