8000 Merge branch '2.0' · symfony/symfony-docs@cd0465d · GitHub
[go: up one dir, main page]
Skip to content

Commit cd0465d

Browse files
weaverryanweaverryan
committed
Merge branch '2.0'
2 parents 2b0ab71 + 39ddef0 commit cd0465d

File tree

7 files changed

+18
-15
lines changed

7 files changed

+18
-15
lines changed

‎book/doctrine.rst

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1375,12 +1375,12 @@ For more information about Doctrine, see the *Doctrine* section of the
13751375

13761376
.. _`Doctrine`: http://www.doctrine-project.org/
13771377
.. _`MongoDB`: http://www.mongodb.org/
1378-
.. _`Basic Mapping Documentation`: http://www.doctrine-project.org/docs/orm/2.0/en/reference/basic-mapping.html
1379-
.. _`Query Builder`: http://www.doctrine-project.org/docs/orm/2.0/en/reference/query-builder.html
1380-
.. _`Doctrine Query Language`: http://www.doctrine-project.org/docs/orm/2.0/en/reference/dql-doctrine-query-language.html
1381-
.. _`Association Mapping Documentation`: http://www.doctrine-project.org/docs/orm/2.0/en/reference/association-mapping.html
1378+
.. _`Basic Mapping Documentation`: http://docs.doctrine-project.org/projects/doctrine-orm/en/2.1/reference/basic-mapping.html
1379+
.. _`Query Builder`: http://docs.doctrine-project.org/projects/doctrine-orm/en/2.1/reference/query-builder.html
1380+
.. _`Doctrine Query Language`: http://docs.doctrine-project.org/projects/doctrine-orm/en/2.1/reference/dql-doctrine-query-language.html
1381+
.. _`Association Mapping Documentation`: http://docs.doctrine-project.org/projects/doctrine-orm/en/2.1/reference/association-mapping.html
13821382
.. _`DateTime`: http://php.net/manual/en/class.datetime.php
1383-
.. _`Mapping Types Documentation`: http://www.doctrine-project.org/docs/orm/2.0/en/reference/basic-mapping.html#doctrine-mapping-types
1384-
.. _`Property Mapping documentation`: http://www.doctrine-project.org/docs/orm/2.0/en/reference/basic-mapping.html#property-mapping
1385-
.. _`Lifecycle Events documentation`: http://www.doctrine-project.org/docs/orm/2.0/en/reference/events.html#lifecycle-events
1386-
.. _`Reserved SQL keywords documentation`: http://www.doctrine-project.org/docs/orm/2.0/en/reference/basic-mapping.html#quoting-reserved-words
1383+
.. _`Mapping Types Documentation`: http://docs.doctrine-project.org/projects/doctrine-orm/en/2.1/reference/basic-mapping.html#doctrine-mapping-types
1384+
.. _`Property Mapping documentation`: http://docs.doctrine-project.org/projects/doctrine-orm/en/2.1/reference/basic-mapping.html#property-mapping
1385+
.. _`Lifecycle Events documentation`: http://docs.doctrine-project.org/projects/doctrine-orm/en/2.1/reference/events.html#lifecycle-events
1386+
.. _`Reserved SQL keywords documentation`: http://docs.doctrine-project.org/projects/doctrine-orm/en/2.1/reference/basic-mapping.html#quoting-reserved-words

‎book/service_container.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -518,6 +518,9 @@ available for the core bundles can be found inside the :doc:`Reference Guide</re
518518
``services``, and ``imports`` directives. Any other directives
519519
are handled by a service container extension.
520520

521+
If you want to expose user friendly configuration in your own bundles, read the
522+
":doc:`/cookbook/bundles/extensions`" cookbook recipe.
523+
521524
.. index::
522525
single: Service Container; Referencing services
523526

‎cookbook/doctrine/custom_dql_functions.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,4 +77,4 @@ In Symfony, you can register your custom DQL functions as follows:
7777
),
7878
));
7979
80-
.. _`DQL User Defined Functions`: http://www.doctrine-project.org/docs/orm/2.0/en/cookbook/dql-user-defined-functions.html
80+
.. _`DQL User Defined Functions`: http://docs.doctrine-project.org/projects/doctrine-orm/en/2.1/cookbook/dql-user-defined-functions.html

‎cookbook/doctrine/dbal.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,6 @@ mapping type:
184184
));
185185
186186
.. _`PDO`: http://www.php.net/pdo
187-
.. _`Doctrine`: http://www.doctrine-project.org/projects/dbal/2.0/docs/en
188-
.. _`DBAL Documentation`: http://www.doctrine-project.org/projects/dbal/2.0/docs/en
189-
.. _`Custom Mapping Types`: http://www.doctrine-project.org/docs/dbal/2.0/en/reference/types.html#custom-mapping-types
187+
.. _`Doctrine`: http://www.doctrine-project.org
188+
.. _`DBAL Documentation`: http://docs.doctrine-project.org/projects/doctrine-dbal/en/latest/index.html
189+
.. _`Custom Mapping Types`: http://docs.doctrine-project.org/projects/doctrine-dbal/en/latest/reference/types.html#custom-mapping-types

‎cookbook/doctrine/event_listeners_subscribers.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,4 +111,4 @@ specific type of entity (e.g. a ``Product`` entity but not a ``BlogPost``
111111
entity), you should check for the class name of the entity in your method
112112
(as shown above).
113113

114-
.. _`The Event System`: http://www.doctrine-project.org/docs/orm/2.0/en/reference/events.html
114+
.. _`The Event System`: http://docs.doctrine-project.org/projects/doctrine-orm/en/2.1/reference/events.html

‎cookbook/doctrine/reverse_engineering.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,4 +170,4 @@ The last command generated all getters and setters for your two ``BlogPost`` and
170170
``BlogComment`` entity class properties. The generated entities are now ready to be
171171
used. Have fun!
172172

173-
.. _`Doctrine tools documentation`: http://www.doctrine-project.org/docs/orm/2.0/en/reference/tools.html#reverse-engineering
173+
.. _`Doctrine tools documentation`: http://docs.doctrine-project.org/projects/doctrine-orm/en/2.1/reference/tools.html#reverse-engineering

‎reference/configuration/doctrine.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -304,4 +304,4 @@ which is the first one defined or the one configured via the
304304
Each connection is also accessible via the ``doctrine.dbal.[name]_connection``
305305
service where ``[name]`` if the name of the connection.
306306
307-
.. _DBAL documentation: http://www.doctrine-project.org/docs/dbal/2.0/en
307+
.. _DBAL documentation: http://docs.doctrine-project.org/projects/doctrine-dbal/en/latest/index.html

0 commit comments

Comments
 (0)
0