Skip to content

Commit 3955a4b

Browse files
committed
Replace "chapter" by "article" where appropriate
1 parent 0607517 commit 3955a4b

34 files changed

+84
-85
lines changed

components/yaml/yaml_format.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ According to the official `YAML`_ website, YAML is "a human friendly data
88
serialization standard for all programming languages".
99

1010
Even if the YAML format can describe complex nested data structure, this
11-
chapter only describes the minimum set of features needed to use YAML as a
11+
article only describes the minimum set of features needed to use YAML as a
1212
configuration file format.
1313

1414
YAML is a simple language that describes data. As PHP, it has a syntax for

configuration.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ specific bundle (i.e. ``FrameworkBundle`` and ``TwigBundle``).
9595

9696
.. sidebar:: Configuration Formats
9797

98-
Throughout the chapters, all configuration examples will be shown in
98+
Throughout the documentation, all configuration examples will be shown in
9999
three formats (YAML, XML and PHP). YAML is used by default, but you can
100100
choose whatever you like best. There is no performance difference:
101101

configuration/external_parameters.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
How to Set external Parameters in the Service Container
55
=======================================================
66

7-
In the chapter :doc:`/configuration`, you learned how to manage your application
8-
configuration. At times, it may benefit your application
9-
to store certain credentials outside of your project code. Database configuration
10-
is one such example. The flexibility of the Symfony service container allows
11-
you to easily do this.
7+
In the article :doc:`/configuration`, you learned how to manage your application
8+
configuration. At times, it may benefit your application to store certain
9+
credentials outside of your project code. Database configuration is one such
10+
example. The flexibility of the Symfony service container allows you to easily
11+
do this.
1212

1313
Environment Variables
1414
---------------------

configuration/front_controllers_and_kernel.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ This method is responsible for loading the application's
144144
configuration from the right *environment*.
145145

146146
Environments have been covered extensively
147-
:doc:`in the previous chapter </configuration/environments>`,
147+
:doc:`in the previous article </configuration/environments>`,
148148
and you probably remember that the Symfony Standard Edition comes with three
149149
of them - ``dev``, ``prod`` and ``test``.
150150

contributing/documentation/overview.rst

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -126,9 +126,9 @@ memorable name for the new branch (if you are fixing a reported issue, use
126126

127127
.. code-block:: terminal
128128
129-
$ git checkout -b improve_install_chapter upstream/2.7
129+
$ git checkout -b improve_install_article upstream/2.7
130130
131-
In this example, the name of the branch is ``improve_install_chapter`` and the
131+
In this example, the name of the branch is ``improve_install_article`` and the
132132
``upstream/2.7`` value tells Git to create this branch based on the ``2.7``
133133
branch of the ``upstream`` remote, which is the original Symfony Docs repository.
134134

@@ -151,10 +151,10 @@ even remove any content and do your best to comply with the
151151

152152
.. code-block:: terminal
153153
154-
$ git push origin improve_install_chapter
154+
$ git push origin improve_install_article
155155
156156
The ``origin`` value is the name of the Git remote that corresponds to your
157-
forked repository and ``improve_install_chapter`` is the name of the branch you
157+
forked repository and ``improve_install_article`` is the name of the branch you
158158
created previously.
159159

160160
**Step 7.** Everything is now ready to initiate a **pull request**. Go to your
@@ -171,7 +171,7 @@ changes should be applied:
171171
In this example, the **base fork** should be ``symfony/symfony-docs`` and
172172
the **base** branch should be the ``2.7``, which is the branch that you selected
173173
to base your changes on. The **head fork** should be your forked copy
174-
of ``symfony-docs`` and the **compare** branch should be ``improve_install_chapter``,
174+
of ``symfony-docs`` and the **compare** branch should be ``improve_install_article``,
175175
which is the name of the branch you created and where you made your changes.
176176

177177
.. _pull-request-format:
@@ -192,7 +192,7 @@ changes and push the new changes:
192192
.. code-block:: terminal
193193
194194
$ cd projects/symfony-docs/
195-
$ git checkout improve_install_chapter
195+
$ git checkout improve_install_article
196196
197197
# ... do your changes
198198

controller.rst

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -184,12 +184,12 @@ and ``redirect()`` methods::
184184
The ``redirectToRoute()`` method was introduced in Symfony 2.6. Previously (and still now), you
185185
could use ``redirect()`` and ``generateUrl()`` together for this.
186186

187-
For more information, see the :doc:`Routing chapter </routing>`.
187+
For more information, see the :doc:`Routing article </routing>`.
188188

189189
.. caution::
190190

191-
The ``redirect()`` method does not check its destination in any way. If you
192-
redirect to some URL provided by the end-users, your application may be open
191+
The ``redirect()`` method does not check its destination in any way. If you
192+
redirect to some URL provided by the end-users, your application may be open
193193
to the `unvalidated redirects security vulnerability`_.
194194

195195

@@ -230,7 +230,7 @@ creating unnecessarily deep structures::
230230
));
231231

