diff --git a/source/en/attributions.txt b/source/en/attributions.txt
index d1ac895befefdd4fb47da8e63d7aa33c17657d39..9475ee5858c9ee7068f00dae847644e77e7d955b 100644
--- a/source/en/attributions.txt
+++ b/source/en/attributions.txt
@@ -39,10 +39,10 @@ The following people contributed to guide-wide writing:
 * The glossary was written and adapted by
 https://www.drupal.org/u/jhodgdon[Jennifer Hodgdon],
 with parts from https://www.drupal.org/docs/7/understanding-drupal/glossary["Glossary"],
-https://www.drupal.org/node/2120523["Overview of Configuration (vs. other
+https://www.drupal.org/docs/drupal-apis/configuration-api/overview-of-configuration-vs-other-types-of-information["Overview of Configuration (vs. other
 types of information)"], and
-https://www.drupal.org/docs/8/theming-drupal-8/working-with-breakpoints-in-drupal-8["Working with
-breakpoints in Drupal 8"],
+https://www.drupal.org/docs/theming-drupal/working-with-breakpoints-in-drupal["Working with
+breakpoints in Drupal"],
 each copyright 2000-copyright_upper_year by the individual contributors to the
 https://www.drupal.org/documentation[Drupal Community Documentation].
 
diff --git a/source/en/block-concept.txt b/source/en/block-concept.txt
index cdf95275e4c4c64f84ce3722c86f0b4fdccc7cdd..2114dbd99e119377d7a38fcf9f325aea382b8f6d 100644
--- a/source/en/block-concept.txt
+++ b/source/en/block-concept.txt
@@ -40,7 +40,6 @@ visibility rules.
 *Attributions*
 
 Adapted by https://www.drupal.org/u/les-lim[Les Lim] from
-https://www.drupal.org/docs/8/core/modules/block/overview["Working with blocks
-(content in regions)"]
+https://www.drupal.org/docs/core-modules-and-themes/core-modules/block-module/managing-blocks["Managing blocks"]
 copyright 2000-copyright_upper_year by the individual contributors to the
 https://www.drupal.org/documentation[Drupal Community Documentation].
diff --git a/source/en/block-create-custom.txt b/source/en/block-create-custom.txt
index 002ff71cb66cc47071aae43523e3262ed6b3e9fc..bc220ecb98fc5f414e6a600edf973f433544b3ec 100644
--- a/source/en/block-create-custom.txt
+++ b/source/en/block-create-custom.txt
@@ -62,13 +62,12 @@ video::https://www.youtube-nocookie.com/embed/sI2wrbn3cPg[title="Creating a Cust
 
 ==== Additional resources
 
-https://www.drupal.org/docs/8/core/modules/block/overview[_Drupal.org_ community documentation page "Working with blocks (content in regions)"]
+https://www.drupal.org/docs/core-modules-and-themes/core-modules/block-module/managing-blocks[_Drupal.org_ community documentation page "Managing blocks"]
 
 
 *Attributions*
 
 Adapted by https://www.drupal.org/u/jredding[Jacob Redding] and
 https://www.drupal.org/u/batigolix[Boris Doesborg] from
-https://www.drupal.org/docs/8/core/modules/block/overview[Working with blocks
-(content in regions)], copyright 2000-copyright_upper_year by the individual contributors to
+https://www.drupal.org/docs/core-modules-and-themes/core-modules/block-module/managing-blocks[Managing blocks], copyright 2000-copyright_upper_year by the individual contributors to
 the https://www.drupal.org/documentation[Drupal Community Documentation].
diff --git a/source/en/block-regions.txt b/source/en/block-regions.txt
index 783b531221a58a012b590844ac2c1a817ac37804..09a65bac78bc1093c8757df35a23d74c89967931 100644
--- a/source/en/block-regions.txt
+++ b/source/en/block-regions.txt
@@ -57,10 +57,7 @@ image:images/block-regions-bartik.png["core Bartik theme regions",width="100%"]
 * <<planning-data-types>>
 * <<block-place>>
 
-==== Additional resources
-
-* https://www.drupal.org/node/171224[_Drupal.org_ community documentation page "Assigning content to regions"]
-
+// ==== Additional resources
 
 *Attributions*
 
diff --git a/source/en/config-basic.txt b/source/en/config-basic.txt
index f6cc9afd8e88523dad5bb8008a9e4ffbe479782f..d5bb9a9b69a17d2115052702dd6794679e140c98 100644
--- a/source/en/config-basic.txt
+++ b/source/en/config-basic.txt
@@ -94,7 +94,7 @@ video::https://www.youtube-nocookie.com/embed/oDMCQ1cDYOI[title="Editing Basic S
 
 ==== Additional resources
 
-https://www.drupal.org/node/1896670[_Drupal.org_ community documentation page "Getting started with Drupal 8 administration"]
+https://www.drupal.org/docs/administering-a-drupal-site/getting-started-with-drupal-administration[_Drupal.org_ community documentation page "Getting started with Drupal administration"]
 
 
 *Attributions*
