Skip to content

Commit

Permalink
minor #4531 [symfony] [Hackday] Fixed typos (pborreli)
Browse files Browse the repository at this point in the history
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #4531).

Discussion
----------

[symfony] [Hackday] Fixed typos

Commits
-------

8ffe8a9 Fixed typos
  • Loading branch information
weaverryan committed Dec 7, 2014
2 parents 71495e8 + 8ffe8a9 commit 107610e
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 5 deletions.
6 changes: 4 additions & 2 deletions best_practices/security.rst
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ Authorization (i.e. Denying Access)
Symfony gives you several ways to enforce authorization, including the ``access_control``
configuration in :doc:`security.yml </reference/configuration/security>` the
:ref:`@Security annotation <best-practices-security-annotation>` and using
:ref:`isGranted <best-practices-directy-isGranted>` on the ``security.context``
:ref:`isGranted <best-practices-directly-isGranted>` on the ``security.context``
service directly.

.. best-practice::
Expand Down Expand Up @@ -206,7 +206,7 @@ Now you can reuse this method both in the template and in the security expressio
<a href=""> ... </a>
{% endif %}

.. _best-practices-directy-isGranted:
.. _best-practices-directly-isGranted:

Checking Permissions without @Security
--------------------------------------
Expand Down Expand Up @@ -352,5 +352,7 @@ develop :doc:`your own user provider </cookbook/security/custom_provider>` and

.. _`ParamConverter`: http://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/annotations/converters.html
.. _`@Security annotation`: http://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/annotations/security.html
.. _`security voter`: http://symfony.com/doc/current/cookbook/security/voters_data_permission.html
.. _`ACL's`: http://symfony.com/doc/current/cookbook/security/acl.html
.. _`expression`: http://symfony.com/doc/current/components/expression_language/introduction.html
.. _`FOSUserBundle`: https://github.com/FriendsOfSymfony/FOSUserBundle
2 changes: 1 addition & 1 deletion components/console/helpers/dialoghelper.rst
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ from the command line, you need to overwrite the HelperSet used by the command::

$dialog = $command->getHelper('dialog');
$dialog->setInputStream($this->getInputStream("Test\n"));
// Equals to a user inputing "Test" and hitting ENTER
// Equals to a user inputting "Test" and hitting ENTER
// If you need to enter a confirmation, "yes\n" will work

$commandTester->execute(array('command' => $command->getName()));
Expand Down
2 changes: 1 addition & 1 deletion components/translation/usage.rst
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ Pluralization
-------------

Message pluralization is a tough topic as the rules can be quite complex. For
instance, here is the mathematic representation of the Russian pluralization
instance, here is the mathematical representation of the Russian pluralization
rules::

(($number % 10 == 1) && ($number % 100 != 11))
Expand Down
2 changes: 1 addition & 1 deletion reference/twig_reference.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Symfony Twig Extensions

Twig is the default template engine for Symfony. By itself, it already contains
a lot of built-in functions, filters, tags and tests (learn more about them
from the the `Twig Reference`_).
from the `Twig Reference`_).

Symfony adds more custom extensions on top of Twig to integrate some components
into the Twig templates. You can find more information about the custom
Expand Down

0 comments on commit 107610e

Please sign in to comment.