Merge pull request #561 from dunglas/patch-1

docs: use Symfony HttpClient by default

Author: dbu

Resources/doc/overview.rst

@@ -9,16 +9,17 @@ that the FOSHttpCache_ library needs a ``psr/http-message-implementation`` and
 ``php-http/client-implementation``. If your project does not contain one,
 composer will complain that it did not find ``psr/http-message-implementation``.
 
-To install the bundle together with Guzzle, run:
+To install the bundle together with Symfony HttpClient, run:
 
 .. code-block:: bash
 
-    $ composer require friendsofsymfony/http-cache-bundle guzzlehttp/psr7 php-http/guzzle6-adapter
+    $ composer require friendsofsymfony/http-cache-bundle symfony/http-client nyholm/psr7 guzzlehttp/promises
 
-If you want to use something else than Guzzle 6, see Packagist for a list of
+If you want to use something else than Symfony HttpClient, see Packagist for a list of
 available `client implementations`_.
 
-Then add the bundle to your application:
+If you use an old version of Symfony, you
+must manually register the bundle to your application:
 
 .. code-block:: php
 
@@ -51,7 +52,7 @@ SensioFrameworkExtraBundle_:
 
     $ composer require sensio/framework-extra-bundle
 
-And include it in your project::
+And , if you don't use a recent version of Symfony, include it in your project::
 
      <?php
     // app/AppKernel.php

Resources/doc/reference/configuration/proxy-client.rst

@@ -24,7 +24,7 @@ varnish
 
 .. code-block:: yaml
 
-    # app/config/config.yml
+    # config/packages/fos_http_cache.yaml
     fos_http_cache:
         proxy_client:
             varnish:
@@ -80,7 +80,7 @@ URL may contain a path. If you access your web application on a port other than
 
 .. code-block:: yaml
 
-    # app/config/config.yml
+    # config/packages/fos_http_cache.yaml
     fos_http_cache:
         proxy_client:
             varnish:
@@ -139,7 +139,7 @@ nginx
 
 .. code-block:: yaml
 
-    # app/config/config.yml
+    # config/packages/fos_http_cache.yaml
     fos_http_cache:
         proxy_client:
             nginx:
@@ -170,7 +170,7 @@ refer to the :ref:`FOSHttpCache documentation for Symfony <foshttpcache:symfony
 
 .. code-block:: yaml
 
-    # app/config/config.yml
+    # config/packages/fos_http_cache.yaml
     fos_http_cache:
         proxy_client:
             symfony:
@@ -221,7 +221,7 @@ noop
 
 .. code-block:: yaml
 
-    # app/config/config_test.yml
+    # config/packages/test/fos_http_cache.yaml
     fos_http_cache:
         proxy_client:
             default: noop
@@ -237,7 +237,7 @@ default
 
 .. code-block:: yaml
 
-    # app/config/config.yml
+    # config/packages/fos_http_cache.yaml
     fos_http_cache:
         proxy_client:
             default: varnish