From 7b2f9b456357f46c58cde248d945c6ad28fbcc74 Mon Sep 17 00:00:00 2001 From: Yassine Guedidi Date: Fri, 18 Jul 2014 12:16:32 +0200 Subject: [PATCH 1/2] Update version in Rework your Patch section --- contributing/code/patches.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contributing/code/patches.rst b/contributing/code/patches.rst index 1967c8dc0f0..45e469b8971 100644 --- a/contributing/code/patches.rst +++ b/contributing/code/patches.rst @@ -364,7 +364,7 @@ Rework your Patch Based on the feedback on the pull request, you might need to rework your patch. Before re-submitting the patch, rebase with ``upstream/master`` or -``upstream/2.1``, don't merge; and force the push to the origin: +``upstream/2.3``, don't merge; and force the push to the origin: .. code-block:: bash From 204d1b1a21e4c76a58622089398d4aecfe52153f Mon Sep 17 00:00:00 2001 From: Brayden Williams Date: Fri, 11 Jul 2014 23:43:13 -0700 Subject: [PATCH 2/2] Update twig_reference.rst Fix typo --- reference/twig_reference.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reference/twig_reference.rst b/reference/twig_reference.rst index 6a237ca4b15..d70f83f3dc0 100644 --- a/reference/twig_reference.rst +++ b/reference/twig_reference.rst @@ -5,7 +5,7 @@ Symfony2 Twig Extensions ======================== Twig is the default template engine for Symfony2. By itself, it already contains -a lot of build-in functions, filters, tags and tests (`http://twig.sensiolabs.org/documentation`_ +a lot of built-in functions, filters, tags and tests (`http://twig.sensiolabs.org/documentation`_ then scroll to the bottom). Symfony2 adds more custom extension on top of Twig to integrate some components