Merge branch '2.0'

Conflicts:
	book/installation.rst
	book/propel.rst
	cookbook/doctrine/index.rst
	cookbook/map.rst.inc
	quick_tour/the_big_picture.rst

Author: weaverryan

book/controller.rst

@@ -553,7 +553,7 @@ command:
 
 .. code-block:: bash
 
-    php app/console container:debug
+    $ php app/console container:debug
 
 For more information, see the :doc:`/book/service_container` chapter.
 

book/doctrine.rst

@@ -37,7 +37,7 @@ persist it to the database and fetch it back out.
 
     .. code-block:: bash
     
-        php app/console generate:bundle --namespace=Acme/StoreBundle
+        $ php app/console generate:bundle --namespace=Acme/StoreBundle
 
 Configuring the Database
 ~~~~~~~~~~~~~~~~~~~~~~~~
@@ -79,12 +79,38 @@ information. By convention, this information is usually configured in an
     of your project, like inside your Apache configuration, for example. For
     more information, see :doc:`/cookbook/configuration/external_parameters`.
 
+.. sidebar:: Setting Up The Database
+
+    One mistake even seasoned developers make when starting a Symfony2 project
+    is forgetting to setup default charset and collation on their database,
+    ending up with latin type collations, which are default for most databases.
+    They might even remember to do it the very first time, but forget that
+    it's all gone after running a relatively common command during development:
+
+    .. code-block:: bash
+
+        $ app/console doctrine:database:drop --force
+        $ app/console doctrine:database:create
+
+    There's no way to configure these defaults inside Doctrine, as it tries to be
+    as agnostic as possible in terms of environment configuration. One way to solve
+    this problem is to configure server-level defaults.
+
+    Setting UTF8 defaults for MySQL is as simple as adding a few lines to
+    your configuration file  (typically ``my.cnf``):
+
+    .. code-block:: ini
+    
+        [mysqld]
+        collation-server = utf8_general_ci
+        character-set-server = utf8    
+
 Now that Doctrine knows about your database, you can have it create the database
 for you:
 
 .. code-block:: bash
 
-    php app/console doctrine:database:create
+    $ php app/console doctrine:database:create
 
 Creating an Entity Class
 ~~~~~~~~~~~~~~~~~~~~~~~~
@@ -118,7 +144,7 @@ just a simple PHP class.
 
     .. code-block:: bash
         
-        php app/console doctrine:generate:entity --entity="AcmeStoreBundle:Product" --fields="name:string(255) price:float description:text"
+        $ php app/console doctrine:generate:entity --entity="AcmeStoreBundle:Product" --fields="name:string(255) price:float description:text"
 
 .. index::
     single: Doctrine; Adding mapping metadata
@@ -279,7 +305,7 @@ a regular PHP class, you need to create getter and setter methods (e.g. ``getNam
 
 .. code-block:: bash
 
-    php app/console doctrine:generate:entities Acme/StoreBundle/Entity/Product
+    $ php app/console doctrine:generate:entities Acme/StoreBundle/Entity/Product
 
 This command makes sure that all of the getters and setters are generated
 for the ``Product`` class. This is a safe command - you can run it over and
@@ -313,8 +339,8 @@ mapping information) of a bundle or an entire namespace:
 
 .. code-block:: bash
 
-    php app/console doctrine:generate:entities AcmeStoreBundle
-    php app/console doctrine:generate:entities Acme
+    $ php app/console doctrine:generate:entities AcmeStoreBundle
+    $ php app/console doctrine:generate:entities Acme
 
 .. note::
 
@@ -334,7 +360,7 @@ in your application. To do this, run:
 
 .. code-block:: bash
 
-    php app/console doctrine:schema:update --force
+    $ php app/console doctrine:schema:update --force
 
 .. tip::
 
@@ -727,7 +753,7 @@ used earlier to generate the missing getter and setter methods:
 
 .. code-block:: bash
 
