Commitfdc755e

authored and

committed

Grammar fixes proposed by@weaverryan and@wouterj

1 parenteca1e73 commitfdc755eCopy full SHA for fdc755e

File tree

-4

lines changed

-4

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -140,15 +140,15 @@ will be executed. In the next section, you'll learn exactly what that means.`
`140`	`140`
`141`	`141`	`In addition to YAML files, routes can be configured in XML or PHP files`
`142`	`142`	`and even embedded in PHP annotations. This flexibility is one of the main`
`143`		`- features of Symfony2, a framework that never imposesyoua particular`
`144`		`- configuration format.`
	`143`	`+ features of Symfony2, a framework that never imposes a particular`
	`144`	`+ configuration format on you.`
`145`	`145`
`146`	`146`	`Controllers`
`147`	`147`	`~~~~~~~~~~~`
`148`	`148`
`149`	`149`	`A controller is a PHP function or method that handles incoming requests and`
`150`	`150`	`returns responses (often HTML code). Instead of using the PHP global variables`
`151`		-and functions (like ``$_GET`` or ``header()``) to manage these HTTP messages
	`151`	+and functions (like ``$_GET`` or ``header()``) to manage these HTTP messages,
`152`	`152`	Symfony uses objects::ref:`Request<component-http-foundation-request>`
`153`	`153`	and:ref:`Response<component-http-foundation-response>`. The simplest possible
`154`	`154`	`controller might create the response by hand, based on the request::`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ the template contents using any of these delimiters:`
`21`	`21`	* ``{% ... %}``: controls the logic of the template; it is used for example to
`22`	`22`	execute ``for`` loops and ``if`` statements;
`23`	`23`
`24`		-* ``{# ... #}``: allowsto include comments inside templates.
	`24`	+* ``{# ... #}``: allowsincluding comments inside templates.
`25`	`25`
`26`	`26`	`Below is a minimal template that illustrates a few basics, using two variables`
`27`	`27`	``page_title`` and ``navigation``, which would be passed into the template:

Comments

(0)