diff --git a/CHANGELOG b/CHANGELOG
index 73d4b9930c..65079c7f9d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -21,11 +21,13 @@ devel
   in a cluster by pushing parts of the aggregation onto the DB servers and only
   doing the total aggregation on the coordinator
 
-* replace JavaScript functions FULLTEXT, NEAR, WITHIN with regular AQL via a
-  new optimizer rule.
+* replace JavaScript functions FULLTEXT, NEAR, WITHIN and WITHIN_RECTANGLE with 
+  regular AQL subqueries via a new optimizer rule "replace-function-with-index".
 
-  - The NEAR function now does not default to a limit of 100 documents any more.
-  - "fulltext-index-optimizer" optimizer rule has been removed.
+* the existing "fulltext-index-optimizer" optimizer rule has been removed because its
+  duty is now handled by the "replace-function-with-index" rule.
+
+* The `NEAR` AQL function now does not default to a limit of 100 documents any more.
 
 * added option "--latency true" option to arangoimport. Lists microsecond latency
   statistics on 10 second intervals.
diff --git a/Documentation/Books/AQL/ExecutionAndPerformance/Optimizer.md b/Documentation/Books/AQL/ExecutionAndPerformance/Optimizer.md
index baed6fb098..7f639e25f4 100644
--- a/Documentation/Books/AQL/ExecutionAndPerformance/Optimizer.md
+++ b/Documentation/Books/AQL/ExecutionAndPerformance/Optimizer.md
@@ -423,8 +423,9 @@ The following optimizer rules may appear in the `rules` attribute of a plan:
   e.g. `FOR x IN (FOR y IN collection FILTER y.value >= 5 RETURN y.test) RETURN x.a`
   would become `FOR tmp IN collection FILTER tmp.value >= 5 LET x = tmp.test RETURN x.a`
 * `geo-index-optimizer`: will appear when a geo index is utilized.
-* `replace-function-with-index`: will appear when a function like FULLTEXT is replaced
-   with an index.
+* `replace-function-with-index`: will appear when a deprecated index function such as
+   `FULLTEXT`, `NEAR`, `WITHIN` or `WITHIN_RECTANGLE` is replaced with a regular
+   subquery.
 * `remove-sort-rand`: will appear when a *SORT RAND()* expression is removed by
   moving the random iteration into an *EnumerateCollectionNode*. This optimizer rule
   is specific for the MMFiles storage engine.