-    php app/console doctrine:generate:entities Acme
+    $ php app/console doctrine:generate:entities Acme
 
 Next, add a new method - ``findAllOrderedByName()`` - to the newly generated
 repository class. This method will query for all of the ``Product`` entities,
@@ -779,7 +805,7 @@ you can let Doctrine create the class for you.
 
 .. code-block:: bash
 
-    php app/console doctrine:generate:entity --entity="AcmeStoreBundle:Category" --fields="name:string(255)"
+    $ php app/console doctrine:generate:entity --entity="AcmeStoreBundle:Category" --fields="name:string(255)"
 
 This task generates the ``Category`` entity for you, with an ``id`` field,
 a ``name`` field and the associated getter and setter functions.
@@ -890,7 +916,7 @@ methods for you:
 
 .. code-block:: bash
 
-    php app/console doctrine:generate:entities Acme
+    $ php app/console doctrine:generate:entities Acme
 
 Ignore the Doctrine metadata for a moment. You now have two classes - ``Category``
 and ``Product`` with a natural one-to-many relationship. The ``Category``
@@ -919,7 +945,7 @@ table, and ``product.category_id`` column, and new foreign key:
 
 .. code-block:: bash
 
-    php app/console doctrine:schema:update --force
+    $ php app/console doctrine:schema:update --force
 
 .. note::
 
@@ -1322,7 +1348,7 @@ without any arguments:
 
 .. code-block:: bash
 
-    php app/console
+    $ php app/console
 
 A list of available command will print out, many of which start with the
 ``doctrine:`` prefix. You can find out more information about any of these
@@ -1331,7 +1357,7 @@ to get details about the ``doctrine:database:create`` task, run:
 
 .. code-block:: bash
 
-    php app/console help doctrine:database:create
+    $ php app/console help doctrine:database:create
 
 Some notable or interesting tasks include:
 
@@ -1341,7 +1367,7 @@ Some notable or interesting tasks include:
 
   .. code-block:: bash
   
-    php app/console doctrine:ensure-production-settings --env=prod
+    $ php app/console doctrine:ensure-production-settings --env=prod
 
 * ``doctrine:mapping:import`` - allows Doctrine to introspect an existing
   database and create mapping information. For more information, see

book/forms.rst

@@ -64,7 +64,7 @@ going to need to build a form. But before you begin, first focus on the generic
 
    .. code-block:: bash
 
-        php app/console generate:bundle --namespace=Acme/TaskBundle
+        $ php app/console generate:bundle --namespace=Acme/TaskBundle
 
 This class is a "plain-old-PHP-object" because, so far, it has nothing
 to do with Symfony or any other library. It's quite simply a normal PHP object

book/http_fundamentals.rst

@@ -483,25 +483,28 @@ libraries that can be used inside *any* PHP project. These libraries, called
 the *Symfony2 Components*, contain something useful for almost any situation,
 regardless of how your project is developed. To name a few:
 
-* `HttpFoundation`_ - Contains the ``Request`` and ``Response`` classes, as
-  well as other classes for handling sessions and file uploads;
+* :doc:`HttpFoundation</components/http_foundation/introduction>` - Contains
+  the ``Request`` and ``Response`` classes, as well as other classes for handling
+  sessions and file uploads;
 
-* `Routing`_ - Powerful and fast routing system that allows you to map a
-  specific URI (e.g. ``/contact``) to some information about how that request
-  should be handled (e.g. execute the ``contactAction()`` method);
+* :doc:`Routing</components/routing>` - Powerful and fast routing system that
+  allows you to map a specific URI (e.g. ``/contact``) to some information
+  about how that request should be handled (e.g. execute the ``contactAction()``
+  method);
 
 * `Form`_ - A full-featured and flexible framework for creating forms and
   handling form submissions;
 
 * `Validator`_ A system for creating rules about data and then validating
   whether or not user-submitted data follows those rules;
 
-* `ClassLoader`_ An autoloading library that allows PHP classes to be used
-  without needing to manually ``require`` the files containing those classes;
+* :doc:`ClassLoader</components/class_loader>` An autoloading library that allows
+  PHP classes to be used without needing to manually ``require`` the files
+  containing those classes;
 
