From 00348d5b3ea789a896d4460dd6d2252d0ca30830 Mon Sep 17 00:00:00 2001 From: Baptiste Langlade Date: Sat, 16 Aug 2014 12:17:46 +0200 Subject: [PATCH 1/5] missing backtik --- components/dependency_injection/advanced.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/components/dependency_injection/advanced.rst b/components/dependency_injection/advanced.rst index 2d07d0eab13..6e9ceb6b4af 100644 --- a/components/dependency_injection/advanced.rst +++ b/components/dependency_injection/advanced.rst @@ -221,3 +221,4 @@ the service itself gets loaded. To do so, you can use the ``file`` directive. Notice that Symfony will internally call the PHP statement ``require_once``, which means that your file will be included only once per request. + From d3e2e25c43ad7e8b4f11f917d10dc87b7df81119 Mon Sep 17 00:00:00 2001 From: Baptiste Langlade Date: Sat, 16 Aug 2014 12:18:40 +0200 Subject: [PATCH 2/5] removed unnecessary parentheses --- components/http_foundation/introduction.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/http_foundation/introduction.rst b/components/http_foundation/introduction.rst index b44be7d9d9a..5a59262ac58 100644 --- a/components/http_foundation/introduction.rst +++ b/components/http_foundation/introduction.rst @@ -177,7 +177,7 @@ on how this is used in the Symfony2 framework, see :ref:`the Symfony2 book `. Finally, the raw data sent with the request body can be accessed using -:method:`Symfony\\Component\\HttpFoundation\\Request::getContent()`:: +:method:`Symfony\\Component\\HttpFoundation\\Request::getContent`:: $content = $request->getContent(); From 739a9f1e10844fc4b07907fe2471d04a120b7509 Mon Sep 17 00:00:00 2001 From: Baptiste Langlade Date: Sat, 16 Aug 2014 12:20:00 +0200 Subject: [PATCH 3/5] replaced forgo by forgot --- reference/configuration/framework.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reference/configuration/framework.rst b/reference/configuration/framework.rst index 3339381e271..a0e5ba5f555 100644 --- a/reference/configuration/framework.rst +++ b/reference/configuration/framework.rst @@ -423,7 +423,7 @@ would be ``/images/logo.png?version=5``. URL rewrite rules could then be used to disregard the version prefix before serving the asset. Alternatively, you could copy assets to the appropriate - version path as part of your deployment process and forgo any URL rewriting. + version path as part of your deployment process and forgot any URL rewriting. The latter option is useful if you would like older asset versions to remain accessible at their original URL. From a2e003f7a9b990adb6e6598e2cdb1813527856fb Mon Sep 17 00:00:00 2001 From: Baptiste Langlade Date: Sat, 16 Aug 2014 12:21:10 +0200 Subject: [PATCH 4/5] typo, replaced form by from --- components/translation/introduction.rst | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/components/translation/introduction.rst b/components/translation/introduction.rst index 963ba671ff3..7300f01f7a9 100644 --- a/components/translation/introduction.rst +++ b/components/translation/introduction.rst @@ -70,19 +70,19 @@ Loader too. The default loaders are: * :class:`Symfony\\Component\\Translation\\Loader\\CsvFileLoader` - to load catalogs from CSV files. * :class:`Symfony\\Component\\Translation\\Loader\\IcuDatFileLoader` - to load - catalogs form resource bundles. + catalogs from resource bundles. * :class:`Symfony\\Component\\Translation\\Loader\\IcuResFileLoader` - to load - catalogs form resource bundles. + catalogs from resource bundles. * :class:`Symfony\\Component\\Translation\\Loader\\IniFileLoader` - to load - catalogs form ini files. + catalogs from ini files. * :class:`Symfony\\Component\\Translation\\Loader\\MoFileLoader` - to load - catalogs form gettext files. + catalogs from gettext files. * :class:`Symfony\\Component\\Translation\\Loader\\PhpFileLoader` - to load catalogs from PHP files. * :class:`Symfony\\Component\\Translation\\Loader\\PoFileLoader` - to load - catalogs form gettext files. + catalogs from gettext files. * :class:`Symfony\\Component\\Translation\\Loader\\QtFileLoader` - to load - catalogs form QT XML files. + catalogs from QT XML files. * :class:`Symfony\\Component\\Translation\\Loader\\XliffFileLoader` - to load catalogs from Xliff files. * :class:`Symfony\\Component\\Translation\\Loader\\YamlFileLoader` - to load From b9411fcd2c9874e59ce215fd898d9c0b943b56bd Mon Sep 17 00:00:00 2001 From: Baptiste Langlade Date: Sat, 16 Aug 2014 13:24:35 +0200 Subject: [PATCH 5/5] Revert "missing backtik" This reverts commit a0de6888d20c1a58637b6cd68b0105b8b52cd2d4 as it's intended for 2.5. --- components/dependency_injection/advanced.rst | 1 - 1 file changed, 1 deletion(-) diff --git a/components/dependency_injection/advanced.rst b/components/dependency_injection/advanced.rst index 6e9ceb6b4af..2d07d0eab13 100644 --- a/components/dependency_injection/advanced.rst +++ b/components/dependency_injection/advanced.rst @@ -221,4 +221,3 @@ the service itself gets loaded. To do so, you can use the ``file`` directive. Notice that Symfony will internally call the PHP statement ``require_once``, which means that your file will be included only once per request. -