Merge remote-tracking branch 'origin/master' into 2.0

Author: dbu

cookbook/editions/cmf_sandbox.rst

@@ -115,7 +115,7 @@ run:
 
 .. code-block:: bash
 
-    $ php bin/console doctrine:database:create
+    $ php app/console doctrine:database:create
 
 If you don't have sqlite, you can specify ``pdo_mysql`` or ``pdo_pgsql`` and
 provide the database name and login credentials to use.
@@ -124,14 +124,14 @@ Then you have to set up your database with:
 
 .. code-block:: bash
 
-    $ php bin/console doctrine:phpcr:init:dbal
+    $ php app/console doctrine:phpcr:init:dbal --force
 
 Once your database is set up, you need to `register the node types`_ for
 phpcr-odm:
 
 .. code-block:: bash
 
-    $ php bin/console doctrine:phpcr:repository:init
+    $ php app/console doctrine:phpcr:repository:init
 
 Import the Fixtures
 ~~~~~~~~~~~~~~~~~~~
@@ -141,7 +141,7 @@ They are loaded using the fixture loading concept of PHPCR-ODM.
 
 .. code-block:: bash
 
-    $ php bin/console -v doctrine:phpcr:fixtures:load
+    $ php app/console -v doctrine:phpcr:fixtures:load
 
 This command loads fixtures from all bundles that provide them in the
 ``DataFixtures/PHPCR`` folder. The sandbox has fixtures in the

tutorial/make-homepage.rst

@@ -198,6 +198,8 @@ Now empty your repository, reinitialize it and reload your fixtures:
 
 .. code-block:: bash
 
+    $ php bin/console doctrine:phpcr:node:remove /cms
+    $ php bin/console doctrine:phpcr:repository:init
     $ php bin/console doctrine:phpcr:fixtures:load
 
 and verify that the ``cms`` node has been created correctly, using the