Skip to content

Commit 34a234e

Browse files
committed
Merge branch '4.4' into 5.3
* 4.4: Correct spelling & grammar in routing.rst Correct spelling & grammar in page-creation.rst Correct spelling mistakes
2 parents 244c88f + 513c208 commit 34a234e

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

page_creation.rst

+3-3
Original file line numberDiff line numberDiff line change
@@ -79,12 +79,12 @@ That's it! If you are using Symfony web server, try it out by going to: http://l
7979

8080
If you see a lucky number being printed back to you, congratulations! But before
8181
you run off to play the lottery, check out how this works. Remember the two steps
82-
to creating a page?
82+
to create a page?
8383

8484
#. *Create a controller and a method*: This is a function where *you* build the page and ultimately
8585
return a ``Response`` object. You'll learn more about :doc:`controllers </controller>`
8686
in their own section, including how to return JSON responses;
87-
87+
8888
#. *Create a route*: In ``config/routes.yaml``, the route defines the URL to your
8989
page (``path``) and what ``controller`` to call. You'll learn more about :doc:`routing </routing>`
9090
in its own section, including how to make *variable* URLs.
@@ -159,7 +159,7 @@ Second, after this package was downloaded, Flex runs a *recipe*, which is a
159159
set of automated instructions that tell Symfony how to integrate an external
160160
package. `Flex recipes`_ exist for many packages and have the ability
161161
to do a lot, like adding configuration files, creating directories, updating ``.gitignore``
162-
and adding new config to your ``.env`` file. Flex *automates* the installation of
162+
and adding a new config to your ``.env`` file. Flex *automates* the installation of
163163
packages so you can get back to coding.
164164

165165
The bin/console Command

routing.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -713,7 +713,7 @@ URL Route Parameters
713713
Parameters also support `PCRE Unicode properties`_, which are escape
714714
sequences that match generic character types. For example, ``\p{Lu}``
715715
matches any uppercase character in any language, ``\p{Greek}`` matches any
716-
Greek character, etc.
716+
Greek characters, etc.
717717

718718
.. note::
719719

@@ -1083,7 +1083,7 @@ Parameter Conversion
10831083

10841084
A common routing need is to convert the value stored in some parameter (e.g. an
10851085
integer acting as the user ID) into another value (e.g. the object that
1086-
represents the user). This feature is called "param converter".
1086+
represents the user). This feature is called a "param converter".
10871087

10881088
To add support for "param converters" we need SensioFrameworkExtraBundle:
10891089

setup.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ to run this command which displays information about the project:
117117
Running Symfony Applications
118118
----------------------------
119119

120-
In production, you should install a webserver like Nginx or Apache and
120+
In production, you should install a web server like Nginx or Apache and
121121
:doc:`configure it to run Symfony </setup/web_server_configuration>`. This
122122
method can also be used if you're not using the Symfony local web server for
123123
development.
@@ -190,7 +190,7 @@ and enables all the packages needed to use the official Symfony logger.
190190

191191
This is possible because lots of Symfony packages/bundles define **"recipes"**,
192192
which are a set of automated instructions to install and enable packages into
193-
Symfony applications. Flex keeps tracks of the recipes it installed in a
193+
Symfony applications. Flex keeps track of the recipes it installed in a
194194
``symfony.lock`` file, which must be committed to your code repository.
195195

196196
Symfony Flex recipes are contributed by the community and they are stored in

0 commit comments

Comments
 (0)