Merge branch 'master' into dev

Author: wouterj

book/installation.rst

@@ -128,6 +128,21 @@ And then access the CMF via:
 
     http://localhost:8000
 
+
+If you run an Apache installation as described in the `Symfony cookbook article on setup`_,
+your URL will look like this:
+
+.. code-block:: text
+
+    http://localhost/app_dev.php
+
+.. note::
+
+    Adding the ``app_dev.php`` to the url in your browser is important to actually
+    see the test page. Because the AcmeDemoBundle is only configured to work with the
+    Development Environment. (If you have a look at ``AppKernel.php`` you can easily
+    spot why)
+
 .. sidebar:: Using Other Database Backends
 
     If you prefer to use another database backend, for example MySQL, run the
@@ -254,3 +269,4 @@ and then run the following command:
 .. _`guidelines in the symfony book`: http://symfony.com/doc/master/book/installation.html#configuration-and-setup
 .. _`the Symfony2 book`: http://symfony.com/doc/current/book/
 .. _`Fixtures`: http://symfony.com/doc/current/bundles/DoctrineFixturesBundle/index.html
+.. _`Symfony cookbook article on setup`: http://symfony.com/doc/current/cookbook/configuration/web_server_configuration.html

book/simplecms.rst

@@ -49,8 +49,10 @@ To create a page, use the
     // // src/Acme/MainBundle/DataFixtures/PHPCR/LoadSimpleCms.php
     namespace Acme\DemoBundle\DataFixtures\PHPCR;
 
-    use Symfony\Cmf\Bundle\SimpleCmsBundle\Doctrine\Phpcr\Page;
+    use Doctrine\Common\DataFixtures\FixtureInterface;
+    use Doctrine\Common\Persistence\ObjectManager;
     use Doctrine\ODM\PHPCR\DocumentManager;
+    use Symfony\Cmf\Bundle\SimpleCmsBundle\Doctrine\Phpcr\Page;
 
     class LoadSimpleCms implements FixtureInterface
     {
@@ -97,8 +99,10 @@ structure, you would do::
     // // src/Acme/MainBundle/DataFixtures/PHPCR/LoadSimpleCms.php
     namespace Acme\DemoBundle\DataFixtures\PHPCR;
 
-    use Symfony\Cmf\Bundle\SimpleCmsBundle\Doctrine\Phpcr\Page;
+    use Doctrine\Common\DataFixtures\FixtureInterface;
+    use Doctrine\Common\Persistence\ObjectManager;
     use Doctrine\ODM\PHPCR\DocumentManager;
+    use Symfony\Cmf\Bundle\SimpleCmsBundle\Doctrine\Phpcr\Page;
 
     class LoadSimpleCms implements FixtureInterface
     {

quick_tour/the_router.rst

@@ -47,7 +47,7 @@ other examples:
             /about       # /about Route
             /contact     # /contact Route
                 /team    # /contact/team Route
-                /docs    # /docs Route
+                /docs    # /contact/docs Route
 
 OK, you got it? The only thing the Router has to do is prefix the route with a
 specific path prefix and load that document. In the case of the SimpleCmsBundle,

tutorial/make-homepage.rst

@@ -404,6 +404,8 @@ the page action::
     // src/Acme/BasicCmsBundle/Controller/DefaultController.php
 
     // ...
+    use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
+
     class DefaultController extends Controller
     {
         // ...

tutorial/the-frontend.rst

@@ -108,8 +108,13 @@ first level of child items. Modify your fixtures to declare a root element
 to which you will add the existing ``Home`` page and an additional ``About`` page::
 
     // src/Acme/BasicCmsBundle/DataFixtures/Phpcr/LoadPageData.php
+    namespace Acme\DemoBundle\DataFixtures\PHPCR;
+
+    use Doctrine\Common\DataFixtures\FixtureInterface;
+    use Doctrine\Common\Persistence\ObjectManager;
+    use Doctrine\ODM\PHPCR\DocumentManager;
+    use Symfony\Cmf\Bundle\SimpleCmsBundle\Doctrine\Phpcr\Page;
 
-    // ...
     class LoadPageData implements FixtureInterface
     {
         public function load(ObjectManager $dm)