Merge branch 'master' into dev

Conflicts:
	bundles/phpcr_odm.rst
	cookbook/editions/cmf_sandbox.rst

Author: wouterj

cookbook/editions/cmf_sandbox.rst

@@ -213,12 +213,12 @@ After this, your should follow the steps in `Preparing the PHPCR repository`_.
 Doctrine caching
 ................
 
-Optionally, to improve performance, you can install
-DoctrineCacheBundle by typing the following command:
+Optionally, to improve performance, you can install DoctrineCacheBundle by
+typing the following command:
 
 .. code-block:: bash
 
-    $ php composer.phar require "doctrine/cache-bundle:1.0.*"
+    $ php composer.phar require doctrine/cache-bundle:1.0.*
 
 And adding the following entry to your ``app/AppKernel.php``::
 

quick_tour/the_model.rst

@@ -14,7 +14,7 @@ of the CMF.
     is storage agnosticly created, meaning it is not tied to specific storage
     system.
 
-Getting Familair with PHPCR
+Getting Familiar with PHPCR
 ---------------------------
 
 PHPCR_ stores all data into one big tree structure. You can compare this to a
@@ -92,9 +92,17 @@ by creating a new class in the AcmeMainBundle::
 
     use Doctrine\Common\Persistence\ObjectManager;
     use Doctrine\Common\DataFixtures\FixtureInterface;
+    use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 
-    class LoadPageData implements FixtureInterface
+    class LoadPageData implements FixtureInterface, OrderedFixtureInterface
     {
+        public function getOrder()
+        {
+            // refers to the order in which the class' load function is called 
+            // (lower return values are called first)
+            return 10;
+        }
+    
         public function load(ObjectManager $documentManager)
         {
         }