diff --git a/source/en/config-user.txt b/source/en/config-user.txt
index 0690bf1a4ec5e4ebff920efd39fdad63a83a600e..b2b9df8fe9ad6c614a598fa2fe20bc27c591771b 100644
--- a/source/en/config-user.txt
+++ b/source/en/config-user.txt
@@ -81,8 +81,8 @@ video::https://www.youtube-nocookie.com/embed/POhQTAX93R8[title="Configuring Use
 
 ==== Additional resources
 
-https://www.drupal.org/security/secure-configuration[Security Guide] can help
-you with a more safety-focused approach to configuration.
+https://www.drupal.org/security/secure-configuration[Securing your site] can
+help you with a more safety-focused approach to configuration.
 
 
 *Attributions*
diff --git a/source/en/content-create.txt b/source/en/content-create.txt
index be4aab2d6d49797938403280391a103480026a65..e94df1a50115f0617c5550359e822a5578959710 100644
--- a/source/en/content-create.txt
+++ b/source/en/content-create.txt
@@ -87,7 +87,7 @@ video::https://www.youtube-nocookie.com/embed/h312fekiSNE[title="Creating a Cont
 
 ==== Additional resources
 
-https://www.drupal.org/docs/8/core/modules/node/about-nodes[_Drupal.org_ community documentation page "About nodes"]
+https://www.drupal.org/docs/core-modules-and-themes/core-modules/node-module/about-nodes[_Drupal.org_ community documentation page "About nodes"]
 
 
 *Attributions*
diff --git a/source/en/content-paths.txt b/source/en/content-paths.txt
index 2ad908c241051cc6fb379eaa0f0f28bb83a99aa3..32a0530e03208bbb96d32e340a0383fae6a4c44e 100644
--- a/source/en/content-paths.txt
+++ b/source/en/content-paths.txt
@@ -61,6 +61,6 @@ aliasing, provides this functionality.
 Adapted by https://www.drupal.org/u/dianalakatos[Diána Lakatos] at
 https://pronovix.com/[Pronovix] from
 https://www.drupal.org/node/120631["URL aliases"], and
-https://www.drupal.org/node/31644["Understanding Drupal paths"]
+https://www.drupal.org/docs/7/understanding-drupal/url-paths["URL paths"]
 copyright 2000-copyright_upper_year by the individual contributors to the
 https://www.drupal.org/documentation[Drupal Community Documentation]
diff --git a/source/en/extend-manual-install.txt b/source/en/extend-manual-install.txt
index fc44ec32cc86789bb276a64410ea501eeb5df193..b01c5a779fa0e439b64138976a038fbcc9209e09 100644
--- a/source/en/extend-manual-install.txt
+++ b/source/en/extend-manual-install.txt
@@ -143,9 +143,9 @@ video::https://www.youtube-nocookie.com/embed/kOzQz9q3Kf8[title="Manually Downlo
 
 ==== Additional resources
 
-* https://www.drupal.org/node/250790[_Drupal.org_ community documentation page "Updating modules"]
-* https://www.drupal.org/docs/8/extending-drupal-8/installing-drupal-8-modules[_Drupal.org_ community documentation page "Installing contributed modules (Drupal 8)"]
-* https://www.drupal.org/docs/8/extending-drupal-8/installing-themes[_Drupal.org_ community documentation page "Installing themes"]
+* https://www.drupal.org/docs/extending-drupal/updating-modules[_Drupal.org_ community documentation page "Updating modules"]
+* https://www.drupal.org/docs/extending-drupal/installing-drupal-modules[_Drupal.org_ community documentation page "Installing Drupal modules"]
+* https://www.drupal.org/docs/extending-drupal/installing-themes[_Drupal.org_ community documentation page "Installing themes"]
 
 
 *Attributions*
diff --git a/source/en/extend-module-install.txt b/source/en/extend-module-install.txt
index ca9e486d498a409345445f36bfef6ae2e558ae30..75ff33964c42f7d2beb501326982c874939bd70e 100644
--- a/source/en/extend-module-install.txt
+++ b/source/en/extend-module-install.txt
@@ -141,7 +141,7 @@ video::https://www.youtube-nocookie.com/embed/vx9nWJE1Kbk[title="Downloading and
 
 ==== Additional resources
 
-* https://www.drupal.org/node/340271[_Drupal.org_ community documentation page "Contributed modules"]
+* https://www.drupal.org/docs/extending-drupal/installing-drupal-modules[_Drupal.org_ community documentation page "Installing Drupal modules"]
 * https://www.drupal.org/download["Download and Extend" page on _Drupal.org_]
 * https://www.drupal.org/project/admin_toolbar[Admin Toolbar module on _Drupal.org_]
 
diff --git a/source/en/guide.txt b/source/en/guide.txt
index 56de625c6e2f959229349b0448e9cd3c49974f81..da174b9b3e62a5e94e4ac75796e07c11992713df 100644
--- a/source/en/guide.txt
+++ b/source/en/guide.txt
@@ -1,5 +1,5 @@
 [[user_guide]]
-= Drupal 8 User Guide
+= Drupal User Guide
 
 // Chapters are defined here, and each one includes the individual
 // topic files that make up the chapter, in order.
