Merge branch '2.1'

Conflicts:
	reference/configuration/framework.rst

Author: weaverryan

book/doctrine.rst

@@ -88,7 +88,7 @@ for you:
 
     $ php app/console doctrine:database:create
 
-.. sidebar:: Setting Up The Database
+.. sidebar:: Setting Up The Database to be UTF8
 
     One mistake even seasoned developers make when starting a Symfony2 project
     is forgetting to setup default charset and collation on their database,
@@ -114,6 +114,45 @@ for you:
         collation-server = utf8_general_ci
         character-set-server = utf8
 
+Using SQLite
+~~~~~~~~~~~~
+
+If you want to use SQLite as your database, you need to set the path
+where your database file should be stored:
+
+.. configuration-block::
+
+    .. code-block:: yaml
+
+        # app/config/config.yml
+        doctrine:
+            dbal:
+                driver: pdo_sqlite
+                path: "%kernel.root_dir%/sqlite.db"
+                charset: UTF8
+
+    .. code-block:: xml
+
+        <!-- app/config/config.xml -->
+        <doctrine:config
+            driver="pdo_sqlite"
+            path="%kernel.root_dir%/sqlite.db"
+            charset="UTF-8"
+        >
+            <!-- ... -->
+        </doctrine:config>
+
+    .. code-block:: php
+
+        // app/config/config.php
+        $container->loadFromExtension('doctrine', array(
+            'dbal' => array(
+                'driver'  => 'pdo_sqlite',
+                'path'    => '%kernel.root_dir%/sqlite.db',
+                'charset' => 'UTF-8',
+            ),
+        ));
+
 Creating an Entity Class
 ~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -317,8 +356,8 @@ doesn't replace your existing methods).
 
 .. caution::
 
-    Keep in mind that Doctrine's entity generator produces simple getters/setters. 
-    You should check generated entities and adjust getter/setter logic to your own 
+    Keep in mind that Doctrine's entity generator produces simple getters/setters.
+    You should check generated entities and adjust getter/setter logic to your own
     needs.
 
 .. sidebar:: More about ``doctrine:generate:entities``
@@ -1370,7 +1409,7 @@ without any arguments:
 
     $ php app/console
 
-A list of available command will print out, many of which start with the
+A list of available commands will print out, many of which start with the
 ``doctrine:`` prefix. You can find out more information about any of these
 commands (or any Symfony command) by running the ``help`` command. For example,
 to get details about the ``doctrine:database:create`` task, run:
@@ -1406,6 +1445,16 @@ Some notable or interesting tasks include:
    read the ":doc:`/bundles/DoctrineFixturesBundle/index`" entry of the
    documentation.
 
+.. tip::
+
+    This page shows working with Doctrine within a controller. You may also
+    want to work with Doctrine elsewhere in your application. The
+    :method:`Symfony\\Bundle\\FrameworkBundle\\Controller\\Controller::getDoctrine`
+    method of the controller returns the ``doctrine`` service, you can work with
+    this in the same way elsewhere by injecting this into your own
+    services. See :doc:`/book/service_container` for more on creating
+    your own services.
+
 Summary
 -------
 

book/page_creation.rst

@@ -803,7 +803,7 @@ options of each feature.
     disadvantages. The choice of which to use is up to you:
 
     * *YAML*: Simple, clean and readable (learn more about yaml in
-    * ":doc:`/components/yaml/yaml_format`");
+      ":doc:`/components/yaml/yaml_format`");
 
     * *XML*: More powerful than YAML at times and supports IDE autocompletion;
 

book/security.rst

@@ -296,8 +296,8 @@ First, enable form login under your firewall:
                     pattern:    ^/
                     anonymous: ~
                     form_login:
-                        login_path:  /login
-                        check_path:  /login_check
+                        login_path:  login
+                        check_path:  login_check
 
     .. code-block:: xml
 
@@ -313,7 +313,7 @@ First, enable form login under your firewall:
             <config>
                 <firewall name="secured_area" pattern="^/">
                     <anonymous />
-                    <form-login login_path="/login" check_path="/login_check" />
+                    <form-login login_path="login" check_path="login_check" />
                 </firewall>
             </config>
         </srv:container>
@@ -327,8 +327,8 @@ First, enable form login under your firewall:
                     'pattern' => '^/',
                     'anonymous' => array(),
                     'form_login' => array(
-                        'login_path' => '/login',
-                        'check_path' => '/login_check',
+                        'login_path' => 'login',
+                        'check_path' => 'login_check',
                     ),
                 ),
             ),
@@ -355,10 +355,11 @@ First, enable form login under your firewall:
             'form_login' => array(),
 
 Now, when the security system initiates the authentication process, it will
