Fix broken links

wouterj · wouterj · commit 18e12cd6b1c4 · 2016-03-19T18:03:01.000+01:00
diff --git a/book/database_layer.rst b/book/database_layer.rst
@@ -373,7 +373,7 @@ take different actions as objects go through their persistence lifecycle.
 .. _`JSR-283 specification`: http://jcp.org/en/jsr/detail?id=283
 .. _`Doctrine ORM`: http://symfony.com/doc/current/book/doctrine.html
 .. _`doctrine documentation`: http://docs.doctrine-project.org/projects/doctrine-phpcr-odm/en/latest/reference/basic-mapping.html#basicmapping-identifier-generation-strategies
-.. _`Basic Mapping Documentation`: http://docs.doctrine-project.org/projects/doctrine-phpcr-odm/en/latest/reference/annotations-reference.html
+.. _`Basic Mapping Documentation`: http://docs.doctrine-project.org/projects/doctrine-phpcr-odm/en/latest/reference/basic-mapping.html
 .. _`the QueryBuilder documentation`: http://docs.doctrine-project.org/projects/doctrine-phpcr-odm/en/latest/reference/query-builder.html
 .. _`create complex queries`: http://docs.doctrine-project.org/projects/doctrine-phpcr-odm/en/latest/reference/query-builder.html
 .. _`Custom Repository Classes`: http://symfony.com/doc/current/book/doctrine.html#custom-repository-classes
diff --git a/book/installation.rst b/book/installation.rst
@@ -288,7 +288,7 @@ and then run the following command:
 .. _`Requirements for running Symfony2`: http://symfony.com/doc/current/reference/requirements.html
 .. _`SQLite`: http://www.sqlite.org/
 .. _`Composer`: http://getcomposer.org/
-.. _`guidelines in the symfony book`: http://symfony.com/doc/master/book/installation.html#configuration-and-setup
+.. _`guidelines in the symfony book`: http://symfony.com/doc/current/book/installation.html#book-installation-permissions
 .. _`the Symfony2 book`: http://symfony.com/doc/current/book/
 .. _`Fixtures`: http://symfony.com/doc/current/bundles/DoctrineFixturesBundle/index.html
 .. _`Symfony cookbook article on setup`: http://symfony.com/doc/current/cookbook/configuration/web_server_configuration.html
diff --git a/book/structuring_content.rst b/book/structuring_content.rst
@@ -168,8 +168,8 @@ optional. You can go to the :doc:`../bundles/menu/index` reference page for the
 configuration options list and additional information.
 
 .. _KnpMenuBundle: https://github.com/knplabs/KnpMenuBundle
-.. _`KnpMenuBundle's documentation`: https://github.com/KnpLabs/KnpMenuBundle/blob/master/Resources/doc/index.md
-.. _`respective documentation page`: https://github.com/KnpLabs/KnpMenuBundle/blob/master/Resources/doc/index.md#rendering-menus
+.. _`KnpMenuBundle's documentation`: http://symfony.com/doc/master/bundles/KnpMenuBundle/index.html
+.. _`respective documentation page`: http://symfony.com/doc/master/bundles/KnpMenuBundle/index.html#rendering-menus
 .. _`Doctrine PHPCR documentation page`: http://docs.doctrine-project.org/projects/doctrine-phpcr-odm/en/latest/reference/association-mapping.html#references
 .. _`KnpMenu`: https://github.com/knplabs/KnpMenu
 .. _SonataDoctrinePHPCRAdminBundle: http://sonata-project.org/bundles/doctrine-phpcr-admin/master/doc/index.html
diff --git a/bundles/block/types.rst b/bundles/block/types.rst
@@ -427,5 +427,5 @@ for further information.
 .. _`Sonata Admin Extensions`: http://sonata-project.org/bundles/admin/master/doc/reference/extensions.html
 .. _`LiipImagineBundle`: https://github.com/liip/LiipImagineBundle
 .. _`LiipImagineBundle documentation`: https://github.com/liip/LiipImagineBundle/tree/master/Resources/doc
