Merge pull request #576 from symfony-cmf/revert-575-seo-corrections

Revert "seo corrections"

Author: wouterj

bundles/seo/configuration.rst

@@ -20,33 +20,38 @@ phpcr
 
         # app/config/config.yml
         cmf_seo:
-            persistence:
-                phpcr:
-                    enabled: false
-                    manager_name: ~
+            dynamic:
+                persistence:
+                    phpcr:
+                        enabled: false
+                        manager_name: ~
 
     .. code-block:: xml
 
         <!-- app/config/config.xml -->
         <?xml version="1.0" encoding="UTF-8" ?>
         <container xmlns="http://symfony.com/schema/dic/services">
             <config xmlns="http://cmf.symfony.com/schema/dic/seo">
-                <persistence>
-                    <phpcr
-                        enabled="false"
-                        manager-name="null"
-                    />
-                </persistence>
+                <dynamic>
+                    <persistence>
+                        <phpcr
+                            enabled="false"
+                            manager-name="null"
+                        />
+                    </persistence>
+                </dynamic>
             </config>
         </container>
 
     .. code-block:: php
 
         $container->loadFromExtension('cmf_seo', array(
-            'persistence' => array(
-                'phpcr' => array(
-                    'enabled' => false,
-                    'manager_name' => null,
+            'dynamic' => array(
+                'persistence' => array(
+                    'phpcr' => array(
+                        'enabled' => false,
+                        'manager_name' => null,
+                    ),
                 ),
             ),
         ));
@@ -67,7 +72,7 @@ translation_domain
 **type**: ``string`` **default**: ``messages``
 
 The translation domain to use when translating the title and description
-template. See :ref:`bundles-seo-title-description-template` for more
+template. See :ref:`bundles-seo-title-description-emplate` for more
 information.
 
 
@@ -76,15 +81,15 @@ title
 
 **type**: ``string`` **default**: ``null``
 
-The title template, read :ref:`here <bundles-seo-title-description-template>`
+The title template, read :ref:`here <bundles-seo-title-description-emplate>`
 about the usage.
 
 description
 ~~~~~~~~~~~
 
 **type**: ``string`` **default**: ``null``
 
-The description template, read :ref:`here <bundles-seo-title-description-template>`
+The description template, read :ref:`here <bundles-seo-title-description-emplate>`
 about the usage.
 
 original_route_pattern

bundles/seo/extractors.rst

@@ -33,7 +33,7 @@ Available Extractors
 
 .. note::
 
-    The interfaces live in the ``Symfony\Cmf\Bundle\SeoBundle\Extractor``
+    The interfaces life in the ``Symfony\Cmf\Bundle\SeoBundle\Extractor``
     namespace.
 
 An Example

bundles/seo/introduction.rst

@@ -81,7 +81,7 @@ The only thing to do now is to use the twig helper in your templates:
     </html>
 
 This will render a page with the default title ("Page's default title") as
-title element. The information defined for description and keywords will go
+title element. The information definded for description and keywords will go
 into the correct metatags.
 
 .. seealso::
@@ -127,7 +127,7 @@ Persisting the ``SeoMetadata`` with the document makes it easy to edit for the
 admin, while using the extractors are perfect to easily use values from the
 displayed content.
 
-Both ways are documented in detail in separate sections:
+Both ways are documented in detail in seperate sections:
 
 * :doc:`seo_aware`
 * :doc:`extractors`
@@ -172,7 +172,7 @@ you want to change that to redirect instead, you can set the
             ),
         );
 
-.. _bundles-seo-title-description-template:
+.. _bundles-seo-title-description-emplate:
 
 Defining a Title and Description Template
 -----------------------------------------

bundles/seo/seo_aware.rst

@@ -2,7 +2,7 @@ Saving the SeoMetadata in the Object
 ====================================
 
 The ``SeoMetadata`` can be saved in the object, so you can persist it into the
-database. This option gives admins the possibility of changing the SEO data for
+database. This option gives admins the possiblity of changing the SEO data for
 the document.
 
 In order to save the ``SeoMetadata`` in the object, the object should
@@ -30,11 +30,6 @@ the ``SeoMetadata``::
         }
     }
 
-.. tip::
-
-    If you are using PHP5.4+ you may also benefit from using the trait ``SeoAwareTrait``
-    to plug these behavior into your model.
-
 Now you can set some SEO data for this ``Page`` using the metadata::
 
     use Acme\SiteBundle\Document\Page;
@@ -225,7 +220,7 @@ object:
             </entity>
         </doctrine-mapping>
 
-You can also choose to put the ``SeoMetadata`` class into a separate table. To
+You can also choose to put the ``SeoMetadata`` class into a seperate table. To
 do this, you have to enable ORM support just like you enabled PHPCR enabled
 above and add a OneToOne or ManyToOne relation between the content entity and
 the ``SeoMetadata`` entity.
@@ -238,15 +233,15 @@ form type can be used in forms to edit the ``SeoMetadata`` object.
 
 .. caution::
 
-    The bundle requires the `BurgovKeyValueFormBundle`_ when using the form
+    The bundles requires the `BurgovKeyValueFormBundle`_ when using the form
     type. Make sure you install and enable it.
 
 Sonata Admin Integration
 ------------------------
 
 Besides providing a form type, the bundle also provides a Sonata Admin
 Extension. This extension adds a field for the ``SeoMetadata`` when an admin
-edits an object that implements the ``SeoAwareInterface`` in the Sonata Admin
+edits an objec that implements the ``SeoAwareInterface`` in the Sonata Admin
 panel.
 
 .. caution::