diff --git a/components/cache.rst b/components/cache.rst index 939627b1807..4873fb7abc7 100644 --- a/components/cache.rst +++ b/components/cache.rst @@ -209,11 +209,11 @@ the cache items before storing them. The :class:`Symfony\\Component\\Cache\\Marshaller\\DefaultMarshaller` uses PHP's ``serialize()`` function by default, but you can optionally use the ``igbinary_serialize()`` -function from the `Igbinary extension`_: +function from the `Igbinary extension`_:: use Symfony\Component\Cache\Adapter\RedisAdapter; - use Symfony\Component\Cache\DefaultMarshaller; - use Symfony\Component\Cache\DeflateMarshaller; + use Symfony\Component\Cache\Marshaller\DefaultMarshaller; + use Symfony\Component\Cache\Marshaller\DeflateMarshaller; $marshaller = new DeflateMarshaller(new DefaultMarshaller()); // you can optionally use the Igbinary extension if you have it installed diff --git a/reference/configuration/framework.rst b/reference/configuration/framework.rst index 4ce41c3615d..39bf2abb31c 100644 --- a/reference/configuration/framework.rst +++ b/reference/configuration/framework.rst @@ -1261,7 +1261,7 @@ timeout **type**: ``float`` **default**: depends on your PHP config -Time, in seconds, to wait for a response. If the response takes longer, a +Time, in seconds, to wait for network activity. If the connection is idle for longer, a :class:`Symfony\\Component\\HttpClient\\Exception\\TransportException` is thrown. Its default value is the same as the value of PHP's `default_socket_timeout`_ config option.