Merge branch '2.1' into 2.2

weaverryan · weaverryan · commit 6fbf49af4181 · 2013-09-24T21:57:11.000-05:00
diff --git a/cookbook/bundles/extension.rst b/cookbook/bundles/extension.rst
@@ -494,7 +494,7 @@ configuration arrays together.
 The ``Configuration`` class can be much more complicated than shown here,
 supporting array nodes, "prototype" nodes, advanced validation, XML-specific
 normalization and advanced merging. You can read more about this in :doc:`the Config Component documentation</components/config/definition>`.
-You can also see it action by checking out some of the core Configuration classes,
+You can also see it in action by checking out some of the core Configuration classes,
 such as the one from the `FrameworkBundle Configuration`_ or the `TwigBundle Configuration`_.
 
 Modifying the configuration of another Bundle
