Skip to content
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
0b442c7
[quick_tour] simplified drastically the first two sections of "The Bi…
javiereguiluz Jan 30, 2014
6e5a6a2
[quick_tour] simplified the "routing" section
javiereguiluz Jan 31, 2014
63f671c
[quick_tour] updated the "Controllers" section
javiereguiluz Jan 31, 2014
8a1db94
[quick_tour] updated some screenshots
javiereguiluz Jan 31, 2014
b6c1721
[quick_tour] finished the review of "The Big Picture" chapter
javiereguiluz Jan 31, 2014
7c8c38c
[quick_tour] updated "the view" chapter
javiereguiluz Feb 1, 2014
be8787c
[quick tour] simplified "the controller" chapter
javiereguiluz Feb 1, 2014
3a2fd71
[quick_tour] simplified "the architecture" chapter
javiereguiluz Feb 1, 2014
f48cbf1
[quick_tour] second pass to the "big picture" chapter
javiereguiluz Feb 3, 2014
905e3e6
[quick tour] second pass to "the view" chapter
javiereguiluz Feb 3, 2014
cce8145
[quick_tour] second pass to "the controller" chapter and
javiereguiluz Feb 4, 2014
1e1deb0
[quick_tour] second pass to "the architecture" chapter
javiereguiluz Feb 4, 2014
f57ad39
[quick_tour] replaced "chapter" by "part" in some tutorial parts
javiereguiluz Feb 4, 2014
0d4da93
[quick_tour] removed inline links
javiereguiluz Feb 9, 2014
deced02
Bundle names should not be placed in literals
javiereguiluz Feb 9, 2014
53ba9d5
Removed a wrongly inserted comma
javiereguiluz Feb 9, 2014
4a4635d
When using server:run command, it's not necessary to add the `app_dev…
javiereguiluz Feb 9, 2014
89c7dd3
Capitalized some sentences that come after a colon
javiereguiluz Feb 9, 2014
bd1fc95
Added a new headline to better structure the documentation
javiereguiluz Feb 9, 2014
7cfc1d9
Minor rewording
javiereguiluz Feb 9, 2014
a22d663
Fixed the capitalization of a section heading
javiereguiluz Feb 9, 2014
9f04dae
Replaced "variable" by "placeholder" when using {_format} inside a route
javiereguiluz Feb 9, 2014
f810f4a
Removed the animated GIF showing how to install Symfony
javiereguiluz Feb 9, 2014
cef3103
Added a more useful message for users that don't have PHP 5.4
javiereguiluz Feb 16, 2014
1ed3dc9
Grammar fixes proposed by @weaverryan and @WouterJ
javiereguiluz Feb 16, 2014
c7d3fac
Restored the original line that explained how a routing file is imported
javiereguiluz Feb 16, 2014
fa1d018
Restored all the original introductions for each tutorial part
javiereguiluz Feb 16, 2014
304d4ce
[quick_tour] rewording and grammar fixes suggested by @weaverryan
javiereguiluz Feb 18, 2014
3b430f8
[quick_tour] more rewording and grammar fixes
javiereguiluz Feb 18, 2014
c911698
[quick_tour] removed an unneeded comma
javiereguiluz Feb 18, 2014
ef88ae2
[quick_tour] rewording and grammar fixes noted by @xabbuh
javiereguiluz Feb 19, 2014
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Bundle names should not be placed in literals
  • Loading branch information
javiereguiluz committed Feb 9, 2014
commit deced02c55070087db53d23760490b1273c38e53
2 changes: 1 addition & 1 deletion quick_tour/the_architecture.rst
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ Extending Bundles

If you follow these conventions, then you can use :doc:`bundle inheritance</cookbook/bundles/inheritance>`
to "override" files, controllers or templates. For example, you can create
a bundle - ``AcmeNewBundle`` - and specify that it overrides AcmeDemoBundle.
a bundle - AcmeNewBundle - and specify that it overrides AcmeDemoBundle.
Copy link
Member

Choose a reason for hiding this comment

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

Maybe we shouldn't say that a bundles overrides another bundle but instead extends a parent bundle?

Copy link
Member

Choose a reason for hiding this comment

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

No, we have explicitely changed this from parent to override (one of my first doc contributions) as there is no parent/child relation, the getParent method is confusing and only there as it means a big BC change.

More information in symfony/symfony#4347 and the related doc PR and fabian's commit

Copy link
Member

Choose a reason for hiding this comment

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

Ah, thanks for the clarification.

When Symfony loads the ``AcmeDemoBundle:Welcome:index`` controller, it will
first look for the ``WelcomeController`` class in AcmeNewBundle and, if
it doesn't exist, then look inside AcmeDemoBundle. This means that one bundle
Expand Down
2 changes: 1 addition & 1 deletion quick_tour/the_big_picture.rst
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ have seen so far. All the code you write for your application is organized in
bundles. In Symfony2 speak, a bundle is a structured set of files (PHP files,
stylesheets, JavaScripts, images, ...) that implements a single feature (a
blog, a forum, ...) and which can be easily shared with other developers. As
of now, you have manipulated one bundle, ``AcmeDemoBundle``. You will learn
of now, you have manipulated one bundle, AcmeDemoBundle. You will learn
more about bundles in the :doc:`last part of this tutorial</quick_tour/the_architecture>`.
Copy link
Member

Choose a reason for hiding this comment

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

same space needed here (and everywhere else in the quick tour)


.. _quick-tour-big-picture-environments:
Expand Down