diff --git a/components/cache/adapters/couchbasebucket_adapter.rst b/components/cache/adapters/couchbasebucket_adapter.rst index 7043a7c3e95..5c221665e62 100644 --- a/components/cache/adapters/couchbasebucket_adapter.rst +++ b/components/cache/adapters/couchbasebucket_adapter.rst @@ -1,6 +1,6 @@ .. index:: single: Cache Pool - single: Couchabase Cache + single: Couchbase Cache .. _couchbase-adapter: @@ -60,7 +60,7 @@ helper method allows creating and configuring a `Couchbase Bucket`_ class instan 'couchbase://localhost' // the DSN can include config options (pass them as a query string): // 'couchbase://localhost:11210?operationTimeout=10' - // 'couchbase://localhost:11210?operationTimeout=10&configTimout=20' + // 'couchbase://localhost:11210?operationTimeout=10&configTimeout=20' ); // pass an array of DSN strings to register multiple servers with the client diff --git a/components/serializer.rst b/components/serializer.rst index 9c8b73a04a1..c941edc98c1 100644 --- a/components/serializer.rst +++ b/components/serializer.rst @@ -996,7 +996,7 @@ Option Description D and ``$options = ['csv_headers' => ['a', 'b', 'c']]`` then ``serialize($data, 'csv', $options)`` returns ``a,b,c\n1,2,3`` ``[]``, inferred from input data's keys -``csv_escape_formulas`` Escapes fields containg formulas by prepending them ``false`` +``csv_escape_formulas`` Escapes fields containing formulas by prepending them ``false`` with a ``\t`` character ``as_collection`` Always returns results as a collection, even if only ``true`` one line is decoded. diff --git a/reference/configuration/security.rst b/reference/configuration/security.rst index c651f6cd2e3..6a812374a06 100644 --- a/reference/configuration/security.rst +++ b/reference/configuration/security.rst @@ -374,7 +374,7 @@ Using the Sodium Password Hasher ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ It uses the `Argon2 key derivation function`_. Argon2 support was introduced -in PHP 7.2 by bundeling the `libsodium`_ extension. +in PHP 7.2 by bundling the `libsodium`_ extension. The hashed passwords are ``96`` characters long, but due to the hashing requirements saved in the resulting hash this may change in the future, so make diff --git a/session.rst b/session.rst index 70e62b62263..cb62454a94e 100644 --- a/session.rst +++ b/session.rst @@ -131,7 +131,7 @@ Check out the Symfony config reference to learn more about the other available Basic Usage ----------- -The sessions is available througth the Request and the RequestStack. +The sessions is available through the Request and the RequestStack. Symfony provides a request_stack service that is injected in your services and controllers if you type-hint an argument with :class:`Symfony\\Component\\HttpFoundation\\RequestStack`::