Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add custom link labels where Cookbook articles titles looked wrong #4857

Merged

Conversation

javiereguiluz
Copy link
Member

Q A
Doc fix? yes
New docs? no
Applies to all
Fixed tickets #4822

@@ -165,8 +165,8 @@ fields:

If you need more control over how your fields are rendered, then you should
remove the ``form_widget(form)`` function and render your fields individually.
See :doc:`/cookbook/form/form_customization` for more information on this and how
you can control *how* the form renders at a global level using form theming.
See :doc:`/cookbook/form/form_customization` article for more information on this
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See the [...]?

@weaverryan
Copy link
Member

Thanks Javier! @xabbuh - I'll take care of your line note right now - I agree about the missing word

@weaverryan weaverryan merged commit 1b31ad1 into symfony:2.3 Jan 16, 2015
weaverryan added a commit that referenced this pull request Jan 16, 2015
…ked wrong (javiereguiluz)

This PR was merged into the 2.3 branch.

Discussion
----------

Add custom link labels where Cookbook articles titles looked wrong

| Q             | A
| ------------- | ---
| Doc fix?      | yes
| New docs?     | no
| Applies to    | all
| Fixed tickets | #4822

Commits
-------

1b31ad1 Add custom link labels where Cookbook articles titles looked wrong
weaverryan added a commit that referenced this pull request Jan 16, 2015
weaverryan added a commit that referenced this pull request Jan 16, 2015
* 2.3:
  [#4857] Adding missing word thanks to xabbuh
  Fixing bad english thanks to xabbuh
  Adding missing words thanks to javiereguiluz
  [#4643] Minor english changes to make things even smoother (though they were correct before)
  replace API link for SwiftmailerBundle
  Update security.rst
  Update routing.rst
  don't output message from AuthenticationException
  Add custom link labels where Cookbook articles titles looked wrong
  Removed a leftover comma in security config sample
  [#4141] Tweaks to the new form csrf caching entry
  How to override vendor directory location - fix
  How to override vendor directory location - fix
  How to override vendor directory location
weaverryan added a commit that referenced this pull request Jan 16, 2015
* 2.5:
  [#4857] Adding missing word thanks to xabbuh
  Fixing bad english thanks to xabbuh
  Adding missing words thanks to javiereguiluz
  [#4643] Minor english changes to make things even smoother (though they were correct before)
  replace API link for SwiftmailerBundle
  Update security.rst
  Update routing.rst
  don't output message from AuthenticationException
  Add custom link labels where Cookbook articles titles looked wrong
  Fix code example
  Removed a leftover comma in security config sample
  [#4141] Tweaks to the new form csrf caching entry
  How to override vendor directory location - fix
  How to override vendor directory location - fix
  How to override vendor directory location
weaverryan added a commit that referenced this pull request Jan 18, 2015
* 2.6: (30 commits)
  fix merge after removing @Security in 2.3
  Reverting a commit on 2.5 branch, as it was only meant to be on 2.3 (so reverting after the merge)
  [#4735] Reverting what was left on the 2.5 branch after the merge conflict had already put back some of it
  Typo Fix: "allows to" should be "allows you to"
  Adding a link to log things in the prod environment
  [#4857] Adding missing word thanks to xabbuh
  move cautions to make them visible
  Fixing bad english thanks to xabbuh
  Adding missing words thanks to javiereguiluz
  language tweak thanks to xabbuh!
  Adding an example image of the debug_formatter
  [#4643] Minor english changes to make things even smoother (though they were correct before)
  replace API link for SwiftmailerBundle
  Update security.rst
  Update routing.rst
  don't output message from AuthenticationException
  Add custom link labels where Cookbook articles titles looked wrong
  Fix typo: BLOG => BLOB
  Fix code example
  Removed a leftover comma in security config sample
  ...

Conflicts:
	reference/configuration/security.rst
weaverryan added a commit that referenced this pull request Jan 18, 2015
* 2.7: (31 commits)
  fix merge after removing @Security in 2.3
  Reverting a commit on 2.5 branch, as it was only meant to be on 2.3 (so reverting after the merge)
  [#4735] Reverting what was left on the 2.5 branch after the merge conflict had already put back some of it
  Typo Fix: "allows to" should be "allows you to"
  Adding a link to log things in the prod environment
  [#4857] Adding missing word thanks to xabbuh
  move cautions to make them visible
  Fixing bad english thanks to xabbuh
  Adding missing words thanks to javiereguiluz
  language tweak thanks to xabbuh!
  Adding an example image of the debug_formatter
  [#4643] Minor english changes to make things even smoother (though they were correct before)
  replace API link for SwiftmailerBundle
  Update security.rst
  Update routing.rst
  don't output message from AuthenticationException
  Add custom link labels where Cookbook articles titles looked wrong
  Fix typo: BLOG => BLOB
  Fix code example
  Removed a leftover comma in security config sample
  ...
@javiereguiluz javiereguiluz deleted the improve_best_practices_crossrefs branch February 18, 2015 16:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants