Merge branch '3.4' into 4.3

* 3.4:
  Updated some console commands
  Improved some deprecation message

Author: javiereguiluz

_build/_themes/_exts/symfonycom/sphinx/lexer.py

@@ -10,7 +10,7 @@ class TerminalLexer(RegexLexer):
     tokens = {
         'root': [
             ('^\$', Generic.Prompt, 'bash-prompt'),
-            ('^C:\\[^\n>]+>', Generic.Prompt, 'dos-prompt'),
+            ('^>', Generic.Prompt, 'dos-prompt'),
             ('^#.+$', Comment.Single),
             ('^.+$', Generic.Output),
         ],

bundles/inheritance.rst

@@ -4,7 +4,7 @@
 How to Use Bundle Inheritance to Override Parts of a Bundle
 ===========================================================
 
-.. caution::
+.. deprecated:: 3.4
 
     Bundle inheritance was removed in Symfony 4.0, but you can
     :doc:`override any part of a bundle </bundles/override>` without