diff --git a/core/lib/Drupal/Core/FileTransfer/Form/FileTransferAuthorizeForm.php b/core/lib/Drupal/Core/FileTransfer/Form/FileTransferAuthorizeForm.php
index a25156e503..e8971f85dd 100644
--- a/core/lib/Drupal/Core/FileTransfer/Form/FileTransferAuthorizeForm.php
+++ b/core/lib/Drupal/Core/FileTransfer/Form/FileTransferAuthorizeForm.php
@@ -177,7 +177,7 @@ public function validateForm(array &$form, FormStateInterface $form_state) {
         // database connection form in the installer.
         $form_state->setErrorByName('connection_settings', $this->t('Failed to connect to the server. The server reports the following message: <p class="error">@message</p> For more help adding or updating code on your server, see the <a href=":handbook_url">handbook</a>.', [
           '@message' => $e->getMessage(),
-          ':handbook_url' => 'https://www.drupal.org/docs/8/extending-drupal-8/overview',
+          ':handbook_url' => 'https://www.drupal.org/docs/extending-drupal/overview',
         ]));
       }
     }
diff --git a/core/modules/update/update.manager.inc b/core/modules/update/update.manager.inc
index a3f54b04e6..7895b55990 100644
--- a/core/modules/update/update.manager.inc
+++ b/core/modules/update/update.manager.inc
@@ -102,10 +102,10 @@ function _update_manager_check_backends(&$form, $operation) {
   $available_backends = drupal_get_filetransfer_info();
   if (empty($available_backends)) {
     if ($operation == 'update') {
-      $form['available_backends']['#markup'] = t('Your server does not support updating modules and themes from this interface. Instead, update modules and themes by uploading the new versions directly to the server, as documented in <a href=":doc_url">Extending Drupal 8</a>.', [':doc_url' => 'https://www.drupal.org/docs/8/extending-drupal-8/overview']);
+      $form['available_backends']['#markup'] = t('Your server does not support updating modules and themes from this interface. Instead, update modules and themes by uploading the new versions directly to the server, as documented in <a href=":doc_url">Extending Drupal</a>.', [':doc_url' => 'https://www.drupal.org/docs/extending-drupal/overview']);
     }
     else {
-      $form['available_backends']['#markup'] = t('Your server does not support adding modules and themes from this interface. Instead, add modules and themes by uploading them directly to the server, as documented in <a href=":doc_url">Extending Drupal 8</a>.', [':doc_url' => 'https://www.drupal.org/docs/8/extending-drupal-8/overview']);
+      $form['available_backends']['#markup'] = t('Your server does not support adding modules and themes from this interface. Instead, add modules and themes by uploading them directly to the server, as documented in <a href=":doc_url">Extending Drupal</a>.', [':doc_url' => 'https://www.drupal.org/docs/extending-drupal/overview']);
     }
     return FALSE;
   }
@@ -117,21 +117,21 @@ function _update_manager_check_backends(&$form, $operation) {
   if ($operation == 'update') {
     $form['available_backends']['#markup'] = \Drupal::translation()->formatPlural(
       count($available_backends),
-      'Updating modules and themes requires <strong>@backends access</strong> to your server. See <a href=":doc_url">Extending Drupal 8</a> for other update methods.',
-      'Updating modules and themes requires access to your server via one of the following methods: <strong>@backends</strong>. See <a href=":doc_url">Extending Drupal 8</a> for other update methods.',
+      'Updating modules and themes requires <strong>@backends access</strong> to your server. See <a href=":doc_url">Extending Drupal</a> for other update methods.',
+      'Updating modules and themes requires access to your server via one of the following methods: <strong>@backends</strong>. See <a href=":doc_url">Extending Drupal</a> for other update methods.',
       [
         '@backends' => implode(', ', $backend_names),
-        ':doc_url' => 'https://www.drupal.org/docs/8/extending-drupal-8/overview',
+        ':doc_url' => 'https://www.drupal.org/docs/extending-drupal/overview',
       ]);
   }
   else {
     $form['available_backends']['#markup'] = \Drupal::translation()->formatPlural(
       count($available_backends),
-      'Adding modules and themes requires <strong>@backends access</strong> to your server. See <a href=":doc_url">Extending Drupal 8</a> for other methods.',
-      'Adding modules and themes requires access to your server via one of the following methods: <strong>@backends</strong>. See <a href=":doc_url">Extending Drupal 8</a> for other methods.',
+      'Adding modules and themes requires <strong>@backends access</strong> to your server. See <a href=":doc_url">Extending Drupal</a> for other methods.',
+      'Adding modules and themes requires access to your server via one of the following methods: <strong>@backends</strong>. See <a href=":doc_url">Extending Drupal</a> for other methods.',
       [
         '@backends' => implode(', ', $backend_names),
-        ':doc_url' => 'https://www.drupal.org/docs/8/extending-drupal-8/overview',
+        ':doc_url' => 'https://www.drupal.org/docs/extending-drupal/overview',
       ]);
   }
   return TRUE;
diff --git a/core/themes/olivero/templates/includes/get-started.html.twig b/core/themes/olivero/templates/includes/get-started.html.twig
index 8bc42405da..6d4339e946 100644
--- a/core/themes/olivero/templates/includes/get-started.html.twig
+++ b/core/themes/olivero/templates/includes/get-started.html.twig
@@ -15,7 +15,7 @@
 {% set drupal_values = 'https://www.drupal.org/about/values-and-principles' %}
 {% set drupal_user_guide = 'https://www.drupal.org/docs/user_guide/en/index.html' %}
 {% set create_content = '/node/add' %}
-{% set drupal_extend = 'https://www.drupal.org/docs/8/extending-drupal-8' %}
+{% set drupal_extend = 'https://www.drupal.org/docs/extending-drupal' %}
 {% set drupal_global_training_days = 'https://groups.drupal.org/global-training-days' %}
 {% set drupal_events = 'https://www.drupal.org/community/events' %}
 {% set drupal_slack = 'https://www.drupal.org/slack' %}