diff --git a/source/en/install-composer.txt b/source/en/install-composer.txt
index 1317f4facbb2ce4c42b9560d5240883af440bd66..418434deff85ac2b8d84c5e199cbc3c11feeda97 100644
--- a/source/en/install-composer.txt
+++ b/source/en/install-composer.txt
@@ -162,9 +162,9 @@ video::https://www.youtube-nocookie.com/embed/v-WeFthdmD4[title="Using Composer
 
 ==== Additional resources
 
-* https://www.drupal.org/docs/develop/using-composer/using-composer-to-manage-drupal-site-dependencies["Using Composer to manage Drupal site dependencies"]
-* https://www.drupal.org/docs/8/update/update-core-via-composer["Update core via Composer"]
-* https://www.drupal.org/docs/8/install/add-composer-to-an-existing-site[Add Composer to an existing site]
+* https://www.drupal.org/docs/develop/using-composer/using-composer-to-manage-drupal-site-dependencies[_Drupal.org_ community documentation page "Using Composer to manage Drupal site dependencies"]
+* https://www.drupal.org/docs/updating-drupal/update-drupal-core-via-composer[_Drupal.org_ community documentation page "Update Drupal core via Composer"]
+* https://www.drupal.org/docs/installing-drupal/add-composer-to-an-existing-site[_Drupal.org_ community documentation page "Add Composer to an existing site"]
 
 *Attributions*
 
diff --git a/source/en/install-decide.txt b/source/en/install-decide.txt
index 22c07619864f2559e9d26131ca68a3cc49da9599..a9699b21219d1114990ac60c6e594c6629429601 100644
--- a/source/en/install-decide.txt
+++ b/source/en/install-decide.txt
@@ -37,7 +37,7 @@ Use a pre-configured environment::
   Use a pre-configured environment or virtual machine that contains Drupal and
   all the required supporting software to install Drupal locally. See the
   section for your operating system under
-  https://www.drupal.org/docs/develop/local-server-setup[Drupal.org's Local server setup guide]
+  https://www.drupal.org/docs/develop/local-server-setup[_Drupal.org_ community documentation page "Local server setup guide"]
   for possible options.
 
 Download manually from the web site::
diff --git a/source/en/install-dev-making.txt b/source/en/install-dev-making.txt
index 2a821fcf6eb4abef84ef5e5082829a4dec1462d4..cd89a5de613c33cb703dfbaa290d31e513a80931 100644
--- a/source/en/install-dev-making.txt
+++ b/source/en/install-dev-making.txt
@@ -143,7 +143,7 @@ video::https://www.youtube-nocookie.com/embed/FSBNm4oAkaA[title="Making a Develo
 ==== Additional resources
 
 * https://www.drupal.org/docs/7/backing-up-and-migrating-a-site/backing-up-a-site[_Drupal.org_ community documentation page "Backing up a site"]
-* https://www.drupal.org/docs/develop/local-server-setup/how-to-create-a-test-site[_Drupal.org_ community documentation page "Create a Test Site"]
+* https://www.drupal.org/docs/develop/local-server-setup/how-to-create-a-test-site[_Drupal.org_ community documentation page "How to create a test site"]
 
 
 *Attributions*
diff --git a/source/en/install-requirements.txt b/source/en/install-requirements.txt
index 195eda8fc602a2246c047f9502ba0cac0dcf51c3..7ab6ec8066a8ff4f618ff3a69152e568cc9b14ef 100644
--- a/source/en/install-requirements.txt
+++ b/source/en/install-requirements.txt
@@ -92,7 +92,7 @@ software.
 
 ==== Additional resources
 
-* https://www.drupal.org/docs/8/system-requirements[_Drupal.org_ community documentation page "System requirements"]
+* https://www.drupal.org/docs/system-requirements[_Drupal.org_ community documentation page "System requirements"]
 * https://secure.php.net/manual/en/configuration.php[PHP Runtime Configuration (PHP memory limit and other settings)]
 
 
@@ -101,6 +101,6 @@ software.
 Adapted by https://www.drupal.org/u/KarlKedrovsky[Karl Kedrovsky],
 https://www.drupal.org/u/bemery987[Brian Emery], and
 https://www.drupal.org/u/jhodgdon[Jennifer Hodgdon] from
-https://www.drupal.org/docs/8/system-requirements["System requirements"],
+https://www.drupal.org/docs/system-requirements["System requirements"],
 copyright 2000-copyright_upper_year by the individual contributors to the
 https://www.drupal.org/documentation[Drupal Community Documentation].
diff --git a/source/en/install-run.txt b/source/en/install-run.txt
index b386314729f0505e2ca4f19ea22000b8c9cf3cfb..244a14bc1c602cd452217dff2574bbe775683647 100644
--- a/source/en/install-run.txt
+++ b/source/en/install-run.txt
@@ -147,8 +147,8 @@ video::https://www.youtube-nocookie.com/embed/LGfRKKKDjv8[title="Running the Ins
 
 ==== Additional resources
 
