Merge branch '2.4'

* 2.4: use html+jinja instead of html+twig
symfony · Dec 27, 2013 · 6c3d9eb · 6c3d9eb
2 parents 6b7d307 + bade680
commit 6c3d9eb
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/cookbook/security/csrf_in_login_form.rst b/cookbook/security/csrf_in_login_form.rst
@@ -81,7 +81,7 @@ using the login form:
 
 .. configuration-block::
 
-    .. code-block:: html+twig
+    .. code-block:: html+jinja
 
         {# src/Acme/SecurityBundle/Resources/views/Security/login.html.twig #}
 
@@ -168,4 +168,4 @@ After this, you have protected your login form against CSRF attacks.
             ));
 
 .. _`Cross-site request forgery`: http://en.wikipedia.org/wiki/Cross-site_request_forgery
-.. _`Forging Login Requests`: http://en.wikipedia.org/wiki/Cross-site_request_forgery#Forging_login_requests
+.. _`Forging Login Requests`: http://en.wikipedia.org/wiki/Cross-site_request_forgery#Forging_login_requests