-redirect the user to the login form (``/login`` by default). Implementing
-this login form visually is your job. First, create two routes: one that
-will display the login form (i.e. ``/login``) and one that will handle the
-login form submission (i.e. ``/login_check``):
+redirect the user to the login form (``/login`` by default). Implementing this
+login form visually is your job. First, the create two routes we used in the
+security configuration: the ``login`` route will display the login form (i.e.
+``/login``) and the ``login_check`` route will handle the login form
+submission (i.e.  ``/login_check``):
 
 .. configuration-block::
 
@@ -408,12 +409,11 @@ login form submission (i.e. ``/login_check``):
     to this URL.
 
 .. versionadded:: 2.1
-    As of Symfony 2.1, you *must* have routes configured for your ``login_path``
-    (e.g. ``/login``), ``check_path`` (e.g. ``/login_check``) and ``logout``
-    (e.g. ``/logout`` - see `Logging Out`_) URLs.
+    As of Symfony 2.1, you *must* have routes configured for your ``login_path``,
+    ``check_path`` ``logout`` keys. These keys can be route names (as shown
+    in this example) or URLs that have routes configured for them.
 
-Notice that the name of the ``login`` route isn't important. What's important
-is that the URL of the route (``/login``) matches the ``login_path`` config
+Notice that the name of the ``login`` route matches the``login_path`` config
 value, as that's where the security system will redirect users that need
 to login.
 
@@ -557,7 +557,7 @@ see :doc:`/cookbook/security/form_login`.
 
     **1. Create the correct routes**
 
-    First, be sure that you've defined the ``/login`` and ``/login_check``
+    First, be sure that you've defined the ``login`` and ``login_check``
     routes correctly and that they correspond to the ``login_path`` and
     ``check_path`` config values. A misconfiguration here can mean that you're
     redirected to a 404 page instead of the login page, or that submitting
@@ -1671,7 +1671,7 @@ the firewall can handle this automatically for you when you activate the
             'firewalls' => array(
                 'secured_area' => array(
                     // ...
-                    'logout' => array('path' => 'logout', 'target' => '/'),
+                    'logout' => array('path' => '/logout', 'target' => '/'),
                 ),
             ),
             // ...

book/translation.rst

@@ -303,7 +303,7 @@ override the translation messages of a bundle in any of the top 2 directories.
 
 The override mechanism works at a key level: only the overridden keys need
 to be listed in a higher priority message file. When a key is not found
-in a message file, the translator will automatically fallback to the lower
+in a message file, the translator will automatically fall back to the lower
 priority message files.
 
 The filename of the translations is also important as Symfony2 uses a convention
@@ -996,7 +996,7 @@ steps:
   a specific convention;
 
 * Manage the user's locale, which is stored on the request, but can also
-  be set once the user's session.
+  be set on the user's session.
 
 .. _`i18n`: http://en.wikipedia.org/wiki/Internationalization_and_localization
 .. _`L10n`: http://en.wikipedia.org/wiki/Internationalization_and_localization

components/config/definition.rst

@@ -1,11 +1,11 @@
 .. index::
-   single: Config; Define and process configuration values
+   single: Config; Defining and processing configuration values
 
-Define and process configuration values
-=======================================
+Defining and processing configuration values
+============================================
 
-Validate configuration values
------------------------------
+Validating configuration values
+-------------------------------
 
 After loading configuration values from all kinds of resources, the values
 and their structure can be validated using the "Definition" part of the Config
@@ -38,8 +38,8 @@ they are when first encountered. Also, some keys are only available when
 another key has a specific value (in the sample configuration above: the
 ``memory`` key only makes sense when the ``driver`` is ``sqlite``).
 
-Define a hierarchy of configuration values using the TreeBuilder
-----------------------------------------------------------------
+Defining a hierarchy of configuration values using the TreeBuilder
+------------------------------------------------------------------
 
 All the rules concerning configuration values can be defined using the
 :class:`Symfony\\Component\\Config\\Definition\\Builder\\TreeBuilder`.
@@ -66,8 +66,8 @@ should be returned from a custom ``Configuration`` class which implements the
         }
     }
 
-Add node definitions to the tree
---------------------------------
+Adding node definitions to the tree
+-----------------------------------
 
 Variable nodes
 ~~~~~~~~~~~~~~

components/console/single_command_tool.rst

@@ -1,8 +1,8 @@
 .. index::
    single: Console; Single command application
 
-How to build an Application that is a single Command
-====================================================
+Building a Single Command Application
+=====================================
 
 When building a command line tool, you may not need to provide several commands.
 In such case, having to pass the command name each time is tedious. Fortunately,

cookbook/console/console_command.rst

@@ -112,7 +112,7 @@ should be used instead of :class:`Symfony\\Component\\Console\\Application`::
 
 To be able to use the fully set up service container for your console tests
 you can extend your test from
