From: Anatol Belski <ab@php.net>
Date: Tue, 28 Apr 2015 15:08:03 +0000 (+0200)
Subject: updated NEWS and fixed a typo
X-Git-Tag: PRE_PHP7_NSAPI_REMOVAL~127
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=27a6ab5bc515cfdad68b5e2ada7bb146b1f86a84;p=php

updated NEWS and fixed a typo
---

diff --git a/NEWS b/NEWS
index e5c60d1fe5..8216814748 100644
--- a/NEWS
+++ b/NEWS
@@ -119,6 +119,9 @@
   . Fixed bug #65933 (Cannot specify config lines longer than 1024 bytes). (Chris Wright)
   . Implement request #67106 (Split main fpm config). (Elan Ruusamäe, Remi)
 
+- FTP:
+  . Fixed bug #69082 FTPS support on Windows
+
 - Intl:
   . Removed deprecated aliases datefmt_set_timezone_id() and
     IntlDateFormatter::setTimeZoneID(). (Nikita)
diff --git a/UPGRADING b/UPGRADING
index c85d18e32f..121e124f34 100644
--- a/UPGRADING
+++ b/UPGRADING
@@ -659,7 +659,7 @@ For more details see https://wiki.php.net/rfc/removal_of_dead_sapis_and_exts
 - ftp
   . The ftp extension is always shipped shared
   . For SSL support, the dependency on the openssl extension was abolished. Instead
-    it depends alone on the openssl library. If it's presend at the compile time,
+    it depends alone on the openssl library. If it's present at the compile time,
     ftp_ssl_connect() is enabled automatically.
 
 - odbc