4 files changed, 28 insertions, 22 deletions
diff --git a/doc/website/contents.rst b/doc/website/contents.rst
index 2e7214577..c9f9477b2 100644
--- a/doc/website/contents.rst
+++ b/doc/website/contents.rst
@@ -5,13 +5,14 @@ Contents
 .. toctree::
 
    index
-   license
    faq
-   manual
    download
    vcs
+   license
+   manual
    pgpkey
    credits
    users
    algos
    relnotes/contents
+
diff --git a/doc/website/download.rst b/doc/website/download.rst
index 14531fbcb..befce2a84 100644
--- a/doc/website/download.rst
+++ b/doc/website/download.rst
@@ -1,5 +1,5 @@
 
-Getting The Latest Sources
+Download
 ========================================
 
 All releases are signed with a :doc:`PGP key <pgpkey>`.
@@ -43,3 +43,23 @@ The latest stable branch release is :doc:`relnotes/1_10_7`:
   and
   :installer_x86_64:`1.10.5` (:installer_sig_x86_64:`sig <1.10.5>`)
   are also available.
+
+From Your Favorite Distribution
+----------------------------------------
+
+Botan is already included in many package distributions,
+including `Fedora <https://admin.fedoraproject.org/pkgdb/acls/name/botan>`_,
+`EPEL <http://dl.fedoraproject.org/pub/epel/6/SRPMS/repoview/botan.html>`_ (for RHEL/CentOS),
+`Debian <http://packages.debian.org/search?keywords=libbotan>`_,
+`Ubuntu <http://packages.ubuntu.com/search?keywords=botan>`_,
+`Gentoo <http://packages.gentoo.org/package/botan>`_,
+`Arch <http://www.archlinux.org/packages/community/x86_64/botan/>`_,
+`Slackbuild <http://slackbuilds.org/result/?search=Botan>`_,
+`FreeBSD <http://www.freshports.org/security/botan110>`_,
+`NetBSD <ftp://ftp.netbsd.org/pub/pkgsrc/current/pkgsrc/security/botan/README.html>`_,
+`Cygwin <http://cygwin.com/packages/x86/botan/>`_,
+`MacPorts <http://www.macports.org/ports.php?by=name&substr=botan>`_,
+`OpenPKG <http://www.openpkg.org/product/packages/?package=botan>`_, and
+`T2 SDE <http://www.t2-project.org/packages/botan.html>`_
+though in some cases the included version lags behind the latest
+release.
diff --git a/doc/website/faq.rst b/doc/website/faq.rst
index 5cd66cabe..b59595521 100644
--- a/doc/website/faq.rst
+++ b/doc/website/faq.rst
@@ -117,6 +117,9 @@ operation, include "thread_safe" in the string you pass to
 working mutex implementation cannot be found, LibraryInitializer will
 throw an exception rather than continue operating in a bad state.
 
+In 1.11.0 and later, the C++11 std thread library is used and the
+library always serializes access.
+
 How do I load this key generated by OpenSSL into botan?
 --------------------------------------------------------
 
@@ -220,24 +223,6 @@ There is currently no support for OpenPGP, CMS, OTR, or SSHv2 servers.
 Will it work on my platform XYZ??
 ----------------------------------------
 
-It runs on most common operating systems and can be used with a number
-of different commercial and open source compilers, and is already
-included in most major package distributions, including
-\
-`Fedora <https://admin.fedoraproject.org/pkgdb/acls/name/botan>`_,
-`EPEL <http://dl.fedoraproject.org/pub/epel/6/SRPMS/repoview/botan.html>`_ (for RHEL/CentOS),
-`Debian <http://packages.debian.org/search?keywords=libbotan>`_,
-`Ubuntu <http://packages.ubuntu.com/search?keywords=botan>`_,
-`Gentoo <http://packages.gentoo.org/package/botan>`_,
-`Arch Linux <http://www.archlinux.org/packages/extra/x86_64/botan/>`_,
-`Slackbuild <http://slackbuilds.org/result/?search=Botan>`_,
-`FreeBSD <http://www.freshports.org/security/botan>`_,
-`NetBSD <ftp://ftp.netbsd.org/pub/pkgsrc/current/pkgsrc/security/botan/README.html>`_,
-`Cygwin <http://cygwin.com/packages/botan/>`_,
-`MacPorts <http://www.macports.org/ports.php?by=name&substr=botan>`_,
-`OpenPKG <http://www.openpkg.org/product/packages/?package=botan>`_, and
-`T2 SDE <http://www.t2-project.org/packages/botan.html>`_
-
 The most common stumbling block is a compiler that is buggy or can't
 handle modern C++ (specifically, C++98). Most any recent release of
 GCC, Clang, Intel C++, Visual C++, etc are all fine. It is tested most
diff --git a/doc/website/pgpkey.rst b/doc/website/pgpkey.rst
index ef8827835..1f0e83a44 100644
--- a/doc/website/pgpkey.rst
+++ b/doc/website/pgpkey.rst
@@ -1,5 +1,5 @@
 
-PGP Code Signing Key
+Code Signing Key
 ========================================
 
 .. highlight:: none