diff --git a/docs/.vuepress/components/Poi.vue b/docs/.vuepress/components/Poi.vue
index ec107a580..ecb7e9856 100644
--- a/docs/.vuepress/components/Poi.vue
+++ b/docs/.vuepress/components/Poi.vue
@@ -48,6 +48,10 @@ export default {
     methods: {
         activatePoi() {
             this.isActive = true;
+
+            const $browser = document.getElementById(this.target);
+
+            $browser.scrollIntoView({ behavior: 'smooth' });
         },
         deactivatePoi() {
             this.isActive = false;
diff --git a/docs/.vuepress/theme/global-components/Badge.vue b/docs/.vuepress/theme/global-components/Badge.vue
index 898aceabe..04af8177c 100644
--- a/docs/.vuepress/theme/global-components/Badge.vue
+++ b/docs/.vuepress/theme/global-components/Badge.vue
@@ -62,7 +62,7 @@ export default {
     border-width: 1px;
     border-color: var(--border-color);
     color: var(--sidebar-link-color);
-    padding: 4px calc(5px - 0.1em) 4px 5px;
+    padding: 4px calc(4px - 0.1em) 4px 5px;
   }
 
   &.edition {
@@ -70,7 +70,7 @@ export default {
     border-width: 1px;
     border-color: var(--text-color);
     color: var(--text-color);
-    padding: 0.3em 0.4em 0.1em;
+    padding: 0.35em 0.3em 0.2em 0.4em;
   }
 
   & + & {
diff --git a/docs/.vuepress/theme/global-components/BrowserShot.vue b/docs/.vuepress/theme/global-components/BrowserShot.vue
index e00c14829..63b533a2e 100644
--- a/docs/.vuepress/theme/global-components/BrowserShot.vue
+++ b/docs/.vuepress/theme/global-components/BrowserShot.vue
@@ -1,6 +1,7 @@
 <template>
   <component
     class="browser-shot"
+    :id="id"
     :is="link ? 'a' : 'div'"
     :href="link ? url : null"
     :target="link ? '_blank' : null"
diff --git a/docs/4.x/installation.md b/docs/4.x/installation.md
index 98fd53d5f..70eb7efff 100644
--- a/docs/4.x/installation.md
+++ b/docs/4.x/installation.md
@@ -43,11 +43,7 @@ While we [strongly recommend](#why-ddev) DDEV for new Craft projects, [alternate
     ddev composer create -y --no-scripts "craftcms/craft:^4"
     ```
 
-1. Run the Craft setup wizard, and accept all defaults (in `[square brackets]`):
-
-    ```bash
-    ddev craft install
-    ```
+    The setup wizard will start automatically! Accept all defaults (in `[square brackets]`), and note your chosen username and password.
 
     ::: tip
     Our [First-Time Setup](kb:first-time-setup) guide in the Knowledge Base has more information about what to expect during setup.
diff --git a/docs/5.x/install.md b/docs/5.x/install.md
index d2668f964..f9f143f3c 100644
--- a/docs/5.x/install.md
+++ b/docs/5.x/install.md
@@ -38,14 +38,10 @@ While we [strongly recommend](#why-ddev) DDEV for new Craft projects, [alternate
 1. Scaffold the project from the official [starter project](https://github.com/craftcms/craft):
 
     ```bash
-    ddev composer create -y --no-scripts "craftcms/craft"
+    ddev composer create -y "craftcms/craft"
     ```
 
-1. Run the Craft setup wizard, and accept all defaults (in `[square brackets]`):
-
-    ```bash
-    ddev craft install
-    ```
+    The setup wizard will start automatically! Accept all defaults (in `[square brackets]`), and note your chosen username and password.
 
     ::: tip
     Our [First-Time Setup](kb:first-time-setup) guide in the Knowledge Base has more information about what to expect during setup.
diff --git a/docs/commerce/5.x/development/cart.md b/docs/commerce/5.x/development/cart.md
index d17520475..75b73ec4e 100644
--- a/docs/commerce/5.x/development/cart.md
+++ b/docs/commerce/5.x/development/cart.md
@@ -61,7 +61,7 @@ This is generally not necessary, and can have significant performance impacts on
 
 To see what cart information you can use in your templates, take a look at the [Order](commerce5:craft\commerce\elements\Order) class reference. You can also refer to the example templates’ [`shop/cart/index.twig`](https://github.com/craftcms/commerce/blob/5.x/example-templates/dist/shop/cart/index.twig) file.
 
-Once a cart is completed and turned into an order, accessing the current cart via either method starts this process over.
+Once a cart is completed and becomes an order, accessing the current cart via either method starts this process over.
 
 ## Displaying Cart Contents
 
@@ -93,9 +93,9 @@ Craft includes a powerful [internationalization engine](guide:tutorial-i18n#plur
 
 ### Line Items
 
-A cart’s contents are represented by _line items_. Line items are typically populated from [purchasables](../system/purchasables.md) when they are added to the cart, but [custom line items](#custom-line-items) can also be created on-the-fly. <Since product="commerce" ver="5.1.0" feature="Custom, ad-hoc line items" />
+A cart’s contents are represented by _line items_. Line items are typically populated and refreshed from [purchasables](../system/purchasables.md) when they are added to the cart, but [custom line items](#custom-line-items) can also be created on-the-fly. <Since product="commerce" ver="5.1.0" feature="Custom, ad-hoc line items" />
 
-Out-of-the-box, line items  [variant](../system/products-variants.md), and have a quantity, description, notes, a calculated subtotal, options, adjustments (like tax and shipping costs), and other metadata. Most importantly, though, the line item retains a reference to its purchasable so that it can be refreshed with the latest information from your store while the customer is shopping.
+Out-of-the-box, most line items represent a [variant](../system/products-variants.md), and have a quantity, description, notes, a calculated subtotal, options, adjustments (like tax and shipping costs), and other metadata. Most importantly, though, the line item retains a reference to its purchasable so that it can be refreshed with the latest information from your store while the customer is shopping. [Donations](../system/donations.md) are also added to the cart as line items.
 
 ::: tip
 In the event a product or variant is altered or deleted after a customer checks out, enough information is memoized on each line item to reconstruct what was purchased, and how much was paid. Some of this is recorded directly on the line item (like [prices](#prices) and its [physical attributes](#physical-properties)), and some is stored as metadata (like [options](#line-item-options-and-notes) and [snapshots](../system/purchasables.md#snapshots)).
@@ -116,7 +116,9 @@ Line items are always returned as an array, even if there is only a single item
 </ul>
 ```
 
-You can get a line item’s source [purchasable](../system/purchasables.md) by calling `item.purchasable`. Let’s take a closer look at some other data available via line items.
+You can get a line item’s source [purchasable](../system/purchasables.md) (most often a [variant](../system/products-variants.md#variants)) by calling `item.purchasable`, and the product a variant belongs to via `item.purchasable.product` or `item.purchasable.owner`.
+
+Let’s take a closer look at some other data available via line items.
 
 #### Prices
 
diff --git a/docs/getting-started-tutorial/README.md b/docs/getting-started-tutorial/README.md
index 7f42b5521..cd957b9c0 100644
--- a/docs/getting-started-tutorial/README.md
+++ b/docs/getting-started-tutorial/README.md
@@ -21,6 +21,12 @@ If you get stuck, [join us on Discord](https://craftcms.com/discord)! We all wan
 
 Craft is a flexible, user-friendly <abbr title="Content management system">CMS</abbr> for creating custom digital experiences on the web—and beyond.
 
-You have a _ton_ of options when it comes to choosing a CMS. Craft is uniquely equipped to deliver high-quality, content-driven experiences to your clients and their audiences, in large part due to its blank-slate approach to content modeling.
+You have a _ton_ of options when it comes to choosing a CMS. Craft is uniquely equipped to deliver high-quality, content-driven experiences to your clients and their audiences, in large part due to its blank-slate approach to content modeling and front-end development.
 
 To demonstrate Craft’s agility, we’ll build a basic blog—and in doing so, touch a number of powerful tools that let you design, build, and manage _any_ kind of content.
+
+## Editions + Licensing
+
+Craft’s <Badge type="edition" vertical="text-bottom">Solo</Badge> edition is free to use for personal projects. Everything we’ll cover in this tutorial is available in Solo, and you won’t be asked to sign up for accounts or add payment info. If you want to explore features of Craft’s <Badge type="edition" vertical="text-bottom">Team</Badge> or <Badge type="edition" vertical="text-bottom">Pro</Badge> editions, you are welcome to upgrade and test locally for as long as you like!
+
+_Please note that installing any version of Craft binds you to our [Terms of Service](https://craftcms.com/terms-of-service) and [Acceptable Use Policy](https://craftcms.com/acceptable-use-policy)._
diff --git a/docs/getting-started-tutorial/build/README.md b/docs/getting-started-tutorial/build/README.md
index 790617006..a3b210884 100644
--- a/docs/getting-started-tutorial/build/README.md
+++ b/docs/getting-started-tutorial/build/README.md
@@ -16,7 +16,7 @@ Craft supports two fundamentally different approaches to building a front-end:
 ::: tip
 Both methods give you complete access to your content. You are free to choose one of these approaches, combine aspects that suit your project, switch between them at a later date, deploy both for different audiences, or come up with your own hybrid architecture!
 
-Craft doesn’t dictate anything about how you consume your content—in fact, it can be used as a back-end for a native application or kiosk, a bare API… or have no front-end at all, and exist solely as a warehouse for structured data.
+Craft doesn’t dictate _anything_ about how you consume your content—in fact, it can be used as a back-end for a native application or kiosk, a bare API… or have no front-end at all, and exist solely as a warehouse for structured data.
 :::
 
 This tutorial will focus on a “monolithic” architecture, due to its lack of external dependencies—however, we will touch on the [GraphQL API](../more/graphql.md) in the _More_ section.
diff --git a/docs/getting-started-tutorial/build/blog-templates.md b/docs/getting-started-tutorial/build/blog-templates.md
index 04b45bcc9..241095f36 100644
--- a/docs/getting-started-tutorial/build/blog-templates.md
+++ b/docs/getting-started-tutorial/build/blog-templates.md
@@ -72,7 +72,7 @@ Create `templates/blog/_entry.twig` and paste this code to it:
 The first highlighted line connects our post template with the layout template, using the `{% extends %}` tag. The second highlight defines a `{% block ... %}`, the content of which will be output in the corresponding region of `_layout.twig`.
 
 ::: tip
-When using layouts, all output must be within `block` tag pairs—but you may have as many `block` tags as you wish!
+When extending a layout, all output must be within `block` tag pairs—but you may have as many `block` tags as you wish!
 :::
 
 Now that the blog section’s template is ready, you can visit the URL for a published post:
@@ -120,7 +120,7 @@ If you were to go back into the control panel and create some more posts, you co
 
 #### Feature Image
 
-Let’s output the image we attached via [the “Feature Image” asset field](../configure/resources.md#feature-image). That field had a handle of `featureImage`, so it will be available on the `entry` variable as `entry.featureImage`, just like the title was:
+Let’s display the image we attached via [the “Feature Image” asset field](../configure/resources.md#feature-image). When we attached the assets field to the _Post_ field layout, we gave it a handle of `featureImage`—so it will be available on the `entry` variable as `entry.featureImage`, just like its title was:
 
 ```twig{4,15-19}
 {% extends '_layout' %}
@@ -171,6 +171,8 @@ If you would prefer to build the image element yourself, you can get the individ
   height="{{ featureImage.height }}" />
 ```
 
+Note the use of `featureImage.alt`! Craft automatically adds this attribute when building the tag itself—but it will be empty unless you add the **Alternative Text** field layout element to the volume’s field layout (and populate it with a description of the image).
+
 </Block>
 
 Refresh the page to see your changes:
@@ -241,9 +243,9 @@ If you pasted this into `templates/blog/_entry.twig` and the indentation got mes
 
 Let’s output the [post content](../configure/resources.md#post-content) stored in our Matrix field. This process starts in a familiar way:
 
-1. Load matrix blocks via the `postContent` field handle and store them in a variable;
-1. Loop over those blocks with a `{% for %}` tag;
-1. Render different content based on the blocks’ types, using an `{% if %}` tag;
+1. Load the nested entries via the `postContent` field handle and store them in a variable;
+1. Loop over those entries with a `{% for %}` tag;
+1. Render different content based on the entries’ types, using an `{% if %}` tag;
 
 After the line that declares our `topics` variable, add a new `set` tag:
 
@@ -254,7 +256,7 @@ After the line that declares our `topics` variable, add a new `set` tag:
 {% set postContent = entry.postContent.all() %}
 ```
 
-With the content loaded into a `postContent` variable, we can start outputting data for each block. Below the topics list, add a new `for` loop:
+With the content loaded into a `postContent` variable, we can start outputting data for each block. Below the topics list and feature image, add a new `for` loop:
 
 ```twig{2,4,7,12,17,22}
 <div class="post-content">
@@ -290,9 +292,9 @@ With the content loaded into a `postContent` variable, we can start outputting d
 
 Looking at the highlighted lines in this block of code…
 
-- Our `for` loop uses the `postContent` variable defined at the top of the template, and makes each block available in turn as `contentBlock`;
-- We capture the “type” of block in a variable named `blockType` so we can compare against it later;
-- The `if`, `elseif`, and `else` tags test the value of `blockType` each time through the loop and render different sections of the template;
+- Our `for` loop uses the `postContent` variable defined at the top of the template, and makes each nested entry available in turn as `contentBlock`;
+- We capture the “type” of entry in a variable named `blockType` so we can compare against it later;
+- The `if`, `elseif`, and `else` tags test the value of `blockType` each time through the loop and render different parts of the template;
 - “Image” blocks contain an asset field that can be used exactly the same way as the `featureImage` field is on the main entry;
 - An `else` tag is used to provide some debugging information for us—but it will only show up if we’ve gotten our block type handles mixed up;
 - A final `else` tag actually belongs to the main `for` loop, and allows us to output a message when there are no blocks to display;
@@ -305,11 +307,11 @@ How could we add a new _Quote_ block type?
 
 Back in the control panel:
 
-1. Visit **Settings** &rarr; **Fields** &rarr; **Post Content**;
-1. Click **New Block Type**;
-1. Name it _Quote_, and give it a handle of `quote`;
-1. Add a **Plain Text** field named _Quote_ (also with a handle of `quote`), and mark it as **Required**;
-1. Save the field;
+1. Visit <Journey path="Settings, Fields, Post Content" />;
+1. In the **Entry Types** selector, click **+ Create**;
+1. Name the new entry type “Quote”, and give it a handle of `quote`;
+1. Add our plain text field (_Text_) to its field layout, leaving the name and label as-is;
+1. Save the entry type;
 
 At this point, return to one of your blog entries’s edit screens, and add a **Quote** block to the **Post Content** matrix field. Reload that post’s page in the front-end, and you should see something like this:
 
@@ -321,9 +323,9 @@ In `templates/blog/_entry.twig`, add a new `elseif` comparison tag in the conten
   {# ... #}
 {% elseif blockType == 'quote' %}
   <div class="content-block quote">
-    <blockquote>{{ contentBlock.quote | md }}</blockquote>
+    <blockquote>{{ contentBlock.text | md }}</blockquote>
   </div>
-{% else %} {# This `else` tag is what outputs our “unsupported” message! #}
+{% else %} {# This `else` tag already exists, and is what outputs our “unsupported” message. #}
   {# ... #}
 ```
 
@@ -378,19 +380,25 @@ Create a new template at `templates/blog/index.twig`, with the following content
 {% endblock %}
 ```
 
+In your browser, navigate to `https://tutorial.ddev.site/blog`, and verify you see all the posts you created via the control panel!
+
 Notice that this template makes no reference to an `entry` variable. This is because it won’t be rendered based on an element’s URI format—Craft is just matching the request to `/blog` with a template.
 
-That doesn’t mean we can’t access our content, though! The first highlighted line uses what’s called an _element query_. Element queries are different from the automatically-injected `entry` variable: instead of containing a _specific_ entry object, they define some _criteria_ for loading one or more entries from the database.
+That doesn’t mean we can’t access our content, though! The first highlighted line uses what’s called an _element query_. Element queries are different from the automatically-injected `entry` variable: instead of containing a _specific_ entry object, they define some _parameters_ for loading one or more entries from the database.
 
 Element queries are designed to be written and read in relatively plain language. Let’s break this one down:
 
 1. `craft` is a global variable that collects a number of functions and features;
 1. `.entries()` creates a new element query with specific functionality for fetching entries;
-1. `.section()` configures the query to select only entries from the passed section(s);
+1. `.section()` configures that query to select only entries from the passed section(s);
 1. `.all()` executes the query and returns _all_ matching entries;
 
 Most element queries will have steps 1 and 4 in common, but steps 2 and 3 are specific to our need to fetch _entries_ in a particular _section_. We’ll have a chance to use some more element query features in the next step!
 
+::: tip
+Craft sorts entries by their `postDate` (newest to oldest), by default.
+:::
+
 ### Topic Pages
 
 Now that our blog index displays a list of posts, let’s implement the topic index pages. Much of the display logic will remain consistent between them, so this template will look pretty familiar.
@@ -435,9 +443,9 @@ From the blog index, click through to one of your posts, then click the topic li
 
 Like the blog index, we get a list of posts that each link out to their individual pages.
 
-_Unlike_ the blog index, our topic template automatically has access to a `category` variable. This is because every topic page is backed by a category element, just like our individual post pages. It’s still up to us, though, to decide what other data should be displayed—and to fetch it with element queries.
+_Unlike_ the blog index, our topic template automatically has access to a `category` variable. This is because every topic page is backed by a category element, just like our post entries. It’s still up to us, though, to decide what other data should be displayed—and to fetch it with element queries.
 
-We’ve used the `category` variable in a new entry element query, near the top of the template:
+We’ve used the `category` variable in a new entry query, near the top of the template:
 
 ```twig
 {% set posts = craft.entries().section('blog').postCategories(category).all() %}
diff --git a/docs/getting-started-tutorial/build/extra-templates.md b/docs/getting-started-tutorial/build/extra-templates.md
index 28c502b0e..4610d0e1c 100644
--- a/docs/getting-started-tutorial/build/extra-templates.md
+++ b/docs/getting-started-tutorial/build/extra-templates.md
@@ -4,59 +4,32 @@ sidebarDepth: 2
 
 # Extra Templates
 
-Now that we’ve scaffolded our blog templates, we can turn to some supporting features.
+Now that we’ve scaffolded our core blog templates, we can turn to some ancillary features. If you have your own ideas, or want to continue tinkering with the _Blog_ section, go for it! This section is mostly an opportunity to practice using tools you’ve already seen.
 
 ## About Page
 
-Our original content model included “About” page, which we’ll set up as another section.
+Our original content plan included an “About” page, which we’ll set up as another section. Back in the control panel:
 
-### Fields
-
-Let’s by creating some fields for the page. We need a place to put a paragraph or two of text, and way to upload a profile photo.
-
-#### Bio
-
-1. In the control panel, navigate to **Settings** &rarr; **Fields**;
-1. Click **+ New group** in the sidebar, and name it _About_;
-1. Click **+ New field** in the upper-right corner;
-1. Provide these settings:
-    - **Name**: Bio
-    - **Handle**: `bio`
-    - **Field Type**: **Plain Text**
-    - **Allow line breaks**: **Enabled**
-    - **Initial rows**: `8`
-1. Click **Save** or press <kbd>Ctrl/Command + S</kbd>;
-
-#### Profile Photo
-
-Picking up where you left off (in the _About_ field group), follow these steps:
-
-1. Click **+ New field** in the upper-right corner;
-1. Provide these settings:
-    - **Name**: Profile Photo
-    - **Handle**: `profilePhoto`
-    - **Field Type**: **Assets**
-    - **Sources**: **Images** only
-    - **Max relations**: `1`
-    - **View mode**: **Large Thumbnails**
-1. Click **Save** or press <kbd>Ctrl/Command + S</kbd>;
-
-### Single Section
-
-Continuing in the control panel…
-
-1. Navigate to **Settings** &rarr; **Sections**;
+1. Navigate to <Journey path="Settings, Sections" />;
 1. Click **+ New section**;
 1. Provide these settings:
-    - **Name**: _About_
+    - **Name**: “About”
     - **Handle**: `about`
     - **Section Type**: **Single**
     - **URI**: `about`
     - **Template**: `_singles/about`
-1. Click **Save and edit entry types** or press <kbd>Ctrl/Command + S</kbd>;
-1. Select the auto-generated entry type (it should also be named _About_);
-1. Drag fields from the **About** group into the field layout in whatever order you prefer;
-1. Click **Save** press <kbd>Ctrl/Command + S</kbd>;
+1. In the **Entry Types** selector, click **+ Create**, and use these settings:
+    - **Name**: “About”
+    - **Handle**: `about`
+    - **Show the Title field**, **Show the Slug field**, and **Show the Status field**: Off
+1. Add the base _Image_ field to the _Content_ tab in the field layout designer, and apply these overrides:
+    - **Label**: “Profile Image”
+    - **Handle**: `profileImage`
+    - Optional: Enable the **Use for element thumbnails** in the field layout element’s action menu <Icon kind="ellipses" />;
+1. Add the base _Text_ field to the _Content_ tab in the field layout designer, with these overrides:
+    - **Label**: “Bio”
+    - **Handle**: `bio`
+1. **Save** the entry type and section;
 
 With that, our new page is configured! Let’s head over to **Entries** &rarr; **Singles**, then click **About** to add some content.
 
@@ -67,15 +40,15 @@ Create `templates/_singles/about.twig` (the **Template** path we used when setti
 ```twig
 {% extends '_layout' %}
 
-{% set profilePhoto = entry.profilePhoto.one() %}
+{% set profileImage = entry.profileImage.one() %}
 
 {% block content %}
   <h1>{{ entry.title }}</h1>
 
   <div class="about">
-    {% if profilePhoto %}
+    {% if profileImage %}
       <div class="photo">
-        {{ profilePhoto.getImg() }}
+        {{ profileImage.getImg() }}
       </div>
     {% endif %}
 
@@ -86,7 +59,7 @@ Create `templates/_singles/about.twig` (the **Template** path we used when setti
 {% endblock %}
 ```
 
-This template builds upon features we’ve already seen in other places—layouts, element queries, `if` tags, and filters. We’ve interspersed a bit of HTML so that we can come back and apply CSS, later.
+This template builds upon features we’ve already seen in other places—layouts, element queries, `if` tags, and filters. We’ve interspersed a few `class` attributes in the HTML so that we can come back and target it with CSS, later.
 
 Navigate to `/about` (the _About_ section’s URI) in the front-end—you should see our page’s `title` and the profile image we uploaded:
 
@@ -146,6 +119,9 @@ The new `<header>` region is a great place to put a globally-available menu. Jus
 
 <nav>
   <ul>
+    <li>
+      <a href="{{ url('/') }}">Home</a>
+    </li>
     <li>
       <a href="{{ url('blog') }}">Blog</a>
     </li>
@@ -170,25 +146,17 @@ The updates above included a couple of items in the footer, but it’s worth tak
 
 Global sets are Craft’s way of storing a data that should be accessible _everywhere_ in our templates. They function almost exactly like the **Single** section we defined for the _About_ page, except that global sets don’t get their own URLs.
 
-In the control panel, navigate to **Settings** &rarr; **Fields**, then follow these steps:
-
-1. Click **+ New group** and name it _Global_;
-1. Click **+ New field**;
-1. Provide these field settings:
-    - **Name**: _Description_
-    - **Handle**: `description`
-    - **Field type**: **Plain Text**
-    - **Allow line breaks**: Enabled
-1. Click **Save** or press <kbd>Ctrl/Command + S</kbd>;
-
-With the field created, navigate to **Settings** &rarr; **Global Sets**:
+In the control panel, navigate to <Journey path="Settings, Globals" />, then follow these steps:
 
 1. Click **+ New global set**;
 1. Name the set _Site Info_ and use `siteInfo` for the handle;
-1. Click **+ New Tab** in the field layout designer, and name it _Settings_, _Content_, or something else generic (when there’s only a single tab, Craft will hide it—but it can’t be empty);
+1. Click **+ New Tab** in the field layout designer, and name it _Settings_, _Content_, or something else generic (when there’s only a single tab, Craft will hide the UI for it—but its name can’t be empty);
+1. Drag in the base _Text_ field, and override these settings:
+    - **Label**: “Description”
+    - **Handle**: `description`
 1. Click **Save** or press <kbd>Ctrl/Command + S</kbd>;
 
-A new **Globals** item should appear in the main navigation. Click that, and add a description:
+A new **Globals** item should appear in the main navigation. Click that, populate the **Description** field, and save it:
 
 <BrowserShot url="https://tutorial.ddev.site/admin/globals/siteInfo" :link="false">
 <img src="../images/globals.png" alt="Screenshot of the Craft control panel showing a global set edit screen" />
@@ -206,4 +174,6 @@ Back in `templates/_layout.twig`, output that blurb in the footer:
 </footer>
 ```
 
+Craft makes the `siteInfo` variable available on every page and in every template, so its fields are always within reach.
+
 Let’s put HTML aside for a moment and get some styles applied!
diff --git a/docs/getting-started-tutorial/build/optimization.md b/docs/getting-started-tutorial/build/optimization.md
index 5b491366a..3a41ec343 100644
--- a/docs/getting-started-tutorial/build/optimization.md
+++ b/docs/getting-started-tutorial/build/optimization.md
@@ -51,7 +51,7 @@ Some people prefer to pass variables _explicitly_ so that they know exactly what
 } only %}
 ```
 
-The `only` at the end of the tag ensures that no other variables from the current template are leaked into the included template.
+The `only` at the end of the tag ensures that no other variables from the current template are leaked into the included template. Craft’s global variables (and our `siteInfo` global set) will still be available.
 :::
 
 ## Asset Transforms
@@ -61,10 +61,10 @@ Applying CSS to our front-end finally got the images under control… but we’r
 The asset URLs that Craft generates for the `<img>` tags via `image.getImg()` look like this:
 
 ```
-https://tutorial-two.ddev.site/uploads/images/highway-26.jpg
+https://tutorial.ddev.site/uploads/images/highway-26.jpg
 ```
 
-This points to the unmodified, original file—exactly as it was uploaded. Craft always keeps these around, but we can ask for an optimized version via [transforms](/4.x/image-transforms.md).
+This points to the unmodified, original file—exactly as it was uploaded. Craft always keeps these around, but we can ask for an optimized version via [transforms](/5.x/development/image-transforms.md).
 
 Transforms are defined directly in your templates, or in the control panel. Each transform has a _mode_, which determines what other options are required. For our blog index, the most important qualities are the final _width_ of the image (about 640px, or double that for high-resolution displays), and that important subjects aren’t cropped out.
 
@@ -87,13 +87,13 @@ Let’s add these constraints to the template:
 Refreshing the blog index, you may notice a delay before the images are displayed again—that’s to be expected, as Craft only generates a transform when it’s requested for the first time.
 :::
 
-This one change reduced our page’s total size to 310KB—or by 99%!
+According to the browser’s **Network** tab (or looking at the original and transformed files on-disk), this one change reduced our page’s total size to about 310KB—or by _99%_!
 
 ### Named Transforms
 
 Applying these settings to all pages (and remembering to synchronize any tweaks between them) can be cumbersome. Fortunately, we can centralize these definitions in the control panel, and refer to them by only a handle:
 
-1. Navigate to **Settings** &rarr; **Assets** &rarr; **Image Transforms**;
+1. Navigate to <Journey path="Settings, Assets, Image Transforms" />;
 1. Click **+ New image transform**;
 1. Provide these settings, leaving others at their defaults:
     - **Name**: Thumbnail;
@@ -103,7 +103,7 @@ Applying these settings to all pages (and remembering to synchronize any tweaks
     - **Allow Upscaling**: Turn _off_;
 1. Click **Save**;
 
-Now we can reference this transform in our templates by its handle, rather than its specifics:
+Now we can reference this transform throughout our templates by its handle, rather than its specifics:
 
 ```twig
 <div class="thumbnail">
@@ -113,13 +113,13 @@ Now we can reference this transform in our templates by its handle, rather than
 
 ### Focal Points
 
-On the _About_ page, we’ve cropped the **Profile Photo** image as a circle, which almost perfectly cut out the subject. Craft doesn’t know about the content of this image—or what kind of frame it will be displayed in—but we can give it some hints.
+On the _About_ page, we’ve cropped the **Profile Photo** image as a circle, which almost perfectly cut out the subject (in the lower third of the image). Craft doesn’t know about the content of our image—or what kind of frame it will be displayed in—but we can give it some hints.
 
 The first step will be to define a transform. This is a one-off treatment, so we won’t bother going through the control panel:
 
 ```twig
 <div class="photo">
-  {{ profilePhoto.getImg({
+  {{ profileImage.getImg({
     mode: 'crop',
     width: 360,
     height: 360,
@@ -129,7 +129,7 @@ The first step will be to define a transform. This is a one-off treatment, so we
 
 This brings another marked improvement to the size of our pages—from 8MB for a single image to just over 40KB… but our subject is still getting cropped out!
 
-Open the _About_ page in the control panel, then double-click the attached asset in the <Poi label="1" target="asset-slideout" id="field" /> **Profile Photo** field. In the slideout, open the metadata panel with the control in the upper-right corner, then click <Poi label="2" target="asset-slideout" id="controls" /> **Edit image** in the preview window:
+Open the _About_ page in the control panel, then double-click the attached asset in the <Poi label="1" target="asset-slideout" id="field" /> **Profile Image** field. In the slideout, open the metadata panel with the control in the upper-right corner, then click <Poi label="2" target="asset-slideout" id="controls" /> **Edit image** in the preview window:
 
 <BrowserShot
   id="asset-slideout"
@@ -137,7 +137,7 @@ Open the _About_ page in the control panel, then double-click the attached asset
   :link="false"
   :poi="{
     field: [30, 35],
-    controls: [95, 18],
+    controls: [96, 16],
   }"
   caption="Changing an asset’s focal point.">
 <img src="../images/focal-point-open.png" alt="Screenshot of the image editor in the Craft control panel" />
@@ -150,8 +150,8 @@ In the image editor, click <Poi label="1" target="focal-point" id="button" /> **
   url="https://tutorial-two.ddev.site/admin/admin/entries/about/46-about"
   :link="false"
   :poi="{
-    button: [28, 27],
-    handle: [83, 55],
+    button: [27, 27],
+    handle: [81, 66],
   }"
   caption="Changing an asset’s focal point.">
 <img src="../images/focal-point-set.png" alt="Screenshot of the image editor in the Craft control panel" />
@@ -163,13 +163,13 @@ Click **Save** to confirm the new focal point, and return to the _About_ page in
 <img src="../images/focal-point-crop.png" alt="Screenshot of avatar tastefully cropping subject" />
 </BrowserShot>
 
-## Eager Loading
+## Eager-Loading
 
 Our blog’s indexes show a list of posts, each of which includes an image. We perform one query for the list of posts, then _each time we output a post_, we perform _another_ query to get the asset attached via its **Feature Image** field.
 
 This is what’s called an “N+1” problem: the number of queries required to load the content is proportional to the amount of content—and that could be _a lot_. If we had 50 posts, it would take 51 queries to display the blog feed; if we also wanted to display topics for each post in the feed, it would be _101_ queries!
 
-Craft addresses this with a feature called _eager loading_, which allows us to declare in the main query what nested elements we are apt to need, for every result:
+Craft addresses this with a feature called _eager loading_, which allows us to declare in the main query (or the secondary queries, as we’ll see in a moment) what nested elements we are apt to need, for each result:
 
 ```twig{3-5}
 {% set posts = craft.entries()
@@ -186,6 +186,18 @@ Without any changes to our templates, Craft is able to fetch the posts, then gat
 Only relational fields (**Assets**, **Entries**, **Categories**, and **Tags**) need to be eager-loaded—and not every scenario demands it! The best rule of thumb is to look out for nested `for` loops, or any time you use a relational field _inside_ a `for` loop.
 :::
 
+### Lazy Eager-Loading
+
+If you aren’t sure what data you need, ahead of time, you can defer eager-loading until those related or nested elements are actually needed. Instead of defining the eager-load requirements in both the blog index _and_ category templates, we can update the shared `blog/_feed.twig` template:
+
+```twig{2}
+{% for post in posts %}
+  {% set image = post.featureImage.eagerly().one() %}
+
+  {# ... #}
+{% endfor %}
+```
+
 ### Transforms
 
 When we defined image transforms for posts’ featured images on the blog index, we inadvertently triggered an additional query for each post, _on top of_ the asset query. Fortunately, eager loading is supported for transforms (named _and_ unnamed), as well:
@@ -217,3 +229,18 @@ When we defined image transforms for posts’ featured images on the blog index,
 :::
 
 While eager-loading can provide _some_ performance benefits here, maintaining transform options between queries and usage can become difficult. This is a great reason to consolidate transforms in the control panel!
+
+The equivalent solution for lazily eager-loaded elements would look like this (again in `templates/blog/_feed.twig`):
+
+```twig{3-5}
+{% for post in posts %}
+  {% set image = post.featureImage
+    .withTransforms([
+      { mode: 'fit', width: 1200 },
+    ])
+    .eagerly()
+    .one() %}
+
+  {# ... #}
+{% endfor %}
+```
diff --git a/docs/getting-started-tutorial/build/preview.md b/docs/getting-started-tutorial/build/preview.md
index c2b36be13..2ac55ffa6 100644
--- a/docs/getting-started-tutorial/build/preview.md
+++ b/docs/getting-started-tutorial/build/preview.md
@@ -6,4 +6,4 @@ Now that we have a full suite of templates (and enough CSS to make sense of our
 <img src="../images/live-preview.png" alt="Screenshot of control panel editing a post with live preview: content on the left and a front end preview on the right" />
 </BrowserShot>
 
-As you make edits in the content pane, Craft auto-saves the changes and refreshes the front-end preview. You can save your changes at any time, knowing that what you see is exactly what will be published!
+As you make edits in the content pane, Craft auto-saves the changes to a provisional draft and refreshes the front-end preview. You can apply your changes at any time, knowing that what you see is exactly what will be published!
diff --git a/docs/getting-started-tutorial/build/routing.md b/docs/getting-started-tutorial/build/routing.md
index 103930961..764f610f6 100644
--- a/docs/getting-started-tutorial/build/routing.md
+++ b/docs/getting-started-tutorial/build/routing.md
@@ -10,7 +10,7 @@ The relationship between your local development hostname (`https://tutorial.ddev
 
 ### Assets
 
-If you haven’t already done so, upload an image to your asset volume. When configuring the underlying filesystem, we set its **File System Path** to `@webroot/uploads/images`, which is a shortcut or _alias_ to a folder inside the `web/` directory at the top level of our project.
+If you haven’t already done so, upload an image to your asset volume. When configuring the underlying filesystem, we set its **File System Path** to `@webroot/uploads`, which is a shortcut or _alias_ to a folder inside the `web/` directory at the top level of our project.
 
 In VS Code, look in your sidebar for the `web/` directory, then navigate down to `uploads/images/`. You should see the file(s) you’ve uploaded, so far—and maybe a few extra folders that Craft created to store transforms (we’ll talk about transforms, later):
 
@@ -20,9 +20,9 @@ In VS Code, look in your sidebar for the `web/` directory, then navigate down to
 You should let Craft manage this directory (and eventually add it to the provided `.gitignore` file). Directly adding, deleting, moving, or renaming assets oftentimes means that Craft will lose track of them.
 :::
 
-The URL to a file in your `web/uploads/images/` directory will begin with `https://tutorial.ddev.site/uploads/images/`—we know this, because we set the filesystem’s **Base URL** to `@web/uploads/images`, where `@web` is another _alias_ that Craft provides that evaluates to the project’s root URL. If we had uploaded a photo named `photo.jpg`, the full URL would be `https://tutorial.ddev.site/uploads/images/photo.jpg`.
+The URL to a file in your `web/uploads/images/` directory will begin with `https://tutorial.ddev.site/uploads/images/`—we know this, because we set the filesystem’s **Base URL** to `@uploads/images`, where `@uploads` is another _alias_ that we defined in `general.php` to be the same as our project’s base URL. If we had uploaded an image named `photo.jpg`, its full URL would be `https://tutorial.ddev.site/uploads/images/photo.jpg`.
 
-Don’t worry about constructing these URLs—like entries, Craft knows what an asset’s URL should look like, based on where it is stored.
+Don’t worry about constructing these URLs yourself—like entries, Craft knows exactly what an asset’s URL should be, based on where it is stored.
 
 ### Other Files
 
@@ -40,6 +40,7 @@ The web root is a _bad_ place to store these kinds of things:
 
 - A `.env` file;
 - Database backups;
+- PHP files and other executables (except for `index.php`);
 - Readmes and other documentation about the project;
 - Exported data (unless it is intended for public use);
 
@@ -71,9 +72,9 @@ Whenever the HTTP server fails to find a file matching the current URL or “pat
 
 We’ve actually seen this in action from the moment we first logged in to the control panel! The same process is also why we got a [scary error screen](../configure/editing.md#previewing) when attempting to access one of our posts’ URLs.
 
-Entries in that section (_Blog_) have a **URI Format** of `blog/{slug}`. `{slug}` is a special placeholder, representing an entry’s _Slug_ value. When entries are created and updated, Craft evaluates this “template” and stores the result—for example, if a post named “My Trip to Bend” had a slug of `my-trip-to-bend`, it would be assigned a URI of `blog/my-trip-to-bend`.
+Entries in that section (_Blog_) have a **URI Format** of `blog/{slug}`. `{slug}` is a special placeholder, representing an entry’s **Slug** value. As entries are created and updated, Craft evaluates this “template” and stores the result—for example, if a post named “My Trip to Bend” had a slug of `my-trip-to-bend`, it would be assigned a URI of `blog/my-trip-to-bend`.
 
-Accessing `https://tutorial.ddev.site/blog/my-trip-to-bend` doesn’t match any files in our web root, so the HTTP server hands the request off to Craft. When that happens, Craft compares the path (`/blog/my-trip-to-bend`) to known URIs. (This is where our error occurred—Craft found our blog post and proceeded to load the template we defined in its settings… but it didn’t exist!)
+Accessing `https://tutorial.ddev.site/blog/my-trip-to-bend` doesn’t match any files in our web root, so the HTTP server hands the request off to Craft. When that happens, Craft compares the path (`/blog/my-trip-to-bend`) to known URIs. This is where our error occurred—Craft found our blog post and proceeded to load the template we defined in its settings… but it didn’t exist!
 
 Any request that _doesn’t_ match a known element URI is then tested against a few other special cases.
 
@@ -82,7 +83,7 @@ URIs _must_ be unique in Craft, meaning that each post in the _Blog_ section mus
 
 We’re specifically referring to these as _URI_s instead of _URLs_ because Craft doesn’t store or match against fully-qualified URLs. When a request reaches Craft (wherever the installation lives), it assumes its configuration provides a correct hostname or “base URL” with which it should construct URLs. When you installed Craft, it wrote a `PRIMARY_SITE_URL` variable to the `.env` file, and stored a reference to it in the default site’s settings.
 
-Altogether, this means that Craft sites are extremely portable. If you change the domain of a site (or move it into a subfolder), you usually only need to update a single environment variable to maintain all of your existing routes.
+Altogether, this means that Craft sites are extremely portable. If you change the domain of a site (or move it into a subfolder), you usually only need to update a single environment variable to maintain all of your existing routes and for Craft to be able to generate correct, absolute URLs.
 :::
 
 ## Template Routes
@@ -97,14 +98,14 @@ Let’s find that in VS Code:
 
 ![VS Code with index.html open and a prompt to install extensions visible](../images/vs-code-index-twig.png)
 
-We’re in the right place (the `<title>` tag’s content is the same as our browser’s tab), but this is pretty difficult to read as-is—our next step will be to get VS Code set up for working with _Twig_, Craft’s templating language.
+We’re in the right place (the `<title>` tag’s content is the same as our browser’s tab), but this is pretty difficult to read, as-is—our next step will be to get VS Code set up for working with _Twig_, Craft’s templating language.
 
-How does Craft know to render this template, though? It’s not in the web root (so we know Craft is serving the request), but we don’t have an entry, category, or other element type set up that would match the base _path_ (`/`).
+How does Craft know to render this template, though? It’s not in the web root (so we know Craft is involved in the request), but we don’t have an entry, category, or other element type set up that would match the base _path_ (`/`).
 
 Craft performs one additional check before giving up: it searches your `templates/` folder for a file that matches the request’s path. In this case, `index.twig` has some additional significance: the request path is actually _empty_ (the initial slash is ignored), so Craft looks in the root of the `templates/` folder for an `index.twig` or `index.html`.
 
 ::: details Another Path Example
-If we instead visited a path like `/not-a-real-page`, Craft would check to see if a template named `not-a-real-page.twig` (or `not-a-real-page.html`) existed in your root `templates/` folder, then check for `index.twig` (or `index.html`) in a `not-a-real-page/` subfolder.
+If we instead visited a path like `/not-a-real-page`, Craft would check to see if a template named `not-a-real-page.twig` (or `not-a-real-page.html`) existed in your root `templates/` folder, then check for `index.twig` (or `index.html`) in `templates/not-a-real-page/`.
 :::
 
 Having located our first template, it’s time to talk about the language that makes them dynamic: _Twig_.
@@ -115,4 +116,4 @@ Craft will only render Twig files that live in the `templates/` directory. You c
 
 ## Everything Else
 
-Craft has a few other routing tricks up its sleeve, but they aren’t immediately relevant to our blog. The main documentation has a complete guide to Craft’s [routing behavior](/4.x/routing.md).
+Craft has a few other routing tricks up its sleeve, but they aren’t immediately relevant to our blog. The main documentation has a complete guide to Craft’s [routing behavior](/5.x/system/routing.md).
diff --git a/docs/getting-started-tutorial/build/styles.md b/docs/getting-started-tutorial/build/styles.md
index 97567950b..d1edc4829 100644
--- a/docs/getting-started-tutorial/build/styles.md
+++ b/docs/getting-started-tutorial/build/styles.md
@@ -13,26 +13,32 @@ When we first created `_layout.twig`, it included this line:
 This is equivalent to using a plain `<link>` tag, but it takes care of generating a valid, absolute URL and building the appropriate HTML. You could construct it yourself, like this:
 
 ```html
-<link href="{{ url('@web/styles.css') }}" rel="stylesheet">
+<link href="{{ url('styles.css') }}" rel="stylesheet">
 ```
 
 ::: tip
 The same tag can be used _anywhere_ in Twig, meaning each template (say, for the individual post pages) can request that a style sheet be added to the final document’s `<head>`:
 
 ```twig
+{# Say, from `templates/blog/_entry.twig`! #}
 {% do craft.app.view.registerCssFile('@web/post.css') %}
 ```
+
+Of course, this doesn’t do any good if there’s no underlying CSS file!
 :::
 
 ### Project CSS
 
 Let’s get some baseline styles into the project so we can visualize the structure of our HTML a bit better.
 
-Grab the contents of [this file](repo:craftcms/tutorial-project/blob/main/web/styles.css) from the tutorial project repository on GitHub and paste them into the `web/styles.css` file we created at the beginning of the tutorial.
+Grab the contents of [this file](repo:craftcms/tutorial-project/blob/main/web/styles.css) from the tutorial project repository on GitHub and paste it into the `web/styles.css` file we created at the beginning of the tutorial.
 
 The blog index should now look something like this:
 
-<BrowserShot url="https://tutorial.ddev.site/blog" :link="false" :max-height="400">
+<BrowserShot
+  url="https://tutorial.ddev.site/blog"
+  :link="false"
+  :max-height="400">
 <img src="../images/styles.png" alt="Screenshot of blog page with CSS applied" />
 </BrowserShot>
 
@@ -55,12 +61,15 @@ nav a:hover {
 
 The first rule sets a default color (`var(--color-muted)`) for links in the `nav` element. The second one combines a `:hover` “pseudo-selector” and an `.active` class selector that applies a darker color (`var(--color-base)`) under certain conditions. Our HTML doesn’t add this class, though! Let’s see what it takes to wire this up, in `_layout.twig`:
 
-```twig{2,7,10}
+```twig{2,7,10,13}
 {# Get the first segment of the current URI: #}
 {% set navSegment = craft.app.request.getSegment(1) %}
 
 <nav>
   <ul>
+    <li>
+      <a href="{{ url('/') }}" class="{{ navSegment is empty ? 'active' : 'inactive' }}">Home</a>
+    </li>
     <li>
       <a href="{{ url('blog') }}" class="{{ navSegment == 'blog' ? 'active' : 'inactive' }}">Blog</a>
     </li>
@@ -73,7 +82,7 @@ The first rule sets a default color (`var(--color-muted)`) for links in the `nav
 
 The first highlighted line is a call to one of Craft’s internal functions that looks at the current URI or path. If we were on the `/blog/topics/road-trips` or `/blog` pages, for instance, the first “segment” would just be `blog`. If we were on `/about`, the first segment would be `about`.
 
-The second and third highlighted lines add a new `class` attribute to each anchor tag, and output either `active` or `inactive`, using Twig’s _ternary_ operator. You can think of this as a combination of an output tag (`{{ ... }}`) and a control tag (`{% ... %}`): the condition is a comparison against the `navSegment` variable, where a “truthy” result returns the value after the `?`, and a “falsey” result returns the value after the `:`.
+The remainder of the highlighted lines add a new `class` attribute to each anchor tag, and output either `active` or `inactive`, using Twig’s _ternary_ operator (`?`). You can think of this as a combination of an output tag (`{{ ... }}`) and a control tag (`{% ... %}`): the condition is a comparison against the `navSegment` variable, where a “truthy” result returns the value after the `?`, and a “falsey” result returns the value after the `:`. Ignoring for a moment that we aren’t displaying the navigation on the homepage, its comparison doesn’t have a value to test against, so we just check if the first segment is “empty!”
 
 Refresh your browser, and see the link automatically highlighted:
 
@@ -83,7 +92,7 @@ Refresh your browser, and see the link automatically highlighted:
 
 ### Matrix Blocks
 
-One thing that our HTML _does_ currently support is different treatment for the blocks in our **Post Content** field.
+One thing that our HTML _does_ currently support is different treatment for each entry type in our **Post Content** field.
 
 Recall that we had a series of `if` tags that separated output based on each block’s `type`:
 
@@ -124,7 +133,7 @@ These aren’t included in the style sheet, but they can be added just after the
 
 ### Advanced Styles and Customization
 
-You are in complete control of the HTML that Craft outputs, so there are very few limitations with respect to its structure or substance!
+You are in complete control of the HTML that Craft outputs, so there are very few limitations with respect to its structure and substance!
 
 #### Variation
 
@@ -132,7 +141,7 @@ In addition to setting flags based on your _content_, you have access to a bevy
 
 - Introduce variation with randomization, with the `random()` and `shuffle()` functions;
 - Step through values with the `cycle()` function, inside a loop;
-- Use `now` and date comparisons to display different content based on the time of day;
+- Use `now` and date comparisons to output different content based on the time of day;
 - Let administrators select values in a global set (or on particular entry, category, asset, etc.) to customize the site or page’s appearance;
 
 #### Interpolating CSS
@@ -152,4 +161,4 @@ While Twig’s primary target is HTML, you are welcome to output variables into
 </head>
 ```
 
-This presumes `theme` is the handle of a global set that contains two **Color** fields named _Background Color_ and _Text Color_.
+This presumes `theme` is the handle of a global set that contains two **Color** fields named _Background Color_ and _Text Color_. Craft doesn’t have any inherent understanding of “themes” like other platforms, but you can create all kinds of aesthetic and functional settings that are suited to your project!
diff --git a/docs/getting-started-tutorial/build/twig.md b/docs/getting-started-tutorial/build/twig.md
index 2073ed5a1..22668b54d 100644
--- a/docs/getting-started-tutorial/build/twig.md
+++ b/docs/getting-started-tutorial/build/twig.md
@@ -8,19 +8,19 @@ If you’ve used Twig in other projects, that knowledge will be useful here. Cra
 
 ## Why Twig?
 
-Our goal in this section is to combine static HTML with dynamic content. Twig is a simple—yet powerful—language that allows us to translate the data we’ve defined in Craft into a blob of HTML that can then be sent back to a browser and displayed for a user.
+Our goal in this section is to intersperse static HTML with dynamic content. Twig is a simple—yet powerful—language that allows us to translate the data we’ve defined in Craft into a blob of HTML that can then be sent back to a browser and displayed for a user.
 
 The beauty of a template language is that a single template can be rendered many times with different data. Our main task will be to create a Twig template for our blog posts that demonstrates a combination of Craft and Twig concepts, as well as the benefits of reusability.
 
 ::: tip
-Any HTML document is also a valid Twig file, so if you have experience writing HTML _without_ a template language, you’re in a great position to start building with Craft.
+Any HTML document is also a valid Twig file, so if you have experience writing HTML _without_ a template language or CMS, you’re in a great position to start building with Craft.
 
 If not, check out the [Getting Started with HTML](https://developer.mozilla.org/en-US/docs/Learn/HTML/Introduction_to_HTML/Getting_started) article on _Mozilla Developer Network_.
 :::
 
 ## Your First Template
 
-In VS Code, you should have `templates/index.twig` open. Let’s clear out that file (press <kbd>Command/Control + A</kbd>, then <kbd>Backspace</kbd>, or use the **Selection** menu) and replace it with this:
+In VS Code, you should have `templates/index.twig` open. Let’s clear out that file (press <kbd>Command/Control + A</kbd>, then <kbd>Backspace</kbd>, or use the **Selection** menu to **Select All**) and replace it with this:
 
 ```twig
 Hello from {{ siteName }}!
@@ -52,7 +52,7 @@ Our simple `index.twig` file may not look much different, but once we drop some
 
 There are only a few things you need to know up-front about Twig’s syntax. Everything that follows can be copy-and-pasted into your project, but being able to pick out important bits and pieces will allow you to start tinkering on-the-fly.
 
-<See path="/4.x/dev/twig-primer.md" description="Curious about all of Twig’s features? Check out our templating guide in the main documentation." />
+<See path="/5.x/development/twig.md" description="Curious about all of Twig’s features? Check out our templating guide in the main documentation." />
 
 Replace the contents of `templates/index.twig` with this:
 
@@ -93,7 +93,7 @@ For now, this code can serve as a quick-reference guide for Twig syntax. Read do
 
 Let’s take a closer look at some of the features in the template, above. You don’t need to memorize all this; feel free to skip to the next page if you’d prefer to learn about the concepts in-context!
 
-<See path="/4.x/dev/twig-primer.md" />
+<See path="/5.x/development/twig.md" />
 
 #### Comments
 
@@ -103,7 +103,7 @@ A Twig comment is surrounded by curly-braces and hashes:
 {# Watch out! #}
 ```
 
-Any text inside a comment is hidden when the template is rendered, meaning they’re a great place to stash notes to yourself. Most VS Code themes use a muted color for comments so that you can focus on the surrounding code.
+Any text inside a comment is discarded when the template is rendered, meaning they’re a great place to stash notes to yourself. Most VS Code themes use a muted color for comments so that you can focus on the surrounding code. You can still use HTML comments (`<!-- Like this! -->`), but they _will_ be output verbatim in the rendered HTML document.
 
 #### Output
 
@@ -115,11 +115,11 @@ Pairs of curly braces output the value of an expression:
 
 “Expressions” come in many forms, but the simplest is a _variable_. Craft provides a number of global variables (including `siteName`), and makes others available, contextually.
 
-<See path="/4.x/dev/global-variables.md" />
+<See path="/5.x/reference/twig/global-variables.md" />
 
 #### Control
 
-Control tags let you manipulate data or alter the path through your templates. In the example, we saw two uses of this:
+Control tags let you manipulate data or alter the logical path through your templates. In the example, we saw two uses of this:
 
 - `set`: Declares a new variable, which can be used elsewhere.
 - `for` / `endfor`: Repeats the enclosed template for each item in a list.
@@ -134,7 +134,7 @@ The content of our `for` loop outputs an HTML “list item” tag, interpolating
 
 …but rather than having to know how many times something needs to loop (and then write out the code for each one), we’re able to generalize the behavior.
 
-<See path="/4.x/dev/tags.md" description="Explore other tags available in Twig." />
+<See path="/5.x/reference/twig/tags.md" description="Explore other tags available in Twig." />
 
 #### Variables
 
@@ -164,7 +164,7 @@ It’s currently {{ now | time }}.
 
 Whenever this page is loaded, Craft evaluates your template and substitutes these processed values. There are dozens more filters available to you, but we won’t be able to cover them all in this tutorial.
 
-<See path="/4.x/dev/filters.md" description="View a list of filters available in Craft’s Twig environment." />
+<See path="/5.x/reference/twig/filters.md" description="View a list of filters available in Craft’s Twig environment." />
 
 ::: tip
 Twig also supports **functions**, which have a lot in common with filters. The main difference is that functions don’t always take or manipulate input; one way of looking at the relationship between functions and filters is that filters _always_ have at least one argument (the value before the `|`).
diff --git a/docs/getting-started-tutorial/configure/README.md b/docs/getting-started-tutorial/configure/README.md
index 346145c04..a7c329b95 100644
--- a/docs/getting-started-tutorial/configure/README.md
+++ b/docs/getting-started-tutorial/configure/README.md
@@ -2,7 +2,7 @@
 
 Now that we have a working Craft installation, it’s time to explore some of its powerful content modeling features.
 
-In this section, we will:
+In the next few sections, we will:
 
 1. Review Craft’s native content types;
 1. Create a space to author blog posts and add custom fields;
@@ -20,37 +20,43 @@ We use the term _elements_ to collectively describe the variety of content types
 
 ### Entries
 
-Entries are the most versatile type of element. Every entry belongs to a _section_, which determines how administrators will use them. Entries have titles, authors, post dates, and expiry dates.
+Entries are the most versatile type of element. Every entry belongs to a _section_ (or another entry), which determines how administrators will use them. Entries have titles, authors, post dates, and expiry dates.
 
 Sections come in three flavors: **Channels**, **Singles**, and **Structures**. These section types share many features like field layouts, template mappings, customizable URL patterns, localization, and more.
 
 Channels
-: A channel is typically used to syndicate many entries with a similar composition, sorted by one or more of their built-in attributes or custom fields. Channels can have multiple _entry types_ to further distinguish, filter, or sort entries. Each entry type is given its own field layout.
+: A channel is typically used to syndicate many entries with a similar composition, sorted by one or more of their built-in attributes or custom fields. Channels can have multiple _entry types_ to further distinguish, filter, or sort entries. Each entry type has its own _field layout_.
 
 : **Example**: Articles, events, classifieds, employee profiles.
 
 Singles
-: Singles are for one-off pages: there will only ever be one entry type (and entry) per single. URLs of singles can be locked to prevent tampering.
+: Singles are for one-off pages: there will only ever be one entry per single. URLs of singles can be locked to prevent tampering.
 
 : **Example**: Homepage, a blog landing page, featured case studies, or an “About” page.
 
 Structures
-: Structures support the same features as channels, but add the ability to nest entries within other entries—and to define their order in relation to one another. The hierarchical nature of structures makes them a good candidate for complex bundles of information, or for situations where the order of pages is important.
+: Structures support the same features as channels, but add the ability to nest entries hierarchically—and to define their order in relation to one another. This tree-like organization makes them a good candidate for complex bundles of information, or for situations where the order of pages is important.
 
 : **Example**: Reference libraries, sequential tutorials, multi-page case studies.
 
 #### Entry Types
 
-Channels and structures can define multiple _entry types_. In doing so, you can create rich variations in authoring experience, even within a section—or differentiate entries in the front-end with features and styles appropriate to the content.
+Entry types provide rich variations in authoring experience, within a section—or when nested within one another. You can also use entry types to differentiate content in the front-end, by presenting their unique fields with appropriate markup and styles.
 
 ### Globals
 
 In situations where you need to manage some information that isn’t associated with a single page (or that might be accessed in many places throughout a site) _globals_ are the answer. Globals are a lot like _singles_, except they do not get their own URLs.
 
-Each global set has its own field layout, and can use any of your custom fields. Globals are always within reach, under a main navigation item.
+Each global set has its own field layout, and can use any of your custom fields. Globals are always within reach in the control panel, under a main navigation item.
 
 **Example**: Navigation, sidebars, footer or header content, or non-critical “settings” you want controlled by a user (like an analytics ID).
 
+### Categories
+
+Categories are mostly obsolete in Craft, but provide a semantic alternative to entries. They are typically used to organize other elements into user-defined, hierarchical taxonomies—while also acting as content containers, as elements themselves!
+
+**Example**: Corporate structure, species, genres, locations.
+
 ### Assets
 
 Assets are Craft’s way of managing uploaded files. They’re stored on _filesystems_, and organized into groups called _volumes_, which can have any number of nested folders. In addition to keeping track of the underlying file, Assets are elements just like entries: each volume defines a field layout, allowing you to attach rich custom field data.
@@ -80,7 +86,7 @@ Your content model is defined by the union of element types’ native properties
   <GridItem label="Table" src="/images/field-table.svg" />
   <GridItem label="Tags" src="/images/field-tags.svg" />
   <GridItem label="Time" src="/images/field-date-time.svg" />
-  <GridItem label="URL" src="/images/field-url.svg" />
+  <GridItem label="Link" src="/images/field-url.svg" />
   <GridItem label="Users" src="/images/field-users.svg" />
 </div>
 
@@ -92,12 +98,12 @@ There are loads more field types available in the official [Plugin Store](https:
 
 ## Modeling a Blog Post
 
-As our first exercise in content modeling, let’s consider what comprises a blog post:
+As our first exercise in content modeling, let’s consider what features a blog post might have:
 
 - Title/Headline
 - Author
 - Post Date
-- Feature/Summary Image
+- Feature Image
 - Summary/Description
 - Categories
 - Content/Body
@@ -110,8 +116,8 @@ From the element types and fields we’ve learned about so far, we might map the
     - **Authors**;
 - Feature images will be uploaded as **assets**;
 - Summary text can live in a **Plain Text** field;
-- Categories can be handled with Craft’s element type of the same name (we’ll learn about this as we set it up—categories are very similar to entries);
-- Post content will be managed as repeating blocks with a **Matrix** field;
+- Categories can be handled with Craft’s element type of the same name;
+- Post content will be managed as repeatable “blocks,” by way of entries nested inside a **Matrix** field;
 
 This process may seem arcane at first—once you’ve had a chance to see the tools in action, connecting them to your project goals will feel less mechanical and more creative.
 
diff --git a/docs/getting-started-tutorial/configure/editing.md b/docs/getting-started-tutorial/configure/editing.md
index 7adfcf729..e04f7ab38 100644
--- a/docs/getting-started-tutorial/configure/editing.md
+++ b/docs/getting-started-tutorial/configure/editing.md
@@ -6,7 +6,10 @@ Our blog is starting to take shape! Let’s pause for a moment and look at the e
 
 If you haven’t already, navigate to **Entries** and click **+ New entry** to create your first post. Here’s what it’ll look like with a bit of content added:
 
-<BrowserShot url="https://tutorial.ddev.site/admin/entries/blog/2?draftId=1&fresh=1" :link="false" caption="A complete blog post, ready to be saved.">
+<BrowserShot
+    url="https://tutorial.ddev.site/admin/entries/blog/2?draftId=1&fresh=1"
+    :link="false"
+    caption="A blog post, populated with content, ready to be saved.">
 <img src="../images/new-entry-with-content.png" alt="Screenshot of blog post entry with fields filled in" />
 </BrowserShot>
 
@@ -18,13 +21,13 @@ Working with content in Craft is usually pretty intuitive—after all, _you_ jus
 
 ![](../images/draft-autosave.png)
 
-From the moment you arrive on an edit screen, Craft begins autosaving your changes as a _provisional draft_. You always get to decide when those changes are applied, though.
-
-Edits on an already-published entry automatically start a new _draft_, and you can always see the save status and even leave notes in the versions menu. This menu will also let you see previous drafts and versions, which can be handy:
+As soon as you arrive on an edit screen (for new entries) or make any kind of edit (to an existing entry), Craft creates a _provisional draft_ and begins autosaving your changes. When you’re ready to apply those changes, click **Save**.
 
 ![](../images/unsaved-changes.png)
 
-If you would like to turn your edits into a _draft_ so other users can review them, click **Create draft** instead of **Save**.
+If you would like to turn your edits into a _draft_ so other users can review them, click **Create draft** instead of **Save**. You can go back to editing the live entry via the **Revisions** menu in the breadcrumbs; whenever you save changes to a _live_ entry, Craft will merge them back into any drafts the next time they’re accessed via the control panel.
+
+Provisional drafts are tied to your user, and any entries you’ve edited (but not saved or turned into a proper draft) will display an _Edited_ chip, wherever it’s visible in the control panel.
 
 ### Assets
 
@@ -38,9 +41,9 @@ This last method is a great way to seed your project with an asset library.
 
 ### Categories
 
-Our _Topics_ field is backed by categories, which are managed similarly to assets—this is because they are both types of elements.
+Our _Post Categories_ field is backed by categories, which are managed similarly to entries and assets—this is because they are both types of _elements_.
 
-Categories are attached by clicking **+ Add a category**, then selecting an existing category or clicking **Add a Topics category**.
+Categories are attached by clicking **+ Add a category**, then selecting an existing category (or clicking **New Topics category**) in the modal.
 
 ### Slideouts
 
@@ -65,11 +68,19 @@ Click the sidebar button <Poi label="C" target="editAsset" id="sidebar" /> to vi
 Edits made in this way affect the element anywhere else it’s used. For example: if you also attached the asset to a block in the **Post Content** field with the intention of outputting its title as a caption or credit in _both_ places it’s used, updating its title in _either_ place (or via the top-level **Assets** section of the control panel) affects _all_ instances.
 :::
 
+<Block label="Images + Accessibility">
+
+Craft’s control panel is routinely audited for accessibility against WCAG 2.2 (general web accessibility guidelines) and ATAG 2.0 (specific to content authoring tools). To help your editors (and users!), add the native **Alternative Text** field layout element to all your asset volumes.
+
+We’ll take another look at alternative text as we begin using images in templates.
+
+</Block>
+
 ### Matrix
 
-You can grab the handle <Icon kind="move" /> in the upper-right corner of any matrix block to re-order them. Each block has a <Icon kind="settings" /> menu (just to the left of its handle) containing options to move, delete, or disable the block, as well as insert new blocks between existing ones:
+You can grab the handle <Icon kind="move" /> in the upper-right corner of any nested entry to re-order them. Each nested entry also as an action menu <Icon kind="ellipses" /> (just to the left of its handle) containing options to move, delete, or disable the block, as well as insert new entries between existing ones:
 
-![](../images/matrix-menu.png)
+![Screenshot of an open action menu on a nested entry](../images/matrix-action-menu.png)
 
 ### Publishing
 
@@ -77,7 +88,7 @@ For new entries, Craft will generate slugs based on the entry’s title. Our _Bl
 
 You can set an entry’s **Post Date** to be in the future to prevent it from being available on the front-end, and optionally add an **Expiry Date** to have it disappear, later. You can always turn off the **Enabled** switch to be certain the post will be hidden publicly, regardless of other settings.
 
-![](../images/entry-meta.png)
+![Screenshot of the meta pane of a typical entry](../images/entry-meta.png)
 
 ### Previewing
 
@@ -85,8 +96,8 @@ Choosing **View** from the header opens the entry in a new tab—even if it isn
 
 If you were to click this button right now, you’d get something that looks like this:
 
-<BrowserShot url="https://tutorial.ddev.site/blog/my-trip-to-bend" :link="false">
+<BrowserShot url="https://tutorial.ddev.site/blog/over-the-mountain" :link="false">
 <img src="../images/error-404.png" alt="HTTP 404 error screen" />
 </BrowserShot>
 
-This looks scarier than it is. In fact, it tells us _exactly_ what the problem is: we haven’t created the template that our blog posts are expecting. Let’s fix this.
+This looks scarier than it is! In fact, it tells us _exactly_ what the problem is: we haven’t created the template that our blog post entries are expecting to exist. Let’s fix this.
diff --git a/docs/getting-started-tutorial/configure/resources.md b/docs/getting-started-tutorial/configure/resources.md
index dd5c33870..b5e1ebeaa 100644
--- a/docs/getting-started-tutorial/configure/resources.md
+++ b/docs/getting-started-tutorial/configure/resources.md
@@ -1,3 +1,7 @@
+---
+sidebarDepth: 2
+---
+
 # Creating Resources
 
 Before we can add content and use it in our site’s front-end, we need to define the management tools for it. This process is done entirely within the control panel—no coding is required to create new content types!
@@ -6,53 +10,13 @@ Before we can add content and use it in our site’s front-end, we need to defin
 Our content outline included an _About_ page and a place to keep global site information—we’ll circle back and work on those after we see the blog through.
 :::
 
-## Creating a Section
-
-Our first order of business is to create a _section_ for our blog posts.
-
-<BrowserShot
-    url="https://tutorial.ddev.site/admin/settings/sections/new"
-    id="newSection"
-    :poi="{
-        name: [35, 24, 'A'],
-        handle: [35, 38, 'B'],
-        type: [35, 62, 'C'],
-        uri: [45, 80, 'D'],
-        template: [70, 80, 'E'],
-    }"
-    :link="false"
-    caption="Settings for the new blog section.">
-<img src="../images/new-section.png" alt="Screenshot of new section fields" />
-</BrowserShot>
-
-1. In the control panel, choose **Settings** from the main navigation.
-1. Choose **Sections** from the “Content” row.
-1. Choose **+ New section**.
-1. Enter “Blog” in the **Name** <Poi label="A" target="newSection" id="name" /> field.
-1. Leave the rest of the default settings as they are, ensuring **Section Type** <Poi label="C" target="newSection" id="type" /> is set to **Channel**.
-1. Click **Save and edit entry types**.
-
-::: tip
-Craft will automatically generate values for the **Handle** <Poi label="B" target="newSection" id="handle" />, **Entry URI Format** <Poi label="D" target="newSection" id="uri" />, and **Template** <Poi label="E" target="newSection" id="template" /> fields. These will come into play in a moment!
-:::
-
-You’ll be dropped into the **Entry Types** tab of your new section’s edit screen, and should see one entry type, named “Default.” We’ll come back to this screen once we’ve created some fields.
-
 ## Supporting Features
 
-We’ve addressed the first item in our content model inventory by creating a section for blog posts… but the content model we decided on requires some other supporting features.
-
-Let’s walk through creating each of those components:
-
-- A _volume_ for storing images;
-- An _assets field_ to attach a primary image;
-- A _plain text field_ for post summaries;
-- A _categories field_ to organize posts;
-- A _matrix field_ for posts’ main content;
+Authors will primarily interact with entries as they create blog posts, but some of the features we’ve planned depend on other resources that make sense to configure ahead of time.
 
 ### Create an Asset Volume
 
-First, let’s create a place to upload the files we’ll use for our feature and post images.
+First, let’s create a place to upload the files for our feature and post images.
 
 Assets are organized into _volumes_, which sit on top of a _filesystem_. Filesystems are how Craft talks to different storage providers, while keeping the user interface consistent. For now, we’ll be using your local hard drive—but it could be a remote service like Amazon S3 or Google Cloud Storage.
 
@@ -60,40 +24,63 @@ Assets are organized into _volumes_, which sit on top of a _filesystem_. Filesys
     url="https://tutorial.ddev.site/admin/settings/assets/volumes/new"
     id="newVolume"
     :poi="{
-        volumeName: [30, 25, 'A'],
-        volumeHandle: [30, 35, 'B'],
-        volumeFsMenu: [30, 55, 'C'],
-        fsName: [70, 8, 'D'],
-        fsHandle: [65, 18, 'E'],
-        fsHasPublicUrls: [75, 28, 'F'],
-        fsBaseUrl: [75, 40, 'G'],
-        fsBasePath: [70, 72, 'H'],
+        volumeName: [30, 20, 'A'],
+        volumeHandle: [30, 28, 'B'],
+        volumeFsMenu: [35, 42, 'C'],
+        fsName: [60, 7, 'D'],
+        fsHandle: [60, 16, 'E'],
+        fsHasPublicUrls: [70, 35, 'F'],
+        fsBaseUrl: [60, 48, 'G'],
+        fsBasePath: [60, 64, 'H'],
+        volumeSubpath: [30, 56, 'I'],
+        transformSubpath: [33, 84, 'J'],
     }"
     :link="false"
     caption="Creating an asset volume and filesystem.">
 <img src="../images/new-asset-volume.png" alt="Screenshot of the asset volume creation screen in Craft’s control panel" />
 </BrowserShot>
 
-We’ll create a local Asset Volume within the web root for blog post images:
+We’ll create a local asset volume within the web root, so our images are accessible from a web browser:
 
-1. In the control panel, navigate to **Settings** → **Assets**;
+1. In the control panel, navigate to <Journey path="Settings, Assets" />;
 1. Click **+ New volume**;
 1. Enter “Images” in the **Name** field <Poi label="A" target="newVolume" id="volumeName" />;
 1. Click the **Asset Filesystem** menu <Poi label="C" target="newVolume" id="volumeFsMenu" /> and select **Create a new filesystem…**;
 
-    Within the slideout that opens, provide these settings:
+    Within the filesystem creation slideout that opens, provide these settings:
 
     - **Name** <Poi label="D" target="newVolume" id="fsName" />: “Hard Disk”
     - **Files in this filesystem have public URLs** <Poi label="F" target="newVolume" id="fsHasPublicUrls" />: On/Enabled
-    - **Base URL** <Poi label="G" target="newVolume" id="fsBaseUrl" />: `@web/uploads/images`
-    - **Base Path** <Poi label="H" target="newVolume" id="fsBasePath" />: `@webroot/uploads/images`
+    - **Base URL** <Poi label="G" target="newVolume" id="fsBaseUrl" />: `@uploads`
+    - **Base Path** <Poi label="H" target="newVolume" id="fsBasePath" />: `@webroot/uploads`
 
     Save the filesystem, and ensure it has populated the **Asset Filesystem** <Poi label="C" target="newVolume" id="volumeFsMenu" /> menu.
 
+    ::: tip
+    We chose a generic **Base URL** and **Base Path** here so that the filesystem can be reused later by multiple volumes—say, one for “Documents” that you want to keep separate from photographic media. The **Subpath** setting on the volume (see below) will ensure our images live within a specific folder of the filesystem!
+    :::
+
+1. Set the volume’s **Subpath** <Poi label="I" target="newVolume" id="volumeSubpath" /> and **Transform subpath** <Poi label="J" target="newVolume" id="transformSubpath" /> both to `images`;
 1. Save the Asset Volume.
 
+Switch back to your code editor, and open `config/general.php`. Near the end of the file, you’ll see the `@webroot` alias we just used when configuring the filesystem. This ensures we have a reliable means of referring to the `web/` directory of our project, from resources we configure elsewhere; we still need to define the `@uploads` alias, though!
+
+Add this to the array passed to `->aliases(...)`, then save the file:
+
+```php{5}
+return GeneralConfig::create()
+    // ...
+    ->aliases([
+        '@webroot' => dirname(__DIR__) . '/web',
+        '@uploads' => App::env('PRIMARY_SITE_URL') . '/uploads',
+    ])
+;
+```
+
+Here, we combine the value of the `PRIMARY_SITE_URL` environment variable (automatically provided by DDEV) with a path segment (`/uploads`)—this corresponds to the filesystem’s **Base Path**, when accessed via HTTP. In practical terms, we’re using predefined values to build consistent on-disk paths (like `/var/www/html/web/uploads/images`) and URLs (like `https://tutorial.ddev.site/uploads/images`) for every uploaded asset.
+
 ::: tip
-The `@web` and `@webroot` [_aliases_](/4.x/config/README.md#aliases) are automatically defined by Craft, and point to the base site URL and document root (`web/` in your project folder), respectively.
+You may have noticed that Craft suggests existing aliases and environment variables as you input these values via the control panel. If you want to double-check your settings after adding the alias, visit <Journey path="Settings, Filesystems, Hard Disk" />, then focus the **Base URL** field.
 :::
 
 ### Create a Category Group
@@ -104,19 +91,19 @@ The second resource we need to create is a group for our blog’s _categories_.
     url="https://tutorial.ddev.site/admin/settings/categories/new"
     id="newCategoryGroup"
     :poi="{
-        name: [53, 23, 'A'],
-        handle: [51, 35, 'B'],
-        levels: [32, 45, 'C'],
-        uri: [45, 80, 'D'],
-        template: [75, 80, 'E'],
-        save: [90, 11, 'F'],
+        name: [55, 23, 'A'],
+        handle: [53, 37, 'B'],
+        levels: [32, 52, 'C'],
+        uri: [45, 83, 'D'],
+        template: [75, 83, 'E'],
+        save: [89, 10.5, 'F'],
     }"
     :link="false"
-    caption="Settings for a new blog category group.">
-<img src="../images/new-category-group.png" alt="Screenshot of new category group fields" />
+    caption="Settings for a new “topics” category group.">
+<img src="../images/new-category-group.png" alt="Screenshot of the category group creation screen in the Craft control panel" />
 </BrowserShot>
 
-1. Navigate to **Settings** and choose **Categories**;
+1. Navigate to <Journey path="Settings, Categories";
 1. Choose **+ New category group**;
 1. In the **Name** <Poi label="A" target="newCategoryGroup" id="name" /> field, enter “Topics”;
 1. In the **Max Levels** <Poi label="C" target="newCategoryGroup" id="levels" /> field, enter `1`;
@@ -124,195 +111,295 @@ The second resource we need to create is a group for our blog’s _categories_.
 1. Set the **Template** <Poi label="E" target="newCategoryGroup" id="template" /> to `blog/_topic`;
 1. **Save** <Poi label="F" target="newCategoryGroup" id="save" /> the category group.
 
-## Custom Fields
+## Creating a Section
+
+With some supporting resources created, it’s time to scaffold our blog’s _section_, _entry type_, and all its _custom fields_. Craft allows us to do this in a single screen, via nested slideouts—we’ll cover them in sequence!
+
+<BrowserShot
+    url="https://tutorial.ddev.site/admin/settings/sections/new"
+    id="newSection"
+    :poi="{
+        name: [50, 14, 'A'],
+        handle: [48, 23, 'B'],
+        type: [39, 37, 'C'],
+        uri: [45, 60, 'D'],
+        template: [75, 60, 'E'],
+        entryTypes: [32, 50, 'F'],
+    }"
+    :link="false"
+    caption="Settings for the new blog section.">
+<img src="../images/new-section.png" alt="Screenshot of new section fields" />
+</BrowserShot>
+
+1. In the control panel, choose **Settings** from the main navigation.
+1. Choose **Sections** from the “Content” row.
+1. Choose **+ New section**.
+1. Enter “Blog” in the **Name** <Poi label="A" target="newSection" id="name" /> field.
+1. Leave the rest of the default settings as they are, ensuring **Section Type** <Poi label="C" target="newSection" id="type" /> is set to **Channel**.
+
+::: tip
+Craft will automatically generate values for the **Handle** <Poi label="B" target="newSection" id="handle" />, **Entry URI Format** <Poi label="D" target="newSection" id="uri" />, and **Template** <Poi label="E" target="newSection" id="template" /> fields. These will come into play in a moment!
+:::
+
+Without leaving this screen, we can also create our first _entry type_. Click **+ Create** <Poi label="F" target="newSection" id="entryTypes" /> within the **Entry Types** field to open a slideout:
 
-Now that we’ve set up all the underlying resources (a section, an asset volume, and a category group), let’s create the fields for our blog posts.
+<BrowserShot
+    url="https://tutorial.ddev.site/admin/settings/sections/new"
+    id="newEntryType"
+    :poi="{
+        name: [81, 5, 'A'],
+        icon: [65, 21, 'B'],
+        fld: [60, 52, 'C'],
+        newField: [94, 89, 'D'],
+    }"
+    :link="false"
+    caption="Creating a “Post” entry type for our new Blog section.">
+<img src="../images/new-entry-type.png" alt="Entry type editor slideout" />
+</BrowserShot>
 
-Custom fields are reusable, so we’ll define them in a global space, then add them to the field layouts where they’re needed. Each of the resources we’ve created so far can have their own field layouts.
+1. Enter “Post” in the entry type’s **Name** <Poi label="A" target="newEntryType" id="name" /> field;
+1. Pick an **Icon** <Poi label="B" target="newEntryType" id="icon" /> and **Color** (optional—we’ll have another opportunity to make better use of these settings, in a moment);
 
-The first thing we’ll do is create a _field group_ to keep our fields organized.
+At the bottom of the entry type creation slideout, you’ll find the **Field Layout** <Poi label="C" target="newEntryType" id="fld" /> designer.
 
-1. Navigate to **Settings** → **Fields**.
-2. Choose **+ New group** in the sidebar, and give it a name like “Blog.”
+## Custom Fields
 
-The following fields will all be created within this new _Blog_ field group. Clicking **+ New Field** while viewing a group will automatically select it—but you can always move a field between groups using the **Group** option on its edit screen.
+To add a field to our new _Post_ entry type, click the **+ New field** <Poi label="D" target="newEntryType" id="newField" /> button in the sidebar of the **Field Layout**.
+
+::: tip
+You may have noticed the field layout designer at the bottom of the asset volume and category group settings screens—every element type in Craft supports the content modeling tools we’re going to cover in this section!
+:::
 
 ### Summary
 
-The post summary will be entered in a _plain text_ field.
+The post summary will be entered in a _plain text_ field. We’re going to create a single, generic text field and reuse it in a few places.
+
+<BrowserShot
+    url="https://tutorial.ddev.site/admin/settings/sections/new"
+    id="newTextField"
+    :poi="{
+        name: [81, 5, 'A'],
+        keywords: [75, 29, 'B'],
+        allowLineBreaks: [60, 74, 'C'],
+    }"
+    :link="false"
+    caption="Creating a plain text field in a slideout.">
+<img src="../images/new-plain-text-field.png" alt="Plain text field creation slideout" />
+</BrowserShot>
 
-1. Click **+ New Field**;
-1. Enter “Summary” into the **Name** field;
-1. Enter “Summaries should be one or two sentences.” in the **Default Instructions** field to give authors a hint about the field’s intended usage;
-1. Enable **Allow line breaks**;
-1. Set the revealed **Initial Rows** field to `1`;
+1. Enter “Text” into the **Name** <Poi label="A" target="newTextField" id="name" /> field;
+1. Enable **Use this field’s value as search keywords** <Poi label="B" target="newTextField" id="keywords" />;
+1. Enable **Allow line breaks** <Poi label="C" target="newTextField" id="allowLineBreaks" />;
 1. Save the field.
 
+That’s all we need for now! The slideout will close, revealing the text field in the field layout designer sidebar. Drag that field into the _Content_ tab in the field layout.
+
+Our generic field is not very useful to editors, though—how would they know what to enter into a field labeled “Text?” Craft supports reuse of most field types, each instance of which can override the base field’s UI label (what authors see) and handle (how it’s accessed in templates and queries).
+
+On the field layout element you just dragged into the _Content_ tab, open the action menu <Icon kind="ellipses" /> and select **Settings**:
+
+![Setting overrides for a field layout element](../images/fld-field-overrides.png)
+
+In the slideout that appears, update the **Label** to “Summary” and the **Handle** to `summary`, then click **Apply** to save the overrides; you should see the new label and handle reflected in the field layout designer, as well as a pencil icon indicating that field instance has customizations.
+
+::: warning
+If you don’t see the pencil icon, make sure the changes were made in the **Settings** slideout, not the **Edit field** slideout—the former controls instance-level settings, and the latter re-opens the base field’s configuration.
+:::
+
 ### Feature Image
 
-Posts’ primary images will be added to an _asset_ field.
+Posts’ primary images will be added to an _asset_ field. This one will also be used in a few places, so we’re going to give it a relatively generic name and handle. Click **+ New Field** from the entry type’s field layout designer again to open a slideout:
 
 <BrowserShot
-    url="https://tutorial.ddev.site/admin/settings/fields/new"
-    id="newAssetField"
+    url="https://tutorial.ddev.site/admin/settings/sections/new"
+    id="newAssetsField"
     :poi="{
-        name: [3, 13.5, 'A'],
-        handle: [3, 17.25, 'B'],
-        type: [3, 27, 'C'],
-        restrict: [3, 29, 'D'],
-        location: [3, 33.3, 'E'],
-        allowSubfolders: [3, 36.2, 'F'],
-        defaultLocation: [3, 39.6, 'G'],
-        allowedTypes: [3, 53.5, 'H'],
-        maxRelations: [3, 75.7, 'I'],
+        name: [44.5, 3, 'A'],
+        handle: [44.5, 7, 'B'],
+        type: [44.5, 18, 'C'],
+        restrict: [44.5, 22, 'D'],
+        location: [44.5, 26, 'E'],
+        allowSubfolders: [44.5, 30, 'F'],
+        defaultLocation: [44.5, 34, 'G'],
+        allowedTypes: [44.5, 52, 'H'],
+        minMaxRelations: [44.5, 74, 'I'],
+        viewMode: [44.5, 80, 'J'],
     }"
     :link="false"
     :max-height="600"
     caption="Settings for a new asset field.">
-<img src="../images/new-asset-field.png" alt="Screenshot of new asset field settings" />
+<img src="../images/new-assets-field.png" alt="Screenshot of new asset field settings" />
 </BrowserShot>
 
-1. Click **+ New Field**;
-1. Enter “Feature Image” into the **Name** <Poi label="A" target="newAssetField" id="name" /> field (and note that Craft automatically generates a **Handle** of `featureImage`);
-1. Select **Assets** from the **Field Type** <Poi label="C" target="newAssetField" id="type" /> menu—the rest of the page will be updated with options specific to asset fields;
-1. Tick **Restrict assets to a single location?** <Poi label="D" target="newAssetField" id="restrict" />;
-1. Select the **Images** volume from the revealed **Asset Location** <Poi label="E" target="newAssetField" id="location" /> menu;
-1. Tick **Allow subfolders** <Poi label="F" target="newAssetField" id="allowSubfolders" />;
-1. Leave both path inputs (<Poi label="E" target="newAssetField" id="location" /> + <Poi label="G" target="newAssetField" id="defaultLocation" />) empty;
-1. Tick **Restrict allowed file types** <Poi label="H" target="newAssetField" id="allowedTypes" />, then tick **Image** from the revealed options;
-1. Set **Max Relations** <Poi label="I" target="newAssetField" id="maxRelations" /> to `1`;
+1. Enter “Image” into the **Name** <Poi label="A" target="newAssetsField" id="name" /> field (and note that Craft automatically generates a **Handle** <Poi label="B" target="newAssetsField" id="handle" /> of `image`);
+1. Select **Assets** from the **Field Type** <Poi label="C" target="newAssetsField" id="type" /> menu—the rest of the page will be updated with options specific to asset fields;
+1. Enable **Restrict assets to a single location?** <Poi label="D" target="newAssetsField" id="restrict" />;
+1. Select the **Images** volume from the revealed **Asset Location** <Poi label="E" target="newAssetsField" id="location" /> menu;
+1. Enable **Allow subfolders** <Poi label="F" target="newAssetsField" id="allowSubfolders" />;
+1. Leave both path inputs (<Poi label="E" target="newAssetsField" id="location" /> + <Poi label="G" target="newAssetsField" id="defaultLocation" />) empty;
+1. Enable **Restrict allowed file types** <Poi label="H" target="newAssetsField" id="allowedTypes" />, then tick **Image** from the revealed options;
+1. Set **Min** and **Max Relations** <Poi label="I" target="newAssetsField" id="maxRelations" /> to `1`;
+1. Use the **Large Thumbnails** option for the **View Mode** <Poi label="J" target="newAssetsField" id="viewMode" /> setting;
 1. Save the field.
 
+You’ll be dropped back at the entry type slideout. Add the new _Image_ field to the field layout, just as we did for the _Text_ field—then use the action menu <Icon kind="ellipses" /> to open its **Settings**:
+
+- Update the **Label** to “Feature Image”
+- Set the **Handle** to `featureImage`
+
+Apply those overrides, and verify that the pencil icon has appeared in the field layout element.
+
+::: tip
+From the action menu <Icon kind="ellipses" />, consider enabling **Use for element thumbnails** to use the _Feature Image_ field’s asset as a visual signpost when _Post_ entries are displayed in the control panel!
+:::
+
 ### Categories/Topics
 
-Our _topics_ field only needs a couple of options:
+Our _topics_ field is significantly simpler! Click **+ New field** again to get started:
+
+<BrowserShot
+    url="https://tutorial.ddev.site/admin/settings/sections/new"
+    id="newCategoriesField"
+    :poi="{
+        name: [44.5, 5, 'A'],
+        handle: [44.5, 12, 'B'],
+        type: [44.5, 33, 'C'],
+        source: [44.5, 42, 'D'],
+    }"
+    :link="false"
+    caption="Settings for a new categories field.">
+<img src="../images/new-categories-field.png" alt="Screenshot of the categories field settings" />
+</BrowserShot>
 
-1. Click **+ New Field**;
-1. Enter “Post Categories” into the **Name** field (and note that Craft automatically generates a **Handle** of `postCategories`);
-1. Choose “Categories” from the **Field Type** menu—the rest of the page will be updated with options specific to categories fields;
-1. Choose “Topics” from the **Source** menu (it will probably be selected, already);
+1. Enter “Post Categories” into the **Name** <Poi label="A" target="newCategoriesField" id="name" /> field (and note that Craft automatically generates a **Handle** <Poi label="B" target="newCategoriesField" id="handle" /> of `postCategories`);
+1. Choose “Categories” from the **Field Type** <Poi label="C" target="newCategoriesField" id="type" /> menu—the rest of the page will be updated with options specific to categories fields;
+1. Choose “Topics” from the **Source** <Poi label="D" target="newCategoriesField" id="source" /> menu (it will probably be selected, already);
 1. Save the field.
 
 ::: tip
-Previously, we only created the category _group_. This step creates a _field_ that will allow us to select from the pool of content. Craft separates these concerns so that you may establish relationships to and from elements in different parts of your site, without needing to duplicate content.
+Previously, we only created the category _group_. This step creates a _field_ that will allow us to select from that pool of content. Craft separates these concerns so that you may establish relationships between elements in different parts of your site, without needing to duplicate content on either end of the relationship.
 
-For example, if we later added a _Galleries_ section, you could create and assign another categories field to its field layout, but still have access to the same pool of topics!
+For example, if we later added a _Galleries_ section, you could assign this categories field (or create another one) to that volume’s field layout, while pulling from the same pool of topics!
 :::
 
+With the field created, drag it into the _Post_ entry type’s field layout. This one is specific enough to the context that we don’t need to override any instance settings!
+
 ### Post Content
 
-Matrix fields are inherently a bit more complex than other field types, because they contain _nested_ fields. The process of creating those nested fields should feel pretty familiar, though!
+Our posts’ content will be authored with Craft’s _Matrix_ field type. Matrix fields are inherently a bit more complex than other field types, because they manage _nested_ entries rather than single, “scalar” values like text or numbers. The good news is that the process of defining the entry types available within a Matrix field is identical to what we’ve done, so far!
+
+Back on our _Post_ entry type slideout, click **+ New field**:
 
 <BrowserShot
-    url="https://tutorial.ddev.site/admin/settings/fields/new"
+    url="https://tutorial.ddev.site/admin/settings/sections/new"
     id="newMatrixField"
     :poi="{
-        name: [3, 13.8, 'A'],
-        handle: [3, 18.25, 'B'],
-        type: [3, 30, 'C'],
-        config: [5, 45, 'D'],
-        fieldSettings: [65, 36.2, 'E'],
+        name: [44.5, 5, 'A'],
+        handle: [44.5, 13, 'B'],
+        search: [44.5, 28.5, 'C'],
+        type: [44.5, 35, 'D'],
+        entryTypes: [44.5, 45, 'E'],
+        siteSettings: [44.5, 56, 'F'],
+        minMaxEntries: [44.5, 68, 'G'],
+        viewMode: [44.5, 81, 'H'],
+        newButtonLabel: [44.5, 89, 'I'],
     }"
     :link="false"
-    :max-height="600"
-    caption="Configuring a new matrix field with multiple block types.">
-<img src="../images/new-matrix-field.png" alt="Screenshot of matrix field settings" />
+    caption="Configuring a new matrix field.">
+<img src="../images/new-matrix-field.png" alt="Screenshot of Matrix field settings" />
 </BrowserShot>
 
-1. Click **+ New Field**;
-1. Enter “Post Content” in the **Name** <Poi label="A" target="newMatrixField" id="name" /> field (and note that Craft automatically generates a **Handle** of `postContent`);
-1. Choose “Matrix” from the **Field Type** <Poi label="C" target="newMatrixField" id="type" /> menu—the rest of the page will be updated with options specific to matrix fields;
-1. Within the **Configuration** <Poi label="D" target="newMatrixField" id="config" /> space, use the **+ New block type**  button to create two _block types_:
+1. Enter “Post Content” in the **Name** <Poi label="A" target="newMatrixField" id="name" /> field (and note that Craft automatically generates a **Handle** <Poi label="B" target="newMatrixField" id="handle" /> of `postContent`);
+1. Enable **Use this field’s values as search keywords** <Poi label="C" target="newMatrixField" id="search" />;
+1. Choose “Matrix” from the **Field Type** <Poi label="D" target="newMatrixField" id="type" /> menu—the rest of the page will be updated with options specific to matrix fields;
+1. Leave the **Site Settings** <Poi label="F" target="newMatrixField" id="siteSettings" /> fields blank;
+1. Set the **Min Entries** <Poi label="G" target="newMatrixField" id="minMaxEntries" /> field to `1`, and leave **Max Entries** blank;
+1. Choose **As inline-editable blocks** from the **View Mode** <Poi label="H" target="newMatrixField" id="viewMode" /> menu;
+1. Type “Add block” into the **“New” Button Label** <Poi label="I" target="newMatrixField" id="newButtonLabel" /> field;
 
-    #### Text Block
+Now, return to the **Entry Types** <Poi label="E" target="newMatrixField" id="entryTypes" /> field we skipped—it’s time to define a couple of basic entry types that we’ll use in various combinations while composing content:
 
-    The first block will be used for text. When prompted for a _block type_ **Name**, enter “Text.”
+#### Text Block
 
-    1. In the **Fields** column of the configuration pane, click **+ New field**;
-    1. In the **Field Settings** <Poi label="D" target="newMatrixField" id="config" /> column, enter these values…
-        - **Name**: “Text”
-        - **Field Type**: Plain Text
-        - **This field is required**: Checked
-        - **Allow line breaks**: Checked
-        - **Initial Rows**: `12`
+The first block will be used for plain text. Click **+ Create** beneath the **Entry Types** heading in the Matrix field’s settings:
 
-    #### Image Block
+<BrowserShot
+    url="https://tutorial.ddev.site/admin/settings/sections/new"
+    id="newNestedEntryType"
+    :poi="{
+        name: [44.5, 5, 'A'],
+        icon: [44.5, 22, 'B'],
+        showTitles: [44.5, 31.5, 'C'],
+        showSlugs: [44.5, 45.5, 'D'],
+        fldAdd: [59, 71, 'E'],
+    }"
+    :link="false"
+    caption="Configuring a new entry type, nested within a Matrix field.">
+<img src="../images/new-nested-entry-type-text.png" alt="Screenshot showing a nested entry type creation slideout" />
+</BrowserShot>
 
-    The second block will be used for attaching images.
+Recall that we made a general-purpose text field for our posts’ _Summary_, earlier!
 
-    1. Back in the **Fields** column of the configuration pane, click **+ New field**.
-    1. In the **Field Settings** <Poi label="D" target="newMatrixField" id="config" /> column…
-        - Set the **Name** field to “Image”;
-        - Choose “Assets” from the **Field Type** menu;
-        - Tick **This field is required**;
-        - Copy the remainder of the settings from the [Feature Image](#feature-image) field we created a moment ago;
+1. Enter “Text” for the **Name** <Poi label="A" target="newNestedEntryType" id="name" /> and ensure the handle was automatically set to `text`;
+1. Pick an **Icon** and **Color** <Poi label="B" target="newNestedEntryType" id="icon" /> (optional—these can help authors identify the nested entry types);
+1. Turn off **Show the Title field** <Poi label="C" target="newNestedEntryType" id="showTitles" /> and **Show the Slug field** <Poi label="D" target="newNestedEntryType" id="showSlugs" />;
+1. Drag the _Text_ (`text`) field from the **Field Layout** designer sidebar into the _Content_ tab <Poi label="E" target="newNestedEntryType" id="fldAdd" />;
 
-1. Save the field.
+Click **Save** to create the entry type and attach it to the Matrix field. If you chose an icon and color for the entry type, you’ll see it reflected in the **Entry Types** selector!
 
-With that, our fields are ready to be added to a _field layout_!
+#### Image Block
 
-<Block label="Optional Step">
+The second block will be used for attaching images. Repeat the process above, but name the entry type “Image” (with a handle of `image`), and drag the _Image_ field into the **Field Layout**. Save the entry type to return to your Matrix field settings slideout. You should see two entry types connected to it:
 
-#### Install the CKEditor plugin for rich text fields
+![Entry types connected to a Matrix field.](../images/new-matrix-field-entry-types.png)
 
-If you would prefer to compose the text of your blog posts using a _rich text_ editor (sometimes called a <abbr title="What You See Is What You Get">WYSIWYG</abbr>), the first-party [CKEditor](https://plugins.craftcms.com/ckeditor) can be substituted for the plain text field we created inside our matrix field’s _Text_ block.
+### Finalizing the Field Layout
 
-Plugins can be installed from the control panel (click **Plugin Store** in the main navigation and search for “CKEditor”), or via the command line:
+With the _Text_ and _Image_ entry types created, click **Save** on the Matrix field. You will be returned to the original _Post_ entry type slideout, with the _Post Content_ Matrix field isolated in its **Field Layout** sidebar.
 
-1. Run `ddev composer require craftcms/ckeditor -w` to add the package to your project;
-1. Install the plugin by running `ddev php craft plugin/install ckeditor`;
+Drag that field into the _Content_ tab, then click **Save** to create the _Post_ entry type! You should now see the _Post_ entry type attached to the _Blog_ section’s **Entry Types**. One last **Save** on the _Blog_ section, and you’re done—what a journey!
 
-Once installed, you’ll need to update your field’s settings:
+::: tip
+In the future, you can access all your entry types from <Journey path="Settings, Entry Types" /> and fields from <Journey path="Settings, Fields" />, directly.
+:::
 
-1. Navigate to the _Post Content_ matrix field’s settings, then the _Text_ block type, then the _Text_ field;
-1. Switch the **Field Type** to **CKEditor**;
-1. Define a reusable configuration;
-1. Save the field;
+<Block label="Optional Steps">
 
-That’s it! Plain text fields can be migrated to CKEditor without losing data—but some field types are _not_ compatible with one another! Craft puts a ⚠️ next to any options in the **Field Type** menu that can’t be automatically converted.
-
-</Block>
+#### Install the CKEditor plugin for rich text fields
 
-## Building a Field Layout
+If you would prefer to compose the text of your blog posts using a _rich text_ editor (sometimes called a <abbr title="What You See Is What You Get">WYSIWYG</abbr> editor), our first-party [CKEditor](https://plugins.craftcms.com/ckeditor) plugin can be substituted for most any plain text field.
 
-Craft’s assumption is that you will eventually have a variety of content types, and that each will use a subset of your fields. To connect our blog entries to the fields they need, we’ll create a _field layout_.
+Plugins are installed from the control panel (click **Plugin Store** in the main navigation and search for “CKEditor”), or via the command line:
 
-<BrowserShot
-    url="https://tutorial.ddev.site/admin/settings/sections/1/entrytypes/1"
-    id="fieldLayout"
-    :poi="{
-        name: [18.5, 18.5, 'A'],
-        contentTab: [39, 55, 'B'],
-        uiElements: [95, 41, 'C'],
-    }"
-    :link="false"
-    caption="Post entry type field layout, prior to configuration.">
-<img src="../images/blog-field-layout.png" alt="Screenshot of bare blog field layout" />
-</BrowserShot>
+1. Run `ddev composer require craftcms/ckeditor -w` to add the package to your project;
+1. Install the plugin by running `ddev php craft plugin/install ckeditor`;
 
-Field layouts for entries are managed via _entry types_.
+Once installed, you’ll need to create a new field, and replace the field in our _Text_ entry type:
 
-1. Navigate to **Settings** → **Sections**;
-1. Choose **Edit entry types** in the _Blog_ row, and then choose the _Default_ entry type that was created along with the section;
-1. Take the opportunity to give this entry type a more useful **Name** <Poi label="A" target="fieldLayout" id="name" /> like “Post,” and ensure the **Handle** is updated;
-1. Drag each of the fields we created earlier to the _Content_ <Poi label="B" target="fieldLayout" id="contentTab" /> tab in whatever order makes sense to you.
-1. Save the entry type.
+1. Navigate to <Journey path="Settings, Entry Types" />, then select _Text_;
+1. Remove the _Text_ field from the field layout by dragging it into the sidebar, or using the action menu <Icon kind="ellipses" /> and selecting **Remove**;
+1. Click **+ New field** in the field layout designer sidebar;
+1. Give the field a **Name** and **Handle** that make sense, like “Rich Text” and `richText`, respectively;
+1. Define a [reusable configuration](https://github.com/craftcms/ckeditor?tab=readme-ov-file#configuration);
+1. Save the field;
+1. Drag the new _Rich Text_ field into your layout;
+1. Save the field layout;
 
-All the fields nested within your Matrix field will come along with it, so they won’t appear in the field layout designer!
+That’s it! Plain text fields can be migrated to CKEditor without losing data—but some field types are _not_ compatible with one another! Craft puts a ⚠️ next to any options in the **Field Type** menu that can’t be automatically converted.
 
-<Block label="Optional Step">
+Switching the existing plain text field to CKEditor means that _all_ instances of that field would be updated. This may not be appropriate for our _Summary_ field (or additional uses, later in the tutorial), so we elected to treat it as a separate base field.
 
 #### Advanced Field Layout Customizations
 
-The **UI Elements** <Poi label="C" target="fieldLayout" id="uiElements" /> tab in the right sidebar contains a few tools that can help spruce up field layouts. This one is relatively simple, but as you create richer authoring experiences, having ways to split up fields, add instructions, or output arbitrary HTML can make a profound difference to its usability.
+The **UI Elements** tab in the right sidebar of every field layout designer contains a few tools that can help create richer authoring experiences. Craft comes with tools for splitting up fields, injecting additional instructions, rendering Twig templates, and more.
 
 Here are a few other features of field layouts worth experimenting with:
 
-- **Widths**: By default, fields occupy the full width of the element editor. Use the column selector UI next to the <Icon kind="settings" /> to set the field as 1/4, 1/2, 3/4, or full-width.
+- **Widths**: By default, fields occupy the full width of the element editor. Use the column selector UI next to the <Icon kind="ellipses" /> to set the field as 1/4, 1/2, 3/4, or full-width.
 - **Line breaks**: If a row isn’t full, you can force a field onto the next row with a line break field layout element.
-- **Field labels**: Click the <Icon kind="settings" /> to open a slideout and update a field’s **Label**. This is particularly useful for the **Title** field: say you were creating employee profiles, and needed a place for their names and _position_ titles—the built-in **Title** field would make more sense being called “Full Name.”
-- **Required fields**: Also within a field’s setting slideout is an option to mark a field as **Required**.
-- **Field conditions** and : Fields can be conditionally included in layouts by setting up condition rules, within the settings slideout.
+- **Field labels**: Click the <Icon kind="ellipses" /> to open a slideout and update a field’s **Label**. This is particularly useful for the **Title** field: say you were creating employee profiles, and needed a place for each person’s name and _position_—the built-in **Title** field would make more sense being called “Full Name,” while their position could be re-labeled “Position/Title” without creating confusion.
+- **Required fields**: Also within a field’s action menu is an option to mark a field as **Required**.
+- **Field conditions** and **User conditions**: Fields can be conditionally included in layouts by setting up condition rules, within the settings slideout. These conditions are evaluated dynamically, and can include rules based on other fields’ values!
 
 </Block>
 
@@ -324,4 +411,8 @@ Return to **Entries** in the main navigation, and click **+ New entry** to creat
 <img src="../images/new-entry-empty.png" alt="Screenshot of new entry screen" />
 </BrowserShot>
 
+::: tip
+Anything missing? You can always go back to the _Post_ entry type to add, remove, or rearrange fields.
+:::
+
 Feel free to play with the content editor on your own—then check back in so we can go over a couple features you’ll need to be aware of before building out the front-end.
diff --git a/docs/getting-started-tutorial/environment/editor.md b/docs/getting-started-tutorial/environment/editor.md
index 5f022eb71..f40b667cb 100644
--- a/docs/getting-started-tutorial/environment/editor.md
+++ b/docs/getting-started-tutorial/environment/editor.md
@@ -1,6 +1,6 @@
 # Choose a Code Editor
 
-The files Craft installs on your computer are all stored in plain text.
+The files we’re about to install on your computer are all stored in plain text.
 
 One benefit of plain text files (as opposed to, say, an application or “binary”) is their portability. They can be easily downloaded, stored, edited, and version-controlled—and applications to help with these tasks are widely available.
 
diff --git a/docs/getting-started-tutorial/environment/stack.md b/docs/getting-started-tutorial/environment/stack.md
index d4b21befe..8d62ab197 100644
--- a/docs/getting-started-tutorial/environment/stack.md
+++ b/docs/getting-started-tutorial/environment/stack.md
@@ -22,9 +22,10 @@ Setting up DDEV happens in two main steps, each of which includes some platform-
 That’s it! You now have everything you need to start building a Craft project—except Craft.
 
 ::: tip
-Before moving on, make sure you’re running DDEV 1.21.4 or later. You can check which version you’re currently running with the following command:
+Before moving on, make sure you’re running DDEV 1.23.4 or later. You can check which version you’re currently running with the following command:
 
 ```sh
 ddev -v
+# -> ddev version v1.23.4
 ```
 :::
diff --git a/docs/getting-started-tutorial/images/503.png b/docs/getting-started-tutorial/images/503.png
deleted file mode 100644
index 295fd6525..000000000
Binary files a/docs/getting-started-tutorial/images/503.png and /dev/null differ
diff --git a/docs/getting-started-tutorial/images/blog-field-layout.png b/docs/getting-started-tutorial/images/blog-field-layout.png
deleted file mode 100644
index 34cff1ea7..000000000
Binary files a/docs/getting-started-tutorial/images/blog-field-layout.png and /dev/null differ
diff --git a/docs/getting-started-tutorial/images/dashboard.png b/docs/getting-started-tutorial/images/dashboard.png
new file mode 100644
index 000000000..9d98db150
Binary files /dev/null and b/docs/getting-started-tutorial/images/dashboard.png differ
diff --git a/docs/getting-started-tutorial/images/draft-autosave.png b/docs/getting-started-tutorial/images/draft-autosave.png
index 11cdbcd79..eb4a82425 100644
Binary files a/docs/getting-started-tutorial/images/draft-autosave.png and b/docs/getting-started-tutorial/images/draft-autosave.png differ
diff --git a/docs/getting-started-tutorial/images/edit-asset-slideout.png b/docs/getting-started-tutorial/images/edit-asset-slideout.png
index b87dc15c9..05a4645a9 100644
Binary files a/docs/getting-started-tutorial/images/edit-asset-slideout.png and b/docs/getting-started-tutorial/images/edit-asset-slideout.png differ
diff --git a/docs/getting-started-tutorial/images/empty-control-panel.png b/docs/getting-started-tutorial/images/empty-control-panel.png
deleted file mode 100644
index dc30be7c8..000000000
Binary files a/docs/getting-started-tutorial/images/empty-control-panel.png and /dev/null differ
diff --git a/docs/getting-started-tutorial/images/entry-meta.png b/docs/getting-started-tutorial/images/entry-meta.png
index 924835c9b..0517980f8 100644
Binary files a/docs/getting-started-tutorial/images/entry-meta.png and b/docs/getting-started-tutorial/images/entry-meta.png differ
diff --git a/docs/getting-started-tutorial/images/fld-field-overrides.png b/docs/getting-started-tutorial/images/fld-field-overrides.png
new file mode 100644
index 000000000..4f02e749c
Binary files /dev/null and b/docs/getting-started-tutorial/images/fld-field-overrides.png differ
diff --git a/docs/getting-started-tutorial/images/focal-point-crop.png b/docs/getting-started-tutorial/images/focal-point-crop.png
index ecf422485..65c994bc2 100644
Binary files a/docs/getting-started-tutorial/images/focal-point-crop.png and b/docs/getting-started-tutorial/images/focal-point-crop.png differ
diff --git a/docs/getting-started-tutorial/images/focal-point-open.png b/docs/getting-started-tutorial/images/focal-point-open.png
index c2fea8db7..bb1776283 100644
Binary files a/docs/getting-started-tutorial/images/focal-point-open.png and b/docs/getting-started-tutorial/images/focal-point-open.png differ
diff --git a/docs/getting-started-tutorial/images/focal-point-set.png b/docs/getting-started-tutorial/images/focal-point-set.png
index 5082d4314..edf440892 100644
Binary files a/docs/getting-started-tutorial/images/focal-point-set.png and b/docs/getting-started-tutorial/images/focal-point-set.png differ
diff --git a/docs/getting-started-tutorial/images/globals.png b/docs/getting-started-tutorial/images/globals.png
index 4616b5552..ae20b07af 100644
Binary files a/docs/getting-started-tutorial/images/globals.png and b/docs/getting-started-tutorial/images/globals.png differ
diff --git a/docs/getting-started-tutorial/images/listing-with-custom-focal-point.png b/docs/getting-started-tutorial/images/listing-with-custom-focal-point.png
deleted file mode 100644
index 59c9775e3..000000000
Binary files a/docs/getting-started-tutorial/images/listing-with-custom-focal-point.png and /dev/null differ
diff --git a/docs/getting-started-tutorial/images/live-preview.png b/docs/getting-started-tutorial/images/live-preview.png
index 3eae76ea6..7d109480f 100644
Binary files a/docs/getting-started-tutorial/images/live-preview.png and b/docs/getting-started-tutorial/images/live-preview.png differ
diff --git a/docs/getting-started-tutorial/images/login.png b/docs/getting-started-tutorial/images/login.png
index 8e057f8e6..c80004748 100644
Binary files a/docs/getting-started-tutorial/images/login.png and b/docs/getting-started-tutorial/images/login.png differ
diff --git a/docs/getting-started-tutorial/images/matrix-action-menu.png b/docs/getting-started-tutorial/images/matrix-action-menu.png
new file mode 100644
index 000000000..d62a035ba
Binary files /dev/null and b/docs/getting-started-tutorial/images/matrix-action-menu.png differ
diff --git a/docs/getting-started-tutorial/images/matrix-menu.png b/docs/getting-started-tutorial/images/matrix-menu.png
deleted file mode 100644
index ac75c1707..000000000
Binary files a/docs/getting-started-tutorial/images/matrix-menu.png and /dev/null differ
diff --git a/docs/getting-started-tutorial/images/new-asset-field.png b/docs/getting-started-tutorial/images/new-asset-field.png
deleted file mode 100644
index 6586645e3..000000000
Binary files a/docs/getting-started-tutorial/images/new-asset-field.png and /dev/null differ
diff --git a/docs/getting-started-tutorial/images/new-asset-volume.png b/docs/getting-started-tutorial/images/new-asset-volume.png
index 1eb847464..5cd72ec1f 100644
Binary files a/docs/getting-started-tutorial/images/new-asset-volume.png and b/docs/getting-started-tutorial/images/new-asset-volume.png differ
diff --git a/docs/getting-started-tutorial/images/new-assets-field.png b/docs/getting-started-tutorial/images/new-assets-field.png
new file mode 100644
index 000000000..a3913b191
Binary files /dev/null and b/docs/getting-started-tutorial/images/new-assets-field.png differ
diff --git a/docs/getting-started-tutorial/images/new-categories-field.png b/docs/getting-started-tutorial/images/new-categories-field.png
new file mode 100644
index 000000000..6e0174b53
Binary files /dev/null and b/docs/getting-started-tutorial/images/new-categories-field.png differ
diff --git a/docs/getting-started-tutorial/images/new-category-group.png b/docs/getting-started-tutorial/images/new-category-group.png
index 13688e181..2884346eb 100644
Binary files a/docs/getting-started-tutorial/images/new-category-group.png and b/docs/getting-started-tutorial/images/new-category-group.png differ
diff --git a/docs/getting-started-tutorial/images/new-entry-empty.png b/docs/getting-started-tutorial/images/new-entry-empty.png
index 45d52ccae..f89bae146 100644
Binary files a/docs/getting-started-tutorial/images/new-entry-empty.png and b/docs/getting-started-tutorial/images/new-entry-empty.png differ
diff --git a/docs/getting-started-tutorial/images/new-entry-type.png b/docs/getting-started-tutorial/images/new-entry-type.png
new file mode 100644
index 000000000..32dd55be4
Binary files /dev/null and b/docs/getting-started-tutorial/images/new-entry-type.png differ
diff --git a/docs/getting-started-tutorial/images/new-entry-with-content.png b/docs/getting-started-tutorial/images/new-entry-with-content.png
index 10ea2bcdf..f9c33d274 100644
Binary files a/docs/getting-started-tutorial/images/new-entry-with-content.png and b/docs/getting-started-tutorial/images/new-entry-with-content.png differ
diff --git a/docs/getting-started-tutorial/images/new-matrix-field-entry-types.png b/docs/getting-started-tutorial/images/new-matrix-field-entry-types.png
new file mode 100644
index 000000000..0f764ae5e
Binary files /dev/null and b/docs/getting-started-tutorial/images/new-matrix-field-entry-types.png differ
diff --git a/docs/getting-started-tutorial/images/new-matrix-field.png b/docs/getting-started-tutorial/images/new-matrix-field.png
index 74a2886fd..8a969fd27 100644
Binary files a/docs/getting-started-tutorial/images/new-matrix-field.png and b/docs/getting-started-tutorial/images/new-matrix-field.png differ
diff --git a/docs/getting-started-tutorial/images/new-nested-entry-type-text.png b/docs/getting-started-tutorial/images/new-nested-entry-type-text.png
new file mode 100644
index 000000000..c8f32792a
Binary files /dev/null and b/docs/getting-started-tutorial/images/new-nested-entry-type-text.png differ
diff --git a/docs/getting-started-tutorial/images/new-plain-text-field.png b/docs/getting-started-tutorial/images/new-plain-text-field.png
new file mode 100644
index 000000000..9f5a561bb
Binary files /dev/null and b/docs/getting-started-tutorial/images/new-plain-text-field.png differ
diff --git a/docs/getting-started-tutorial/images/new-section.png b/docs/getting-started-tutorial/images/new-section.png
index 739f5d7b1..6fa165c0f 100644
Binary files a/docs/getting-started-tutorial/images/new-section.png and b/docs/getting-started-tutorial/images/new-section.png differ
diff --git a/docs/getting-started-tutorial/images/plugin-store.png b/docs/getting-started-tutorial/images/plugin-store.png
index cb096fa05..e6ebacf16 100644
Binary files a/docs/getting-started-tutorial/images/plugin-store.png and b/docs/getting-started-tutorial/images/plugin-store.png differ
diff --git a/docs/getting-started-tutorial/images/settings.png b/docs/getting-started-tutorial/images/settings.png
index d9a70e47f..c03ee804d 100644
Binary files a/docs/getting-started-tutorial/images/settings.png and b/docs/getting-started-tutorial/images/settings.png differ
diff --git a/docs/getting-started-tutorial/images/single-edit.png b/docs/getting-started-tutorial/images/single-edit.png
deleted file mode 100644
index 63d0373a3..000000000
Binary files a/docs/getting-started-tutorial/images/single-edit.png and /dev/null differ
diff --git a/docs/getting-started-tutorial/images/styles-nav-highlight.png b/docs/getting-started-tutorial/images/styles-nav-highlight.png
index 8a7e76031..41239881c 100644
Binary files a/docs/getting-started-tutorial/images/styles-nav-highlight.png and b/docs/getting-started-tutorial/images/styles-nav-highlight.png differ
diff --git a/docs/getting-started-tutorial/images/styles.png b/docs/getting-started-tutorial/images/styles.png
index bcd7240a7..c70a8e43d 100644
Binary files a/docs/getting-started-tutorial/images/styles.png and b/docs/getting-started-tutorial/images/styles.png differ
diff --git a/docs/getting-started-tutorial/images/system-report.png b/docs/getting-started-tutorial/images/system-report.png
new file mode 100644
index 000000000..503db33f4
Binary files /dev/null and b/docs/getting-started-tutorial/images/system-report.png differ
diff --git a/docs/getting-started-tutorial/images/transforms.png b/docs/getting-started-tutorial/images/transforms.png
index 66ab25dd6..817d42033 100644
Binary files a/docs/getting-started-tutorial/images/transforms.png and b/docs/getting-started-tutorial/images/transforms.png differ
diff --git a/docs/getting-started-tutorial/images/unsaved-changes.png b/docs/getting-started-tutorial/images/unsaved-changes.png
index 0fdca5e6d..4b2e580e9 100644
Binary files a/docs/getting-started-tutorial/images/unsaved-changes.png and b/docs/getting-started-tutorial/images/unsaved-changes.png differ
diff --git a/docs/getting-started-tutorial/images/upgrade-pro.png b/docs/getting-started-tutorial/images/upgrade-pro.png
deleted file mode 100644
index 337cc2d61..000000000
Binary files a/docs/getting-started-tutorial/images/upgrade-pro.png and /dev/null differ
diff --git a/docs/getting-started-tutorial/images/utilities.png b/docs/getting-started-tutorial/images/utilities.png
deleted file mode 100644
index 0ef3cb122..000000000
Binary files a/docs/getting-started-tutorial/images/utilities.png and /dev/null differ
diff --git a/docs/getting-started-tutorial/images/vs-code-extensions.png b/docs/getting-started-tutorial/images/vs-code-extensions.png
deleted file mode 100644
index 97ed20a71..000000000
Binary files a/docs/getting-started-tutorial/images/vs-code-extensions.png and /dev/null differ
diff --git a/docs/getting-started-tutorial/images/welcome-template.png b/docs/getting-started-tutorial/images/welcome-template.png
index ae53215ae..c0b896443 100644
Binary files a/docs/getting-started-tutorial/images/welcome-template.png and b/docs/getting-started-tutorial/images/welcome-template.png differ
diff --git a/docs/getting-started-tutorial/install/README.md b/docs/getting-started-tutorial/install/README.md
index a42564610..cde8f6c2f 100644
--- a/docs/getting-started-tutorial/install/README.md
+++ b/docs/getting-started-tutorial/install/README.md
@@ -16,7 +16,7 @@ cd tutorial
 
 ## Setup
 
-Then run the following commands to configure a new DDEV project there:
+Run the following commands to configure a new DDEV project in that folder:
 
 1. Create DDEV configuration files:
 
@@ -27,16 +27,10 @@ Then run the following commands to configure a new DDEV project there:
 2. Scaffold the project from the official starter project:
 
     ```sh
-    ddev composer create -y --no-scripts craftcms/craft
+    ddev composer create -y "craftcms/craft"
     ```
 
-3. Run the Craft setup wizard
-
-    ```sh
-    ddev craft install
-    ```
-
-    Answer the prompts, leaving `Site URL` set to the default value (`https://tutorial.ddev.site`)—unless you chose something other than `tutorial` when creating your [project folder](#project-folder).
+    The setup wizard will start automatically. Answer the prompts, leaving `Site URL` set to the default value (`https://tutorial.ddev.site`)—unless you chose something other than `tutorial` when creating your [project folder](#project-folder).
 
     ::: tip
     Remember the username and password you choose for your user account! We’ll need those in a moment.
diff --git a/docs/getting-started-tutorial/install/control-panel.md b/docs/getting-started-tutorial/install/control-panel.md
index 5b1f225cd..5b6c78833 100644
--- a/docs/getting-started-tutorial/install/control-panel.md
+++ b/docs/getting-started-tutorial/install/control-panel.md
@@ -2,8 +2,8 @@
 
 You should have three project windows up, at this point:
 
-1. A terminal, which we used to install Craft and DDEV;
-1. An editor, with the project folder;
+1. A terminal, which we used to install DDEV and Craft;
+1. An editor, open to your project folder;
 1. A browser, with Craft’s default welcome page loaded;
 
 ## Signing In
@@ -34,6 +34,8 @@ ddev craft users/set-password me@domain.com
 
 ## Dashboard
 
+Upon signing in, you will be sent to your **Dashboard**, a space you can customize with <Poi label="1" id="widgets" target="dashboard" /> widgets.
+
 <BrowserShot
     url="https://tutorial.ddev.site/admin/dashboard"
     id="dashboard"
@@ -45,10 +47,10 @@ ddev craft users/set-password me@domain.com
     }"
     :link="false"
     caption="The control panel without any content.">
-<img src="../images/empty-control-panel.png" alt="Screenshot of the Craft CMS control panel Dashboard" />
+<img src="../images/dashboard.png" alt="Screenshot of the Craft CMS control panel Dashboard" />
 </BrowserShot>
 
-Upon signing in, you will be sent to your **Dashboard**, a space you can customize with <Poi label="1" id="widgets" target="dashboard" /> widgets. Craft adds four widgets by default:
+Craft adds four widgets by default:
 
 - **Recent Entries**: Empty, as we haven’t created any content yet.
 - **Craft Support**: Find help in the community, or get official support.
@@ -70,14 +72,14 @@ If the control panel looks a little empty right now, don’t worry; this is by d
 In the main navigation, click **Utilities**. By default, you’ll land on the **System Report** utility, which displays key details about your Craft installation and server:
 
 <BrowserShot url="https://tutorial.ddev.site/admin/utilities/system-report" :link="false" caption="The System Report utility lists important details about your installation.">
-<img src="../images/utilities.png" alt="Screenshot of the Craft CMS utilities section" />
+<img src="../images/system-report.png" alt="Screenshot of the Craft CMS utilities section, with the “System Report” pane active" />
 </BrowserShot>
 
 ::: tip
 If you used something other than DDEV to set up the project, you may want to take a moment and ensure everything under the **Requirements** heading has been satisfied! If you see a warning about a “`@web` alias,” it’s safe to ignore for now.
 :::
 
-Feel free to explore the other [built-in utilities](/4.x/control-panel.md#utilities) at your leisure. This is the only one we’ll highlight, for now.
+Feel free to explore the other [built-in utilities](/5.x/system/control-panel.md#utilities) at your leisure. This is the only one we’ll highlight, for now.
 
 ## Settings
 
diff --git a/docs/getting-started-tutorial/more/README.md b/docs/getting-started-tutorial/more/README.md
index 1a08f74d6..ede3f4443 100644
--- a/docs/getting-started-tutorial/more/README.md
+++ b/docs/getting-started-tutorial/more/README.md
@@ -7,29 +7,30 @@ To get a better sense of how Craft can support your next project’s unique requ
 ## Beginner: _Explore the Demo_
 
 - Expose blog post author details.  
-  **Hint:** add [`{% dump entry.author %}`](/4.x/dev/tags.md#dump) anywhere you have access to an `entry` to see what’s there—or consult the [User element API documentation](craft4:craft\elements\User);
-- Update the homepage (`templates/index.twig`) to match the rest of the site;
-- Add more posts and implement [pagination](/4.x/dev/tags.md#paginate) on the index pages;
+  **Hint:** add [`{% dump entry.author %}`](/5.x/reference/twig/tags.md#dump) anywhere you have access to an `entry` to see what’s there—or consult the [User element API documentation](craft5:craft\elements\User);
+- Update the homepage (`templates/index.twig`) to use the same layout as the rest of the site;
+- Add more posts and implement [pagination](/5.x/reference/twig/tags.md#paginate) on the index pages;
 - Add an RSS feed using the example [in the knowledge base](kb:rss-and-atom-feeds);
 - Use the [Contact Form plugin](https://plugins.craftcms.com/contact-form) to add a form to your site;
 
 ## Intermediate: _Go Deeper with Craft_
 
 - Add a new section to the site like _Galleries_ or _Reviews_;
-- Add multiple [sites](/4.x/sites.md) to your installation that cross-promote content or offer it [in different languages](/4.x/sites.md#setting-up-a-localized-site);
-- Add a [Structure section](/4.x/entries.md#sections) to the site for creating nested bundles of specialized content;
-- Upgrade to [Craft Pro](kb:upgrading-to-craft-pro) and learn about [user accounts](/4.x/users.md) and front-end authentication;
-- Create multiple user groups and experiment with [permissions](/4.x/user-management.md);
-- Set up new [element sources](/4.x/elements.md#indexes) or advanced [field layouts](/4.x/fields.md#field-layouts) with the condition builder;
+- Add multiple [sites](/5.x/system/sites.md) to your installation that cross-promote content or offer it [in different languages](/5.x/system/sites.md#setting-up-a-new-site);
+- Add a [Structure section](/5.x/reference/element-types/entries.md#sections) to the site for creating nested bundles of specialized content;
+- Experiment with a decoupled front-end using the [GraphQL API](graphql.md);
+- Upgrade to [Craft Pro](kb:upgrading-to-craft-pro) and learn about [user accounts](/5.x/reference/element-types/users.md) and front-end authentication;
+- Create multiple user groups and experiment with [permissions](/5.x/system/user-management.md);
+- Set up new [element sources](/5.x/system/elements.md#indexes) or advanced [field layouts](/5.x/system/fields.md#field-layouts) with the condition builder;
 
 ## Advanced: _Extend Craft_
 
 - Create a store and start selling products with [Craft Commerce](https://craftcms.com/commerce);
 - Familiarize yourself with [Yii](https://www.yiiframework.com/doc/guide/2.0/en), the framework that Craft is built on;
-- [Build a custom plugin or module](/4.x/extend/) using your own business logic;
+- [Build a custom plugin or module](/5.x/extend/) using your own business logic;
 
 ## Additional Resources
 
-This tutorial serves as a high-level introduction to features covered in the [official documentation](/4.x/). Take a look, and if you have questions or just want to chat about Craft and the modern web, [join us in Discord](https://craftcms.com/discord)!
+This tutorial serves as a high-level introduction to features covered in the [official documentation](/5.x/). Take a look, and if you have questions or just want to chat about Craft and the modern web, [join us in Discord](https://craftcms.com/discord)!
 
 We know you’ll build something great with Craft.
diff --git a/docs/getting-started-tutorial/more/graphql.md b/docs/getting-started-tutorial/more/graphql.md
index 8f5690895..1906f4a5e 100644
--- a/docs/getting-started-tutorial/more/graphql.md
+++ b/docs/getting-started-tutorial/more/graphql.md
@@ -1,39 +1,20 @@
 # Headless Mode + GraphQL
 
-You can also use Craft as a headless CMS, meaning your web server handles content management, but an outside application provides the public-facing front end. In this model, server-side Twig templates are not used—instead, you’ll use the built-in GraphQL API to fetch content and render it with whatever client-side view library you or your team is familiar with.
+Craft can also act as a “headless” CMS. This style of website or application is typically split into two halves: a back-end, which is responsible for managing content and exposing a developer-friendly API; and a decoupled front-end, that requests data over HTTP from the back-end and displays it to users. Instead of rendering Twig templates on the server, you’ll use the built-in GraphQL API to fetch content and render it with whatever client-side view library you or your team is familiar with.
 
-GraphQL support is limited to the Pro edition of Craft. If you’ve already modeled content and used it in Twig templates, the GraphQL API should feel familiar.
+Craft’s GraphQL API will feel familiar, now that you have experience with loading content in a Twig environment!
 
 ::: warning
-Building a front end this way requires more development experience than we’ve covered in this tutorial. We’ll only touch on GraphQL basics and recommend more resources.
+Building a front end this way is heavily reliant on experience with JavaScript and other web technologies—there are also a _ton_ of options when it comes to frameworks and approaches! This guide will only explore GraphQL basics that are generally applicable.
 :::
 
 ## Overview
 
-GraphQL is a popular and expressive query language that works well with Craft’s flexible content modeling tools. In most cases, fetching content with GraphQL is analogous to using element queries in Twig—but instead of returning native element objects, the structure and substance of JSON output from the GraphQL is determined by the _client_ rather than the _server_.
+GraphQL is a popular and expressive query language that works well with Craft’s flexible content modeling tools. In most cases, fetching content with GraphQL is analogous to using element queries in Twig—but instead of returning native element objects, the structure and substance of JSON output from GraphQL is determined by the _client_ rather than the _server_. Craft would ordinarily return _all_ native and custom field data for an element, but GraphQL requires that you explicitly include each property.
 
 ## Configure GraphQL
 
-The GraphQL API requires Craft Pro. You can start a Pro trial locally and use it however long you need to evaluate Craft—payment is only required when you start using Craft Pro on a public-facing domain. It’s safe to downgrade any time, if you decide the Solo edition is enough for your needs!
-
-<BrowserShot
-  url="https://tutorial.ddev.site/admin/plugin-store/upgrade-craft"
-  :link="false"
-  :poi="{
-    soloBadge: [64, 95],
-    tryButton: [89, 72],
-  }"
-  caption="Upgrading from Solo to Pro.">
-<img src="../images/upgrade-pro.png" alt="Screenshot of plugin store upgrading to Craft Pro trial" />
-</BrowserShot>
-
-To upgrade your installation to Craft Pro:
-
-1. In the control panel, locate the **Solo** badge at the bottom of any screen and click **Upgrade to Craft Pro**;
-1. Choose **Try for free** within the <badge type="edition" vertical="middle">Pro</badge> panel of the **Upgrade Craft CMS** page;
-1. Refresh the page, or go back to the **Dashboard**;
-
-Once upgraded, a new **GraphQL** item will appear in the main navigation menu. Let’s open the GraphiQL explorer to browse the auto-generated schema and documentation, by clicking **GraphQL**, then **GraphiQL**.
+Let’s open the GraphiQL explorer to browse the auto-generated schema and documentation, by clicking **GraphQL**, then **GraphiQL**.
 
 <BrowserShot url="https://tutorial.ddev.site/admin/graphiql" :link="false" caption="The GraphiQL explorer.">
 <img src="../images/graphiql.png" alt="Screenshot of GraphiQL" />
@@ -55,16 +36,16 @@ You’ll see `pong` in the response pane, signaling that everything’s ready to
 <img src="../images/graphiql-ping.png" alt="Screenshot of GraphiQL with simple query and response" />
 </BrowserShot>
 
-By default, the Craft CMS GraphiQL interface will use the full “schema” without any restrictions—in other words, it has access to _all content_ through the GraphQL API, including mutations.
+By default, the Craft CMS GraphiQL interface will use the full “schema” without any restrictions—in other words, it has access to _all content_ through the GraphQL API, including mutations. You can switch schemas with the menu at the top of the screen.
 
 To use GraphQL *externally* (without a privileged user session), you’ll need to do two things:
 
-1. [Establish a GraphQL API endpoint](/4.x/graphql.md#setting-up-your-api-endpoint) for querying externally.
-2. Either create your own private schema with a secret access token, or edit the public schema to enable querying content without an access token. (By default, the public schema leaves all content disabled.) See [Define Your Schemas](/4.x/graphql.md) in the GraphQL documentation.
+1. [Establish a GraphQL API endpoint](/5.x/development/graphql.md#setting-up-your-api-endpoint) for querying externally.
+2. Either create your own private schema (and an access token), or edit the public schema to enable querying content without an access token. (By default, the public schema leaves all content disabled.) See [Define Your Schemas](/5.x/development/graphql.md#define-your-schemas) in the GraphQL documentation.
 
 ## Optional: Enable Headless Mode
 
-If you want to query Craft CMS for content but handle your own routing, you can enable <config4:headlessMode>. This will optimize the installation to hide template settings and route management and return all front end responses as JSON.
+If you want to query Craft for content but handle your own routing, you can enable <config5:headlessMode>. This optimizes the installation and UI, hiding template settings (like how we connected _Blog_ section entries to `templates/blog/_entry.twig`), disabling all routes except for the control panel, and returning JSON for all front-end requests.
 
 To enable headless mode, add this to `config/general.php`:
 
@@ -80,7 +61,7 @@ return GeneralConfig::create()
 
 ## Twig examples as GraphQL queries
 
-Content can be fetched with GraphQL using the same parameters we’ve already used in Twig. Ultimately, Craft is still using [element queries](/4.x/element-queries.md) to decide how data should be loaded.
+Content can be fetched via GraphQL with the same parameters we’ve already used in Twig. Ultimately, Craft is still using [element queries](/5.x/development/element-queries.md) to decide what data should be loaded.
 
 Let’s retrace each step of the tutorial where we fetched content, seeing how the Twig example maps to a GraphQL query.
 
@@ -97,9 +78,9 @@ These aren’t available via the GraphQL API, but if you needed them you could s
 ::: code
 ```graphql Query
 {
-  globalSet(handle: "siteInformation") {
-    ... on siteInformation_GlobalSet {
-      siteDescription
+  globalSet(handle: "siteInfo") {
+    ... on siteInfo_GlobalSet {
+      description
     }
   }
 }
@@ -108,7 +89,7 @@ These aren’t available via the GraphQL API, but if you needed them you could s
 {
   "data": {
     "globalSet": {
-      "siteDescription": "Hello, world!"
+      "description": "Hello, world!"
     }
   }
 }
@@ -128,37 +109,36 @@ The blog post detail template displays an entire blog post with its full content
 - `entry.postContent`
   - `block.type`
   - `block.text`
-  - `block.image` Assets field
+  - `block.image`, an assets field
 - `entry.postCategories`
   - `title`
   - `url`
-- `siteInformation.siteDescription` processed by Markdown
+- `siteInfo.description`, processed by Markdown
 
-With the Twig setup, the web server provides its URL to Craft CMS, which uses its routing logic to fetch the entry and make it available as `entry` in the template.
-
-We don’t have routing logic running GraphQL queries, so we’ll query on the known slug `my-trip-to-bend` for this example. Grab any slug from one of your test entries.
+When Craft is in charge of routing, it matches the requested URL against existing entries, then loads and exposes it as `entry` in the template. We don’t have that routing mechanism in the GraphiQL IDE, so we’re going to specify the known slug `my-trip-to-bend` for this example.
 
 We also used `postDate` in two different formats, so we’re using the [GraphQL alias](https://graphql.org/learn/queries/#aliases) `postDateAlt` to return a second format for parity.
 
-```graphql
+::: code
+```graphql Query
 {
   entry(slug: "my-trip-to-bend") {
     title
     postDate @formatDateTime(format: "d M Y")
     postDateAlt: postDate @formatDateTime(format: "Y-m-d")
     url
-    ... on blog_blog_Entry {
+    ... on post_Entry {
       featureImage {
         title
         url
         sized: url @transform(width: 900, height: 600, quality: 90)
       }
       postContent {
-        ... on postContent_text_BlockType {
+        ... on text_Entry {
           typeHandle
           text
         }
-        ... on postContent_image_BlockType {
+        ... on image_Entry {
           typeHandle
           image {
             title
@@ -172,65 +152,67 @@ We also used `postDate` in two different formats, so we’re using the [GraphQL
       }
     }
   }
-  globalSet(handle: ["siteInformation"]) {
-    ... on siteInformation_GlobalSet {
-      siteDescription @markdown
+  globalSet(handle: ["siteInfo"]) {
+    ... on siteInfo_GlobalSet {
+      description @markdown
     }
   }
 }
 ```
-
-You’ll notice that anything with its own field layout implements its own element interface, which is why properties consistent for all element types (`title`, `postDate`, `slug`, etc.) are readily available while custom fields must be queried in the context of a relevant element interface such as everything nested within `... on blog_blog_Entry {}`.
-
-The response should be something like this:
-
-```json
+```json Response
 {
   "data": {
     "entry": {
-      "title": "My first post",
-      "postDate": "20 Mar 2020",
-      "postDateAlt": "2020-03-20",
+      "title": "My Trip to Bend",
+      "postDate": "15 Oct 2024",
+      "postDateAlt": "2024-10-15",
       "url": "https://tutorial.ddev.site/blog/my-trip-to-bend",
       "featureImage": [
         {
-          "title": "Craft Image from Unsplash",
-          "url": "https://tutorial.ddev.site/assets/blog/tim-gouw-rXBwosfgG-c-unsplash.jpg",
-          "sized": "https://tutorial.ddev.site/assets/blog/_900x600_crop_center-center_90_none/tim-gouw-rXBwosfgG-c-unsplash.jpg"
+          "title": "Highway 26",
+          "url": "https://tutorial.ddev.site/uploads/images/highway-26.JPG",
+          "sized": "https://tutorial.ddev.site/uploads/_900x600_crop_center-center_90_none/5/highway-26.jpg"
         }
       ],
       "postContent": [
         {
           "typeHandle": "text",
-          "text": "<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>"
+          "text": "Vivamus sagittis lacus vel augue laoreet rutrum faucibus dolor auctor. Praesent commodo cursus magna, vel scelerisque nisl consectetur et. Curabitur blandit tempus porttitor. Maecenas sed diam eget risus varius blandit sit amet non magna. Maecenas sed diam eget risus varius blandit sit amet non magna. Nullam quis risus eget urna mollis ornare vel eu leo."
         },
         {
           "typeHandle": "image",
           "image": [
             {
-              "title": "Little Drinks",
-              "url": "https://tutorial.ddev.site/assets/blog/rosie-kerr-Z0iBELYV8uk-unsplash.jpg"
+              "title": "Warm Springs",
+              "url": "https://tutorial.ddev.site/uploads/images/warm-springs.JPG"
             }
           ]
         },
         {
           "typeHandle": "text",
-          "text": "<p>Sed dignissim purus eget lectus bibendum blandit blandit id dui. Ut odio lectus, sodales quis convallis ac, tincidunt in nunc. Integer a est justo, pharetra iaculis turpis. Donec vehicula lorem eu sem condimentum at semper velit fermentum. Phasellus euismod quam vel felis aliquet fringilla. In volutpat diam id purus rutrum vestibulum. Praesent at purus risus, non tristique nibh.</p>\n"
+          "text": "Vestibulum id ligula porta felis euismod semper. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Morbi leo risus, porta ac consectetur ac, vestibulum at eros. Nullam quis risus eget urna mollis ornare vel eu leo.\n\nCras mattis consectetur purus sit amet fermentum. Vestibulum id ligula porta felis euismod semper. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Morbi leo risus, porta ac consectetur ac, vestibulum at eros. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit."
         }
       ],
       "postCategories": [
         {
-          "title": "Ramblings",
-          "uri": "https://tutorial.ddev.site/blog/category/ramblings"
+          "title": "Trips",
+          "url": "https://tutorial.ddev.site/blog/topic/trips"
+        },
+        {
+          "title": "Oregon",
+          "url": "https://tutorial.ddev.site/blog/topic/oregon"
         }
       ]
     },
     "globalSet": {
-      "siteDescription": "<p>This is our tutorial site where we’ve built a blog from scratch with Craft CMS.</p>\n"
+      "description": "<p>Photos and stories from around the Pacific Northwest.</p>\n"
     }
   }
 }
 ```
+:::
+
+You’ll notice that anything with its own field layout implements its own element interface, which is why properties consistent for all element types (`title`, `postDate`, `slug`, etc.) are readily available while custom fields must be queried in the context of a relevant element interface—like everything nested within `... on post_Entry {}`.
 
 ### `blog/index`
 
@@ -238,12 +220,15 @@ The blog listing page displays a thumbnail icon and summary for every entry.
 
 This is fairly straightforward with GraphQL. We’ll expose the custom focal point as well in case the front end might make use of it:
 
-```graphql
+::: code
+```graphql Query
 {
   entries(section: "blog") {
     title
+    postDate @formatDateTime(format: "d M Y")
     url
-    ... on blog_blog_Entry {
+    ... on post_Entry {
+      summary
       featureImage {
         title
         url
@@ -254,22 +239,41 @@ This is fairly straightforward with GraphQL. We’ll expose the custom focal poi
   }
 }
 ```
-
-Result:
-
-```json
+```json Response
 {
   "data": {
     "entries": [
       {
-        "title": "My first post",
+        "title": "Over the Mountain",
+        "postDate": "15 Oct 2024",
+        "url": "https://tutorial.ddev.site/blog/over-the-mountain",
+        "summary": "Lorem ipsum dolor sit amet, consectetur adipiscing elit.",
+        "featureImage": [
+          {
+            "title": "Warm Springs",
+            "url": "https://tutorial.ddev.site/uploads/images/warm-springs.JPG",
+            "sized": "https://tutorial.ddev.site/uploads/_300x300_crop_center-center_none/7/warm-springs.jpg",
+            "focalPoint": [
+              0.5,
+              0.5
+            ]
+          }
+        ]
+      },
+      {
+        "title": "My Trip to Bend",
+        "postDate": "15 Oct 2024",
         "url": "https://tutorial.ddev.site/blog/my-trip-to-bend",
+        "summary": "Sed posuere consectetur est at lobortis.",
         "featureImage": [
           {
-            "title": "Craft Image from Unsplash",
-            "url": "https://tutorial.ddev.site/assets/blog/tim-gouw-rXBwosfgG-c-unsplash.jpg",
-            "sized": "https://tutorial.ddev.site/assets/blog/_300x300_crop_center-center_none/tim-gouw-rXBwosfgG-c-unsplash.jpg",
-            "focalPoint": [0.2059, 0.6287]
+            "title": "Highway 26",
+            "url": "https://tutorial.ddev.site/uploads/images/highway-26.JPG",
+            "sized": "https://tutorial.ddev.site/uploads/_300x300_crop_center-center_none/5/highway-26.jpg",
+            "focalPoint": [
+              0.5,
+              0.5
+            ]
           }
         ]
       }
@@ -277,14 +281,16 @@ Result:
   }
 }
 ```
+:::
 
 ### `blog/_category`
 
 The blog category listing is the same as the listing layout above, limited to a specific category defined in the page URL.
 
-We’ll use the `relatedTo` query parameter, which requires IDs as its arguments. We can relate to the “Ramblings” category by its ID, which we can get with another GraphQL query or by visiting “Categories” and finding the numeric ID in the control panel URL.
+We’ll use the `relatedTo` query parameter, which requires IDs as its arguments. We can relate to the “Trips” category by its ID, which we can get with another GraphQL query or by visiting _Categories_ and finding the numeric ID in the control panel URL.
 
-```graphql
+::: code
+```graphql Query
 {
   categories {
     id
@@ -292,32 +298,40 @@ We’ll use the `relatedTo` query parameter, which requires IDs as its arguments
   }
 }
 ```
-
-```json
+```json{5-6} Response
 {
   "data": {
     "categories": [
       {
-        "id": "30",
-        "title": "Ramblings"
+        "id": "11",
+        "title": "Trips"
+      },
+      {
+        "id": "12",
+        "title": "Oregon"
+      },
+      {
+        "id": "22",
+        "title": "Summer"
       }
     ]
   }
 }
 ```
+:::
 
-If the ID for that category is `30`, the listing query could limit results by that relationship:
+If the ID for that category is `11`, the listing query could limit results by that relationship:
 
 ```graphql
 {
-  entries(section: "blog", relatedTo: 30) {
+  entries(section: "blog", relatedTo: 11) {
     title
     # ...
   }
 }
 ```
 
-Limiting on more than one category ID, like entries in category `30` or `40`, would be a matter of passing an array:
+Limiting on more than one category ID, like entries in category `11` _or_ `22`, would be a matter of passing an array:
 
 ```graphql
 {
@@ -328,74 +342,49 @@ Limiting on more than one category ID, like entries in category `30` or `40`, wo
 }
 ```
 
-For more on relationship querying, see the [Relations](/3.x/relations.md) page in the Craft CMS documentation.
+For more on querying using relationships, see the [Relations](/5.x/system/relations.md) page in the Craft CMS documentation.
 
 ### `_singles/about`
 
 The about page is a Single, which is sort of a section and an entry and can be queried either way; using the `section` or `slug` parameter with a value of `about`.
 
-- `entry.title`
-- `entry.aboutImage`
-- `entry.postContent`
-  - `block.type`
-  - `block.text`
-  - `block.image` Assets field
+- `entry.profileImage`
+- `entry.bio`
 
+::: code Query
 ```graphql
 {
   entry(section: "about") {
-    title
-    ... on about_about_Entry {
-      aboutImage {
+    ... on about_Entry {
+      profileImage {
         title
         url
       }
-      postContent {
-        ... on postContent_text_BlockType {
-          typeHandle
-          text
-        }
-        ... on postContent_image_BlockType {
-          typeHandle
-          image {
-            title
-            url
-          }
-        }
-      }
+      bio
     }
   }
 }
 ```
-
-Result:
-
-```json
+```json Response
 {
   "data": {
     "entry": {
-      "title": "About",
-      "aboutImage": [
+      "title": null,
+      "profileImage": [
         {
-          "title": "Floating in Space",
-          "url": "https://tutorial.ddev.site/assets/general/nasa-Yj1M5riCKk4-unsplash.jpg"
+          "title": "Lake Billy Chinook",
+          "url": "https://tutorial-five.ddev.site/uploads/images/lake-billy-chinook.jpeg"
         }
       ],
-      "postContent": [
-        {
-          "typeHandle": "text",
-          "text": "<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus nibh quam, consequat et pellentesque non, malesuada vulputate risus. Donec et nisi sit amet nisi aliquam pulvinar. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum hendrerit neque tincidunt massa tempus cursus dictum diam vulputate. Morbi aliquet, mi ut aliquam varius, nunc augue pellentesque felis, nec blandit sapien nunc vitae odio. Vivamus pretium metus sit amet urna iaculis id accumsan massa tincidunt. Maecenas posuere nibh id magna porta ullamcorper. Nunc tortor velit, tincidunt sit amet dapibus at, lacinia ac sem. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin feugiat iaculis sem ac blandit. Integer dignissim lacinia dolor eu elementum.</p>\n<p>Sed dignissim purus eget lectus bibendum blandit blandit id dui. Ut odio lectus, sodales quis convallis ac, tincidunt in nunc. Integer a est justo, pharetra iaculis turpis. Donec vehicula lorem eu sem condimentum at semper velit fermentum. Phasellus euismod quam vel felis aliquet fringilla. In volutpat diam id purus rutrum vestibulum. Praesent at purus risus, non tristique nibh.</p>\n<p>Quisque rutrum, dolor id viverra varius, odio libero dapibus augue, ac semper felis quam a dolor. Praesent sagittis quam et justo consequat luctus. Fusce posuere augue nec ipsum rhoncus id vestibulum libero consectetur. Etiam luctus ultricies neque, at viverra est tincidunt mollis. Nam sollicitudin sollicitudin gravida. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Ut non sem a tortor ultricies fringilla. Nam ac velit nulla, eu ullamcorper tellus. Donec interdum hendrerit nisi, et tempus dolor pulvinar at. Mauris lacinia sollicitudin est vitae rutrum. Nullam ullamcorper interdum bibendum.</p>"
-        }
-      ]
+      "bio": "Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Aenean lacinia bibendum nulla sed consectetur. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Lorem ipsum dolor sit amet, consectetur adipiscing elit.\n\nCurabitur blandit tempus porttitor. Praesent commodo cursus magna, vel scelerisque nisl consectetur et. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum id ligula porta felis euismod semper. Etiam porta sem malesuada magna mollis euismod."
     }
   }
 }
 ```
+:::
 
 ## Explore GraphQL further
 
 As with the Twig examples, we’re just scratching the surface of ways you can fetch content with Craft CMS.
 
-See the [GraphQL API](/3.x/graphql.md) section of the Craft CMS documentation to learn more about working with GraphQL.
-
-You may also want to check out our [blog starter project](https://github.com/craftcms/starter-blog) that includes an example Craft CMS + [Gatsby](https://www.gatsbyjs.org/) integration.
+See the [GraphQL API](/5.x/development/graphql.md) section of the Craft CMS documentation to learn more about working with GraphQL, or install the [Element API](plugin:element-api) plugin to start building custom JSON endpoints!