diff --git a/best_practices/security.rst b/best_practices/security.rst index 026c672bcaa..541325d8a4e 100644 --- a/best_practices/security.rst +++ b/best_practices/security.rst @@ -73,7 +73,7 @@ Authorization (i.e. Denying Access) Symfony gives you several ways to enforce authorization, including the ``access_control`` configuration in `security.yml`_, the :ref:`@Security annotation ` -and using :ref:`isGranted ` on the ``security.context`` +and using :ref:`isGranted ` on the ``security.context`` service directly. .. best-practice:: @@ -204,7 +204,7 @@ Now you can reuse this method both in the template and in the security expressio ... {% endif %} -.. _best-practices-directy-isGranted: +.. _best-practices-directly-isGranted: Checking Permissions without @Security -------------------------------------- @@ -351,9 +351,7 @@ develop `your own user provider`_ and `your own authentication provider`_. .. _`security.yml`: http://symfony.com/doc/current/reference/configuration/security.html .. _`ParamConverter`: http://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/annotations/converters.html .. _`@Security annotation`: http://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/annotations/security.html -.. _`security.yml`: http://symfony.com/doc/current/reference/configuration/security.html .. _`security voter`: http://symfony.com/doc/current/cookbook/security/voters_data_permission.html -.. _`Acces Control List`: http://symfony.com/doc/current/cookbook/security/acl.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 diff --git a/components/console/helpers/dialoghelper.rst b/components/console/helpers/dialoghelper.rst index 8b0730ee3e5..53a946583cd 100644 --- a/components/console/helpers/dialoghelper.rst +++ b/components/console/helpers/dialoghelper.rst @@ -258,7 +258,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())); diff --git a/components/translation/usage.rst b/components/translation/usage.rst index e6343c95f00..507d4f1c3c2 100644 --- a/components/translation/usage.rst +++ b/components/translation/usage.rst @@ -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)) diff --git a/components/var_dumper/advanced.rst b/components/var_dumper/advanced.rst index b6aae5c792e..fb261dfc157 100644 --- a/components/var_dumper/advanced.rst +++ b/components/var_dumper/advanced.rst @@ -235,4 +235,4 @@ properties not in the class declaration). .. tip:: - Before writting your own casters, you should check the existing ones. + Before writing your own casters, you should check the existing ones. diff --git a/components/var_dumper/introduction.rst b/components/var_dumper/introduction.rst index 06c7eb5816d..869c73fc6fe 100644 --- a/components/var_dumper/introduction.rst +++ b/components/var_dumper/introduction.rst @@ -67,7 +67,7 @@ DebugBundle and Twig Integration The ``DebugBundle`` allows greater integration of the component into the Symfony full stack framework. It is enabled by default in the *dev* and *test* -environement of the standard edition since version 2.6. +environment of the standard edition since version 2.6. Since generating (even debug) output in the controller or in the model of your application may just break it by e.g. sending HTTP headers or @@ -131,7 +131,7 @@ then its dump representation:: .. note:: - The gray arrow is a toggle button for hidding/showing children of + The gray arrow is a toggle button for hiding/showing children of nested structures. .. code-block:: php @@ -232,7 +232,7 @@ then its dump representation:: "When a dump goes over its maximum items limit,\n" ."or when some special objects are encountered,\n" ."children can be replaced by an ellipsis and\n" - ."optionnally followed by a number that says how\n" + ."optionally followed by a number that says how\n" ."many have been removed; `9` in this case.\n" ); dump($var); diff --git a/reference/twig_reference.rst b/reference/twig_reference.rst index 80078b2aa15..cae73adae05 100644 --- a/reference/twig_reference.rst +++ b/reference/twig_reference.rst @@ -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