Fix typo in doctrine mapping config for annotations. Update Doctrine2 overview page.

Alexander Zogheb · weaverryan · commit 3ca843721de6 · 2011-02-07T16:37:01.000-06:00
diff --git a/guides/doctrine/orm/configuration.rst b/guides/doctrine/orm/configuration.rst
@@ -56,7 +56,7 @@ Explicit definition of all the mapped entities is the only necessary
 configuration for the ORM and there are several configuration options that you
 can control. The following configuration options exist for a mapping:
 
-- ``type`` One of "annotations", "xml", "yml", "php" or "static-php". This
+- ``type`` One of "annotation", "xml", "yml", "php" or "static-php". This
   specifies which type of metadata type your mapping uses.
 - ``dir`` Path to the mapping or entity files (depending on the driver). If
   this path is relative it is assumed to be relative to the bundle root. This
diff --git a/guides/doctrine/orm/overview.rst b/guides/doctrine/orm/overview.rst
@@ -88,14 +88,15 @@ write mapping information with annotations, XML, or YAML:
         namespace Sensio\HelloBundle\Entity;
 
         /**
+         * @orm:Table()
          * @orm:Entity
          */
         class User
         {
             /**
              * @orm:Id
              * @orm:Column(type="integer")
-             * @orm:GeneratedValue(strategy="IDENTITY")
+             * @orm:GeneratedValue(strategy="AUTO")
              */
             protected $id;
 
@@ -115,7 +116,7 @@ write mapping information with annotations, XML, or YAML:
                 id:
                     type: integer
                     generator:
-                        strategy: IDENTITY
+                        strategy: AUTO
             fields:
                 name:
                     type: string
@@ -131,7 +132,7 @@ write mapping information with annotations, XML, or YAML:
 
             <entity name="Sensio\HelloBundle\Entity\User" table="user">
                 <id name="id" type="integer" column="id">
-                    <generator strategy="IDENTITY"/>
+                    <generator strategy="AUTO"/>
                 </id>
                 <field name="name" column="name" type="string" length="255" />
             </entity>
