diff --git a/docs/config.rst b/docs/config.rst index 0a81c71a..5b704c9f 100644 --- a/docs/config.rst +++ b/docs/config.rst @@ -18,7 +18,7 @@ Sample Configuration document_managers: default: mappings: - AcmeDemoBundle: ~ + App: ~ filters: filter-name: class: Class\Example\Filter\ODM\ExampleFilter @@ -41,7 +41,7 @@ Sample Configuration - + @@ -83,7 +83,7 @@ If you wish to use memcache to cache your metadata, you need to configure the document_managers: default: mappings: - AcmeDemoBundle: ~ + App: ~ metadata_cache_driver: type: memcached class: Symfony\Component\Cache\Adapter\MemcachedAdapter @@ -103,7 +103,7 @@ If you wish to use memcache to cache your metadata, you need to configure the - + Symfony\Component\Cache\Adapter\MemcachedAdapter localhost @@ -138,9 +138,9 @@ can control. The following configuration options exist for a mapping: - ``prefix`` A common namespace prefix that all documents of this mapping share. This prefix should never conflict with prefixes of other defined mappings otherwise some of your documents cannot be found by Doctrine. This - option defaults to the bundle namespace + ``Document``, for example for an - application bundle called ``AcmeHelloBundle``, the prefix would be - ``Acme\HelloBundle\Document``. + option defaults to the application namespace + ``Document``, for example + for an application called ``App``, the prefix would be + ``App\Document``. - ``alias`` Doctrine offers a way to alias document namespaces to simpler, shorter names to be used in queries or for Repository access. @@ -175,14 +175,14 @@ The following configuration shows a bunch of mapping examples: document_managers: default: mappings: - MyBundle1: ~ - MyBundle2: xml - MyBundle3: { type: attribute, dir: Documents/ } - MyBundle4: { type: xml, dir: Resources/config/doctrine/mapping } - MyBundle5: + App: ~ + App2: xml + App3: { type: attribute, dir: Documents/ } + App4: { type: xml, dir: config/doctrine/mapping } + App5: type: xml - dir: my-bundle-mappings-dir - alias: BundleAlias + dir: my-app-mappings-dir + alias: AppAlias doctrine_extensions: type: xml dir: "%kernel.project_dir%/src/vendor/DoctrineExtensions/lib/DoctrineExtensions/Documents" @@ -201,10 +201,10 @@ The following configuration shows a bunch of mapping examples: - - - - + + + + - + - + diff --git a/docs/installation.rst b/docs/installation.rst index 7521c465..54b8add0 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -35,7 +35,7 @@ To install DoctrineMongoDBBundle with Composer run the following command: Enable the Bundle ----------------- -Your bundle should be automatically enabled if you use Flex. +The bundle should be automatically enabled if you use Flex. Otherwise, you'll need to manually enable the bundle by adding the following line in the ``config/bundles.php`` file of your project: diff --git a/src/DependencyInjection/DoctrineMongoDBExtension.php b/src/DependencyInjection/DoctrineMongoDBExtension.php index 18b3476b..ebd224da 100644 --- a/src/DependencyInjection/DoctrineMongoDBExtension.php +++ b/src/DependencyInjection/DoctrineMongoDBExtension.php @@ -462,14 +462,14 @@ private function normalizeDriverOptions(array $connection): array * * doctrine_mongodb: * mappings: - * MyBundle1: ~ - * MyBundle2: xml - * MyBundle3: { type: attribute } - * MyBundle4: { type: xml, dir: Resources/config/doctrine/mapping } - * MyBundle5: + * App1: ~ + * App2: xml + * App3: { type: attribute } + * App4: { type: xml, dir: config/doctrine/mapping } + * App5: * type: xml - * dir: [bundle-mappings1/, bundle-mappings2/] - * alias: BundleAlias + * dir: [app-mappings1/, app-mappings2/] + * alias: AppAlias * arbitrary_key: * type: xml * dir: %kernel.dir%/../src/vendor/DoctrineExtensions/lib/DoctrineExtensions/Documents