From 18e7934c51e2486bd1d74da1675e09255767776e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Paris?= Date: Fri, 13 Jan 2017 11:45:33 +0100 Subject: [PATCH] Use preferred spelling for "cannot" "can not" is technically correct (see http://www.dailywritingtips.com/cannot-or-can-not/), but less recommended, it seems. --- components/console/helpers/dialoghelper.rst | 2 +- components/console/helpers/questionhelper.rst | 2 +- components/process.rst | 2 +- components/var_dumper.rst | 2 +- controller/soap_web_service.rst | 2 +- doctrine/event_listeners_subscribers.rst | 2 +- reference/forms/types/button.rst | 2 +- reference/forms/types/form.rst | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/components/console/helpers/dialoghelper.rst b/components/console/helpers/dialoghelper.rst index 70176801257..645aaac9fa7 100644 --- a/components/console/helpers/dialoghelper.rst +++ b/components/console/helpers/dialoghelper.rst @@ -156,7 +156,7 @@ You can also ask and validate a hidden response:: $validator = function ($value) { if ('' === trim($value)) { - throw new \Exception('The password can not be empty'); + throw new \Exception('The password cannot be empty'); } return $value; diff --git a/components/console/helpers/questionhelper.rst b/components/console/helpers/questionhelper.rst index 7d11dc17861..f3376ae49a3 100644 --- a/components/console/helpers/questionhelper.rst +++ b/components/console/helpers/questionhelper.rst @@ -299,7 +299,7 @@ You can also use a validator with a hidden question:: $question = new Question('Please enter your password'); $question->setValidator(function ($value) { if (trim($value) == '') { - throw new \Exception('The password can not be empty'); + throw new \Exception('The password cannot be empty'); } return $value; diff --git a/components/process.rst b/components/process.rst index 15823fc996a..30c87c1000f 100644 --- a/components/process.rst +++ b/components/process.rst @@ -323,7 +323,7 @@ Use :method:`Symfony\\Component\\Process\\Process::disableOutput` and .. caution:: - You can not enable or disable the output while the process is running. + You cannot enable or disable the output while the process is running. If you disable the output, you cannot access ``getOutput()``, ``getIncrementalOutput()``, ``getErrorOutput()`` or ``getIncrementalErrorOutput()``. diff --git a/components/var_dumper.rst b/components/var_dumper.rst index bd6babfb8f7..5c87cd78fc7 100644 --- a/components/var_dumper.rst +++ b/components/var_dumper.rst @@ -91,7 +91,7 @@ of your application may just break it by e.g. sending HTTP headers or corrupting your view, the bundle configures the ``dump()`` function so that variables are dumped in the web debug toolbar. -But if the toolbar can not be displayed because you e.g. called ``die``/``exit`` +But if the toolbar cannot be displayed because you e.g. called ``die``/``exit`` or a fatal error occurred, then dumps are written on the regular output. In a Twig template, two constructs are available for dumping a variable. diff --git a/controller/soap_web_service.rst b/controller/soap_web_service.rst index 16e74d48b15..6a2fe21940e 100644 --- a/controller/soap_web_service.rst +++ b/controller/soap_web_service.rst @@ -8,7 +8,7 @@ How to Create a SOAP Web Service in a Symfony Controller Setting up a controller to act as a SOAP server is simple with a couple tools. You must, of course, have the `PHP SOAP`_ extension installed. -As the PHP SOAP extension can not currently generate a WSDL, you must either +As the PHP SOAP extension cannot currently generate a WSDL, you must either create one from scratch or use a 3rd party generator. .. note:: diff --git a/doctrine/event_listeners_subscribers.rst b/doctrine/event_listeners_subscribers.rst index 8278efba4b3..cc785646524 100644 --- a/doctrine/event_listeners_subscribers.rst +++ b/doctrine/event_listeners_subscribers.rst @@ -207,7 +207,7 @@ interface and have an event method for each event it subscribes to:: .. tip:: - Doctrine event subscribers can not return a flexible array of methods to + Doctrine event subscribers cannot return a flexible array of methods to call for the events like the :ref:`Symfony event subscriber ` can. Doctrine event subscribers must return a simple array of the event names they subscribe to. Doctrine will then expect methods on the subscriber diff --git a/reference/forms/types/button.rst b/reference/forms/types/button.rst index 20fbf3030dd..0a9809caeb1 100644 --- a/reference/forms/types/button.rst +++ b/reference/forms/types/button.rst @@ -29,7 +29,7 @@ The following options are defined in the :class:`Symfony\\Component\\Form\\Extension\\Core\\Type\\BaseType` class. The ``BaseType`` class is the parent class for both the ``button`` type and the :doc:`form type `, but it is not part -of the form type tree (i.e. it can not be used as a form type on its own). +of the form type tree (i.e. it cannot be used as a form type on its own). .. include:: /reference/forms/types/options/button_attr.rst.inc diff --git a/reference/forms/types/form.rst b/reference/forms/types/form.rst index a2ed009fb9d..b7d0e8e96f5 100644 --- a/reference/forms/types/form.rst +++ b/reference/forms/types/form.rst @@ -150,7 +150,7 @@ The following options are defined in the :class:`Symfony\\Component\\Form\\Extension\\Core\\Type\\BaseType` class. The ``BaseType`` class is the parent class for both the ``form`` type and the :doc:`button type `, but it is not part -of the form type tree (i.e. it can not be used as a form type on its own). +of the form type tree (i.e. it cannot be used as a form type on its own). .. include:: /reference/forms/types/options/attr.rst.inc