Merge branch '2.0'

weaverryan · weaverryan · commit c7f3353d2f5d · 2012-07-14T18:11:55.000-05:00
diff --git a/cookbook/bundles/inheritance.rst b/cookbook/bundles/inheritance.rst
@@ -32,6 +32,11 @@ as the "parent" of your bundle::
 By making this simple change, you can now override several parts of the ``FOSUserBundle``
 simply by creating a file with the same name.
 
+.. note::
+
+    Despite the method name, there is no parent/child relationship between 
+    the bundles, it is just a way to extend and override an existing bundle.
+
 Overriding Controllers
 ~~~~~~~~~~~~~~~~~~~~~~
 
diff --git a/quick_tour/the_architecture.rst b/quick_tour/the_architecture.rst
@@ -299,11 +299,11 @@ Extending Bundles
 
 If you follow these conventions, then you can use :doc:`bundle inheritance</cookbook/bundles/inheritance>`
 to "override" files, controllers or templates. For example, you can create
-a bundle - ``AcmeNewBundle`` - and specify that its parent is ``AcmeDemoBundle``.
+a bundle - ``AcmeNewBundle`` - and specify that it overrides ``AcmeDemoBundle``.
 When Symfony loads the ``AcmeDemoBundle:Welcome:index`` controller, it will
-first look for the ``WelcomeController`` class in ``AcmeNewBundle`` and then
-look inside ``AcmeDemoBundle``. This means that one bundle can override almost
-any part of another bundle!
+first look for the ``WelcomeController`` class in ``AcmeNewBundle`` and, if 
+it doesn't exist, then look inside ``AcmeDemoBundle``. This means that one bundle 
+can override almost any part of another bundle!
 
 Do you understand now why Symfony2 is so flexible? Share your bundles between
 applications, store them locally or globally, your choice.
