Merge remote-tracking branch 'tyx/master'

Resources/doc/reference/filter_field_definition.rst

@@ -13,9 +13,9 @@ Example
     namespace Sonata\NewsBundle\Admin;
 
     use Sonata\AdminBundle\Datagrid\DatagridMapper;
-    use Sonata\AdminBundle\Admin\EntityAdmin;
+    use Sonata\AdminBundle\Admin\Admin;
 
-    class PostAdmin extends EntityAdmin
+    class PostAdmin extends Admin
     {
         protected $filter = array(
             'title',

Resources/doc/reference/form_field_definition.rst

@@ -12,9 +12,9 @@ Example
     namespace Sonta\NewsBundle\Admin;
 
     use Sonata\AdminBundle\Form\FormMapper;
-    use Sonata\AdminBundle\Admin\EntityAdmin;
+    use Sonata\AdminBundle\Admin\Admin;
 
-    class PostAdmin extends EntityAdmin
+    class PostAdmin extends Admin
     {
         protected $form = array(
             'author' => array('edit' => 'list'),
@@ -22,7 +22,7 @@ Example
             'title',
             'abstract',
             'content',
-            'tags' => array('options' => array('expanded' => true)),
+            'tags' => array('form_field_options' => array('expanded' => true)),
             'comments_close_at',
             'comments_enabled',
             'comments_default_status'

Resources/doc/reference/list_field_definition.rst

@@ -11,10 +11,10 @@ Example
     <?php
     namespace Sonata\NewsBundle\Admin;
 
-    use Sonata\AdminBundle\Admin\EntityAdmin;
+    use Sonata\AdminBundle\Admin\Admin;
     use Sonata\AdminBundle\Datagrid\ListMapper;
 
-    class PostAdmin extends EntityAdmin
+    class PostAdmin extends Admin
     {
         protected $list = array(
             'title'   => array(),

Resources/doc/tutorial/creating_your_first_admin_class/defining_admin_class.rst

@@ -19,12 +19,12 @@ By convention Admin files are set under a Admin folder.
 
     namespace Sonata\NewsBundle\Admin;
 
-    use Sonata\AdminBundle\Admin\EntityAdmin;
+    use Sonata\AdminBundle\Admin\Admin;
     use Sonata\AdminBundle\Form\FormMapper;
     use Sonata\AdminBundle\Datagrid\DatagridMapper;
     use Sonata\AdminBundle\Datagrid\ListMapper;
 
-    class PostAdmin extends EntityAdmin
+    class PostAdmin extends Admin
     {
 
     }
@@ -37,7 +37,7 @@ By convention Admin files are set under a Admin folder.
 
         <tag name="sonata.admin" manager_type="orm" group="sonata_blog" label="post"/>
 
-        <argument>Application\Sonata\NewsBundle\Entity\Post</argument>
+        <argument>Sonata\NewsBundle\Entity\Post</argument>
         <argument>SonataNewsBundle:PostAdmin</argument>
     </service>
 
@@ -66,7 +66,7 @@ Now, let's specify the differents fields we want to use:
         'title',
         'abstract',
         'content',
-        'tags' => array('options' => array('expanded' => true)),
+        'tags' => array('form_field_options' => array('expanded' => true)),
         'comments_enabled',
         'comments_default_status'
     );
@@ -90,9 +90,9 @@ TagAdmin
 
     namespace Sonata\NewsBundle\Admin;
 
-    use Sonata\AdminBundle\Admin\EntityAdmin;
+    use Sonata\AdminBundle\Admin\Admin;
 
-    class TagAdmin extends EntityAdmin
+    class TagAdmin extends Admin
     {
 
         protected $list = array(
@@ -114,9 +114,9 @@ CommentAdmin
 
     namespace Sonata\NewsBundle\Admin;
 
-    use Sonata\AdminBundle\Admin\EntityAdmin;
+    use Sonata\AdminBundle\Admin\Admin;
 
-    class CommentAdmin extends EntityAdmin
+    class CommentAdmin extends Admin
     {
         protected $list = array(
             'name' => array('identifier' => true),