Commit2de64b0

committed

Merge remote-tracking branch 'origin/2.0' into 2.0

2 parents2fae69c +e35a38b commit2de64b0Copy full SHA for 2de64b0

File tree

-4

lines changed

-4

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -848,8 +848,8 @@ the framework.`
`848`	`848`
`849`	`849`	`..tip::`
`850`	`850`
`851`		- Be sure that ``swiftmailer`` entry appears in your application
`852`		- configuration. Asyou mentioned in:ref:`service-container-extension-configuration`,
	`851`	+ Be sure thatthe``swiftmailer`` entry appears in your application
	`852`	+ configuration. Aswas mentioned in:ref:`service-container-extension-configuration`,
`853`	`853`	the ``swiftmailer`` key invokes the service extension from the
`854`	`854`	``SwiftmailerBundle``, which registers the ``mailer`` service.
`855`	`855`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -272,7 +272,7 @@ Allowing "new" tags with the "prototype"`
`272`	`272`
`273`	`273`	`Allowing the user to dynamically add new tags means that you'll need to`
`274`	`274`	`use some JavaScript. Previously you added two tags to your form in the controller.`
`275`		`-Nowtolet the user add as many tag forms as he needs directly in the browser.`
	`275`	`+Now let the user add as many tag forms as he needs directly in the browser.`
`276`	`276`	`This will be done through a bit of JavaScript.`
`277`	`277`
`278`	`278`	`The first thing you need to do is to let the form collection know that it will`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -213,7 +213,7 @@ object:`
`213`	`213`
`214`	`214`	`<label for="{{ form.name.vars.id }}"`
`215`	`215`	`class="{{ form.name.vars.required ? 'required' : '' }}">`
`216`		`- {{ form.name.label }}`
	`216`	`+ {{ form.name.vars.label }}`
`217`	`217`	`</label>`
`218`	`218`
`219`	`219`	`..code-block::html+php`

Comments

(0)