Skip to content
This repository was archived by the owner on Sep 16, 2021. It is now read-only.

Commit 7a31f3f

Browse files
wouterjwouterj
committed
minor #575 seo corrections (cordoval)
This PR was submitted for the dev branch but it was merged into the master branch instead (closes #575). Discussion ---------- seo corrections |Q |A | |--- |--- | |Bug Fix? |n | |New Feature? |n | |BC Breaks? |n | |Deprecations?|n | |Tests Pass? |n | |Fixed Tickets|https://github.com/symfony-cmf/SeoBundle/issues/146| |License |MIT | |Doc PR | | Commits ------- b917a73 seo corrections f0d455e Fixed filename in comments
2 parents b151043 + b917a73 commit 7a31f3f

File tree

5 files changed

+32
-32
lines changed

5 files changed

+32
-32
lines changed

‎bundles/seo/configuration.rst

Lines changed: 17 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -20,38 +20,33 @@ phpcr
2020
2121
# app/config/config.yml
2222
cmf_seo:
23-
dynamic:
24-
persistence:
25-
phpcr:
26-
enabled: false
27-
manager_name: ~
23+
persistence:
24+
phpcr:
25+
enabled: false
26+
manager_name: ~
2827
2928
.. code-block:: xml
3029
3130
<!-- app/config/config.xml -->
3231
<?xml version="1.0" encoding="UTF-8" ?>
3332
<container xmlns="http://symfony.com/schema/dic/services">
3433
<config xmlns="http://cmf.symfony.com/schema/dic/seo">
35-
<dynamic>
36-
<persistence>
37-
<phpcr
38-
enabled="false"
39-
manager-name="null"
40-
/>
41-
</persistence>
42-
</dynamic>
34+
<persistence>
35+
<phpcr
36+
enabled="false"
37+
manager-name="null"
38+
/>
39+
</persistence>
4340
</config>
4441
</container>
4542
4643
.. code-block:: php
4744
4845
$container->loadFromExtension('cmf_seo', array(
49-
'dynamic' => array(
50-
'persistence' => array(
51-
'phpcr' => array(
52-
'enabled' => false,
53-
'manager_name' => null,
54-
),
46+
'persistence' => array(
47+
'phpcr' => array(
48+
'enabled' => false,
49+
'manager_name' => null,
5550
),
5651
),
5752
));
@@ -72,7 +67,7 @@ translation_domain
7267
**type**: ``string`` **default**: ``messages``
7368

7469
The translation domain to use when translating the title and description
75-
template. See :ref:`bundles-seo-title-description-emplate` for more
70+
template. See :ref:`bundles-seo-title-description-template` for more
7671
information.
7772

7873

@@ -81,15 +76,15 @@ title
8176

8277
**type**: ``string`` **default**: ``null``
8378

84-
The title template, read :ref:`here <bundles-seo-title-description-emplate>`
79+
The title template, read :ref:`here <bundles-seo-title-description-template>`
8580
about the usage.
8681

8782
description
8883
~~~~~~~~~~~
8984

9085
**type**: ``string`` **default**: ``null``
9186

92-
The description template, read :ref:`here <bundles-seo-title-description-emplate>`
87+
The description template, read :ref:`here <bundles-seo-title-description-template>`
9388
about the usage.
9489

9590
original_route_pattern

‎bundles/seo/extractors.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Available Extractors
3333

3434
.. note::
3535

36-
The interfaces life in the ``Symfony\Cmf\Bundle\SeoBundle\Extractor``
36+
The interfaces live in the ``Symfony\Cmf\Bundle\SeoBundle\Extractor``
3737
namespace.
3838

3939
An Example

‎bundles/seo/introduction.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ The only thing to do now is to use the twig helper in your templates:
8181
</html>
8282

8383
This will render a page with the default title ("Page's default title") as
84-
title element. The information definded for description and keywords will go
84+
title element. The information defined for description and keywords will go
8585
into the correct metatags.
8686

8787
.. seealso::
@@ -127,7 +127,7 @@ Persisting the ``SeoMetadata`` with the document makes it easy to edit for the
127127
admin, while using the extractors are perfect to easily use values from the
128128
displayed content.
129129

130-
Both ways are documented in detail in seperate sections:
130+
Both ways are documented in detail in separate sections:
131131

132132
* :doc:`seo_aware`
133133
* :doc:`extractors`
@@ -172,7 +172,7 @@ you want to change that to redirect instead, you can set the
172172
),
173173
);
174174
175-
.. _bundles-seo-title-description-emplate:
175+
.. _bundles-seo-title-description-template:
176176

177177
Defining a Title and Description Template
178178
-----------------------------------------

‎bundles/seo/seo_aware.rst

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Saving the SeoMetadata in the Object
22
====================================
33

44
The ``SeoMetadata`` can be saved in the object, so you can persist it into the
5-
database. This option gives admins the possiblity of changing the SEO data for
5+
database. This option gives admins the possibility of changing the SEO data for
66
the document.
77

88
In order to save the ``SeoMetadata`` in the object, the object should
@@ -30,6 +30,11 @@ the ``SeoMetadata``::
3030
}
3131
}
3232

33+
.. tip::
34+
35+
If you are using PHP5.4+ you may also benefit from using the trait ``SeoAwareTrait``
36+
to plug these behavior into your model.
37+
3338
Now you can set some SEO data for this ``Page`` using the metadata::
3439

3540
use Acme\SiteBundle\Document\Page;
@@ -220,7 +225,7 @@ object:
220225
</entity>
221226
</doctrine-mapping>
222227
223-
You can also choose to put the ``SeoMetadata`` class into a seperate table. To
228+
You can also choose to put the ``SeoMetadata`` class into a separate table. To
224229
do this, you have to enable ORM support just like you enabled PHPCR enabled
225230
above and add a OneToOne or ManyToOne relation between the content entity and
226231
the ``SeoMetadata`` entity.
@@ -233,15 +238,15 @@ form type can be used in forms to edit the ``SeoMetadata`` object.
233238

234239
.. caution::
235240

236-
The bundles requires the `BurgovKeyValueFormBundle`_ when using the form
241+
The bundle requires the `BurgovKeyValueFormBundle`_ when using the form
237242
type. Make sure you install and enable it.
238243

239244
Sonata Admin Integration
240245
------------------------
241246

242247
Besides providing a form type, the bundle also provides a Sonata Admin
243248
Extension. This extension adds a field for the ``SeoMetadata`` when an admin
244-
edits an objec that implements the ``SeoAwareInterface`` in the Sonata Admin
249+
edits an object that implements the ``SeoAwareInterface`` in the Sonata Admin
245250
panel.
246251

247252
.. caution::

‎tutorial/sonata-admin.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,7 @@ container configuration:
357357
358358
.. code-block:: xml
359359
360-
<!-- src/Acme/BasicCmsBundle/Resources/config/config.yml -->
360+
<!-- src/Acme/BasicCmsBundle/Resources/config/services.yml -->
361361
<?xml version="1.0" encoding="UTF-8" ?>
362362
<container xmlns="http://symfony.com/schema/dic/services"
363363
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -407,7 +407,7 @@ container configuration:
407407
408408
.. code-block:: php
409409
410-
// src/Acme/BasicCmsBundle/Resources/config/config.php
410+
// src/Acme/BasicCmsBundle/Resources/config/services.php
411411
use Symfony\Component\DependencyInjection\Reference;
412412
// ...
413413

0 commit comments

Comments
 (0)