From: Páll Haraldsson <Pall.Haraldsson@gmail.com>
Date: Thu, 21 Jul 2016 20:56:18 +0000 (+0000)
Subject: Typo..
X-Git-Tag: php-7.2.0alpha1~1339^2~12
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=98d8c70a9172f9aed5e1ab70349cdbcd1fa27093;p=php

Typo..

[skip ci]
---

diff --git a/UPGRADING b/UPGRADING
index 553b43fb11..5400a2eee6 100644
--- a/UPGRADING
+++ b/UPGRADING
@@ -311,7 +311,7 @@ PHP 7.1 UPGRADE NOTES
 - Core:
   . Support for long and UTF-8 path;
 
-    If an application is UTF-8 conform, no further action is required. For
+    If an application is UTF-8 conforming, no further action is required. For
     applications depending on paths in non UTF-8 encodings for I/O, an explicit
     INI directive has to be set. The encoding INI settings check relies on the
     order in the core:
@@ -319,7 +319,7 @@ PHP 7.1 UPGRADE NOTES
       - default_charset
       - zend.multibyte
 
-    Several functions for codepage handling were itroduced:
+    Several functions for codepage handling were introduced:
       - sapi_windows_cp_set() to set the default codepage
       - sapi_windows_cp_get() to retrieve the current codepage
       - sapi_windows_cp_is_utf8()