Merge pull request #688 from symfony-cmf/travis-docker

use travis docker env

Author: wouterj

.travis.yml

@@ -3,8 +3,11 @@ language: python
 python:
     - "2.7"
 
-before_script:
-    - sudo apt-get install enchant
+sudo: false
+
+addons:
+    apt:
+        packages: [enchant]
 
 install: "pip install -q -r requirements.txt --use-mirrors"
 

book/database_layer.rst

@@ -37,7 +37,7 @@ versioning and access control.
 
 Doctrine PHPCR-ODM has the same API as the other Doctrine libraries, like the
 `Doctrine ORM`_. The Doctrine PHPCR-ODM adds another great feature to PHPCR:
-Multilanguage support.
+multi-language support.
 
 .. sidebar:: PHPCR Implementations
 

book/static_content.rst

@@ -78,5 +78,4 @@ developers with a small and easy to understand starting point you can extend
 or use as inspiration to develop your own content types, Controllers and Admin
 panels.
 
-.. _`multilanguage support in PHPCR-ODM`: http://docs.doctrine-project.org/projects/doctrine-phpcr-odm/en/latest/reference/multilang.html
 .. _SonataDoctrinePHPCRAdminBundle: https://github.com/sonata-project/SonataDoctrinePhpcrAdminBundle

bundles/core/configuration.rst

@@ -210,7 +210,7 @@ If the ``multilang`` option is *not* defined at all, the CoreBundle registers a
 listener for Doctrine PHPCR-ODM that modifies PHPCR-ODM metadata to remove the
 translatable attribute from all fields.
 
-If multilang is enabled, the ``TranslatableExtension`` for
+If multi-language is enabled, the ``TranslatableExtension`` for
 ``SonataAdminBundle`` is enabled and the locales will be configured on all CMF
 bundles that use this configuration:
 

bundles/create/introduction.rst

@@ -508,7 +508,7 @@ reads like this:
     The metadata support in CreatePHP is not as powerful as in Doctrine. There
     are currently no drivers for annotation or yml mappings. Mappings are not
     inherited from a parent class but need to be repeated each time. And the
-    mapping file must include the full namespace in the filename to be found.
+    mapping file must include the full namespace in the file name to be found.
 
     All of these issues will hopefully be fixed in later versions if people
     step up and contribute pull requests.

bundles/map.rst.inc

@@ -108,7 +108,7 @@ bundle based on the key bundles.
 Contributed Bundles
 ~~~~~~~~~~~~~~~~~~~
 
-Besides that, the Symfony CMF team also maintains some 3th party bundles which
+Besides that, the Symfony CMF team also maintains some third party bundles which
 help with integrating PHPCR concepts into the Symfony Framework.
 
 * :doc:`phpcr_odm/index`

bundles/menu/menu_documents.rst

@@ -107,7 +107,7 @@ locale to be set via. the ``setLocale`` method::
     $menuItem = ...;
     $menuItem->setLocale('fr');
 
-See :ref:`Persisting Multilang Documents <bundles-core-multilang-persisting_multilang_documents>` for more details.
+See :ref:`Persisting Multi-Language Documents <bundles-core-multilang-persisting_multilang_documents>` for more details.
 
 Publish Workflow
 ~~~~~~~~~~~~~~~~

bundles/phpcr_odm/fixtures_initializers.rst

@@ -30,17 +30,17 @@ Initializers have to implement the
 ``Doctrine\Bundle\PHPCRBundle\Initializer\InitializerInterface``. If you don't
 need any special logic and want to create plain PHPCR nodes and not documents,
 you can simply define services with ``GenericInitializer``. The generic
-initializer expects a name to identify the initializer, an array of repository
+Initializer expects a name to identify the Initializer, an array of repository
 paths it will create if they do not exist and an optional string defining
 namespaces and primary / mixin node types in the CND language that should be
 registered with the repository.
 
 .. versionadded:: 1.1
     Since version 1.1, the ``GenericInitializer`` expects a name parameter
     as first argument. With 1.0 there is no way to specify a custom name
