Merge branch '2.8' into 3.0

Author: wouterj

reference/forms/types/collection.rst

@@ -361,7 +361,7 @@ prototype_data
 
 Allows you to define specific data for the prototype. Each new row added will
 initially contain the data set by this option. By default, the data configured
-for all entries with the ``entry_options`` option will be used.
+for all entries with the `entry_options`_ option will be used.
 
 .. code-block:: php