From 09b7c878141e8bbedf90f694165114b68520c3b1 Mon Sep 17 00:00:00 2001
From: Arvid Norberg <arvid@libtorrent.org>
Date: Tue, 5 Aug 2014 03:28:06 +0000
Subject: [PATCH] merged changes from RC_1_0

---
 docs/features.html | 16 +++-------------
 docs/features.rst  | 20 +++-----------------
 2 files changed, 6 insertions(+), 30 deletions(-)

diff --git a/docs/features.html b/docs/features.html
index b27595afe..c8bc0b6d9 100644
--- a/docs/features.html
+++ b/docs/features.html
@@ -372,24 +372,14 @@ it is fully functional.</p>
 <p>libtorrent runs on most major operating systems, including Windows,
 MacOS X, Linux, BSD and Solaris.
 It uses Boost.Thread, Boost.Filesystem, Boost.Date_time and various other
-boost libraries as well as <a class="reference external" href="http://www.zlib.org">zlib</a> (shipped) and <a class="reference external" href="http://asio.sf.net">asio</a> (shipped). At least version
-1.34.1 of boost is required.</p>
+boost libraries. At least version 1.46.1 of boost is required.</p>
 <p>libtorrent uses asio, hence it will take full advantage of high performance
 network APIs on the most popular platforms. I/O completion ports on windows,
 epoll on linux and kqueue on MacOS X and BSD.</p>
-<p>libtorrent has been successfully compiled and tested on:</p>
-<ul class="simple">
-<li>Windows 2000, XP and Vista vc7.1, vc8</li>
-<li>Linux x86 GCC 3.3, GCC 3.4.2, 4.x</li>
-<li>Linux PPC GCC 4.1.1</li>
-<li>MacOS X (darwin), (Apple's) GCC 3.3, (Apple's) GCC 4.0</li>
-<li>SunOS 5.8 GCC 3.1 and Sunpro</li>
-<li>Cygwin GCC 3.3.3</li>
-</ul>
-<p>Fails on:</p>
+<p>libtorrent does not build with the following compilers:</p>
 <ul class="simple">
 <li>GCC 2.95.4</li>
-<li>msvc6</li>
+<li>Visual Studio 6, 7.0, 7.1</li>
 </ul>
 </div>
 </div>
diff --git a/docs/features.rst b/docs/features.rst
index 711c616e1..2aaf6a3f6 100644
--- a/docs/features.rst
+++ b/docs/features.rst
@@ -380,28 +380,14 @@ portability
 libtorrent runs on most major operating systems, including Windows,
 MacOS X, Linux, BSD and Solaris.
 It uses Boost.Thread, Boost.Filesystem, Boost.Date_time and various other
-boost libraries as well as zlib_ (shipped) and asio_ (shipped). At least version
-1.34.1 of boost is required.
-
-.. _zlib: http://www.zlib.org
-.. _asio: http://asio.sf.net
+boost libraries. At least version 1.46.1 of boost is required.
 
 libtorrent uses asio, hence it will take full advantage of high performance
 network APIs on the most popular platforms. I/O completion ports on windows,
 epoll on linux and kqueue on MacOS X and BSD.
 
-libtorrent has been successfully compiled and tested on:
-
-* Windows 2000, XP and Vista vc7.1, vc8
-* Linux x86 GCC 3.3, GCC 3.4.2, 4.x
-* Linux PPC GCC 4.1.1
-* MacOS X (darwin), (Apple's) GCC 3.3, (Apple's) GCC 4.0
-* SunOS 5.8 GCC 3.1 and Sunpro
-* Cygwin GCC 3.3.3
-
-Fails on:
+libtorrent does not build with the following compilers:
 
 * GCC 2.95.4
-* msvc6
-
+* Visual Studio 6, 7.0, 7.1