From 538181d4dd994df70e905308b013c5bd02a3365e Mon Sep 17 00:00:00 2001 From: Toni Uebernickel Date: Mon, 12 Mar 2012 10:49:07 +0100 Subject: [PATCH 1/5] fix typo in web_profiler.verbose description --- reference/configuration/web_profiler.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reference/configuration/web_profiler.rst b/reference/configuration/web_profiler.rst index 4c5d81bff6f..d6e472f0875 100644 --- a/reference/configuration/web_profiler.rst +++ b/reference/configuration/web_profiler.rst @@ -13,7 +13,7 @@ Full Default Configuration web_profiler: - # display secondary information to make the toolbar shorter + # display secondary information, disable to make the toolbar shorter verbose: true # display the web debug toolbar at the bottom of pages with a summary of profiler info From 5e54a71faf8e8a4be63b14305e24543126e75708 Mon Sep 17 00:00:00 2001 From: Matthew Ratzke Date: Wed, 14 Mar 2012 23:49:43 -0600 Subject: [PATCH 2/5] Updated doctrine links for 2.2, fixes #1149 --- book/doctrine.rst | 16 ++++++++-------- cookbook/doctrine/custom_dql_functions.rst | 2 +- .../doctrine/event_listeners_subscribers.rst | 2 +- cookbook/doctrine/reverse_engineering.rst | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/book/doctrine.rst b/book/doctrine.rst index 9bfc9650371..c58cf1d3b7a 100644 --- a/book/doctrine.rst +++ b/book/doctrine.rst @@ -1375,12 +1375,12 @@ For more information about Doctrine, see the *Doctrine* section of the .. _`Doctrine`: http://www.doctrine-project.org/ .. _`MongoDB`: http://www.mongodb.org/ -.. _`Basic Mapping Documentation`: http://www.doctrine-project.org/docs/orm/2.0/en/reference/basic-mapping.html -.. _`Query Builder`: http://www.doctrine-project.org/docs/orm/2.0/en/reference/query-builder.html -.. _`Doctrine Query Language`: http://www.doctrine-project.org/docs/orm/2.0/en/reference/dql-doctrine-query-language.html -.. _`Association Mapping Documentation`: http://www.doctrine-project.org/docs/orm/2.0/en/reference/association-mapping.html +.. _`Basic Mapping Documentation`: http://www.doctrine-project.org/docs/orm/2.2/en/reference/basic-mapping.html +.. _`Query Builder`: http://www.doctrine-project.org/docs/orm/2.2/en/reference/query-builder.html +.. _`Doctrine Query Language`: http://www.doctrine-project.org/docs/orm/2.2/en/reference/dql-doctrine-query-language.html +.. _`Association Mapping Documentation`: http://www.doctrine-project.org/docs/orm/2.2/en/reference/association-mapping.html .. _`DateTime`: http://php.net/manual/en/class.datetime.php -.. _`Mapping Types Documentation`: http://www.doctrine-project.org/docs/orm/2.0/en/reference/basic-mapping.html#doctrine-mapping-types -.. _`Property Mapping documentation`: http://www.doctrine-project.org/docs/orm/2.0/en/reference/basic-mapping.html#property-mapping -.. _`Lifecycle Events documentation`: http://www.doctrine-project.org/docs/orm/2.0/en/reference/events.html#lifecycle-events -.. _`Reserved SQL keywords documentation`: http://www.doctrine-project.org/docs/orm/2.0/en/reference/basic-mapping.html#quoting-reserved-words +.. _`Mapping Types Documentation`: http://www.doctrine-project.org/docs/orm/2.2/en/reference/basic-mapping.html#doctrine-mapping-types +.. _`Property Mapping documentation`: http://www.doctrine-project.org/docs/orm/2.2/en/reference/basic-mapping.html#property-mapping +.. _`Lifecycle Events documentation`: http://www.doctrine-project.org/docs/orm/2.2/en/reference/events.html#lifecycle-events +.. _`Reserved SQL keywords documentation`: http://www.doctrine-project.org/docs/orm/2.2/en/reference/basic-mapping.html#quoting-reserved-words diff --git a/cookbook/doctrine/custom_dql_functions.rst b/cookbook/doctrine/custom_dql_functions.rst index a678a9cdce2..24432c0cd8b 100644 --- a/cookbook/doctrine/custom_dql_functions.rst +++ b/cookbook/doctrine/custom_dql_functions.rst @@ -77,4 +77,4 @@ In Symfony, you can register your custom DQL functions as follows: ), )); -.. _`DQL User Defined Functions`: http://www.doctrine-project.org/docs/orm/2.0/en/cookbook/dql-user-defined-functions.html \ No newline at end of file +.. _`DQL User Defined Functions`: http://www.doctrine-project.org/docs/orm/2.2/en/cookbook/dql-user-defined-functions.html \ No newline at end of file diff --git a/cookbook/doctrine/event_listeners_subscribers.rst b/cookbook/doctrine/event_listeners_subscribers.rst index e8064e08ec9..0cb25159269 100644 --- a/cookbook/doctrine/event_listeners_subscribers.rst +++ b/cookbook/doctrine/event_listeners_subscribers.rst @@ -111,4 +111,4 @@ specific type of entity (e.g. a ``Product`` entity but not a ``BlogPost`` entity), you should check for the class name of the entity in your method (as shown above). -.. _`The Event System`: http://www.doctrine-project.org/docs/orm/2.0/en/reference/events.html \ No newline at end of file +.. _`The Event System`: http://www.doctrine-project.org/docs/orm/2.2/en/reference/events.html \ No newline at end of file diff --git a/cookbook/doctrine/reverse_engineering.rst b/cookbook/doctrine/reverse_engineering.rst index c6287711304..fd8ea156ac5 100644 --- a/cookbook/doctrine/reverse_engineering.rst +++ b/cookbook/doctrine/reverse_engineering.rst @@ -170,4 +170,4 @@ The last command generated all getters and setters for your two ``BlogPost`` and ``BlogComment`` entity class properties. The generated entities are now ready to be used. Have fun! -.. _`Doctrine tools documentation`: http://www.doctrine-project.org/docs/orm/2.0/en/reference/tools.html#reverse-engineering +.. _`Doctrine tools documentation`: http://www.doctrine-project.org/docs/orm/2.2/en/reference/tools.html#reverse-engineering From 0cdb40d3fb6b38fead6e039f5f5ed35f850cadb5 Mon Sep 17 00:00:00 2001 From: Matthew Ratzke Date: Thu, 15 Mar 2012 12:01:59 -0600 Subject: [PATCH 3/5] corrected links --- cookbook/doctrine/reverse_engineering.rst | 2 +- reference/configuration/doctrine.rst | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cookbook/doctrine/reverse_engineering.rst b/cookbook/doctrine/reverse_engineering.rst index fd8ea156ac5..2c177cdfebe 100644 --- a/cookbook/doctrine/reverse_engineering.rst +++ b/cookbook/doctrine/reverse_engineering.rst @@ -170,4 +170,4 @@ The last command generated all getters and setters for your two ``BlogPost`` and ``BlogComment`` entity class properties. The generated entities are now ready to be used. Have fun! -.. _`Doctrine tools documentation`: http://www.doctrine-project.org/docs/orm/2.2/en/reference/tools.html#reverse-engineering +.. _`Doctrine tools documentation`: http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/reference/tools.html#reverse-engineering diff --git a/reference/configuration/doctrine.rst b/reference/configuration/doctrine.rst index 0365ffdeec9..fa53168daf4 100644 --- a/reference/configuration/doctrine.rst +++ b/reference/configuration/doctrine.rst @@ -304,4 +304,4 @@ which is the first one defined or the one configured via the Each connection is also accessible via the ``doctrine.dbal.[name]_connection`` service where ``[name]`` if the name of the connection. -.. _DBAL documentation: http://www.doctrine-project.org/docs/dbal/2.0/en \ No newline at end of file +.. _DBAL documentation: http://docs.doctrine-project.org/projects/doctrine-dbal/en/latest/index.html \ No newline at end of file From f7c9fb8817235e5b67baca3150e66d63dfa05167 Mon Sep 17 00:00:00 2001 From: Matthew Ratzke Date: Thu, 15 Mar 2012 15:17:20 -0600 Subject: [PATCH 4/5] Updated [book]doctrine for links w/o redirects --- book/doctrine.rst | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/book/doctrine.rst b/book/doctrine.rst index c58cf1d3b7a..c309ef39d36 100644 --- a/book/doctrine.rst +++ b/book/doctrine.rst @@ -1375,12 +1375,12 @@ For more information about Doctrine, see the *Doctrine* section of the .. _`Doctrine`: http://www.doctrine-project.org/ .. _`MongoDB`: http://www.mongodb.org/ -.. _`Basic Mapping Documentation`: http://www.doctrine-project.org/docs/orm/2.2/en/reference/basic-mapping.html -.. _`Query Builder`: http://www.doctrine-project.org/docs/orm/2.2/en/reference/query-builder.html -.. _`Doctrine Query Language`: http://www.doctrine-project.org/docs/orm/2.2/en/reference/dql-doctrine-query-language.html -.. _`Association Mapping Documentation`: http://www.doctrine-project.org/docs/orm/2.2/en/reference/association-mapping.html +.. _`Basic Mapping Documentation`: http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/reference/basic-mapping.html +.. _`Query Builder`: http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/reference/query-builder.html +.. _`Doctrine Query Language`: http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/reference/dql-doctrine-query-language.html +.. _`Association Mapping Documentation`: http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/reference/association-mapping.html .. _`DateTime`: http://php.net/manual/en/class.datetime.php -.. _`Mapping Types Documentation`: http://www.doctrine-project.org/docs/orm/2.2/en/reference/basic-mapping.html#doctrine-mapping-types -.. _`Property Mapping documentation`: http://www.doctrine-project.org/docs/orm/2.2/en/reference/basic-mapping.html#property-mapping -.. _`Lifecycle Events documentation`: http://www.doctrine-project.org/docs/orm/2.2/en/reference/events.html#lifecycle-events -.. _`Reserved SQL keywords documentation`: http://www.doctrine-project.org/docs/orm/2.2/en/reference/basic-mapping.html#quoting-reserved-words +.. _`Mapping Types Documentation`: http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/reference/basic-mapping.html#doctrine-mapping-types +.. _`Property Mapping documentation`: http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/reference/basic-mapping.html#property-mapping +.. _`Lifecycle Events documentation`: http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/reference/events.html#lifecycle-events +.. _`Reserved SQL keywords documentation`: http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/reference/basic-mapping.html#quoting-reserved-words From eb53359ad34e71059e39e2f83dd58b3a2697d1b3 Mon Sep 17 00:00:00 2001 From: Matthew Ratzke Date: Thu, 15 Mar 2012 15:33:17 -0600 Subject: [PATCH 5/5] [coocbook][doctrine] no longer relies on redirect for document urls --- cookbook/doctrine/custom_dql_functions.rst | 2 +- cookbook/doctrine/event_listeners_subscribers.rst | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cookbook/doctrine/custom_dql_functions.rst b/cookbook/doctrine/custom_dql_functions.rst index 24432c0cd8b..361727cc7be 100644 --- a/cookbook/doctrine/custom_dql_functions.rst +++ b/cookbook/doctrine/custom_dql_functions.rst @@ -77,4 +77,4 @@ In Symfony, you can register your custom DQL functions as follows: ), )); -.. _`DQL User Defined Functions`: http://www.doctrine-project.org/docs/orm/2.2/en/cookbook/dql-user-defined-functions.html \ No newline at end of file +.. _`DQL User Defined Functions`: http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/cookbook/dql-user-defined-functions.html \ No newline at end of file diff --git a/cookbook/doctrine/event_listeners_subscribers.rst b/cookbook/doctrine/event_listeners_subscribers.rst index 0cb25159269..af4d13e67c4 100644 --- a/cookbook/doctrine/event_listeners_subscribers.rst +++ b/cookbook/doctrine/event_listeners_subscribers.rst @@ -111,4 +111,4 @@ specific type of entity (e.g. a ``Product`` entity but not a ``BlogPost`` entity), you should check for the class name of the entity in your method (as shown above). -.. _`The Event System`: http://www.doctrine-project.org/docs/orm/2.2/en/reference/events.html \ No newline at end of file +.. _`The Event System`: http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/reference/events.html \ No newline at end of file