merge documentation update to github from RC_1_0

This commit is contained in:
arvidn 2015-06-20 00:13:38 -04:00
parent 1450a692e4
commit 900330992e
3 changed files with 6 additions and 5 deletions

View File

@ -19,7 +19,7 @@
* `mailing list`_ (archive_)
* `who's using libtorrent?`_
* `report bugs`_
* `sourceforge page`_
* `github page`_
* `blog`_
--------
@ -82,7 +82,7 @@ libtorrent
.. _archive: http://dir.gmane.org/gmane.network.bit-torrent.libtorrent
.. _`who's using libtorrent?`: projects.html
.. _`report bugs`: http://code.google.com/p/libtorrent/issues/entry
.. _sourceforge page: http://sourceforge.net/projects/libtorrent
.. _`github page`: http:/github.com/arvidn/libtorrent
.. _blog: http://blog.libtorrent.org
.. _`ruby bindings`: http://libtorrent-ruby.rubyforge.org/
@ -142,7 +142,7 @@ It is however greatly appreciated if additional features are contributed
back to the open source project. Patches can be emailed to the mailing
list or posted to the `bug tracker`_.
.. _`bug tracker`: https://code.google.com/p/libtorrent/issues/list
.. _`bug tracker`: https://github.com/arvidn/libtorrent/issues
Acknowledgements
================

View File

@ -862,6 +862,7 @@ See <a class="reference external" href="reference-Settings.html#dht_settings">dh
<p><tt class="docutils literal">is_dht_running()</tt> returns true if the DHT support has been started
and false
otherwise.</p>
<p><tt class="docutils literal">get_dht_settings()</tt> returns the current settings</p>
<a name="add_dht_router()"></a>
<a name="add_dht_node()"></a></div>
<div class="section" id="add-dht-router-add-dht-node">

View File

@ -104,7 +104,7 @@ std::string demangle(char const* name)
#include "dbghelp.h"
std::string demangle(char const* name)
{
{
char demangled_name[256];
if (UnDecorateSymbolName(name, demangled_name, sizeof(demangled_name), UNDNAME_NO_THROW_SIGNATURES) == 0)
demangled_name[0] = 0;
@ -255,7 +255,7 @@ TORRENT_NO_RETURN TORRENT_EXPORT void assert_fail(char const* expr, int line
print_backtrace(stack, sizeof(stack), 0);
char const* message = "assertion failed. Please file a bugreport at "
"http://code.google.com/p/libtorrent/issues\n"
"https://github.com/arvidn/libtorrent/issues\n"
"Please include the following information:\n\n"
"version: " LIBTORRENT_VERSION "\n"
LIBTORRENT_REVISION "\n";