From 12367901a27ae0e9fb71effe865be734af6b49b9 Mon Sep 17 00:00:00 2001
From: Paul Gilzow <paul.gilzow@platform.sh>
Date: Tue, 24 Oct 2023 14:32:30 -0500
Subject: [PATCH 01/10] changes mentions of "Drupal 9" to just "Drupal" in the
 the guides/drupal9 section.

---
 .../src/development/variables/_index.md       |  4 +-
 sites/platform/src/guides/drupal9/_index.md   |  3 --
 .../src/guides/drupal9/elasticsearch.md       |  2 +-
 .../platform/src/guides/drupal9/memcached.md  |  2 +-
 .../platform/src/guides/drupal9/multi-site.md |  3 --
 sites/platform/src/guides/drupal9/redis.md    | 42 +++++++++----------
 .../platform/src/guides/drupal9/simplesaml.md |  2 +-
 sites/platform/src/guides/drupal9/solr.md     |  2 +-
 8 files changed, 27 insertions(+), 33 deletions(-)

diff --git a/sites/platform/src/development/variables/_index.md b/sites/platform/src/development/variables/_index.md
index 366d16366e..39e48187ed 100644
--- a/sites/platform/src/development/variables/_index.md
+++ b/sites/platform/src/development/variables/_index.md
@@ -198,7 +198,7 @@ but still adapt the behavior to each environment.
 {{% version/only "1" %}}
 #### Implementation example
 