-.. _`sub-request`: http://symfony.com/doc/current/book/internals.html#internal-requests
+.. _`sub-request`: https://symfony.com/doc/current/components/http_kernel/introduction.html#http-kernel-sub-requests
 .. _SonataDoctrinePHPCRAdminBundle: http://sonata-project.org/bundles/doctrine-phpcr-admin/master/doc/index.html
diff --git a/bundles/content/exposing_content_via_rest.rst b/bundles/content/exposing_content_via_rest.rst
@@ -151,7 +151,7 @@ for details.
 
 .. _`FOSRestBundle`: https://github.com/FriendsOfSymfony/FOSRestBundle
 .. _`JMSSerializerBundle`: https://github.com/schmittjoh/JMSSerializerBundle
-.. _`FOSRestBundle view layer`: https://github.com/FriendsOfSymfony/FOSRestBundle/blob/master/Resources/doc/2-the-view-layer.md
+.. _`FOSRestBundle view layer`: https://symfony.com/doc/master/bundles/FOSRestBundle/2-the-view-layer.html
 .. _Composer: http://getcomposer.org/
 .. _`documentation of the JMS serializer`: http://jmsyst.com/libs/#serializer
 .. _`default response format changed between 1.0 and 1.1 of the ContentBundle`: https://github.com/symfony-cmf/ContentBundle/pull/91
diff --git a/bundles/core/publish_workflow.rst b/bundles/core/publish_workflow.rst
@@ -293,7 +293,7 @@ Custom Voters
 .............
 
 To build voters with custom logic, you need to implement
-:class:`Symfony\\Component\\Security\\Core\\Authentication\\Voter\\VoterInterface`
+:class:`Symfony\\Component\\Security\\Core\\Authorization\\Voter\\VoterInterface`
 and define a service with the tag ``cmf_published_voter``. This is similar
 to the ``security.voter`` tag, but adds your voter to the publish workflow. As
 with the security voters, you can specify a priority, though it is of limited
diff --git a/bundles/menu/introduction.rst b/bundles/menu/introduction.rst
@@ -182,5 +182,5 @@ Read On
 .. _`KnpMenu`: https://github.com/knplabs/KnpMenu
 .. _`KnpMenuBundle`: https://github.com/knplabs/KnpMenuBundle
 .. _`with composer`: http://getcomposer.org
-.. _`rendering menus`: https://github.com/KnpLabs/KnpMenuBundle/blob/master/Resources/doc/index.md#rendering-menus
+.. _`rendering menus`: http://symfony.com/doc/master/bundles/KnpMenuBundle/index.html#rendering-menus
 .. _`symfony-cmf/menu-bundle`: https://packagist.org/packages/symfony-cmf/menu-bundle
diff --git a/bundles/menu/menu_provider.rst b/bundles/menu/menu_provider.rst
@@ -32,4 +32,4 @@ use an absolute path to get menus that are not located in the menu basepath.
     You can also write your completely custom provider and register it with the
     KnpMenu as explained in the `KnpMenuBundle custom provider documentation`_.
 
-.. _`KnpMenuBundle custom provider documentation`: https://github.com/KnpLabs/KnpMenuBundle/blob/master/Resources/doc/custom_provider.md
+.. _`KnpMenuBundle custom provider documentation`: http://symfony.com/doc/master/bundles/KnpMenuBundle/custom_provider.html
diff --git a/bundles/menu/sonata_admin.rst b/bundles/menu/sonata_admin.rst
@@ -242,5 +242,5 @@ configuration:
 .. _`Sonata Admin extension documentation`: http://sonata-project.org/bundles/admin/master/doc/reference/extensions.html
 .. _SonataDoctrinePHPCRAdminBundle: http://sonata-project.org/bundles/doctrine-phpcr-admin/master/doc/index.html
 .. _`the sonata admin documentation`: http://sonata-project.org/bundles/doctrine-phpcr-admin/master/doc/reference/configuration.html
