Merge branch 'master' into dev

wouterj · wouterj · commit c6da068026b3 · 2014-05-13T20:03:41.000+02:00
Conflicts:
	cookbook/creating_a_cms/getting-started.rst
	cookbook/creating_cms_using_cmf_and_sonata.rst
	cookbook/editions/cmf_sandbox.rst
	cookbook/installing_configuring_doctrine_phpcr_odm.rst
diff --git a/cookbook/creating_a_cms/sonata-admin.rst b/cookbook/creating_a_cms/sonata-admin.rst
@@ -15,7 +15,7 @@ Ensure that you have the following package installed:
         ...
         require: {
             ...
-            "sonata-project/doctrine-phpcr-admin-bundle": "dev-master",
+            "sonata-project/doctrine-phpcr-admin-bundle": "1.0.*",
         },
         ...
     }

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ Ensure that you have the following package installed:`
`15`	`15`	`...`
`16`	`16`	`require: {`
`17`	`17`	`...`
`18`		`- "sonata-project/doctrine-phpcr-admin-bundle": "dev-master",`
	`18`	`+ "sonata-project/doctrine-phpcr-admin-bundle": "1.0.*",`
`19`	`19`	`},`
`20`	`20`	`...`
`21`	`21`	`}`