update links, fix wording from Symfony2 to Symfony

Author: dbu

CONTRIBUTING.md

@@ -1,18 +1,13 @@
 Contributing
 ------------
 
-Symfony2 CMF is an open source, community-driven project. We follow the same
-guidelines as core Symfony2. If you'd like to contribute, please read the
+Symfony CMF is an open source, community-driven project. We follow the same
+guidelines as core Symfony. If you'd like to contribute, please read the
 [Contributing Documentation][1] part of the documentation. If you're submitting a pull
-request, please make yourself comfortable with [the format][2], follow the
-guidelines in the [Creating a Pull Request][3] section and use the [Pull Request
-Format][4].
-
-> :warning: **NOTE**
-> If you are documenting new features you should base your PR on the
-> **dev branch**, *not* the master branch.
+request, please make yourself comfortable with [the documentation format][2].
+The [Symfony documentation guide][3] can be helpful for you - just replace the
+repository names in the examples.
 
  [1]: https://symfony.com/doc/current/contributing/documentation/index.html
  [2]: https://symfony.com/doc/current/contributing/documentation/format.html
- [3]: https://symfony.com/doc/current/contributing/documentation/overview.html#creating-a-pull-request
- [4]: https://symfony.com/doc/current/contributing/documentation/overview.html#pull-request-format
+ [3]: https://symfony.com/doc/current/contributing/documentation/overview.html

bundles/block/cache.rst

@@ -257,7 +257,7 @@ When using the Esi, Ssi or Js cache adapters, the settings passed here are remem
     .. code-block:: jinja
 
         {{ sonata_block_render({ 'name': 'rssBlock' }, {
-            'title': 'Symfony2 CMF news',
+            'title': 'Symfony CMF news',
             'url': 'http://cmf.symfony.com/news.rss',
             'maxItems': 2
         }) }}
@@ -267,7 +267,7 @@ When using the Esi, Ssi or Js cache adapters, the settings passed here are remem
         <?php echo $view['blocks']->render(array(
             'name' => 'rssBlock',
         ), array(
-            'title'    => 'Symfony2 CMF news',
+            'title'    => 'Symfony CMF news',
             'url'      => 'http://cmf.symfony.com/news.rss',
             'maxItems' => 2,
         )) ?>

bundles/block/create_your_own_blocks.rst

@@ -236,14 +236,14 @@ Example of how settings can be overwritten through a template helper:
     .. code-block:: jinja
 
         {{ sonata_block_render({'name': 'rssBlock'}, {
-            'title': 'Symfony2 CMF news',
+            'title': 'Symfony CMF news',
             'url': 'http://cmf.symfony.com/news.rss'
         }) }}
 
     .. code-block:: html+php
 
         <?php $view['blocks']->render(array('name' => 'rssBlock'), array(
-            'title' => 'Symfony2 CMF news',
+            'title' => 'Symfony CMF news',
             'url'   => 'http://cmf.symfony.com/news.rss',
         )) ?>
 

bundles/block/types.rst

@@ -123,7 +123,7 @@ Create a document::
     $myRssBlock = new RssBlock();
     $myRssBlock->setParentDocument($parentPage);
     $myRssBlock->setName('rssBlock');
-    $myRssBlock->setSetting('title', 'Symfony2 CMF news');
+    $myRssBlock->setSetting('title', 'Symfony CMF news');
     $myRssBlock->setSetting('url', 'http://cmf.symfony.com/news.rss');
     $myRssBlock->setSetting('maxItems', 3);
 

bundles/content/exposing_content_via_rest.rst

@@ -146,7 +146,7 @@ for details.
 
 .. _`FOSRestBundle`: https://github.com/FriendsOfSymfony/FOSRestBundle
 .. _`JMSSerializerBundle`: https://github.com/schmittjoh/JMSSerializerBundle
-.. _`FOSRestBundle view layer`: https://symfony.com/doc/master/bundles/FOSRestBundle/2-the-view-layer.html
+.. _`FOSRestBundle view layer`: https://symfony.com/doc/current/bundles/FOSRestBundle/2-the-view-layer.html
 .. _Composer: https://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/content-bundle/pull/91

bundles/core/publish_workflow.rst

