瀏覽代碼

Merge pull request #1055 from pborreli/typos

Fixed typos
Thomas 12 年之前
父節點
當前提交
c0c24c8eeb

+ 1 - 1
Admin/Admin.php

@@ -347,7 +347,7 @@ abstract class Admin implements AdminInterface, DomainObjectInterface
     protected $datagrid;
     protected $datagrid;
 
 
     /**
     /**
-     * The router intance
+     * The router instance
      *
      *
      * @var RouteGeneratorInterface
      * @var RouteGeneratorInterface
      */
      */

+ 1 - 1
CHANGELOG.md

@@ -37,7 +37,7 @@ CHANGELOG
     * The dashboard list is now a block, so it can be removed from the sonata_admin configuration.
     * The dashboard list is now a block, so it can be removed from the sonata_admin configuration.
     * More blocks can be created please follow the instruction here : http://sonata-project.org/bundles/block/master/doc/reference/your_first_block.html
     * More blocks can be created please follow the instruction here : http://sonata-project.org/bundles/block/master/doc/reference/your_first_block.html
 
 
-* [BC BREAK] New configuration format for the dasboard section.
+* [BC BREAK] New configuration format for the dashboard section.
 
 
 ### 2012-02-28
 ### 2012-02-28
 
 

+ 1 - 1
Form/ChoiceList/ModelChoiceList.php

@@ -212,7 +212,7 @@ class ModelChoiceList extends SimpleChoiceList
      *
      *
      * @param  string $property     The name of the property
      * @param  string $property     The name of the property
      *
      *
