From 01bfc4f2f1ed7236b6e34e936f6add3ee8feea36 Mon Sep 17 00:00:00 2001
From: asartalo <asartalo@projectweb.ph>
Date: Sun, 24 Apr 2011 10:38:35 +0800
Subject: [PATCH 1/4] Removed '--force' Option for the orrm:schema-tool:create
 command as this is not available for this command.

---
 en/tutorials/getting-started-xml-edition.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/en/tutorials/getting-started-xml-edition.rst b/en/tutorials/getting-started-xml-edition.rst
index 4377592c5..c8e3553df 100644
--- a/en/tutorials/getting-started-xml-edition.rst
+++ b/en/tutorials/getting-started-xml-edition.rst
@@ -745,7 +745,7 @@ Doctrine command-line tool:
 ::
 
     doctrine@my-desktop> cd myproject/
-    doctrine@my-desktop> doctrine orm:schema-tool:create --force
+    doctrine@my-desktop> doctrine orm:schema-tool:create
 
 .. note::
 

From 511268ddd79781f1dd40749e931cb3408a4fb61f Mon Sep 17 00:00:00 2001
From: asartalo <asartalo@projectweb.ph>
Date: Sun, 24 Apr 2011 10:52:18 +0800
Subject: [PATCH 2/4] Removed another instance of '--force' Option for the
 orrm:schema-tool:create command as this is not available for this command.

---
 en/tutorials/getting-started-xml-edition.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/en/tutorials/getting-started-xml-edition.rst b/en/tutorials/getting-started-xml-edition.rst
index c8e3553df..80b3aa227 100644
--- a/en/tutorials/getting-started-xml-edition.rst
+++ b/en/tutorials/getting-started-xml-edition.rst
@@ -766,7 +766,7 @@ either re-create the database:
 ::
 
     doctrine@my-desktop> doctrine orm:schema-tool:drop --force
-    doctrine@my-desktop> doctrine orm:schema-tool:create --force
+    doctrine@my-desktop> doctrine orm:schema-tool:create
 
 Or use the update functionality:
 

From 3cac853dd46f630b631f7c84fac8edb0c5ea711e Mon Sep 17 00:00:00 2001
From: asartalo <asartalo@projectweb.ph>
Date: Sun, 24 Apr 2011 13:21:34 +0800
Subject: [PATCH 3/4] Changed instances of entity manager variable '' to '' for
 consistency.

---
 en/tutorials/getting-started-xml-edition.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/en/tutorials/getting-started-xml-edition.rst b/en/tutorials/getting-started-xml-edition.rst
index 80b3aa227..03cf5681a 100644
--- a/en/tutorials/getting-started-xml-edition.rst
+++ b/en/tutorials/getting-started-xml-edition.rst
@@ -975,7 +975,7 @@ can rewrite our code:
     <?php
     $dql = "SELECT b, e, r, p FROM Bug b JOIN b.engineer e ".
            "JOIN b.reporter r JOIN b.products p ORDER BY b.created DESC";
-    $query = $em->createQuery($dql);
+    $query = $entityManager->createQuery($dql);
     $bugs = $query->getArrayResult();
     
     foreach ($bugs AS $bug) {
@@ -1116,7 +1116,7 @@ grouped by product:
     <?php
     $dql = "SELECT p.id, p.name, count(b.id) AS openBugs FROM Bug b ".
            "JOIN b.products p WHERE b.status = 'OPEN' GROUP BY p.id";
-    $productBugs = $em->createQuery($dql)->getScalarResult();
+    $productBugs = $entityManager->createQuery($dql)->getScalarResult();
     
     foreach($productBugs as $productBug) {
         echo $productBug['name']." has " . $productBug['openBugs'] . " open bugs!\n";

From 16f132bff09438664a03a6850fdc0f5e42f745d1 Mon Sep 17 00:00:00 2001
From: asartalo <asartalo@projectweb.ph>
Date: Sun, 24 Apr 2011 13:24:54 +0800
Subject: [PATCH 4/4] Corrected annotation for sample code: moved
 repositoryClass attribute from @Table to @Entity.

---
 en/tutorials/getting-started-xml-edition.rst | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/en/tutorials/getting-started-xml-edition.rst b/en/tutorials/getting-started-xml-edition.rst
index 03cf5681a..14069f4ea 100644
--- a/en/tutorials/getting-started-xml-edition.rst
+++ b/en/tutorials/getting-started-xml-edition.rst
@@ -1244,7 +1244,8 @@ we have to adjust the metadata slightly.
 
         <?php
         /**
-         * @Entity @Table(name="bugs", repositoryClass="BugRepository")
+         * @Entity(repositoryClass="BugRepository")
+         * @Table(name="bugs")
          */
         class Bug
         {