Merge branch '2.0' into 2.1

weaverryan · weaverryan · commit 68781401f7a0 · 2012-12-23T11:54:28.000-05:00
diff --git a/contributing/code/security.rst b/contributing/code/security.rst
@@ -21,21 +21,23 @@ confirmed, the core-team works on a solution following these steps:
 
 1. Send an acknowledgement to the reporter;
 2. Work on a patch;
-3. Write a security announcement for the official Symfony `blog`_ about the
+3. Get a CVE identifier from mitre.org;
+4. Write a security announcement for the official Symfony `blog`_ about the
    vulnerability. This post should contain the following information:
 
    * a title that always include the "Security release" string;
    * a description of the vulnerability;
    * the affected versions;
    * the possible exploits;
    * how to patch/upgrade/workaround affected applications;
+   * the CVE identifier;
    * credits.
-4. Send the patch and the announcement to the reporter for review;
-5. Apply the patch to all maintained versions of Symfony;
-6. Package new versions for all affected versions;
-7. Publish the post on the official Symfony `blog`_ (it must also be added to
+5. Send the patch and the announcement to the reporter for review;
+6. Apply the patch to all maintained versions of Symfony;
+7. Package new versions for all affected versions;
+8. Publish the post on the official Symfony `blog`_ (it must also be added to
    the "`Security Advisories`_" category);
-8. Update the security advisory list (see below).
+9. Update the security advisory list (see below).
 
 .. note::
 
@@ -52,6 +54,7 @@ Security Advisories
 This section indexes security vulnerabilities that were fixed in Symfony
 releases, starting from Symfony 1.0.0:
 
+* December 20, 2012: `Security release: Symfony 2.0.20 and 2.1.5 <http://symfony.com/blog/security-release-symfony-2-0-20-and-2-1-5-released>`_  (`CVE-2012-6431 <http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2012-6431>`_ and `CVE-2012-6432 <http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2012-6432>`_)
 * November 29, 2012: `Security release: Symfony 2.0.19 and 2.1.4 <http://symfony.com/blog/security-release-symfony-2-0-19-and-2-1-4>`_
 * November 25, 2012: `Security release: symfony 1.4.20 released  <http://symfony.com/blog/security-release-symfony-1-4-20-released>`_ (`CVE-2012-5574 <http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2012-5574>`_)
 * August 28, 2012: `Security Release: Symfony 2.0.17 released <http://symfony.com/blog/security-release-symfony-2-0-17-released>`_
diff --git a/cookbook/bundles/best_practices.rst b/cookbook/bundles/best_practices.rst
@@ -263,7 +263,7 @@ The end user can provide values in any configuration file:
 
     .. code-block:: ini
 
-        ; app/config/config.ini
+        ; app/config/parameters.ini
         [parameters]
         acme_hello.email.from = fabien@example.com
 
diff --git a/cookbook/configuration/external_parameters.rst b/cookbook/configuration/external_parameters.rst
@@ -99,18 +99,18 @@ The container also has support for setting PHP constants as parameters. To
 take advantage of this feature, map the name of your constant  to a parameter
 key, and define the type as ``constant``.
 
-    .. code-block:: xml
+.. code-block:: xml
 
-        <?xml version="1.0" encoding="UTF-8"?>
+    <?xml version="1.0" encoding="UTF-8"?>
 
-        <container xmlns="http://symfony.com/schema/dic/services"
-            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <container xmlns="http://symfony.com/schema/dic/services"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
-            <parameters>
-                <parameter key="global.constant.value" type="constant">GLOBAL_CONSTANT</parameter>
-                <parameter key="my_class.constant.value" type="constant">My_Class::CONSTANT_NAME</parameter>
-            </parameters>
-        </container>
+        <parameters>
+            <parameter key="global.constant.value" type="constant">GLOBAL_CONSTANT</parameter>
+            <parameter key="my_class.constant.value" type="constant">My_Class::CONSTANT_NAME</parameter>
+        </parameters>
+    </container>
 
 .. note::
 
diff --git a/cookbook/form/form_collections.rst b/cookbook/form/form_collections.rst
@@ -425,7 +425,8 @@ into new ``Tag`` objects and added to the ``tags`` property of the ``Task`` obje
     and call ``$em->persist($tag)`` on each, you'll receive an error from
     Doctrine:
 
-        A new entity was found through the relationship 'Acme\TaskBundle\Entity\Task#tags' that was not configured to cascade persist operations for entity...
+        A new entity was found through the relationship `Acme\TaskBundle\Entity\Task#tags`
+        that was not configured to cascade persist operations for entity...
 
     To fix this, you may choose to "cascade" the persist operation automatically
     from the ``Task`` object to any related tags. To do this, add the ``cascade``
diff --git a/cookbook/security/entity_provider.rst b/cookbook/security/entity_provider.rst
@@ -200,9 +200,9 @@ For more details on each of these, see :class:`Symfony\\Component\\Security\\Cor
 Below is an export of my ``User`` table from MySQL. For details on how to
 create user records and encode their password, see :ref:`book-security-encoding-user-password`.
 
-.. code-block:: text
+.. code-block:: bash
 
-    mysql> select * from user;
+    $ mysql> select * from user;
     +----+----------+----------------------------------+------------------------------------------+--------------------+-----------+
     | id | username | salt                             | password                                 | email              | is_active |
     +----+----------+----------------------------------+------------------------------------------+--------------------+-----------+
diff --git a/cookbook/symfony1.rst b/cookbook/symfony1.rst
@@ -90,9 +90,11 @@ a bundle. With the help of a console command, the ``Resources/public/``
 directory of each bundle is copied or symbolically-linked to the ``web/bundles/``
 directory. This allows you to keep assets organized inside your bundle, but
 still make them available to the public. To make sure that all bundles are
-available, run the following command::
+available, run the following command:
 
-    php app/console assets:install web
+.. code-block:: bash
+
+    $ php app/console assets:install web
 
 .. note::
 
@@ -174,16 +176,16 @@ Using the Console
 In symfony1, the console is in the root directory of your project and is
 called ``symfony``:
 
-.. code-block:: text
+.. code-block:: bash
 
-    php symfony
+    $ php symfony
 
 In Symfony2, the console is now in the app sub-directory and is called
 ``console``:
 
-.. code-block:: text
+.. code-block:: bash
 
-    php app/console
+    $ php app/console
 
 Applications
 ------------
@@ -251,7 +253,9 @@ In symfony1, the ``routing.yml`` and ``app.yml`` configuration files were
 automatically loaded inside any plugin. In Symfony2, routing and application
 configuration inside a bundle must be included manually. For example, to
 include a routing resource from a bundle called ``AcmeDemoBundle``, you can
-do the following::
+do the following:
+
+.. code-block:: yaml
 
     # app/config/routing.yml
     _hello:
@@ -301,4 +305,4 @@ primarily to configure objects that you can use. For more information, see
 the chapter titled ":doc:`/book/service_container`".
 
 .. _`Symfony2 Standard`: https://github.com/symfony/symfony-standard
-.. _`Composer`: http://getcomposer.org
+.. _`Composer`: http://getcomposer.org
diff --git a/cookbook/testing/bootstrap.rst b/cookbook/testing/bootstrap.rst
@@ -25,7 +25,12 @@ with ``tests.bootstrap.php``:
 .. code-block:: xml
 
     <!-- app/phpunit.xml.dist -->
-    bootstrap = "tests.bootstrap.php"
+
+    <!-- ... -->
+    <phpunit
+        ...
+        bootstrap = "tests.bootstrap.php"
+    >
 
 Now, you can define in your ``phpunit.xml.dist`` file which environment you want the
 cache to be cleared:
diff --git a/reference/dic_tags.rst b/reference/dic_tags.rst
@@ -641,26 +641,28 @@ Your custom loader's ``load`` method is responsible for returning a
 
 Now, register your loader as a service and tag it with ``translation.loader``:
 
-.. code-block:: yaml
+.. configuration-block::
+
+    .. code-block:: yaml
 
-    services:
-        main.translation.my_custom_loader:
-            class: Acme\MainBundle\Translation\MyCustomLoader
-            tags:
-                - { name: translation.loader, alias: bin }
+        services:
+            main.translation.my_custom_loader:
+                class: Acme\MainBundle\Translation\MyCustomLoader
+                tags:
+                    - { name: translation.loader, alias: bin }
 
-.. code-block:: xml
+    .. code-block:: xml
 
-    <service id="main.translation.my_custom_loader" class="Acme\MainBundle\Translation\MyCustomLoader">
-        <tag name="translation.loader" alias="bin" />
-    </service>
+        <service id="main.translation.my_custom_loader" class="Acme\MainBundle\Translation\MyCustomLoader">
+            <tag name="translation.loader" alias="bin" />
+        </service>
 
-.. code-block:: php
+    .. code-block:: php
 
-    $container
-        ->register('main.translation.my_custom_loader', 'Acme\MainBundle\Translation\MyCustomLoader')
-        ->addTag('translation.loader', array('alias' => 'bin'))
-    ;
+        $container
+            ->register('main.translation.my_custom_loader', 'Acme\MainBundle\Translation\MyCustomLoader')
+            ->addTag('translation.loader', array('alias' => 'bin'))
+        ;
 
 The ``alias`` option is required and very important: it defines the file
 "suffix" that will be used for the resource files that use this loader. For
