diff --git a/commands/cache.md b/commands/cache.md
index 116dd101..b351dee5 100644
--- a/commands/cache.md
+++ b/commands/cache.md
@@ -4,7 +4,7 @@ Adds, removes, fetches, and flushes the WP Object Cache object.
 
 By default, the WP Object Cache exists in PHP memory for the length of the request (and is emptied at the end). Use a persistent object cache drop-in to persist the object cache between requests.
 
-[Read the codex article](https://codex.wordpress.org/Class_Reference/WP_Object_Cache) for more detail.
+[Read the codex article](https://developer.wordpress.org/reference/classes/wp_object_cache) for more detail.
 
 ### EXAMPLES
 
diff --git a/commands/cap.md b/commands/cap.md
index a1726efe..4d8de3bf 100644
--- a/commands/cap.md
+++ b/commands/cap.md
@@ -2,7 +2,7 @@
 
 Adds, removes, and lists capabilities of a user role.
 
-See references for [Roles and Capabilities](https://codex.wordpress.org/Roles_and_Capabilities) and [WP User class](https://codex.wordpress.org/Class_Reference/WP_User).
+See references for [Roles and Capabilities](https://wordpress.org/documentation/article/roles-and-capabilities) and [WP User class](https://developer.wordpress.org/reference/classes/wp_user).
 
 ### EXAMPLES
 
diff --git a/commands/rewrite.md b/commands/rewrite.md
index 52154bf8..d7a84a90 100644
--- a/commands/rewrite.md
+++ b/commands/rewrite.md
@@ -2,8 +2,8 @@
 
 Lists or flushes the site's rewrite rules, updates the permalink structure.
 
-See the WordPress [Rewrite API](https://codex.wordpress.org/Rewrite_API) and
-[WP Rewrite](https://codex.wordpress.org/Class_Reference/WP_Rewrite) class reference.
+See the WordPress [Rewrite API](https://developer.wordpress.org/apis/rewrite) and
+[WP Rewrite](https://developer.wordpress.org/reference/classes/wp_rewrite) class reference.
 
 ### EXAMPLES
 
diff --git a/commands/role.md b/commands/role.md
index 79002209..9a4832e4 100644
--- a/commands/role.md
+++ b/commands/role.md
@@ -2,7 +2,7 @@
 
 Manages user roles, including creating new roles and resetting to defaults.
 
-See references for [Roles and Capabilities](https://codex.wordpress.org/Roles_and_Capabilities) and [WP User class](https://codex.wordpress.org/Class_Reference/WP_User).
+See references for [Roles and Capabilities](https://wordpress.org/documentation/article/roles-and-capabilities) and [WP User class](https://developer.wordpress.org/reference/classes/wp_user).
 
 ### EXAMPLES
 
diff --git a/commands/term.md b/commands/term.md
index 5eebcfcc..4ffb4829 100644
--- a/commands/term.md
+++ b/commands/term.md
@@ -2,7 +2,7 @@
 
 Manages taxonomy terms and term meta, with create, delete, and list commands.
 
-See reference for [taxonomies and their terms](https://codex.wordpress.org/Taxonomies).
+See reference for [taxonomies and their terms](https://wordpress.org/documentation/article/taxonomies).
 
 ### EXAMPLES
 
diff --git a/commands/user.md b/commands/user.md
index 4c723f68..9a653a0d 100644
--- a/commands/user.md
+++ b/commands/user.md
@@ -2,7 +2,7 @@
 
 Manages users, along with their roles, capabilities, and meta.
 
-See references for [Roles and Capabilities](https://codex.wordpress.org/Roles_and_Capabilities) and [WP User class](https://codex.wordpress.org/Class_Reference/WP_User).
+See references for [Roles and Capabilities](https://wordpress.org/documentation/article/roles-and-capabilities) and [WP User class](https://developer.wordpress.org/reference/classes/wp_user).
 
 ### EXAMPLES
 
diff --git a/guides/common-issues.md b/guides/common-issues.md
index 44f939be..cb6a1baf 100644
--- a/guides/common-issues.md
+++ b/guides/common-issues.md
@@ -58,7 +58,7 @@ $ wp core check-update
 PHP Fatal error:  Call to undefined function add_filter() in phar:///usr/local/bin/wp/php/WP_CLI/Runner.php(952) : eval()'d code on line N
 ```
 
-Modifying `wp-config.php` beyond constant definitions is not best practice. You should move any modifications to a [WordPress mu-plugin](https://codex.wordpress.org/Must_Use_Plugins), which will retain the functionality of your modifications while allowing wp-cli to parse your wp-config.php without throwing a PHP error, as well as preventing other errors.
+Modifying `wp-config.php` beyond constant definitions is not best practice. You should move any modifications to a [WordPress mu-plugin](https://developer.wordpress.org/advanced-administration/plugins/mu-plugins/), which will retain the functionality of your modifications while allowing wp-cli to parse your wp-config.php without throwing a PHP error, as well as preventing other errors.
 
 See: [#1631](https://github.com/wp-cli/wp-cli/issues/1631)