Merge branch '1.2'

Conflicts:
	.travis.yml
	bundles/phpcr_odm/configuration.rst
	requirements.txt

Author: wouterj

.travis.yml

@@ -1,15 +1,19 @@
 language: python
 
-python:
-    - "2.7"
+python: 2.7
 
 sudo: false
 
+cache:
+    directories:
+        - $HOME/.cache/pip
+        - _build
+
 addons:
     apt:
         packages: [enchant]
 
-install: "pip install -q -r requirements.txt --use-mirrors"
+install: pip install sphinx~=1.3 git+https://github.com/fabpot/sphinx-php.git sphinxcontrib-spelling pyenchant
 
 script: 
     - sphinx-build -nW -b html -d _build/doctrees . _build/html

_exts

@@ -259,7 +259,7 @@ Now what is left to do is to update the sonata routes to become locale aware:
             <route id="admin_dashboard" pattern="/{_locale}/admin/">
                 <default key="_controller">FrameworkBundle:Redirect:redirect</default>
                 <default key="route">sonata_admin_dashboard</default>
-                <default "permanent">true</default>
+                <default key="permanent">true</default>
             </route>
 
             <import resource="@SonataAdminBundle/Resources/config/routing/sonata_admin.xml"
@@ -272,19 +272,19 @@ Now what is left to do is to update the sonata routes to become locale aware:
             <route id="admin_without_locale" pattern="/admin">
                 <default key="_controller">FrameworkBundle:Redirect:redirect</default>
                 <default key="route">sonata_admin_dashboard</default>
-                <default "permanent">true</default>
+                <default key="permanent">true</default>
             </route>
+
             <route id="admin_dashboard_without_locale" pattern="/admin/dashboard">
                 <default key="_controller">FrameworkBundle:Redirect:redirect</default>
                 <default key="route">sonata_admin_dashboard</default>
-                <default "permanent">true</default>
+                <default key="permanent">true</default>
             </route>
         </routes>
 
     .. code-block:: php
 
         // app/config/routing.php
-
         $collection = new RouteCollection();
 
         $collection->add('admin_dashboard', new Route('/{_locale}/admin/', array(

book/handling_multilang.rst

@@ -118,7 +118,7 @@ You can include the default in the main configuration file as follows:
         # app/config/config.yml
         imports:
             # ...
-            - { resource: @CmfBlogBundle/Resources/config/routing/autoroute_default.yml }
+            - { resource: '@CmfBlogBundle/Resources/config/routing/autoroute_default.yml' }
         # ...
 
     .. code-block:: xml

bundles/blog.rst

@@ -236,9 +236,9 @@ Metadata Handling
         cmf_create:
             auto_mapping: true
             rdf_config_dirs:
-                - "%kernel.root_dir%/Resources/rdf-mappings"
+                - '%kernel.root_dir%/Resources/rdf-mappings'
             map:
-                "<http://rdfs.org/sioc/ns#Post>": "Symfony\Cmf\Bundle\ContentBundle\Doctrine\Phpcr\StaticContent"
+                '<http://rdfs.org/sioc/ns#Post>': 'Symfony\Cmf\Bundle\ContentBundle\Doctrine\Phpcr\StaticContent'
 
     .. code-block:: xml
 

bundles/create/configuration.rst

@@ -43,29 +43,19 @@ Configuration
     .. code-block:: xml
 
         <!-- app/config/config.xml -->
-        <?xml version="1.0" encoding="UTF-8" ?>
+        <?xml version="1.0" charset="UTF-8" ?>
         <container xmlns="http://symfony.com/schema/dic/services">
 
             <config xmlns="http://doctrine-project.org/schema/symfony-dic/odm/phpcr">
-
-                <session
-                    workspace="default"
-                    username="admin"
-                    password="admin"
-                >
-
-                    <backend
-                        type="X"
-                    >
+                <session workspace="default" username="admin" password="admin">
+                    <backend type="X">
                         <parameter key="jackalope.factory">Jackalope\Factory</parameter>
                         <parameter key="jackalope.check_login_on_server">false</parameter>
                         <parameter key="jackalope.disable_stream_wrapper">false</parameter>
                         <parameter key="jackalope.auto_lastmodified">true</parameter>
                     </backend>
 
-                    <options
-                        jackalope.fetch_depth="1"
-                    />
+                    <options jackalope.fetch_depth="1" />
                 </session>
             </config>
         </container>
@@ -473,13 +463,10 @@ not configure anything here, the ODM services will not be loaded.
     .. code-block:: xml
 
         <!-- app/config/config.xml -->
-        <?xml version="1.0" encoding="UTF-8" ?>
+        <?xml version="1.0" charset="UTF-8" ?>
         <container xmlns="http://symfony.com/schema/dic/services">
-
             <config xmlns="http://doctrine-project.org/schema/symfony-dic/odm/phpcr">
-
-                <odm
-                    configuration-id="null"
+                <odm configuration-id="null"
                     auto-mapping="true"
                     auto-generate-proxy-classes="%kernel.debug%"
                     proxy-dir="%kernel.cache_dir%/doctrine/PHPCRProxies"
@@ -489,16 +476,14 @@ not configure anything here, the ODM services will not be loaded.
                         <translation alias="phpcr_locale" />
                     </namespaces>
 
-                    <mappings>
-                        <"name"
-                            mapping="true"
-                            type="null"
-                            dir="null"
-                            alias="null"
-                            prefix="null"
-                            is-bundle="null"
-                        />
-                    </mappings>
+                    <mapping name="<name>">
+                        mapping="true"
+                        type="null"
+                        dir="null"
+                        alias="null"
+                        prefix="null"
+                        is-bundle="null"
+                    />
 
                     <metadata-cache-driver
                         type="array"