-     * @return \ReflectionProperty  The reflection instsance
+     * @return \ReflectionProperty  The reflection instance
      */
      */
     private function getReflProperty($property)
     private function getReflProperty($property)
     {
     {

+ 1 - 1
Resources/doc/reference/conditional_validation.rst

@@ -7,7 +7,7 @@ as it allows to declare validation on : class, field and getter. However these d
 can take a while to code for complex rules. Rules must be a set of a ``Constraint``
 can take a while to code for complex rules. Rules must be a set of a ``Constraint``
 and ``Validator`` instances.
 and ``Validator`` instances.
 
 
-The inline validation tries to provide a nice solution by introducting an ``ErrorElement``
+The inline validation tries to provide a nice solution by introducing an ``ErrorElement``
 object. The object can be used to check assertion against the model :
 object. The object can be used to check assertion against the model :
 
 
 .. code-block:: php
 .. code-block:: php

+ 1 - 1
Resources/doc/reference/console.rst

@@ -55,7 +55,7 @@ sonata:admin:setup-acl
 ----------------------
 ----------------------
 
 
 The ``sonata:admin:setup-acl`` command updates ACL definitions for all admin
 The ``sonata:admin:setup-acl`` command updates ACL definitions for all admin
-classes available in ``sonata.admin.pool``. For instance everytime you create a
+classes available in ``sonata.admin.pool``. For instance every time you create a
 new ``Admin`` class, you can create ACL by using the ``sonata:admin:setup-acl``
 new ``Admin`` class, you can create ACL by using the ``sonata:admin:setup-acl``
 command. The ACL database will be automatically updated with the latest masks
 command. The ACL database will be automatically updated with the latest masks
 and roles informations.
 and roles informations.

+ 3 - 3
Resources/doc/reference/preview_mode.rst

@@ -15,9 +15,9 @@ Preview can be used to render how the object would look like in your front-end e
 However by default it uses a template similar to the one of the show action and works with
 However by default it uses a template similar to the one of the show action and works with
 the fields configured to be shown in the show view.
 the fields configured to be shown in the show view.
 
 
-Overridding the preview template (SonataAdminBundle:CRUD:preview.html.twig) can be done either
+Overriding the preview template (SonataAdminBundle:CRUD:preview.html.twig) can be done either
 globally through the template configuration for the key 'preview' or per admin entity by
 globally through the template configuration for the key 'preview' or per admin entity by
-overridding the getTemplate($name) and returning the appropriate template when the key
+overriding the getTemplate($name) and returning the appropriate template when the key
 matches 'preview'.
 matches 'preview'.
 
 
 .. code-block:: php
 .. code-block:: php
@@ -44,7 +44,7 @@ The entity is passed to the view in a variable called object. If your original v
 a different object you can just set your own variables prior to calling parent().
 a different object you can just set your own variables prior to calling parent().
 
 
 Keep in mind that the whole edit form will now appear in your view.
 Keep in mind that the whole edit form will now appear in your view.
-Hidding the fieldset tags with css (display:none) will be enough to only show the buttons
+Hiding the fieldset tags with css (display:none) will be enough to only show the buttons
 (which still have to be styled according to your wishes) and create a nice preview-workflow.
 (which still have to be styled according to your wishes) and create a nice preview-workflow.
 
 
 .. code-block:: jinja
 .. code-block:: jinja

+ 1 - 1
Resources/doc/reference/saving_hooks.rst

@@ -1,7 +1,7 @@
 Saving hooks
 Saving hooks
 ============
 ============
 
 
-When the model is persited upon on the stated object two Admin methods are 
+When the model is persisted upon on the stated object two Admin methods are
 always called. You can extend this method to add custom business logic.
 always called. You can extend this method to add custom business logic.
 
 
     - new object : ``prePersist($object)`` / ``postPersist($object)``
     - new object : ``prePersist($object)`` / ``postPersist($object)``

+ 3 - 3
Resources/doc/reference/security.rst

@@ -160,7 +160,7 @@ In your ``app/config/config.yml`` you then need to put the following:
 The following configuration for the SonataUserBundle defines:
 The following configuration for the SonataUserBundle defines:
 
 
     - the ``FriendsOfSymfony/FOSUserBundle`` as a security provider
     - the ``FriendsOfSymfony/FOSUserBundle`` as a security provider
-    - the login form for authentification
+    - the login form for authentication
     - the access control : resources with related required roles, the important
     - the access control : resources with related required roles, the important
         part is the admin configuration
         part is the admin configuration
     - the ``acl`` option to enable the ACL.
     - the ``acl`` option to enable the ACL.
@@ -443,7 +443,7 @@ because for example you want to restrict access using extra rules:
             </service>
             </service>
         </services>
         </services>
 
 
-- change the access decission strategy to ``unanimous``
+- change the access decision strategy to ``unanimous``
 
 
     .. code-block:: yaml
     .. code-block:: yaml
 
 
@@ -471,7 +471,7 @@ because for example you want to restrict access using extra rules:
 Usage
 Usage
 ~~~~~
 ~~~~~
 
 
-Everytime you create a new ``Admin`` class, you should start with the command
+Every time you create a new ``Admin`` class, you should start with the command
 ``php app/console sonata:admin:setup-acl`` so the ACL database will be updated
 ``php app/console sonata:admin:setup-acl`` so the ACL database will be updated
 with the latest roles and permissions.
 with the latest roles and permissions.
 
 

+ 1 - 1
Resources/doc/reference/templates.rst

@@ -47,7 +47,7 @@ You can easily extend the provided templates in your own and customize only the
 .. code-block:: jinja
 .. code-block:: jinja
 
 
     {% extends 'SonataAdminBundle:CRUD:edit.html.twig' %}
     {% extends 'SonataAdminBundle:CRUD:edit.html.twig' %}
-    {# Acme/MyBundle/Ressources/view/my-custom-edit.html.twig #}
+    {# Acme/MyBundle/Resources/view/my-custom-edit.html.twig #}
 
 
     {% block title %}
     {% block title %}
         {{ "My title"|trans }}
         {{ "My title"|trans }}

+ 1 - 1
Tests/Admin/PoolTest.php

@@ -62,7 +62,7 @@ class PoolTest extends \PHPUnit_Framework_TestCase
                 'items' => array('itemKey' => 'sonata.user.admin.group1')
                 'items' => array('itemKey' => 'sonata.user.admin.group1')
             ),
             ),
             'adminGroup2' => array(
             'adminGroup2' => array(
-                'itmes' => array('itemKey' => 'sonata.user.admin.group1')
+                'items' => array('itemKey' => 'sonata.user.admin.group1')
             ),
             ),
             'adminGroup3' => array(
             'adminGroup3' => array(
                 'items' => array('itemKey' => 'sonata.user.admin.group2')
                 'items' => array('itemKey' => 'sonata.user.admin.group2')

+ 1 - 1
Tests/Filter/FilterFactoryTest.php

@@ -29,7 +29,7 @@ class FilterFactoryTest extends \PHPUnit_Framework_TestCase
     /**
     /**
      * @expectedException RuntimeException
      * @expectedException RuntimeException
      */
      */
-    public function testUnknowType()
+    public function testUnknownType()
     {
     {
         $container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface');
         $container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface');