Merge branch '5.1' into 5.x

OskarStark · OskarStark · commit ef1b95a0d0cf · 2020-11-12T10:02:56.000+01:00
* 5.1:
  add html extension to snake_case recommendation examples
diff --git a/templates.rst b/templates.rst
@@ -118,8 +118,8 @@ Template Naming
 
 Symfony recommends the following for template names:
 
-* Use `snake case`_ for filenames and directories (e.g. ``blog_posts.twig``,
-  ``admin/default_theme/blog/index.twig``, etc.);
+* Use `snake case`_ for filenames and directories (e.g. ``blog_posts.html.twig``,
+  ``admin/default_theme/blog/index.html.twig``, etc.);
 * Define two extensions for filenames (e.g. ``index.html.twig`` or
   ``blog_posts.xml.twig``) being the first extension (``html``, ``xml``, etc.)
   the final format that the template will generate.
