Skip to content

Commit 2a43a97

Browse files
committed
Fixed YAML code blocks in the book
1 parent a535ae0 commit 2a43a97

File tree

3 files changed

+17
-16
lines changed

3 files changed

+17
-16
lines changed

book/propel.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,10 @@ configuration file (``config.yml``):
5555
5656
propel:
5757
dbal:
58-
driver: "%database_driver%"
59-
user: "%database_user%"
60-
password: "%database_password%"
61-
dsn: "%database_driver%:host=%database_host%;dbname=%database_name%;charset=%database_charset%"
58+
driver: "%database_driver%"
59+
user: "%database_user%"
60+
password: "%database_password%"
61+
dsn: "%database_driver%:host=%database_host%;dbname=%database_name%;charset=%database_charset%"
6262
6363
Now that Propel knows about your database, Symfony2 can create the database for
6464
you:

book/security.rst

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ authentication (i.e. the old-school username/password box):
4545
security:
4646
firewalls:
4747
secured_area:
48-
pattern: ^/
48+
pattern: ^/
4949
anonymous: ~
5050
http_basic:
5151
realm: "Secured Demo Area"
@@ -300,11 +300,11 @@ First, enable form login under your firewall:
300300
security:
301301
firewalls:
302302
secured_area:
303-
pattern: ^/
303+
pattern: ^/
304304
anonymous: ~
305305
form_login:
306-
login_path: login
307-
check_path: login_check
306+
login_path: login
307+
check_path: login_check
308308
309309
.. code-block:: xml
310310
@@ -373,10 +373,10 @@ submission (i.e. ``/login_check``):
373373
374374
# app/config/routing.yml
375375
login:
376-
path: /login
377-
defaults: { _controller: AcmeSecurityBundle:Security:login }
376+
path: /login
377+
defaults: { _controller: AcmeSecurityBundle:Security:login }
378378
login_check:
379-
path: /login_check
379+
path: /login_check
380380
381381
.. code-block:: xml
382382
@@ -637,8 +637,8 @@ see :doc:`/cookbook/security/form_login`.
637637
638638
firewalls:
639639
login_firewall:
640-
pattern: ^/login$
641-
anonymous: ~
640+
pattern: ^/login$
641+
anonymous: ~
642642
secured_area:
643643
pattern: ^/
644644
form_login: ~
@@ -1094,13 +1094,14 @@ aren't stored anywhere in a database. The actual user object is provided
10941094
by Symfony (:class:`Symfony\\Component\\Security\\Core\\User\\User`).
10951095

10961096
.. tip::
1097+
10971098
Any user provider can load users directly from configuration by specifying
10981099
the ``users`` configuration parameter and listing the users beneath it.
10991100

11001101
.. caution::
11011102

11021103
If your username is completely numeric (e.g. ``77``) or contains a dash
1103-
(e.g. ``user-name``), you should use that alternative syntax when specifying
1104+
(e.g. ``user-name``), you should use an alternative syntax when specifying
11041105
users in YAML:
11051106

11061107
.. code-block:: yaml

book/translation.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -452,8 +452,8 @@ by the routing system using the special ``_locale`` parameter:
452452
.. code-block:: yaml
453453
454454
contact:
455-
path: /{_locale}/contact
456-
defaults: { _controller: AcmeDemoBundle:Contact:index, _locale: en }
455+
path: /{_locale}/contact
456+
defaults: { _controller: AcmeDemoBundle:Contact:index, _locale: en }
457457
requirements:
458458
_locale: en|fr|de
459459

0 commit comments

Comments
 (0)