Merge remote-tracking branch 'sensio/3.1' into 3.1

weaverryan · weaverryan · commit 9d289a4f2c2f · 2016-07-14T11:04:50.000-04:00
* sensio/3.1:
  Move new articles to correct location
diff --git a/components/cache.rst b/components/cache.rst
@@ -75,10 +75,10 @@ Advanced Usage
 --------------
 
 .. toctree::
+    :glob:
     :maxdepth: 1
 
-    cache_items
-    cache_pools
+    cache/*
 
 .. _`PSR-6`: http://www.php-fig.org/psr/psr-6/
 .. _Packagist: https://packagist.org/packages/symfony/cache
diff --git a/components/cache/index.rst b/components/cache/index.rst
diff --git a/components/http_kernel.rst b/components/http_kernel.rst
@@ -83,9 +83,9 @@ Framework - works.
 Initially, using the :class:`Symfony\\Component\\HttpKernel\\HttpKernel`
 is really simple and involves creating an
 :doc:`event dispatcher </components/event_dispatcher>` and a
-:ref:`controller and argument resolver <component-http-kernel-resolve-controller>` (explained
-below). To complete your working kernel, you'll add more event listeners
-to the events discussed below::
+:ref:`controller and argument resolver <component-http-kernel-resolve-controller>`
+(explained below). To complete your working kernel, you'll add more event
+listeners to the events discussed below::
 
     use Symfony\Component\HttpFoundation\Request;
     use Symfony\Component\HttpKernel\HttpKernel;
diff --git a/controller.rst b/controller.rst
@@ -792,7 +792,7 @@ This returns a special ``JsonResponse`` object that encodes the data automatical
         // return $this->json($data, $status = 200, $headers = array(), $context = array());
     }
 
-If the :doc:`serializer service </cookbook/serializer>` is enabled in your
+If the :doc:`serializer service </serializer>` is enabled in your
 application, contents passed to ``json()`` are encoded with it. Otherwise,
 the :phpfunction:`json_encode` function is used.
 
diff --git a/controller/argument_value_resolver.rst b/controller/argument_value_resolver.rst
diff --git a/reference/dic_tags.rst b/reference/dic_tags.rst
@@ -362,7 +362,7 @@ controller.argument_value_resolver
 Value resolvers implement the
 :class:`Symfony\\Component\\HttpKernel\\Controller\\ArgumentValueResolverInterface`
 and are used to resolve argument values for controllers as described here:
-:doc:`/cookbook/controller/argument_value_resolver`.
+:doc:`/controller/argument_value_resolver`.
 
 data_collector
 --------------

Original file line number	Diff line number	Diff line change
@@ -792,7 +792,7 @@ This returns a special ``JsonResponse`` object that encodes the data automatical
`792`	`792`	`// return $this->json($data, $status = 200, $headers = array(), $context = array());`
`793`	`793`	`}`
`794`	`794`
`795`		-If the :doc:`serializer service </cookbook/serializer>` is enabled in your
	`795`	+If the :doc:`serializer service </serializer>` is enabled in your
`796`	`796`	application, contents passed to ``json()`` are encoded with it. Otherwise,
`797`	`797`	the :phpfunction:`json_encode` function is used.
`798`	`798`