From a669ceb1ea7e6297a8aba9e602b33a69271f3c7d Mon Sep 17 00:00:00 2001 From: Oskar Stark Date: Thu, 28 Mar 2019 09:22:12 +0100 Subject: [PATCH] use application(s) instead of app(s) --- components/mercure.rst | 2 +- configuration/front_controllers_and_kernel.rst | 2 +- email.rst | 4 ++-- form/form_themes.rst | 12 ++++++------ frontend/assetic/index.rst | 2 +- mercure.rst | 4 ++-- security.rst | 2 +- security/user_provider.rst | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/components/mercure.rst b/components/mercure.rst index 384bea479b2..4c566c7ade2 100644 --- a/components/mercure.rst +++ b/components/mercure.rst @@ -9,7 +9,7 @@ The Mercure Component browsers and other HTTP clients in a convenient, fast, reliable and battery-friendly way. It is especially useful to publish real-time updates of resources served - through web APIs, to reactive web and mobile apps. + through web APIs, to reactive web and mobile applications. The Mercure Component implements the "publisher" part of the Mercure Protocol. diff --git a/configuration/front_controllers_and_kernel.rst b/configuration/front_controllers_and_kernel.rst index a9035571370..9acb4a5245e 100644 --- a/configuration/front_controllers_and_kernel.rst +++ b/configuration/front_controllers_and_kernel.rst @@ -74,7 +74,7 @@ It then creates the service container before serving requests in its :method:`Symfony\\Component\\HttpKernel\\HttpKernelInterface::handle` method. -The kernel used in Symfony apps extends from :class:`Symfony\\Component\\HttpKernel\\Kernel` +The kernel used in Symfony applications extends from :class:`Symfony\\Component\\HttpKernel\\Kernel` and uses the :class:`Symfony\\Bundle\\FrameworkBundle\\Kernel\\MicroKernelTrait`. The ``Kernel`` class leaves some methods from :class:`Symfony\\Component\\HttpKernel\\KernelInterface` unimplemented and the ``MicroKernelTrait`` defines several abstract methods, so diff --git a/email.rst b/email.rst index 63308647dcb..29bb7a1d171 100644 --- a/email.rst +++ b/email.rst @@ -139,7 +139,7 @@ other encryption or auth mode, you must override those values If your Gmail account uses 2-Step-Verification, you must `generate an App password`_ and use it as the value of the mailer password. You must also ensure that you -`allow less secure apps to access your Gmail account`_. +`allow less secure applications to access your Gmail account`_. Using Cloud Services to Send Emails ----------------------------------- @@ -175,5 +175,5 @@ Learn more .. _`SendGrid`: https://sendgrid.com/ .. _`Amazon SES`: http://aws.amazon.com/ses/ .. _`generate an App password`: https://support.google.com/accounts/answer/185833 -.. _`allow less secure apps to access your Gmail account`: https://support.google.com/accounts/answer/6010255 +.. _`allow less secure applications to access your Gmail account`: https://support.google.com/accounts/answer/6010255 .. _`RFC 3986`: https://www.ietf.org/rfc/rfc3986.txt diff --git a/form/form_themes.rst b/form/form_themes.rst index 8bd7482afb1..e8b1640e89b 100644 --- a/form/form_themes.rst +++ b/form/form_themes.rst @@ -18,8 +18,8 @@ great when using some of the most popular CSS frameworks. Each theme is defined in a single Twig template: * `form_div_layout.html.twig`_, wraps each form field inside a ``
`` element - and it's the theme used by default in Symfony apps unless you configure it as - explained later in this article. + and it's the theme used by default in Symfony applications unless you configure + it as explained later in this article. * `form_table_layout.html.twig`_, wraps the entire form inside a ```` element and each form field inside a ```` element. * `bootstrap_3_layout.html.twig`_, wraps each form field inside a ``
`` @@ -157,9 +157,9 @@ Disabling Global Themes for Single Forms Global form themes defined in the app are always applied to all forms, even those which use the ``form_theme`` tag to apply their own themes. You may want to disable this for example when creating an admin interface for a bundle which -can be installed on different Symfony apps (and so you can't control what themes -are enabled globally). To do that, add the ``only`` keyword after the list of -form themes: +can be installed on different Symfony applications (and so you can't control what +themes are enabled globally). To do that, add the ``only`` keyword after the list +of form themes: .. code-block:: twig @@ -406,7 +406,7 @@ Creating a Form Theme in a Separate Template ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ This is recommended when creating form themes that are used in your entire app -or even reused in different Symfony apps. You only need to create a Twig +or even reused in different Symfony applications. You only need to create a Twig template somewhere and follow the :ref:`form fragment naming ` rules to know which Twig blocks to define. diff --git a/frontend/assetic/index.rst b/frontend/assetic/index.rst index 76434529920..63955c9f8dd 100644 --- a/frontend/assetic/index.rst +++ b/frontend/assetic/index.rst @@ -5,4 +5,4 @@ Assetic Using Assetic to manage web assets in Symfony applications is no longer recommended. Instead, use :doc:`Webpack Encore `, which bridges - Symfony apps with modern JavaScript-based tools to manage web assets. + Symfony applications with modern JavaScript-based tools to manage web assets. diff --git a/mercure.rst b/mercure.rst index 108d3530e65..34d6ea6231c 100644 --- a/mercure.rst +++ b/mercure.rst @@ -523,8 +523,8 @@ hypermedia API, and automatic update broadcasting through the Mercure hub:: } As showcased `in this recording`_, the API Platform Client Generator also -allows to scaffold complete React and React Native apps from this API. -These apps will render the content of Mercure updates in real-time. +allows to scaffold complete React and React Native applications from this API. +These applications will render the content of Mercure updates in real-time. Checkout `the dedicated API Platform documentation`_ to learn more about its Mercure support. diff --git a/security.rst b/security.rst index 340123a5163..87cdc225feb 100644 --- a/security.rst +++ b/security.rst @@ -109,7 +109,7 @@ here: :doc:`User Providers `. 2c) Encoding Passwords ---------------------- -Not all apps have "users" that need passwords. *If* your users have passwords, +Not all applications have "users" that need passwords. *If* your users have passwords, you can control how those passwords are encoded in ``security.yaml``. The ``make:user`` command will pre-configure this for you: diff --git a/security/user_provider.rst b/security/user_provider.rst index b1bf2b8b1f5..a6df9e76a4f 100644 --- a/security/user_provider.rst +++ b/security/user_provider.rst @@ -208,8 +208,8 @@ Memory User Provider -------------------- It's not recommended to use this provider in real applications because of its -limitations and how difficult it is to manage users. It may be useful in app -prototypes and for limited apps that don't store users in databases. +limitations and how difficult it is to manage users. It may be useful in application +prototypes and for limited applications that don't store users in databases. This user provider stores all user information in a configuration file, including their passwords. That's why the first step is to configure how these