-* https://www.drupal.org/docs/8/install/step-3-create-a-database[Drupal.org community documentation page "Create A Database"]
-* https://www.drupal.org/server-permissions[Drupal.org community documentation section "Webhosting issues"]
+* https://www.drupal.org/docs/installing-drupal/step-3-create-a-database[_Drupal.org_ community documentation page "Create a database"]
+* https://www.drupal.org/server-permissions[_Drupal.org_ community documentation section "Webhosting issues"]
 
 
 *Attributions*
diff --git a/source/en/install-tools.txt b/source/en/install-tools.txt
index 758f44d1a7c26c9eac2a7252511a5cf1b0582c36..dd4471962facad9f86cfaba2d333e750e7d8bda7 100644
--- a/source/en/install-tools.txt
+++ b/source/en/install-tools.txt
@@ -151,7 +151,7 @@ Browser debugging tools::
 
 ==== Additional resources
 
-* https://www.drupal.org/node/147789[_Drupal.org_ community documentation page "Development tools"]
+* https://www.drupal.org/docs/develop/development-tools/development-tools-overview[_Drupal.org_ community documentation page "Development tools overview"]
 
 * https://www.drupal.org/docs/develop/using-composer/using-composer-with-drupal[_Drupal.org_ community documentation page "Using Composer with Drupal"]
 
diff --git a/source/en/language-add.txt b/source/en/language-add.txt
index 988716bb065a834f0328bd740a94df83e9aa8c36..9869facae2f0214d7fff52c87f76689b66a9c41d 100644
--- a/source/en/language-add.txt
+++ b/source/en/language-add.txt
@@ -67,7 +67,7 @@ video::https://www.youtube-nocookie.com/embed/8Yu0G4gJ0f4[title="Adding a Langua
 
 ==== Additional resources
 
-https://www.drupal.org/resource-guides/configuring-multilingual-site[_Drupal.org_ page "Resource Guide: Configuring a Multilingual Site"]
+https://www.drupal.org/docs/multilingual-guide[_Drupal.org_ community documentation page "Multilingual guide"]
 
 
 *Attributions*
diff --git a/source/en/menu-link-from-content.txt b/source/en/menu-link-from-content.txt
index e12bec676518f9ae48ea3a65aa296b9a1641c827..6f6681ce2e70b31dbcb3e7afaaa5db8af97ad695 100644
--- a/source/en/menu-link-from-content.txt
+++ b/source/en/menu-link-from-content.txt
@@ -80,13 +80,13 @@ video::https://www.youtube-nocookie.com/embed/JE_3INtBcTw[title="Adding a Page t
 
 ==== Additional resources
 
-https://www.drupal.org/docs/8/core/modules/menu-ui[_Drupal.org_ community documentation page "Working with menus"]
+https://www.drupal.org/docs/core-modules-and-themes/core-modules/menu-ui-module/adding-a-link-to-a-menu[_Drupal.org_ community documentation page "Adding a link to a menu"]
 
 
 *Attributions*
 
 Adapted by https://www.drupal.org/u/batigolix[Boris Doesborg] from
-https://www.drupal.org/docs/8/core/modules/menu-ui["Working with Menus"],
+https://www.drupal.org/docs/core-modules-and-themes/core-modules/menu-ui-module/adding-a-link-to-a-menu["Adding a link to a menu"],
 copyright 2000-copyright_upper_year by the individual contributors to the
 https://www.drupal.org/documentation[Drupal Community Documentation];
 edited by https://www.drupal.org/u/jerseycheese[Jack Haas].
diff --git a/source/en/prevent-cache.txt b/source/en/prevent-cache.txt
index 72f358377386cf2337b8d2b3abeed4513e7af794..1f5ea1941e281b01c79831e5875479bb6d01de4f 100644
--- a/source/en/prevent-cache.txt
+++ b/source/en/prevent-cache.txt
@@ -77,7 +77,7 @@ usually to clear the cache. See <<prevent-cache-clear>> for more information.
 ==== Additional resources
 
 Learn about additional caching and performance optimization methods in the
-https://www.drupal.org/docs/7/managing-site-performance-and-scalability/caching-to-improve-performance/caching-overview[_Drupal.org_ community documentation page "Caching to improve performance"].
+https://www.drupal.org/docs/7/managing-site-performance-and-scalability/caching-to-improve-performance/caching-overview[_Drupal.org_ community documentation page "Caching overview"].
 
 
 *Attributions*
diff --git a/source/en/prevent-status.txt b/source/en/prevent-status.txt
index 3f7c05c2c92be113d1466aa8ee562b45282aff8d..201022a08ee7e6461c964d966b1a5453c67051d4 100644
--- a/source/en/prevent-status.txt
+++ b/source/en/prevent-status.txt
@@ -38,7 +38,7 @@ image:images/prevent-status.png["Status report of a basic site",width="100%"]
 ==== Additional resources
 
 If you have an error about trusted host settings in your status report, see
-https://www.drupal.org/docs/8/install/trusted-host-settings[_Drupal.org_ community documentation page "Trusted Host settings"].
+https://www.drupal.org/docs/installing-drupal/trusted-host-settings[_Drupal.org_ community documentation page "Trusted Host settings"].
 
 *Attributions*
 