-* `Templating`_ A toolkit for rendering templates, handling template inheritance
-  (i.e. a template is decorated with a layout) and performing other common
-  template tasks;
+* :doc:`Templating</components/templating>` A toolkit for rendering templates,
+  handling template inheritance (i.e. a template is decorated with a layout)
+  and performing other common template tasks;
 
 * `Security`_ - A powerful library for handling all types of security inside
   an application;
@@ -541,11 +544,7 @@ sensible defaults. For more advanced users, the sky is the limit.
 .. _`List of HTTP status codes`: http://en.wikipedia.org/wiki/List_of_HTTP_status_codes
 .. _`List of HTTP header fields`: http://en.wikipedia.org/wiki/List_of_HTTP_header_fields
 .. _`List of common media types`: http://en.wikipedia.org/wiki/Internet_media_type#List_of_common_media_types
-.. _`HttpFoundation`: https://github.com/symfony/HttpFoundation
-.. _`Routing`: https://github.com/symfony/Routing
 .. _`Form`: https://github.com/symfony/Form
 .. _`Validator`: https://github.com/symfony/Validator
-.. _`ClassLoader`: https://github.com/symfony/ClassLoader
-.. _`Templating`: https://github.com/symfony/Templating
 .. _`Security`: https://github.com/symfony/Security
 .. _`Translation`: https://github.com/symfony/Translation

book/installation.rst