-.. _`KnpMenuBundle documentation`: http://github.com/KnpLabs/KnpMenu/blob/master/doc/01-Basic-Menus.markdown#menu-attributes
+.. _`KnpMenuBundle documentation`: https://github.com/KnpLabs/KnpMenu/blob/master/doc/01-Basic-Menus.markdown#menu-attributes
 .. _BurgovKeyValueFormBundle: https://github.com/Burgov/KeyValueFormBundle
diff --git a/bundles/phpcr_odm/fixtures_initializers.rst b/bundles/phpcr_odm/fixtures_initializers.rst
@@ -309,7 +309,7 @@ A simple example fixture class looks like this::
         }
     }
 
-For more on fixtures, see the `documentation of the DoctrineFixturesBundle <DoctrineFixturesBundle>`_.
+For more on fixtures, see the `documentation of the DoctrineFixturesBundle`_.
 
-.. _`DoctrineFixturesBundle`: http://symfony.com/doc/current/bundles/DoctrineFixturesBundle/index.html
+.. _`documentation of the DoctrineFixturesBundle`: http://symfony.com/doc/current/bundles/DoctrineFixturesBundle/index.html
 .. _`Doctrine data-fixtures`: https://github.com/doctrine/data-fixtures
diff --git a/bundles/routing/dynamic_customize.rst b/bundles/routing/dynamic_customize.rst
@@ -247,11 +247,6 @@ yourself and configure that service:
            ),
        ));
 
-.. _`Creating and configuring services in the container`: http://symfony.com/doc/current/book/service_container.html#creating-configuring-services-in-the-container/
-.. _`PHPCR-ODM`: http://www.doctrine-project.org/projects/phpcr-odm.html
-
-.. _bundle-routing-route-defaults-validator:
-
 The RouteDefaultsValidator
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -262,3 +257,8 @@ will check that they exist.
 
 You can override the validator by setting the
 ``cmf_routing.validator.route_defaults.class`` parameter.
+
+.. _`Creating and configuring services in the container`: http://symfony.com/doc/current/book/service_container.html#creating-configuring-services-in-the-container
+.. _`PHPCR-ODM`: http://www.doctrine-project.org/projects/phpcr-odm.html
+
+.. _bundle-routing-route-defaults-validator:
diff --git a/bundles/simple_cms/introduction.rst b/bundles/simple_cms/introduction.rst
@@ -65,6 +65,6 @@ Sections
 * :doc:`configuration`
 
 .. _`Symfony CMF Standard Edition`: https://github.com/symfony-cmf/standard-edition
-.. _`CMF website`: https://github.com/symfony-cmf/cmf-website/
+.. _`CMF website`: https://github.com/symfony-cmf/symfony-cmf-website/
 .. _`with composer`: http://getcomposer.org
 .. _`Packagist`: https://packagist.org/packages/symfony-cmf/simple-cms-bundle
diff --git a/bundles/tree_browser/introduction.rst b/bundles/tree_browser/introduction.rst
@@ -239,8 +239,8 @@ Read On
 .. _`Packagist`: https://packagist.org/packages/symfony-cmf/tree-browser-bundle
 .. _`with composer`: http://getcomposer.org
 .. _`FOSJsRoutingBundle`: https://github.com/FriendsOfSymfony/FOSJsRoutingBundle
