Skip to content

Updated doctrine links for 2.2, fixes #1149 #1155

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Mar 21, 2012
Merged

Updated doctrine links for 2.2, fixes #1149 #1155

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
538181d
fix typo in web_profiler.verbose description
havvg Mar 12, 2012
6957678
Merge pull request #1139 from havvg/2.0
weaverryan Mar 14, 2012
5e54a71
Updated doctrine links for 2.2, fixes #1149
Mar 15, 2012
4a76181
pulling upstream changes
Mar 15, 2012
0cdb40d
corrected links
Mar 15, 2012
1be96c2
Merge branch '2.0' of git://github.com/symfony/symfony-docs
Mar 15, 2012
f7c9fb8
Updated [book]doctrine for links w/o redirects
Mar 15, 2012
eb53359
[coocbook][doctrine] no longer relies on redirect for document urls
Mar 15, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions book/doctrine.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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://docs.doctrine-project.org/projects/doctrine-orm/en/2.1/reference/basic-mapping.html
.. _`Query Builder`: http://docs.doctrine-project.org/projects/doctrine-orm/en/2.1/reference/query-builder.html
.. _`Doctrine Query Language`: http://docs.doctrine-project.org/projects/doctrine-orm/en/2.1/reference/dql-doctrine-query-language.html
.. _`Association Mapping Documentation`: http://docs.doctrine-project.org/projects/doctrine-orm/en/2.1/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://docs.doctrine-project.org/projects/doctrine-orm/en/2.1/reference/basic-mapping.html#doctrine-mapping-types
.. _`Property Mapping documentation`: http://docs.doctrine-project.org/projects/doctrine-orm/en/2.1/reference/basic-mapping.html#property-mapping
.. _`Lifecycle Events documentation`: http://docs.doctrine-project.org/projects/doctrine-orm/en/2.1/reference/events.html#lifecycle-events
.. _`Reserved SQL keywords documentation`: http://docs.doctrine-project.org/projects/doctrine-orm/en/2.1/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
2 changes: 1 addition & 1 deletion cookbook/doctrine/custom_dql_functions.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,4 +77,4 @@ In Symfony, you can register your custom DQL functions as follows:
),
));

.. _`DQL User Defined Functions`: http://docs.doctrine-project.org/projects/doctrine-orm/en/2.1/cookbook/dql-user-defined-functions.html
.. _`DQL User Defined Functions`: http://www.doctrine-project.org/docs/orm/2.2/en/cookbook/dql-user-defined-functions.html
2 changes: 1 addition & 1 deletion cookbook/doctrine/event_listeners_subscribers.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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://docs.doctrine-project.org/projects/doctrine-orm/en/2.1/reference/events.html
.. _`The Event System`: http://www.doctrine-project.org/docs/orm/2.2/en/reference/events.html
2 changes: 1 addition & 1 deletion cookbook/doctrine/reverse_engineering.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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://docs.doctrine-project.org/projects/doctrine-orm/en/2.1/reference/tools.html#reverse-engineering
.. _`Doctrine tools documentation`: http://www.doctrine-project.org/docs/orm/2.2/en/reference/tools.html#reverse-engineering
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is wrong. The doc is now on docs.doctrine-project.org so you should link to it properly instead of relying on the redirection

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@stof corrected, should i update the other links to use docs.doctrine-project.org also?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah, all doc links

2 changes: 1 addition & 1 deletion reference/configuration/doctrine.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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://docs.doctrine-project.org/projects/doctrine-dbal/en/latest/index.html
.. _DBAL documentation: http://www.doctrine-project.org/docs/dbal/2.0/en