Merge branch '2.7' into 2.8

xabbuh · xabbuh · commit ba0aa354b784 · 2016-12-27T10:33:31.000+01:00
* 2.7:
  Fixed a syntax issue in Doctrine article
diff --git a/doctrine.rst b/doctrine.rst
@@ -385,7 +385,7 @@ see the :ref:`doctrine-field-types` section.
 .. tip::
 
     After creating your entities you should validate the mappings with the
-    following command::
+    following command:
 
     .. code-block:: terminal
 
