From 48b081910f12bd0d1f316a562e8adf195eab4f8c Mon Sep 17 00:00:00 2001 From: Denis Gorbachev Date: Mon, 10 Sep 2012 20:56:36 +0400 Subject: [PATCH 1/2] Update cookbook/security/acl.rst MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit See https://github.com/doctrine/DoctrineMongoDBBundle/pull/4#issuecomment-8428994 --- cookbook/security/acl.rst | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cookbook/security/acl.rst b/cookbook/security/acl.rst index 7222e7562d7..c8da32883fe 100644 --- a/cookbook/security/acl.rst +++ b/cookbook/security/acl.rst @@ -61,8 +61,9 @@ First, we need to configure the connection the ACL system is supposed to use: .. note:: - The ACL system requires at least one Doctrine DBAL connection to be - configured. However, that does not mean that you have to use Doctrine for + The ACL system requires either one Doctrine DBAL (usable by default) + or Doctrine ODM connection (usable with `MongoDBAclBundle `_) + to be configured. However, that does not mean that you have to use Doctrine for mapping your domain objects. You can use whatever mapper you like for your objects, be it Doctrine ORM, Mongo ODM, Propel, or raw SQL, the choice is yours. From 0a202b4c2572aff6ffa7404ffd4f541121fd049d Mon Sep 17 00:00:00 2001 From: Denis Gorbachev Date: Tue, 11 Sep 2012 14:08:16 +0400 Subject: [PATCH 2/2] Fixed formatting --- cookbook/security/acl.rst | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cookbook/security/acl.rst b/cookbook/security/acl.rst index c8da32883fe..53d457472fd 100644 --- a/cookbook/security/acl.rst +++ b/cookbook/security/acl.rst @@ -62,8 +62,9 @@ First, we need to configure the connection the ACL system is supposed to use: .. note:: The ACL system requires either one Doctrine DBAL (usable by default) - or Doctrine ODM connection (usable with `MongoDBAclBundle `_) - to be configured. However, that does not mean that you have to use Doctrine for + or Doctrine ODM connection (usable with `MongoDBAclBundle + `_) to be configured. + However, that does not mean that you have to use Doctrine for mapping your domain objects. You can use whatever mapper you like for your objects, be it Doctrine ORM, Mongo ODM, Propel, or raw SQL, the choice is yours.