8000 Rebased #3848 by wouterj · Pull Request #4126 · symfony/symfony-docs · GitHub
[go: up one dir, main page]

Skip to content

Rebased #3848 #4126

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 16, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion components/templating/introduction.rst
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ In a template:

.. note::

The global variables can be overriden by a local variable in the template
The global variables can be overridden by a local variable in the template
with the same name.

Output Escaping
Expand Down
2 changes: 1 addition & 1 deletion cookbook/assetic/asset_management.rst
Original file line number Diff line number Diff line change
Expand Up @@ -487,7 +487,7 @@ by Symfony (as the asset files are in the ``dev`` environment). This is on
purpose - letting Symfony generate these files dynamically in a production
environment is just too slow.

.. _cookbook-asetic-dump-prod:
.. _cookbook-assetic-dump-prod:

Instead, each time you use your app in the ``prod`` environment (and therefore,
each time you deploy), you should run the following task:
Expand Down
2 changes: 1 addition & 1 deletion cookbook/assetic/uglifyjs.rst
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ apply this filter when debug mode is off (e.g. ``app.php``):

To try this out, switch to your ``prod`` environment (``app.php``). But before
you do, don't forget to :ref:`clear your cache <book-page-creation-prod-cache-clear>`
and :ref:`dump your assetic assets <cookbook-asetic-dump-prod>`.
and :ref:`dump your assetic assets <cookbook-assetic-dump-prod>`.

.. tip::

Expand Down
2 changes: 1 addition & 1 deletion cookbook/doctrine/dbal.rst
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ mapping type:
'dbal' => array(
'connections' => array(
'default' => array(
// other connection parameers
// other connection parameters
'mapping_types' => array(
'enum' => 'string',
),
Expand Down
2 changes: 1 addition & 1 deletion reference/constraints/Valid.rst
B6B3
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ an ``Address`` instance in the ``$address`` property.
.. code-block:: php

// src/Acme/HelloBundle/Entity/Address.php
namespace Amce\HelloBundle\Entity;
namespace Acme\HelloBundle\Entity;

class Address
{
Expand Down
2 changes: 1 addition & 1 deletion reference/forms/types/choice.rst
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ Field Variables
| choices | ``array`` | A nested array containing the ``ChoiceView`` objects of |
| | | the remaining choices. |
+------------------------+--------------+-------------------------------------------------------------------+
| separator | ``string`` | The seperator to use between choice groups. |
| separator | ``string`` | The separator to use between choice groups. |
+------------------------+--------------+-------------------------------------------------------------------+
| empty_value | ``mixed`` | The empty value if not already in the list, otherwise |
| | | ``null``. |
Expand Down
0