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

Small fixes to Quick Tour #22

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions glossary.rst
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,9 @@ Glossary
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.

Environment
*Environments* are different sets of configuration, that share the same
PHP code. So basically, environments and configuration are synonyms. For
each application, Symfony provides three default environments:
*production* (``prod``), *test* (``test``), and *development* (``dev``).
6 changes: 3 additions & 3 deletions quick_tour/the_architecture.rst
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ Symfony2 stand apart from the framework crowd, let's dive into it now.
The Directory Structure
-----------------------

The directory structure of a Symfony :term:`application` is rather flexible
The directory structure of a Symfony :term:`project` is rather flexible
but the directory structure of a sandbox reflects the typical and recommended
structure of a Symfony application:
structure of a Symfony project:

* ``app/``: This directory contains the application configuration;

Expand Down Expand Up @@ -148,7 +148,7 @@ method of the ``AppKernel`` class::
//new Symfony\Bundle\TwigBundle\TwigBundle(),

// register your bundles
new Application\AppBundle\AppBundle(),
new Application\HelloBundle\HelloBundle(),
);

if ($this->isDebug()) {
Expand Down
4 changes: 2 additions & 2 deletions quick_tour/the_big_picture.rst
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ The code is pretty straightforward but let's explain this code line by line:
see later in this tutorial).

* *line 9*: Each controller is made of several actions. As per the
configuration, the hello page is handled by the ``index`` action (the third
configuration, the *hello* page is handled by the ``index`` action (the third
part of the ``_controller`` routing value). This method receives the
resource placeholder values as arguments (``$name`` in our case).

Expand Down Expand Up @@ -279,7 +279,7 @@ Environments
------------

Now that you have a better understanding on how Symfony works, have a closer
look at the bottom of the page; you will notice a small bar with the Symfony
look at the bottom of the *hello* page; you will notice a small bar with the Symfony
and PHP logos. It is called the "Web Debug Toolbar" and it is the developer's
best friend. Of course, such a tool must not be displayed when you deploy your
application to your production servers. That's why you will find another front
Expand Down