From 338b64137093f366aaeec40f4058a2b493e6c8f1 Mon Sep 17 00:00:00 2001
From: Steve Holme <steve_holme@hotmail.com>
Date: Thu, 6 Nov 2014 23:47:18 +0000
Subject: [PATCH] docs: Updated following the addition of SSPI based HTTP
 digest auth

---
 docs/ROADMAP.md                  | 16 +++++++---------
 docs/TODO                        |  7 -------
 docs/curl.1                      |  2 +-
 docs/libcurl/curl_version_info.3 |  2 +-
 4 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/docs/ROADMAP.md b/docs/ROADMAP.md
index 0937c08061..1e35ce6369 100644
--- a/docs/ROADMAP.md
+++ b/docs/ROADMAP.md
@@ -22,28 +22,26 @@ New stuff - libcurl
    `curl_formget()` and `curl_formfree()` by adding replacement functions and
    deprecating the old ones to allow custom mallocs and more
 
-7. HTTP Digest authentication via Windows SSPI
+7. SASL GSSAPI (Kerberos 5) authentication via a GSS-API library
 
-8. SASL GSSAPI (Kerberos 5) authentication via a GSS-API library
-
-9. add support for third-party SASL libraries such as Cyrus SASL - may need to
+8. add support for third-party SASL libraries such as Cyrus SASL - may need to
    move existing native and SSPI based authentication into vsasl folder after
    reworking HTTP and SASL code
 
-10. SASL authentication in LDAP
+9. SASL authentication in LDAP
 
-11. Simplify the SMTP email interface so that programmers don't have to
+10. Simplify the SMTP email interface so that programmers don't have to
     construct the body of an email that contains all the headers, alternative
     content, images and attachments - maintain raw interface so that
     programmers that want to do this can
 
-12. Allow the email protocols to return the capabilities before
+11. Allow the email protocols to return the capabilities before
     authenticating. This will allow an application to decide on the best
     authentication mechanism
 
-13. Allow Windows threading model to be replaced by Win32 pthreads port
+12. Allow Windows threading model to be replaced by Win32 pthreads port
 
-14. Implement a dynamic buffer size to allow SFTP to use much larger buffers
+13. Implement a dynamic buffer size to allow SFTP to use much larger buffers
     and possibly allow the size to be customizable by applications. Use less
     memory when handles are not in use?
 
diff --git a/docs/TODO b/docs/TODO
index 2f2ef92243..bb2ae37c05 100644
--- a/docs/TODO
+++ b/docs/TODO
@@ -42,7 +42,6 @@
  5.3 Rearrange request header order
  5.4 SPDY
  5.5 auth= in URLs
- 5.6 Digest via Windows SSPI
 
  6. TELNET
  6.1 ditch stdin
@@ -314,12 +313,6 @@ This is not detailed in any FTP specification.
 
  Additionally this should be implemented for proxy base URLs as well.
 
-5.6 Digest via Windows SSPI
-
- libcurl already supports HTTP Digest Authentication via native routines as well
- as SASL Digest via both Windows SSPI and native routines. In addition to this
- libcurl should also support HTTP Digest Authentication via Windows SSPI.
-
 6. TELNET
 
 6.1 ditch stdin
diff --git a/docs/curl.1 b/docs/curl.1
index d8498b9254..5f88cffb8b 100644
--- a/docs/curl.1
+++ b/docs/curl.1
@@ -1684,7 +1684,7 @@ Principal Name) formats. For example, EXAMPLE\\user and user@example.com
 respectively.
 
 If you use a Windows SSPI-enabled curl binary and perform Kerberos V5,
-Negotiate, NTLM or DIGEST-MD5 authentication then you can tell curl to select
+Negotiate, NTLM or Digest authentication then you can tell curl to select
 the user name and password from your environment by specifying a single colon
 with this option: "-u :".
 
diff --git a/docs/libcurl/curl_version_info.3 b/docs/libcurl/curl_version_info.3
index 8a4c2322b6..681d1a611d 100644
--- a/docs/libcurl/curl_version_info.3
+++ b/docs/libcurl/curl_version_info.3
@@ -125,7 +125,7 @@ letters. (Added in 7.12.0)
 .IP CURL_VERSION_SSPI
 libcurl was built with support for SSPI. This is only available on Windows and
 makes libcurl use Windows-provided functions for Kerberos, NTLM, SPNEGO and
-SASL DIGEST-MD5 authentication. It also allows libcurl to use the current user
+Digest authentication. It also allows libcurl to use the current user
 credentials without the app having to pass them on. (Added in 7.13.2)
 .IP CURL_VERSION_GSSAPI
 libcurl was built with support for GSS-API. This makes libcurl use provided
-- 
GitLab