diff --git a/manual/docs/Getting started - Setting table definition - Table options.php b/manual/docs/Object relational mapping - Table options.php
similarity index 91%
rename from manual/docs/Getting started - Setting table definition - Table options.php
rename to manual/docs/Object relational mapping - Table options.php
index 16635f74d..fe1d855f2 100644
--- a/manual/docs/Getting started - Setting table definition - Table options.php	
+++ b/manual/docs/Object relational mapping - Table options.php	
@@ -11,7 +11,7 @@ class MyInnoDbRecord extends Doctrine_Record
     {
         \$this->hasColumn('name', 'string');
 
-        \$this->option('engine', 'INNODB');
+        \$this->option('type', 'INNODB');
     }
 }
 ?>");
diff --git a/manual/documentation2.php b/manual/documentation2.php
index c998ea17a..863426410 100644
--- a/manual/documentation2.php
+++ b/manual/documentation2.php
@@ -85,6 +85,7 @@ class DocTool
             if (substr($c, 0, 5) == "<?php") {
                 include("docs/$name.php");
             } elseif (strpos($c, '<br \>') !== false || 
+                      strpos($c, '<br />') !== false ||
                       strpos($c, '<ul>') !== false ||
                       strpos($c, '<p>') !== false) {
                 print $c;
diff --git a/manual/menu.php b/manual/menu.php
index 2f974c228..647619e3c 100644
--- a/manual/menu.php
+++ b/manual/menu.php
@@ -18,6 +18,7 @@ Connection management
 Object relational mapping
     Introduction
     Table and class naming
+    Table options
     Columns
         Column naming
         Column aliases
@@ -237,6 +238,15 @@ DQL (Doctrine Query Language)
         Arithmetic functions
         Datetime functions
         Collection functions
+    Subqueries
+        Introduction
+        Comparisons using subqueries
+        Conditional expressions
+            ANY, IN and SOME
+            ALL
+            EXISTS and NOT EXISTS
+        Correlated subqueries
+        Subqueries in FROM clause
     GROUP BY, HAVING clauses
     ORDER BY clause
         Introduction