Docs updated

manual/codes/Basic Components - Query - FROM - selecting tables.php

@@ -18,7 +18,7 @@ $coll = $q->select('u.name, u.age, e.address')
 // find all users, user email and user phonenumbers
 
 $coll = $q->from('FROM User u')
-          ->leftJoin('u.Email e')
-          ->leftJoin('u.Phonenumber p')
+          ->innerJoin('u.Email e')
+          ->innerJoin('u.Phonenumber p')
           ->execute();
 ?>

manual/codes/Basic Components - Query - Introduction.php

@@ -5,4 +5,8 @@ $q = new Doctrine_Query();
 // initalizing a new Doctrine_Query (using custom connection parameter)
 // here $conn is an instance of Doctrine_Connection
 $q = new Doctrine_Query($conn);
+
+// an example using the create method
+// here we simple fetch all users
+$users = Doctrine_Query::create()->from('User')->execute();
 ?>

manual/codes/Basic Components - Query - ORDER BY - sorting query results.php

 <?php
+$q = new Doctrine_Query();
+
 // find all users, sort by name descending
 
-$coll = $conn->query("FROM User ORDER BY User.name DESC");
+$users = $q->from('User u')->orderby('u.name DESC');
 
 // find all users sort by name ascending
 
-$coll = $conn->query("FROM User ORDER BY User.name ASC");
-
-// or 
-
-$coll = $conn->query("FROM User ORDER BY User.name");
+$users = $q->from('User u')->orderby('u.name ASC');
 
-// find all users and their emails, sort by email address
+// find all users and their emails, sort by email address in ascending order
 
-$coll = $conn->query("FROM User, User.Email ORDER BY User.Email.address");
+$users = $q->from('User u')->leftJoin('u.Email e')->orderby('e.address');
 
 // find all users and their emails, sort by user name and email address
 
-$coll = $conn->query("FROM User, User.Email ORDER BY User.name, User.Email.address");
+$users = $q->from('User u')->leftJoin('u.Email e')
+           ->addOrderby('u.name')->addOrderby('e.address');
 ?>

manual/docs/Basic Components - Query - DQL - SQL conversion.php

 <?php
+/**
 $str = "
 The following examples should give a hint of how DQL is converted into SQL.
 The classes used in here are the same as in chapter 14.1 (Users and groups are both entities etc).
@@ -52,4 +53,5 @@ foreach($e as $line) {
 }
 }
 renderQueries($str);
+*/
 ?>

manual/docs/Basic Components - Query - FROM - selecting tables.php

@@ -3,7 +3,7 @@ The FROM clause indicates the component or components from which to retrieve rec
 If you name more than one component, you are performing a join.
 For each table specified, you can optionally specify an alias. Doctrine_Query offers easy to use
 methods such as from(), addFrom(), leftJoin() and innerJoin() for managing the FROM part of your DQL query.
-
+<br \><br \>
 <?php
 renderCode("<?php
 // find all users
@@ -15,4 +15,5 @@ renderCode("<?php
 
 \$coll = \$q->select('u.name')->('User u');
 ?>");
-?>
+?>     <br \><br \>
+The following example shows how to use leftJoin and innerJoin methods:  <br \><br \>

manual/docs/Basic Components - Query - Introduction.php

+<?php ?>
 DQL (Doctrine Query Language) is a object query language which allows
 you to find objects. DQL understands things like object relationships, polymorphism and 
-inheritance (including column aggregation inheritance).
+inheritance (including column aggregation inheritance). 
+For more info about DQL see the actual DQL chapter.
 <br \><br \>
-So instead of writing lots of SQL inner and outer joins, unions and subselects yourself,
-you can write simple DQL queries where relationships are being referenced with dot-notation.
-<br \><br \>
-You can execute DQL queries with Doctrine_Connection::query() method.
+Doctrine_Query along with Doctrine_Expression provide an easy-to-use wrapper for writing DQL queries. Creating a new 
+query object can be done by either using the new operator or by calling create method. The create method exists for allowing easy
+method call chaining.