-    for the generic initializer.
+    for the generic Initializer.
 
-A service to use the generic initializer looks like this:
+A service to use the generic Initializer looks like this:
 
 .. configuration-block::
 
@@ -87,19 +87,19 @@ A service to use the generic initializer looks like this:
         $definition->addTag('doctrine_phpcr.initializer');
         $container->setDefinition('acme_content.phpcr.initializer', $definition);
 
-You can execute your initializers using the following command:
+You can execute your Initializers using the following command:
 
 .. code-block:: bash
 
     $ php app/console doctrine:phpcr:repository:init
 
 .. versionadded:: 1.1
     Since DoctrinePHPCRBundle 1.1 the load data fixtures command will
-    automatically execute the initializers after purging the database,
+    automatically execute the Initializers after purging the database,
     before executing the fixtures.
 
-The generic initializer only creates PHPCR nodes. If you want to create
-specific documents, you need your own initializer. The interesting method
+The generic Initializer only creates PHPCR nodes. If you want to create
+specific documents, you need your own Initializer. The interesting method
 to overwrite is the ``init`` method. It is passed the ``ManagerRegistry``,
 from which you can retrieve the PHPCR session but also the document manager::
 
@@ -149,10 +149,10 @@ from which you can retrieve the PHPCR session but also the document manager::
 .. versionadded:: 1.1
     Since version 1.1, the ``init`` method is passed the ``ManagerRegistry`` rather
     than the PHPCR ``SessionInterface`` to allow the creation of documents in
-    initializers. With 1.0, you would need to manually set the ``phpcr:class``
+    Initializers. With 1.0, you would need to manually set the ``phpcr:class``
     property to the right value.
 
-Define a service for your initializer as follows:
+Define a service for your Initializer as follows:
 
 .. configuration-block::
 

bundles/phpcr_odm/multilang.rst

@@ -1,10 +1,10 @@
 .. index::
-    single: Multilanguage; DoctrinePHPCRBundle
+    single: Multi-Language; DoctrinePHPCRBundle
 
-Doctrine PHPCR-ODM Multilanguage Support
-========================================
+Doctrine PHPCR-ODM Multi-Language Support
+=========================================
 
-To use the multilanguage features of PHPCR-ODM you need to enable locales in
+To use the multi-language features of PHPCR-ODM you need to enable locales in
 the configuration.
 
 Translation Configuration
@@ -167,14 +167,14 @@ depending on the locale.
                 type: binary
                 translated: true
 
-Unless you explicitly interact with the multilanguage features of PHPCR-ODM,
+Unless you explicitly interact with the multi-language features of PHPCR-ODM,
 documents are loaded in the request locale and saved in the locale they where
 loaded. (This could be a different locale, if the PHPCR-ODM did not find the
 requested locale and had to fall back to an alternative locale.)
 
 .. tip::
 
     For more information on multilingual documents, see the
-    `PHPCR-ODM documentation on Multilanguage`_.
+    `PHPCR-ODM documentation on multi-language`_.
 
-.. _`PHPCR-ODM documentation on Multilanguage`: http://docs.doctrine-project.org/projects/doctrine-phpcr-odm/en/latest/reference/multilang.html
+.. _`PHPCR-ODM documentation on multi-language`: http://docs.doctrine-project.org/projects/doctrine-phpcr-odm/en/latest/reference/multilang.html

bundles/routing/configuration.rst

@@ -547,7 +547,7 @@ content repository service.
 
 **type**: ``array`` **default**: ``array()``
 
-To enable multilanguage, set the valid locales in this option.
+To enable multi-language, set the valid locales in this option.
 
 If the :doc:`CoreBundle <../core/introduction>` is registered, this will
 default to the value of ``cmf_core.locales``.