Merge branch '2.2' into 2.3

weaverryan · weaverryan · commit b7e8d03430c4 · 2019-02-02T21:39:59.000-05:00
* 2.2:
  Fixing build errors
  Fixing missing double ticks
  Fixing build bugs with new parser
diff --git a/book/doctrine.rst b/book/doctrine.rst
@@ -22,7 +22,7 @@ can be.
     easy, and explained in the ":doc:`/cookbook/doctrine/dbal`" cookbook entry.
 
     You can also persist data to `MongoDB`_ using Doctrine ODM library. For
-    more information, read the "`DoctrineMongoDBBundle`_"
+    more information, read the DoctrineMongoDBBundle
     documentation.
 
 A Simple Example: A Product
@@ -1121,7 +1121,6 @@ table, the new ``product.category_id`` column, and the new foreign key:
 
     $ php app/console doctrine:schema:update --force
 
-
 Saving Related Entities
 ~~~~~~~~~~~~~~~~~~~~~~~
 
diff --git a/cookbook/bundles/override.rst b/cookbook/bundles/override.rst
@@ -34,6 +34,8 @@ is almost always the case), you can easily override controllers via bundle
 inheritance. For more information, see :doc:`/cookbook/bundles/inheritance`.
 If the controller is a service, see the next section on how to override it.
 
+.. _override-services-configuration:
+
 Services & Configuration
 ------------------------
 
@@ -107,7 +109,7 @@ Forms
 
 In order to override a form type, it has to be registered as a service (meaning
 it is tagged as ``form.type``). You can then override it as you would override any
-service as explained in `Services & Configuration`_. This, of course, will only
+service as explained in :ref:`override-services-configuration`. This, of course, will only
 work if the type is referred to by its alias rather than being instantiated,
 e.g.::
 
@@ -183,8 +185,7 @@ Translations
 ------------
 
 Translations are not related to bundles, but to domains. That means that you
-can override the translations from any translation file, as long as it is in
-:ref:`the correct domain <using-message-domains>`.
+can override the translations from any translation file, as long as it is in the correct domain.
 
 .. caution::
 
diff --git a/index.rst b/index.rst
@@ -87,6 +87,15 @@ Contribute to Symfony:
 
     contributing/index
 
+CMF
+---
+
+The Symfony CMFproject makes it easier for developers to add CMS functionality
+to applications built with the Symfony2 PHP framework.
+
+.. toctree::
+    :hidden:
+
 .. include:: /contributing/map.rst.inc
 
 Create your Own Framework
