symfony
diff --git a/‎bundles/override.rst
Copy file name to clipboardExpand all lines: bundles/override.rst
+16Lines changed: 16 additions & 0 deletions b/‎bundles/override.rst
Copy file name to clipboardExpand all lines: bundles/override.rst
+16Lines changed: 16 additions & 0 deletions
diff --git a/‎contributing/code/core_team.rst
Copy file name to clipboardExpand all lines: contributing/code/core_team.rst
+2-4Lines changed: 2 additions & 4 deletions b/‎contributing/code/core_team.rst
Copy file name to clipboardExpand all lines: contributing/code/core_team.rst
+2-4Lines changed: 2 additions & 4 deletions
diff --git a/‎deployment.rst
Copy file name to clipboardExpand all lines: deployment.rst
+2-11Lines changed: 2 additions & 11 deletions b/‎deployment.rst
Copy file name to clipboardExpand all lines: deployment.rst
+2-11Lines changed: 2 additions & 11 deletions
diff --git a/‎frontend/encore/faq.rst
Copy file name to clipboardExpand all lines: frontend/encore/faq.rst
+2Lines changed: 2 additions & 0 deletions b/‎frontend/encore/faq.rst
Copy file name to clipboardExpand all lines: frontend/encore/faq.rst
+2Lines changed: 2 additions & 0 deletions
diff --git a/‎reference/dic_tags.rst
Copy file name to clipboardExpand all lines: reference/dic_tags.rst
+1-1Lines changed: 1 addition & 1 deletion b/‎reference/dic_tags.rst
Copy file name to clipboardExpand all lines: reference/dic_tags.rst
+1-1Lines changed: 1 addition & 1 deletion
@@ -35,6 +35,22 @@ template from the FOSUserBundle, create this template:
     If you add a template in a new location, you *may* need to clear your
     cache (``php bin/console cache:clear``), even if you are in debug mode.
 
+Instead of overriding an entire template, you may just want to override one or
+more blocks. However, since you are overriding the template you want to extend
+from, you would end up in an infinite loop error. The solution is to use the
+special ``!`` prefix in the template name to tell Symfony that you want to
+extend from the original template, not from the overridden one:
+
+.. code-block:: twig
+
+    {# templates/bundles/FOSUserBundle/Registration/confirmed.html.twig #}
+    {# the special '!' prefix avoids errors when extending from an overridden template #}
+    {% extends "@!FOSUserBundle/Registration/confirmed.html.twig" %}
+
+    {% block some_block %}
+        ...
+    {% endblock %}
+
 .. _templating-overriding-core-templates:
 
 .. tip::
 
@@ -63,9 +63,6 @@ Active Core Members
   * **Tobias Schultze** (`Tobion`_) can merge into the Routing_,
     OptionsResolver_ and PropertyAccess_ components;
 
-  * **Romain Neutron** (`romainneutron`_) can merge into the
-    Process_ component;
-
   * **Nicolas Grekas** (`nicolas-grekas`_) can merge into the Cache_, Debug_,
     Process_, PropertyAccess_, VarDumper_ components, PhpUnitBridge_ and
     the DebugBundle_;
@@ -125,7 +122,8 @@ They are no longer part of the core team, but we are very grateful for all their
 Symfony contributions:
 
 * **Bernhard Schussek** (`webmozart`_);
-* **Abdellatif AitBoudad** (`aitboudad`_).
+* **Abdellatif AitBoudad** (`aitboudad`_);
+* **Romain Neutron**.
 
 Core Membership Application
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -170,25 +170,16 @@ Make sure you clear and warm-up your Symfony cache:
 
     $ php bin/console cache:clear --env=prod --no-debug
 
-E) Dump your Assetic Assets
-~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-If you're using Assetic, you'll also want to dump your assets:
-
-.. code-block:: terminal
-
-    $ php bin/console assetic:dump --env=prod --no-debug
-
-F) Other Things!
+E) Other Things!
 ~~~~~~~~~~~~~~~~
 
 There may be lots of other things that you need to do, depending on your
 setup:
 
 * Running any database migrations
 * Clearing your APC cache
-* Running ``assets:install`` (already taken care of in ``composer install``)
 * Add/edit CRON jobs
+* ref:`Building and minifying your assets <how-do-i-deploy-my-encore-assets>` with Webpack Encore
 * Pushing assets to a CDN
 * ...
 
 
@@ -1,6 +1,8 @@
 FAQ and Common Issues
 =====================
 
+.. _how-do-i-deploy-my-encore-assets:
+
 How do I deploy my Encore Assets?
 ---------------------------------
 
 
@@ -710,7 +710,7 @@ If your custom authentication factory extends
 :class:`Symfony\\Bundle\\SecurityBundle\\DependencyInjection\\Security\\Factory\\AbstractFactory`
 and your custom authentication listener extends
 :class:`Symfony\\Component\\Security\\Http\\Firewall\\AbstractAuthenticationListener`,
-then your custom authentication listener will automatically have this tagged
+then your custom authentication listener will automatically have this tag
 applied and it will function automatically.
 
 security.voter