Small clean-ups for the last few commits.

* include/freetype/fttrace.h (afwarp): Removed.
diff --git a/ChangeLog b/ChangeLog
index 20d8707..39a45d8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,40 +1,55 @@
+2021-07-12  Werner Lemberg  <wl@gnu.org>
+
+	Small clean-ups for the last few commits.
+
+	* include/freetype/fttrace.h (afwarp): Removed.
+
 2021-07-12  David Turner  <david@freetype.org>
 
-	Remove obsolete AF_Angle type and related sources.
+	Remove obsolete `AF_Angle` type and related sources.
 
-	Move the af_sort_xxx() functions from afangles.c to afhints.c in
-	order to get rid of the obsolete angle-related types, macros and
-	function definitions.
+	* src/autofit/afangles.c: File removed.  Functions related to
+	sorting moved to...
+	* src/autofit/afhints.c (af_sort_pos, af_sort_and_quantize_widths):
+	This file.
+	* src/autofit/afangles.h: File removed.
+	* src/autofit/aftypes.h: Updated.
+	* src/autofit/autofit.c: Updated.
 
-	* src/autofit/*: Remove code.
+	* src/autofit/rules.mk (AUTOF_DRV_SRC): Updated.
 
 2021-07-12  David Turner  <david@freetype.org>
 
 	Remove experimental auto-hinting 'warp' mode.
 
-	This feature was always experimental, and probably nevery worked
-	properly. This patch completely removes it from the source code,
+	This feature was always experimental, and probably never worked
+	properly.  This patch completely removes it from the source code,
 	except for a documentation block describing it for historical
-	purpose.
+	purposes.
 
-	* devel/ftoption.h: Remove AF_CONFIG_OPTION_USE_WARPER.
-	* include/freetype/config/ftoption.h: Remove AF_CONFIG_OPTION_USE_WARPER.
-	* include/freetype/ftdriver.h: Document 'warping' property as obsolete.
-	* src/autofit/*: Remove any warp mode related code.
+	* devel/ftoption.h, include/freetype/config/ftoption.h: Remove
+	`AF_CONFIG_OPTION_USE_WARPER`.
+
+	* include/freetype/ftdriver.h: Document 'warping' property as
+	obsolete.
+
+	* src/autofit/afwarp.c, src/autofit/afwarp.h: Files removed.
+	* src/autofit/*: Remove any code related to warp mode.
 
 2021-07-12  David Turner  <david@freetype.org>
 
-	Remove experimental "Latin2" writing system (FT_OPTION_AUTOFIT2)
+	Remove experimental 'Latin2' writing system (`FT_OPTION_AUTOFIT2`).
 
 	This code has always been experimental and was never compiled anyway
-	(FT_OPTION_AUTOFIT2 does not appear in ftoption.h or even any of our
-	build files).
+	(`FT_OPTION_AUTOFIT2` does not appear in `ftoption.h` or even any of
+	our build files).
 
-	* include/freetype/internal/fttrace.h: Remove 'FT_TRACE_DEF( aflatin2 )'.
-	* src/autofit/aflatin2.[hc]: Removed.
-	* src/autofit/afloader.c: Remove undocumented hook to activate Latin2 system.
-	* src/autofit/afstyles.h: Remove ltn2_dflt style definition.
-	* src/autofit/afwrtsys.h: Remove LATIN2 writing system definition.
+	* include/freetype/internal/fttrace.h (aflatin2): Removed.
+	* src/autofit/aflatin2.h, src/autofit/aflatin2.c: Files removed.
+	* src/autofit/afloader.c: Remove undocumented hook to activate
+	Latin2 system.
+	* src/autofit/afstyles.h: Remove `ltn2_dflt` style definition.
+	* src/autofit/afwrtsys.h: Remove `LATIN2` writing system definition.
 	* src/autofit/autofit.c: Updated.
 
 2021-07-05  Werner Lemberg  <wl@gnu.org>
diff --git a/devel/ftoption.h b/devel/ftoption.h
index ab7bbbd..f92b416 100644
--- a/devel/ftoption.h
+++ b/devel/ftoption.h
@@ -105,8 +105,7 @@
    *
    * ```
    *   FREETYPE_PROPERTIES=truetype:interpreter-version=35 \
-   *                       cff:no-stem-darkening=1 \
-   *                       autofitter:warping=1
+   *                       cff:no-stem-darkening=1
    * ```
    *
    */
