diff --git a/docs/.vuepress/components/Fig.vue b/docs/.vuepress/components/Fig.vue
new file mode 100644
index 000000000..bda9c729e
--- /dev/null
+++ b/docs/.vuepress/components/Fig.vue
@@ -0,0 +1,15 @@
+<template>
+    <figure>
+        <img :src="src">
+        <figcaption :html="caption"></figcaption>
+    </figure>
+</template>
+
+<script>
+export default {
+  props: {
+    src: String,
+    caption: String,
+  },
+};
+</script>
diff --git a/docs/.vuepress/components/Since.vue b/docs/.vuepress/components/Since.vue
index 4fbaa0fea..8542b6bbb 100644
--- a/docs/.vuepress/components/Since.vue
+++ b/docs/.vuepress/components/Since.vue
@@ -1,11 +1,17 @@
 <template>
+  <span :class="{ 'since': true, 'since--with-highlight': $slots.default }">
+    <mark v-if="$slots.default" class="since__highlight">
+      <slot></slot>
+    </mark>
+
     <a
-      class="since" 
+      class="since__label" 
       :href="releaseUrl"
       :title="parsedDescription"
       target="_blank">
-        {{ ver }}<span class="plus">+</span>
-      </a>
+      {{ ver }}<span class="plus">+</span>
+    </a>
+  </span>
 </template>
 
 <script>
