Skip to content

Commit

Permalink
minor #30 Moved the rest of the book chapters (javiereguiluz)
Browse files Browse the repository at this point in the history
This PR was squashed before being merged into the 2.7 branch (closes #30).

Discussion
----------

Moved the rest of the book chapters

* `book/` directory is GONE
* Leftover chapters moved as tutorials (I've maintained the original file names, but in the next days we'll update them to avoid idiotic paths such as `/propel/propel`, `/performance/performance`, etc.

Commits
-------

7963397 Moved the rest of the book chapters
  • Loading branch information
javiereguiluz committed Jul 11, 2016
2 parents 4d3b468 + 7963397 commit 56e11a6
Show file tree
Hide file tree
Showing 10 changed files with 7 additions and 20 deletions.
13 changes: 0 additions & 13 deletions book/index.rst

This file was deleted.

5 changes: 0 additions & 5 deletions book/map.rst.inc

This file was deleted.

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
5 changes: 5 additions & 0 deletions redirection_map
Original file line number Diff line number Diff line change
Expand Up @@ -77,3 +77,8 @@
/book/http_cache /http_cache
/book/translation /translation
/book/service_container /service_container
/book/http_fundamentals /http_fundamentals
/book/from_flat_php_to_symfony2 /introduction/from_flat_php_to_symfony2
/book/configuration /configuration/configuration
/book/propel /propel/propel
/book/performance /performance/performance
4 changes: 2 additions & 2 deletions service_container.rst
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ for you. In order for this to work, you must *teach* the container how to
create the ``Mailer`` service. This is done via configuration, which can
be specified in YAML, XML or PHP:

.. include:: includes/_service_container_my_mailer.rst.inc
.. include:: includes/service_container/_my_mailer.rst.inc

.. note::

Expand Down Expand Up @@ -581,7 +581,7 @@ which has a ``getMailerMethod()`` method on it, which will return a string
like ``sendmail`` based on some configuration. Remember that the first argument
to the ``my_mailer`` service is the simple string ``sendmail``:

.. include:: includes/_service_container_my_mailer.rst.inc
.. include:: includes/service_container/_my_mailer.rst.inc

But instead of hardcoding this, how could we get this value from the ``getMailerMethod()``
of the new ``mailer_configuration`` service? One way is to use an expression:
Expand Down

0 comments on commit 56e11a6

Please sign in to comment.