-The [Drupal 9 template](https://github.com/platformsh-templates/drupal9/) shows an example of
+The [Drupal template](https://github.com/platformsh-templates/drupal10/) shows an example of
 overriding Drupal configuration using environment variables.
 These variables are parsed in the [`settings.platformsh.php` script](https://github.com/platformsh-templates/drupal9/blob/8d5d23cdcb91ffa3f96727adf9d3dba74dfc01db/web/sites/default/settings.platformsh.php#L125-L162).
 
@@ -223,4 +223,4 @@ You need to name your {{% vendor/name %}} variables to match the ones used in yo
 Make sure that the {{% vendor/name %}} variables start with a string present in your `switch` statement.
 
 You can apply similar logic for [other frameworks and languages](../../development/variables/use-variables.md#access-variables-in-your-app).
-{{% /version/only %}}
\ No newline at end of file
+{{% /version/only %}}
diff --git a/sites/platform/src/guides/drupal9/_index.md b/sites/platform/src/guides/drupal9/_index.md
index e6ae98bf3b..b6d066eba5 100644
--- a/sites/platform/src/guides/drupal9/_index.md
+++ b/sites/platform/src/guides/drupal9/_index.md
@@ -4,9 +4,6 @@ weight: -180
 sectionBefore: PHP
 description: |
     Everything you need to get started with Drupal on {{% vendor/name %}}.
-banner:
-    title: A note on version
-    body: While this guide focuses on Drupal 9, you can also refer to it when using Drupal 10 as differences in settings are minimal. Note that a {{% vendor/name %}} [Drupal 10 template](https://github.com/platformsh-templates/drupal10) is available.
 ---
 
 {{% description %}}
diff --git a/sites/platform/src/guides/drupal9/elasticsearch.md b/sites/platform/src/guides/drupal9/elasticsearch.md
index 8f72bc387d..da7c54927a 100644
--- a/sites/platform/src/guides/drupal9/elasticsearch.md
+++ b/sites/platform/src/guides/drupal9/elasticsearch.md
@@ -1,5 +1,5 @@
 ---
-title: "Using Elasticsearch with Drupal 9.x"
+title: "Using Elasticsearch with Drupal"
 sidebarTitle: "Elasticsearch"
 description: |
     Add an Elasticsearch server to your site and connect it to Drupal.
diff --git a/sites/platform/src/guides/drupal9/memcached.md b/sites/platform/src/guides/drupal9/memcached.md
index 611410b67c..77d4d35aa5 100644
--- a/sites/platform/src/guides/drupal9/memcached.md
+++ b/sites/platform/src/guides/drupal9/memcached.md
@@ -1,5 +1,5 @@
 ---
-title: "Using Memcached with Drupal 9.x"
+title: "Using Memcached with Drupal"
 sidebarTitle: "Memcached"
 description: |
     Configure Memcached instead of Redis for Drupal caching.
diff --git a/sites/platform/src/guides/drupal9/multi-site.md b/sites/platform/src/guides/drupal9/multi-site.md
index 9fa2fa8e54..b6ee234319 100644
--- a/sites/platform/src/guides/drupal9/multi-site.md
+++ b/sites/platform/src/guides/drupal9/multi-site.md
@@ -5,9 +5,6 @@ toc: false
 description: |
     {{% vendor/name %}} supports running [multiple applications](/learn/bestpractices/oneormany.md) in the same project, and these can be two or more Drupal sites.
 weight: -80
-banner:
-    title: A note on version
-    body: While this guide focuses on Drupal 9, you can also refer to it when using Drupal 10 as differences in settings are minimal. Note that a {{% vendor/name %}} [Drupal 10 template](https://github.com/platformsh-templates/drupal10) is available.
 ---
 
 {{% description %}}
diff --git a/sites/platform/src/guides/drupal9/redis.md b/sites/platform/src/guides/drupal9/redis.md
index 1171245dc8..aa33152717 100644
--- a/sites/platform/src/guides/drupal9/redis.md
+++ b/sites/platform/src/guides/drupal9/redis.md
@@ -1,40 +1,40 @@
 ---
-title: "Using Redis with Drupal 9.x"
+title: "Using Redis with Drupal"
 sidebarTitle: "Redis"
 description: Add Redis caching to your existing Drupal site.
 weight: -70
 ---
 
-Redis is a fast open-source in-memory database and cache, 
-useful for application-level caching. 
-For more information on this service, see the [dedicated Redis page](../../add-services/redis.md) 
+Redis is a fast open-source in-memory database and cache,
+useful for application-level caching.
+For more information on this service, see the [dedicated Redis page](../../add-services/redis.md)
 or the [official Redis documentation](https://redis.io/docs/).
 
 Follow the instructions on this page to do one of the following:
 
-- Add and configure Redis for Drupal 9.x if you have deployed Drupal manually.
-- Fine-tune your existing configuration if you have deployed Drupal 9 using a [{{% vendor/name %}} template](../../development/templates.md).
+- Add and configure Redis for Drupal if you have deployed Drupal manually.
+- Fine-tune your existing configuration if you have deployed Drupal using a [{{% vendor/name %}} template](../../development/templates.md).
 
 ## Before you begin
 
 You need:
 
-- A [Drupal 9 version deployed on {{% vendor/name %}}](../drupal9/deploy/_index.md)
+- A [Drupal version deployed on {{% vendor/name %}}](../drupal/deploy/_index.md)
 - The [{{% vendor/name %}} CLI](../../administration/cli/)
 - [Composer](https://getcomposer.org/)
 - The [Config Reader library](../../guides/drupal9/deploy/customize.md#install-the-config-reader)
 
-You also need a `settings.platformsh.php` file from which you can [manage the configuration of the Redis service](../drupal9/deploy/customize.md#settingsphp).
-If you installed Drupal 9 with a template, this file is already present in your project.
+You also need a `settings.platformsh.php` file from which you can [manage the configuration of the Redis service](../drupal/deploy/customize.md#settingsphp).
+If you installed Drupal with a template, this file is already present in your project.
 
 {{< note >}}
 
 By default, Redis is an ephemeral service.
-This means that the Redis storage isn't persistent 
-and that data can be lost when a container is moved, shut down 
+This means that the Redis storage isn't persistent
+and that data can be lost when a container is moved, shut down
 or when the service hits its memory limit.
 
-To solve this, {{% vendor/name %}} recommends that you change the [service type](../../add-services/redis.md#service-types) 
+To solve this, {{% vendor/name %}} recommends that you change the [service type](../../add-services/redis.md#service-types)
 to [persistent Redis](../../add-services/redis.md#persistent-redis) (`redis-persistent`).
 
 {{< /note >}}
@@ -113,7 +113,7 @@ To add the Redis module to your project, run the following command:
 composer require drupal/redis
 ```
 
-Then commit the resulting changes to your `composer.json` 
+Then commit the resulting changes to your `composer.json`
 and `composer.lock` files.
 
 ## Configure your Redis service
@@ -145,10 +145,10 @@ To configure your Redis service, follow these steps:
       $settings['redis.connection']['host'] = $redis['host'];
       $settings['redis.connection']['port'] = $redis['port'];
 
-      // You can leverage Redis by using it for the lock and flood control systems 
-      // and the cache tag checksum. 
+      // You can leverage Redis by using it for the lock and flood control systems
+      // and the cache tag checksum.
       // To do so, apply the following changes to the container configuration.
-      // Alternatively, copy the contents of the modules/contrib/redis/example.services.yml file 
+      // Alternatively, copy the contents of the modules/contrib/redis/example.services.yml file
       // to your project-specific services.yml file.
       // Modify the contents to fit your needs and remove the following line.
       $settings['container_yamls'][] = 'modules/contrib/redis/example.services.yml';
@@ -192,11 +192,11 @@ To configure your Redis service, follow these steps:
     }
    ```
 
-   You can customize your configuration further 
+   You can customize your configuration further
    using the inline comments from this example configuration.
-   For more information on possible configuration options, 
-   see the `README.txt` file delivered with the Redis module 
-   or the [official Redis documentation](https://redis.io/docs/). 
+   For more information on possible configuration options,
+   see the `README.txt` file delivered with the Redis module
+   or the [official Redis documentation](https://redis.io/docs/).
 
 ## Verify Redis is running
 
@@ -215,4 +215,4 @@ Then, run the following command:
 ```
 
 The output produces information and statistics about Redis,
-showing that the service is up and running.
\ No newline at end of file
+showing that the service is up and running.
diff --git a/sites/platform/src/guides/drupal9/simplesaml.md b/sites/platform/src/guides/drupal9/simplesaml.md
index 17d90f6886..55960e4f9e 100644
--- a/sites/platform/src/guides/drupal9/simplesaml.md
+++ b/sites/platform/src/guides/drupal9/simplesaml.md
@@ -5,7 +5,7 @@ description: |
 weight: -60
 banner:
     title: A note on versions
-    body: This page focuses on a Drupal 9 and SimpleSAML 1.19.x combination. Documentation for later SimpleSAML versions (2.0.x) has been delayed due to compatibility issues. If, as a {{% vendor/name %}} user, you have successfully set up Drupal 9 or 10 with a SimpleSAML 2.0.x version, [we want to hear about it!](https://community.platform.sh/)
+    body: This page focuses on a Drupal and SimpleSAML 1.19.x combination. Documentation for later SimpleSAML versions (2.0.x) has been delayed due to compatibility issues. If, as a {{% vendor/name %}} user, you have successfully set up Drupal 9 or 10 with a SimpleSAML 2.0.x version, [we want to hear about it!](https://community.platform.sh/)
 ---
 
 SimpleSAMLphp is a library for authenticating a PHP-based application against a SAML server, such as Shibboleth.
diff --git a/sites/platform/src/guides/drupal9/solr.md b/sites/platform/src/guides/drupal9/solr.md
index 85a5e4f16c..f4d27b9bf7 100644
--- a/sites/platform/src/guides/drupal9/solr.md
+++ b/sites/platform/src/guides/drupal9/solr.md
@@ -1,5 +1,5 @@
 ---
-title: "Using Solr with Drupal 9.x"
+title: "Using Solr with Drupal"
 sidebarTitle: "Solr"
 description: |
     Add a Solr server to your site and connect it to Drupal.

From 57875001cbfe564832c019d6ffd315ee184d5a2a Mon Sep 17 00:00:00 2001
From: Paul Gilzow <paul.gilzow@platform.sh>
Date: Tue, 24 Oct 2023 15:06:26 -0500
Subject: [PATCH 02/10] changes mentions of "Drupal 9" to just "Drupal" in the
 the guides/drupal9/deploy section

---
 .../src/guides/drupal9/deploy/_index.md         | 13 +++++--------
 .../src/guides/drupal9/deploy/configure.md      | 17 +++++++----------
 .../src/guides/drupal9/deploy/customize.md      | 11 ++++-------
 .../src/guides/drupal9/deploy/deploy.md         |  7 ++-----
 .../src/guides/drupal9/deploy/next-steps.md     |  3 ---
 5 files changed, 18 insertions(+), 33 deletions(-)

diff --git a/sites/platform/src/guides/drupal9/deploy/_index.md b/sites/platform/src/guides/drupal9/deploy/_index.md
index d4ef668614..1e51adf996 100644
--- a/sites/platform/src/guides/drupal9/deploy/_index.md
+++ b/sites/platform/src/guides/drupal9/deploy/_index.md
@@ -1,26 +1,23 @@
 ---
-title: Deploy Drupal 9 on {{% vendor/name %}}
+title: Deploy Drupal on {{% vendor/name %}}
 sidebarTitle: Get started
 weight: -110
 layout: single
 description: |
     Create a {{% vendor/name %}} account, download a few tools, and prepare to deploy Drupal.
-banner:
-    title: A note on version
-    body: While this guide focuses on Drupal 9, you can also refer to it when using Drupal 10 as differences in settings are minimal. Note that a {{% vendor/name %}} [Drupal 10 template](https://github.com/platformsh-templates/drupal10) is available.
 ---
 
-Drupal is a flexible and extensible PHP-based CMS framework. To deploy Drupal 9 on {{% vendor/name %}}, the recommended way is to use Composer, the PHP package management suite.
+Drupal is a flexible and extensible PHP-based CMS framework. To deploy Drupal on {{% vendor/name %}}, the recommended way is to use Composer, the PHP package management suite.
 
-This guide assumes you are using the well-supported Composer flavor of Drupal 9.
+This guide assumes you are using the well-supported Composer flavor of Drupal.
 
-{{% guides/starting-point name="Drupal 9" templateRepo="drupal9" composerLink="https://github.com/drupal/recommended-project/tree/9.0.x" initExample=true %}}
+{{% guides/starting-point name="Drupal" templateRepo="drupal" composerLink="https://github.com/drupal/recommended-project/" initExample=true %}}
 
 {{% guides/requirements %}}
 
 ## Initialize a project
 
-{{< guides/initialize name="Drupal 9" template="drupal9" >}}
+{{< guides/initialize name="Drupal" template="drupal" >}}
 
 If you don't have code, create a new Drupal project from scratch.
 The following commands create a brand new Drupal project using Composer.
diff --git a/sites/platform/src/guides/drupal9/deploy/configure.md b/sites/platform/src/guides/drupal9/deploy/configure.md
index fe11b2c41e..40f5943f8b 100644
--- a/sites/platform/src/guides/drupal9/deploy/configure.md
+++ b/sites/platform/src/guides/drupal9/deploy/configure.md
@@ -1,17 +1,14 @@
 ---
-title: "Configure Drupal 9 for {{% vendor/name %}}"
+title: "Configure Drupal for {{% vendor/name %}}"
 sidebarTitle: "Configure"
 weight: -100
 description: |
     Review the basics of what makes up a {{% vendor/name %}} project, including its three principle configuration files and how to define them for Drupal.
-banner:
-    title: A note on version
-    body: While this guide focuses on Drupal 9, you can also refer to it when using Drupal 10 as differences in settings are minimal. Note that a {{% vendor/name %}} [Drupal 10 template](https://github.com/platformsh-templates/drupal10) is available.
 ---
 
-{{% guides/config-desc name="Drupal 9" %}}
+{{% guides/config-desc name="Drupal" %}}
 
-{{% guides/config-app template="drupal9" /%}}
+{{% guides/config-app template="drupal10" /%}}
 
 {{% guides/config-service name="Drupal" %}}
 
@@ -20,12 +17,12 @@ although you can also use Oracle MySQL or [PostgreSQL](../../../add-services/pos
 For Drupal caching, we strongly recommend [Redis](../../../add-services/redis.md).
 Drupal's cache can be very aggressive,
 and keeping that data out of the database helps with both performance and disk usage.
-See an example of Redis for caching in our [Drupal template](https://github.com/platformsh-templates/drupal9).
+See an example of Redis for caching in our [Drupal template](https://github.com/platformsh-templates/drupal10).
 
 {{% /guides/config-service %}}
 
-{{< readFile file="static/files/fetch/servicesyaml/drupal9" highlight="yaml" >}}
+{{< readFile file="static/files/fetch/servicesyaml/drupal10" highlight="yaml" >}}
 
-{{% guides/config-routes template="drupal9" name="Drupal 9" %}}
+{{% guides/config-routes template="drupal10" name="Drupal" %}}
 
-{{< guide-buttons next="Customize Drupal9" >}}
+{{< guide-buttons next="Customize Drupal" >}}
diff --git a/sites/platform/src/guides/drupal9/deploy/customize.md b/sites/platform/src/guides/drupal9/deploy/customize.md
index f63b1c64cb..371a327e7d 100644
--- a/sites/platform/src/guides/drupal9/deploy/customize.md
+++ b/sites/platform/src/guides/drupal9/deploy/customize.md
@@ -1,12 +1,9 @@
 ---
-title: "Customize Drupal 9 for {{% vendor/name %}}"
+title: "Customize Drupal for {{% vendor/name %}}"
 sidebarTitle: "Customize"
 weight: -90
 description: |
     Add some helpful dependencies, and modify your Drupal site to read from a {{% vendor/name %}} environment.
-banner:
-    title: A note on version
-    body: While this guide focuses on Drupal 9, you can also refer to it when using Drupal 10 as differences in settings are minimal. Note that a {{% vendor/name %}} [Drupal 10 template](https://github.com/platformsh-templates/drupal10) is available.
 ---
 
 Now that your code contains all of the configuration to deploy on {{% vendor/name %}},
@@ -47,7 +44,7 @@ when a project starts, before cron commands are run, and when you log into an en
 That gives you a place to do extra environment variable setup before the app runs,
 including modifying the system `$PATH` and other shell level customizations.
 
-The Drupal template includes a small [`.environment` file](https://github.com/platformsh-templates/drupal9/blob/master/.environment).
+The Drupal template includes a small [`.environment` file](https://github.com/platformsh-templates/drupal10/blob/master/.environment).
 This modifies the `$PATH` to include the `vendor/bin` directory,
 where command line tools like Drush are stored.
 
@@ -67,7 +64,7 @@ fi
 
 Drush requires a YAML file that declares what its URL is.
 That value varies depending on the branch you're on, so it can't be included in a static file.
-Instead, the `drush` directory includes a [short script](https://github.com/platformsh-templates/drupal9/blob/master/drush/platformsh_generate_drush_yml.php)
+Instead, the `drush` directory includes a [short script](https://github.com/platformsh-templates/drupal10/blob/master/drush/platformsh_generate_drush_yml.php)
 that generates that file on each deploy, writing it to `.drush/drush.yml`.
 That allows Drush to run successfully on {{% vendor/name %}}, such as to run cron tasks.
 
@@ -75,4 +72,4 @@ The script contents aren't especially interesting.
 For the most part, you can download it from the template,
 place it in a `drush` directory in your project so they can be called from the deploy hook, and then forget about it.
 
-{{< guide-buttons next="Deploy Drupal 9" >}}
+{{< guide-buttons next="Deploy Drupal" >}}
diff --git a/sites/platform/src/guides/drupal9/deploy/deploy.md b/sites/platform/src/guides/drupal9/deploy/deploy.md
index 51263e2f09..33644bbb86 100644
--- a/sites/platform/src/guides/drupal9/deploy/deploy.md
+++ b/sites/platform/src/guides/drupal9/deploy/deploy.md
@@ -1,12 +1,9 @@
 ---
-title: "Deploy Drupal 9"
+title: "Deploy Drupal"
 sidebarTitle: "Deploy"
 weight: -80
 description: |
     Now that your site is ready, push it to {{% vendor/name %}} and import your data.
-banner:
-    title: A note on version
-    body: While this guide focuses on Drupal 9, you can also refer to it when using Drupal 10 as differences in settings are minimal. Note that a {{% vendor/name %}} [Drupal 10 template](https://github.com/platformsh-templates/drupal10) is available.
 ---
 
 ## Deployment
@@ -20,7 +17,7 @@ Run through it as normal, but note that you will not be asked for the database c
 The `settings.platformsh.php` file added earlier automatically provides the database credentials
 and the installer is smart enough to not ask for them again.
 
-Once the installer is complete you are presented with your new site. 
+Once the installer is complete you are presented with your new site.
 
 {{% guides/data-migration %}}
 
diff --git a/sites/platform/src/guides/drupal9/deploy/next-steps.md b/sites/platform/src/guides/drupal9/deploy/next-steps.md
index 265d31a281..8a0dec2e4b 100644
--- a/sites/platform/src/guides/drupal9/deploy/next-steps.md
+++ b/sites/platform/src/guides/drupal9/deploy/next-steps.md
@@ -4,9 +4,6 @@ sidebarTitle: "Next steps"
 weight: -70
 description: |
     Upgrading, adding modules, and further development of your site.
-banner:
-    title: A note on version
-    body: While this guide focuses on Drupal 9, you can also refer to it when using Drupal 10 as differences in settings are minimal. Note that a {{% vendor/name %}} [Drupal 10 template](https://github.com/platformsh-templates/drupal10) is available.
 ---
 
 ## Adding modules and themes

From eb214bb8a2c50ffd010f61d64c16eba2c5e621ba Mon Sep 17 00:00:00 2001
From: Paul Gilzow <paul.gilzow@platform.sh>
Date: Tue, 24 Oct 2023 15:24:30 -0500
Subject: [PATCH 03/10] changes directory name drupal9 --> drupal. Updates
 files that contained links back to that directory

---
 sites/platform/src/add-services/elasticsearch.md                | 2 +-
 sites/platform/src/add-services/memcached.md                    | 2 +-
 sites/platform/src/add-services/redis.md                        | 2 +-
 sites/platform/src/add-services/solr.md                         | 2 +-
 sites/platform/src/guides/{drupal9 => drupal}/_index.md         | 0
 sites/platform/src/guides/{drupal9 => drupal}/deploy/_index.md  | 0
 .../platform/src/guides/{drupal9 => drupal}/deploy/configure.md | 0
 .../platform/src/guides/{drupal9 => drupal}/deploy/customize.md | 0
 sites/platform/src/guides/{drupal9 => drupal}/deploy/deploy.md  | 0
 .../src/guides/{drupal9 => drupal}/deploy/next-steps.md         | 0
 sites/platform/src/guides/{drupal9 => drupal}/elasticsearch.md  | 0
 sites/platform/src/guides/{drupal9 => drupal}/faq.md            | 0
 sites/platform/src/guides/{drupal9 => drupal}/memcached.md      | 0
 sites/platform/src/guides/{drupal9 => drupal}/multi-site.md     | 0
 sites/platform/src/guides/{drupal9 => drupal}/redis.md          | 0
 sites/platform/src/guides/{drupal9 => drupal}/simplesaml.md     | 0
 sites/platform/src/guides/{drupal9 => drupal}/solr.md           | 0
 17 files changed, 4 insertions(+), 4 deletions(-)
 rename sites/platform/src/guides/{drupal9 => drupal}/_index.md (100%)
 rename sites/platform/src/guides/{drupal9 => drupal}/deploy/_index.md (100%)
 rename sites/platform/src/guides/{drupal9 => drupal}/deploy/configure.md (100%)
 rename sites/platform/src/guides/{drupal9 => drupal}/deploy/customize.md (100%)
 rename sites/platform/src/guides/{drupal9 => drupal}/deploy/deploy.md (100%)
 rename sites/platform/src/guides/{drupal9 => drupal}/deploy/next-steps.md (100%)
 rename sites/platform/src/guides/{drupal9 => drupal}/elasticsearch.md (100%)
 rename sites/platform/src/guides/{drupal9 => drupal}/faq.md (100%)
 rename sites/platform/src/guides/{drupal9 => drupal}/memcached.md (100%)
 rename sites/platform/src/guides/{drupal9 => drupal}/multi-site.md (100%)
 rename sites/platform/src/guides/{drupal9 => drupal}/redis.md (100%)
 rename sites/platform/src/guides/{drupal9 => drupal}/simplesaml.md (100%)
 rename sites/platform/src/guides/{drupal9 => drupal}/solr.md (100%)

diff --git a/sites/platform/src/add-services/elasticsearch.md b/sites/platform/src/add-services/elasticsearch.md
index 2f7f7dd8bf..89520aa98a 100644
--- a/sites/platform/src/add-services/elasticsearch.md
+++ b/sites/platform/src/add-services/elasticsearch.md
@@ -13,7 +13,7 @@ See the [Elasticsearch documentation](https://www.elastic.co/guide/en/elasticsea
 
 {{% frameworks version="1" %}}
 
-- [Drupal](../guides/drupal9/elasticsearch.md)
+- [Drupal](../guides/drupal/elasticsearch.md)
 - [Jakarta EE](../guides/jakarta/deploy.md#elasticsearch)
 - [Micronaut](../guides/micronaut/elasticsearch.md)
 - [Quarkus](../guides/quarkus/elasticsearch.md)
diff --git a/sites/platform/src/add-services/memcached.md b/sites/platform/src/add-services/memcached.md
index 482cbb677d..bae71ba622 100644
--- a/sites/platform/src/add-services/memcached.md
+++ b/sites/platform/src/add-services/memcached.md
@@ -14,7 +14,7 @@ Both Memcached and Redis can be used for application caching. As a general rule,
 
 {{% frameworks version="1" %}}
 
-- [Drupal](../guides/drupal9/memcached.md)
+- [Drupal](../guides/drupal/memcached.md)
 
 {{% /frameworks %}}
 
diff --git a/sites/platform/src/add-services/redis.md b/sites/platform/src/add-services/redis.md
index 5ae420c76e..a1c067942b 100644
--- a/sites/platform/src/add-services/redis.md
+++ b/sites/platform/src/add-services/redis.md
@@ -13,7 +13,7 @@ for high-performance data retrieval and key-value storage.
 
 {{% frameworks version="1" %}}
 
-- [Drupal](../guides/drupal9/redis.md)
+- [Drupal](../guides/drupal/redis.md)
 - [Ibexa DXP](../guides/ibexa/deploy.md#cache-and-sessions)
 - [Jakarta EE](../guides/jakarta/deploy.md#redis)
 - [Micronaut](../guides/micronaut/redis.md)
diff --git a/sites/platform/src/add-services/solr.md b/sites/platform/src/add-services/solr.md
index 4a09fdc52f..6f8e6d9942 100644
--- a/sites/platform/src/add-services/solr.md
+++ b/sites/platform/src/add-services/solr.md
@@ -10,7 +10,7 @@ Solr search with generic schemas provided, and a custom schema is also supported
 
 {{% frameworks version="1" %}}
 
-- [Drupal](../guides/drupal9/solr.md)
+- [Drupal](../guides/drupal/solr.md)
 - [Ibexa DXP](../guides/ibexa/deploy.md#solr-specificity)
 - [Jakarta EE](../guides/jakarta/deploy.md#apache-solr)
 - [Spring](../guides/spring/solr.md)
diff --git a/sites/platform/src/guides/drupal9/_index.md b/sites/platform/src/guides/drupal/_index.md
similarity index 100%
rename from sites/platform/src/guides/drupal9/_index.md
rename to sites/platform/src/guides/drupal/_index.md
diff --git a/sites/platform/src/guides/drupal9/deploy/_index.md b/sites/platform/src/guides/drupal/deploy/_index.md
similarity index 100%
rename from sites/platform/src/guides/drupal9/deploy/_index.md
rename to sites/platform/src/guides/drupal/deploy/_index.md
diff --git a/sites/platform/src/guides/drupal9/deploy/configure.md b/sites/platform/src/guides/drupal/deploy/configure.md
similarity index 100%
rename from sites/platform/src/guides/drupal9/deploy/configure.md
rename to sites/platform/src/guides/drupal/deploy/configure.md
diff --git a/sites/platform/src/guides/drupal9/deploy/customize.md b/sites/platform/src/guides/drupal/deploy/customize.md
similarity index 100%
rename from sites/platform/src/guides/drupal9/deploy/customize.md
rename to sites/platform/src/guides/drupal/deploy/customize.md
diff --git a/sites/platform/src/guides/drupal9/deploy/deploy.md b/sites/platform/src/guides/drupal/deploy/deploy.md
similarity index 100%
rename from sites/platform/src/guides/drupal9/deploy/deploy.md
rename to sites/platform/src/guides/drupal/deploy/deploy.md
diff --git a/sites/platform/src/guides/drupal9/deploy/next-steps.md b/sites/platform/src/guides/drupal/deploy/next-steps.md
similarity index 100%
rename from sites/platform/src/guides/drupal9/deploy/next-steps.md
rename to sites/platform/src/guides/drupal/deploy/next-steps.md
diff --git a/sites/platform/src/guides/drupal9/elasticsearch.md b/sites/platform/src/guides/drupal/elasticsearch.md
similarity index 100%
rename from sites/platform/src/guides/drupal9/elasticsearch.md
rename to sites/platform/src/guides/drupal/elasticsearch.md
diff --git a/sites/platform/src/guides/drupal9/faq.md b/sites/platform/src/guides/drupal/faq.md
similarity index 100%
rename from sites/platform/src/guides/drupal9/faq.md
rename to sites/platform/src/guides/drupal/faq.md
diff --git a/sites/platform/src/guides/drupal9/memcached.md b/sites/platform/src/guides/drupal/memcached.md
similarity index 100%
rename from sites/platform/src/guides/drupal9/memcached.md
rename to sites/platform/src/guides/drupal/memcached.md
diff --git a/sites/platform/src/guides/drupal9/multi-site.md b/sites/platform/src/guides/drupal/multi-site.md
similarity index 100%
rename from sites/platform/src/guides/drupal9/multi-site.md
rename to sites/platform/src/guides/drupal/multi-site.md
diff --git a/sites/platform/src/guides/drupal9/redis.md b/sites/platform/src/guides/drupal/redis.md
similarity index 100%
rename from sites/platform/src/guides/drupal9/redis.md
rename to sites/platform/src/guides/drupal/redis.md
diff --git a/sites/platform/src/guides/drupal9/simplesaml.md b/sites/platform/src/guides/drupal/simplesaml.md
similarity index 100%
rename from sites/platform/src/guides/drupal9/simplesaml.md
rename to sites/platform/src/guides/drupal/simplesaml.md
diff --git a/sites/platform/src/guides/drupal9/solr.md b/sites/platform/src/guides/drupal/solr.md
similarity index 100%
rename from sites/platform/src/guides/drupal9/solr.md
rename to sites/platform/src/guides/drupal/solr.md

From 6dce2d2ee54c82da3950081e5a112e93a3c69704 Mon Sep 17 00:00:00 2001
From: Paul Gilzow <paul.gilzow@platform.sh>
Date: Tue, 24 Oct 2023 15:28:39 -0500
Subject: [PATCH 04/10] Updates link to drupal directory location

---
 sites/platform/src/guides/drupal/redis.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sites/platform/src/guides/drupal/redis.md b/sites/platform/src/guides/drupal/redis.md
index aa33152717..6bc4866f80 100644
--- a/sites/platform/src/guides/drupal/redis.md
+++ b/sites/platform/src/guides/drupal/redis.md
@@ -22,7 +22,7 @@ You need:
 - A [Drupal version deployed on {{% vendor/name %}}](../drupal/deploy/_index.md)
 - The [{{% vendor/name %}} CLI](../../administration/cli/)
 - [Composer](https://getcomposer.org/)
-- The [Config Reader library](../../guides/drupal9/deploy/customize.md#install-the-config-reader)
+- The [Config Reader library](../../guides/drupal/deploy/customize.md#install-the-config-reader)
 
 You also need a `settings.platformsh.php` file from which you can [manage the configuration of the Redis service](../drupal/deploy/customize.md#settingsphp).
 If you installed Drupal with a template, this file is already present in your project.

From de309d68c4396a3bcf166cdf1eb73495986f2bed Mon Sep 17 00:00:00 2001
From: Paul Gilzow <paul.gilzow@platform.sh>
Date: Tue, 24 Oct 2023 15:29:32 -0500
Subject: [PATCH 05/10] Updates all redirect rules that previously pointed to
 drupal9 to point to the drupal equivalent. adds redirect rule to redirect all
 requests to previous drupal9 locations to drupal equivalent.

---
 .platform/routes.yaml | 42 +++++++++++++++++++++++-------------------
 1 file changed, 23 insertions(+), 19 deletions(-)

diff --git a/.platform/routes.yaml b/.platform/routes.yaml
index 7ef6bd1068..b7bdd12200 100644
--- a/.platform/routes.yaml
+++ b/.platform/routes.yaml
@@ -46,17 +46,21 @@ https://{default}/:
       "/tutorials/region-migration.html": { "to": "/guides/general/region-migration.html", "code": 301, "prefix": false }
       "/tutorials/mysql-replication.html": { "to": "/guides/general/mysql-replication.html", "code": 301, "prefix": false }
       # PR 1560
-      "/frameworks/drupal8.html": { "to": "/guides/drupal9/deploy.html", "code": 301, "prefix": false }
-      "/frameworks/drupal8/developing-with-drupal.html": { "to": "/guides/drupal9/deploy.html", "code": 301, "prefix": false }
-      "/frameworks/drupal8/drush.html": { "to": "/guides/drupal9/deploy/next-steps.html#use-drush-aliases", "code": 301, "prefix": false }
-      "/frameworks/drupal8/elasticsearch.html": { "to": "/guides/drupal9/deploy/elasticsearch.html", "code": 301, "prefix": false }
-      "/frameworks/drupal8/faq.html": { "to": "/guides/drupal9/deploy/faq.html", "code": 301, "prefix": false }
+      "/frameworks/drupal8.html": { "to": "/guides/drupal/deploy.html", "code": 301, "prefix": false }
+      "/frameworks/drupal8/developing-with-drupal.html": { "to": "/guides/drupal/deploy.html", "code": 301, "prefix": false }
+      "/frameworks/drupal8/drush.html": { "to": "/guides/drupal/deploy/next-steps.html#use-drush-aliases", "code": 301, "prefix": false }
+      "/frameworks/drupal8/elasticsearch.html": { "to": "/guides/drupal/deploy/elasticsearch.html", "code": 301, "prefix": false }
+      "/frameworks/drupal8/faq.html": { "to": "/guides/drupal/deploy/faq.html", "code": 301, "prefix": false }
       "/frameworks/drupal8/lando.html": { "to": "/development/local/lando.html", "code": 301, "prefix": false }
-      "/frameworks/drupal8/memcached.html": { "to": "/guides/drupal9/deploy/memcached.html", "code": 301, "prefix": false }
-      "/frameworks/drupal8/multi-site.html": { "to": /guides/drupal9/deploy/multi-site.html", "code": 301, "prefix": false }
-      "/frameworks/drupal8/redis.html": { "to": "/guides/drupal9/deploy/redis.html", "code": 301, "prefix": false }
-      "/frameworks/drupal8/simplesaml.html": { "to": "/guides/drupal9/deploy/simplesaml.html", "code": 301, "prefix": false }
-      "/frameworks/drupal8/solr.html": { "to": "/guides/drupal9/deploy/solr.html", "code": 301, "prefix": false }
+      "/frameworks/drupal8/memcached.html": { "to": "/guides/drupal/deploy/memcached.html", "code": 301, "prefix": false }
+      "/frameworks/drupal8/multi-site.html": { "to": "/guides/drupal/deploy/multi-site.html", "code": 301, "prefix": false }
+      "/frameworks/drupal8/redis.html": { "to": "/guides/drupal/deploy/redis.html", "code": 301, "prefix": false }
+      "/frameworks/drupal8/simplesaml.html": { "to": "/guides/drupal/deploy/simplesaml.html", "code": 301, "prefix": false }
+      "/frameworks/drupal8/solr.html": { "to": "/guides/drupal/deploy/solr.html", "code": 301, "prefix": false }
+
+      # chore/3546
+      "^/guides/drupal9/(.*)$": { "to": "/guides/drupal/$1", "regexp": true }
+
       # PR 1562
       "/frameworks/typo3.html": { "to": "/guides/typo3/deloy.html", "code": 301, "prefix": false }
       "/frameworks/typo3/faq.html": { "to": "/guides/typo3/deploy/next-steps.html", "code": 301, "prefix": false }
@@ -85,14 +89,14 @@ https://{default}/:
       "/bestpractices/environment-build.html": { "to": "/development/variables.html", "code": 301, "prefix": false }
 
       # Drupal 7 EOL
-      "/frameworks/drupal7.*": { "to": "/guides/drupal9/deploy.html", "code": 301, "regexp": true }
+      "/frameworks/drupal7.*": { "to": "/guides/drupal/deploy.html", "code": 301, "regexp": true }
 
       # Removal of featured frameworks
       "/frameworks/(?!deploy|drupal)(.*).html":  { "to": "/guides/$1/deploy.html", "code": 301, "regexp": true }
       "/frameworks/ibexa/fastly.html":  { "to": "/guides/ibexa/fastly.html", "code": 301, "prefix": false }
 
       "/configuration/app/web.html#how-can-i-rewrite-an-incoming-request-without-a-redirect":   { "to": "/create-apps/web/rewrite-requests.html", "code": 301, "prefix": false }
-      
+
       # Navigation restructure in April 2021
       "/configuration/app-containers.html": { "to": "/create-apps/app-reference.html", "code": 301, "prefix": false }
       "/configuration/app/access.html": { "to": "/create-apps/app-reference.html#access", "code": 301, "prefix": false }
@@ -152,7 +156,7 @@ https://{default}/:
       "/configuration/yaml.html":  { "to": "/overview/yaml.html", "code": 301 }
       "/administration/web/delete.html":  { "to": "/projects/delete-project.html", "code": 301 }
       "/guides/general/region-migration.html":  { "to": "/projects/region-migration.html", "code": 301 }
-      
+
       # Remove get started index pages
       "/get-started/deploy.html(.*)" : { "to": "/get-started/deploy/init.html$1", "code": 301, "regexp": true }
       "/get-started/add-data.html(.*)" : { "to": "/get-started/add-data/branch.html$1", "code": 301, "regexp": true }
@@ -177,11 +181,11 @@ https://{default}/:
       "/development/protective-block.html" : { "to": "/security.html", "code": 301 }
       "/drupal_migrate/guides/local/git-initialize-repository.html" : { "to": "/tutorials/migrating.html", "code": 301 }
       "/drupal_migrate/guides/type/php/drupal/migrate/import-database.html" : { "to": "/tutorials/migrating.html", "code": 301 }
-      "/drupal_migrate/guides/type/php/drupal/migrate/import-files.html" : { "to": "/tutorials/migrating.html", "code": 301 } 
+      "/drupal_migrate/guides/type/php/drupal/migrate/import-files.html" : { "to": "/tutorials/migrating.html", "code": 301 }
       "/drupal_migrate/guides/type/php/drupal/rebuild-site-registry.html" : { "to": "/tutorials/migrating.html", "code": 301 }
-      "/drupal/guides/local/get-project.html" : { "to": "/guides/drupal9/deploy.html", "code": 301 } 
-      "/drupal/guides/prerequisites/platform-cli.html" : { "to": "/guides/drupal9/deploy.html", "code": 301 } 
-      "/frameworks/drupal.html" : { "to": "/guides/drupal9/deploy.html", "code": 301 } 
+      "/drupal/guides/local/get-project.html" : { "to": "/guides/drupal/deploy.html", "code": 301 }
+      "/drupal/guides/prerequisites/platform-cli.html" : { "to": "/guides/drupal/deploy.html", "code": 301 }
+      "/frameworks/drupal.html" : { "to": "/guides/drupal/deploy.html", "code": 301 }
       "/guides/general/composer-auth.html" : { "to": "/languages/php/composer-auth.html", "code": 301 }
       "/images/getting-started/free-trial.png" : { "to": "/get-started/introduction.html", "code": 301 }
       "/images/integrations/bitbucket_server.png" : { "to": "/integrations/source/bitbucket.html", "code": 301 }
@@ -216,7 +220,7 @@ https://{default}/:
       "/user_guide/reference/toolstacks/nodejs/index.html" : { "to": "/languages/nodejs.html", "code": 301 }
       "/user_guide/reference/toolstacks/php/configure-php.html" : { "to": "/languages/php.html", "code": 301 }
       "/user_guide/reference/toolstacks/php/drupal/customizing-settings-php.html" : { "to": "/languages/php.html#customize-php-settings", "code": 301 }
-      "/user_guide/reference/toolstacks/php/drupal7/redis.html" : { "to": "/guides/drupal9/redis.html", "code": 301 }
+      "/user_guide/reference/toolstacks/php/drupal7/redis.html" : { "to": "/guides/drupal/redis.html", "code": 301 }
       "/user_guide/reference/upgrade/index.html" : { "to": "/get-started/introduction.html", "code": 301 }
       "/user_guide/using/backup-and-restore.html" : { "to": "/security/backups.html", "code": 301 }
       "/user_guide/using/going-live.html" : { "to": "/domains/steps.html", "code": 301 }
@@ -276,7 +280,7 @@ https://docs.upsun.com/:
     enabled: false
   redirects:
     paths:
-      # Console tooltips 
+      # Console tooltips
       "/anchors/resources/configuration.html": { "to": "/manage-resources.html", "code": 301, "prefix": false }
       "/anchors/scaling/down.html": { "to": "/administration/pricing.html", "code": 301, "prefix": false }
       "/anchors/organizations/admin.html": { "to": "/administration/organizations.html", "code": 301, "prefix": false }

From b463c0dcf4e8e1381ec70816f16746b213faa59c Mon Sep 17 00:00:00 2001
From: Paul Gilzow <paul.gilzow@platform.sh>
Date: Tue, 24 Oct 2023 16:20:34 -0500
Subject: [PATCH 06/10] updates drupal repo from drupal9 to drupal10

---
 shared/data/remote-examples/templates/drupal-config.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared/data/remote-examples/templates/drupal-config.yaml b/shared/data/remote-examples/templates/drupal-config.yaml
index c004c4de1c..4618963d24 100644
--- a/shared/data/remote-examples/templates/drupal-config.yaml
+++ b/shared/data/remote-examples/templates/drupal-config.yaml
@@ -4,4 +4,4 @@ repoOrg: "platformsh-templates"
 branch: "master"
 file: "web/sites/default/settings.platformsh.php"
 repos:
-    - drupal9
+    - drupal10

From 98a819744f5f1c6ea7a04e1fce21a70cc967f944 Mon Sep 17 00:00:00 2001
From: Paul Gilzow <paul.gilzow@platform.sh>
Date: Tue, 24 Oct 2023 16:22:06 -0500
Subject: [PATCH 07/10] Fixes a few missed mentions of Drupal 9

---
 sites/platform/src/_index.md                         | 2 +-
 sites/platform/src/development/variables/_index.md   | 2 +-
 sites/platform/src/guides/drupal/deploy/customize.md | 4 ++--
 sites/platform/src/guides/drupal/faq.md              | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/sites/platform/src/_index.md b/sites/platform/src/_index.md
index 2d23d6a9ff..b35f44e1b5 100644
--- a/sites/platform/src/_index.md
+++ b/sites/platform/src/_index.md
@@ -53,7 +53,7 @@ The **Frameworks** section is a collection of framework-specific how-to guides -
 | Language              | Frameworks |
 | :----------------     | :------  |
 | [Python](/languages/python/_index.md)                |   [Django](/guides/django/_index.md)  |
-| [PHP](/languages/php/_index.md)                      |   [Drupal](/guides/drupal9/_index.md)<br/>[Ibexa](/guides/ibexa/_index.md)<br/>[Laravel](/guides/laravel/_index.md)<br/>[Symfony](/guides/symfony/_index.md)<br/>[TYPO3](/guides/typo3/_index.md)<br/>[WordPress](/guides/wordpress/_index.md)   |
+| [PHP](/languages/php/_index.md)                      |   [Drupal](/guides/drupal/_index.md)<br/>[Ibexa](/guides/ibexa/_index.md)<br/>[Laravel](/guides/laravel/_index.md)<br/>[Symfony](/guides/symfony/_index.md)<br/>[TYPO3](/guides/typo3/_index.md)<br/>[WordPress](/guides/wordpress/_index.md)   |
 | [Javascript/Node.js](/languages/nodejs/_index.md)     |  [Gatsby](/guides/gatsby/_index.md)<br/>[Next.js](/guides/nextjs/_index.md)<br/>[Strapi](/guides/strapi/_index.md)  |
 | [Java](/languages/java/_index.md)                  |  [Hibernate](/guides/hibernate/_index.md)<br/>[Jakarta](/guides/jakarta/_index.md)<br/>[Micronaut](/guides/micronaut/_index.md)<br/>[Quarkus](/guides/quarkus/_index.md)<br/>[Spring](/guides/spring/_index.md)  |
 
diff --git a/sites/platform/src/development/variables/_index.md b/sites/platform/src/development/variables/_index.md
index 39e48187ed..89ea5d990f 100644
--- a/sites/platform/src/development/variables/_index.md
+++ b/sites/platform/src/development/variables/_index.md
@@ -200,7 +200,7 @@ but still adapt the behavior to each environment.
 
 The [Drupal template](https://github.com/platformsh-templates/drupal10/) shows an example of
 overriding Drupal configuration using environment variables.
-These variables are parsed in the [`settings.platformsh.php` script](https://github.com/platformsh-templates/drupal9/blob/8d5d23cdcb91ffa3f96727adf9d3dba74dfc01db/web/sites/default/settings.platformsh.php#L125-L162).
+These variables are parsed in the [`settings.platformsh.php` script](https://github.com/platformsh-templates/drupal10/blob/386ea35b034b5d78da8060925940e793bea479d9/web/sites/default/settings.platformsh.php#L126-L164).
 
 For example, the site name is overridden by a variable named `drupalsettings:system.site:name`.
 Variables for the override are composed of three distinct parts each separated by colons:
diff --git a/sites/platform/src/guides/drupal/deploy/customize.md b/sites/platform/src/guides/drupal/deploy/customize.md
index 371a327e7d..a7c33fc3db 100644
--- a/sites/platform/src/guides/drupal/deploy/customize.md
+++ b/sites/platform/src/guides/drupal/deploy/customize.md
@@ -19,7 +19,7 @@ There are a number of additional steps that are either required or recommended,
 `settings.php` is the main Drupal environment-configuration file.
 In a stock Drupal installation it contains the database credentials, various other settings, and an enormous amount of comments.
 
-In the Drupal 9 template, the [`settings.php`](https://github.com/platformsh-templates/drupal9/blob/master/web/sites/default/settings.php) file
+In the Drupal template, the [`settings.php`](https://github.com/platformsh-templates/drupal10/blob/master/web/sites/default/settings.php) file
 is mostly replaced with a stub that contains only the most basic configuration
 and then includes a `settings.platformsh.php` and `settings.local.php` file, if they exist.
 The latter is a common Drupal pattern, and the `settings.local.php` file should never be committed to Git.
@@ -32,7 +32,7 @@ That includes the database credentials, Redis caching, and file system paths.
 
 The file itself is a bit long, but reasonably self-explanatory.
 
-{{< readFile file="static/files/fetch/config-examples/drupal9" highlight="php" >}}
+{{< readFile file="static/files/fetch/config-examples/drupal10" highlight="php" >}}
 
 If you add additional services to your application, such as Solr, Elasticsearch, or RabbitMQ,
 you would add configuration for those services to the `settings.platformsh.php` file as well.
diff --git a/sites/platform/src/guides/drupal/faq.md b/sites/platform/src/guides/drupal/faq.md
index 4b7ed0b2d0..94b5c8e794 100644
--- a/sites/platform/src/guides/drupal/faq.md
+++ b/sites/platform/src/guides/drupal/faq.md
@@ -26,7 +26,7 @@ Examine the watchdog logs and resolve the errors reported.
 2. Cron should run at regular intervals to ensure cache tables get cleared out.
 3. You are using database caching.
 That isn't recommended, primarily because it can balloon the size of the database.
-[Redis caching](/guides/drupal9/redis.md) is recommended for all Drupal sites.
+[Redis caching](/guides/drupal/redis.md) is recommended for all Drupal sites.
 
 ## Why do I get "MySQL can't connect to the database server"?
 

From 23fedeed9b24e630a7a11441f52a5b8d53559c50 Mon Sep 17 00:00:00 2001
From: Paul Gilzow <paul.gilzow@platform.sh>
Date: Tue, 24 Oct 2023 16:36:23 -0500
Subject: [PATCH 08/10] ah-ha! finally found the missing pointer to D9!

---
 shared/data/remote-examples/templates/services.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared/data/remote-examples/templates/services.yaml b/shared/data/remote-examples/templates/services.yaml
index 4c7b4dc271..71550e0605 100644
--- a/shared/data/remote-examples/templates/services.yaml
+++ b/shared/data/remote-examples/templates/services.yaml
@@ -4,7 +4,7 @@ repoOrg: "platformsh-templates"
 branch: "master"
 file: ".platform/services.yaml"
 repos:
-    - drupal9
+    - drupal10
     - typo3
     - wordpress-composer
     - wordpress-vanilla

From 03a8c9b6a634e1b9c4ee8c68c700aee2ca330ea4 Mon Sep 17 00:00:00 2001
From: Paul Gilzow <paul.gilzow@platform.sh>
Date: Tue, 24 Oct 2023 16:47:20 -0500
Subject: [PATCH 09/10] removes errant space between vendor name and period.

---
 themes/psh-docs/layouts/shortcodes/guides/config-desc.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/psh-docs/layouts/shortcodes/guides/config-desc.md b/themes/psh-docs/layouts/shortcodes/guides/config-desc.md
index 6c8193bb9f..1c5be1b361 100644
--- a/themes/psh-docs/layouts/shortcodes/guides/config-desc.md
+++ b/themes/psh-docs/layouts/shortcodes/guides/config-desc.md
@@ -1,5 +1,5 @@
 {{ $name := .Get "name" }}
-You now have a *project* running on {{ .Site.Params.vendor.name }} .
+You now have a *project* running on {{ .Site.Params.vendor.name }}.
 In many ways, a project is just a collection of tools around a Git repository.
 Just like a Git repository, a project has branches, called *environments*.
 Each environment can then be activated.

From 92e26a5d3c11badf58b0d8e7562ed9cacb839a71 Mon Sep 17 00:00:00 2001
From: Paul Gilzow <paul.gilzow@platform.sh>
Date: Tue, 24 Oct 2023 16:55:08 -0500
Subject: [PATCH 10/10] corrects broken redirects unrelated to this PR but that
 were caught due to this PR updating items related to drupal.

---
 .platform/routes.yaml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/.platform/routes.yaml b/.platform/routes.yaml
index b7bdd12200..b5d9defb76 100644
--- a/.platform/routes.yaml
+++ b/.platform/routes.yaml
@@ -49,16 +49,16 @@ https://{default}/:
       "/frameworks/drupal8.html": { "to": "/guides/drupal/deploy.html", "code": 301, "prefix": false }
       "/frameworks/drupal8/developing-with-drupal.html": { "to": "/guides/drupal/deploy.html", "code": 301, "prefix": false }
       "/frameworks/drupal8/drush.html": { "to": "/guides/drupal/deploy/next-steps.html#use-drush-aliases", "code": 301, "prefix": false }
-      "/frameworks/drupal8/elasticsearch.html": { "to": "/guides/drupal/deploy/elasticsearch.html", "code": 301, "prefix": false }
-      "/frameworks/drupal8/faq.html": { "to": "/guides/drupal/deploy/faq.html", "code": 301, "prefix": false }
+      "/frameworks/drupal8/elasticsearch.html": { "to": "/guides/drupal/elasticsearch.html", "code": 301, "prefix": false }
+      "/frameworks/drupal8/faq.html": { "to": "/guides/drupal/faq.html", "code": 301, "prefix": false }
       "/frameworks/drupal8/lando.html": { "to": "/development/local/lando.html", "code": 301, "prefix": false }
-      "/frameworks/drupal8/memcached.html": { "to": "/guides/drupal/deploy/memcached.html", "code": 301, "prefix": false }
-      "/frameworks/drupal8/multi-site.html": { "to": "/guides/drupal/deploy/multi-site.html", "code": 301, "prefix": false }
-      "/frameworks/drupal8/redis.html": { "to": "/guides/drupal/deploy/redis.html", "code": 301, "prefix": false }
-      "/frameworks/drupal8/simplesaml.html": { "to": "/guides/drupal/deploy/simplesaml.html", "code": 301, "prefix": false }
-      "/frameworks/drupal8/solr.html": { "to": "/guides/drupal/deploy/solr.html", "code": 301, "prefix": false }
+      "/frameworks/drupal8/memcached.html": { "to": "/guides/drupal/memcached.html", "code": 301, "prefix": false }
+      "/frameworks/drupal8/multi-site.html": { "to": "/guides/drupal/multi-site.html", "code": 301, "prefix": false }
+      "/frameworks/drupal8/redis.html": { "to": "/guides/drupal/redis.html", "code": 301, "prefix": false }
+      "/frameworks/drupal8/simplesaml.html": { "to": "/guides/drupal/simplesaml.html", "code": 301, "prefix": false }
+      "/frameworks/drupal8/solr.html": { "to": "/guides/drupal/solr.html", "code": 301, "prefix": false }
 
-      # chore/3546
+      # chore/3546 & PR 3548
       "^/guides/drupal9/(.*)$": { "to": "/guides/drupal/$1", "regexp": true }
 
       # PR 1562