232232
The Symfony templating system and Twig are explained more in the
233-
:doc:`Creating and Using Templates chapter </templating>`.
233+
:doc:`Creating and Using Templates article </templating>`.
234234

235235
.. index::
236236
single: Controller; Accessing services
@@ -266,7 +266,7 @@ console command:
266266
.. versionadded:: 2.6
267267
Prior to Symfony 2.6, this command was called ``container:debug``.
268268

269-
For more information, see the :doc:`/service_container` chapter.
269+
For more information, see the :doc:`/service_container` article.
270270

271271
.. tip::
272272

@@ -548,7 +548,7 @@ A) Shortcut methods (like ``render()`` and ``redirectToRoute()``);
548548
B) Access to *all* of the useful objects (services) in the system via the
549549
:ref:`get() <controller-accessing-services>` method.
550550

551-
In other chapters, you'll learn how to use specific services from inside your controller
551+
In other articles, you'll learn how to use specific services from inside your controller
552552
that will help you persist and fetch objects from a database, process form submissions,
553553
handle caching and more.
554554

doctrine/registration_form.rst

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ encoder in the security configuration:
290290
<encoder class="AppBundle\Entity\User">bcrypt</encoder>
291291
</config>
292292
</srv:container>
293-
293+
294294
.. code-block:: php
295295
296296
// app/config/security.php
@@ -302,9 +302,8 @@ encoder in the security configuration:
302302
),
303303
));
304304
305-
In this case the recommended ``bcrypt`` algorithm is used. To learn more
306-
about how to encode the users password have a look into the
307-
:ref:`security chapter <security-encoding-user-password>`.
305+
In this case the recommended ``bcrypt`` algorithm is used. If needed, check out
306+
the :ref:`user password encoding <security-encoding-user-password>` article.
308307

309308
.. note::
310309

form/csrf_protection.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ using a CSRF token inside your forms.
1111

1212
The good news is that, by default, Symfony embeds and validates CSRF tokens
1313
automatically for you. This means that you can take advantage of the CSRF
14-
protection without doing anything. In fact, every form in this chapter has
14+
protection without doing anything. In fact, every form in this article has
1515
taken advantage of the CSRF protection!
1616

1717
CSRF protection works by adding a hidden field to your form - called ``_token``

form/dynamic_form_modification.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ a bare form class looks like::
6767
.. note::
6868

6969
If this particular section of code isn't already familiar to you, you
70-
probably need to take a step back and first review the :doc:`Forms chapter </forms>`
70+
probably need to take a step back and first review the :doc:`Forms article </forms>`
7171
before proceeding.
7272

7373
Assume for a moment that this form utilizes an imaginary "Product" class

form/form_customization.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -795,7 +795,7 @@ Customizing Error Output
795795
The Form component only handles *how* the validation errors are rendered,
796796
and not the actual validation error messages. The error messages themselves
797797
are determined by the validation constraints you apply to your objects.
798-
For more information, see the chapter on :doc:`validation </validation>`.
798+
For more information, see the article on :doc:`validation </validation>`.
799799

800800
There are many different ways to customize how errors are rendered when a
801801
form is submitted with errors. The error messages for a field are rendered

0 commit comments

Comments
 (0)