diff --git a/source/en/security-cron.txt b/source/en/security-cron.txt
index 9dc7c9fc8777bb239708ad7723bd5257ea88b6d0..8413fdeab6beedfe581596621b140707a0d09cc0 100644
--- a/source/en/security-cron.txt
+++ b/source/en/security-cron.txt
@@ -73,9 +73,8 @@ _http://www.example.com/cron/0MgWtfB33FYbbQ5UAC3L0LL3RC0PT3RNUBZILLA0Nf1Re_
 Whenever this URL is visited, cron maintenance tasks will run. Set up one of
 the following schedulers to access this URL regularly:
 +
-  * https://www.drupal.org/node/23714[The Cron daemon] (Linux, OS X, Solaris,
-  BSD)
-  * https://www.drupal.org/node/31506[Scheduled Tasks] (Windows)
+  * https://www.drupal.org/docs/7/setting-up-cron/configuring-cron-jobs-using-the-cron-command[The Cron daemon] (Linux, OS X, Solaris, BSD)
+  * https://www.drupal.org/docs/7/setting-up-cron-for-drupal/configuring-cron-jobs-with-windows[Scheduled Tasks] (Windows)
   * A cron SASS provider (software as a service)
   * A cron manager provided by your web hosting provider (see the documentation
   provided by your provider)
diff --git a/source/en/security-update-module.txt b/source/en/security-update-module.txt
index 6b512570b93f70d1c2631b072cc5d8af63bff308..5ed5710d8b18a720f95d8f8b4e6528e9425c9c4b 100644
--- a/source/en/security-update-module.txt
+++ b/source/en/security-update-module.txt
@@ -107,9 +107,7 @@ to check for errors.
 // Video from Drupalize.Me.
 video::https://www.youtube-nocookie.com/embed/wxWW-lPQ_Pc[title="Updating a Module"]
 
-==== Additional resources
-
-https://www.drupal.org/node/250790[_Drupal.org_ community documentation page "Updating modules"]
+// ==== Additional resources
 
 
 *Attributions*
@@ -117,6 +115,6 @@ https://www.drupal.org/node/250790[_Drupal.org_ community documentation page "Up
 Adapted by https://www.drupal.org/u/batigolix[Boris Doesborgh], and
 https://www.drupal.org/u/hey_germano[Sarah German] at
 https://www.advomatic.com[Advomatic], from
-https://www.drupal.org/node/250790["Updating modules"], copyright 2000-copyright_upper_year by
-the individual contributors to the
+https://www.drupal.org/docs/7/update/updating-modules["Update modules"],
+copyright 2000-copyright_upper_year by the individual contributors to the
 https://www.drupal.org/documentation[Drupal Community Documentation].
diff --git a/source/en/structure-content-display.txt b/source/en/structure-content-display.txt
index 21694cf8002afde831624b528632d9b2724d3c1a..15eac9ad7e00b5407114167a41b95adc64d290ff 100644
--- a/source/en/structure-content-display.txt
+++ b/source/en/structure-content-display.txt
@@ -113,8 +113,8 @@ video::https://www.youtube-nocookie.com/embed/myYI9rhF_4o[title="Changing Conten
 
 ==== Additional resources
 
-* https://www.drupal.org/node/774798[_Drupal.org_ community documentation page "Specify how fields are displayed"]
-* https://www.drupal.org/node/774744[_Drupal.org_ community documentation page "Rearrange the order of fields"]
+* https://www.drupal.org/docs/7/nodes-content-types-and-fields/specify-how-fields-are-displayed[_Drupal.org_ community documentation page "Specify how fields are displayed"]
+* https://www.drupal.org/docs/7/nodes-content-types-and-fields/rearrange-the-order-of-fields[_Drupal.org_ community documentation page "Rearrange the order of fields"]
 * https://www.drupal.org/node/1577752[_Drupal.org_ community documentation page "View modes"]
 
 
diff --git a/source/en/structure-fields.txt b/source/en/structure-fields.txt
index e433e100e5e4e9e6d51c966c93690ee88486bde1..36a204a69b5f014aae3fe804a761630d353181ec 100644
--- a/source/en/structure-fields.txt
+++ b/source/en/structure-fields.txt
@@ -161,7 +161,7 @@ video::https://www.youtube-nocookie.com/embed/CZpfR9WbVcQ[title="Adding Basic Fi
 
 ==== Additional resources
 
-https://www.drupal.org/node/774742[_Drupal.org_ community documentation page "Add a field to a content type"]
+https://www.drupal.org/docs/7/nodes-content-types-and-fields/add-a-field-to-a-content-type[_Drupal.org_ community documentation page "Add a field to a content type"]
 
 
 *Attributions*
diff --git a/source/en/structure-image-responsive.txt b/source/en/structure-image-responsive.txt
index 787be743230c9987cf44c0966e5059c770eb27cf..d7b7eb2622e506c0bb6cd693baa76f8518cc395b 100644
--- a/source/en/structure-image-responsive.txt
+++ b/source/en/structure-image-responsive.txt
@@ -41,18 +41,18 @@ tag, depending on how the responsive image style is set up.
 
 ==== Additional resources
 
