Merge pull request #486 from symfony-cmf/consistency

Consistency

Author: wouterj

bundles/block/create_your_own_blocks.rst

@@ -254,7 +254,7 @@ Form Configuration
 ~~~~~~~~~~~~~~~~~~
 
 The methods ``buildEditForm`` and ``buildCreateForm`` specify how to build the
-the forms for editing using a frontend or backend UI. The method
+the forms for editing using a front-end or backend UI. The method
 ``validateBlock`` contains the validation configuration. This is not used in
 the CMF and it is recommended to instead build forms or Sonata admin classes
 that can handle the block documents.
@@ -270,7 +270,7 @@ JavaScripts and Stylesheets
 
 The methods ``getJavaScripts`` and ``getStylesheets`` of the service class
 define the JavaScript and Stylesheet files needed by a block. There is a
-twig function and a templating helper to render all links for all blocks used
+Twig function and a templating helper to render all links for all blocks used
 on the current page:
 
 .. configuration-block::

bundles/block/introduction.rst

@@ -189,7 +189,7 @@ Block Context
 
 The BlockContext contains all information and the block document needed to
 render the block. It aggregates and merges all settings from configuration,
-the block service, the block document and settings passed to the twig template
+the block service, the block document and settings passed to the Twig template
 helper. Therefore, use the BlockContext to get or alter a setting if needed.
 
 .. _bundle-block-service:
@@ -210,7 +210,7 @@ service. It is only relevant when
 Block rendering
 ---------------
 
-Rendering is handled by the SonataBlockBundle ``sonata_block_render`` twig
+Rendering is handled by the SonataBlockBundle ``sonata_block_render`` Twig
 function. The block name is either an absolute PHPCR path or the name of the
 block relative to the ``cmfMainContent`` document.
 
@@ -269,7 +269,7 @@ response object - typically by rendering a Twig template.
 Embedding Blocks in WYSIWYG Content
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-The CmfBlockBundle provides a twig filter ``cmf_embed_blocks`` that
+The CmfBlockBundle provides a Twig filter ``cmf_embed_blocks`` that
 looks through the content and looks for special tags to render blocks. To use
 the tag, you need to apply the ``cmf_embed_blocks`` filter to your output. If
 you can, render your blocks directly in the template. This feature is only a
@@ -294,7 +294,7 @@ might be a CMF bundle at some point for this).
     Make sure to only place this filter where you display the content and not
     where editing it, as otherwise your users would start to edit the rendered
     output of their blocks.
-    This feature conflicts with the frontend editing provided by CreateBundle,
+    This feature conflicts with the front-end editing provided by CreateBundle,
     as create.js operates on the rendered content as displayed to the user.
     There is an ongoing `discussion how to fix this`_.
 

bundles/block/types.rst

@@ -106,7 +106,7 @@ SimpleBlock
 -----------
 
 Just a text block with a ``title`` and a ``body``. The default template
-renders both title and body with the twig ``raw`` filter, meaning HTML is
+renders both title and body with the Twig ``raw`` filter, meaning HTML is
 allowed in those fields.
 
 This block is useful to edit static text fragments and for example display
@@ -356,11 +356,11 @@ a ``SlideshowBlock`` object, you can render it with:
             'name' => 'slideshow',
         )) ?>
 
-Make the slideshow work in the frontend
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Make the Slideshow Work in the Front-End
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Since the BlockBundle doesn't contain anything to make the slideshow work
-in the frontend, you need to do this yourself. Use your favourite JavaScript
+in the front-end, you need to do this yourself. Use your favourite JavaScript
 library to make the slideshow interactive. If special markup is needed for
 your slideshow code to work, you can override
 ``BlockBundle:Block:block_slideshow.html.twig`` and/or the templates of the

bundles/blog.rst

@@ -50,8 +50,8 @@ Example:
 
         # app/config.yml
         cmf_blog:
-            use_sonata_admin:     auto
-            blog_basepath:        /cms/blog
+            use_sonata_admin: auto
+            blog_basepath: /cms/blog
             class:
                 blog_admin: Symfony\Cmf\Bundle\BlogBundle\Admin\BlogAdmin # Optional
                 post_admin: Symfony\Cmf\Bundle\BlogBundle\Admin\PostAdmin # Optional

