From 3e6ae6eeb80e71eda0860e80bc40f7bb0ef2d3dd Mon Sep 17 00:00:00 2001
From: Daniel Stenberg <daniel@haxx.se>
Date: Sun, 4 Sep 2005 22:10:03 +0000
Subject: [PATCH] mention the recent improvements

---
 CHANGES       | 15 +++++++++++++++
 RELEASE-NOTES |  9 +++++----
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/CHANGES b/CHANGES
index 7b209cb88..be0696565 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,6 +7,21 @@
                                   Changelog
 
 
+Daniel (4 September 2005)
+- I applied Nicolas François' man page patch he posted to the Debian bug
+  tracker. It corrected two lines that started with apostrophes, which isn't
+  legal nroff format.
+
+- Added --ftp-skip-pasv-ip to the command line tool, that sets the new
+  CURLOPT_FTP_SKIP_PASV_IP option. It makes libcurl re-use the control
+  connection's IP address when setting up the data connection instead of
+  extractting the IP address from the PASV response. It has turned out this
+  feature is frequently needed by people to circumvent silly servers and silly
+  firewalls, especially when FTPS is used and the PASV command-response is
+  sent encrtyped.
+
+  Sponsored by CU*Answers
+
 Daniel (1 September 2005)
 - John Kelly added TFTP support to libcurl. A bunch of new error codes was
   added. TODO: add them to docs. add TFTP server to test suite. add TFTP to
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index fc8ed64f9..0da6b7d09 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -2,8 +2,8 @@ Curl and libcurl 7.14.2
 
  Public curl release number:               90
  Releases counted from the very beginning: 117
- Available command line options:           108
- Available curl_easy_setopt() options:     123
+ Available command line options:           109
+ Available curl_easy_setopt() options:     124
  Number of public functions in libcurl:    46
  Amount of public web site mirrors:        25
  Number of known libcurl bindings:         31
@@ -11,7 +11,8 @@ Curl and libcurl 7.14.2
 
 This release includes the following changes:
 
- o 
+ o --ftp-skip-pasv-ip / CURLOPT_FTP_SKIP_PASV_IP (sponsored by CU*Answers)
+ o TFTP support added
 
 This release includes the following bugfixes:
 
@@ -24,6 +25,6 @@ Other curl-related news since the previous public release:
 This release would not have looked like this without help, code, reports and
 advice from friends like these:
 
- 
+ o John Kelly, Nicolas François
 
         Thanks! (and sorry if I forgot to mention someone)