-.. _`admin_tree.js`: https://github.com/sonata-project/SonataDoctrinePhpcrAdminBundle/blob/master/Resources/views/Tree/tree.html.twig
-.. _`select_tree.js`: https://github.com/sonata-project/SonataDoctrinePhpcrAdminBundle/blob/master/Resources/views/Form/form_admin_fields.html.twig
-.. _`PhpcrOdmTree`: https://github.com/sonata-project/SonataDoctrinePhpcrAdminBundle/blob/master/Tree/PhpcrOdmTree.php
+.. _`admin_tree.js`: https://github.com/sonata-project/SonataDoctrinePhpcrAdminBundle/blob/1.2/Resources/views/Tree/tree.html.twig
+.. _`select_tree.js`: https://github.com/sonata-project/SonataDoctrinePhpcrAdminBundle/blob/1.2/Resources/views/Form/form_admin_fields.html.twig
+.. _`PhpcrOdmTree`: https://github.com/sonata-project/SonataDoctrinePhpcrAdminBundle/blob/1.2/Tree/PhpcrOdmTree.php
 .. _`jsTree`: http://www.jstree.com/
 .. _SonataDoctrinePHPCRAdminBundle: http://sonata-project.org/bundles/doctrine-phpcr-admin/master/doc/index.html
diff --git a/components/routing/chain.rst b/components/routing/chain.rst
@@ -22,9 +22,10 @@ the URL and provide the request parameters.
     Historically, the router had to do the matching on the URL string alone.
     Since Symfony 2.2, it can alternatively implement the
     ``RequestMatcherInterface`` to do the matching on the full
-    :class:`Symfony\\Component\\Routing\\Request` object if it wants to use
-    other request information into account like the domain or accept-encoding.
-    The ``ChainRouter`` supports both types of route matching.
+    :class:`Symfony\\Component\\HttpFoundation\\Request` object if it wants to
+    use other request information into account like the domain or
+    accept-encoding.  The ``ChainRouter`` supports both types of route
+    matching.
 
 Adding Routers to the Chain
 ---------------------------
diff --git a/components/routing/dynamic.rst b/components/routing/dynamic.rst
@@ -98,8 +98,8 @@ do not exist yet:
     taken, should the objects be instance of more than one of the classes. This
     enhancer is for example used to determine the controller and template based
     on the class of a Content document.  This enhancer is similar to
-    ``FieldMapEnhancer``, but doing an :phpfunction:`instanceof` check rather
-    than string comparison for the map keys.
+    ``FieldMapEnhancer``, but doing an `instanceof`_ check rather than string
+    comparison for the map keys.
 ``FieldPresenceEnhancer``
     If a field is present in the route match, sets an other field to a
     specified value if that field is not set yet.
@@ -230,6 +230,7 @@ object, generators that are able to do so have to implement the
 call  with any object they can handle.
 
 .. _`Event Dispatcher`: http://symfony.com/doc/current/components/event_dispatcher/index.html
-.. _`How to create an Event Listener`: http://symfony.com/doc/current/cookbook/service_container/event_listener.html
+.. _`How to create an Event Listener`: http://symfony.com/doc/current/cookbook/event_dispatcher/event_listener.html
+.. _instanceof: http://php.net/operators.type
 .. _`Symfony2 Dependency Injection Component`: http://symfony.com/doc/master/components/dependency_injection/index.html
 .. _`Symfony2 DI Component compilation section`: http://symfony.com/doc/current/components/dependency_injection/compilation.html
diff --git a/components/routing/introduction.rst b/components/routing/introduction.rst
@@ -39,10 +39,10 @@ The goal of Routing
 Routing is the task of a framework to determine, based on the web request, what
 code it has to call and which parameters to apply. The Symfony2 core
 :class:`Symfony\\Component\\Routing\\Matcher\\RequestMatcherInterface` defines
-that a router must convert a :class:`Symfony\\Component\\Routing\\Request` into
-an array of routing information. In the full stack Symfony2 framework, the code
-to call is defined in the ``_controller`` field of the match parameters. The
-framework is going to call the controller specified, matching eventual
+that a router must convert a :class:`Symfony\\Component\\HttpFoundation\\Request`
+into an array of routing information. In the full stack Symfony2 framework, the
+code to call is defined in the ``_controller`` field of the match parameters.
+The framework is going to call the controller specified, matching eventual
 parameters of that method by name with the other parameters found in the match
 array or in the ``Request`` object attributes field.
 
