Removed the Propel chapter from the Symfony book

Author: javiereguiluz

book/map.rst.inc

@@ -6,7 +6,6 @@
 * :doc:`/book/routing`
 * :doc:`/book/templating`
 * :doc:`/book/doctrine`
-* :doc:`/book/propel`
 * :doc:`/book/testing`
 * :doc:`/book/validation`
 * :doc:`/book/forms`

cookbook/index.rst

@@ -19,6 +19,7 @@ The Cookbook
     form/index
     logging/index
     profiler/index
+    propel/index
     request/index
     routing/index
     security/index

cookbook/map.rst.inc

@@ -120,6 +120,10 @@
   * :doc:`/cookbook/profiler/matchers`
   * :doc:`/cookbook/profiler/storage`
 
+* :doc:`/cookbook/propel/index`
+
+  * :doc:`/cookbook/propel/propel`
+
 * :doc:`/cookbook/request/index`
 
   * :doc:`/cookbook/request/load_balancer_reverse_proxy`

cookbook/propel/index.rst

@@ -0,0 +1,7 @@
+Propel
+======
+
+.. toctree::
+    :maxdepth: 2
+
+    file_uploads

book/propel.rst renamed to cookbook/propel/propel.rst

@@ -4,10 +4,14 @@
 Databases and Propel
 ====================
 
-One of the most common and challenging tasks for any application
-involves persisting and reading information to and from a database. Symfony
-does not come integrated with any ORMs but the Propel integration is easy.
-To install Propel, read `Working With Symfony2`_ on the Propel documentation.
+`Propel`_ is an open-source Object-Relational Mapping (ORM) for SQL-Databases in
+PHP 5.4. It allows you to access your database using a set of objects, providing
+a simple API for storing and retrieving data.
+
+Propel is also an alternative to `Doctrine`_, which is the ORM that comes
+already integrated into Symfony. This article explains how to use Propel with
+a Symfony application, but first, install Propel following the instructions
+available at the `Working With Symfony2`_ section on the Propel documentation.
 
 A Simple Example: A Product
 ---------------------------
@@ -496,6 +500,8 @@ Commands
 
 You should read the dedicated section for `Propel commands in Symfony2`_.
 
+.. _`Propel`: http://propelorm.org/
+.. _`Doctrine`: http://www.doctrine-project.org/
 .. _`Working With Symfony2`: http://propelorm.org/Propel/cookbook/symfony2/working-with-symfony2.html#installation
 .. _`PropelBundle configuration section`: http://propelorm.org/Propel/cookbook/symfony2/working-with-symfony2.html#configuration
 .. _`Relationships`: http://propelorm.org/Propel/documentation/04-relationships.html

redirection_map

@@ -1,4 +1,5 @@
 /book/stable_api /contributing/code/bc
+/book/propel /cookbook/propel/propel
 /cookbook/deployment-tools /cookbook/deployment/tools
 /cookbook/doctrine/migrations /bundles/DoctrineFixturesBundle/index
 /cookbook/doctrine/doctrine_fixtures /bundles/DoctrineFixturesBundle/index