From b1f6fe2528f96e75e5c5ddf0b075956406e762f6 Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Sun, 18 Jul 2010 22:57:20 +0200 Subject: [PATCH] Updated Introduction to be more consistent with current Github development model --- manual/en/introduction.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/manual/en/introduction.txt b/manual/en/introduction.txt index 2cc766801..489c41a47 100644 --- a/manual/en/introduction.txt +++ b/manual/en/introduction.txt @@ -148,6 +148,12 @@ submodules for the Common and DBAL package dependencies: This updates your Git checkout to use the Doctrine\Common and Doctrine\DBAL package versions that are recommended for the cloned Master version of Doctrine 2. +> **NOTE** +> +> You should not combine the Doctrine-Common, Doctrine-DBAL and Doctrine-ORM master commits +> with each other in combination. The ORM may not work with the current Common or DBAL master versions. +> Instead the ORM ships with the Git Submodules that are required. + +++ Subversion > **NOTE**