Removed note, it's important information!

wouterj · wouterj · commit 34963be3e206 · 2013-04-01T11:13:47.000+02:00
diff --git a/book/propel.rst b/book/propel.rst
@@ -28,7 +28,7 @@ Configuring the Database
 ~~~~~~~~~~~~~~~~~~~~~~~~
 
 Before you can start, you'll need to configure your database connection
-information.  By convention, this information is usually configured in an
+information. By convention, this information is usually configured in an
 ``app/config/parameters.ini`` file:
 
 .. code-block:: ini
@@ -42,20 +42,17 @@ information.  By convention, this information is usually configured in an
     database_password = password
     database_charset  = UTF8
 
-.. note::
-
-    Defining the configuration via ``parameters.ini`` is just a convention. The
-    parameters defined in that file are referenced by the main configuration
-    file when setting up Propel:
+These parameters defined in ``parameters.ini`` can now be included in the
+configuration file (``config.yml``):
 
-    .. code-block:: yaml
+.. code-block:: yaml
 
-        propel:
-            dbal:
-                driver:     "%database_driver%"
-                user:       "%database_user%"
-                password:   "%database_password%"
-                dsn:        "%database_driver%:host=%database_host%;dbname=%database_name%;charset=%database_charset%"
+    propel:
+        dbal:
+            driver:     "%database_driver%"
+            user:       "%database_user%"
+            password:   "%database_password%"
+            dsn:        "%database_driver%:host=%database_host%;dbname=%database_name%;charset=%database_charset%"
 
 Now that Propel knows about your database, Symfony2 can create the database for
 you:
