From 99cd0c7a08948b6ea01d0a174d82b36ff8810b87 Mon Sep 17 00:00:00 2001 From: Arvid Norberg Date: Tue, 14 Oct 2014 16:36:06 +0000 Subject: [PATCH] merged changes from RC_1_0 --- Makefile.am | 2 - docs/base.css | 136 --------------------------------- docs/building.html | 46 +++++++++-- docs/client_test.html | 46 +++++++++-- docs/contributing.html | 46 +++++++++-- docs/dht_extensions.html | 46 +++++++++-- docs/dht_rss.html | 46 +++++++++-- docs/dht_sec.html | 46 +++++++++-- docs/dht_store.html | 46 +++++++++-- docs/examples.html | 46 +++++++++-- docs/extension_protocol.html | 46 +++++++++-- docs/features.html | 46 +++++++++-- docs/img/logo.png | Bin 12163 -> 0 bytes docs/index.html | 58 ++++++++++++-- docs/index.rst | 3 + docs/projects.html | 46 +++++++++-- docs/python_binding.html | 46 +++++++++-- docs/reference-Session.html | 46 +++++++++-- docs/style.css | 116 +++++++++++++++------------- docs/template.txt | 44 +++++++++-- docs/template2.txt | 41 +++++++++- docs/troubleshooting.html | 46 +++++++++-- docs/tuning.html | 46 +++++++++-- docs/udp_tracker_protocol.html | 46 +++++++++-- docs/utp.html | 46 +++++++++-- src/session_impl.cpp | 2 +- 26 files changed, 872 insertions(+), 312 deletions(-) delete mode 100644 docs/base.css delete mode 100644 docs/img/logo.png diff --git a/Makefile.am b/Makefile.am index 655b8e177..8838834d3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -42,13 +42,11 @@ DOCS_IMAGES = \ docs/utp_stack.diagram \ docs/utp_stack.png \ docs/style.css \ - docs/base.css \ docs/rst.css \ docs/img/bg.png \ docs/img/blue_bottom.png \ docs/img/blue_top.png \ docs/img/dotline.gif \ - docs/img/logo.png \ docs/img/minus.gif \ docs/img/orange.png diff --git a/docs/base.css b/docs/base.css deleted file mode 100644 index 0baf4fe7b..000000000 --- a/docs/base.css +++ /dev/null @@ -1,136 +0,0 @@ -/* Page template */ - -html>body { font-size: 13px; } -body { text-align: center; } - -#container { - text-align: left; - width: 700px; - margin: 0 auto; - position: relative; -} - -#headerNav { -} - -#headerNav ul { - margin: 2px; - list-style: none; - font-family: Tahoma; - text-align: right; - text-transform: uppercase; - line-height: 1em; -} - -#headerNav ul li { - display: inline; - border-left: solid 1px #ccc; - padding-left: 10px; - padding-right: 10px; - margin: 0; - font-size: 80%; -} - -#headerNav ul li.first { - border: 0; -} - -#headerNav ul li a { - border: none; - color: #666; -} - -#headerNav ul li a:hover { - background: #eee; -} - -#header { - height: 116px; - width: 695px; - background: url('img/orange.png') #FDA72A no-repeat top left; -} - -#header h1 { - margin: 0; - padding: 0; - float: right; - width: 536px; - height: 116px; - background: url('img/logo.png'); -} - -#header h1 span, #header h2 { display: none; } - -#footer { - clear: both; - width: 695px; - height: 49px; - background: #D3D3D3 url('img/footer.png') no-repeat left top; - text-align: center; - margin-bottom: 1em; -} - -#footer span { - line-height: 49px; - font-size: 88%; - text-align: center; - color: #777; - display: block; -} - -#main { - font-family: Verdana; - line-height: 1.25em; - text-align: left; - margin-top: 10px; -} - -/* Base elements */ - -* {margin: 0; padding: 0;} -body { font: 0.8125em Verdana, sans-serif;} - -h1, h2, h3 { - font: 1.5em Georgia "Times New Roman", serif; - letter-spacing: 1px; - padding-bottom: 0.5em; -} - -h1 { font-size: 180%; } -h2 { font-size: 130%; } -h3 { font-size: 100%; } - -p { - font-size: 92%; - line-height: 1.7em; -} - -a { - text-decoration: none; - color: #8D370A; - border-bottom: dotted 1px #8D370A; -} - -a:hover { - border-bottom: solid 1px #8D370A; - background: #eee; -} - -#librarySidebar { - float: left; - width: 150px; -} - -#libraryBody { - border-left: solid 1px #eee; - padding-left: 10px; - margin-left: 158px; - margin-right: 10px; -} - -ul, ol { line-height: 1.8em; } -ul { list-style: square; } -li { margin-left: 2.8em; font-size: 92%; } - -p, ul, ol, img {margin-bottom: 1em;} - diff --git a/docs/building.html b/docs/building.html index ecb33b8a8..9a513b1ff 100644 --- a/docs/building.html +++ b/docs/building.html @@ -3,10 +3,9 @@ - + libtorrent manual - @@ -37,10 +40,40 @@ %(docinfo)s %(body)s + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
homebloguTP
downloaddocumentationDHT put extension
python bindingsfeaturesDHT security extension
mailing list archivecontributingstreaming
report a bugbuildingbittorrent slides
+
+