-* https://www.drupal.org/node/1388492[_Drupal.org_ community documentation page "Responsive web design"]
+* https://www.drupal.org/docs/mobile-guide/responsive-web-design[_Drupal.org_ community documentation page "Responsive web design"]
 
-* https://www.drupal.org/docs/8/mobile-guide/responsive-images-in-drupal-8[_Drupal.org_ community documentation page "Responsive images in Drupal 8"]
+* https://www.drupal.org/docs/mobile-guide/responsive-images[_Drupal.org_ community documentation page "Responsive Images"]
 
-* https://www.drupal.org/docs/8/theming-drupal-8/working-with-breakpoints-in-drupal-8[_Drupal.org_ community documentation page "Working with breakpoints in Drupal 8"]
+* https://www.drupal.org/docs/theming-drupal/working-with-breakpoints-in-drupal[_Drupal.org_ community documentation page "Working with breakpoints in Drupal"]
 
 * https://chromatichq.com/blog/responsive-images-drupal-8-using-srcset[Blog post "Responsive Images in Drupal 8 using 'srcset'"]
 
 *Attributions*
 
 Adapted by https://www.drupal.org/u/batigolix[Boris Doesborg] from
-https://www.drupal.org/docs/8/mobile-guide/responsive-images-in-drupal-8[Responsive
-images in Drupal 8],
+https://www.drupal.org/docs/mobile-guide/responsive-images[Responsive
+images],
 copyright 2000-copyright_upper_year by the individual contributors to the
 https://www.drupal.org/documentation[Drupal Community Documentation].
diff --git a/source/en/structure-image-style-create.txt b/source/en/structure-image-style-create.txt
index 24183a9fca4e2e856bdacc7c228a2ff55ef0d803..f42c58e827923e894e86da0c37e4a689540c6e8d 100644
--- a/source/en/structure-image-style-create.txt
+++ b/source/en/structure-image-style-create.txt
@@ -111,7 +111,7 @@ video::https://www.youtube-nocookie.com/embed/DKIo7j19ulY[title="Setting up an I
 
 ==== Additional resources
 
-https://www.drupal.org/docs/8/core/modules/image/working-with-images[_Drupal.org_ community documentation page "Working with images in Drupal 7 and 8"]
+https://www.drupal.org/docs/core-modules-and-themes/core-modules/image-module/working-with-images[_Drupal.org_ community documentation page "Working with images"]
 
 
 *Attributions*
@@ -119,7 +119,6 @@ https://www.drupal.org/docs/8/core/modules/image/working-with-images[_Drupal.org
 Adapted and edited by https://www.drupal.org/u/batigolix[Boris Doesborg], and
 https://www.drupal.org/u/jojyja[Jojy Alphonso] at
 http://redcrackle.com[Red Crackle] from
-https://www.drupal.org/docs/8/core/modules/image/working-with-images["Working with images in
-Drupal 7 and 8"],
+https://www.drupal.org/docs/core-modules-and-themes/core-modules/image-module/working-with-images["Working with images"],
 copyright 2000-copyright_upper_year by the individual contributors to the
 https://www.drupal.org/documentation[Drupal Community Documentation].
diff --git a/source/en/structure-image-styles.txt b/source/en/structure-image-styles.txt
index 3d889a06d7f2e1eedd85759a7addd13bdeb0b0a3..94224e94af0d1b7f3105b9204fbbd3b93e833462 100644
--- a/source/en/structure-image-styles.txt
+++ b/source/en/structure-image-styles.txt
@@ -56,7 +56,7 @@ to see the image styles that are defined by default.
 
 ==== Additional resources
 
-https://www.drupal.org/docs/8/core/modules/image/working-with-images[_Drupal.org_ community documentation page "Working with images in Drupal 7 and 8"]
+https://www.drupal.org/docs/core-modules-and-themes/core-modules/image-module/working-with-images[_Drupal.org_ community documentation page "Working with images"]
 
 
 *Attributions*
@@ -64,7 +64,6 @@ https://www.drupal.org/docs/8/core/modules/image/working-with-images[_Drupal.org
 Adapted and edited by https://www.drupal.org/u/batigolix[Boris Doesborg],
 and https://www.drupal.org/u/jojyja[Jojy Alphonso] at
 http://redcrackle.com[Red Crackle], from
-https://www.drupal.org/docs/8/core/modules/image/working-with-images["Working with images in
-Drupal 7 and 8"],
+https://www.drupal.org/docs/core-modules-and-themes/core-modules/image-module/working-with-images["Working with images"]
 copyright 2000-copyright_upper_year by the individual contributors to the
 https://www.drupal.org/documentation[Drupal Community Documentation]
