Merge branch '2.2' into 2.3

weaverryan · weaverryan · commit 8e63221376d9 · 2013-10-14T17:30:45.000-05:00
diff --git a/contributing/code/security.rst b/contributing/code/security.rst
@@ -96,6 +96,7 @@ Security Advisories
 This section indexes security vulnerabilities that were fixed in Symfony
 releases, starting from Symfony 1.0.0:
 
+* October 10, 2013: `Security releases: Symfony 2.0.25, 2.1.13, 2.2.9, and 2.3.6 released <http://symfony.com/blog/security-releases-cve-2013-5958-symfony-2-0-25-2-1-13-2-2-9-and-2-3-6-released>`_ (`CVE-2013-5958 <http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2013-5958>`_)
 * August 7, 2013: `Security releases: Symfony 2.0.24, 2.1.12, 2.2.5, and 2.3.3 released <http://symfony.com/blog/security-releases-symfony-2-0-24-2-1-12-2-2-5-and-2-3-3-released>`_ (`CVE-2013-4751 <http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2013-4751>`_ and `CVE-2013-4752 <http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2013-4752>`_)
 * January 17, 2013: `Security release: Symfony 2.0.22 and 2.1.7 released <http://symfony.com/blog/security-release-symfony-2-0-22-and-2-1-7-released>`_ (`CVE-2013-1348 <http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2013-1348>`_ and `CVE-2013-1397 <http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2013-1397>`_)
 * 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>`_)
diff --git a/cookbook/cache/varnish.rst b/cookbook/cache/varnish.rst
@@ -6,7 +6,7 @@ How to use Varnish to speed up my Website
 
 Because Symfony2's cache uses the standard HTTP cache headers, the
 :ref:`symfony-gateway-cache` can easily be replaced with any other reverse
-proxy. Varnish is a powerful, open-source, HTTP accelerator capable of serving
+proxy. `Varnish`_ is a powerful, open-source, HTTP accelerator capable of serving
 cached content quickly and including support for :ref:`Edge Side Includes <edge-side-includes>`.
 
 .. index::
@@ -206,5 +206,6 @@ absolute URLs:
     in the Symfony configuration so that Varnish is seen as a trusted proxy
     and the ``X-Forwarded-`` headers are used.
 
+.. _`Varnish`: https://www.varnish-cache.org
 .. _`Edge Architecture`: http://www.w3.org/TR/edge-arch
 .. _`GZIP and Varnish`: https://www.varnish-cache.org/docs/3.0/phk/gzip.html
diff --git a/cookbook/console/console_command.rst b/cookbook/console/console_command.rst
@@ -105,10 +105,11 @@ instead of
             $command = $application->find('demo:greet');
             $commandTester = new CommandTester($command);
             $commandTester->execute(
-               array(
-                  'name'    => 'Fabien',
-                  '--yell'  => true,
-               )
+                array(
+                    'command' => $command->getName(),
+                    'name'    => 'Fabien',
+                    '--yell'  => true,
+                )
             );
 
             $this->assertRegExp('/.../', $commandTester->getDisplay());
@@ -145,10 +146,11 @@ you can extend your test from
             $command = $application->find('demo:greet');
             $commandTester = new CommandTester($command);
             $commandTester->execute(
-               array(
-                  'name'    => 'Fabien',
-                  '--yell'  => true,
-               )
+                array(
+                    'command' => $command->getName(),
+                    'name'    => 'Fabien',
+                    '--yell'  => true,
+                )
             );
 
             $this->assertRegExp('/.../', $commandTester->getDisplay());