diff --git a/contributing/code.rst b/contributing/code.rst
@@ -28,7 +28,7 @@ Resources / Links
 .. _`Website`: http://cmf.symfony.com/
 .. _`Wiki`: https://github.com/symfony-cmf/symfony-cmf/wiki
 .. _`Issue Tracker`: https://github.com/symfony-cmf/symfony-cmf/issues
-.. _`IRC channel`: irc://freenode/#symfony-cmf
+.. _`IRC channel`: http://webchat.freenode.net/?channels=%23symfony-cmf
 .. _`Users mailing list`: http://groups.google.com/group/symfony-cmf-users
 .. _`Devs mailing list`: http://groups.google.com/group/symfony-cmf-devs
 .. _`Submitting a Patch`: http://symfony.com/doc/current/contributing/code/patches.html
diff --git a/tutorial/getting-started.rst b/tutorial/getting-started.rst
@@ -229,8 +229,8 @@ be referenceable and in addition will automatically set the date using the
 
 Both the ``Post`` and ``Page`` classes implement the
 ``RouteReferrersReadInterface``. This interface enables the
-`DynamicRouter to generate URLs`_ from instances of these classes. (for
-example with ``{{ path(content) }}`` in Twig).
+:ref:`DynamicRouter to generate URLs <bundles-routing-dynamic-generator>` from
+instances of these classes. (for example with ``{{ path(content) }}`` in Twig).
 
 Repository Initializer
 ~~~~~~~~~~~~~~~~~~~~~~
@@ -426,13 +426,11 @@ Then load the fixtures:
 
 You should now have some data in your content repository.
 
-.. _`routingautobundle documentation`: http://symfony.com/doc/current/cmf/bundles/routing_auto.html
-.. _`dynamicrouter to generate urls`: http://symfony.com/doc/current/cmf/bundles/routing/dynamic.html#url-generation-with-the-dynamicrouterA
 .. _`idempotent`: http://en.wiktionary.org/wiki/idempotent
 .. _`symfony-cmf/routing-auto-bundle`: https://packagist.org/packages/symfony-cmf/routing-auto-bundle
 .. _`symfony-cmf/menu-bundle`: https://packagist.org/packages/symfony-cmf/menu-bundle
 .. _`sonata-project/doctrine-phpcr-admin-bundle`: https://packagist.org/packages/sonata-project/doctrine-phpcr-admin-bundle
 .. _`doctrine/data-fixtures`: https://packagist.org/packages/doctrine/data-fixtures
-.. _`doctrine dbal jackalope`: https://github.com/jackalope/jackalope-doctrine-dbal
+.. _`Doctrine DBAL Jackalope`: https://github.com/jackalope/jackalope-doctrine-dbal
 .. _`Apache Jackrabbit`: https://jackrabbit.apache.org
 .. _`pre persist lifecycle event`: http://docs.doctrine-project.org/projects/doctrine-phpcr-odm/en/latest/reference/events.html#lifecycle-callbacks

Original file line number	Diff line number	Diff line change
`@@ -309,7 +309,7 @@ A simple example fixture class looks like this::`
`309`	`309`	`}`
`310`	`310`	`}`
`311`	`311`
`312`		-For more on fixtures, see the `documentation of the DoctrineFixturesBundle <DoctrineFixturesBundle>`_.
	`312`	+For more on fixtures, see the `documentation of the DoctrineFixturesBundle`_.
`313`	`313`
`314`		-.. _`DoctrineFixturesBundle`: http://symfony.com/doc/current/bundles/DoctrineFixturesBundle/index.html
	`314`	+.. _`documentation of the DoctrineFixturesBundle`: http://symfony.com/doc/current/bundles/DoctrineFixturesBundle/index.html
`315`	`315`	.. _`Doctrine data-fixtures`: https://github.com/doctrine/data-fixtures