From a2d39a1697d7c02a868bec953ba1b458d3a0e8af Mon Sep 17 00:00:00 2001 From: Christian Flothmann Date: Mon, 5 May 2014 18:32:22 +0200 Subject: [PATCH] fix the wording in versionadded directives --- book/forms.rst | 10 +++++----- book/routing.rst | 6 +++--- book/security.rst | 3 ++- book/testing.rst | 5 +++-- book/translation.rst | 2 +- components/config/definition.rst | 7 ++++--- components/console/events.rst | 2 +- components/debug.rst | 4 ++-- components/dependency_injection/compilation.rst | 3 ++- components/dependency_injection/lazy_services.rst | 2 +- components/filesystem.rst | 6 +++--- components/finder.rst | 2 +- components/http_foundation/introduction.rst | 3 ++- components/process.rst | 3 ++- components/property_access/introduction.rst | 8 ++++---- components/stopwatch.rst | 7 ++++--- components/translation/introduction.rst | 4 ++-- cookbook/console/logging.rst | 2 +- cookbook/console/sending_emails.rst | 10 +++++----- cookbook/form/dynamic_form_modification.rst | 4 ++-- cookbook/form/inherit_data_option.rst | 3 ++- cookbook/service_container/scopes.rst | 2 +- cookbook/templating/render_without_controller.rst | 2 +- reference/configuration/framework.rst | 10 +++++----- reference/constraints/CardScheme.rst | 2 +- reference/constraints/Currency.rst | 2 +- reference/constraints/EqualTo.rst | 2 +- reference/constraints/GreaterThan.rst | 2 +- reference/constraints/GreaterThanOrEqual.rst | 2 +- reference/constraints/IdenticalTo.rst | 2 +- reference/constraints/LessThan.rst | 2 +- reference/constraints/LessThanOrEqual.rst | 2 +- reference/constraints/Luhn.rst | 6 +++--- reference/constraints/NotEqualTo.rst | 2 +- reference/constraints/NotIdenticalTo.rst | 2 +- reference/dic_tags.rst | 4 ++-- reference/forms/types/options/disabled.rst.inc | 2 +- reference/forms/types/options/error_mapping.rst.inc | 2 +- reference/forms/types/options/inherit_data.rst.inc | 3 ++- reference/forms/types/options/property_path.rst.inc | 2 +- reference/twig_reference.rst | 4 ++-- 41 files changed, 81 insertions(+), 72 deletions(-) diff --git a/book/forms.rst b/book/forms.rst index 685f2b37ba8..693a6a973b0 100644 --- a/book/forms.rst +++ b/book/forms.rst @@ -232,10 +232,10 @@ controller:: } .. versionadded:: 2.3 - The :method:`Symfony\\Component\\Form\\FormInterface::handleRequest` method was - added in Symfony 2.3. Previously, the ``$request`` was passed to the - ``submit`` method - a strategy which is deprecated and will be removed - in Symfony 3.0. For details on that method, see :ref:`cookbook-form-submit-request`. + The :method:`Symfony\\Component\\Form\\FormInterface::handleRequest` method + was introduced in Symfony 2.3. Previously, the ``$request`` was passed + to the ``submit`` method - a strategy which is deprecated and will be + removed in Symfony 3.0. For details on that method, see :ref:`cookbook-form-submit-request`. This controller follows a common pattern for handling forms, and has three possible paths: @@ -1845,7 +1845,7 @@ but here's a short example: .. versionadded:: 2.1 The ``constraints`` option, which accepts a single constraint or an array of constraints (before 2.1, the option was called ``validation_constraint``, - and only accepted a single constraint) is new to Symfony 2.1. + and only accepted a single constraint) was introduced in Symfony 2.1. .. code-block:: php diff --git a/book/routing.rst b/book/routing.rst index 6c0fef9be6a..44024702f67 100644 --- a/book/routing.rst +++ b/book/routing.rst @@ -69,8 +69,8 @@ The route is simple: return $collection; .. versionadded:: 2.2 - The ``path`` option is new in Symfony 2.2, ``pattern`` is used in older - versions. + The ``path`` option was introduced in Symfony 2.2, ``pattern`` is used + in older versions. The path defined by the ``blog_show`` route acts like ``/blog/*`` where the wildcard is given the name ``slug``. For the URL ``/blog/my-blog-post``, @@ -704,7 +704,7 @@ be accomplished with the following route configuration: return $collection; .. versionadded:: 2.2 - The ``methods`` option is added in Symfony 2.2. Use the ``_method`` + The ``methods`` option was introduced in Symfony 2.2. Use the ``_method`` requirement in older versions. Despite the fact that these two routes have identical paths (``/contact``), diff --git a/book/security.rst b/book/security.rst index 9e38f4833ea..13a06994143 100644 --- a/book/security.rst +++ b/book/security.rst @@ -1846,7 +1846,8 @@ Utilities --------- .. versionadded:: 2.2 - The ``StringUtils`` and ``SecureRandom`` classes were added in Symfony 2.2 + The ``StringUtils`` and ``SecureRandom`` classes were introduced in Symfony + 2.2 The Symfony Security component comes with a collection of nice utilities related to security. These utilities are used by Symfony, but you should also use diff --git a/book/testing.rst b/book/testing.rst index c892fb057cb..8e1484b894d 100644 --- a/book/testing.rst +++ b/book/testing.rst @@ -408,8 +408,9 @@ Accessing internal Objects ~~~~~~~~~~~~~~~~~~~~~~~~~~ .. versionadded:: 2.3 - The ``getInternalRequest()`` and ``getInternalResponse()`` method were - added in Symfony 2.3. + The :method:`Symfony\\Component\\BrowserKit\\Client::getInternalRequest` + and :method:`Symfony\\Component\\BrowserKit\\Client::getInternalResponse` + methods were introduced in Symfony 2.3. If you use the client to test your application, you might want to access the client's internal objects:: diff --git a/book/translation.rst b/book/translation.rst index 1b0c340a548..b73e61d996c 100644 --- a/book/translation.rst +++ b/book/translation.rst @@ -308,7 +308,7 @@ texts* and complex expressions: template (in order to avoid side effects). .. versionadded:: 2.1 - The ``trans_default_domain`` tag is new in Symfony 2.1 + The ``trans_default_domain`` tag was introduced in Symfony 2.1. PHP Templates ~~~~~~~~~~~~~ diff --git a/components/config/definition.rst b/components/config/definition.rst index f84e76351ce..391b87b34a1 100644 --- a/components/config/definition.rst +++ b/components/config/definition.rst @@ -112,7 +112,7 @@ Numeric node constraints ~~~~~~~~~~~~~~~~~~~~~~~~ .. versionadded:: 2.2 - The numeric (float and integer) nodes are new in 2.2 + The numeric (float and integer) nodes were introduced in Symfony 2.2. Numeric nodes (float and integer) provide two extra constraints - :method:`Symfony\\Component\\Config\\Definition\\Builder::min` and @@ -137,7 +137,7 @@ Enum nodes ~~~~~~~~~~ .. versionadded:: 2.1 - The enum node is new in Symfony 2.1 + The enum node was introduced in Symfony 2.1. Enum nodes provide a constraint to match the given input against a set of values:: @@ -291,7 +291,8 @@ Optional Sections ----------------- .. versionadded:: 2.2 - The ``canBeEnabled`` and ``canBeDisabled`` methods are new in Symfony 2.2 + The ``canBeEnabled`` and ``canBeDisabled`` methods were introduced in + Symfony 2.2. If you have entire sections which are optional and can be enabled/disabled, you can take advantage of the shortcut diff --git a/components/console/events.rst b/components/console/events.rst index f1dd133d505..fa69da00b5b 100644 --- a/components/console/events.rst +++ b/components/console/events.rst @@ -5,7 +5,7 @@ Using Events ============ .. versionadded:: 2.3 - Console events were added in Symfony 2.3. + Console events were introduced in Symfony 2.3. The Application class of the Console component allows you to optionally hook into the lifecycle of a console application via events. Instead of reinventing diff --git a/components/debug.rst b/components/debug.rst index 0d20a13ee9a..b3eba0dd0ba 100644 --- a/components/debug.rst +++ b/components/debug.rst @@ -8,8 +8,8 @@ The Debug Component The Debug component provides tools to ease debugging PHP code. .. versionadded:: 2.3 - The Debug component is new to Symfony 2.3. Previously, the classes were - located in the HttpKernel component. + The Debug component was introduced in Symfony 2.3. Previously, the classes + were located in the HttpKernel component. Installation ------------ diff --git a/components/dependency_injection/compilation.rst b/components/dependency_injection/compilation.rst index a90110e4e65..10486f265b6 100644 --- a/components/dependency_injection/compilation.rst +++ b/components/dependency_injection/compilation.rst @@ -277,7 +277,8 @@ Prepending Configuration passed to the Extension ------------------------------------------------ .. versionadded:: 2.2 - The ability to prepend the configuration of a bundle is new in Symfony 2.2. + The ability to prepend the configuration of a bundle was introduced in + Symfony 2.2. An Extension can prepend the configuration of any Bundle before the ``load()`` method is called by implementing :class:`Symfony\\Component\\DependencyInjection\\Extension\\PrependExtensionInterface`:: diff --git a/components/dependency_injection/lazy_services.rst b/components/dependency_injection/lazy_services.rst index 8f93fbcae75..82a8ce194e1 100644 --- a/components/dependency_injection/lazy_services.rst +++ b/components/dependency_injection/lazy_services.rst @@ -5,7 +5,7 @@ Lazy Services ============= .. versionadded:: 2.3 - Lazy services were added in Symfony 2.3. + Lazy services were introduced in Symfony 2.3. Why Lazy Services? ------------------ diff --git a/components/filesystem.rst b/components/filesystem.rst index ab92e083d54..96dd7c2ba9b 100644 --- a/components/filesystem.rst +++ b/components/filesystem.rst @@ -7,8 +7,8 @@ The Filesystem Component The Filesystem component provides basic utilities for the filesystem. .. versionadded:: 2.1 - The Filesystem component is new to Symfony 2.1. Previously, the ``Filesystem`` - class was located in the HttpKernel component. + The Filesystem component was introduced in Symfony 2.1. Previously, the + ``Filesystem`` class was located in the HttpKernel component. Installation ------------ @@ -237,7 +237,7 @@ dumpFile ~~~~~~~~ .. versionadded:: 2.3 - ``dumpFile`` is new in Symfony 2.3. + The ``dumpFile()`` was introduced in Symfony 2.3. :method:`Symfony\\Component\\Filesystem\\Filesystem::dumpFile` allows you to dump contents to a file. It does this in an atomic manner: it writes a temporary diff --git a/components/finder.rst b/components/finder.rst index 59e373d3768..5131ea94375 100644 --- a/components/finder.rst +++ b/components/finder.rst @@ -207,7 +207,7 @@ Path ~~~~ .. versionadded:: 2.2 - The ``path()`` and ``notPath()`` methods were added in version 2.2. + The ``path()`` and ``notPath()`` methods were introduced in Symfony 2.2. Restrict files and directories by path with the :method:`Symfony\\Component\\Finder\\Finder::path` method:: diff --git a/components/http_foundation/introduction.rst b/components/http_foundation/introduction.rst index 5c2bfc0f78d..b44be7d9d9a 100644 --- a/components/http_foundation/introduction.rst +++ b/components/http_foundation/introduction.rst @@ -251,7 +251,8 @@ by using the following methods: returns the list of accepted charsets ordered by descending quality. .. versionadded:: 2.2 - The :class:`Symfony\\Component\\HttpFoundation\\AcceptHeader` class is new in Symfony 2.2. + The :class:`Symfony\\Component\\HttpFoundation\\AcceptHeader` class was + introduced in Symfony 2.2. If you need to get full access to parsed data from ``Accept``, ``Accept-Language``, ``Accept-Charset`` or ``Accept-Encoding``, you can use diff --git a/components/process.rst b/components/process.rst index 70afa1c7f2d..3acc2c55137 100644 --- a/components/process.rst +++ b/components/process.rst @@ -37,7 +37,8 @@ The component takes care of the subtle differences between the different platfor when executing the command. .. versionadded:: 2.2 - The ``getIncrementalOutput()`` and ``getIncrementalErrorOutput()`` methods were added in Symfony 2.2. + The ``getIncrementalOutput()`` and ``getIncrementalErrorOutput()`` methods + were introduced in Symfony 2.2. The ``getOutput()`` method always return the whole content of the standard output of the command and ``getErrorOutput()`` the content of the error diff --git a/components/property_access/introduction.rst b/components/property_access/introduction.rst index 37573f2567b..a9eb4083fd9 100644 --- a/components/property_access/introduction.rst +++ b/components/property_access/introduction.rst @@ -9,8 +9,8 @@ The PropertyAccess Component object or array using a simple string notation. .. versionadded:: 2.2 - The PropertyAccess component is new to Symfony 2.2. Previously, the - ``PropertyPath`` class was located in the Form component. + The PropertyAccess component was introduced in Symfony 2.2. Previously, + the ``PropertyPath`` class was located in the Form component. Installation ------------ @@ -34,8 +34,8 @@ default configuration:: $accessor = PropertyAccess::createPropertyAccessor(); .. versionadded:: 2.3 - Before Symfony 2.3, the :method:`Symfony\\Component\\PropertyAccess\\PropertyAccess::createPropertyAccessor` - was called ``getPropertyAccessor()``. + The :method:`Symfony\\Component\\PropertyAccess\\PropertyAccess::createPropertyAccessor` + method was introduced in Symfony 2.3. Previously, it was called ``getPropertyAccessor()``. Reading from Arrays ------------------- diff --git a/components/stopwatch.rst b/components/stopwatch.rst index e8494a75d35..e2561614204 100644 --- a/components/stopwatch.rst +++ b/components/stopwatch.rst @@ -8,8 +8,9 @@ The Stopwatch Component Stopwatch component provides a way to profile code. .. versionadded:: 2.2 - The Stopwatch component is new to Symfony 2.2. Previously, the ``Stopwatch`` - class was located in the HttpKernel component (and was new in 2.1). + The Stopwatch component was introduced in Symfony 2.2. Previously, the + ``Stopwatch`` class was located in the HttpKernel component (and was introduced + in Symfony 2.1). Installation ------------ @@ -36,7 +37,7 @@ microtime by yourself. Instead, use the simple $event = $stopwatch->stop('eventName'); The :class:`Symfony\\Component\\Stopwatch\\StopwatchEvent` object can be retrieved -from the :method:`Symfony\\Component\\Stopwatch\\Stopwatch::start`, +from the :method:`Symfony\\Component\\Stopwatch\\Stopwatch::start`, :method:`Symfony\\Component\\Stopwatch\\Stopwatch::stop` and :method:`Symfony\\Component\\Stopwatch\\Stopwatch::lap` methods. diff --git a/components/translation/introduction.rst b/components/translation/introduction.rst index ca1df51756b..963ba671ff3 100644 --- a/components/translation/introduction.rst +++ b/components/translation/introduction.rst @@ -90,8 +90,8 @@ Loader too. The default loaders are: .. versionadded:: 2.1 The ``IcuDatFileLoader``, ``IcuResFileLoader``, ``IniFileLoader``, - ``MofileLoader``, ``PoFileLoader`` and ``QtFileLoader`` were added in - Symfony 2.1 + ``MofileLoader``, ``PoFileLoader`` and ``QtFileLoader`` were introduced + in Symfony 2.1. All file loaders require the :doc:`Config component `. diff --git a/cookbook/console/logging.rst b/cookbook/console/logging.rst index 21bd1162777..6f34a75048d 100644 --- a/cookbook/console/logging.rst +++ b/cookbook/console/logging.rst @@ -73,7 +73,7 @@ To get your console application to automatically log uncaught exceptions for all of your commands, you can use :doc:`console events`. .. versionadded:: 2.3 - Console events were added in Symfony 2.3. + Console events were introduced in Symfony 2.3. First configure a listener for console exception events in the service container: diff --git a/cookbook/console/sending_emails.rst b/cookbook/console/sending_emails.rst index ccc1d1947d5..b5f1ba41cb2 100644 --- a/cookbook/console/sending_emails.rst +++ b/cookbook/console/sending_emails.rst @@ -21,7 +21,7 @@ Configuring the Request Context globally ---------------------------------------- .. versionadded: 2.2 - The ``base_url`` parameter is available since Symfony 2.2 + The ``base_url`` parameter was introduced in Symfony 2.2. To configure the Request Context - which is used by the URL Generator - you can redefine the parameters it uses as default values to change the default host @@ -98,14 +98,14 @@ the queue yourself. Use the following code to send emails inside your console command:: $message = new \Swift_Message(); - + // ... prepare the message - + $container = $this->getContainer(); $mailer = $container->get('mailer'); - + $mailer->send($message); - + // now manually flush the queue $spool = $mailer->getTransport()->getSpool(); $transport = $container->get('swiftmailer.transport.real'); diff --git a/cookbook/form/dynamic_form_modification.rst b/cookbook/form/dynamic_form_modification.rst index 51330f9dfb8..f0290bded63 100644 --- a/cookbook/form/dynamic_form_modification.rst +++ b/cookbook/form/dynamic_form_modification.rst @@ -533,8 +533,8 @@ On a form, we can usually listen to the following events: * ``POST_SUBMIT`` .. versionadded:: 2.3 - The events ``PRE_SUBMIT``, ``SUBMIT`` and ``POST_SUBMIT`` were added in - Symfony 2.3. Before, they were named ``PRE_BIND``, ``BIND`` and ``POST_BIND``. + The events ``PRE_SUBMIT``, ``SUBMIT`` and ``POST_SUBMIT`` were introduced + in Symfony 2.3. Before, they were named ``PRE_BIND``, ``BIND`` and ``POST_BIND``. .. versionadded:: 2.2.6 The behavior of the ``POST_SUBMIT`` event changed slightly in 2.2.6, which the diff --git a/cookbook/form/inherit_data_option.rst b/cookbook/form/inherit_data_option.rst index 92efc82be10..ee46305be2b 100644 --- a/cookbook/form/inherit_data_option.rst +++ b/cookbook/form/inherit_data_option.rst @@ -5,7 +5,8 @@ How to Reduce Code Duplication with "inherit_data" ================================================== .. versionadded:: 2.3 - This ``inherit_data`` option was known as ``virtual`` before Symfony 2.3. + This ``inherit_data`` option was introduced in Symfony 2.3. Before, it + was known as ``virtual``. The ``inherit_data`` form field option can be very useful when you have some duplicated fields in different entities. For example, imagine you have two diff --git a/cookbook/service_container/scopes.rst b/cookbook/service_container/scopes.rst index 2d6f8e7065a..bcbdb188fc6 100644 --- a/cookbook/service_container/scopes.rst +++ b/cookbook/service_container/scopes.rst @@ -99,7 +99,7 @@ Using a synchronized Service ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ .. versionadded:: 2.3 - Synchronized services are new in Symfony 2.3. + Synchronized services were introduced in Symfony 2.3. Injecting the container or setting your service to a narrower scope have drawbacks. For synchronized services (like the ``request``), using setter diff --git a/cookbook/templating/render_without_controller.rst b/cookbook/templating/render_without_controller.rst index 72cbdacc563..cfd96b61c7b 100644 --- a/cookbook/templating/render_without_controller.rst +++ b/cookbook/templating/render_without_controller.rst @@ -79,7 +79,7 @@ Caching the static Template .. versionadded:: 2.2 The ability to cache templates rendered via ``FrameworkBundle:Template:template`` - is new in Symfony 2.2. + was introduced in Symfony 2.2. Since templates that are rendered in this way are typically static, it might make sense to cache them. Fortunately, this is easy! By configuring a few diff --git a/reference/configuration/framework.rst b/reference/configuration/framework.rst index d0181c56408..9c36b3e1c94 100644 --- a/reference/configuration/framework.rst +++ b/reference/configuration/framework.rst @@ -62,7 +62,7 @@ http_method_override ~~~~~~~~~~~~~~~~~~~~ .. versionadded:: 2.3 - The ``http_method_override`` option is new in Symfony 2.3. + The ``http_method_override`` option was introduced in Symfony 2.3. **type**: ``Boolean`` **default**: ``true`` @@ -422,10 +422,10 @@ enabled The profiler can be disabled by setting this key to ``false``. .. versionadded:: 2.3 - - The ``collect`` option is new in Symfony 2.3. Previously, when ``profiler.enabled`` - was false, the profiler *was* actually enabled, but the collectors were - disabled. Now the profiler and collectors can be controller independently. + The ``collect`` option was introduced in Symfony 2.3. Previously, when + ``profiler.enabled`` was ``false``, the profiler *was* actually enabled, + but the collectors were disabled. Now, the profiler and the collectors + can be controlled independently. collect ....... diff --git a/reference/constraints/CardScheme.rst b/reference/constraints/CardScheme.rst index c163dd1f2e3..f8d706e665a 100644 --- a/reference/constraints/CardScheme.rst +++ b/reference/constraints/CardScheme.rst @@ -2,7 +2,7 @@ CardScheme ========== .. versionadded:: 2.2 - The CardScheme validation is new in Symfony 2.2. + The ``CardScheme`` constraint was introduced in Symfony 2.2. This constraint ensures that a credit card number is valid for a given credit card company. It can be used to validate the number before trying to initiate a payment diff --git a/reference/constraints/Currency.rst b/reference/constraints/Currency.rst index 3a2a3b1b8cf..22709f469ba 100644 --- a/reference/constraints/Currency.rst +++ b/reference/constraints/Currency.rst @@ -2,7 +2,7 @@ Currency ======== .. versionadded:: 2.3 - This constraint is new in version 2.3. + The ``Currency`` constraint was introduced in Symfony 2.3. Validates that a value is a valid `3-letter ISO 4217`_ currency name. diff --git a/reference/constraints/EqualTo.rst b/reference/constraints/EqualTo.rst index c8e36b2be4a..1079bd90430 100644 --- a/reference/constraints/EqualTo.rst +++ b/reference/constraints/EqualTo.rst @@ -2,7 +2,7 @@ EqualTo ======= .. versionadded:: 2.3 - This constraint is new in version 2.3. + The ``EqualTo`` constraint was introduced in Symfony 2.3. Validates that a value is equal to another value, defined in the options. To force that a value is *not* equal, see :doc:`/reference/constraints/NotEqualTo`. diff --git a/reference/constraints/GreaterThan.rst b/reference/constraints/GreaterThan.rst index a266a6c97cc..80439900b26 100644 --- a/reference/constraints/GreaterThan.rst +++ b/reference/constraints/GreaterThan.rst @@ -2,7 +2,7 @@ GreaterThan =========== .. versionadded:: 2.3 - This constraint is new in version 2.3. + The ``GreaterThan`` constraint was introduced in Symfony 2.3. Validates that a value is greater than another value, defined in the options. To force that a value is greater than or equal to another value, see diff --git a/reference/constraints/GreaterThanOrEqual.rst b/reference/constraints/GreaterThanOrEqual.rst index 383c572d3a8..0dfe7072dc6 100644 --- a/reference/constraints/GreaterThanOrEqual.rst +++ b/reference/constraints/GreaterThanOrEqual.rst @@ -2,7 +2,7 @@ GreaterThanOrEqual ================== .. versionadded:: 2.3 - This constraint is new in version 2.3. + The ``GreaterThanOrEqual`` constraint was introduced in Symfony 2.3. Validates that a value is greater than or equal to another value, defined in the options. To force that a value is greater than another value, see diff --git a/reference/constraints/IdenticalTo.rst b/reference/constraints/IdenticalTo.rst index 44ba134dcd1..ea010607dd9 100644 --- a/reference/constraints/IdenticalTo.rst +++ b/reference/constraints/IdenticalTo.rst @@ -2,7 +2,7 @@ IdenticalTo =========== .. versionadded:: 2.3 - This constraint is new in version 2.3. + The ``IdenticalTo`` constraint was introduced in Symfony 2.3. Validates that a value is identical to another value, defined in the options. To force that a value is *not* identical, see diff --git a/reference/constraints/LessThan.rst b/reference/constraints/LessThan.rst index 2ae57eee0a7..849b157bc0a 100644 --- a/reference/constraints/LessThan.rst +++ b/reference/constraints/LessThan.rst @@ -2,7 +2,7 @@ LessThan ======== .. versionadded:: 2.3 - This constraint is new in version 2.3. + The ``LessThan`` constraint was introduced in Symfony 2.3. Validates that a value is less than another value, defined in the options. To force that a value is less than or equal to another value, see diff --git a/reference/constraints/LessThanOrEqual.rst b/reference/constraints/LessThanOrEqual.rst index e1b56e32e05..d706ac20693 100644 --- a/reference/constraints/LessThanOrEqual.rst +++ b/reference/constraints/LessThanOrEqual.rst @@ -2,7 +2,7 @@ LessThanOrEqual =============== .. versionadded:: 2.3 - This constraint is new in version 2.3. + The ``LessThanOrEqual`` constraint was introduced in Symfony 2.3. Validates that a value is less than or equal to another value, defined in the options. To force that a value is less than another value, see diff --git a/reference/constraints/Luhn.rst b/reference/constraints/Luhn.rst index 07bd8bd2dda..cdb55c7f156 100644 --- a/reference/constraints/Luhn.rst +++ b/reference/constraints/Luhn.rst @@ -2,7 +2,7 @@ Luhn ==== .. versionadded:: 2.2 - The Luhn validation is new in Symfony 2.2. + The ``Luhn`` constraint was introduced in Symfony 2.2. This constraint is used to ensure that a credit card number passes the `Luhn algorithm`_. It is useful as a first step to validating a credit card: before communicating with a @@ -39,7 +39,7 @@ will contain a credit card number. // src/Acme/SubscriptionBundle/Entity/Transaction.php namespace Acme\SubscriptionBundle\Entity\Transaction; - + use Symfony\Component\Validator\Constraints as Assert; class Transaction @@ -71,7 +71,7 @@ will contain a credit card number. // src/Acme/SubscriptionBundle/Entity/Transaction.php namespace Acme\SubscriptionBundle\Entity\Transaction; - + use Symfony\Component\Validator\Mapping\ClassMetadata; use Symfony\Component\Validator\Constraints as Assert; diff --git a/reference/constraints/NotEqualTo.rst b/reference/constraints/NotEqualTo.rst index 6805a425599..0e2e9f7593d 100644 --- a/reference/constraints/NotEqualTo.rst +++ b/reference/constraints/NotEqualTo.rst @@ -2,7 +2,7 @@ NotEqualTo ========== .. versionadded:: 2.3 - This constraint is new in version 2.3. + The ``NotEqualTo`` constraint was introduced in Symfony 2.3. Validates that a value is **not** equal to another value, defined in the options. To force that a value is equal, see diff --git a/reference/constraints/NotIdenticalTo.rst b/reference/constraints/NotIdenticalTo.rst index d83ef989ae6..9a70d41c571 100644 --- a/reference/constraints/NotIdenticalTo.rst +++ b/reference/constraints/NotIdenticalTo.rst @@ -2,7 +2,7 @@ NotIdenticalTo ============== .. versionadded:: 2.3 - This constraint is new in version 2.3. + The ``NotIdenticalTo`` constraint was introduced in Symfony 2.3. Validates that a value is **not** identical to another value, defined in the options. To force that a value is identical, see diff --git a/reference/dic_tags.rst b/reference/dic_tags.rst index e39e2dedb77..0fbed08d7d8 100644 --- a/reference/dic_tags.rst +++ b/reference/dic_tags.rst @@ -991,7 +991,7 @@ translation.extractor **Purpose**: To register a custom service that extracts messages from a file .. versionadded:: 2.1 - The ability to add message extractors is new in Symfony 2.1. + The ability to add message extractors was introduced in Symfony 2.1. When executing the ``translation:update`` command, it uses extractors to extract translation messages from a file. By default, the Symfony2 framework @@ -1062,7 +1062,7 @@ translation.dumper **Purpose**: To register a custom service that dumps messages to a file .. versionadded:: 2.1 - The ability to add message dumpers is new in Symfony 2.1. + The ability to add message dumpers was introduced in Symfony 2.1. After an `Extractor `_ has extracted all messages from the templates, the dumpers are executed to dump the messages to a translation diff --git a/reference/forms/types/options/disabled.rst.inc b/reference/forms/types/options/disabled.rst.inc index 89e8177a6e3..50d100a1f37 100644 --- a/reference/forms/types/options/disabled.rst.inc +++ b/reference/forms/types/options/disabled.rst.inc @@ -2,7 +2,7 @@ disabled ~~~~~~~~ .. versionadded:: 2.1 - The ``disabled`` option is new in version 2.1 + The ``disabled`` option was introduced in Symfony 2.1. **type**: ``boolean`` **default**: ``false`` diff --git a/reference/forms/types/options/error_mapping.rst.inc b/reference/forms/types/options/error_mapping.rst.inc index e2af2edebad..115d446d9b5 100644 --- a/reference/forms/types/options/error_mapping.rst.inc +++ b/reference/forms/types/options/error_mapping.rst.inc @@ -4,7 +4,7 @@ error_mapping **type**: ``array`` **default**: ``empty`` .. versionadded:: 2.1 - The ``error_mapping`` option is new to Symfony 2.1. + The ``error_mapping`` option was introduced in Symfony 2.1. This option allows you to modify the target of a validation error. diff --git a/reference/forms/types/options/inherit_data.rst.inc b/reference/forms/types/options/inherit_data.rst.inc index 5537c1aa51c..3b789db9f25 100644 --- a/reference/forms/types/options/inherit_data.rst.inc +++ b/reference/forms/types/options/inherit_data.rst.inc @@ -2,7 +2,8 @@ inherit_data ~~~~~~~~~~~~ .. versionadded:: 2.3 - This option was known as ``virtual`` before Symfony 2.3. + The ``inherit_data`` option was introduced in Symfony 2.3. Before, it + was known as ``virtual``. **type**: ``boolean`` **default**: ``false`` diff --git a/reference/forms/types/options/property_path.rst.inc b/reference/forms/types/options/property_path.rst.inc index 797ea2a5784..e6661fcfeea 100644 --- a/reference/forms/types/options/property_path.rst.inc +++ b/reference/forms/types/options/property_path.rst.inc @@ -16,4 +16,4 @@ you can set the ``property_path`` option to ``false``, but using ``mapped`` option. .. versionadded:: 2.1 - Since 2.1, the ``mapped`` option has been added for this use-case. + The ``mapped`` option was introduced in Symfony 2.1 for this use-case. diff --git a/reference/twig_reference.rst b/reference/twig_reference.rst index 7fb080bddc4..6a237ca4b15 100644 --- a/reference/twig_reference.rst +++ b/reference/twig_reference.rst @@ -18,8 +18,8 @@ Functions --------- .. versionadded:: 2.2 - The ``render`` and ``controller`` functions are new in Symfony 2.2. Prior, - the ``{% render %}`` tag was used and had a different signature. + The ``render`` and ``controller`` functions were introduced in Symfony + 2.2. Prior, the ``{% render %}`` tag was used and had a different signature. +----------------------------------------------------+--------------------------------------------------------------------------------------------+ | Function Syntax | Usage |