@@ -52,10 +52,10 @@ one of the following commands (replacing ``###`` with your actual filename):
 .. code-block:: bash
 
     # for .tgz file
-    tar zxvf Symfony_Standard_Vendors_2.0.###.tgz
+    $ tar zxvf Symfony_Standard_Vendors_2.0.###.tgz
 
     # for a .zip file
-    unzip Symfony_Standard_Vendors_2.0.###.zip
+    $ unzip Symfony_Standard_Vendors_2.0.###.zip
 
 When you're finished, you should have a ``Symfony/`` directory that looks
 something like this:
@@ -95,7 +95,7 @@ Step 2: Install vendors
 
 .. code-block:: bash
 
-    php composer.phar install
+    $ php composer.phar install
 
 This command downloads all of the necessary vendor libraries - including
 Symfony itself - into the ``vendor/`` directory.
@@ -163,11 +163,11 @@ If there are any issues, correct them now before moving on.
 
     .. code-block:: bash
 
-        rm -rf app/cache/*
-        rm -rf app/logs/*
+        $ rm -rf app/cache/*
+        $ rm -rf app/logs/*
 
-        sudo chmod +a "www-data allow delete,write,append,file_inherit,directory_inherit" app/cache app/logs
-        sudo chmod +a "`whoami` allow delete,write,append,file_inherit,directory_inherit" app/cache app/logs
+        $ sudo chmod +a "www-data allow delete,write,append,file_inherit,directory_inherit" app/cache app/logs
+        $ sudo chmod +a "`whoami` allow delete,write,append,file_inherit,directory_inherit" app/cache app/logs
 
     **2. Using Acl on a system that does not support chmod +a**
 
@@ -178,8 +178,8 @@ If there are any issues, correct them now before moving on.
 
     .. code-block:: bash
 
-        sudo setfacl -R -m u:www-data:rwx -m u:`whoami`:rwx app/cache app/logs
-        sudo setfacl -dR -m u:www-data:rwx -m u:`whoami`:rwx app/cache app/logs
+        $ sudo setfacl -R -m u:www-data:rwx -m u:`whoami`:rwx app/cache app/logs
+        $ sudo setfacl -dR -m u:www-data:rwx -m u:`whoami`:rwx app/cache app/logs
 
     Note that not all web servers run as the user ``www-data``. You have to
     check which user the web server is being run as and put it in for ``www-data``.

book/page_creation.rst

@@ -69,7 +69,7 @@ instructions (use all of the default options):
 
 .. code-block:: bash
 
-    php app/console generate:bundle --namespace=Acme/HelloBundle --format=yml
+    $ php app/console generate:bundle --namespace=Acme/HelloBundle --format=yml
 
 Behind the scenes, a directory is created for the bundle at ``src/Acme/HelloBundle``.
 A line is also automatically added to the ``app/AppKernel.php`` file so that
@@ -261,7 +261,7 @@ application should greet you:
 
     .. code-block:: bash
 
-        php app/console cache:clear --env=prod --no-debug
+        $ php app/console cache:clear --env=prod --no-debug
 
 An optional, but common, third step in the process is to create a template.
 
@@ -667,7 +667,7 @@ generating a basic bundle skeleton:
 
 .. code-block:: bash
 
-    php app/console generate:bundle --namespace=Acme/TestBundle
+    $ php app/console generate:bundle --namespace=Acme/TestBundle
 
 The bundle skeleton generates with a basic controller, template and routing
 resource that can be customized. You'll learn more about Symfony2's command-line

book/propel.rst

@@ -22,7 +22,7 @@ persist it to the database and fetch it back out.
 
     .. code-block:: bash
 
-        php app/console generate:bundle --namespace=Acme/StoreBundle
+        $ php app/console generate:bundle --namespace=Acme/StoreBundle
 
 Configuring the Database
 ~~~~~~~~~~~~~~~~~~~~~~~~
@@ -62,7 +62,7 @@ you:
 
 .. code-block:: bash
 
-    php app/console propel:database:create
+    $ php app/console propel:database:create
 
 .. note::
 
@@ -104,7 +104,7 @@ After creating your ``schema.xml``, generate your model from it by running:
 
 .. code-block:: bash
 
-    php app/console propel:model:build
+    $ php app/console propel:model:build
 
 This generates each model class to quickly develop your application in the
 ``Model/`` directory the ``AcmeStoreBundle`` bundle.
@@ -119,9 +119,8 @@ needed for every known model in your application.  To do this, run:
 
 .. code-block:: bash
 
-    php app/console propel:sql:build
-
-    php app/console propel:sql:insert --force
+    $ php app/console propel:sql:build
+    $ php app/console propel:sql:insert --force
 
 Your database now has a fully-functional ``product`` table with columns that
 match the schema you've specified.
@@ -305,17 +304,16 @@ Create the classes:
 
 .. code-block:: bash
 
-    php app/console propel:model:build
+    $ php app/console propel:model:build
 
 Assuming you have products in your database, you don't want lose them. Thanks to
 migrations, Propel will be able to update your database without losing existing
 data.
 
 .. code-block:: bash
 
-    php app/console propel:migration:generate-diff
-
-    php app/console propel:migration:migrate
+    $ php app/console propel:migration:generate-diff
+    $ php app/console propel:migration:migrate
 
 Your database has been updated, you can continue to write your application.
 

book/routing.rst

@@ -1035,7 +1035,7 @@ the command by running the following from the root of your project.
 
 .. code-block:: bash
 
-    php app/console router:debug
+    $ php app/console router:debug
 
 The command will print a helpful list of *all* the configured routes in
 your application:
@@ -1054,7 +1054,7 @@ the route name after the command:
 
 .. code-block:: bash
 
-    php app/console router:debug article_show
+    $ php app/console router:debug article_show
 
 .. index::
    single: Routing; Generating URLs

book/translation.rst

@@ -273,7 +273,7 @@ filesystem and discovered by Symfony, thanks to some conventions.
 
     .. code-block:: bash
     
-        php app/console cache:clear
+        $ php app/console cache:clear
 
 .. index::
    single: Translations; Translation resource locations

components/class_loader.rst

@@ -1,5 +1,6 @@
 .. index::
    pair: Autoloader; Configuration
+   single: Components; ClassLoader
 
 The ClassLoader Component
 =========================

components/config/introduction.rst

@@ -1,5 +1,6 @@
 .. index::
    single: Config
+   single: Components; Config
 
 The Config Component
 ====================