Skip to content

Commit 31ac1a4

Browse files
committed
Merge pull request #2324 from caponica/fix_Sf2_vs_sf1_chapter
Cleaned up typos in chapter comparing Sf2 and sf1
2 parents 2a1f290 + 1728510 commit 31ac1a4

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

cookbook/symfony1.rst

+5-5
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ So, sit back and relax as you travel from "then" to "now".
2020
Directory Structure
2121
-------------------
2222

23-
When looking at a Symfony2 project - for example, the `Symfony2 Standard`_ -
23+
When looking at a Symfony2 project - for example, the `Symfony2 Standard Edition`_ -
2424
you'll notice a very different directory structure than in symfony1. The
2525
differences, however, are somewhat superficial.
2626

@@ -133,13 +133,13 @@ example::
133133
}
134134

135135
The file itself lives at
136-
``vendor/bundle/Sensio/Bundle/FrameworkExtraBundle/SensioFrameworkExtraBundle.php``.
136+
``vendor/bundles/Sensio/Bundle/FrameworkExtraBundle/SensioFrameworkExtraBundle.php``.
137137
As you can see, the location of the file follows the namespace of the class.
138138
Specifically, the namespace, ``Sensio\Bundle\FrameworkExtraBundle``, spells out
139139
the directory that the file should live in
140-
(``vendor/bundle/Sensio/Bundle/FrameworkExtraBundle``). This is because, in the
140+
(``vendor/bundles/Sensio/Bundle/FrameworkExtraBundle``). This is because, in the
141141
``app/autoload.php`` file, you'll configure Symfony to look for the ``Sensio``
142-
namespace in the ``vendor/bundle`` directory:
142+
namespace in the ``vendor/bundles`` directory:
143143

144144
.. code-block:: php
145145
@@ -367,4 +367,4 @@ In reality, the Symfony2 configuration is much more powerful and is used
367367
primarily to configure objects that you can use. For more information, see
368368
the chapter titled ":doc:`/book/service_container`".
369369

370-
.. _`Symfony2 Standard`: https://github.com/symfony/symfony-standard
370+
.. _`Symfony2 Standard Edition`: https://github.com/symfony/symfony-standard

0 commit comments

Comments
 (0)