diff --git a/source/en/structure-taxonomy.txt b/source/en/structure-taxonomy.txt
index 4f624d3bf7f6a5fa92a27c5ff94254b3a8b286f1..c786668b70b47a88ac651eb3e1afc6fd178f1196 100644
--- a/source/en/structure-taxonomy.txt
+++ b/source/en/structure-taxonomy.txt
@@ -71,6 +71,6 @@ https://www.drupal.org/u/jhodgdon[Jennifer Hodgdon],
 and https://www.drupal.org/u/jojyja[Jojy Alphonso] at
 http://redcrackle.com[Red Crackle] from
 https://www.drupal.org/docs/7/organizing-content-with-taxonomies/organizing-content-with-taxonomy["Organizing content with taxonomies"]
-and https://www.drupal.org/node/774892["About taxonomies"],
+and https://www.drupal.org/docs/7/organizing-content-with-taxonomies/about-taxonomies["About taxonomy"],
 copyright 2000-copyright_upper_year by the individual contributors to the
 https://www.drupal.org/documentation[Drupal Community Documentation].
diff --git a/source/en/structure-text-formats.txt b/source/en/structure-text-formats.txt
index 6754370abe4bd9d8bce3e534d02cf671eb9598b8..c1a6ac39581211dca5386962895f06c577955ee5 100644
--- a/source/en/structure-text-formats.txt
+++ b/source/en/structure-text-formats.txt
@@ -54,8 +54,7 @@ formats of your website to prevent such abuse.
 
 ==== Additional resources
 
-* https://www.drupal.org/docs/8/core/modules/filter/overview[_Drupal.org_ community
-documentation page "Filter module: text formats that filter user input"]
+* https://www.drupal.org/docs/core-modules-and-themes/core-modules/filter-module/filter-module-overview[_Drupal.org_ community documentation page "Filter module overview"]
 
 * https://en.wikipedia.org/wiki/Cross-site_scripting[Wikipedia page "Cross-site
 scripting"]
diff --git a/source/en/thoughts-connecting.txt b/source/en/thoughts-connecting.txt
index 02f17df53bdfbffc9f092d6dd58488bc88b06e85..75f5fd93e3406d0a90e505e4bb587968c82a8304 100644
--- a/source/en/thoughts-connecting.txt
+++ b/source/en/thoughts-connecting.txt
@@ -95,8 +95,7 @@ https://www.drupal.org/node/101494[_Drupal.org_ page "How to report a security i
 * https://groups.drupal.org/events["Event Calendar" on _groups.drupal.org_] or
 https://www.drupical.com/[_drupical.com_]
 
-* https://www.drupal.org/community["Where is the Drupal Community?" page on
-_Drupal.org_]
+* https://www.drupal.org/community["Community page on _Drupal.org_]
 
 * https://groups.drupal.org/[_groups.drupal.org_]
 
diff --git a/source/en/thoughts-learn-more.txt b/source/en/thoughts-learn-more.txt
index 15d58aff4d97ee6b9e632d4733536c0c87a7ed2d..138225bb4d9d517b023306139c314c4cd603031b 100644
--- a/source/en/thoughts-learn-more.txt
+++ b/source/en/thoughts-learn-more.txt
@@ -27,7 +27,7 @@ How to find additional material to gain advanced site-building skills.
 The following resources should prove useful to you, as you continue to advance
 your skills:
 
-https://www.drupal.org/documentation["Drupal Community Documentation" section on _Drupal.org_]::
+https://www.drupal.org/documentation[Drupal Community Documentation]::
   Wiki-like documentation contributed by the Drupal community, ranging from
   basic to advanced, about all aspects of Drupal (site building and
   administration, theming, development, and contributed modules).
diff --git a/source/en/understanding-data.txt b/source/en/understanding-data.txt
index 453e99effa391fc58e3f38840dade9a542f634f9..10dd47b407ceed2e30af70933ed3fd466808511d 100644
--- a/source/en/understanding-data.txt
+++ b/source/en/understanding-data.txt
@@ -53,6 +53,6 @@ Session::
 *Attributions*
 
 Adapted by https://www.drupal.org/u/jhodgdon[Jennifer Hodgdon] from
-https://www.drupal.org/node/2120523["Overview of Configuration (vs. other types of information)"],
+https://www.drupal.org/docs/drupal-apis/configuration-api/overview-of-configuration-vs-other-types-of-information["Overview of Configuration (vs. other types of information)"],
 copyright 2000-copyright_upper_year by the individual contributors to the
 https://www.drupal.org/documentation[Drupal Community Documentation]
diff --git a/source/en/understanding-drupal.txt b/source/en/understanding-drupal.txt
index 16a70f5a90398e8e8f562580afc4d7284a55384a..277edeb8764e9426dd5db29cccdc71dbc945f75c 100644
--- a/source/en/understanding-drupal.txt
+++ b/source/en/understanding-drupal.txt
@@ -101,7 +101,7 @@ world-wide community. See <<understanding-project>> for more on this topic.
 
 ==== Additional resources
 
-* https://www.drupal.org/docs/8/understanding-drupal-8/overview[The Drupal overview]
+* https://www.drupal.org/docs/understanding-drupal/overview[_Drupal.org_ community documentation page "Understanding Drupal: Overview"]
 
 * https://www.drupal.org/about/faq[_Drupal.org_ page "FAQ" (Frequently Asked Questions)]
 
