Mention axTLS in some more documentation

diff --git a/docs/FEATURES b/docs/FEATURES
index 32589e1d32b2dfd04e09ea954a923248c8dfe058..63e4f676c13d388e7d7962c8a791b28d7a3091c2 100644 (file)
--- a/docs/FEATURES
+++ b/docs/FEATURES
@@ -125,7 +125,7 @@ FILE
 FOOTNOTES
 =========
 
-  *1 = requires OpenSSL, GnuTLS, NSS, yassl or PolarSSL
+  *1 = requires OpenSSL, GnuTLS, NSS, yassl, axTLS or PolarSSL
   *2 = requires OpenLDAP
   *3 = requires a GSSAPI-compliant library, such as Heimdal or similar.
   *4 = requires FBopenssl

diff --git a/docs/INTERNALS b/docs/INTERNALS
index 9d0bdbaa1b3097752daf10d9d99d14faae27e4d2..e667c330767220a79ddde9ea0254218a3a44ce15 100644 (file)
--- a/docs/INTERNALS
+++ b/docs/INTERNALS
@@ -44,6 +44,7 @@ Portability
  MIT krb5 lib 1.2.4
  qsossl       V5R2M0
  NSS          3.11.x
+ axTLS        1.2.7
  Heimdal      ?
 
  * = only partly functional, but that's due to bugs in the third party lib, not

diff --git a/docs/LICENSE-MIXING b/docs/LICENSE-MIXING
index 3db1a3d7f171d24fe6f9f656a2630b1a095dc89e..f596546da57cfd18b27f227f5cf846a648165306 100644 (file)
--- a/docs/LICENSE-MIXING
+++ b/docs/LICENSE-MIXING
@@ -55,6 +55,10 @@ NSS     http://www.mozilla.org/projects/security/pki/nss/
         grant you different permissions and impose different obligations. You
         should select the license that best meets your needs.
 
+axTLS   http://axtls.sourceforge.net/
+
+        (May be used for SSL/TLS support) Uses a Modified BSD-style license.
+
 c-ares  http://daniel.haxx.se/projects/c-ares/license.html
 
         (Used for asynchronous name resolves) Uses an MIT license that is very

diff --git a/docs/libcurl/libcurl-tutorial.3 b/docs/libcurl/libcurl-tutorial.3
index 72f002963a3a3b372defb897e7e2d7076c0bfefa..1efd6fbb3227ecb631600178af133bf01b7a7964 100644 (file)
--- a/docs/libcurl/libcurl-tutorial.3
+++ b/docs/libcurl/libcurl-tutorial.3
@@ -283,6 +283,10 @@ yassl
 
  Required actions unknown.
 
+axTLS
+
+ Required actions unknown.
+
 When using multiple threads you should set the CURLOPT_NOSIGNAL option to 1
 for all handles. Everything will or might work fine except that timeouts are
 not honored during the DNS lookup - which you can work around by building

diff --git a/tests/FILEFORMAT b/tests/FILEFORMAT
index 05d622f333b6321654f6e729c7a6079c001a7e4a..74fecacdd6626d2446fa78dd35519d9b0d9ac04e 100644 (file)
--- a/tests/FILEFORMAT
+++ b/tests/FILEFORMAT
@@ -168,6 +168,7 @@ A list of features that MUST be present in the client/library for this test to
 be able to run (if these features are not present, the test will be
 SKIPPED). Features testable here are:
 
+axTLS
 crypto
 getrlimit
 GnuTLS