propagate from branch 'net.randombit.botan' (head b49cf847fb6f62734b53874469be895ba89a8b17)

            to branch 'net.randombit.botan.cxx11' (head 64b6daff56452594958eed3805a9639db94bd333)

4 files changed, 29 insertions, 26 deletions

diff --git a/configure.py b/configure.py
index dea64eca2..7e13424a5 100755
--- a/configure.py
+++ b/configure.py
@@ -1602,6 +1602,9 @@ def main(argv = None):
     if argv is None:
         argv = sys.argv
 
+    logging.basicConfig(stream = sys.stdout,
+                        format = '%(levelname) 7s: %(message)s')
+
     options = process_command_line(argv[1:])
 
     def log_level():
@@ -1611,9 +1614,7 @@ def main(argv = None):
             return logging.WARNING
         return logging.INFO
 
-    logging.basicConfig(stream = sys.stdout,
-                        format = '%(levelname) 7s: %(message)s',
-                        level = log_level())
+    logging.getLogger().setLevel(log_level())
 
     logging.debug('%s invoked with options "%s"' % (
         argv[0], ' '.join(argv[1:])))
diff --git a/doc/contents.txt b/doc/contents.txt
index 633625e14..16060e82a 100644
--- a/doc/contents.txt
+++ b/doc/contents.txt
@@ -6,6 +6,7 @@ Contents
    :maxdepth: 2
 
    index
+   reading
    building
    firststep
    filters
@@ -24,6 +25,7 @@ Contents
 .. toctree::
    :hidden:
 
+   log
    license
    credits
    faq
@@ -32,7 +34,6 @@ Contents
    download
    pgpkey
    algos
-   log
    build_log
 
 Indices and tables
diff --git a/doc/index.txt b/doc/index.txt
index b8d33602d..f2f54e557 100644
--- a/doc/index.txt
+++ b/doc/index.txt
@@ -66,25 +66,3 @@ be a bug, please file a ticket in `Bugzilla
 A useful reference while reading this manual is the `Doxygen
 documentation <http://botan.randombit.net/doxygen>`_.
 
-Recommended Reading
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-It's a very good idea if you have some knowledge of cryptography
-*before* trying to use the library. This is an area where it is very
-easy to make mistakes, and where things are often subtle and/or
-counterintuitive. Obviously the library tries to provide things at a
-high level precisely to minimize the number of ways things can go
-wrong, but naive use will almost certainly not result in a secure
-system.
-
-Especially recommended are:
-
-- *Cryptography Engineering*
-  Niels Ferguson, Bruce Schneier, and Tadayoshi Kohno
-
-- *Security Engineering -- A Guide to Building Dependable Distributed Systems*
-  Ross Anderson
-
-- *Handbook of Applied Cryptography*
-  Alfred J. Menezes, Paul C. Van Oorschot, and Scott A. Vanstone
-  (`available online <http://www.cacr.math.uwaterloo.ca/hac/>`_)
diff --git a/doc/reading.txt b/doc/reading.txt
new file mode 100644
index 000000000..a0e547296
--- /dev/null
+++ b/doc/reading.txt
@@ -0,0 +1,23 @@
+
+Recommended Reading
+========================================
+
+It's a very good idea if you have some knowledge of cryptography
+*before* trying to use the library. This is an area where it is very
+easy to make mistakes, and where things are often subtle and/or
+counterintuitive. Obviously the library tries to provide things at a
+high level precisely to minimize the number of ways things can go
+wrong, but naive use will almost certainly not result in a secure
+system.
+
+Especially recommended are:
+
+- *Cryptography Engineering*
+  Niels Ferguson, Bruce Schneier, and Tadayoshi Kohno
+
+- *Security Engineering -- A Guide to Building Dependable Distributed Systems*
+  Ross Anderson
+
+- *Handbook of Applied Cryptography*
+  Alfred J. Menezes, Paul C. Van Oorschot, and Scott A. Vanstone
+  (`available online <http://www.cacr.math.uwaterloo.ca/hac/>`_)