Skip to content

Commit c668911

Browse files
committed
Merge branch '4.3' into 4.4
* 4.3: Fixed a syntax issue in a configuration directive Fixed some Windows console commands Updated the lexer used to highlight terminal blocks
2 parents 07c50d0 + 5118c01 commit c668911

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ class TerminalLexer(RegexLexer):
1010
tokens = {
1111
'root': [
1212
('^\$', Generic.Prompt, 'bash-prompt'),
13-
('^[^\n>]+>', Generic.Prompt, 'dos-prompt'),
13+
('^C:\\[^\n>]+>', Generic.Prompt, 'dos-prompt'),
1414
('^#.+$', Comment.Single),
1515
('^.+$', Generic.Output),
1616
],

configuration.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ configuration file using a special syntax: wrap the parameter name in two ``%``
291291
by adding another ``%`` so Symfony doesn't consider it a reference to a
292292
parameter name:
293293

294-
.. configuration-block::
294+
.. configuration-block::
295295

296296
.. code-block:: yaml
297297

configuration/dot-env-changes.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@ changes can be made to any Symfony 3.4 or higher app:
7979
$ git mv .env.dist .env
8080
8181
# Windows
82-
$ mv .env .env.local
83-
$ git mv .env.dist .env
82+
C:\> move .env .env.local
83+
C:\> git mv .env.dist .env
8484
8585
You can also update the `comment on the top of .env`_ to reflect the new changes.
8686

0 commit comments

Comments
 (0)