From 7690cc0ceb1a5cc621874985890986583792fe12 Mon Sep 17 00:00:00 2001 From: Wouter J Date: Thu, 25 Sep 2014 00:58:41 +0200 Subject: [PATCH] Revert "seo corrections" --- bundles/seo/configuration.rst | 39 ++++++++++++++++++++--------------- bundles/seo/extractors.rst | 2 +- bundles/seo/introduction.rst | 6 +++--- bundles/seo/seo_aware.rst | 13 ++++-------- 4 files changed, 30 insertions(+), 30 deletions(-) diff --git a/bundles/seo/configuration.rst b/bundles/seo/configuration.rst index ae1e3ef6..fe2da9c7 100644 --- a/bundles/seo/configuration.rst +++ b/bundles/seo/configuration.rst @@ -20,10 +20,11 @@ phpcr # app/config/config.yml cmf_seo: - persistence: - phpcr: - enabled: false - manager_name: ~ + dynamic: + persistence: + phpcr: + enabled: false + manager_name: ~ .. code-block:: xml @@ -31,22 +32,26 @@ phpcr - - - + + + + + .. 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,7 +81,7 @@ title **type**: ``string`` **default**: ``null`` -The title template, read :ref:`here ` +The title template, read :ref:`here ` about the usage. description @@ -84,7 +89,7 @@ description **type**: ``string`` **default**: ``null`` -The description template, read :ref:`here ` +The description template, read :ref:`here ` about the usage. original_route_pattern diff --git a/bundles/seo/extractors.rst b/bundles/seo/extractors.rst index 770d60fa..f6ba2155 100644 --- a/bundles/seo/extractors.rst +++ b/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 diff --git a/bundles/seo/introduction.rst b/bundles/seo/introduction.rst index 9de7c456..ae61706e 100644 --- a/bundles/seo/introduction.rst +++ b/bundles/seo/introduction.rst @@ -81,7 +81,7 @@ The only thing to do now is to use the twig helper in your templates: 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 ----------------------------------------- diff --git a/bundles/seo/seo_aware.rst b/bundles/seo/seo_aware.rst index 78cb5f9b..ed81031c 100644 --- a/bundles/seo/seo_aware.rst +++ b/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: -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,7 +233,7 @@ 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 @@ -246,7 +241,7 @@ 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::