From b759982cf65c1be430a7e310e5c26ac89895c55c Mon Sep 17 00:00:00 2001
From: Arvid Norberg <arvid@libtorrent.org>
Date: Thu, 25 Jul 2013 05:08:35 +0000
Subject: [PATCH] more documentation polishing

---
 docs/gen_reference_doc.py      |  7 ++++---
 docs/makefile                  |  3 ++-
 include/libtorrent/peer_id.hpp | 10 +++++-----
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/docs/gen_reference_doc.py b/docs/gen_reference_doc.py
index b223e060a..133d55ca4 100644
--- a/docs/gen_reference_doc.py
+++ b/docs/gen_reference_doc.py
@@ -57,6 +57,7 @@ category_mapping = {
 	'peer_id.hpp': 'Utility',
 	'identify_client.hpp': 'Utility',
 	'thread.hpp': 'Utility',
+	'ip_filter.hpp': 'Filter',
 }
 
 def categorize_symbol(name, filename):
@@ -530,7 +531,7 @@ for c in classes:
 		categories[cat]['overview'] = overviews[c['file']]
 
 	categories[cat]['classes'].append(c)
-	symbols[c['name']] = categories[cat]['filename'].replace('.rst', '.html') + '#' + html_sanitize(c['name'])
+	symbols[c['name']] = categories[cat]['filename'].replace('.rst', '.html') + '#' + c['name']
 
 for f in functions:
 	cat = categorize_symbol(first_item(f['names']), f['file'])
@@ -541,7 +542,7 @@ for f in functions:
 		categories[cat]['overview'] = overviews[f['file']]
 
 	for n in f['names']:
-		symbols[n] = categories[cat]['filename'].replace('.rst', '.html') + '#' + html_sanitize(n)
+		symbols[n] = categories[cat]['filename'].replace('.rst', '.html') + '#' + n
 	categories[cat]['functions'].append(f)
 
 for e in enums:
@@ -549,7 +550,7 @@ for e in enums:
 	if not cat in categories:
 		categories[cat] = { 'classes': [], 'functions': [], 'enums': [], 'filename': 'reference-%s.rst' % cat.replace(' ', '_')}
 	categories[cat]['enums'].append(e)
-	symbols[e['name']] = categories[cat]['filename'].replace('.rst', '.html') + '#' + html_sanitize(e['name'])
+	symbols[e['name']] = categories[cat]['filename'].replace('.rst', '.html') + '#' + e['name']
 
 def print_declared_in(out, o):
 	out.write('Declared in "%s"\n\n' % print_link(o['file'], '../include/%s' % o['file']))
diff --git a/docs/makefile b/docs/makefile
index ca6f26b75..b54dccd24 100644
--- a/docs/makefile
+++ b/docs/makefile
@@ -34,7 +34,8 @@ TARGETS = index \
 	reference-Utility \
 	reference-Bencoding \
 	reference-Alerts \
-	reference-RSS
+	reference-RSS \
+	reference-Filter
 
 FIGURES = read_disk_buffers write_disk_buffers troubleshooting
 
diff --git a/include/libtorrent/peer_id.hpp b/include/libtorrent/peer_id.hpp
index 670ad97f4..afd86fc54 100644
--- a/include/libtorrent/peer_id.hpp
+++ b/include/libtorrent/peer_id.hpp
@@ -195,35 +195,35 @@ namespace libtorrent
 			return ret;
 		}
 		
-		big_number operator^ (big_number const& n) const
+		big_number operator^(big_number const& n) const
 		{
 			big_number ret = *this;
 			ret ^= n;
 			return ret;
 		}
 
-		big_number operator& (big_number const& n) const
+		big_number operator&(big_number const& n) const
 		{
 			big_number ret = *this;
 			ret &= n;
 			return ret;
 		}
 
-		big_number& operator &= (big_number const& n)
+		big_number& operator&=(big_number const& n)
 		{
 			for (int i = 0; i< number_size; ++i)
 				m_number[i] &= n.m_number[i];
 			return *this;
 		}
 
-		big_number& operator |= (big_number const& n)
+		big_number& operator|=(big_number const& n)
 		{
 			for (int i = 0; i< number_size; ++i)
 				m_number[i] |= n.m_number[i];
 			return *this;
 		}
 
-		big_number& operator ^= (big_number const& n)
+		big_number& operator^=(big_number const& n)
 		{
 			for (int i = 0; i< number_size; ++i)
 				m_number[i] ^= n.m_number[i];