diff --git a/source/en/understanding-themes.txt b/source/en/understanding-themes.txt
index 947a90d531facbd6aeb952f7f2b2118e1859b2fa..da4f4385cf267a8379fc9aa8eee23fa19b78d55a 100644
--- a/source/en/understanding-themes.txt
+++ b/source/en/understanding-themes.txt
@@ -36,8 +36,8 @@ and paid - is very robust.
 If none of the 3rd party options suit your needs, you'll need to create a custom
 theme. A custom theme can be as simple as a single CSS file that adds styling to
 the markup provided by the core software. Guidance for creating custom themes in
-Drupal 8 can be found in the
-https://www.drupal.org/docs/8/theming[_Drupal.org_ community documentation page
+Drupal can be found in the
+https://www.drupal.org/docs/theming-drupal[_Drupal.org_ community documentation page
 "Theming Drupal"].
 
 ==== Related topics
@@ -48,8 +48,7 @@ https://www.drupal.org/docs/8/theming[_Drupal.org_ community documentation page
 
 ==== Additional resources
 
-https://www.drupal.org/docs/8/theming[_Drupal.org_ community documentation page
-"Theming Drupal"]
+https://www.drupal.org/docs/theming-drupal[_Drupal.org_ community documentation page "Theming Drupal"]
 
 
 *Attributions*
diff --git a/source/en/user-concept.txt b/source/en/user-concept.txt
index 83e42d1f5945d55db2dcbb92525c438038f0b113..d7d3ca780a8958a79a1eb4724f7206976c51a7c5 100644
--- a/source/en/user-concept.txt
+++ b/source/en/user-concept.txt
@@ -76,7 +76,7 @@ to manage the site configuration
 
 * https://www.drupal.org/node/120614[_Drupal.org_ community documentation page "Users, roles and permissions"]
 * https://www.drupal.org/docs/7/managing-users[_Drupal.org_ community documentation page "Managing Users"]
-* https://www.drupal.org/node/1803614[_Drupal.org_ community documentation page "User Roles"]
+* https://www.drupal.org/docs/7/managing-users/user-roles[_Drupal.org_ community documentation page "User Roles"]
 
 
 *Attributions*
@@ -84,6 +84,6 @@ to manage the site configuration
 Adapted by https://www.drupal.org/u/mark-lacroix[Mark LaCroix],
 https://www.drupal.org/u/batigolix[Boris Doesborg], and
 https://www.drupal.org/u/jhodgdon[Jennifer Hodgdon] from
-https://www.drupal.org/node/1803614["User Roles"],
+https://www.drupal.org/docs/7/managing-users/user-roles["User Roles"],
 copyright 2000-copyright_upper_year by the individual contributors to the
 https://www.drupal.org/documentation[Drupal Community Documentation].
diff --git a/source/en/user-new-role.txt b/source/en/user-new-role.txt
index 8053f46803f5c0b27422de7d1ba848c2797f6c81..e46f026a27eaa08498c7e7b437c460db6792085b 100644
--- a/source/en/user-new-role.txt
+++ b/source/en/user-new-role.txt
@@ -66,7 +66,7 @@ video::https://www.youtube-nocookie.com/embed/JdNxJKWAi8Q[title="Creating a Role
 
 ==== Additional resources
 
-https://www.drupal.org/node/1803614[_Drupal.org_ community documentation page "User Roles"]
+https://www.drupal.org/docs/7/managing-users/user-roles[_Drupal.org_ community documentation page "User Roles"]
 
 
 *Attributions*
@@ -75,6 +75,6 @@ https://www.drupal.org/node/1803614[_Drupal.org_ community documentation page "U
 Adapted and edited by https://www.drupal.org/u/JackProbst[Jack Probst],
 https://www.drupal.org/u/batigolix[Boris Doesborg], and
 https://www.drupal.org/u/eojthebrave[Joe Shindelar] from
-https://www.drupal.org/node/1803614["User Roles"], copyright 2000-copyright_upper_year by the
+https://www.drupal.org/docs/7/managing-users/user-roles["User Roles"], copyright 2000-copyright_upper_year by the
 individual contributors to the https://www.drupal.org/documentation[Drupal
 Community Documentation]
diff --git a/source/en/user-permissions.txt b/source/en/user-permissions.txt
index f5ce841326ce4e9d95d4856f4998f07167e76636..310b225453902aaa9a248ef86b32b4383d7c3bbc 100644
--- a/source/en/user-permissions.txt
+++ b/source/en/user-permissions.txt
@@ -90,6 +90,6 @@ Adapted and edited by https://www.drupal.org/u/batigolix[Boris Doesborg],
 https://www.drupal.org/u/bemery987[Brian Emery],
 and https://www.drupal.org/u/jojyja[Jojy Alphonso] at
 http://redcrackle.com[Red Crackle], from
-https://www.drupal.org/node/1803614["User Roles"],
+https://www.drupal.org/docs/7/managing-users/user-roles["User Roles"],
 copyright 2000-copyright_upper_year by the individual contributors to the
 https://www.drupal.org/documentation[Drupal Community Documentation].