From 51500cdba9bc45a22e233cec7591b1ab237e96e0 Mon Sep 17 00:00:00 2001
From: Toni Uebernickel <tuebernickel@gmail.com>
Date: Mon, 6 Feb 2012 18:25:19 +0100
Subject: [PATCH] synchronize README files

---
 README.markdown               | 5 +++--
 Resources/doc/README.markdown | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/README.markdown b/README.markdown
index 6797a1b..4dc00cb 100644
--- a/README.markdown
+++ b/README.markdown
@@ -11,18 +11,19 @@ If you want to use the bundle with a **Symfony2 version 2.x.x** (actually, a ver
 
 Currently supports:
 
- * Generation of model classes based on an XML schema (not YAML) placed under `BundleName/Resources/*schema.xml`.
+ * Generation of model classes based on an XML schema (not YAML) placed under `BundleName/Resources/config/*schema.xml`.
  * Insertion of SQL statements.
  * Runtime autoloading of Propel and generated classes.
  * Propel runtime initialization through the XML configuration.
  * Migrations [Propel 1.6](http://www.propelorm.org/documentation/10-migrations.html).
- * Reverse engineering from [existing database](http://www.propelorm.org/wiki/Documentation/1.6/Existing-Database).
+ * Reverse engineering from [existing database](http://www.propelorm.org/cookbook/working-with-existing-databases.html).
  * Integration to the Symfony2 Profiler.
  * Load SQL, YAML and XML fixtures.
  * Create/Drop databases.
  * Integration with the Form component.
  * Integration with the Security component.
  * Propel ParamConverter can be used with Sensio Framework Extra Bundle.
+ * Schema Inheritance
 
 For documentation, see:
 
diff --git a/Resources/doc/README.markdown b/Resources/doc/README.markdown
index 5735998..7e66961 100644
--- a/Resources/doc/README.markdown
+++ b/Resources/doc/README.markdown
@@ -401,7 +401,7 @@ Currently only schema inheritance is provided.
 ### Schema Inheritance ###
 
 You can override the defined schema of a bundle from within its child bundle.
-The child's schema will *completely* override the parent's one.
 To make use of the inheritance you only need to drop a schema file in the `Resources/config` folder of the child bundle.
 
-**IMPORTANT**: If there is *at least one* schema file in the child bundle, *none* of the parent's schema files will be used.
+Each file can be overridden without interfering with other schema files.
+If you want to remove parts of a schema, you only need to add an empty schema file.