@@ -5,9 +5,9 @@ Publish Workflow
 ----------------
 
 The publish workflow system allows to control what content is available on the
-site. This is similar to the `Symfony2 Security component`_. But contrary to the
+site. This is similar to the `Symfony Security component`_. But contrary to the
 security context, the publish check can be executed even when no firewall is in
-place and the security context thus has no token (see `Symfony2 Authorization`_).
+place and the security context thus has no token (see `Symfony Authorization`_).
 
 The publish workflow is also tied into the security workflow: The CoreBundle
 registers a security voter that forwards security checks to the publish
@@ -371,6 +371,6 @@ There is a :doc:`Sonata admin extension <../sonata_phpcr_admin_integration/core>
 available to edit workflow information on any document implementing the
 interface.
 
-.. _`Symfony2 security component`: http://symfony.com/doc/current/components/security.html
-.. _`Symfony2 Authorization`: http://symfony.com/doc/current/components/security/authorization.html
+.. _`Symfony security component`: http://symfony.com/doc/current/components/security.html
+.. _`Symfony Authorization`: http://symfony.com/doc/current/components/security/authorization.html
 .. _`ACL checks`: http://symfony.com/doc/current/security/acl.html

bundles/create/introduction.rst

@@ -7,7 +7,7 @@ CreateBundle
 
     The CreateBundle provides modern front-end in-place editing for web
     applications. It integrates create.js and the CreatePHP library into
-    Symfony2.
+    Symfony.
 
 .. include:: ../_partials/unmaintained.rst.inc
 
@@ -307,7 +307,7 @@ JavaScript loader check if the current user is granted the configured
 .. tip::
 
     In order to have security in place, you need to configure a
-    "Symfony2 firewall". Read more in the `Symfony2 security chapter`_.
+    "Symfony firewall". Read more in the `Symfony security chapter`_.
     If you do not do that, create.js will not be loaded and editing
     will be disabled.
 
@@ -363,8 +363,7 @@ after those to be able to customize as needed) with:
     Make sure Assetic is rewriting the paths in your CSS files properly or you
     might not see icon images.
 
-In your page bottom area, load the JavaScript files. If you are using Symfony 2.2 or
-higher, the method reads:
+In your page bottom area, load the JavaScript files:
 
 .. configuration-block::
 
@@ -666,4 +665,4 @@ Read On
 .. _`symfony-cmf/create-bundle`: https://packagist.org/packages/symfony-cmf/create-bundle
 .. _`RDF`: https://en.wikipedia.org/wiki/Resource_Description_Framework
 .. _`RDFa`: https://en.wikipedia.org/wiki/RDFa
-.. _`Symfony2 security chapter`: https://symfony.com/doc/current/book/security.html
+.. _`Symfony security chapter`: https://symfony.com/doc/current/security.html

bundles/menu/introduction.rst

@@ -180,5 +180,5 @@ Read On
 .. _`KnpMenu`: https://github.com/knplabs/KnpMenu
 .. _`KnpMenuBundle`: https://github.com/knplabs/KnpMenuBundle
 .. _`with composer`: https://getcomposer.org
-.. _`rendering menus`: https://symfony.com/doc/master/bundles/KnpMenuBundle/index.html#rendering-menus
+.. _`rendering menus`: https://symfony.com/doc/current/bundles/KnpMenuBundle/index.html#rendering-menus
 .. _`symfony-cmf/menu-bundle`: https://packagist.org/packages/symfony-cmf/menu-bundle

bundles/menu/menu_documents.rst

@@ -123,4 +123,4 @@ The standard menu node implements ``PublishTimePeriodInterface`` and
 The ``MenuContentVoter`` decides that a menu node is not published if the
 content it is pointing to is not published.
 
-.. _`Creating Menus: The Basics`: https://github.com/KnpLabs/KnpMenu/blob/1.1.x/doc/01-Basic-Menus.markdown
+.. _`Creating Menus: The Basics`: https://github.com/KnpLabs/KnpMenu/blob/master/doc/01-Basic-Menus.markdown

bundles/menu/menu_provider.rst

@@ -33,4 +33,4 @@ are not located under 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://symfony.com/doc/master/bundles/KnpMenuBundle/custom_provider.html
+.. _`KnpMenuBundle custom provider documentation`: https://symfony.com/doc/current/bundles/KnpMenuBundle/custom_provider.html

bundles/phpcr_odm/configuration.rst

@@ -353,7 +353,7 @@ supported by Doctrine.
 
 Specify the Doctrine DBAL connection name to use if you don't want to use the
 default connection. The name must be one of the names of the ``doctrine.dbal``
-section of your Doctrine configuration, see the `Symfony2 Doctrine documentation`_.
+section of your Doctrine configuration, see the `Symfony Doctrine documentation`_.
 
 ``jackalope.disable_transactions``
 """"""""""""""""""""""""""""""""""
@@ -372,7 +372,7 @@ Logging and Profiling
 ~~~~~~~~~~~~~~~~~~~~~
 
 When using any of the Jackalope PHPCR implementations, you can activate logging
-to log to the symfony log, or profiling to show information in the Symfony2
+to log to the symfony log, or profiling to show information in the Symfony
 debug toolbar:
 
 .. configuration-block::
@@ -659,7 +659,7 @@ Absolute path to the jackrabbit jar file. If this is set, you can use the
 
 For tuning the output of the ``doctrine:phpcr:dump`` command.
 
-.. _`Symfony2 Doctrine documentation`: https://symfony.com/doc/current/book/doctrine.html
+.. _`Symfony Doctrine documentation`: https://symfony.com/doc/current/doctrine.html
 .. _`last modified listener cookbook entry`: http://docs.doctrine-project.org/projects/doctrine-phpcr-odm/en/latest/cookbook/last-modified.html
 .. _`Doctrine ORM`: https://symfony.com/doc/current/reference/configuration/doctrine.html#caching-drivers
 .. _`curl-setopt`: http://php.net/manual/de/function.curl-setopt.php

bundles/phpcr_odm/events.rst

@@ -96,6 +96,6 @@ You can find more information and examples of the doctrine event system
 in "`How to Register Event Listeners and Subscribers`_" of the core documentation.
 
 .. _`Doctrine PHPCR-ODM event system documentation`: http://docs.doctrine-project.org/projects/doctrine-phpcr-odm/en/latest/reference/events.html
-.. _`Symfony event subscriber`: https://symfony.com/doc/master/components/event_dispatcher/introduction.html#using-event-subscribers
-.. _`Doctrine ORM events`: https://symfony.com/doc/current/cookbook/doctrine/event_listeners_subscribers.html
-.. _`How to Register Event Listeners and Subscribers`: https://symfony.com/doc/current/cookbook/doctrine/event_listeners_subscribers.html
+.. _`Symfony event subscriber`: https://symfony.com/doc/current/components/event_dispatcher/introduction.html#using-event-subscribers
+.. _`Doctrine ORM events`: https://symfony.com/doc/current/doctrine/event_listeners_subscribers.html
+.. _`How to Register Event Listeners and Subscribers`: https://symfony.com/doc/current/doctrine/event_listeners_subscribers.html

bundles/phpcr_odm/fixtures_initializers.rst

@@ -283,7 +283,7 @@ Fixture Loading
 
 To use the ``doctrine:phpcr:fixtures:load`` command, you additionally need to
 install the `DoctrineFixturesBundle`_ which brings the
-`Doctrine data-fixtures`_ into Symfony2.
+`Doctrine data-fixtures`_ into Symfony.
 
 Fixtures work the same way they work for Doctrine ORM. You write fixture
 classes implementing ``Doctrine\Common\DataFixtures\FixtureInterface``. If you

bundles/phpcr_odm/forms.rst

@@ -101,8 +101,7 @@ The minimal code required to use this type looks as follows::
 
     When building an admin interface with the SonataDoctrinePHPCRAdminBundle_
     there is also the ``sonata_type_model``, which is more powerful, allowing to
-    add to the referenced documents on the fly. Unfortunately it is
-    `currently broken`_.
+    add to the referenced documents on the fly.
 
 phpcr_reference
 ~~~~~~~~~~~~~~~
@@ -186,4 +185,3 @@ correct.
 .. _BurgovKeyValueFormBundle: https://github.com/Burgov/KeyValueFormBundle
 .. _`Symfony documentation on the entity form type`: https://symfony.com/doc/current/reference/forms/types/entity.html
 .. _SonataDoctrinePHPCRAdminBundle: https://sonata-project.org/bundles/doctrine-phpcr-admin/master/doc/index.html
-.. _`currently broken`: https://github.com/sonata-project/SonataDoctrineORMAdminBundle/issues/145

bundles/phpcr_odm/introduction.rst

@@ -24,7 +24,7 @@ Out of the box, this bundle supports the following PHPCR implementations:
 
 .. tip::
 
-    This reference only explains the Symfony2 integration of PHPCR and
+    This reference only explains the Symfony integration of PHPCR and
     PHPCR-ODM. To learn how to use PHPCR, refer to `the PHPCR website`_ and
     for Doctrine PHPCR-ODM to the `PHPCR-ODM documentation`_.
 
@@ -96,7 +96,7 @@ DBAL. The full documentation is in the :doc:`configuration reference <configurat
 
 To use Jackalope Doctrine DBAL, you need to configure a database connection
 with the DoctrineBundle. For detailed information, see the
-`Symfony2 Doctrine documentation`_. A simple example is:
+`Symfony Doctrine documentation`_. A simple example is:
 
 .. code-block:: yaml
 
@@ -346,7 +346,7 @@ Profiling and Performance of Jackalope
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 When using any of the Jackalope PHPCR implementations, you can activate logging
-to log to the symfony log, or profiling to show information in the Symfony2
+to log to the symfony log, or profiling to show information in the Symfony
 debug toolbar:
 
 .. configuration-block::
@@ -526,25 +526,14 @@ Read On
 
 .. _`Doctrine PHPCR-ODM`: http://docs.doctrine-project.org/projects/doctrine-phpcr-odm/en/latest/index.html
 .. _`DoctrinePHPCRBundle`: https://github.com/doctrine/DoctrinePHPCRBundle
-.. _`Symfony2 Doctrine documentation`: https://symfony.com/doc/current/book/doctrine.html
+.. _`Symfony Doctrine documentation`: https://symfony.com/doc/current/doctrine.html
 .. _`Jackalope`: http://jackalope.github.io/
 .. _`the PHPCR website`: http://phpcr.github.io/
 .. _`PHPCR-ODM documentation`: http://docs.doctrine-project.org/projects/doctrine-phpcr-odm/en/latest/
 .. _`bug in libxml`: https://bugs.php.net/bug.php?id=36501
 .. _`with composer`: https://getcomposer.org
 .. _`doctrine/phpcr-bundle`: https://packagist.org/packages/doctrine/phpcr-bundle
-.. _`metadata caching`: https://symfony.com/doc/master/reference/configuration/doctrine.html
-.. _`PHPCR-ODM documentation on Multilanguage`: http://docs.doctrine-project.org/projects/doctrine-phpcr-odm/en/latest/reference/multilang.html
 .. _`custom node type`: https://github.com/doctrine/phpcr-odm/wiki/Custom-node-type-phpcr%3Amanaged
-.. _`the PHPCR-ODM documentation`: http://docs.doctrine-project.org/projects/doctrine-phpcr-odm/en/latest/reference/events.html
-.. _`Symfony event subscriber`: https://symfony.com/doc/master/components/event_dispatcher/introduction.html#using-event-subscribers
-.. _`Symfony cookbook entry`: https://symfony.com/doc/current/cookbook/doctrine/event_listeners_subscribers.html
-.. _`Symfony documentation on the entity form type`: https://symfony.com/doc/current/reference/forms/types/entity.html
-.. _SonataDoctrinePHPCRAdminBundle: https://sonata-project.org/bundles/doctrine-phpcr-admin/master/doc/index.html
-.. _`currently broken`: https://github.com/sonata-project/SonataDoctrineORMAdminBundle/issues/145
 .. _`DoctrineMigrationsBundle`: https://symfony.com/doc/current/bundles/DoctrineMigrationsBundle/index.html
 .. _`DoctrineFixturesBundle`: https://symfony.com/doc/current/bundles/DoctrineFixturesBundle/index.html
-.. _`Doctrine data-fixtures`: https://github.com/doctrine/data-fixtures
-.. _`documentation of the DoctrineFixturesBundle`: https://symfony.com/doc/current/bundles/DoctrineFixturesBundle/index.html
 .. _`SQL2 queries`: http://www.h2database.com/jcr/grammar.html
-.. _`BurgovKeyValueFormBundle`: https://github.com/Burgov/KeyValueFormBundle

bundles/phpcr_odm/models.rst

@@ -350,9 +350,9 @@ objects go through their persistence lifecycle.
 
 .. _`PHP Content Repository`: http://phpcr.github.io/
 .. _`JSR-283 specification`: https://jcp.org/en/jsr/detail?id=283
-.. _`Doctrine ORM`: https://symfony.com/doc/current/book/doctrine.html
+.. _`Doctrine ORM`: https://symfony.com/doc/current/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/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`: https://symfony.com/doc/current/book/doctrine.html#custom-repository-classes
+.. _`Custom Repository Classes`: https://symfony.com/doc/current/doctrine/repository.html

bundles/routing/dynamic.rst

@@ -667,5 +667,5 @@ Read on in the chapter :doc:`customizing the dynamic router <dynamic_customize>`
 .. _`CMF Routing component`: https://github.com/symfony-cmf/Routing
 .. _`Doctrine ORM`: http://www.doctrine-project.org/projects/orm.html
 .. _`PHPCR-ODM`: http://www.doctrine-project.org/projects/phpcr-odm.html
-.. _`URL generating capabilities of Symfony`: https://symfony.com/doc/current/book/routing.html#generating-urls
+.. _`URL generating capabilities of Symfony`: https://symfony.com/doc/current/routing.html#generating-urls
 .. _`FOSJsRoutingBundle`: https://github.com/FriendsOfSymfony/FOSJsRoutingBundle

bundles/routing/dynamic_customize.rst

@@ -264,5 +264,5 @@ 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`: https://symfony.com/doc/current/book/service_container.html#creating-configuring-services-in-the-container
+.. _`Creating and configuring services in the container`: https://symfony.com/doc/current/service_container.html#creating-configuring-services-in-the-container
 .. _`PHPCR-ODM`: http://www.doctrine-project.org/projects/phpcr-odm.html

bundles/routing/introduction.rst

@@ -108,5 +108,5 @@ For more information on Routing in the Symfony CMF, please refer to:
 .. _`symfony-cmf/routing-bundle`: https://packagist.org/packages/symfony-cmf/routing-bundle
 .. _`RoutingBundle`: https://github.com/symfony-cmf/routing-bundle#readme
 .. _`PHPCR-ODM`: http://www.doctrine-project.org/projects/phpcr-odm.html
-.. _`documentation for DependencyInjection tags`: https://symfony.com/doc/2.1/reference/dic_tags.html
+.. _`documentation for DependencyInjection tags`: https://symfony.com/doc/current/reference/dic_tags.html
 .. _`Routing`: https://symfony.com/doc/current/components/routing/introduction.html

bundles/search/configuration.rst

@@ -146,11 +146,11 @@ template.
             ),
         ));
 
-.. _`LiipSearchBundle`: https://github.com/liip/LiipSearchBundle
-
 ``max_results``
 """""""""""""""
 
 **type**: ``integer`` **default**: ``null``
 
 Defines a limit for number of results returned.
+
+.. _`LiipSearchBundle`: https://github.com/liip/LiipSearchBundle

bundles/seo/error_pages.rst

@@ -184,4 +184,4 @@ Now, register this new class as a service and tag it as
 
 The tag allows a ``group`` attribute, in order to group suggested links.
 
-.. _Symfony Documentation: https://symfony.com/doc/current/cookbook/controller/error_pages.html#overriding-the-default-exceptioncontroller
+.. _Symfony Documentation: https://symfony.com/doc/current/controller/error_pages.html#overriding-the-default-exceptioncontroller

bundles/simple_cms/extending_page_class.rst

@@ -66,7 +66,7 @@ For example::
 
     // set extras
     $extras = array(
-        'subtext' => 'Add CMS functionality to applications built with the Symfony2 PHP framework.',
+        'subtext' => 'Add CMS functionality to applications built with the Symfony PHP framework.',
         'headline-icon' => 'exclamation.png',
     );