From 4e6a87d894022ec528bbf360a4acd31e527eb1a7 Mon Sep 17 00:00:00 2001
From: WouterJ <waldio.webdesign@gmail.com>
Date: Mon, 18 Feb 2013 22:39:34 +0100
Subject: [PATCH] Fixed issues and typos in new formats

Fixed issues by @stof
Fixed typo
---
 cookbook/configuration/override_dir_structure.rst    |  2 +-
 cookbook/form/create_custom_field_type.rst           |  2 +-
 cookbook/form/data_transformers.rst                  |  2 +-
 cookbook/form/form_collections.rst                   |  2 +-
 cookbook/security/custom_authentication_provider.rst |  7 +++----
 cookbook/security/entity_provider.rst                |  7 +++----
 cookbook/templating/global_variables.rst             | 12 +++---------
 cookbook/testing/http_authentication.rst             | 10 +++++-----
 8 files changed, 18 insertions(+), 26 deletions(-)

diff --git a/cookbook/configuration/override_dir_structure.rst b/cookbook/configuration/override_dir_structure.rst
index 3489cd95cf3..e3a66489ca3 100644
--- a/cookbook/configuration/override_dir_structure.rst
+++ b/cookbook/configuration/override_dir_structure.rst
@@ -117,7 +117,7 @@ may need to modify the paths inside these files::
             <!-- app/config/config.xml -->
 
             <!-- ... -->
-            <assetic:config read_from="%kernel.root_dir%/../../public_html" />
+            <assetic:config read-from="%kernel.root_dir%/../../public_html" />
 
         .. code-block:: php
 
diff --git a/cookbook/form/create_custom_field_type.rst b/cookbook/form/create_custom_field_type.rst
index 0982c1198cc..4dad1c54d81 100644
--- a/cookbook/form/create_custom_field_type.rst
+++ b/cookbook/form/create_custom_field_type.rst
@@ -131,7 +131,7 @@ you want to always render it in a ``ul`` element. In your form theme template
 
         <!-- src/Acme/DemoBundle/Resources/views/Form/gender_widget.html.twig -->
         <?php if ($expanded) : ?>
-            <ul <?php $view['slots']->output('widget_container_attributes') ?>>
+            <ul <?php $view['form']->block($form, 'widget_container_attributes') ?>>
             <?php foreach ($form as $child) : ?>
                 <li>
                     <?php echo $view['form']->widget($child) ?>
diff --git a/cookbook/form/data_transformers.rst b/cookbook/form/data_transformers.rst
index 53927f75feb..893ad451bee 100644
--- a/cookbook/form/data_transformers.rst
+++ b/cookbook/form/data_transformers.rst
@@ -293,7 +293,7 @@ it's recognized as a custom field type:
 
         $container
             ->setDefinition('acme_demo.type.issue_selector', array(
-                '@doctrine.orm.entity_manager'
+                new Reference('doctrine.orm.entity_manager'),
             ))
             ->addTag('form.type', array(
                 'alias' => 'issue_selector',
diff --git a/cookbook/form/form_collections.rst b/cookbook/form/form_collections.rst
index 9c1ba931f0e..c5950637f90 100755
--- a/cookbook/form/form_collections.rst
+++ b/cookbook/form/form_collections.rst
@@ -471,7 +471,7 @@ into new ``Tag`` objects and added to the ``tags`` property of the ``Task`` obje
                     <!-- ... -->
                     <one-to-many field="tags" target-entity="Tag">
                         <cascade>
-                            <cascade-persists />
+                            <cascade-persist />
                         </cascade>
                     </one-to-many>
                 </entity>
diff --git a/cookbook/security/custom_authentication_provider.rst b/cookbook/security/custom_authentication_provider.rst
index 70e24924850..4cc326af199 100644
--- a/cookbook/security/custom_authentication_provider.rst
+++ b/cookbook/security/custom_authentication_provider.rst
@@ -499,10 +499,9 @@ You are finished! You can now define parts of your app as under WSSE protection.
     .. code-block:: xml
 
         <config>
-            <firewall name="wsse_secured"
-                pattern="/api/.*"
-                wsse="true"
-            />
+            <firewall name="wsse_secured" pattern="/api/.*">
+                <wsse />
+            </firewall>
         </config>
 
     .. code-block:: php
diff --git a/cookbook/security/entity_provider.rst b/cookbook/security/entity_provider.rst
index c6cd8b495f8..3671cc52538 100644
--- a/cookbook/security/entity_provider.rst
+++ b/cookbook/security/entity_provider.rst
@@ -268,10 +268,9 @@ then be checked against your User entity records in the database:
                 <entity class="AcmeUserBundle:User" property="username" />
             </provider>
 
-            <firewall name="admin_area"
-                pattern="^/admin"
-                http_basic
-            />
+            <firewall name="admin_area" pattern="^/admin">
+                <http-basic />
+            </firewall>
 
             <rule path="^/admin" role="ROLE_ADMIN" />
         </config>
diff --git a/cookbook/templating/global_variables.rst b/cookbook/templating/global_variables.rst
index a95ef2478e0..2059079ecf9 100644
--- a/cookbook/templating/global_variables.rst
+++ b/cookbook/templating/global_variables.rst
@@ -29,7 +29,7 @@ This is possible inside your ``app/config/config.yml`` file:
 
         // app/config/config.php
         $container->loadFromExtension('twig', array(
-             ...,
+             // ...
              'globals' => array(
                  'ga_tracking' => 'UA-xxxxx-x',
              ),
@@ -37,15 +37,9 @@ This is possible inside your ``app/config/config.yml`` file:
 
 Now, the variable ``ga_tracking`` is available in all Twig templates:
 
-.. configuration-block::
-
-    .. code-block:: html+jinja
-
-        <p>The google tracking code is: {{ ga_tracking }}</p>
-
-    .. code-block:: html+php
+.. code-block:: html+jinja
 
-        <p>The google tracking code is: <?php echo $ga_tracking; ?></p>
+    <p>The google tracking code is: {{ ga_tracking }}</p>
 
 It's that easy! You can also take advantage of the built-in :ref:`book-service-container-parameters`
 system, which lets you isolate or reuse the value:
diff --git a/cookbook/testing/http_authentication.rst b/cookbook/testing/http_authentication.rst
index 208acc92c59..0b00422e912 100644
--- a/cookbook/testing/http_authentication.rst
+++ b/cookbook/testing/http_authentication.rst
@@ -39,9 +39,9 @@ key in your firewall, along with the ``form_login`` key:
 
         <!-- app/config/config_test.xml -->
         <security:config>
-            <firewall name="your_firewall_name">
-              <http-basic />
-           </firewall>
+            <security:firewall name="your_firewall_name">
+              <security:http-basic />
+           </security:firewall>
         </security:config>
 
     .. code-block:: php
@@ -50,7 +50,7 @@ key in your firewall, along with the ``form_login`` key:
         $container->loadFromExtension('security', array(
             'firewalls' => array(
                 'your_firewall_name' => array(
-                    'http-basic' => array(),
+                    'http_basic' => array(),
                 ),
             ),
-        ));
\ No newline at end of file
+        ));