@@ -46,7 +46,7 @@ slowest storage engines, :class:`Symfony\\Component\\Cache\\Adapter\\ApcuAdapter
 ));
 
 When calling this adapter's :method:`Symfony\\Component\\Cache\\ChainAdapter::prune` method,
-the call is deligated to all its compatibe cache adapters. It is safe to mix both adapters
+the call is delegated to all its compatible cache adapters. It is safe to mix both adapters
 that *do* and do *not* implement :class:`Symfony\\Component\\Cache\\PruneableInterface`, as
 incompatible adapters are silently ignored::
 

@@ -160,18 +160,18 @@ Pruning Cache Items
 -------------------
 
 Some cache pools do not include an automated mechanism for pruning expired cache items.
-For example, the :ref:`FilesystemAdaper <component-cache-filesystem-adapter>` cache
+For example, the :ref:`FilesystemAdapter <component-cache-filesystem-adapter>` cache
 does not remove expired cache items *until an item is explicitly requested and determined to
 be expired*, for example, via a call to ``Psr\\Cache\\CacheItemPoolInterface::getItem``.
 Under certain workloads, this can cause stale cache entries to persist well past their
 expiration, resulting in a sizable consumption of wasted disk or memory space from excess,
 expired cache items.
 
-This shortcomming has been solved through the introduction of
+This shortcoming has been solved through the introduction of
 :class:`Symfony\\Component\\Cache\\PruneableInterface`, which defines the abstract method
 :method:`Symfony\\Component\\Cache\\PruneableInterface::prune`. The
 :ref:`ChainAdapter <component-cache-chain-adapter>`,
-:ref:`FilesystemAdaper <component-cache-filesystem-adapter>`,
+:ref:`FilesystemAdapter <component-cache-filesystem-adapter>`,
 :ref:`PdoAdapter <pdo-doctrine-adapter>`, and
 :ref:`PhpFilesAdapter <component-cache-files-adapter>` all implement this new interface,
 allowing manual removal of stale cache items::
@@ -185,7 +185,7 @@ allowing manual removal of stale cache items::
 The :ref:`ChainAdapter <component-cache-chain-adapter>` implementation does not directly
 contain any pruning logic itself. Instead, when calling the chain adapter's
 :method:`Symfony\\Component\\Cache\\ChainAdapter::prune` method, the call is delegated to all
-its compatibe cache adapters (and those that do not implement ``PruneableInterface`` are
+its compatible cache adapters (and those that do not implement ``PruneableInterface`` are
 silently ignored)::
 
 use Symfony\Component\Cache\Adapter\ApcuAdapter;

@@ -149,7 +149,7 @@ Listeners receive a
 .. tip::
 
 This event is also dised when an exception is thrown by the command.
-It is then dised just after the ``ConsoleEvents::EXCEPTION`` event.
+It is then dised just after the ``ConsoleEvents::ERROR`` event.
 The exit code received in this case is the exception code.
 
 .. _`reserved exit codes`: http://www.tldp.org/LDP/abs/html/exitcodes.html

@@ -166,8 +166,8 @@ the ``php.ini`` directive ``session.gc_maxlifetime``. The meaning in this contex
 that any stored session that was saved more than ``gc_maxlifetime`` ago should be
 deleted. This allows one to expire records based on idle time.
 
-However, some operating systems do their own session handling and set the
-``session.gc_probability`` variable to ``0`` to stop PHP doing garbage
+However, some operating systems (e.g. Debian) do their own session handling and set
+the ``session.gc_probability`` variable to ``0`` to stop PHP doing garbage
 collection. That's why Symfony now overwrites this value to ``1``.
 
 If you wish to use the original value set in your ``php.ini``, add the following

@@ -19,7 +19,7 @@ Using Libraries that Expect jQuery to be Global
 Some legacy JavaScript applications use programming practices that don't play
 well with the new practices promoted by Webpack. The most common of these
 problems is using code (e.g. jQuery plugins) that assume that jQuery is already
-available via the the ``$`` or ``jQuery`` global variables. If those variables
+available via the ``$`` or ``jQuery`` global variables. If those variables
 are not defined, you'll get these errors:
 
 .. code-block:: text

@@ -21,7 +21,7 @@ that's included on every page:
 
 // you can also extract CSS - this will create a 'vendor.css' file
 // this CSS will *not* be included in page1.css or page2.css anymore
-'bootstrap-sass/assets/stylesheets/_bootstrap.scss'
+'bootstrap/scss/bootstrap.scss'
 ])
 
 As soon as you make this change, you need to include two extra JavaScript files

@@ -163,7 +163,7 @@ Great! Use ``require()`` to import ``jquery`` and ``greet.js``:
 // assets/js/app.js
 
 // loads the jquery package from node_modules
-var $ = require('jquery');
+const $ = require('jquery');
 
 // import the function from greet.js (the .js extension is optional)
 // ./ (or ../) means to look for a local file

@@ -2080,8 +2080,8 @@ Full Default Configuration
 
 # cache configuration
 cache:
-app: cache.app
-system: cache.system
+app: cache.adapter.filesystem
+system: cache.adapter.system
 directory: '%kernel.cache_dir%/pools'
 default_doctrine_provider: ~
 default_psr6_provider: ~

@@ -984,15 +984,15 @@ You can also use expressions inside your templates:
 .. code-block:: html+jinja
 
 {% if is_granted(expression(
-'"ROLE_ADMIN" in roles or (user and user.isSuperAdmin())'
+'"ROLE_ADMIN" in roles or (not is_anonymous() and user.isSuperAdmin())'
 )) %}
 <a href="...">Delete</a>
 {% endif %}
 
 .. code-block:: html+php
 
 <?php if ($view['security']->isGranted(new Expression(
-'"ROLE_ADMIN" in roles or (user and user.isSuperAdmin())'
+'"ROLE_ADMIN" in roles or (not is_anonymous() and user.isSuperAdmin())'
 ))): ?>
 <a href="...">Delete</a>
 <?php endif; ?>

@@ -18,7 +18,7 @@ accepts an :class:`Symfony\\Component\\ExpressionLanguage\\Expression` object::
 public function index()
 {
 $this->denyAccessUnlessGranted(new Expression(
-'"ROLE_ADMIN" in roles or (user and user.isSuperAdmin())'
+'"ROLE_ADMIN" in roles or (not is_anonymous() and user.isSuperAdmin())'
 ));
 
 // ...

@@ -105,3 +105,9 @@ role:
 
 It is also possible to specify using HTTPS in the routing configuration,
 see :doc:`/routing/scheme` for more details.
+
+.. note::
+
+Forcing HTTPS while using a reverse proxy or load balancer requires a proper
+configuration to avoid infinite redirect loops; see :doc:`/deployment/proxies`
+for more details.

@@ -201,13 +201,13 @@ use the ``ldap`` user provider.
 provider is used. However, the LDAP component itself does not provide
 any escaping yet. Thus, it's your responsibility to prevent LDAP injection
 attacks when using the component directly.
-
+
 .. caution::
 
-The user configured above in the the user provider is only used to retrieve
+The user configured above in the user provider is only used to retrieve
 data. It's a static user defined by its username and password (for improved
 security, define the password as an environment variable).
-
+
 If your LDAP server allows to retrieve information anonymously, you can
 set the ``search_dn`` and ``search_password`` options to ``null``.
 
@@ -218,7 +218,7 @@ service
 
 **type**: ``string`` **default**: ``ldap``
 
-This is the name of your configured LDAP client. You can freely chose the
+This is the name of your configured LDAP client. You can freely choose the
 name, but it must be unique in your application and it cannot start with a
 number or contain white spaces.
 
@@ -297,7 +297,7 @@ service
 
 **type**: ``string`` **default**: ``ldap``
 
-This is the name of your configured LDAP client. You can freely chose the
+This is the name of your configured LDAP client. You can freely choose the
 name, but it must be unique in your application and it cannot start with a
 number or contain white spaces.