Added the changes suggested by reviewers

Author: javiereguiluz

bundles/inheritance.rst

@@ -94,7 +94,8 @@ The same goes for routing files and some other resources.
     The overriding of resources only works when you refer to resources with
     the ``@FOSUserBundle/Resources/config/routing/security.xml`` method.
     You need to use the ``@BundleName`` shortcut when refering to resources
-    so they can be successfully overridden.
+    so they can be successfully overridden (except templates, which are
+    overridden in a different way, as explained in :doc:`/templating/overriding`).
 
 .. caution::
 

bundles/override.rst

@@ -72,8 +72,8 @@ associations. Learn more about this feature and its limitations in
 Forms
 -----
 
-Existing form types can be modified defining "form type extensions".
-For more information, see :doc:`/form/create_form_type_extension`.
+Existing form types can be modified defining
+:doc:`form type extensions </form/create_form_type_extension>`.
 
 .. _override-validation: