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