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

Fixes after tonight's merge round #6898

Merged
merged 4 commits into from
Aug 21, 2016
Merged

Conversation

wouterj
Copy link
Member

@wouterj wouterj commented Aug 21, 2016

Some fixes after the merged changes by @weaverryan last night. See the commit messages for more details about the changes.

As i now starts at 1 and cycle() uses the modulo operator, the second list
item is used for the first element. This means odd/even have to be
switched.

See http://twigfiddle.com/8amvok
 * Replaced "goes to" with "visits";
 * Removed wrong `/` at the end of a route name (it was confused with an
   actual URI);
 * Reindented the PHP example to be more readable.
@weaverryan
Copy link
Member

These all makes sense for me! Thanks for the good commit messages - made understanding what you were thinking very easy :). Cheers!

@weaverryan weaverryan merged commit 8e66547 into symfony:2.7 Aug 21, 2016
weaverryan added a commit that referenced this pull request Aug 21, 2016
This PR was merged into the 2.7 branch.

Discussion
----------

Fixes after tonight's merge round

Some fixes after the merged changes by @weaverryan last night. See the commit messages for more details about the changes.

Commits
-------

8e66547 [Console] Focus on framework users first in the guides
cf4022e [Routing] Some minor tweaks to the placeholder doc
296a0a0 [Templating] Fix odd/even cycle
bbef239 [Contributing] Minor grammar fix
@wouterj wouterj deleted the fixes-after-merge branch August 21, 2016 21:10
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.

None yet

3 participants