aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlloyd <[email protected]>2012-06-28 23:08:37 +0000
committerlloyd <[email protected]>2012-06-28 23:08:37 +0000
commitb3668459ec6761de4c8d30dd213d8e6d103d370c (patch)
treeb3a129d9a0c8393e4ed71c55bc50310e2e05fbf6
parentadaa36d91ee8888d6d5dd75d6c26c5ceb74c1735 (diff)
Clarify availability of the amalgamation build
-rw-r--r--doc/faq.txt6
1 files changed, 4 insertions, 2 deletions
diff --git a/doc/faq.txt b/doc/faq.txt
index 0101f0cca..5c74e79f1 100644
--- a/doc/faq.txt
+++ b/doc/faq.txt
@@ -35,13 +35,15 @@ development releases are the obvious choice.
If you want to ship a binary that is usable out of the box on a Linux
distro that ships botan, you'll probably want to match versions with
-that distro; as of this writing most ship with 1.8.
+that distro; as of this writing most ship with 1.8 though some are
+moving to 1.10.
If you're building an application that will embed botan into it
(without relying on a shared library), you want to use an amalgamation
build, which basically turns botan into a single header and a single
source file which you can easily include in your existing application
-build. In this case you can pick which ever tree you prefer.
+build. This feature is available in all versions of 1.10 and all later
+branches.
The self-test program can't locate the library
-----------------------------------------------