-:class:`Symfony\Bundle\FrameworkBundle\Test\WebTestCase`::
+:class:`Symfony\\Bundle\\FrameworkBundle\\Test\\WebTestCase`::
 
     use Symfony\Component\Console\Tester\CommandTester;
     use Symfony\Bundle\FrameworkBundle\Console\Application;

cookbook/email/gmail.rst

@@ -51,6 +51,20 @@ In the development configuration file, change the ``transport`` setting to
 
 You're done!
 
+.. tip::
+
+    If you are using the Symfony Standard Edition, configure the parameters at ``parameters.yml``:
+
+    .. code-block:: yaml
+
+        # app/config/parameters.yml
+        parameters:
+            ...
+            mailer_transport: gmail
+            mailer_host:      ~
+            mailer_user:      your_gmail_username
+            mailer_password:  your_gmail_password
+
 .. note::
 
     The ``gmail`` transport is simply a shortcut that uses the ``smtp`` transport

quick_tour/the_architecture.rst

@@ -140,14 +140,16 @@ PHP. Have a look at the default configuration:
         #esi:             ~
         #translator:      { fallback: "%locale%" }
         secret:          "%secret%"
-        router:          { resource: "%kernel.root_dir%/config/routing.yml" }
+        router:
+            resource: "%kernel.root_dir%/config/routing.yml"
+            strict_requirements: "%kernel.debug%"
         form:            true
         csrf_protection: true
         validation:      { enable_annotations: true }
         templating:      { engines: ['twig'] } #assets_version: SomeVersionScheme
         default_locale:  "%locale%"
-        session:
-            auto_start:     true
+        trusted_proxies: ~
+        session:         ~
 
     # Twig Configuration
     twig:
@@ -159,13 +161,13 @@ PHP. Have a look at the default configuration:
         debug:          "%kernel.debug%"
         use_controller: false
         bundles:        [ ]
-        # java: /usr/bin/java
+        #java: /usr/bin/java
         filters:
             cssrewrite: ~
-            # closure:
-            #     jar: "%kernel.root_dir%/java/compiler.jar"
-            # yui_css:
-            #     jar: "%kernel.root_dir%/java/yuicompressor-2.4.2.jar"
+            #closure:
+            #    jar: "%kernel.root_dir%/Resources/java/compiler.jar"
+            #yui_css:
+            #    jar: "%kernel.root_dir%/Resources/java/yuicompressor-2.4.7.jar"
 
     # Doctrine Configuration
     doctrine:
@@ -188,10 +190,7 @@ PHP. Have a look at the default configuration:
         host:      "%mailer_host%"
         username:  "%mailer_user%"
         password:  "%mailer_password%"
-
-    jms_security_extra:
-        secure_controllers:  true
-        secure_all_services: false
+        spool:     { type: memory }
 
 Each entry like ``framework`` defines the configuration for a specific bundle.
 For example, ``framework`` configures the ``FrameworkBundle`` while ``swiftmailer``

reference/configuration/assetic.rst

@@ -52,3 +52,52 @@ Full Default Configuration
                 functions:
                     # An array of named functions (e.g. some_function, some_other_function)
                     some_function:                 []
+
+    .. code-block:: xml
+
+        <assetic:config
+            debug="%kernel.debug%"
+            use-controller="%kernel.debug%"
+            read-from="%kernel.root_dir%/../web"
+            write-to="%assetic.read_from%"
+            java="/usr/bin/java"
+            node="/usr/bin/node"
+            sass="/usr/bin/sass"
+        >
+            <!-- Defaults (all currently registered bundles) -->
+            <assetic:bundle>FrameworkBundle</assetic:bundle>
+            <assetic:bundle>SecurityBundle</assetic:bundle>
+            <assetic:bundle>TwigBundle</assetic:bundle>
+            <assetic:bundle>MonologBundle</assetic:bundle>
+            <assetic:bundle>SwiftmailerBundle</assetic:bundle>
+            <assetic:bundle>DoctrineBundle</assetic:bundle>
+            <assetic:bundle>AsseticBundle</assetic:bundle>
+            <assetic:bundle>...</assetic:bundle>
+
+            <assetic:asset>
+                <!-- prototype -->
+                <assetic:name>
+                    <assetic:input />
+
+                    <assetic:filter />
+
+                    <assetic:option>
+                        <!-- prototype -->
+                        <assetic:name />
+                    </assetic:option>
+                </assetic:name>
+            </assetic:asset>
+
+            <assetic:filter>
+                <!-- prototype -->
+                <assetic:name />
+            </assetic:filter>
+
+            <assetic:twig>
+                <assetic:functions>
+                    <!-- prototype -->
+                    <assetic:name />
+                </assetic:functions>
+            </assetic:twig>
+
+        </assetic:config>