@@ -58,16 +64,59 @@ export default {
 
 <style lang="postcss" scoped>
 .since {
+  &--with-highlight {}
+}
+
+.since__label {
   @apply inline-block rounded-md py-1 px-1;
   background-color: var(--custom-block-bg-color);
-  border-color: var(--custom-block-border-color);
+  border-color: var(--border-color);
   font-size: 13px;
   vertical-align: super;
   line-height: 12px;
+  text-decoration: none !important;
 
   &:hover {
     background-color: var(--code-bg-color);
-    text-decoration: none;
   }
+
+  .since--with-highlight & {}
+}
+
+.since__highlight {
+    text-decoration: underline;
+    text-decoration-style: dotted;
+    text-decoration-thickness: 1px;
+    text-underline-offset: 2px;
+    color: currentColor;
+    background-color: transparent;
+
+    /*
+    &::before,
+    &::after {
+      display: inline-block;
+      height: 1.3em;
+      width: 4px;
+      border-width: 1px 0;
+      border-radius: 3px;
+      border-color: currentColor;
+      opacity: 0.25;
+      position: relative;
+      bottom: -0.3em;
+      vertical-align: baseline;
+    }
+
+    &::before {
+      content: '';
+      border-left-width: 1px;
+      margin-right: 0.15em;
+    }
+
+    &::after {
+      content: '';
+      border-right-width: 1px;
+      margin-left: 0.15em;
+    }
+    */
 }
 </style>
diff --git a/docs/.vuepress/theme/styles/base.pcss b/docs/.vuepress/theme/styles/base.pcss
index 502e85b04..f75eb6d74 100644
--- a/docs/.vuepress/theme/styles/base.pcss
+++ b/docs/.vuepress/theme/styles/base.pcss
@@ -1,6 +1,7 @@
 :root {
   --text-color: theme("colors.slate");
   --text-color-muted: #6D7480;
+  --text-color-inverted: theme("colors.white");
   --ui-component-color: #8491A4;
   --bg-color: theme("colors.white");
   --sidebar-bg-color: theme("colors.softer");
diff --git a/docs/.vuepress/theme/styles/color-mode.pcss b/docs/.vuepress/theme/styles/color-mode.pcss
index ba34d37d5..fc379ec67 100644
--- a/docs/.vuepress/theme/styles/color-mode.pcss
+++ b/docs/.vuepress/theme/styles/color-mode.pcss
@@ -9,6 +9,7 @@
   html:not([class]) {
     --text-color: theme("colors.white");
     --text-color-muted: #818EA2;
+    --text-color-inverted: theme("colors.slate");
     --ui-component-color: theme("colors.gray.600");
     --bg-color: theme("colors.gray.900");
     --sidebar-bg-color: rgba(0, 0, 0, 0.1);
diff --git a/docs/5.x/configure.md b/docs/5.x/configure.md
index 1b2f3f8df..43a30f6d9 100644
--- a/docs/5.x/configure.md
+++ b/docs/5.x/configure.md
@@ -55,7 +55,7 @@ CRAFT_ENVIRONMENT=dev
 # ...and comments!
 ```
 
-These values can be referenced in your config files by calling [App::env()](craft5:craft\helpers\App::env()), or using them directly in a [control panel setting](#control-panel-settings). Use of PHP’s `getenv()` directly is discouraged, due to [issues with thread-safety](https://github.com/craftcms/cms/issues/3631). The equivalent [`getenv()` Twig function](reference/twig/functions.md#getenv) uses `App::env()`, and is therefore fine to use in templates.
+These values can be referenced in your config files by calling [App::env()](craft5:craft\helpers\App::env()), or using them directly in a [control panel setting](#control-panel-settings). Use of PHP’s `getenv()` directly is discouraged, due to [issues with thread-safety](https://github.com/craftcms/cms/issues/3631). The [`getenv()` Twig function](reference/twig/functions.md#getenv) is a wrapper around our custom `App::env()` method, and therefore fine to use in templates.
 
 Craft doesn’t require your variables to follow any kind of naming convention, but it will automatically discover [some specific environment variables](#environment-overrides) for general and database settings.
 
@@ -65,6 +65,13 @@ For most installations, the `.env` file is the only place where secrets should b
 Some platforms (especially those with ephemeral filesystems, like [Craft Cloud](https://craftcms.com/cloud)) provide a GUI for managing environment variables in lieu of using a `.env` file, and will automatically inject them when the server or process starts. `App::env()` is still the recommended method for retrieving environment variables set in this way.
 :::
 
+Once Craft has fully initialized and the current [site](system/sites.md) is known, it adds two additional environment variables: <Since ver="5.9.0" feature="$CRAFT_SITE and $CRAFT_SITE_UPPER variables" />
+
+| Variable Name | Value |
+| --- | --- |
+| `CRAFT_SITE` | The current site’s handle. |
+| `CRAFT_SITE_UPPER` | The current site’s handle, converted to `SCREAMING_SNAKE_CASE`. |
+
 #### Nested Variables
 
 In your `.env` file, one variable can reference another:
@@ -75,7 +82,7 @@ PRIMARY_SITE_URL="https://${BASE_HOSTNAME}"
 GLOBAL_SITE_URL="https://global.${BASE_HOSTNAME}"
 ```
 
-Depending on your infrastructure, this may also be possible at other points in process of loading environment variables. The example above works thanks to `vlucas/phpdotenv`; Docker (and therefore DDEV) share this general syntax, but not all variables are available at each step as the container boots up—so interpolation is best left until this last stage. Earlier layers may allow interpolation to be escaped so that it is only evaluated by a later one:
+Depending on your infrastructure, this may also be possible at other points in process of loading environment variables. The example above works [thanks to `vlucas/phpdotenv`](https://github.com/vlucas/phpdotenv?tab=readme-ov-file#nesting-variables), the default `.env` file loader; Docker (and therefore DDEV) share this general syntax, but not all variables are available at each step as the container boots up—so interpolation is best left until this last stage. Earlier layers may allow interpolation to be escaped so that it is only evaluated by a later one:
 
 ```bash
 # Here, we escape the beginning interpolation token with a backslash (\):
@@ -88,6 +95,8 @@ Craft does not know or indicate when substitutions have occurred—it only sees
 Variables with substitutions will only be written back into the environment when using one of the [mutable loaders](https://github.com/vlucas/phpdotenv?tab=readme-ov-file#immutability-and-repository-customization).
 :::
 
+[Control panel settings](#control-panel-settings) can also use interpolation.
+
 ### Entry Script
 
 Craft will also respond to a handful of [specific environment variables or PHP constants](#bootstrap-config), as long as they are set prior to bootstrapping the application in your entry script. The [starter project](repo:craftcms/craft) shares a `bootstrap.php` file between `web/index.php` and the `craft` executable to consolidate the definition of constants.
@@ -423,6 +432,14 @@ You may combine aliases and environment variables with additional path segments,
 Plugins can add support for environment variables and aliases in their settings as well. See [Environmental Settings](extend/environmental-settings.md) to learn how.
 :::
 
+#### Interpolation <Since ver="5.9.0" feature="Nested interpolation of environment variables" />
+
+Environment variables can be used _anywhere_ in a string that is ultimately passed to <craft5:craft\helpers\App::env()> or <craft5:craft\helpers\App::parseEnv()>.
+For example, you could parameterize the subdomain portion of a group of [sites](system/sites.md) **Base URL** as `https://$SUBDOMAIN_CORPORATE.$DOMAIN_BASE/en` or `https://$SUBDOMAIN_B2B.$DOMAIN_BASE/en`.
+
+An additional syntax (similar to platform-dependent [nested variables](#nested-variables)) brings dynamic resolution to settings stored in project config—but instead of concatenating values, Craft evaluates references inside `${...}` as part of building the variable name itself.
+Combined with the special [`CRAFT_SITE_UPPER` variables](#env), you can make settings like **System Email Address** more reactive: `$MAILER_FROM_${CRAFT_SITE_UPPER}` would first flatten `${CRAFT_SITE_UPPER}` to something like `ACME_CORPORATE`, then look for the environment variable `MAILER_FROM_ACME_CORPORATE`. A request to a different site might end up trying to resolve the variable `MAILER_FROM_ACME_LABS` or `MAILER_FROM_ACME_B2B`.
+
 ### Templates and Modules
 
 #### Accessing Config Values
diff --git a/docs/5.x/development/element-queries.md b/docs/5.x/development/element-queries.md
index 399e55074..6433f39a1 100644
--- a/docs/5.x/development/element-queries.md
+++ b/docs/5.x/development/element-queries.md
@@ -174,6 +174,8 @@ To make a query case-_insensitive_, pass an object with the special `caseInsensi
 
 [Dropdown](../reference/field-types/dropdown.md), [Radio](../reference/field-types/radio.md), [Checkboxes](../reference/field-types/checkboxes.md), and other fields whose only allowable values are determined by the field’s configuration are _always_ handled in a case-sensitive way.
 
+Textual condition rules in [custom sources](system/elements.md#sources) and [field layouts](system/fields.md#conditions) are always handled case-insensitively. <Since ver="5.9.0" description="Condition rules were made case-insensitive in {product} {ver}" />
+
 ### Reusing Queries
 
 Sometimes, you might want to run a number of similar queries. Take this case, where we want to show some information about upcoming events at a library:
diff --git a/docs/5.x/development/image-transforms.md b/docs/5.x/development/image-transforms.md
index ce22c2003..5e6b450cc 100644
--- a/docs/5.x/development/image-transforms.md
+++ b/docs/5.x/development/image-transforms.md
@@ -1,14 +1,14 @@
 # Image Transforms
 
-Instead of requiring content editors to upload images at a specific sizes, Craft lets you define “image transforms” for automatically manipulating images in predefined ways, or on-demand. Transforms are _non-destructive_, meaning they have no effect on the original uploaded image.
+Instead of requiring content editors to upload images at a specific sizes, Craft lets you define “image transforms” to automatically manipulate images in predefined ways, or on-demand. Transforms are _non-destructive_, meaning they have no effect on the original uploaded image.
 
 <!-- more -->
 
-Transforms can be defined in the control panel or directly from your templates and GraphQL queries.
+Transforms can be defined in the control panel as [named transforms](#named-transforms) or [directly from your templates](#defining-transforms-in-your-templates) and GraphQL queries.
 
 ## Named Transforms
 
-Named transforms are created from the [control panel](../system/control-panel.md) by navigating to **Settings** → **Assets** → **Image Transforms** and press **New Transform**.
+Named transforms are created from the [control panel](../system/control-panel.md) by navigating to <Journey path="Settings, Assets, Image Transforms" /> and press **+ New image transform**.
 
 <BrowserShot
     url="https://my-craft-project.ddev.site/admin/settings/assets/transforms/new"
@@ -16,7 +16,7 @@ Named transforms are created from the [control panel](../system/control-panel.md
     caption="Creating a new predefined asset transform in the control panel."
     id="settings"
     :maxHeight="600">
-<img src="../images/assets-transforms.png" alt="Asset transform edit screen">
+<img src="../images/asset-transform-config.png" alt="Asset transform edit screen">
 </BrowserShot>
 
 <Todo notes="Add POI/waypoints to this screen" />
diff --git a/docs/5.x/extend/cp-section.md b/docs/5.x/extend/cp-section.md
index f19e080c6..1ca779b04 100644
--- a/docs/5.x/extend/cp-section.md
+++ b/docs/5.x/extend/cp-section.md
@@ -1,6 +1,7 @@
 # Control Panel Sections
 
-Modules and plugins can add new sections to the control panel using the [EVENT_REGISTER_CP_NAV_ITEMS](craft5:craft\web\twig\variables\Cp::EVENT_REGISTER_CP_NAV_ITEMS) event:
+Modules and plugins can add new sections to the control panel using the [EVENT_REGISTER_CP_NAV_ITEMS](craft5:craft\web\twig\variables\Cp::EVENT_REGISTER_CP_NAV_ITEMS) event.
+Plugins also have a special [`getCpNavItem()` method](#control-panel-sections).
 
 ```php
 use craft\events\RegisterCpNavItemsEvent;
@@ -16,8 +17,8 @@ public function init()
         Cp::EVENT_REGISTER_CP_NAV_ITEMS,
         function(RegisterCpNavItemsEvent $event) {
             $event->navItems[] = [
-                'url' => 'section-url',
-                'label' => 'Section Label',
+                'label' => 'Plugin Zone',
+                'url' => 'myplugin-zone',
                 'icon' => '@mynamespace/path/to/icon.svg',
             ];
         }
@@ -31,33 +32,55 @@ Each item within the [navItems](craft5:craft\events\RegisterCpNavItemsEvent::$na
 
 - `url` – The URL that the nav item should link to. (It will be run through <craft5:craft\helpers\UrlHelper::cpUrl()>.)
 - `label` – The user-facing nav item label.
-- `icon` – The path to the icon SVG that should be used. (It can begin with an alias.)
-- `badgeCount` _(optional)_ – The badge count that should be displayed in the nav item.
-- `subnav` _(optional)_ – An array of subnav items that should be visible when your section is accessed. (See [Subnavs](#subnavs).)
+- `icon` _(optional)_ – The path to the icon SVG that should be used. (It can begin with an alias.)
+- `fontIcon` _(optional)_ – A character/ligature from Craft’s font icon set.
+- `badgeCount` _(optional)_ – The [badge count](#badges) that should be displayed in the nav item.
+- `subnav` _(optional)_ – An array of additional, nested items that should be visible when your section is accessed, or when a user expands the primary item. (See [Subnavs](#subnavs), below.)
 
-
-For Craft to properly designate an item as “active,” its `url` must be registered with a relative path to the plugin or module’s control panel section. Any `subnav` paths should begin with `url` in order to appear selected when active.
+For Craft to properly designate an item as “active,” its `url` must be registered with a _path_ to the plugin or module’s control panel section.
+This holds true for `subnav` URLs, as well—their `url` must begin with the parent item’s `url` to appear selected.
 
 ## Subnavs
 
-If your section has a sub-navigation, each subnav item within your `subnav` array should be represented by a sub-array with `url` and `label` keys:
+If your section has a sub-navigation, each subnav item within your `subnav` array should be represented by a sub-array with mandatory `url` and `label` keys, and optional `badgeCount`, <Since ver="5.9.0" feature="Icons for nested navigation items in the control panel">`icon`, and `fontIcon`</Since> keys:
 
 ```php
-'subnav' => [
-    'foo' => ['label' => 'Foo', 'url' => 'section-url/foo'],
-    'bar' => ['label' => 'Bar', 'url' => 'section-url/bar'],
+$event->navItems[] = [
+    // ...
 
-    // Display a subnav badge count by adding the optional `badgeCount` key:
-    'baz' => ['label' => 'Baz', 'url' => 'section-url/baz', 'badgeCount' => 5],
-],
+    'subnav' => [
+        'attractions' => [
+            'label' => 'Attractions',
+            'url' => 'plugin-zone/attractions',
+            'icon' => 'pegasus',
+        ],
+        'reservations' => [
+            'label' => 'Reservations',
+            'url' => 'plugin-zone/reservations',
+            'icon' => 'calendar-star',
+        ],
+        // Display a subnav badge count by adding the optional `badgeCount` key:
+        'policies' => [
+            'label' => 'Policies',
+            'url' => 'plugin-zone/policies'
+            'badgeCount' => 3,
+        ],
+    ],
+];
 ```
 
-Your templates can specify which subnav item should be selected by setting a `selectedSubnavItem` variable to the key of the nav item:
+Your templates can specify which subnav item should be selected by setting `selectedSubnavItem` to the key of a nav item:
 
 ```twig
 {% set selectedSubnavItem = 'bar' %}
 ```
 
+## Badges
+
+Navigation items’ `badgeCount`s are intended to be calculated dynamically.
+If this involves costly queries or other blocking operations (like a request to a remote API), consider caching the value.
+More guidance on how to use badges can be found in the [Utilities](utilities.md) section.
+
 ## Plugin Sections
 
 Plugins that only need to add one section can set the `$hasCpSection` property on their primary plugin class, rather than using the [EVENT_REGISTER_CP_NAV_ITEMS](craft5:craft\web\twig\variables\Cp::EVENT_REGISTER_CP_NAV_ITEMS) event:
@@ -79,31 +102,34 @@ class Plugin extends \craft\base\Plugin
 You can alternatively set a `hasCpSection` value in `composer.json` as noted in the [plugin guide](plugin-guide.md#composer-json). We don’t recommend setting it in both places, however, since the value set in `composer.json` will override your public class property’s value and likely create confusion.
 :::
 
-You can modify aspects of the plugin’s control panel nav item by overriding its [getCpNavItem()](craft5:craft\base\PluginInterface::getCpNavItem()) method:
+Craft automatically adds a new [user permission](user-permissions.md) for your plugin, and only shows a nav item to users who can access it.
+
+Modify aspects of your plugin’s control panel nav item by overriding its [getCpNavItem()](craft5:craft\base\PluginInterface::getCpNavItem()) method:
 
 ```php
 public function getCpNavItem(): ?array
 {
+    // Get the base definition (including `label`, `url`, and `icon`)...
     $item = parent::getCpNavItem();
+
+    // ...customize...
     $item['badgeCount'] = 5;
     $item['subnav'] = [
-        'foo' => ['label' => 'Foo', 'url' => 'plugin-handle/foo'],
-        'bar' => ['label' => 'Bar', 'url' => 'plugin-handle/bar'],
-        'baz' => ['label' => 'Baz', 'url' => 'plugin-handle/baz'],
+        // ...
     ];
+
+    // ...and return:
     return $item;
 }
 ```
 
-If you do this, Craft will automatically add a new [user permission](user-permissions.md) for your plugin, and only show the nav item for users that have it.
-
-Clicking on a plugin’s section will take the user to `/admin/plugin-handle`, which will attempt to load an `index.html` or `index.twig` template within the plugin’s [template root](template-roots.md) (its `templates/` folder within its base source folder).
+Clicking on a plugin’s nav item will take the user to `/{cpTrigger}/plugin-handle`, which will attempt to load an `index.html` or `index.twig` template within the plugin’s [template root](template-roots.md) (its `templates/` folder within its base source folder).
 
 ::: tip
 See [Control Panel Templates](cp-templates.md) for more information about developing control panel templates.
 :::
 
-Alternatively, you can route `/admin/plugin-handle` requests to a controller action (or a different template) by registering a control panel route from your plugin’s `init()` method:
+Alternatively, you can route those requests to a controller action (or a different template) by registering a control panel route from your plugin’s `init()` method:
 
 ```php
 use craft\events\RegisterUrlRulesEvent;
@@ -123,3 +149,9 @@ public function init()
 ```
 
 These rules use the same format as those [defined in `routes.php`](../system/routing.md#advanced-routing-with-url-rules). Find additional examples of control panel and site routes in the routing section of the [controllers](controllers.md#routing) documentation.
+
+::: tip
+Craft automatically prepends your pattern with the <config5:cpTrigger>.
+Including it (or hard-coding it to the default `admin`) may make your routes unreachable.
+:::
+
diff --git a/docs/5.x/images/asset-transform-config.png b/docs/5.x/images/asset-transform-config.png
new file mode 100644
index 000000000..952a71a72
Binary files /dev/null and b/docs/5.x/images/asset-transform-config.png differ
diff --git a/docs/5.x/images/assets-transforms.png b/docs/5.x/images/assets-transforms.png
deleted file mode 100644
index 045b20566..000000000
Binary files a/docs/5.x/images/assets-transforms.png and /dev/null differ
diff --git a/docs/5.x/images/drafts-revisions-menu.png b/docs/5.x/images/drafts-revisions-menu.png
index 86dffb256..94040ee2c 100644
Binary files a/docs/5.x/images/drafts-revisions-menu.png and b/docs/5.x/images/drafts-revisions-menu.png differ
diff --git a/docs/5.x/images/entries-customize-sources.png b/docs/5.x/images/entries-customize-sources.png
new file mode 100644
index 000000000..7015aa7eb
Binary files /dev/null and b/docs/5.x/images/entries-customize-sources.png differ
diff --git a/docs/5.x/images/entry-type-edit.png b/docs/5.x/images/entry-type-edit.png
index a522552d1..8629b8844 100644
Binary files a/docs/5.x/images/entry-type-edit.png and b/docs/5.x/images/entry-type-edit.png differ
diff --git a/docs/5.x/images/fields-assets-settings.png b/docs/5.x/images/fields-assets-settings.png
new file mode 100644
index 000000000..1e9daa9b6
Binary files /dev/null and b/docs/5.x/images/fields-assets-settings.png differ
diff --git a/docs/5.x/images/fields-lightswitch-settings.png b/docs/5.x/images/fields-lightswitch-settings.png
new file mode 100644
index 000000000..27f691c33
Binary files /dev/null and b/docs/5.x/images/fields-lightswitch-settings.png differ
diff --git a/docs/5.x/images/fields-matrix-settings.png b/docs/5.x/images/fields-matrix-settings.png
index ae33f0932..a9ac6e40b 100644
Binary files a/docs/5.x/images/fields-matrix-settings.png and b/docs/5.x/images/fields-matrix-settings.png differ
diff --git a/docs/5.x/images/route-with-wildcard-token.png b/docs/5.x/images/route-with-wildcard-token.png
deleted file mode 100644
index 91ab7c29a..000000000
Binary files a/docs/5.x/images/route-with-wildcard-token.png and /dev/null differ
diff --git a/docs/5.x/images/routing-creating-new-route.png b/docs/5.x/images/routing-creating-new-route.png
index e94465fbd..0142fbdc1 100644
Binary files a/docs/5.x/images/routing-creating-new-route.png and b/docs/5.x/images/routing-creating-new-route.png differ
diff --git a/docs/5.x/reference/element-types/README.md b/docs/5.x/reference/element-types/README.md
index df3c2ce04..aff28835e 100644
--- a/docs/5.x/reference/element-types/README.md
+++ b/docs/5.x/reference/element-types/README.md
@@ -22,8 +22,11 @@ Use the sidebar to find information about a specific element type, or learn abou
 
 <See path="users.md" />
 
+Craft has one additional element type used exclusively by the [content block](../field-types/content-block.md) field.
+
 <hr>
 
 ::: tip
-Looking for [Matrix](../field-types/matrix.md) blocks? They were converted to [entries](entries.md#nested-entries) during the [upgrade](../../upgrade.md) to Craft 5!
+Looking for [Matrix](../field-types/matrix.md) blocks?
+They were converted to [entries](entries.md#nested-entries) during the [upgrade](../../upgrade.md) to Craft 5!
 :::
diff --git a/docs/5.x/reference/element-types/addresses.md b/docs/5.x/reference/element-types/addresses.md
index b605467b0..5a325025c 100644
--- a/docs/5.x/reference/element-types/addresses.md
+++ b/docs/5.x/reference/element-types/addresses.md
@@ -26,7 +26,7 @@ Plugins are also able to use addresses to store their own location data.
 
 ## Setup
 
-Address elements share a single field layout, which is managed in the control panel via <Journey path="Settings, Addresses" />.
+All address elements share a single field layout, which is managed in the control panel via <Journey path="Settings, Addresses" />.
 
 <BrowserShot url="https://my-project.ddev.site/admin/settings/addresses" :link="false">
 <img src="../../images/address-field-layout.png" alt="Screenshot of the address element field layout" />
@@ -34,13 +34,28 @@ Address elements share a single field layout, which is managed in the control pa
 
 ### Native and Custom Fields
 
-The address field layout has additional native (but optional) fields for a handful of useful attributes. Addresses—just like other element types—support custom fields for anything else you might need to store.
+The address field layout has additional native (but optional) fields for a handful of useful attributes:
 
-For compatibility and localization, core address components (aside from the Country Code) can’t be separated from one another in the field layout.
+- **Label** — An <Since ver="5.9.0" description="The label field on addresses can be made optional as of {product} {ver}">optional</Since> description of the address.
+- **Organization** — A text field for entering a business or entity name.
+- **Organization Tax ID** — Designed to hold an identifier for the legal entity represented by the address. Used by [Commerce](/commerce/5.x/) to aide in tax calculations.
+- **Full Name** — Associate the address with a name. As with [users](users.md), a single input is displayed, unless <config5:showFirstAndLastNameFields> is enabled.
+- **Latitude/Longitude** — A pair of inputs for latitude and longitude values. Craft does not use these, internally.
+
+Addresses—just like other element types—support [custom fields](../../system/fields.md) for anything else you might need to store.
+
+::: tip
+For compatibility and localization, core address components (aside from the **Country Code**) can’t be separated from one another in the field layout.
+The relevant fields for the given country are rendered wherever the **Address** field layout element is placed.
+:::
 
 ### Config Options
 
-You may set a default country for new addresses via the <config5:defaultCountryCode> setting.
+These settings affect authors’ (and front-end users’) experience with address elements:
+
+- **<config5:defaultCountryCode>** — Choose a default country for new addresses.
+- **<config5:showFirstAndLastNameFields>** — Determines whether the **Full Name** field is a single input, or split into **First Name** and **Last Name** inputs. Names are always stored as a single value, and split back out into first and last, as necessary.
+- **<config5:extraLastNamePrefixes>**, **<config5:extraNameSuffixes>**, and **<config5:extraNameSalutations>**,  — Additional ways to customize the built-in name parser.
 
 ### Copying Addresses <Since ver="5.7.0" feature="Copying addresses" />
 
diff --git a/docs/5.x/reference/element-types/entries.md b/docs/5.x/reference/element-types/entries.md
index 5929f5a06..3dd8df2cc 100644
--- a/docs/5.x/reference/element-types/entries.md
+++ b/docs/5.x/reference/element-types/entries.md
@@ -45,6 +45,7 @@ Entry types have the following settings:
 - **Handle** — Uniquely identifies entries of this type in [templates](../../development/templates.md) and [queries](../../development/element-queries.md).
 - **Description** <Since ver="5.8.0" feature="Entry type descriptions" /> — A short explanation of what the entry type is used for. This is displayed in a tooltip when the entry type is selected elsewhere in the control panel.
 - **Icon** and **Color** — Choose a symbol and color to subtly distinguish entries of this type throughout the control panel.
+- **UI Label Format** <Since ver="5.9.0" feature="Entry type UI label formats" /> — Customize this entry type’s labels (used primarily on [element chips and cards](../../system/elements.md#chips--cards)). Use this to more accurately describe entries in the control panel, without also affecting titles.
 - **Title Translation Method** — In multi-site projects, choose how titles are localized.
 - **Default Title Format** — Entry titles can be set by the author or [dynamically defined](#dynamic-entry-titles) from other values via an [object template](../../system/object-templates.md).
 - **Show the Slug field** — As with titles, slugs can be manually or automatically generated.
@@ -122,6 +123,8 @@ If you want your entries’ titles to _always_ be generated from a template (and
 Prior to Craft 5.5.0, this behavior was governed by two settings (**Show the Title field** and **Show the Title field?**), with no intermediate “default” option.
 :::
 
+You also have control over the labels used to identify your entries in [chips and cards](../../system/elements.md#chips-cards), with the **UI Label Format** setting. <Since ver="5.9.0" feature="Entry type UI label formats" />
+
 ### Translation Settings
 
 Most localization behavior is determined by [section](#sections) and [field](../../system/fields.md) settings, but the translation of titles and slugs is governed by entry types.
@@ -214,10 +217,6 @@ Structures can also make use of the **Maintain Hierarchy** setting on [entries f
 Entries belonging to a structure are discrete from [nested entries](#nested-entries) in [Matrix](../field-types/matrix.md) fields. Structure entries can be freely moved around in their hierarchy (receiving new “parent” elements in the process), whereas nested entries are always owned by the element they were created within.
 :::
 
-#### Custom Sources
-
-You can supplement the automatic [sources](../../system/elements.md#sources) presented in the entries [element index](../../system/elements.md#indexes) with _custom sources_. Each custom source lists all entries by default, but can be filtered to only those that meet the specified **Entry Criteria**.
-
 ### Entry URI Formats
 
 Channel and structure sections can choose whether their entries should be given URLs in the system by filling in the **Entry URI Format** setting. Singles also have this setting, but it is typically a static path or omitted (if it doesn’t need its own URL, like a [global set](globals.md)).
@@ -369,11 +368,42 @@ Entries in [channel](#channels) and [structure](#structures) sections can be mov
 When moving an entry, it’s important to note these behaviors:
 
 - If the new section is a structure, the entry will be placed at the root, according to its **Default Entry Placement** setting.
-- Drafts and revisions will be moved along with the entry and remain accessible, but only drafts that use an entry type that is allowed in the new section can be restored—same as if an entry type were _removed_ from a section.
+- [Drafts and revisions](../../system/drafts-revisions.md) will be moved along with the entry and remain accessible, but only drafts that use an entry type that is allowed in the new section can be restored—same as if an entry type were _removed_ from a section.
 - If the new section has a lower **Max authors** setting, author data will remain intact and produce a validation error when saved.
 - Authors who don’t have access to the new section will also be removed, the next time the entry is saved. Permissions are still checked based on the section, not authorship.
 - Singles will never appear as targets for moving an entry.
 
+::: tip
+You can also [copy and paste](#copying-entries) entries between compatible sections and [Matrix](../field-types/matrix.md) fields.
+:::
+
+## Sources
+
+You can supplement the automatic [sources](../../system/elements.md#sources) presented in the entries [element index](../../system/elements.md#indexes) with custom _pages_ <Since ver="5.9.0" feature="Customizing top-level entry source groups" /> and _sources_.
+
+![The source customization modal, introduced in Craft 5.9.0](../../images/entries-customize-sources.png)
+
+### Pages <Since ver="5.9.0" feature="Customizing top-level entry source groups" />
+
+By default, all sources are created inside a single **Entries** page.
+You may divide those sources into as many pages as necessary, each with their own label and icon.
+Each page is then given a top-level navigation menu item.
+
+Sources can be moved from one page to another by dragging-and-dropping, or using the action menu and selecting one of the **Move to …** options.
+
+### Custom Sources
+
+In addition to the sources created for each section, you can define any number of additional _custom sources_.
+Custom sources list all non-nested entries by default, but can define **Entry Criteria** to hone the index, and set **Default Table Columns** that make sense for the content.
+Control panel users can add temporary tweaks using [filters and columns](../../system/elements.md#filters-and-columns) controls on each index.
+Conditions provided this way are _additive_, meaning the base criteria cannot be relaxed.
+
+::: warning
+All users are able to access custom sources, but Craft still enforces section-based permissions for viewing and editing.
+:::
+
+Built-in sources are differentiated by the presence of a handle, derived from its [section](#sections) (save for the special **All entries** source).
+
 ## Nested Entries
 
 Entries also power the [Matrix](../field-types/matrix.md) and [CKEditor](plugin:ckeditor) fields, which means your [entry types](#entry-types) can represent entire pages, or the building blocks thereof. How you implement your content model and authoring experience is entirely up to you!
diff --git a/docs/5.x/reference/field-types/addresses.md b/docs/5.x/reference/field-types/addresses.md
index 322d0c8a2..9c8114b10 100644
--- a/docs/5.x/reference/field-types/addresses.md
+++ b/docs/5.x/reference/field-types/addresses.md
@@ -20,15 +20,18 @@ Addresses can be [copied](../../system/elements.md#copying-elements) between fie
 
 ## Settings
 
-Address fields can be displayed to editors as [cards](../../system/elements.md#chips-cards) or in a full [element index](../../system/elements.md#indexes). Either way, individual addresses are always displayed as cards.
+Address fields can be displayed to editors as [cards](../../system/elements.md#chips-cards) or in a full [element index](../../system/elements.md#indexes).
+Either way, individual addresses are always displayed as cards.
 
-You can also choose a minimum and maximum number of addresses that can be added to the field for the owner element to validate.
+You can also use the **Min Addresses** and **Max Addresses** settings to control how many addresses must (or _can_) be added to the field for the owner to validate.
+
+All addresses in the system use [a single field layout](../element-types/addresses.md#setup), managed via <Journey path="Settings, Addresses" />.
 
 ## Development
 
-Like Matrix and [relational fields](../../system/relations.md#fields), address field data is provided as an [element query](../../development/element-queries.md) or [element collection](../../development/collections.md#element-collections).
+Like Matrix and [relational fields](../../system/relations.md#fields), address field data is returned as an [element query](../../development/element-queries.md) (or an [element collection](../../development/collections.md#element-collections), when [eager-loaded](../../development/eager-loading.md)).
 
-Typically, you will access addresses attached to an element via the field’s handle followed by a query execution method like `.all()`:
+Typically, you will access addresses attached to an element via the field’s handle, followed by a query execution method like `.all()`:
 
 ```twig
 {% set addresses = entry.contacts.all() %}
@@ -54,6 +57,7 @@ query StationsQuery {
     title
     id
     ... on station_Entry {
+      # Our addresses field:
       location {
         addressLine1
         addressLine2
@@ -79,7 +83,8 @@ query StationsQuery {
 }
 ```
 
-Not all properties will contain data, due to differences in international storage and formatting. [Address formatters](../element-types/addresses.md#address-formatter) are not available via GraphQL, so you are responsible for handling variations in the returned data.
+Not all properties will contain data, due to differences in international storage and formatting.
+[Address formatters](../element-types/addresses.md#address-formatter) are not available via GraphQL, so you are responsible for handling variations in the returned data.
 
 With the admin-only **Full Schema**, you may directly query for one or more addresses using the `address()` and `addresses()` queries:
 
diff --git a/docs/5.x/reference/field-types/assets.md b/docs/5.x/reference/field-types/assets.md
index e6261f242..2c1d547a9 100644
--- a/docs/5.x/reference/field-types/assets.md
+++ b/docs/5.x/reference/field-types/assets.md
@@ -16,36 +16,61 @@ Assets fields allow you to upload and relate [assets](../element-types/assets.md
 
 ## Settings
 
-Assets fields have the following settings:
+<BrowserShot
+  url="https://my-craft-project.ddev.site/admin/settings/fields/new"
+  :link="false"
+  :max-height="500"
+  caption="Adding a new assets field via the control panel.">
+<img src="../../images/fields-assets-settings.png" alt="Assets field settings screen in the Craft control panel">
+</BrowserShot>
 
-- **Restrict uploads to a single folder?** – Whether file uploads/relations should be constrained to a single folder.
+Assets fields have the following novel settings:
 
-  If enabled, the following setting will be visible:
+- **Restrict assets to a single location?** – Force files to be uploaded to (and selected from) a single folder.
+
+  If _enabled_, the following setting will be visible:
 
   - **Asset Location** – A specific volume and folder from which assets can be selected (and into which assets uploaded directly to the field are saved). The path portion of this setting is evaluated as an [object template](../../system/object-templates.md).
 
-  If disabled, the following settings will be visible:
+  If _disabled_, the following settings will be visible:
 
   - **Sources** – Which asset volumes (or other asset index [sources](../../system/elements.md#sources)) the field should be able to relate assets from.
   - **Default Upload Location** – The default volume and path that files are stored in when uploaded directly to the field. This setting is evaluated as an [object template](../../system/object-templates.md).
 
-- **Restrict allowed file types?** Whether the field should only be able to upload/relate files of a certain type(s).
-- **Limit** – The maximum number of assets that can be related with the field at once. (Default is no limit.)
-- **View Mode** – How the field should appear for authors.
+- **Selectable Assets Condition** — Provide additional constraints on the assets that can be selected.
+- **Show unpermitted volumes** — Allow authors to select assets from volumes they aren’t otherwise [allowed to view or modify](../../system/user-management.md#permissions).
+- **Show unpermitted files** — Allow authors to select assets that otherwise would’t be viewable (per their **View files uploaded by other users** permission).
+- **Restrict allowed file types?** — Whether the field should only be able to upload/relate files of a certain type(s).
+  ::: tip
+  You can add novel file “types” with the <config5:extraFileKinds> setting.
+  Craft always respects the <config5:allowedFileExtensions> and <config5:extraAllowedFileExtensions> setting for new uploads.
+
+  If you want to require a single, specific extension (rather than a general “type”), add a **Filename** condition to the **Selectable Assets Condition**, and set it to **ends with** `.jpeg`.
+  :::
+- **Allow uploading directly to the field** — When enabled, authors can drag-and-drop files onto the field to upload and attach them in a single step. Review the **Default Upload Location** setting to make sure these assets are organized.
+
+### Base Relation Field Settings
+
+These settings are part of every relational field:
+
+- **Min Relations** – The _minimum_ number of assets that must be related to pass validation.
+- **Max Relations** – The _maximum_ number of assets that can be related to pass validation.
+- **Default Asset Placement** — Choose whether newly-attached assets are _prepended_ or _appended_ to the existing selection.
+- **View Mode** — How the related assets are displayed to authors (_List_, _Cards_, <Since ver="5.9.0" feature="The inline list and card grid view modes for relational fields">_Card grid_, or _Inline list_</Since>).
 - **“Add” Button Label** – The label that should be used on the field’s selection button.
 - **Validate related assets** — Whether or not validation errors on the related assets will be bubbled up.
 - **Preview Mode** — How this field’s values are displayed when included on element indexes.
 
-### Multi-Site Settings
+Within the **Advanced** toggle, two additional options are available:
 
-On multi-site installs, the following settings will also be available:
+- **Allow self relations** — If this field is attached to an asset via a [volume field layout](../element-types/assets.md#volumes), should the author be allowed to create a circular reference?
+- **Relate assets from a specific site?** — Lock relations to a single [site](#multi-site-settings).
 
-- **Translation Method** — How relationships are handled when [propagating changes to other sites](../../system/fields.md#translation-methods).
-- **Relate assets from a specific site?** — Whether to only allow relations to assets from a specific site.
-  - If _enabled_, a new setting will appear where you can choose which site.
-  - If _disabled_, related assets will always be pulled from the current site.
+#### Multi-Site Settings
 
-- **Show the site menu** — Whether to display the site menu in asset selection modals. (This setting is hidden when relations are locked to a single site.)
+On multi-site installs, the following setting will also be available:
+
+- **Translation Method** — How relationships are handled when [propagating changes to other sites](../../system/fields.md#translation-methods).
 
 <See path="../../system/fields.md" hash="translation-methods" label="Translation Methods" description="Learn about options for translating field values." />
 
diff --git a/docs/5.x/reference/field-types/categories.md b/docs/5.x/reference/field-types/categories.md
index b0d77895f..ffa4c83bd 100644
--- a/docs/5.x/reference/field-types/categories.md
+++ b/docs/5.x/reference/field-types/categories.md
@@ -12,7 +12,7 @@ related:
 
 <div class="version-warning">
 
-Categories are being phased out in favor of [Structure sections](../element-types/entries.md#structures). The corresponding [entries field](entries.md) has a _maintain hierarchy_ setting that mimics categories fields.
+Categories are being phased out in favor of [structure sections](../element-types/entries.md#structures). The corresponding [entries field](entries.md) has a _maintain hierarchy_ setting that mimics categories fields.
 
 Read more about this [transition](https://craftcms.com/blog/entrification) on our blog.
 
@@ -38,11 +38,15 @@ Categories fields have the following settings:
   - **Min Relations** — The minimum number of categories that must be selected when the field is marked as “required” in a field layout. (Default is no minimum.)
   - **Max Relations** — The maximum number of categories that can be selected. (Default is no maximum.)
   - **Default Category Placement** — Whether new selections are prepended or appended to the existing relations.
-  - **View Mode** — How the related users are displayed to authors (_List_ or _Cards_).
+  - **View Mode** — How the related categories are displayed to authors (_List_, _Cards_, <Since ver="5.9.0" feature="The inline list and card grid view modes for relational fields">_Card grid_, or _Inline list_</Since>).
 
 - **“Add” Button Label** — The label that should be used on the field’s selection button.
 - **Validate related categories** — Whether or not validation errors on the related categories will be bubbled up.
 
+When a single source is selected, you can also configure these settings:
+
+- **Show the search input** — Allow authors to quick-search (and create) categories, without opening an element selector modal. <Since ver="5.8.0" feature="Quick-search support for relational fields" />
+
 ### Advanced Settings
 
 Additional settings are available under the **Advanced** toggle:
diff --git a/docs/5.x/reference/field-types/checkboxes.md b/docs/5.x/reference/field-types/checkboxes.md
index 19e614d8d..a3dc9044a 100644
--- a/docs/5.x/reference/field-types/checkboxes.md
+++ b/docs/5.x/reference/field-types/checkboxes.md
@@ -1,9 +1,11 @@
 ---
 related:
+  - uri: lightswitch.md
+    label: Lightswitch fields (for storing a single true/false value)
   - uri: multi-select.md
-    label: Multi-select fields
+    label: Multi-select fields (for selecting multiple values)
   - uri: radio-buttons.md
-    label: Radio buttons fields
+    label: Radio buttons fields (for selecting one of many values)
 ---
 
 # Checkboxes Fields
@@ -111,10 +113,6 @@ foreach ($entry->myFieldHandle->options as $option) {
 ```
 :::
 
-::: warning
-
-:::
-
 To see if any options are checked, use the [length](https://twig.symfony.com/doc/3.x/filters/length.html) filter or [empty](https://twig.symfony.com/doc/3.x/tests/empty.html) test (or the [count](https://www.php.net/manual/en/function.count.php) method in PHP):
 
 ::: code
diff --git a/docs/5.x/reference/field-types/entries.md b/docs/5.x/reference/field-types/entries.md
index 49ea81b56..97ad94a30 100644
--- a/docs/5.x/reference/field-types/entries.md
+++ b/docs/5.x/reference/field-types/entries.md
@@ -34,11 +34,7 @@ Entries fields have the following settings:
 
 - **Sources** — Which sections (or other entry index sources) the field should be able to relate entries from.
 - **Selectable Entries Condition** — Rules that determine which entries should be available for selection.
-- **Maintain Hierarchy** — When selecting from a _structure_ section, should the entries’ order and hierarchy be preserved?
-
-  ::: tip
-  This option is available only when the selected sources are all structures.
-  :::
+- **Maintain Hierarchy** — When selecting from a [structure section](../element-types/entries.md#structures), should the entries’ order and hierarchy be preserved? (This option is available only when _all_ the selected **Sources** are structures.)
 
   When **enabled**, the following options become available:
 
@@ -49,10 +45,13 @@ Entries fields have the following settings:
   - **Min Relations** — The minimum number of entries that must be selected when the field is marked as “required” in a field layout. (Default is no minimum.)
   - **Max Relations** — The maximum number of entries that can be selected. (Default is no maximum.)
   - **Default Entry Placement** — Whether new selections are prepended or appended to the existing relations.
-  - **View Mode** — How the related users are displayed to authors (_List_ or _Cards_).
-- **Show cards in a grid** — When using the **Cards** view mode, this setting allows cards to tile horizontally, as space allows.
+  - **View Mode** — How the related entries are displayed to authors (_List_, _Cards_, <Since ver="5.9.0" feature="The inline list and card grid view modes for relational fields">_Card grid_, or _Inline list_</Since>).
 - **“Add” Button Label** — The label that should be used on the field’s selection button.
 
+When a single source is selected, you can also configure these settings:
+
+- **Show the search input** — Allow authors to quick-search (and create) entries, without opening an element selector modal. <Since ver="5.8.0" feature="Quick-search support for relational fields" />
+
 ### Advanced Settings
 
 Additional settings are available under the **Advanced** toggle:
@@ -120,7 +119,7 @@ $works = \craft\elements\Entry::find()
 
 ### Working with Entries Field Data
 
-If you have an element with an Entries field in your template, you can access its related entries using your Entries field’s handle:
+If you have an element with an entries field in your template, you can access its related entries using your entries field’s handle:
 
 ::: code
 ```twig
@@ -203,15 +202,42 @@ $relatedEntries = $entry->myFieldHandle
 ```
 :::
 
-::: tip
-<Todo notes="Extract this into a snippet." />
+Each time you access an entries field from an element, a new copy of its value is returned.
+This means that applying parameters _does not_ influence the original query, and you can always get the authoritative set of related entries by calling `.all()`:
 
-In Craft 3, we recommended cloning these query objects using the [`clone` keyword](https://www.php.net/manual/en/language.oop5.cloning.php) or [`clone()`](../twig/functions.md#clone) Twig function before applying params. **This is no longer required in Craft 4**, because a new copy of the query is returned each time you access the field property.
-:::
+```twig{12}
+{# Get a list of just organization(s): #}
+{% set orgsQuery = asset.documentSources
+  .type('org')
+  .all() %}
+
+{# Get a list of only individual people: #}
+{% set individualsQuery = asset.documentSources
+  .type('individual')
+  .all() %}
+
+{# Get everything, regardless of the type: #}
+{% set allSources = asset.documentSources.all() %}
+```
+
+Save the returned value to an intermediate variable if you need to refer to it again:
+
+```twig{1,5,8}
+{% set sourceQuery = asset.documentSources %}
+{% set sourceType = craft.app.request.getParam('sourceType') %}
+
+{% if sourceType is not empty and sourceType in ['org', 'individual', 'anonymous'] %}
+  {% do sourceQuery.type(sourceType) %}
+{% endif %}
+
+{% for source in sourceQuery.all() %}
+  {# ... #}
+{% endfor %}
+```
 
 ### Saving Entries Fields
 
-If you have front-end form for saving an element, that needs to contain an Entries field, you will need to submit your field value as a list of entry IDs, in the order you want them to be related.
+If you have front-end form for saving an element, that needs to contain an entries field, you will need to submit your field value as a list of entry IDs, in the order you want them to be related.
 
 For example, you could create a list of checkboxes for each of the possible relations:
 
diff --git a/docs/5.x/reference/field-types/lightswitch.md b/docs/5.x/reference/field-types/lightswitch.md
index 8c523b33c..5a14fbd2d 100644
--- a/docs/5.x/reference/field-types/lightswitch.md
+++ b/docs/5.x/reference/field-types/lightswitch.md
@@ -4,6 +4,28 @@ Lightswitch fields give you a simple toggle input and store a boolean value.
 
 <!-- more -->
 
+## Settings
+
+<BrowserShot
+  url="https://my-craft-project.ddev.site/admin/settings/fields/new"
+  :link="false"
+  :max-height="500"
+  caption="Adding a new lightswitch field via the control panel.">
+<img src="../../images/fields-lightswitch-settings.png" alt="Lightswitch field settings screen in the Craft control panel">
+</BrowserShot>
+
+Lightswitch fields have the following settings:
+
+Default Value
+:   Choose a default value for the field.
+
+OFF Label and ON Label
+:   The text and accessibility label for the toggle’s disabled and enabled states.
+
+Show ON/OFF labels in cards
+:   When rendered on a [card](../../system/elements.md#custom-card-attributes), this determines whether the ON/OFF labels are displayed (instead of the field’s name).
+    These labels can be localized for control panel users with the [`site` translation category](../../system/sites.md#static-message-translations).
+
 ## Development
 
 ### Querying Elements with Lightswitch Fields
@@ -17,6 +39,8 @@ Possible values include:
 | `true` | …with the switch _on_. |
 | `false` | …with the switch _off_. |
 
+See below for more information about how [default values](#default-value-handling) work in queries.
+
 ::: code
 ```twig
 {# Fetch entries with the lightswitch field enabled #}
@@ -32,7 +56,9 @@ $entries = \craft\elements\Entry::find()
 ```
 :::
 
-Elements without a value for a lightswitch field (say, because they haven’t been saved since the field was added) are treated as if they have the default field value. For example, querying against a field that defaults to _off_…
+### Default Value Handling
+
+Elements without a value for a lightswitch field (say, because they haven’t been saved since the field was added, or because one of the query’s relevant field layouts doesn’t include an instance of it) are treated as if they have the **Default Value**. For example, querying against a field that defaults to _off_…
 
 ```twig{3}
 {% set archive = craft.entries()
@@ -96,6 +122,25 @@ if ($entry->myLightswitchField) {
 ```
 :::
 
+The field’s _on_ and _off_ labels are not intended for display to users, but you can get them via the fields service:
+
+::: code
+```twig
+{% set field = craft.app.fields.getFieldByHandle('myLightswitchField') %}
+
+{{ entry.myLightswitchField ? field.onLabel : field.offLabel }}
+```
+```php
+$field = Craft::$app->getFields()->getFieldByHandle('myLightswitchField');
+
+echo $entry->myLightswitchField ? $field->onLabel : $field->offLabel;
+```
+:::
+
+::: tip
+`onLabel` and `offLabel` are the literal strings stored in project config; if you wish to localize them (as the control panel does), you must pass them through the [`site` translation category](../../system/sites.md#static-message-translations).
+:::
+
 ### Saving Lightswitch Fields
 
 In an element or [entry form](kb:entry-form) that needs to save a value to a lightswitch field, you can use this template as a starting point:
diff --git a/docs/5.x/reference/field-types/link.md b/docs/5.x/reference/field-types/link.md
index 3d5de5781..40ba588e0 100644
--- a/docs/5.x/reference/field-types/link.md
+++ b/docs/5.x/reference/field-types/link.md
@@ -85,6 +85,25 @@ Link fields have—at minimum—an input specific to the allowed type of link. I
 
 When the **Show the “Label” field** setting is enabled, an additional input allows authors to customize the textual representation of the link. This input’s `placeholder` text will reflect the automatically-determined value.
 
+A number of other inputs are displayed in a based on the field’s enabled **Advanced Fields**, within a 
+
+### Translations
+
+Elements selected via a relational link type are site-specific, which differs from the default behavior of other relational fields.
+When the field is marked as **Not translatable**, the selected element is returned, regardless of the request’s current site (or which site the element with the link field was loaded in).
+
+Choose one of the other translation modes to allow authors to select different elements on each site, or handle localization in the template:
+
+```twig{4}
+{% set target = entry.myLinkFieldHandle.element %}
+{% set localTarget = craft.entries()
+  .id(target)
+  .site(currentSite)
+  .one() %}
+```
+
+Craft _does_ attempt to localize relations in translatable link fields when they are initially propagated to other sites. <Since ver="5.5.0" feature="Automatic replacement with localized relations during initial propagation of link fields" />
+
 ## Development
 
 Outputting a link field in a template will return a normalized value suitable for use in an anchor tag’s `href` attribute:
@@ -192,6 +211,8 @@ When using an element in a link field, Craft makes the corresponding connections
 {# -> Returns other entries connected to the given `post` via a specific link field. #}
 ```
 
+[Translation](#translations) of link fields is handled differently from other relational fields.
+
 ::: warning
 It is not currently possible to [eager-load](../../development/eager-loading.md) link field relationships, as their element type is not known until the field data is loaded.
 :::
diff --git a/docs/5.x/reference/field-types/matrix.md b/docs/5.x/reference/field-types/matrix.md
index 025bf6715..7a407f556 100644
--- a/docs/5.x/reference/field-types/matrix.md
+++ b/docs/5.x/reference/field-types/matrix.md
@@ -32,11 +32,9 @@ During the Craft 5 upgrade, _Matrix blocks_ were converted to _entries_. [Fields
 
 Select from existing, globally-defined [entry types](../element-types/entries.md#entry-types), or create a new one on-the-fly.
 
-::: tip
 You can specify local overrides for each attached entry type’s **Name** and **Handle** by selecting **Settings** from a chip’s action <Icon kind="ellipses" /> menu. <Since ver="5.6.0" feature="Contextual entry type name and handle overrides" /> A pencil icon will be displayed in any entry type chip that has overrides.
 
 ![An entry type chip with a pencil icon indicating its name or handle have been overridden](../../images/fields-matrix-settings-entry-type-overrides.png)
-:::
 
 #### Groups <Since ver="5.8.0" feature="Grouped entry types in Matrix fields" />
 
@@ -67,7 +65,7 @@ The _maximum_ number of entries that can be created within the field. (Default i
 
 ### Versioning <Since ver="5.7.0" feature="Control over creation of revisions for nested entries in Matrix fields" />
 
-Nested entries using the _As inline-editable blocks_ [view mode](#view-mode) are “versioned” alongside their owner: when making a change directly within the context of the owner, Craft automatically creates [revisions](../../system/drafts-revisions.md) for both elements. However, revisions of the nested element are hidden, by default.
+Nested entries using the _As inline-editable blocks_ [view mode](#view-mode) are “versioned” alongside their owner: when making a change directly within the context of the owner, Craft automatically creates [revisions](../../system/drafts-revisions.md) for both elements. Those revisions are only exposed via the control panel; they are only returned in the front-end when explicitly requested (or as part of a preview request).
 
 The **Enable versioning for entries in this field** setting exposes the revisions menu and the **Notes** field in the sidebar, when editing a nested entry in its own screen.
 
@@ -76,10 +74,11 @@ The **Enable versioning for entries in this field** setting exposes the revision
 Choose how the nested elements are represented within the [field UI](#the-field):
 
   - **As cards**: Read-only [element cards](../../system/elements.md#chips-cards) that surface nested field data.
+  - **As card grid**: Similar to **As cards**, but cards are limited in width and arranged in a grid. <Since ver="5.9.0" feature="The dedicated card grid Matrix view mode" />
   - **As inline-editable blocks**: Manage nested entries as though they were part of the current element. In prior versions of Craft, this was the _only_ display option for Matrix fields.
   - **As an element index**: A simplified [element index](../../system/elements.md#indexes) with sorting, searching, and filtering controls.
 
-    When using the element index view mode, you can also allow authors to toggle between a card view and standard table view. Enabling the table view reveals controls for the columns that will be displayed, by default.
+    When using the element index view mode, you can enabled **Include Table View** to allow authors to toggle between the card view and the traditional table view. Enabling the table view reveals controls for the **Default Table Columns**, and the index’s **Default View Mode**.
 
 ### “New” Button Label
 
@@ -110,7 +109,7 @@ Each block has a menu that provides access to additional controls…
 <img src="../../images/fields-matrix-ui-actions.png" alt="A Matrix field’s action menu in an element form">
 
 ::: tip
-If multiple nested entries are selected, the Collapse/Expand, Disable/Enable, and Delete options will apply to each of them.
+If multiple nested entries are selected, the **Collapse**/**Expand**, **Disable**/**Enable**, and **Delete** options will apply to each of them.
 
 You can collapse inline Matrix blocks by choosing the **Collapse** menu option or by double-clicking on a block’s title bar. When a block is collapsed, its title bar will show a preview of its content so you can still identify which block it is.
 
diff --git a/docs/5.x/reference/field-types/money.md b/docs/5.x/reference/field-types/money.md
index 9b09c3e8d..32d01525c 100644
--- a/docs/5.x/reference/field-types/money.md
+++ b/docs/5.x/reference/field-types/money.md
@@ -39,9 +39,9 @@ Any value compatible with <craft5:craft\helpers\Db::parseMoneyParam()> can be pa
 | - | -
 | `':empty:'` | …that have no amount saved.
 | `':notempty:'` | …that have an amount saved.
-| `'>= 123.45'` | …that have a normalized amount greater than `123.45`.
+| `'>= 123.45'` | …that have a normalized amount greater than or equal to `123.45`.
 | `'< 123.45'` | …that have a normalized amount less than `123.45`.
-| `['and', '>= 50.00', '< 75.00']` | …that have a normalized amount between `50.00` and `75.00`.
+| `['and', '>= 50.00', '< 75.00']` | …that have a normalized amount between `50.00` (inclusive) and `75.00`.
 | `['or', '< -100.00', '> 100.00']` | …that have a normalized amount less than `-100.00` or greater than `100.00`.
 
 All values are assumed to be in the field’s currency.
@@ -59,5 +59,8 @@ $value = \craft\helpers\MoneyHelper::toString($entry->myFieldHandle);
 ```
 :::
 
-That will give you a formatted currency value for the field, if it has a value.
+A formatted representation of the amount is returned, if the field had a value.
 
+::: warning
+The `currency` filter does _not_ work with money field values, due to the way the underlying value is represented.
+:::
diff --git a/docs/5.x/reference/twig/filters.md b/docs/5.x/reference/twig/filters.md
index 6ea44077c..45cfe513d 100644
--- a/docs/5.x/reference/twig/filters.md
+++ b/docs/5.x/reference/twig/filters.md
@@ -56,6 +56,7 @@ Filter | Description
 [indexOf](#indexof) | Returns the index of a given value within an array, or the position of a passed-in string within another string.
 [integer](#integer) | Coerces the passed value to an integer.
 [intersect](#intersect) | Returns the intersecting items of two arrays.
+[invoke](https://twig.symfony.com/doc/3.x/filters/invoke.html) | Calls a function, passing through any arguments.
 [join](https://twig.symfony.com/doc/3.x/filters/join.html) | Concatenates multiple strings into one.
 [json_decode](#json_decode) | JSON-decodes a value.
 [json_encode](#json_encode) | JSON-encodes a value.
@@ -360,6 +361,10 @@ If the passed-in value isn’t a valid number it will be returned verbatim:
 {# Output: oh hai #}
 ```
 
+::: warning
+[Money](../field-types/money.md) field values should be formatted with the [`money`](#money) filter.
+:::
+
 ## `date`
 
 Formats a timestamp or [DateTime](http://php.net/manual/en/class.datetime.php) object.
@@ -660,42 +665,70 @@ Groups items in an array by the results of an arrow function.
 
 ## `hash`
 
-Prefixes the given string with a keyed-hash message authentication code (HMAC), for passing data in plain view (i.e. via front-end forms) that must not be tampered with.
+Generates a hash of the passed string.
+The default behavior uses Craft’s built-in data hashing service, which prepends a [keyed-hash message authentication code](https://en.wikipedia.org/wiki/HMAC) (HMAC) to the input.
+
+This is primarily intended to pass data in plain view (i.e. via front-end forms) that must not be tampered with.
 
 ```twig
-{{ hiddenInput('foo', 'bar'|hash) }}
+{{ hiddenInput('foo', '!!!qux'|hash) }}
+{# -> <input type="hidden" name="foo" value="3c672d401a486334511baf27d9c717dad0f27d7bebc890895f3b15c4b3f6edd3!!!qux"> #}
 ```
 
-PHP scripts can validate the value via [Security::validateData()](yii2:yii\base\Security::validateData()):
+::: danger
+**Do not hash sensitive data.** Hashed values are tamper-proof, but still expose the original value!
+Hashes are **not** a suitable alternative to CSRF tokens or authentication.
+:::
+
+In a plugin or module, you can validate the value via [Security::validateData()](yii2:yii\base\Security::validateData()):
 
 ```php
 $foo = Craft::$app->getRequest()->getBodyParam('foo');
 $foo = Craft::$app->getSecurity()->validateData($foo);
 
 if ($foo !== false) {
-    // $foo is valid!
+    // $foo was not tampered with!
 }
 ```
 
-::: danger
-**Do not hash sensitive data.** Hashed values are tamper-proof, but still expose the original value!
-:::
-
-[Request::getValidatedBodyParam()](craft5:craft\web\Request::getValidatedBodyParam()) can also perform this comparison in a controller, automatically throwing an error when it finds a missing or invalid value:
+[Request::getValidatedBodyParam()](craft5:craft\web\Request::getValidatedBodyParam()) can be used in a [controller](../../extend/controllers.md) to automatically throw an exception on missing or invalid values:
 
 ```php
 public function actionSubmitData()
 {
     $foo = Craft::$app->getRequest()->getValidatedBodyParam('foo');
 
-    // $foo is valid!
+    // $foo is present and valid!
 }
 ```
 
 ::: warning
-Hashing data uses your app’s [`securityKey` config setting](config5:securityKey), by default. If this setting changes between generating and validating a hash, it will fail!
+Generating an HMAC uses your app’s [`securityKey` config setting](config5:securityKey), by default. If this setting changes between generating and validating a hash, it will fail!
 :::
 
+Attempting to validate a hash from a non-default algorithm <Since ver="5.9.0" feature="Non-HMAC data-hashing algorithms in Twig" /> will always fail.
+Hashes from other algorithms can be checked by re-computing the them from your trusted data:
+
+```twig
+{% if craft.app.request.getQueryParam('contentChecksum') != entry.myTextContentField|hash('md5') %}
+  The content of this page has changed since the link was shared.
+{% endif %}
+```
+
+#### Arguments
+
+`algo` <Since ver="5.9.0" feature="Arbitrary data-hasing algorithms in Twig" />
+:   The hashing algorithm to use.
+    Check the output of the `hash_algos()` function on your system for a complete list of supported algorithms.
+
+    ```twig
+    {{ 'My string'|hash('sha256') }}
+    {# -> 3f9a07d83c604dba400d13df4d34566b78338804f0b3181d4e02089fe4daa7b0 #}
+
+    {{ 'My string'|hash('md5') }}
+    {# -> a537d002d4b595d99b7a2a9db4dfa2ff #}
+    ```
+
 ## `httpdate`
 
 Converts a date to the HTTP format, used by [RFC 7231](https://tools.ietf.org/html/rfc7231#section-7.1.1.1)-compliant HTTP headers like `Expires`.
diff --git a/docs/5.x/reference/twig/functions.md b/docs/5.x/reference/twig/functions.md
index cc9c55ebe..614592235 100644
--- a/docs/5.x/reference/twig/functions.md
+++ b/docs/5.x/reference/twig/functions.md
@@ -51,6 +51,7 @@ Function | Description
 [parseEnv](#parseenv) | Parses a string as an environment variable or alias.
 [plugin](#plugin) | Returns a plugin instance by its handle.
 [random](https://twig.symfony.com/doc/3.x/functions/random.html) | Returns a random value.
+[randomString](#randomstring) | Generates a string of random characters.
 [range](https://twig.symfony.com/doc/3.x/functions/range.html) | Returns a list containing an arithmetic progression of integers.
 [raw](#raw) | Wraps the given string in a `Twig\Markup` object to prevent it from getting HTML-encoded when output.
 [redirectInput](#redirectinput) | Outputs a hidden `redirect` input.
@@ -65,6 +66,7 @@ Function | Description
 [template_from_string](https://twig.symfony.com/doc/3.x/functions/template_from_string.html) | Loads a template from a string.
 [ul](#ul) | Outputs an array of items as an unordered list.
 [url](#url) | Generates a URL.
+[uuid](#uuid) | Generates a UUID.
 
 ## `actionInput`
 
@@ -588,18 +590,25 @@ Take care to not leak sensitive environment variables into your HTML!
 
 ## `gql`
 
-Executes a GraphQL query against the full schema.
+Executes a [GraphQL](../../development/graphql.md) query against the full schema.
+
+::: tip
+While this can be useful for debugging GraphQL queries, most front-end templates should use [element queries](../../development/element-queries.md) to load data.
+GraphQL returns plain arrays and scalar values (instead of element objects), which means you won’t have access to any methods and getters on the results—or their fields’ data.
+:::
 
 ```twig
 {% set result = gql('{
   entries (section: "news", limit: 2, orderBy: "dateCreated DESC") {
-    postDate @formatDateTime (format: "Y-m-d")
+    postDate @formatDateTime(format: "Y-m-d")
     title
     url
-    ... on news_article_Entry {
+    typeHandle
+
+    ... on article_Entry {
       shortDescription
       featuredImage {
-        url @transform (width: 300)
+        url @transform(width: 300)
         altText
       }
     }
@@ -610,10 +619,13 @@ Executes a GraphQL query against the full schema.
   <h3><a href="{{ entry.url }}">{{ entry.title }}</a></h3>
   <p class="timestamp">{{ entry.postDate }}</p>
 
-  {% set image = entry.featuredImage[0] %}
-  <img class="thumb" src="{{ image.url }}" alt="{{ image.altText }}">
+  {% set image = entry.featuredImage[0] ?? null %}
+  {% if image %}
+    <img class="thumb" src="{{ image.url }}" alt="{{ image.altText }}">
+  {% endif %}
 
   {{ entry.shortDescription|markdown }}
+
   <p><a href="{{ entry.url }}">Continue reading…</a></p>
 {% endfor %}
 ```
@@ -728,6 +740,38 @@ Returns a plugin instance by its handle, or `null` if no plugin is installed and
 {{ plugin('commerce').version }}
 ```
 
+## `randomString`
+
+Returns a series of 36 random characters from `a` through `z`.
+Pass a `length` to generate fewer or more characters.
+This is a wrapper around <craft5:craft\helpers\StringHelper::randomString()>, and in turn a feature of the [Stringy](https://github.com/voku/Stringy) API.
+
+```twig
+{% set rid = "toggle-#{randomString(8)}" %}
+
+{# -> "toggle-smqfsfgt" #}
+
+<button aria-controls="{{ rid }}">Toggle</button>
+
+<div id="{{ rid }}">
+  {{ entry.details }}
+</div>
+```
+
+::: warning
+The output of `randomString()` is **not** cryptographically secure, and does not guarantee uniqueness.
+Use `craft.app.security.generateRandomString()` if you need a true random value.
+:::
+
+While strings generated from the base character set (`a-z`) are generally safe to use as HTML `id`s, class names, and CSS identifiers; the extended character set includes symbols that should be [escaped](../../development/twig.md#manual-escaping) in most contexts.
+
+### Arguments
+
+The signature of `randomString()` is the same as its [helper function](craft5:craft\helpers\StringHelper::randomString()) in PHP:
+
+- **`length`** — An integer that determines the number of characters returned.
+- **`extendedChars`** — Whether to allow additional special characters, including uppercase letters, numbers, punctuation, etc.
+
 ## `raw`
 
 Wraps the given string in a `Twig\Markup` object to prevent it from getting HTML-encoded when output.
@@ -822,7 +866,7 @@ Randomizes the order of the elements within an array.
 
 ## `siteUrl`
 
-Similar to [url()](#url-path-params-scheme-mustshowscriptname), except _only_ for creating URLs to pages on your site.
+Similar to [url()](#url), except _only_ for creating URLs to pages on your site.
 
 ```twig
 <a href="{{ siteUrl('company/contact') }}">Contact Us</a>
@@ -832,10 +876,10 @@ Similar to [url()](#url-path-params-scheme-mustshowscriptname), except _only_ fo
 
 The `siteUrl()` function has the following arguments:
 
-- **`path`** – The path that the resulting URL should point to on your site. It will be appended to your base site URL.
-- **`params`** – Any query string parameters that should be appended to the URL. This can be either a string (e.g. `'foo=1&bar=2'`) or a [hash](../../development/twig.md#hashes) (e.g. `{foo:'1', bar:'2'}`).
-- **`scheme`** – Which scheme the URL should use (`'http'` or `'https'`). The default value depends on whether the current request is served over SSL or not. If not, then the scheme in your Site URL will be used; if so, then `https` will be used.
-- **`siteId`** – The ID of the site that the URL should point to. By default the current site will be used.
+- **`path`** – The path that the resulting URL should point to on your site. It will be appended to the current site’s **Base URL**.
+- **`params`** – Any query string parameters that should be appended to the URL. This can be either a string (e.g. `'foo=1&bar=2'`) or a [hash](../../development/twig.md#hashes) (e.g. `{ foo: 1, bar: 2 }`).
+- **`scheme`** – Which scheme the URL should use (`'http'` or `'https'`). The default value depends on whether the current request is served over SSL.
+- **`siteId`** – The ID of the site that the URL should point to, if different from the current site.
 
 ## `source`
 
@@ -1016,20 +1060,22 @@ The `ul()` function has the following arguments:
 
 ## `url`
 
-Returns a URL.
+Builds or modifies a URL.
 
 ```twig
 <a href="{{ url('company/contact') }}">Contact Us</a>
 ```
 
+The [`siteUrl()`](#siteurl) may be a better choice when generating internal URLs—particularly if you expect a template to be rendered in the control panel or from the command line.
+
 ### Arguments
 
 The `url()` function has the following arguments:
 
-- **`path`** – The path that the resulting URL should point to on your site. It will be appended to your base site URL.
-- **`params`** – Any query string parameters that should be appended to the URL. This can be either a string (e.g. `'foo=1&bar=2'`) or a [hash](../../development/twig.md#hashes) (e.g. `{foo:'1', bar:'2'}`).
-- **`scheme`** – Which scheme the URL should use (`'http'` or `'https'`). The default value depends on whether the current request is served over SSL or not. If not, then the scheme in your Site URL will be used; if so, then `https` will be used.
-- **`mustShowScriptName`** – If this is set to `true`, then the URL returned will include “index.php”, disregarding the <config5:omitScriptNameInUrls> config setting. (This can be useful if the URL will be used by POST requests over Ajax, where the URL will not be shown in the browser’s address bar, and you want to avoid a possible collision with your site’s .htaccess file redirect.)
+- **`path`** –A path or absolute URL. _Paths_ are appended to the current site’s **Base URL**; _absolute URLs_ are adjusted according to additional arguments.
+- **`params`** – Any query string parameters that should be appended to the URL. This can be either a string (e.g. `'foo=1&bar=2'`) or a [hash](../../development/twig.md#hashes) (e.g. `{ foo: 1, bar: 2 }`).
+- **`scheme`** – Which scheme the URL should use (`'http'` or `'https'`). The default value depends on whether the current request is served over SSL.
+- **`mustShowScriptName`** – If this is set to `true`, then the URL returned will include `index.php`, disregarding the <config5:omitScriptNameInUrls> config setting. (This can be useful if the URL will be used by POST requests over Ajax, where the URL will not be shown in the browser’s address bar, and you want to avoid a possible collision with your site’s `.htaccess` file redirect.)
 
 Using the `url()` function has advantages over hard-coding URLs in your templates:
 
@@ -1039,8 +1085,27 @@ Using the `url()` function has advantages over hard-coding URLs in your template
 
 ::: tip
 You can use the `url()` function for appending query string parameters and/or enforcing a scheme on an absolute URL:
+
 ```twig
-{{ url('http://my-project.tld', 'foo=1', 'https') }}
+{{ url('http://my-project.tld', { foo: 1 }, 'https') }}
 {# Output: "https://my-project.tld?foo=1" #}
 ```
 :::
+
+## `uuid`
+
+Generates a v4 UUID.
+
+```twig
+{{ uuid() }}
+{# -> 77b2b7f2-9ff2-450c-a2e8-d772fc8cdddc #}
+```
+
+UUIDs are generally _not_ safe for use as HTML `id`s or CSS identifiers.
+If you need a character-only string (and the exact format isn’t important), consider using [`randomString()`](#randomstring).
+
+The implementation of this function can be found in <craft5:craft\helpers\StringHelper::UUID()>.
+
+::: warning
+Avoid [caching](tags.md#cache) the output of `uuid()` if its value is used for customization or analytics, as the same value may be sent to multiple clients.
+:::
diff --git a/docs/5.x/reference/twig/tags.md b/docs/5.x/reference/twig/tags.md
index 70c7658e6..7629c2769 100644
--- a/docs/5.x/reference/twig/tags.md
+++ b/docs/5.x/reference/twig/tags.md
@@ -127,7 +127,7 @@ The accepted duration units are defined by <craft5:craft\helpers\DateTimeHelper:
 - `year`(`s`)
 - `week`(`s`)
 
-If this parameter is omitted, your <config5:cacheDuration> config setting will be used to define the default duration.
+If this parameter is omitted, Craft uses the default <config5:cacheDuration>.
 
 #### `until`
 
@@ -169,7 +169,7 @@ Your template caches will automatically clear when any elements (entries, assets
 
 If you have any element _queries_ within the tags (e.g. a `craft.entries`), and you create a new element that should be returned by one of the queries, Craft will also be able to figure that out and clear the cache.
 
-You can also manually clear your template caches from the Utilities page, using the “Clear Caches” tool, or by using the `invalidate-tags/template` console command.
+You can also manually clear your template caches from <Journey path="Utilities, Clear Caches" />, or with the `invalidate-tags/template` console command:
 
 ```bash
 php craft invalidate-tags/template
diff --git a/docs/5.x/system/drafts-revisions.md b/docs/5.x/system/drafts-revisions.md
index 56dca07bb..be426dd18 100644
--- a/docs/5.x/system/drafts-revisions.md
+++ b/docs/5.x/system/drafts-revisions.md
@@ -73,6 +73,11 @@ To avoid issues when rendering drafts in live preview, [templates](../developmen
 ```
 :::
 
+#### Explicit Validation <Since ver="5.8.0" feature="The explicit element validation action" />
+
+Authors can explicitly validate an element without publishing (as though it were live), using the **Validate [Type]** action menu item on any element’s edit screen.
+The page will reload and display any validation failures, and a global success or failure notification.
+
 ### Change Tracking
 
 Fields that have been modified in a draft are recorded in the database and marked in the editor with a status badge. These fields’ values are protected against automatic [merging](#merging-changes) of changes from the canonical element.
@@ -85,7 +90,11 @@ When a draft is viewed in the control panel, Craft merges in any changes from th
 
 Each user is only allowed one _provisional_ draft per canonical element, but can create any number of _saved_ drafts. If you need to stash provisional changes, press the **Create a draft** button.
 
-Use the **Edit draft settings** item in the action menu next to the **Save* button to give your draft a name. This helps you and any collaborators identify a draft by more than its number and creator. You can also add **Notes** to most elements, in the sidebar; these are copied into the [revision](#revisions) when the draft is eventually merged.
+Use the **Edit draft settings** item in the action menu next to the **Save** button to give your draft a name. This helps you and any collaborators identify a draft by more than its number and creator. You can also add **Notes** to most elements, in the sidebar; these are copied into the [revision](#revisions) when the draft is eventually merged.
+
+::: warning
+Users with the **View/Edit/Delete other users’ drafts** [permissions](user-management.md#permissions) may have access to your saved drafts.
+:::
 
 ## Nested Elements
 
@@ -97,13 +106,14 @@ Nested entries are sometimes *not* drafts and *not* canonical. We carefully filt
 
 ## Revisions
 
-In the process of saving an element (or in technical terms, applying a [draft](#drafts) to a canonical element), Craft copies the canonical element into a derivative, called a _revision_. Support for revisions (and the number of revisions each element can have) depends on the element type and [configuration](config5:maxRevisions). 
+In the process of saving an element (or in technical terms, applying a [draft](#drafts) to a canonical element), Craft copies the canonical element into a derivative, called a _revision_.
+Support for revisions (and the number of revisions each element can have) depends on the element type and [configuration](config5:maxRevisions). 
 
 Revisions ensure that edits to an element are both auditable and recoverable. An element’s revisions can be viewed via the menu in its breadcrumbs:
 
 ![The drafts + revisions menu among an entry’s breadcrumbs in the Craft control panel](../images/drafts-revisions-menu.png)
 
-Selecting a revision takes you to a read-only version of the element’s edit screen, where you can **View** the previous state, or **Revert content from this revision**. If there are more than ten revisions for an element, a **View all revisions** button appears at the end of the menu, linking to a dedicated revisions browser. The “Current” revision displays the canonical element, or a provisional draft of it.
+Selecting a revision takes you to a read-only version of the element’s edit screen, where you can **View** the previous state, or **Revert content from this revision**. If there are more than ten revisions for an element, a **View all revisions** button appears at the end of the menu, linking to a dedicated revisions browser. The “Current” revision displays the canonical element (or a provisional draft of it, if you have one).
 
 Restoring a revision copies its content (fields and attributes) into the canonical element.
 
@@ -111,6 +121,9 @@ Restoring a revision copies its content (fields and attributes) into the canonic
 Unlike merging upstream changes into a draft, restoring a revision _does not_ take into consideration which fields and attributes were changed in that particular revision; the entire revision effectively becomes the canonical version. Changes in other drafts are not replaced, but the next time a draft is loaded, Craft will merge in any compatible non-conflicting “changes” from the canonical element.
 :::
 
+When restoring a revision, the current state is saved as a _new_ revision—the element’s history is not just rewound to that point in time!
+A note is automatically added to the new canonical element, indicating where the changes came from.
+
 ## Vocabulary
 
 This list collects all the terms we’ve used to describe the state of an element.
diff --git a/docs/5.x/system/elements.md b/docs/5.x/system/elements.md
index 2d21e8701..d6ad23667 100644
--- a/docs/5.x/system/elements.md
+++ b/docs/5.x/system/elements.md
@@ -190,11 +190,14 @@ Each source also controls what columns are visible in the index, and its default
 </BrowserShot>
 
 ::: tip
-Custom sources are stored in [Project Config](project-config.md). The interface for conditions that involve specific elements (like an author) may appear differently than the equivalent [filter](#filters-and-columns), because the ID may not be stable between environments.
+Custom sources are stored in [project config](project-config.md).
+The interface for conditions that involve specific elements (like an author) may appear differently than the equivalent [filter](#filters-and-columns), because IDs are [not stable between environments](project-config.md#ids-uuids-and-handles).
 
-Instead of an element select field, you’ll see an [autosuggest input](project-config.md#secrets-and-the-environment).
+As an example, element select inputs are replaced by [autosuggest inputs](project-config.md#secrets-and-the-environment), so that the rule’s value can still be dynamic, despite being stored statically.
 :::
 
+Entries provide an additional level of source organization, called [pages](../reference/element-types/entries.md#pages). <Since ver="5.9.0" feature="Customizable entry source “pages”" />
+
 ### Filters and Columns
 
 As a complement to [search](searching.md) and [custom sources](#sources), any user with access to an element index can temporarily filter results using the condition builder interface:
@@ -221,7 +224,9 @@ Use the **View** controls to switch back into structure mode on an index if you
 
 ### Actions
 
-Each element type supports its own set of _actions_ that can be performed on one or more elements, from an index. These actions are either visible directly in the index toolbar (like _Status_), or collected under the <Icon kind="action" /> icon in the footer (like _Delete_). Actions may be hidden or disabled when they don’t apply to the selection or [source](#sources).
+Each element type supports its own set of _actions_ that can be performed on one or more elements, from an index. These actions are either visible directly in the index toolbar (like _Status_), or collected under the <Icon kind="settings" /> icon in the footer (like _Delete_). Actions may be hidden or disabled when they don’t apply to the selection or [source](#sources).
+
+Additional actions may be available on an individual element’s edit screen, under the action <Icon kind="ellipses" /> menu.
 
 ### In-line Editing <Badge text="New!" />
 
@@ -231,7 +236,7 @@ Not all fields are editable in-line, and some may have simplified controls or in
 
 ### Exporters
 
-Craft can export sets of elements to CSV, JSON, or XML. The **Export…** button in the index footer displays all options, including any [custom exporters](../extend/element-exporter-types.md) registered by modules and plugins.
+Craft can export sets of elements to CSV, JSON, XML, <Since ver="5.9.0" feature="XLSX and YAML export formats">XLSX, or YAML</Since>. The **Export…** button in the index footer displays all options, including any [custom exporters](../extend/element-exporter-types.md) registered by modules and plugins.
 
 ### Modals & Contexts
 
@@ -243,7 +248,7 @@ A streamlined version of indexes are used when adding elements to a [relational]
 
 Throughout the control panel, you’ll encounter references to elements in a number of different contexts, like element indexes, [Matrix](../reference/field-types/matrix.md) fields, and other [relational](relations.md) fields. Element _cards_ are a new way to display nested or related elements. They share the core features of element _chips_ (like quick-actions and ordering controls), but provide an additional layer of customization via the element’s [field layout](fields.md#field-layouts).
 
-Both chips and cards support thumbnails, but only cards allow additional custom field values to be bubbled up. The presence and order of those fields is dictated by a combination of the field layout and customizable [card attributes](#custom-card-attributes) <Since ver="5.5.0" feature="Customizable card attributes" />; additional features like colorization and icons are supported by [entries](../reference/element-types/entries.md).
+Both chips and cards support thumbnails, but only cards allow additional custom field values to be bubbled up. The presence and order of those fields is dictated by a combination of the field layout and <Since ver="5.5.0" feature="Customizable card attributes">customizable [card attributes](#custom-card-attributes)</Since>; additional features like colorization and icons are supported by [entries](../reference/element-types/entries.md).
 
 <img src="../images/element-cards.png" alt="Two element “cards” in the Craft control panel, show thumbnails, titles, and statuses." />
 
diff --git a/docs/5.x/system/mail.md b/docs/5.x/system/mail.md
index a1f346622..f14ea2566 100644
--- a/docs/5.x/system/mail.md
+++ b/docs/5.x/system/mail.md
@@ -1,6 +1,7 @@
 # Email
 
-Craft sends email in response to some user actions, like account activation, email verification, password resets, and testing [email settings](#settings). All Craft editions are capable of sending emails, but system messages are only customizable in **Pro**.
+Craft sends email in response to some user actions, like account activation, email verification, password resets, and testing [email settings](#settings).
+All Craft editions are capable of sending emails, but system messages are only customizable in **Pro**.
 
 Plugins may send email under other circumstances, either by registering a global [system message](#system-messages), or using [their own management tools](#other-messages).
 
@@ -18,12 +19,14 @@ You can view and edit the built-in (and plugin-provided) email messages by navig
 Click on any message to open a modal and edit its subject and body.
 
 ::: tip
-Running a [multi-site](sites.md) installation? You can customize system messages (and [mail settings](#settings)) on a per-site basis using the site selection menu in the upper-right corner of the message editor modal.
+Running a [multi-site](sites.md) installation?
+You can customize system messages (and [mail settings](#settings)) on a per-site basis using the site selection menu in the upper-right corner of the message editor modal.
 :::
 
 ### Twig
 
-The body of each system message is evaluated as a Twig template, then parsed as [Markdown](https://daringfireball.net/projects/markdown/). Subject lines may also include Twig.
+The body of each system message is evaluated as a Twig template, then parsed as [Markdown](https://daringfireball.net/projects/markdown/) (or [Github-flavored Markdown](https://github.github.com/gfm/), since 5.9.0).
+Subject lines can also include Twig.
 
 <See path="../development/twig.md" description="Get to know Twig, Craft’s template engine." />
 
@@ -64,10 +67,12 @@ Password Reset
 : - `link`: A tokenized password reset URL.
 
 ::: warning
-When outputting user-provided values (like a username, email, or [address](../reference/element-types/addresses.md)), always use the [escape](https://twig.symfony.com/doc/3.x/filters/escape.html) filter. You can see the shorter version (`|e`) in use in the template, above.
+When outputting user-provided values (like a username, email, or [address](../reference/element-types/addresses.md)), always use the [escape](https://twig.symfony.com/doc/3.x/filters/escape.html) filter.
+You can see the shorter version (`|e`) in use in the template, above.
 :::
 
-Keep in mind that users may have different amounts of profile data populated when they register or reset their password. Include default or alternate text when the desired text may not be available:
+Keep in mind that users may have different amounts of profile data populated when they register or reset their password.
+Include default or alternate text when the desired text may not be available:
 
 ```twig
 {# Output a comma before the user’s name, or jump right to a punctuation mark: #}
@@ -76,7 +81,8 @@ Hello{{ user.fullName is not empty ? ", #{user.fullName}" : null }}!
 
 #### URLs
 
-You may output element URLs just as you would in a front-end template. However, if you are linking to an arbitrary path, use the appropriate URL helper function, in Twig:
+You may output element URLs just as you would in a front-end template.
+However, if you are linking to an arbitrary path, use the appropriate URL helper function, in Twig:
 
 ```twig
 {# Forces a site URL: #}
@@ -86,7 +92,9 @@ You may output element URLs just as you would in a front-end template. However,
 {{ cpUrl('myaccount')}}
 ```
 
-Using the agnostic `url()` function may generate incorrect URLs that reflect how an email was triggered rather than the kind of access the recipient has. For example, a user requesting a password reset link from the front-end will get the proper site URL, but the same email sent in response to an administrator’s action would be prefixed with the <config5:cpTrigger>.
+Using the context-agnostic `url()` function may generate incorrect URLs that reflect _how an email was triggered_ rather than _the kind of access the recipient has_.
+For example, a user requesting a password reset link from the front-end will get the proper site URL, but the same email sent by an administrator from the control panel may be prefixed with the <config5:cpTrigger>.
+When Craft provides a URL in one of the predefined [variables](#variables), it uses the appropriate context: a control panel URL for users with access, or a site URL for those without.
 
 #### Language
 
@@ -102,7 +110,9 @@ Craft generates transforms for images used within emails prior to sending them.
 
 ## Other Messages
 
-Plugins may create and send email messages outside of [system messages](#system-messages). For example, [Commerce](/commerce/5.x/README.md) provides a [user-configurable suite of messages](/commerce/5.x/system/emails.md) and status-based triggers, rather than defining messages in the global space. The mailer will use the **System Email**
+Plugins may create and send email messages outside of [system messages](#system-messages).
+For example, [Commerce](/commerce/5.x/README.md) provides a [user-configurable suite of messages](/commerce/5.x/system/emails.md) and status-based triggers, rather than defining messages in the global space.
+Craft’s mailer sends from the **System Email Address**, unless overridden by a plugin.
 
 ::: tip
 If you are unsure where an email is sent from (or how to edit it), check the system messages utility, then consult the documentation for any installed plugins.
diff --git a/docs/5.x/system/reference-tags.md b/docs/5.x/system/reference-tags.md
index e4ca4c82d..d8ac231d2 100644
--- a/docs/5.x/system/reference-tags.md
+++ b/docs/5.x/system/reference-tags.md
@@ -52,7 +52,7 @@ Curly braces (`{}`) surround the entire tag, with segments separated by colons (
 Element types provided by plugins may offer their own reference handles. Check the element type’s static `refHandle()` method, or [generate an example tag](#generating-tags) from an element index.
 :::
 
-### Examples
+## Examples
 
 The following are all valid reference tag formats:
 
diff --git a/docs/5.x/system/relations.md b/docs/5.x/system/relations.md
index aa0f197cc..c076ad393 100644
--- a/docs/5.x/system/relations.md
+++ b/docs/5.x/system/relations.md
@@ -18,7 +18,7 @@ _Unlike_ other field types, relational fields store their data in a dedicated `r
 
 This allows you to design fast and powerful [queries](#the-relatedto-parameter) for related content, and to [optimize loading](../development/eager-loading.md) of nested and related resources.
 
-### Terminology
+## Terminology
 
 Each relationship consists of two elements we call the *source* and *target*:
 
@@ -64,7 +64,7 @@ Craft has five built-in relational fields, each of which establishes connections
 
 Additionally, the [link field](../reference/field-types/link.md) uses the relations system to store references to assets, categories, and entries.
 
-[Addresses](../reference/element-types/addresses.md) (as well as other nested entries like those in [Matrix](../reference/field-types/matrix.md) or [content blocks](../reference/field-types/content-block.md) fields) and [global sets](../reference/element-types/globals.md) don’t have relational fields, in the traditional sense—the former are managed as nested elements and implicitly connected to their owners; the latter exist as static, singleton elements and are functionally equivalent to a boolean value.
+[Addresses](../reference/element-types/addresses.md) (as well as other nested elements like those in [Matrix](../reference/field-types/matrix.md) or [content blocks](../reference/field-types/content-block.md) fields) and [global sets](../reference/element-types/globals.md) don’t have relational fields, in the traditional sense—the former are managed as nested elements and implicitly connected to their owners; the latter exist as static, singleton elements and are functionally equivalent to a boolean value.
 If you do need to point to one of your global sets (say, to display one of a few fixed sets of data), consider adding a [dropdown field](../reference/field-types/dropdown.md) populated with the global set handles.
 You can then directly load the corresponding global set element using a query:
 
diff --git a/docs/5.x/system/routing.md b/docs/5.x/system/routing.md
index 398a1df90..8e6e7e61d 100644
--- a/docs/5.x/system/routing.md
+++ b/docs/5.x/system/routing.md
@@ -62,28 +62,34 @@ If [Dev Mode](config5:devMode) is enabled, an error report for the exception wil
 
 In some cases, you may want a URL to load a template, but its location in your `templates/` folder doesn’t agree with the URI (therefore bypassing step #4), or the URI itself is “dynamic” or parameterized.
 
-A good example of this is a yearly archive page, where you want a year to be one of the segments in the URL (e.g. `blog/archive/2018`). Creating a static route or template for every year would be impractical—instead, you can define a single route with placeholders for dynamic values:
+A good example of this is an “archive” browseable by year, controlled by a path segment in the URL (e.g. `blog/2025`).
+Remembering to create an entry, static route, or template each year would be impractical—instead, you can define a single route with placeholders for dynamic segments:
 
 ![Creating a New Route](../images/routing-creating-new-route.png)
 
 ### Creating Routes
 
-To create a new Route, go to <Journey path="Settings, Routes" /> and choose **New Route**. A modal window will appear where you can define the route settings:
+To create a new route, go to <Journey path="Settings, Routes" /> and choose **New route**. A modal window will appear where you can define the route settings:
 
 - What should the URI look like?
 - Which template should get loaded?
+- Which sites does the route apply to?
 
-The first setting can contain “tokens”, which represent a range of possible matches, rather than a specific string. (The `year` token, for example, represents four consecutive digits.) When you click on a token, Craft inserts it into the URI setting wherever the cursor is.
+The first setting can contain [tokens](#available-tokens), which represent a range of possible matches, rather than a specific string.
+The `year` token, for example, represents four consecutive digits.
+Tokens can be anywhere in a route, and do not need exclusive control over a path segment (i.e. `blog/daily-summary/{year}-{month}-{day}`).
+When you click on a token, Craft inserts it into the URI setting wherever the cursor is.
 
-If you want to match URIs that look like `blog/archive/2018`, type `blog/archive/` into the URI field and choose the `year` token.
+If you want to match URIs that look like `blog/2025`, type `blog/` into the URI field, then insert the `year` token.
 
 ::: tip
-Route URIs should _not_ begin with a slash (`/`).
+Route URIs should _not_ begin with a slash (`/`), and cannot contain query strings (`?`) or fragments (`#`).
 :::
 
-After defining your URI pattern and entering a template path, press **Save**. The modal will close, revealing your new route on the page.
+After defining your URI pattern and entering a template path, press **Save**.
+The modal will close, revealing your new route on the page.
 
-When you point your browser to `https://my-project.tld/blog/archive/2018`, it will match your new route, and Craft will load the specified template with value of the `year` token automatically available in a variable called `year`:
+When you point your browser to `https://my-project.tld/blog/2025`, it will match your new route, and Craft will render the specified template with a variable named `year`, corresponding to the token:
 
 ```twig
 {# Fetch posts in the specified `year`: #}
@@ -109,9 +115,12 @@ When you point your browser to `https://my-project.tld/blog/archive/2018`, it wi
 Routes automatically support [pagination](../reference/twig/tags.md#paginate), so this one route covers other URIs like `/blog/archive/2018/page/2` (assuming your <config5:pageTrigger> was `page/`). If you wanted to break the archive into smaller logical chunks, you could use additional [tokens](#available-tokens) to collect results by month—or even by day!
 :::
 
+The order of your routes is important!
+New routes are appended to this list, but can be dragged-and-dropped <Icon kind="move" /> into the desired order.
+
 ### Available Tokens
 
-The following tokens are available to the URI setting:
+The following tokens are available in the URI setting:
 
 - `*` – Any string of characters, except for a forward slash (`/`)
 - `day` – Day of a month (`1`-`31` or `01`-`31`)
@@ -124,9 +133,7 @@ The following tokens are available to the URI setting:
 - `year` – Four consecutive digits
 
 ::: tip
-If you define a route using a wildcard token (`*`) in the control panel, it will automatically be available as a named parameter called `any`.
-
-![Screenshot of Create a new route control panel form with wildcard token](../images/route-with-wildcard-token.png =400x300)
+If you define a route using a wildcard token (`*`) in the control panel, the captured value will automatically be available as a named parameter called `any`.
 
 The template for `my-project.tld/foo/some-slug` could then use `{{ any }}`:
 
@@ -138,7 +145,7 @@ It seems you’re looking for `{{ any }}`.
 
 ## Advanced Routing with URL Rules
 
-In addition to routes defined via the control panel, you can define [URL rules](guide:runtime-routing#url-rules) in `config/routes.php`.
+In addition to routes defined via the control panel, you can define [URL rules](guide:runtime-routing#url-rules) in `config/routes.php` that map to templates or [custom controllers](../extend/controllers.md):
 
 ```php
 return [
@@ -150,7 +157,8 @@ return [
 ];
 ```
 
-If your Craft installation has multiple sites, you can create site-specific URL rules by placing them in a sub-array, and set the key to the site’s handle. Craft will take care of determining the site’s base URL via this handle, so you don’t need to declare it as part of the route pattern itself.
+If your Craft installation has multiple sites, you can create site-specific URL rules by nesting them under a key corresponding to the site’s handle.
+Craft will take care of determining the site’s base URL via this handle, so you don’t need to declare it as part of the route pattern itself:
 
 ```php
 return [
@@ -160,7 +168,7 @@ return [
 ];
 ```
 
-A subset of the [tokens](#available-tokens) above can be used within the regular expression portion of your [named parameters](guide:runtime-routing#named-parameters):
+A subset of the [tokens](#available-tokens) above can be used in place of a regular expression in any [named parameter](guide:runtime-routing#named-parameters):
 
 - `{handle}` – matches a field handle, volume handle, etc.
 - `{slug}` – matches an entry slug, category slug, etc.
@@ -175,7 +183,8 @@ return [
 
 ### Accessing Named Parameters in your Templates
 
-URL rules that route to a template (`['template' => 'my/template/path']`) will pass any named parameters to the template as variables—just like CP-defined routes. For example, this rule…
+URL rules that route to a template (`['template' => 'my/template/path']`) will pass any named parameters to the template as variables—just like CP-defined routes.
+For example, this rule…
 
 ```php
 'blog/archive/<year:\d{4}>' => ['template' => 'blog/_archive'],
diff --git a/docs/5.x/system/user-management.md b/docs/5.x/system/user-management.md
index 140436dab..80cb46fc2 100644
--- a/docs/5.x/system/user-management.md
+++ b/docs/5.x/system/user-management.md
@@ -52,7 +52,7 @@ Suspended
 Inactive
 :   New users and users that have been explicitly deactivated are marked as **Inactive**. An inactive user cannot log in, reset their password, or reactivate their account.
 
-#### Special States
+### Special States
 
 Credentialed
 :   Craft has a special distinction for users who are able to log in _or could become able to log in_ under their own power. Any user that is either **Active** or **Pending** is considered **Credentialed**.
@@ -263,6 +263,50 @@ Keep in mind that permissions issues are dealt with differently than [validation
 
 You can look up users with a given permission using the [`can()` method](../reference/element-types/users.md#can) on a user query. To find users belonging to a specific group, use the [`group()` method](../reference/element-types/users.md#group).
 
+### Customizing Authorization
+
+Any time Craft checks a user’s capabilities in the context of a specific [element](elements.md), it emits a number of [events](../extend/events.md).
+If the built-in permissions (combined with field layout conditions) are not granular enough to enforce your editorial workflow, you can design arbitrarily complex checks in code.
+
+In a [custom module](../extend/module-guide.md), listen for any of the <craft5:craft\base\Element> `EVENT_AUTHORIZE_*` events, and set the <craft5:craft\events\AuthorizationCheckEvent::$authorized> property to `true` when your criteria are met.
+
+```php
+use craft\elements\Entry;
+use craft\services\Elements;
+use craft\events\AuthorizationCheckEvent;
+
+Event::on(
+    Entry::class,
+    Elements::EVENT_AUTHORIZE_SAVE,
+    function(AuthorizationCheckEvent $e) {
+        // Make sure the system says they’re capable of this:
+        if (!$e->element->canSave($e->user)) {
+          return;
+        }
+
+        // Is the entry part of a section we care about?
+        $section = $e->element->getSection();
+
+        if (!$section || $section->handle !== 'classifieds') {
+          return;
+        }
+
+        // Ok, they have the relevant permissions.
+        // Let’s see if they've accepted the terms of service:
+        if (!$e->user->acceptedTos) {
+          $e->authorized = false;
+        }
+    }
+);
+```
+
+::: warning
+Setting `true` _or_ `false` in a handler shortcuts Craft’s internal checks, and the user’s real system permissions are never evaluated.
+Avoid setting either value until you are absolutely certain a user should (or should not) be permitted to perform an action.
+:::
+
+Permissions violations can result in confusion and lost data, so your criteria should be stable and well-communicated: in the front-end, this might mean hiding or disabling a link to an entry form so that the user learns about account limitations _prior_ to entering data.
+
 ## Preferences
 
 Users have a few settings that govern their experience of the control panel and front-end, including their preferred **Language** and **Formatting Locale**, a number of **Accessibility** features, and (for [administrators](#admin-accounts)) debugging tools.
diff --git a/docs/5.x/upgrade.md b/docs/5.x/upgrade.md
index eee910808..fdcfc5894 100644
--- a/docs/5.x/upgrade.md
+++ b/docs/5.x/upgrade.md
@@ -468,7 +468,7 @@ If you don’t have control over the query _value_ (say, it comes from a third-p
   .all() %}
 ```
 
-You may also want to review any [custom sources](system/elements.md#sources) that use condition rules targeting the [affected field types](development/element-queries.md#case-sensitivity).
+Textual condition rules in [custom sources](system/elements.md#sources) and [field layouts](system/fields.md#conditions) are always handled case-insensitively. <Since ver="5.9.0" description="Condition rules were made case-insensitive in {product} {ver}" />
 
 ### Matrix Fields