Skip to content

Commit

Permalink
Fixed YAML code blocks in the book
Browse files Browse the repository at this point in the history
  • Loading branch information
wouterj committed Jan 21, 2014
1 parent a535ae0 commit 2a43a97
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 16 deletions.
8 changes: 4 additions & 4 deletions book/propel.rst
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,10 @@ configuration file (``config.yml``):
propel:
dbal:
driver: "%database_driver%"
user: "%database_user%"
password: "%database_password%"
dsn: "%database_driver%:host=%database_host%;dbname=%database_name%;charset=%database_charset%"
driver: "%database_driver%"
user: "%database_user%"
password: "%database_password%"
dsn: "%database_driver%:host=%database_host%;dbname=%database_name%;charset=%database_charset%"
Now that Propel knows about your database, Symfony2 can create the database for
you:
Expand Down
21 changes: 11 additions & 10 deletions book/security.rst
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ authentication (i.e. the old-school username/password box):
security:
firewalls:
secured_area:
pattern: ^/
pattern: ^/
anonymous: ~
http_basic:
realm: "Secured Demo Area"
Expand Down Expand Up @@ -300,11 +300,11 @@ First, enable form login under your firewall:
security:
firewalls:
secured_area:
pattern: ^/
pattern: ^/
anonymous: ~
form_login:
login_path: login
check_path: login_check
login_path: login
check_path: login_check
.. code-block:: xml
Expand Down Expand Up @@ -373,10 +373,10 @@ submission (i.e. ``/login_check``):
# app/config/routing.yml
login:
path: /login
defaults: { _controller: AcmeSecurityBundle:Security:login }
path: /login
defaults: { _controller: AcmeSecurityBundle:Security:login }
login_check:
path: /login_check
path: /login_check
.. code-block:: xml
Expand Down Expand Up @@ -637,8 +637,8 @@ see :doc:`/cookbook/security/form_login`.
firewalls:
login_firewall:
pattern: ^/login$
anonymous: ~
pattern: ^/login$
anonymous: ~
secured_area:
pattern: ^/
form_login: ~
Expand Down Expand Up @@ -1094,13 +1094,14 @@ aren't stored anywhere in a database. The actual user object is provided
by Symfony (:class:`Symfony\\Component\\Security\\Core\\User\\User`).

.. tip::

Any user provider can load users directly from configuration by specifying
the ``users`` configuration parameter and listing the users beneath it.

.. caution::

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

.. code-block:: yaml
Expand Down
4 changes: 2 additions & 2 deletions book/translation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -452,8 +452,8 @@ by the routing system using the special ``_locale`` parameter:
.. code-block:: yaml
contact:
path: /{_locale}/contact
defaults: { _controller: AcmeDemoBundle:Contact:index, _locale: en }
path: /{_locale}/contact
defaults: { _controller: AcmeDemoBundle:Contact:index, _locale: en }
requirements:
_locale: en|fr|de
Expand Down

0 comments on commit 2a43a97

Please sign in to comment.