diff --git a/docs/CHANGES b/docs/CHANGES
index 2151c84..16acfd7 100644
--- a/docs/CHANGES
+++ b/docs/CHANGES
@@ -72,6 +72,9 @@
 
     This work was Priyesh Kumar's GSoC 2020 project.
 
+  - The experimental 'warp' mode (AF_CONFIG_OPTION_USE_WARPER) for the
+    auto-hinter has been removed.
+
   - The smooth rasterizer performance has been improved by >10%.
 
   - PCF bitmap fonts compressed with LZW (these are usually files with
diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
index ab5ab5f..4227fd3 100644
--- a/include/freetype/config/ftoption.h
+++ b/include/freetype/config/ftoption.h
@@ -105,8 +105,7 @@
    *
    * ```
    *   FREETYPE_PROPERTIES=truetype:interpreter-version=35 \
-   *                       cff:no-stem-darkening=1 \
-   *                       autofitter:warping=1
+   *                       cff:no-stem-darkening=1
    * ```
    *
    */
diff --git a/include/freetype/ftdriver.h b/include/freetype/ftdriver.h
index 6b13d92..4936639 100644
--- a/include/freetype/ftdriver.h
+++ b/include/freetype/ftdriver.h
@@ -53,10 +53,10 @@
    *   reasons.
    *
    *   Available properties are @increase-x-height, @no-stem-darkening
-   *   (experimental), @darkening-parameters (experimental), @warping
-   *   (experimental), @glyph-to-script-map (experimental), @fallback-script
-   *   (experimental), and @default-script (experimental), as documented in
-   *   the @properties section.
+   *   (experimental), @darkening-parameters (experimental),
+   *   @glyph-to-script-map (experimental), @fallback-script (experimental),
+   *   and @default-script (experimental), as documented in the @properties
+   *   section.
    *
    */
 
@@ -1165,15 +1165,15 @@
    *   **Obsolete**
    *
    *   This property was always experimental and probably never worked
-   *   correctly. It was entirely removed from the FreeType 2 sources.
-   *   This entry is only here for historical reference.
+   *   correctly.  It was entirely removed from the FreeType~2 sources.  This
+   *   entry is only here for historical reference.
    *
-   *   Warping only works in 'normal' auto-hinting mode replacing it.  The
-   *   idea of the code is to slightly scale and shift a glyph along the
+   *   Warping only worked in 'normal' auto-hinting mode replacing it.  The
+   *   idea of the code was to slightly scale and shift a glyph along the
    *   non-hinted dimension (which is usually the horizontal axis) so that as
-   *   much of its segments are aligned (more or less) to the grid.  To find
+   *   much of its segments were aligned (more or less) to the grid.  To find
    *   out a glyph's optimal scaling and shifting value, various parameter
-   *   combinations are tried and scored.
+   *   combinations were tried and scored.
    *
    * @since:
    *   2.6
diff --git a/include/freetype/ftmodapi.h b/include/freetype/ftmodapi.h
index 1eded9e..cb15423 100644
--- a/include/freetype/ftmodapi.h
+++ b/include/freetype/ftmodapi.h
@@ -508,8 +508,7 @@
    *
    *   ```
    *     FREETYPE_PROPERTIES=truetype:interpreter-version=35 \
-   *                         cff:no-stem-darkening=0 \
-   *                         autofitter:warping=1
+   *                         cff:no-stem-darkening=0
    *   ```
    *
    * @inout:
diff --git a/include/freetype/internal/fttrace.h b/include/freetype/internal/fttrace.h
index 3582d21..3307556 100644
--- a/include/freetype/internal/fttrace.h
+++ b/include/freetype/internal/fttrace.h
@@ -160,7 +160,6 @@
 FT_TRACE_DEF( afmodule )
 FT_TRACE_DEF( aflatin )
 FT_TRACE_DEF( afshaper )
-FT_TRACE_DEF( afwarp )
 
   /* SDF components */
 FT_TRACE_DEF( sdf )       /* signed distance raster for outlines (ftsdf.c) */