From 525f9d1ce9059a4e3f7ae78d2516f5e4c3ff9ba8 Mon Sep 17 00:00:00 2001
From: Javier Eguiluz <javier.eguiluz@gmail.com>
Date: Mon, 13 Nov 2017 20:50:47 +0100
Subject: [PATCH 1/2] Removed an uneeded deprecation notice

---
 reference/configuration/twig.rst | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/reference/configuration/twig.rst b/reference/configuration/twig.rst
index 5cd9f15b7be..df0376c5860 100644
--- a/reference/configuration/twig.rst
+++ b/reference/configuration/twig.rst
@@ -55,7 +55,6 @@ TwigBundle Configuration ("twig")
             paths:
                 '%kernel.project_dir%/vendor/acme/foo-bar/templates': foo_bar
 
-            # The following were added in Symfony 2.7.
             date:
                 format: d.m.Y, H:i:s
                 interval_format: '%%d days'
@@ -91,7 +90,7 @@ TwigBundle Configuration ("twig")
 
                 <twig:global key="foo" id="bar" type="service" />
                 <twig:global key="pi">3.14</twig:global>
-                
+
                 <twig:date format="d.m.Y, H:i:s" interval-format="%d days" timezone="Asia/Tokyo" />
                 <twig:number-format decimals="2" decimal-point="," thousands-separator="." />
 

From ccf888095e0655495b99ce956632920fd3e1bb26 Mon Sep 17 00:00:00 2001
From: Javier Eguiluz <javier.eguiluz@gmail.com>
Date: Mon, 13 Nov 2017 20:52:39 +0100
Subject: [PATCH 2/2] Reverted the removal of some white space to avoid future
 merge conflicts

---
 reference/configuration/twig.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/reference/configuration/twig.rst b/reference/configuration/twig.rst
index df0376c5860..3ec8ba16c3c 100644
--- a/reference/configuration/twig.rst
+++ b/reference/configuration/twig.rst
@@ -90,7 +90,7 @@ TwigBundle Configuration ("twig")
 
                 <twig:global key="foo" id="bar" type="service" />
                 <twig:global key="pi">3.14</twig:global>
-
+                
                 <twig:date format="d.m.Y, H:i:s" interval-format="%d days" timezone="Asia/Tokyo" />
                 <twig:number-format decimals="2" decimal-point="," thousands-separator="." />