Skip to content

Commit 0b5d88c

Browse files
committed
minor #10535 review doc chapters for belittling words (dbu)
This PR was merged into the 4.1 branch. Discussion ---------- review doc chapters for belittling words and a rather hefty chunk of changes for symfony/diversity#9 i hope this one has not gotten too big. Commits ------- 84e6684 review doc chapter for belittling words
2 parents 208c0c8 + 84e6684 commit 0b5d88c

File tree

101 files changed

+205
-208
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

101 files changed

+205
-208
lines changed

bundles/best_practices.rst

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ vendor segment, followed by zero or more category segments, and it ends with the
2323
namespace short name, which must end with ``Bundle``.
2424

2525
A namespace becomes a bundle as soon as you add a bundle class to it. The
26-
bundle class name must follow these simple rules:
26+
bundle class name must follow these rules:
2727

2828
* Use only alphanumeric characters and underscores;
2929
* Use a StudlyCaps name (i.e. camelCase with the first letter uppercased);
@@ -467,8 +467,9 @@ Retrieve the configuration parameters in your code from the container::
467467

468468
$container->getParameter('acme_blog.author.email');
469469

470-
Even if this mechanism is simple enough, you should consider using the more
471-
advanced :doc:`semantic bundle configuration </bundles/configuration>`.
470+
While this mechanism requires the least effort, you should consider using the
471+
more advanced :doc:`semantic bundle configuration </bundles/configuration>` to
472+
make your configuration more robust.
472473

473474
Versioning
474475
----------

bundles/override.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ the routes from any bundle, then they must be manually imported from somewhere
6868
in your application (e.g. ``config/routes.yaml``).
6969

7070
The easiest way to "override" a bundle's routing is to never import it at
71-
all. Instead of importing a third-party bundle's routing, simply copy
71+
all. Instead of importing a third-party bundle's routing, copy
7272
that routing file into your application, modify it, and import it instead.
7373

7474
Controllers

configuration/configuration_organization.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ How to Organize Configuration Files
55
===================================
66

77
The Symfony skeleton defines three :doc:`execution environments </configuration/environments>`
8-
called ``dev``, ``prod`` and ``test``. An environment simply represents a way
8+
called ``dev``, ``prod`` and ``test``. An environment represents a way
99
to execute the same codebase with different configurations.
1010

1111
In order to select the configuration file to load for each environment, Symfony
@@ -129,9 +129,9 @@ Global Configuration Files
129129

130130
Some system administrators may prefer to store sensitive parameters in files
131131
outside the project directory. Imagine that the database credentials for your
132-
website are stored in the ``/etc/sites/mysite.com/parameters.yaml`` file. Loading
133-
this file is as simple as indicating the full file path when importing it from
134-
any other configuration file:
132+
website are stored in the ``/etc/sites/mysite.com/parameters.yaml`` file. You
133+
can load files from outside the project folder by indicating the full file path
134+
when importing it from any other configuration file:
135135

136136
.. configuration-block::
137137

configuration/environments.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ Creating a new Environment
199199
--------------------------
200200

201201
Since an environment is nothing more than a string that corresponds to a set of
202-
configuration, creating a new environment is quite easy.
202+
configuration, you can also create your own environments for specific purposes.
203203

204204
Suppose, for example, that before deployment, you need to benchmark your
205205
application. One way to benchmark the application is to use near-production
@@ -355,7 +355,7 @@ includes the following:
355355

356356
.. note::
357357

358-
You can easily change the directory location and name. For more information
358+
You can change the directory location and name. For more information
359359
read the article :doc:`/configuration/override_dir_structure`.
360360

361361
Going further

configuration/front_controllers_and_kernel.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ You can choose the front controller that's used by adding it in the URL, like:
5151
http://localhost/index.php/some/path/...
5252
5353
As you can see, this URL contains the PHP script to be used as the front
54-
controller. You can use that to easily switch to a custom made front controller
54+
controller. You can use that to switch to a custom made front controller
5555
that is located in the ``public/`` directory.
5656

5757
.. seealso::
@@ -123,7 +123,7 @@ controller to make use of the new kernel.
123123
The Environments
124124
----------------
125125

126-
As just mentioned, the ``Kernel`` has to implement another method -
126+
As mentioned above, the ``Kernel`` has to implement another method -
127127
:method:`Symfony\\Bundle\\FrameworkBundle\\Kernel\\MicroKernelTrait::configureContainer`.
128128
This method is responsible for loading the application's configuration from the
129129
right *environment*.

configuration/micro_kernel_trait.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ The default ``Kernel`` class included in Symfony applications uses a
55
:class:`Symfony\\Bundle\\FrameworkBundle\\Kernel\\MicroKernelTrait` to configure
66
the bundles, the routes and the service container in the same class.
77

8-
This micro-kernel approach is so flexible that let you control your application
9-
structure and features quite easily.
8+
This micro-kernel approach is flexible, allowing you to control your application
9+
structure and features.
1010

1111
A Single-File Symfony Application
1212
---------------------------------

configuration/multiple_kernels.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ According to the above code, this config will live in one or multiple files
124124
stored in ``config/api/`` and ``config/api/ENVIRONMENT_NAME/`` directories.
125125

126126
The new configuration files can be created from scratch when you load just a few
127-
bundles, because it will be very simple. Otherwise, duplicate the existing
127+
bundles, because it will be small. Otherwise, duplicate the existing
128128
config files in ``config/packages/`` or better, import them and override the
129129
needed options.
130130

configuration/override_dir_structure.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ How to Override Symfony's default Directory Structure
55
=====================================================
66

77
Symfony automatically ships with a default directory structure. You can
8-
easily override this directory structure to create your own. The default
8+
override this directory structure to create your own. The default
99
directory structure is:
1010

1111
.. code-block:: text

console/input.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ to greet all your friends). Only the last argument can be a list::
7171
'Who do you want to greet (separate multiple names with a space)?'
7272
);
7373

74-
To use this, just specify as many names as you want:
74+
To use this, specify as many names as you want:
7575

7676
.. code-block:: terminal
7777

console/lazy_commands.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ Built-in Command Loaders
4242
~~~~~~~~~~~~~~~~~~~~~~~~
4343

4444
The :class:`Symfony\\Component\\Console\\CommandLoader\\FactoryCommandLoader`
45-
class provides a simple way of getting commands lazily loaded as it takes an
45+
class provides a way of getting commands lazily loaded as it takes an
4646
array of ``Command`` factories as its only constructor argument::
4747

4848
use Symfony\Component\Console\CommandLoader\FactoryCommandLoader;

0 commit comments

Comments
 (0)