bundles/core/forms.rst

@@ -23,4 +23,4 @@ additionally specify ``content_ids``, which are understood by the
     ));
 
 The form type automatically generates the routes for the specified content and
-passes the routes to the ``trans`` twig helper for replacement in the label.
+passes the routes to the ``trans`` Twig helper for replacement in the label.

bundles/core/introduction.rst

@@ -11,8 +11,8 @@ One of the provided features is an interface and implementation of a publish
 workflow checker with an accompanying interface that models can implement if
 they want to support this checker.
 
-Furthermore, it provides a twig helper exposing several useful functions for
-twig templates to interact with PHPCR-ODM documents.
+Furthermore, it provides a Twig helper exposing several useful functions for
+Twig templates to interact with PHPCR-ODM documents.
 
 Finally, most of its configuration settings are automatically applied as
 defaults for most of the other CMF Bundles.

bundles/core/persistence.rst

@@ -67,7 +67,7 @@ enforce a single translation strategy for all documents:
         cmf_core:
             persistence:
                 phpcr:
-                    translation_strategy:  attribute
+                    translation_strategy: attribute
 
     .. code-block:: xml
 

bundles/core/publish_workflow.rst

@@ -12,7 +12,7 @@ place and the security context thus has no token (see `Symfony2 Authorization`_)
 The publish workflow is also tied into the security workflow: The CoreBundle
 registers a security voter that forwards security checks to the publish
 workflow. This means that if you always have a firewall, you can just use
-the normal security context and the twig function ``is_granted`` to check for
+the normal security context and the Twig function ``is_granted`` to check for
 publication.
 
 .. tip::
@@ -60,7 +60,7 @@ given to editors. The default name of the role is ``ROLE_CAN_VIEW_NON_PUBLISHED`
         # app/config/security.yml
         security:
             role_hierarchy:
-                ROLE_EDITOR:       ROLE_CAN_VIEW_NON_PUBLISHED
+                ROLE_EDITOR: ROLE_CAN_VIEW_NON_PUBLISHED
 
     .. code-block:: xml
 
@@ -112,7 +112,7 @@ the path in question - they will have the permission to view unpublished content
 
 .. _bundle-core-publish-workflow-twig_function:
 
-To check publication in a template, use the twig function ``cmf_is_published``
+To check publication in a template, use the Twig function ``cmf_is_published``
 or the ``$view['cmf']->isPublished`` method:
 
 .. configuration-block::

bundles/create/introduction.rst

@@ -53,14 +53,14 @@ creating `RDFa`_ attributes on your data in the templates. It also maps
 the JSON-LD sent by backbone.js back to your domain objects.
 
 The `CreatePHP`_ library contains a metadata tool to define the mapping between
-your domain objects and the RDF information. It provides a twig extension to
+your domain objects and the RDF information. It provides a Twig extension to
 enrich your HTML pages with the RDFa attributes, similar to how you output forms.
 CreatePHP also provides the means to store the JSON-LD data sent by backbone.js
 back into your domain objects and save them. If you know Doctrine, this is a
 similar job to how Doctrine reads data from database columns and loads them
 into your domain objects.
 
-The CreateBundle finally registers the twig extension in Symfony and provides
+The CreateBundle finally registers the Twig extension in Symfony and provides
 a REST controller for the backbone.js ajax calls. It also provides helpers to
 bootstrap create.js in your templates.
 
@@ -386,7 +386,7 @@ you need to adjust your templates to output that information.
     the remainder of this page to learn how to define the mappings.
 
 To render your data named ``cmfMainContent`` with a handle you call ``rdf``, use the
-``createphp`` twig tag as follows:
+``createphp`` Twig tag as follows:
 
 .. code-block:: html+jinja
 

bundles/phpcr_odm/introduction.rst

@@ -76,11 +76,11 @@ with the DoctrineBundle. For detailed information, see the
 
     # app/config/parameters.yml
     parameters:
-        database_driver:    pdo_mysql
-        database_host:      localhost
-        database_name:      test_project
-        database_user:      root
-        database_password:  password
+        database_driver:   pdo_mysql
+        database_host:     localhost
+        database_name:     test_project
+        database_user:     root
+        database_password: password
 
     # ...