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

Finishing #6252 #6743

Merged
merged 15 commits into from
Jul 10, 2016
Merged

Finishing #6252 #6743

merged 15 commits into from
Jul 10, 2016

Conversation

weaverryan
Copy link
Member

WIP - finishing #6252

Re-opening so I can tweak and review. Rebased to 2.8

@@ -559,10 +583,15 @@ them for you. Here's the same sample application, now built in Symfony::
}
}

First we have a "controller class" which is a convenient way to group several
"controllers" together. So methods inside a controller class are controllers
Copy link
Member

Choose a reason for hiding this comment

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

This phrase looks confusing:

So methods inside a controller class are controllers also called *actions*.

What about:

So methods inside a controller class are also controllers, but they are usually called *actions*.

@javiereguiluz
Copy link
Member

👍

Status: reviewed

@weaverryan weaverryan merged commit 68da559 into 2.8 Jul 10, 2016
weaverryan added a commit that referenced this pull request Jul 10, 2016
This PR was merged into the 2.8 branch.

Discussion
----------

Finishing #6252

WIP - finishing #6252

Re-opening so I can tweak and review. Rebased to 2.8

Commits
-------

68da559 Removing old :term: stuff
f67f675 Replacing missing link
bafea9d Fixing typo
7e9dc86 Final changes
a527a43 [WIP] More changes
c390d8d [WIP] More changes
6ae19f0 [WIP] Removing multiple formats - it makes no sense here
1297c75 [WIP] More changes
47ffb4e [WIP] Reading through the changes
09b28bc changes according to comments after PR + some other typos
689c2fd typo fix in hyperlink
49ec40f typo fix in hyperlink
62f5153 colon  corrections
c56db5c made some new changes, corrected mistakes, undo some foolish deletions
2dc8c63 [] changes in the first four ch of the book
@wouterj
Copy link
Member

wouterj commented Jul 10, 2016

I love the irony of the "minor" tag when merging such big PRs ;) Btw, any reason you choose 2.8 and not 2.7?

@weaverryan
Copy link
Member Author

@wouterj oh damn - thanks for noticing that. I was thinking "2.8 is LTS" (which is true, but 2.7 is still supported). I'll patch it back

@weaverryan weaverryan deleted the paxyknox-book-intro-text-modif branch July 10, 2016 15:45
This was referenced Jul 10, 2016
weaverryan added a commit that referenced this pull request Jul 10, 2016
This PR was merged into the 2.7 branch.

Discussion
----------

Branch fix

Quick PR - #6743 should have gone to 2.7.

Commits
-------

6475bff Removing old :term: stuff
a32adca Replacing missing link
d271df7 Fixing typo
e6f52a0 Final changes
0410e62 [WIP] More changes
d073dcc [WIP] More changes
c43f58b [WIP] Removing multiple formats - it makes no sense here
2593382 [WIP] More changes
a955b5c [WIP] Reading through the changes
d82f05c changes according to comments after PR + some other typos
a9cdc3c typo fix in hyperlink
b378933 typo fix in hyperlink
a1a505b colon  corrections
ef5c0e6 made some new changes, corrected mistakes, undo some foolish deletions
afab48c [] changes in the first four ch of the book
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

5 participants