Skip to content

Commit f0973f1

Browse files
committed
Merge branch '4.1' into 4.2
* 4.1: Add Hyper terminal Removed a too-early mention to MakerBundle Update page_creation.rst
2 parents e4bba5b + 1a325bc commit f0973f1

File tree

2 files changed

+2
-9
lines changed

2 files changed

+2
-9
lines changed

console/coloring.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ output (e.g. important messages, titles, comments, etc.).
1010
Console component disables output coloring for Windows systems, but if your
1111
commands invoke other scripts which emit color sequences, they will be
1212
wrongly displayed as raw escape characters. Install the `Cmder`_, `ConEmu`_, `ANSICON`_
13-
or `Mintty`_ (used by default in GitBash and Cygwin) free applications
13+
,`Mintty`_ (used by default in GitBash and Cygwin) or `Hyper`_ free applications
1414
to add coloring support to your Windows command console.
1515

1616
Using Color Styles
@@ -78,3 +78,4 @@ You can also set these colors and options directly inside the tag name::
7878
.. _ConEmu: https://conemu.github.io/
7979
.. _ANSICON: https://github.com/adoxa/ansicon/releases
8080
.. _Mintty: https://mintty.github.io/
81+
.. _Hyper: https://hyper.is/

page_creation.rst

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -91,14 +91,6 @@ to creating a page?
9191
return a ``Response`` object. You'll learn more about :doc:`controllers </controller>`
9292
in their own section, including how to return JSON responses.
9393

94-
.. tip::
95-
96-
To create controllers faster, let Symfony generate it for you:
97-
98-
.. code-block:: terminal
99-
100-
$ php bin/console make:controller
101-
10294
.. _annotation-routes:
10395

10496
Annotation Routes

0 commit comments

Comments
 (0)