From 4873eb1d316f7a6b0df97ccd3b3bd4b563fcd1de Mon Sep 17 00:00:00 2001
From: Werner Lemberg <wl@gnu.org>
Date: Sun, 19 Aug 2018 07:27:21 +0200
Subject: [PATCH] Update `CHANGES' file.

---
 ChangeLog                   |  2 +-
 docs/CHANGES                | 55 +++++++++++++++++++++++++++++++++++++
 include/freetype/freetype.h |  2 +-
 3 files changed, 57 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7b7c7cf3d..b928d36fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -423,7 +423,7 @@
 
 	[type1] Check relationship between number of axes and designs.
 
-	For Multiple Masters fonts We don't support intermediate designs;
+	For Multiple Masters fonts we don't support intermediate designs;
 	this implies that
 
 	  number_of_designs == 2 ^^ number_of_axes
diff --git a/docs/CHANGES b/docs/CHANGES
index a6d088af4..70bfe7aa3 100644
--- a/docs/CHANGES
+++ b/docs/CHANGES
@@ -1,3 +1,58 @@
+
+CHANGES BETWEEN 2.9.1 and 2.10
+
+  I. IMPORTANT BUG FIXES
+
+
+  II. IMPORTANT CHANGES
+
+    - A bunch of new functions has been added to access and process
+      COLR/CPAL data of OpenType fonts with coloured glyph layers.
+
+        FT_Palette_Data_Get
+        FT_Palette_Select
+        FT_Palette_Set_Foreground_Color
+        FT_Get_Color_Glyph_Layer
+        FT_Bitmap_Blend
+
+
+  III. MISCELLANEOUS
+
+    - `TT_Set_MM_Blend' could fail if call repeatedly with the same
+      arguments.
+
+    - The precision of handling deltas in Variation Fonts has been
+      increased.  The problem did only show up with multidimensional
+      designspaces.
+
+    - New function `FT_Library_SetLcdGeometry' to set up the geometry
+      of LCD subpixels.
+
+    - FreeType now uses the `defaultChar' property of PCF fonts to set
+      the glyph for the undefined character at glyph index 0 (as
+      FreeType already does for all other supported font formats).  As
+      a consequence, the order of glyphs of a PCF font if accessed with
+      FreeType can be different now compared to previous versions.
+
+      This change doesn't affect PCF font access with cmaps.
+
+    - `FT_Select_Charmap' has been changed to allow parameter value
+      `FT_ENCODING_NONE', which is valid for BDF, PCF, and Windows FNT
+      formats to access built-in cmaps that don't have a predefined
+      `FT_Encoding' value.
+
+    - A previously reserved field in the `FT_GlyphSlotRec' structure
+      now holds the glyph index.
+
+    - On Win32 platforms, the use of `_DLL' to build the library has
+      been replaced with `DLL_EXPORT' and `DLL_IMPORT'.
+
+    - The usual round of fuzzer bug fixes to better reject malformed
+      fonts.
+
+
+======================================================================
+
 CHANGES BETWEEN 2.9 and 2.9.1
 
   I. IMPORTANT BUG FIXES
diff --git a/include/freetype/freetype.h b/include/freetype/freetype.h
index fa937cd56..60e9b1592 100644
--- a/include/freetype/freetype.h
+++ b/include/freetype/freetype.h
@@ -1776,7 +1776,7 @@ FT_BEGIN_HEADER
    *
    *   glyph_index ::
    *     The glyph index passed as an argument to @FT_Load_Glyph while
-   *     initializeing the glyph slot (since FreeType version 2.10).
+   *     initializing the glyph slot (since FreeType version 2.10).
    *
    *   generic ::
    *     A typeless pointer unused by the FreeType