Skip to content

Commit 01f52fd

Browse files
committed
Lots of updates thanks to @javiereguiluz!
1 parent 393e8d8 commit 01f52fd

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

book/bundles.rst

+5-5
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ A bundle is simply a structured set of files within a directory that implement
2323
a single feature. You might create a BlogBundle, a ForumBundle or
2424
a bundle for user management (many of these exist already as open source
2525
bundles). Each directory contains everything related to that feature, including
26-
PHP files, templates, stylesheets, JavaScripts, tests and anything else.
26+
PHP files, templates, stylesheets, JavaScript files, tests and anything else.
2727
Every aspect of a feature exists in a bundle and every feature lives in a
2828
bundle.
2929

30-
An application is made up of bundles as defined in the ``registerBundles()``
31-
method of the ``AppKernel`` class::
30+
Bundles used in your applications must be enabled by registering them in
31+
the ``registerBundles()`` method of the ``AppKernel`` class::
3232

3333
// app/AppKernel.php
3434
public function registerBundles()
@@ -42,10 +42,10 @@ method of the ``AppKernel`` class::
4242
new Symfony\Bundle\DoctrineBundle\DoctrineBundle(),
4343
new Symfony\Bundle\AsseticBundle\AsseticBundle(),
4444
new Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle(),
45+
new AppBundle\AppBundle(),
4546
);
4647

4748
if (in_array($this->getEnvironment(), array('dev', 'test'))) {
48-
$bundles[] = new Acme\DemoBundle\AcmeDemoBundle();
4949
$bundles[] = new Symfony\Bundle\WebProfilerBundle\WebProfilerBundle();
5050
$bundles[] = new Sensio\Bundle\DistributionBundle\SensioDistributionBundle();
5151
$bundles[] = new Sensio\Bundle\GeneratorBundle\SensioGeneratorBundle();
@@ -124,7 +124,7 @@ generating a basic bundle skeleton:
124124
125125
$ php app/console generate:bundle --namespace=Acme/TestBundle
126126
127-
The bundle skeleton generates with a basic controller, template and routing
127+
The bundle skeleton generates a basic controller, template and routing
128128
resource that can be customized. You'll learn more about Symfony's command-line
129129
tools later.
130130

book/page_creation.rst

+6-6
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ Before diving into this, test it out!
6868

6969
If you setup a proper virtual host in :doc:`Apache or Nginx </cookbook/configuration/web_server_configuration>`,
7070
replace ``http://localhost:8000`` with your host name - like
71-
``http://symfony.local/app_dev.php/lucky/number``.
71+
``http://symfony.dev/app_dev.php/lucky/number``.
7272

7373
If you see a lucky number being printed back to you, congratulations! But
7474
before you run off to play the lottery, check out how this works.
@@ -407,7 +407,7 @@ in your controller.
407407

408408
The ``{% extends 'base.html.twig' %}`` points to a layout file that lives
409409
at `app/Resources/views/base.html.twig`_ and came with your new project.
410-
It's *really* basic (an unstyled HTML structure) and it's your's to customize.
410+
It's *really* basic (an unstyled HTML structure) and it's yours to customize.
411411
The ``{% block body %}`` part uses Twig's :ref:`inheritance system <twig-inheritance>`
412412
to put the content into the middle of the ``base.html.twig`` layout.
413413

@@ -549,9 +549,9 @@ is ``app/config/config.yml``:
549549
// ...
550550
551551
The ``framework`` key configures FrameworkBundle, the ``twig`` key configures
552-
TwigBundle and so on. A *lot* of behavior in Symfony can be controlled.
553-
To find out how, see the :doc:`Configuration Reference </reference/index>`
554-
section.
552+
TwigBundle and so on. A *lot* of behavior in Symfony can be controlled just
553+
by changing one option in this configuration file. To find out how, see the
554+
:doc:`Configuration Reference </reference/index>` section.
555555

556556
Or, to get a big example dump of all of the valid configuration under a key,
557557
use the handy ``app/console`` command:
@@ -561,7 +561,7 @@ use the handy ``app/console`` command:
561561
$ app/console config:dump-reference framework
562562
563563
There's a lot more power behind Symfony's configuration system, including
564-
environment, imports and parameters. To learn all of it, see the
564+
environments, imports and parameters. To learn all of it, see the
565565
:doc:`Configuration </book/configuration>` chapter.
566566

567567
What's Next?

0 commit comments

Comments
 (0)