Skip to content

Commit

Permalink
Final changes
Browse files Browse the repository at this point in the history
  • Loading branch information
weaverryan committed Jul 10, 2016
1 parent 0410e62 commit e6f52a0
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 21 deletions.
2 changes: 1 addition & 1 deletion book/from_flat_php_to_symfony2.rst
Original file line number Diff line number Diff line change
Expand Up @@ -607,7 +607,7 @@ database and the Templating component to render a template and return a
<?php endforeach ?>
</ul>

The layout ``layout.php`` is nearly identical:
The ``layout.php`` file is nearly identical:

.. code-block:: html+php

Expand Down
17 changes: 9 additions & 8 deletions book/http_fundamentals.rst
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ the user is connecting via a secured connection (i.e. HTTPS).
prepare and store context-specific information about the request.

Symfony Response Object
~~~~~~~~~~~~~~~~~~~~~~
~~~~~~~~~~~~~~~~~~~~~~~

Symfony also provides a :class:`Symfony\\Component\\HttpFoundation\\Response`
class: a simple PHP representation of an HTTP response message. This allows your
Expand All @@ -290,7 +290,7 @@ needs to be returned to the client::
$response = new Response();

$response->setContent('<html><body><h1>Hello world!</h1></body></html>');
$response->setStatusCode(Response::HTTP_OK);;
$response->setStatusCode(Response::HTTP_OK);

// set a HTTP response header
$response->headers->set('Content-Type', 'text/html');
Expand All @@ -306,6 +306,7 @@ There are also special classes to make certain types of responses easier to crea
files and sending file downloads);

* :ref:`StreamedResponse <streaming-response>` (for streaming any other large responses);

.. tip::

The ``Request`` and ``Response`` classes are part of a standalone component
Expand Down Expand Up @@ -413,7 +414,7 @@ The Symfony Application Flow
When you let Symfony handle each request, life is much easier. Symfony follows
the same simple pattern for every request:

_request-flow-figure:
.. _request-flow-figure:

.. figure:: /images/request-flow.png
:align: center
Expand Down Expand Up @@ -534,7 +535,7 @@ Symfony Framework, or just one piece of Symfony all by itself.
.. index::
single: Symfony Components

_standalone-tools-the-symfony2-components:
.. _standalone-tools-the-symfony2-components:

Standalone Tools: The Symfony *Components*
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Expand Down Expand Up @@ -575,7 +576,7 @@ Each one of these components is decoupled and can be used in *any* PHP project,
regardless of whether or not you use the Symfony Framework. Every part is
made to be used if needed and replaced when necessary.

_the-full-solution-the-symfony2-framework:
.. _the-full-solution-the-symfony2-framework:

The Full Solution: The Symfony *Framework*
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Expand All @@ -601,11 +602,11 @@ sensible defaults. For more advanced users, the sky is the limit.

.. _`xkcd`: http://xkcd.com/
.. _`XMLHttpRequest`: https://en.wikipedia.org/wiki/XMLHttpRequest
.. _`List of HTTP header fields`: https://en.wikipedia.org/wiki/List_of_HTTP_header_fields
.. _`List of HTTP status codes`: https://en.wikipedia.org/wiki/List_of_HTTP_status_codes
.. _`List of common media types`: https://www.iana.org/assignments/media-types/media-types.xhtml
.. _`HTTP 1.1 RFC`: http://www.w3.org/Protocols/rfc2616/rfc2616.html
.. _`HTTP Bis`: http://datatracker.ietf.org/wg/httpbis/
.. _`Live HTTP Headers`: https://addons.mozilla.org/en-US/firefox/addon/live-http-headers/
.. _`List of HTTP header fields`: https://en.wikipedia.org/wiki/List_of_HTTP_header_fields
.. _`List of HTTP status codes`: https://en.wikipedia.org/wiki/List_of_HTTP_status_codes
.. _`List of common media types`: https://www.iana.org/assignments/media-types/media-types.xhtml
.. _`Validator`: https://github.com/symfony/validator
.. _`Swift Mailer`: http://swiftmailer.org/
4 changes: 2 additions & 2 deletions book/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -411,12 +411,12 @@ Be sure to also check out the :doc:`Cookbook </cookbook/index>`, which contains
a wide variety of articles about solving specific problems with Symfony.

.. _`explained in this post`: http://fabien.potencier.org/signing-project-releases.html
.. _`Phar extension`: http://php.net/manual/en/intro.phar.php
.. _`Composer`: https://getcomposer.org/
.. _`enable ACL support`: https://help.ubuntu.com/community/FilePermissionsACLs
.. _`Git`: http://git-scm.com/
.. _`Symfony Standard Edition`: https://github.com/symfony/symfony-standard
.. _`Symfony CMF Standard Edition`: https://github.com/symfony-cmf/symfony-cmf-standard
.. _`Symfony CMF`: http://cmf.symfony.com/
.. _`Symfony REST Edition`: https://github.com/gimler/symfony-rest-edition
.. _`FOSRestBundle`: https://github.com/FriendsOfSymfony/FOSRestBundle
.. _`Git`: http://git-scm.com/
.. _`Phar extension`: http://php.net/manual/en/intro.phar.php
18 changes: 8 additions & 10 deletions book/page_creation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Just like on the web, every interaction is initiated by an HTTP request.
Your job is pure and simple: understand that request and return a response.

.. index::
single:: Page creation; Example
single: Page creation; Example

Creating a Page: Route and Controller
-------------------------------------
Expand Down Expand Up @@ -432,15 +432,13 @@ The ``app/`` directory also holds a few other things, like the cache directory
which you'll use to enable new bundles (and one of a *very* short list of
PHP files in ``app/``).

The ``src/`` directory has just one directory ``src/AppBundle`` and everything
lives inside of it. Is where your code lives. It's a set of files within a
directory that implement a single feature. Symfony Standard Edition comes with
``AppBundle`` but there is nothing special about ``AppBundle``. Your project can
have as many bundles as you want, you can even use third-party bundles written
by other that you can find at `KnpBundles.com`_. So, a :term:`bundle` is like a
"plugin" in other software, but even better. To find out more about bundles and
why you might create multiple bundles (hint: sharing code between projects), see
the :doc:`Bundles </book/bundles>` chapter.
The ``src/`` directory has just one directory - ``src/AppBundle`` -
and everything lives inside of it. A bundle is like a "plugin" and you can
`find open source bundles`_ and install them into your project. But even
*your* code lives in a bundle - typically ``AppBundle`` (though there's
nothing special about ``AppBundle``). To find out more about bundles and
why you might create multiple bundles (hint: sharing code between projects),
see the :doc:`Bundles </book/bundles>` chapter.

So what about the other directories in the project?

Expand Down

0 comments on commit e6f52a0

Please sign in to comment.