Merge branch '1.1' into 1.2

wouterj · wouterj · commit db361ba9c5c5 · 2016-02-11T14:53:45.000+01:00
Conflicts:
	_exts
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule "_exts"]
-    path = _exts
-    url = http://github.com/fabpot/sphinx-php
diff --git a/bundles/seo/seo_aware.rst b/bundles/seo/seo_aware.rst
@@ -137,7 +137,7 @@ After you've enabled PHPCR, map your seoMetadata as a child:
         >
             <document name="Acme\SiteBundle\Document\Page">
                 <!-- ... -->
-                <child fieldName="seoMetadata" />
+                <child name="seoMetadata" />
             </document>
         </doctrine-mapping>
 

Original file line number	Diff line number	Diff line change
`@@ -1,3 +0,0 @@`
`1`		`-[submodule "_exts"]`
`2`		`- path = _exts`
`3`		`- url = http://github.com/fabpot/sphinx-php`
Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ After you've enabled PHPCR, map your seoMetadata as a child:`
`137`	`137`	`>`
`138`	`138`	`<document name="Acme\SiteBundle\Document\Page">`
`139`	`139`	`<!-- ... -->`
`140`		`- <child fieldName="seoMetadata" />`
	`140`	`+ <child name="seoMetadata" />`
`141`	`141`	`</document>`
`142`	`142`	`</doctrine-mapping>`
`143`	`143`