Merge branch '2.0' into 2.1

weaverryan · weaverryan · commit bf72f2cd94b6 · 2012-09-09T18:07:47.000-05:00
diff --git a/book/installation.rst b/book/installation.rst
@@ -266,7 +266,7 @@ Beginning Development
 
 Now that you have a fully-functional Symfony2 application, you can begin
 development! Your distribution may contain some sample code - check the
-``README.rst`` file included with the distribution (open it as a text file)
+``README.md`` file included with the distribution (open it as a text file)
 to learn about what sample code was included with your distribution and how
 you can remove it later.
 
diff --git a/components/config/definition.rst b/components/config/definition.rst
@@ -149,8 +149,8 @@ An example of this:
         ->arrayNode('parameters')
             ->isRequired()
             ->requiresAtLeastOneElement()
+            ->useAttributeAsKey('name')
             ->prototype('array')
-                ->useAttributeAsKey('name')
                 ->children()
                     ->scalarNode('name')->isRequired()->end()
                     ->scalarNode('value')->isRequired()->end()
