Index: docs/FAQ
===================================================================
RCS file: /cvsroot/curl/curl/docs/FAQ,v
retrieving revision 1.110
diff -u -r1.110 FAQ
--- docs/FAQ	16 Jan 2006 22:14:38 -0000	1.110
+++ docs/FAQ	25 Jan 2007 15:56:40 -0000
@@ -355,10 +355,10 @@
 
   2.2 Does curl work/build with other SSL libraries?
 
-  Curl has been written to use OpenSSL or GnuTLS, although there should not be
-  many problems using a different library. If anyone does "port" curl to use a
-  different SSL library, we are of course very interested in getting the
-  patch!
+  Curl has been written to use OpenSSL, GnuTLS or NSS, although there should
+  not be many problems using a different library. If anyone does "port" curl
+  to use a different SSL library, we are of course very interested in getting
+  the patch!
 
   2.3 Where can I find a copy of LIBEAY32.DLL?
 
@@ -839,6 +839,8 @@
 
     http://www.gnu.org/software/gnutls/manual/html_node/Multi_002dthreaded-applications.html
 
+  No special locking is needed with a NSS-powered libcurl. NSS is thread-safe.
+
   5.2 How can I receive all data into a large memory chunk?
 
   [ See also the examples/getinmemory.c source ]
Index: docs/FEATURES
===================================================================
RCS file: /cvsroot/curl/curl/docs/FEATURES,v
retrieving revision 1.19
diff -u -r1.19 FEATURES
--- docs/FEATURES	12 Oct 2006 08:55:01 -0000	1.19
+++ docs/FEATURES	25 Jan 2007 15:56:40 -0000
@@ -116,10 +116,10 @@
 FOOTNOTES
 =========
 
-  *1 = requires OpenSSL or GnuTLS
+  *1 = requires OpenSSL, GnuTLS or NSS
   *2 = requires OpenLDAP
   *3 = requires a GSSAPI-compliant library, such as Heimdal or similar.
   *4 = requires FBopenssl
   *5 = requires a krb4 library, such as the MIT one or similar.
   *6 = requires c-ares
-  *7 = requires OpenSSL specificly, as GnuTLS only supports SSLv3 and TLSv1
+  *7 = requires OpenSSL or NSS, as GnuTLS only supports SSLv3 and TLSv1
Index: docs/INSTALL
===================================================================
RCS file: /cvsroot/curl/curl/docs/INSTALL,v
retrieving revision 1.69
diff -u -r1.69 INSTALL
--- docs/INSTALL	16 Aug 2006 18:48:27 -0000	1.69
+++ docs/INSTALL	25 Jan 2007 15:56:40 -0000
@@ -140,6 +140,9 @@
      yassl with its OpenSSL emulation enabled and point to that directory root
      with configure --with-ssl.
 
+     To build with NSS support instead of OpenSSL for SSL/TLS, note that
+     you need to use both --without-ssl and --with-nss.
+
 
 Win32
 =====
Index: docs/LICENSE-MIXING
===================================================================
RCS file: /cvsroot/curl/curl/docs/LICENSE-MIXING,v
retrieving revision 1.7
diff -u -r1.7 LICENSE-MIXING
--- docs/LICENSE-MIXING	7 Jul 2006 20:48:51 -0000	1.7
+++ docs/LICENSE-MIXING	25 Jan 2007 15:56:41 -0000
@@ -47,6 +47,14 @@
         (May be used for SSL/TLS support) Uses the GPL[1] license. If this is
         a problem for you, consider using OpenSSL or GnuTLS instead.
 
+NSS     http://www.mozilla.org/projects/security/pki/nss/
+
+        (May be used for SSL/TLS support) Is covered by the MPL[4] license,
+        the GPL[1] license and the LGPL[3] license. You may choose to license
+        the code under MPL terms, GPL terms, or LGPL terms. These licenses
+        grant you different permissions and impose different obligations. You
+        should select the license that best meets your needs.
+
 c-ares  http://daniel.haxx.se/projects/c-ares/license.html
 
         (Used for asynchronous name resolves) Uses an MIT license that is very
@@ -110,3 +118,5 @@
       how to write such an exception to the GPL
 [3] = LGPL - GNU Lesser General Public License:
       http://www.gnu.org/licenses/lgpl.html
+[4] = MPL - Mozilla Public License:
+      http://www.mozilla.org/MPL/
Index: docs/TODO
===================================================================
RCS file: /cvsroot/curl/curl/docs/TODO,v
retrieving revision 1.130
diff -u -r1.130 TODO
--- docs/TODO	3 Nov 2006 12:22:13 -0000	1.130
+++ docs/TODO	25 Jan 2007 15:56:41 -0000
@@ -160,19 +160,17 @@
    it be? There's so much that could be done if it were! (brought by Chris
    Clark)
 
- * Make curl's SSL layer capable of using other free SSL libraries.  Such as
-   Mozilla Security Services
-   (http://www.mozilla.org/projects/security/pki/nss/), MatrixSSL
-   (http://www.matrixssl.org/) or yaSSL (http://yassl.com/). At least the
-   latter two could be alternatives for those looking to reduce the footprint
-   of libcurl built with OpenSSL or GnuTLS.
+ * Make curl's SSL layer capable of using other free SSL libraries.  Such
+   as  MatrixSSL (http://www.matrixssl.org/) or yaSSL (http://yassl.com/).
+   These could be alternatives for those looking to reduce the footprint of
+   libcurl built with OpenSSL or GnuTLS.
 
  * Peter Sylvester's patch for SRP on the TLS layer.
    Awaits OpenSSL support for this, no need to support this in libcurl before
    there's an OpenSSL release that does it.
 
  * make the configure --with-ssl option first check for OpenSSL and then for
-   GnuTLS if OpenSSL wasn't detected.
+   GnuTLS and finally for NSS if OpenSSL wasn't detected.
 
  GnuTLS