[Security] fixed merge errors

schmittjoh · schmittjoh · commit ff95dd18bde6 · 2011-04-01T12:16:32.000+02:00
diff --git a/book/security/config_reference.rst b/book/security/config_reference.rst
@@ -38,14 +38,14 @@ Configuration Reference
 
             encoders:
                 somename:
-                    class: MyBundle/Entity/MyUser
-                MyBundle/Entity/MyUser: sha512
-                MyBundle/Entity/MyUser: plaintext
-                MyBundle/Entity/MyUser:
+                    class: Acme\DemoBundle\Entity\User
+                Acme\DemoBundle\Entity\User: sha512
+                Acme\DemoBundle\Entity\User: plaintext
+                Acme\DemoBundle\Entity\User:
                     algorithm: sha512
                     encode_as_base64: true
-                    iterations: 5
-                MyBundle/Entity/MyUser:
+                    iterations: 5000
+                Acme\DemoBundle\Entity\User:
                     id: my.custom.encoder.service.id
 
             providers:
@@ -55,10 +55,10 @@ Configuration Reference
                         foo: { password: foo, roles: ROLE_USER }
                         bar: { password: bar, roles: [ROLE_USER, ROLE_ADMIN] }
                 entity:
-                    entity: { class: SecurityBundle:User, property: username }
+                    entity: { class: Security:User, property: username }
 
             factories:
-                MyFactory: %kernel.root_dir%/../src/MyVendor/MyBundle/Resources/config/security_factories.xml
+                MyFactory: %kernel.root_dir%/../src/Acme/DemoBundle/Resources/config/security_factories.xml
 
             firewalls:
                 somename:
@@ -116,11 +116,9 @@ Configuration Reference
 
             access_control:
                 -
-                    path: /foo
+                    path: ^/foo
                     host: mydomain.foo
                     ip: 192.0.0.0/8
-                    attributes:
-                        _controller: SomeController
                     roles: [ROLE_A, ROLE_B]
                     requires_channel: https
 
