Jan 22, 2014 · Jan 21, 2014 · Jan 21, 2014
diff --git a/book/propel.rst b/book/propel.rst

    propel:
        dbal:
            driver:"%database_driver%"
            user:"%database_user%"
            password:"%database_password%"
            dsn:"%database_driver%:host=%database_host%;dbname=%database_name%;charset=%database_charset%"
            driver:   "%database_driver%"
            user:     "%database_user%"
            password: "%database_password%"
            dsn:      "%database_driver%:host=%database_host%;dbname=%database_name%;charset=%database_charset%"

 Now that Propel knows about your database, Symfony2 can create the database for
 you:
diff --git a/book/security.rst b/book/security.rst
        security:
            firewalls:
                secured_area:
                    pattern:^/
                    pattern:   ^/
                    anonymous: ~
                    http_basic:
                        realm: "Secured Demo Area"
        security:
            firewalls:
                secured_area:
                    pattern:^/
                    pattern:   ^/
                    anonymous: ~
                    form_login:
                        login_path:login
                        check_path:login_check
                        login_path: login
                        check_path: login_check

    .. code-block:: xml


        # app/config/routing.yml
        login:
            path:   /login
            defaults:{ _controller: AcmeSecurityBundle:Security:login }
            path:/login
            defaults: { _controller: AcmeSecurityBundle:Security:login }
        login_check:
            path:/login_check
            path: /login_check

    .. code-block:: xml


            firewalls:
                login_firewall:
                    pattern:^/login$
                    anonymous:~
                    pattern:   ^/login$
                    anonymous: ~
                secured_area:
                    pattern:    ^/
                    form_login: ~
 by Symfony (:class:`Symfony\\Component\\Security\\Core\\User\\User`).

 .. tip::

    Any user provider can load users directly from configuration by specifying
    the ``users`` configuration parameter and listing the users beneath it.

 .. caution::

    If your username is completely numeric (e.g. ``77``) or contains a dash
    (e.g. ``user-name``), you should usethat alternative syntax when specifying
    (e.g. ``user-name``), you should usean alternative syntax when specifying
    users in YAML:

    .. code-block:: yaml
diff --git a/book/translation.rst b/book/translation.rst
    .. code-block:: yaml

        contact:
            path:/{_locale}/contact
            defaults:{ _controller: AcmeDemoBundle:Contact:index, _locale: en }
            path:     /{_locale}/contact
            defaults: { _controller: AcmeDemoBundle:Contact:index, _locale: en }
            requirements:
                _locale: en|fr|de

diff --git a/components/config/definition.rst b/components/config/definition.rst
    default_connection: mysql
    connections:
        mysql:
            host: localhost
            driver: mysql
            host:localhost
            driver:mysql
            username: user
            password: pass
        sqlite:
            host: localhost
            driver: sqlite
            memory: true
            host:localhost
            driver:sqlite
            memory:true
            username: user
            password: pass

 .. code-block:: yaml

    connection:
        name: my_mysql_connection
        host: localhost
        driver: mysql
        name:my_mysql_connection
        host:localhost
        driver:mysql
        username: user
        password: pass

diff --git a/components/dependency_injection/parameters.rst b/components/dependency_injection/parameters.rst

        services:
            mailer:
                class:'%mailer.class%'
                arguments: ['%mailer.transport%']
                class:"%mailer.class%"
                arguments: ["%mailer.transport%"]

    .. code-block:: xml

diff --git a/components/dependency_injection/parentservices.rst b/components/dependency_injection/parentservices.rst
            my_email_formatter:
                # ...
            newsletter_manager:
                class:"%newsletter_manager.class%"
                class: "%newsletter_manager.class%"
                calls:
                    - [setMailer, ["@my_mailer"]]
                    - [setEmailFormatter, ["@my_email_formatter"]]
                    - [setEmailFormatter, ["@my_email_formatter"]]

            newsletter_manager:
                class:"%newsletter_manager.class%"
                class:  "%newsletter_manager.class%"
                parent: mail_manager

            greeting_card_manager:
                    - [setEmailFormatter, ["@my_email_formatter"]]

            newsletter_manager:
                class:"%newsletter_manager.class%"
                class:  "%newsletter_manager.class%"
                parent: mail_manager
                calls:
                    - [setMailer, ["@my_alternative_mailer"]]

            greeting_card_manager:
                class:"%greeting_card_manager.class%"
                class:  "%greeting_card_manager.class%"
                parent: mail_manager

    .. code-block:: xml
diff --git a/components/dependency_injection/types.rst b/components/dependency_injection/types.rst
            my_mailer:
                # ...
            newsletter_manager:
                class:NewsletterManager
                class: NewsletterManager
                properties:
                    mailer: "@my_mailer"

diff --git a/cookbook/assetic/apply_to_option.rst b/cookbook/assetic/apply_to_option.rst
        assetic:
            filters:
                coffee:
                    bin: /usr/bin/coffee
                    node: /usr/bin/node
                    node_paths: [/usr/lib/node_modules/]
                    bin:/usr/bin/coffee
                    node:/usr/bin/node
                    node_paths: [/usr/lib/node_modules/]

    .. code-block:: xml

        assetic:
            filters:
                coffee:
                    bin: /usr/bin/coffee
                    node: /usr/bin/node
                    node_paths: [/usr/lib/node_modules/]
                    apply_to: "\.coffee$"
                    bin:/usr/bin/coffee
                    node:/usr/bin/node
                    node_paths: [/usr/lib/node_modules/]
                    apply_to:"\.coffee$"

    .. code-block:: xml

diff --git a/cookbook/assetic/uglifyjs.rst b/cookbook/assetic/uglifyjs.rst

        <!-- app/config/config.xml -->
        <assetic:config>
            <!-- bin: the path to the uglifyjs executable -->
            <assetic:filter
                name="uglifyjs2"
                bin="/usr/local/bin/uglifyjs" />
        $container->loadFromExtension('assetic', array(
            'filters' => array(
                'uglifyjs2' => array(
                    // the path to the uglifyjs executable
                    'bin' => '/usr/local/bin/uglifyjs',
                ),
            ),
diff --git a/cookbook/bundles/override.rst b/cookbook/bundles/override.rst

        # app/config/config.yml
        parameters:
            translator.class:Acme\HelloBundle\Translation\Translator
            translator.class: Acme\HelloBundle\Translation\Translator

    .. code-block:: xml

diff --git a/cookbook/bundles/prepend_extension.rst b/cookbook/bundles/prepend_extension.rst
    .. code-block:: yaml

        # app/config/config.yml

        acme_something:
            # ...
            use_acme_goodbye: false
    .. code-block:: xml

        <!-- app/config/config.xml -->

        <acme-something:config use-acme-goodbye="false">
            <acme-something:entity-manager-name>non_default</acme-something:entity-manager-name>
        </acme-something:config>
    .. code-block:: php

        // app/config/config.php

        $container->loadFromExtension('acme_something', array(
            ...,
            'use_acme_goodbye' => false,
diff --git a/cookbook/configuration/apache_router.rst b/cookbook/configuration/apache_router.rst

        # app/config/routing.yml
        hello:
            path:/hello/{name}
            path: /hello/{name}
            defaults: { _controller: AcmeDemoBundle:Demo:hello }

    .. code-block:: xml
diff --git a/cookbook/configuration/environments.rst b/cookbook/configuration/environments.rst

        imports:
            - { resource: config.yml }

        # ...

    .. code-block:: xml

        <imports>
            <import resource="config.xml" />
        </imports>

        <!-- ... -->

    .. code-block:: php

        $loader->import('config.php');

        // ...

 To share common configuration, each environment's configuration file

            doctrine:
               dbal:
                   logging:"%kernel.debug%"
                   logging: "%kernel.debug%"
                   # ...

        .. code-block:: xml

            <doctrine:dbal logging="%kernel.debug%".../>
            <doctrine:dbal logging="%kernel.debug%" />

        .. code-block:: php

diff --git a/cookbook/configuration/pdo_session_storage.rst b/cookbook/configuration/pdo_session_storage.rst
        framework:
            session:
                # ...
                handler_id:session.handler.pdo
                handler_id: session.handler.pdo

        parameters:
            pdo.db_options:
diff --git a/cookbook/controller/service.rst b/cookbook/controller/service.rst

        services:
            acme.hello.controller:
                class:"%acme.controller.hello.class%"
                class: "%acme.controller.hello.class%"

    .. code-block:: xml


        # app/config/routing.yml
        hello:
            path:/hello
            defaults:{ _controller: acme.hello.controller:indexAction }
            path:     /hello
            defaults: { _controller: acme.hello.controller:indexAction }

    .. code-block:: xml

diff --git a/cookbook/doctrine/dbal.rst b/cookbook/doctrine/dbal.rst
        doctrine:
            dbal:
                types:
                    custom_first: Acme\HelloBundle\Type\CustomFirst
                    custom_first:Acme\HelloBundle\Type\CustomFirst
                    custom_second: Acme\HelloBundle\Type\CustomSecond

    .. code-block:: xml
            dbal:
                connections:
                    default:
 // Other connections parameters
 # other connections parameters
                        mapping_types:
                            enum: string

                <doctrine:dbal>
                <doctrine:dbal default-connection="default">
                    <doctrine:connection>
                        <!-- other connections parameters -->
                        <doctrine:mapping-type name="enum">string</doctrine:mapping-type>
                    </doctrine:connection>
                </doctrine:dbal>
            'dbal' => array(
                'connections' => array(
                    'default' => array(
                        // other connection parameers
                        'mapping_types' => array(
                            'enum'  => 'string',
                        ),
diff --git a/cookbook/doctrine/multiple_entity_managers.rst b/cookbook/doctrine/multiple_entity_managers.rst

        doctrine:
            dbal:
                default_connection:default
                default_connection: default
                connections:
                    default:
                        driver:   "%database_driver%"
                        charset:  UTF8

            orm:
                default_entity_manager:default
                default_entity_manager: default
                entity_managers:
                    default:
                        connection:default
                        connection: default
                        mappings:
                            AcmeDemoBundle: ~
                            AcmeDemoBundle:~
                            AcmeStoreBundle: ~
                    customer:
                        connection:customer
                        connection: customer
                        mappings:
                            AcmeCustomerBundle: ~

    .. code-block:: xml

        <?xml version="1.0" encoding="UTF-8"?>

        <srv:container xmlns="http://symfony.com/schema/dic/doctrine"
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xmlns:srv="http://symfony.com/schema/dic/services"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -55,10 +55,10 @@ configuration file (``config.yml``):

		propel:
		dbal:
		driver:"%database_driver%"
		user:"%database_user%"
		password:"%database_password%"
		dsn:"%database_driver%:host=%database_host%;dbname=%database_name%;charset=%database_charset%"
		driver: "%database_driver%"
		user: "%database_user%"
		password: "%database_password%"
		dsn: "%database_driver%:host=%database_host%;dbname=%database_name%;charset=%database_charset%"

		Now that Propel knows about your database, Symfony2 can create the database for
		you:
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -45,7 +45,7 @@ authentication (i.e. the old-school username/password box):
		security:
		firewalls:
		secured_area:
		pattern:^/
		pattern: ^/
		anonymous: ~
		http_basic:
		realm: "Secured Demo Area"
Expand DownExpand Up		@@ -300,11 +300,11 @@ First, enable form login under your firewall:
		security:
		firewalls:
		secured_area:
		pattern:^/
		pattern: ^/
		anonymous: ~
		form_login:
		login_path:login
		check_path:login_check
		login_path: login
		check_path: login_check

		.. code-block:: xml

Expand DownExpand Up		@@ -373,10 +373,10 @@ submission (i.e. ``/login_check``):

		# app/config/routing.yml
		login:
		path: /login
		defaults:{ _controller: AcmeSecurityBundle:Security:login }
		path:/login
		defaults: { _controller: AcmeSecurityBundle:Security:login }
		login_check:
		path:/login_check
		path: /login_check

		.. code-block:: xml

Expand DownExpand Up		@@ -637,8 +637,8 @@ see :doc:`/cookbook/security/form_login`.

		firewalls:
		login_firewall:
		pattern:^/login$
		anonymous:~
		pattern: ^/login$
		anonymous: ~
		secured_area:
		pattern: ^/
		form_login: ~
Expand DownExpand Up		@@ -1094,13 +1094,14 @@ aren't stored anywhere in a database. The actual user object is provided
		by Symfony (:class:`Symfony\\Component\\Security\\Core\\User\\User`).

		.. tip::

		Any user provider can load users directly from configuration by specifying
		the ``users`` configuration parameter and listing the users beneath it.

		.. caution::

		If your username is completely numeric (e.g. ``77``) or contains a dash
		(e.g. ``user-name``), you should usethat alternative syntax when specifying
		(e.g. ``user-name``), you should usean alternative syntax when specifying
		users in YAML:

		.. code-block:: yaml
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -452,8 +452,8 @@ by the routing system using the special ``_locale`` parameter:
		.. code-block:: yaml

		contact:
		path:/{_locale}/contact
		defaults:{ _controller: AcmeDemoBundle:Contact:index, _locale: en }
		path: /{_locale}/contact
		defaults: { _controller: AcmeDemoBundle:Contact:index, _locale: en }
		requirements:
		_locale: en\|fr\|de

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -21,14 +21,14 @@ applied to it (like: "the value for ``auto_connect`` must be a boolean value"):
		default_connection: mysql
		connections:
		mysql:
		host: localhost
		driver: mysql
		host:localhost
		driver:mysql
		username: user
		password: pass
		sqlite:
		host: localhost
		driver: sqlite
		memory: true
		host:localhost
		driver:sqlite
		memory:true
		username: user
		password: pass

Expand DownExpand Up		@@ -473,9 +473,9 @@ in this config:
		.. code-block:: yaml

		connection:
		name: my_mysql_connection
		host: localhost
		driver: mysql
		name:my_mysql_connection
		host:localhost
		driver:mysql
		username: user
		password: pass

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -134,8 +134,8 @@ making the class of a service a parameter:

		services:
		mailer:
		class:'%mailer.class%'
		arguments: ['%mailer.transport%']
		class:"%mailer.class%"
		arguments: ["%mailer.transport%"]

		.. code-block:: xml

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -62,7 +62,7 @@ The service config for these classes would look something like this:
		my_email_formatter:
		# ...
		newsletter_manager:
		class:"%newsletter_manager.class%"
		class: "%newsletter_manager.class%"
		calls:
		- [setMailer, ["@my_mailer"]]
		- [setEmailFormatter, ["@my_email_formatter"]]
Expand DownExpand Up		@@ -196,7 +196,7 @@ a parent for a service.
		- [setEmailFormatter, ["@my_email_formatter"]]

		newsletter_manager:
		class:"%newsletter_manager.class%"
		class: "%newsletter_manager.class%"
		parent: mail_manager

		greeting_card_manager:
Expand DownExpand Up		@@ -321,13 +321,13 @@ to the ``NewsletterManager`` class, the config would look like this:
		- [setEmailFormatter, ["@my_email_formatter"]]

		newsletter_manager:
		class:"%newsletter_manager.class%"
		class: "%newsletter_manager.class%"
		parent: mail_manager
		calls:
		- [setMailer, ["@my_alternative_mailer"]]

		greeting_card_manager:
		class:"%greeting_card_manager.class%"
		class: "%greeting_card_manager.class%"
		parent: mail_manager

		.. code-block:: xml
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -184,7 +184,7 @@ Another possibility is just setting public fields of the class directly::
		my_mailer:
		# ...
		newsletter_manager:
		class:NewsletterManager
		class: NewsletterManager
		properties:
		mailer: "@my_mailer"

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -20,9 +20,9 @@ An example configuration might look like this:
		assetic:
		filters:
		coffee:
		bin: /usr/bin/coffee
		node: /usr/bin/node
		node_paths: [/usr/lib/node_modules/]
		bin:/usr/bin/coffee
		node:/usr/bin/node
		node_paths: [/usr/lib/node_modules/]

		.. code-block:: xml

Expand DownExpand Up		@@ -130,10 +130,10 @@ applied to all ``.coffee`` files:
		assetic:
		filters:
		coffee:
		bin: /usr/bin/coffee
		node: /usr/bin/node
		node_paths: [/usr/lib/node_modules/]
		apply_to: "\.coffee$"
		bin:/usr/bin/coffee
		node:/usr/bin/node
		node_paths: [/usr/lib/node_modules/]
		apply_to:"\.coffee$"

		.. code-block:: xml

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -75,6 +75,7 @@ your JavaScripts:

		<!-- app/config/config.xml -->
		<assetic:config>
		<!-- bin: the path to the uglifyjs executable -->
		<assetic:filter
		name="uglifyjs2"
		bin="/usr/local/bin/uglifyjs" />
Expand All		@@ -86,6 +87,7 @@ your JavaScripts:
		$container->loadFromExtension('assetic', array(
		'filters' => array(
		'uglifyjs2' => array(
		// the path to the uglifyjs executable
		'bin' => '/usr/local/bin/uglifyjs',
		),
		),
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -53,7 +53,7 @@ in the core FrameworkBundle:

		# app/config/config.yml
		parameters:
		translator.class:Acme\HelloBundle\Translation\Translator
		translator.class: Acme\HelloBundle\Translation\Translator

		.. code-block:: xml

Expand Down