diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/_internal.delete_desired_balance.json b/rest-api-spec/src/main/resources/rest-api-spec/api/_internal.delete_desired_balance.json
index b5c4eaa7fc6f9..651773303389d 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/_internal.delete_desired_balance.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/_internal.delete_desired_balance.json
@@ -1,8 +1,8 @@
 {
   "_internal.delete_desired_balance":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/delete-desired-balance.html",
-      "description": "This API is a diagnostics API and the output should not be relied upon for building applications."
+      "url": null,
+      "description": "This API is a diagnostics API and the output should not be relied upon for building applications"
     },
     "stability":"experimental",
     "visibility":"private",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/_internal.delete_desired_nodes.json b/rest-api-spec/src/main/resources/rest-api-spec/api/_internal.delete_desired_nodes.json
index 8b4759719a41b..a60f99d694953 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/_internal.delete_desired_nodes.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/_internal.delete_desired_nodes.json
@@ -1,8 +1,8 @@
 {
   "_internal.delete_desired_nodes":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/delete-desired-nodes.html",
-      "description": "Deletes the desired nodes. Designed for indirect use by ECE/ESS and ECK. Direct use is not supported."
+      "url": null,
+      "description": "Deletes the desired nodes"
     },
     "stability":"experimental",
     "visibility":"private",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/_internal.get_desired_balance.json b/rest-api-spec/src/main/resources/rest-api-spec/api/_internal.get_desired_balance.json
index 5922d77d99dc0..f2fccf852950b 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/_internal.get_desired_balance.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/_internal.get_desired_balance.json
@@ -1,8 +1,8 @@
 {
   "_internal.get_desired_balance":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/get-desired-balance.html",
-      "description": "This API is a diagnostics API and the output should not be relied upon for building applications."
+      "url": null,
+      "description": "This API is a diagnostics API and the output should not be relied upon for building applications"
     },
     "stability":"experimental",
     "visibility":"private",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/_internal.get_desired_nodes.json b/rest-api-spec/src/main/resources/rest-api-spec/api/_internal.get_desired_nodes.json
index 8fa21ec042c35..cf9a0799cd124 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/_internal.get_desired_nodes.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/_internal.get_desired_nodes.json
@@ -1,8 +1,8 @@
 {
   "_internal.get_desired_nodes":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/get-desired-nodes.html",
-      "description": "Gets the latest desired nodes. Designed for indirect use by ECE/ESS and ECK. Direct use is not supported."
+      "url": null,
+      "description": "Gets the latest desired nodes"
     },
     "stability":"experimental",
     "visibility":"private",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/_internal.prevalidate_node_removal.json b/rest-api-spec/src/main/resources/rest-api-spec/api/_internal.prevalidate_node_removal.json
index 8c945f2894f2f..39b9b85f36273 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/_internal.prevalidate_node_removal.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/_internal.prevalidate_node_removal.json
@@ -1,10 +1,10 @@
 {
   "_internal.prevalidate_node_removal": {
     "documentation":{
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/prevalidate-node-removal-api.html",
+      "url": null,
       "description":"Prevalidates node removal from the cluster"
     },
-    "stability":"stable",
+    "stability":"experimental",
     "visibility":"private",
     "headers":{
       "accept": [ "application/json"]
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/_internal.update_desired_nodes.json b/rest-api-spec/src/main/resources/rest-api-spec/api/_internal.update_desired_nodes.json
index b2cdc77ef8f82..689dfc8064fda 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/_internal.update_desired_nodes.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/_internal.update_desired_nodes.json
@@ -1,8 +1,8 @@
 {
   "_internal.update_desired_nodes":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/update-desired-nodes.html",
-      "description": "Updates the desired nodes. Designed for indirect use by ECE/ESS and ECK. Direct use is not supported."
+      "url": null,
+      "description": "Updates the desired nodes"
     },
     "stability":"experimental",
     "visibility":"private",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/async_search.delete.json b/rest-api-spec/src/main/resources/rest-api-spec/api/async_search.delete.json
index 7cfc14487a396..81ebbd2c1b348 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/async_search.delete.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/async_search.delete.json
@@ -1,8 +1,8 @@
 {
   "async_search.delete":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/async-search.html",
-      "description": "Deletes an async search by ID. If the search is still running, the search request will be cancelled. Otherwise, the saved search results are deleted."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-async-search-submit",
+      "description": "Delete an async search"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/async_search.get.json b/rest-api-spec/src/main/resources/rest-api-spec/api/async_search.get.json
index 41cf08b631092..e1ea50e349850 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/async_search.get.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/async_search.get.json
@@ -1,8 +1,8 @@
 {
   "async_search.get":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/async-search.html",
-      "description": "Retrieves the results of a previously submitted async search request given its ID."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-async-search-submit",
+      "description": "Get async search results"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/async_search.status.json b/rest-api-spec/src/main/resources/rest-api-spec/api/async_search.status.json
index a44c0648f2e8f..4e1ce41624a8c 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/async_search.status.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/async_search.status.json
@@ -1,8 +1,8 @@
 {
   "async_search.status":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/async-search.html",
-      "description": "Retrieves the status of a previously submitted async search request given its ID."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-async-search-submit",
+      "description": "Get the async search status"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/async_search.submit.json b/rest-api-spec/src/main/resources/rest-api-spec/api/async_search.submit.json
index 8ae2fff22281c..b7d8a1272d1af 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/async_search.submit.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/async_search.submit.json
@@ -1,8 +1,8 @@
 {
   "async_search.submit":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/async-search.html",
-      "description": "Executes a search request asynchronously."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-async-search-submit",
+      "description": "Run an async search"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/autoscaling.delete_autoscaling_policy.json b/rest-api-spec/src/main/resources/rest-api-spec/api/autoscaling.delete_autoscaling_policy.json
index 79b542b73ca2e..89afca7b4c5fb 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/autoscaling.delete_autoscaling_policy.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/autoscaling.delete_autoscaling_policy.json
@@ -1,8 +1,8 @@
 {
   "autoscaling.delete_autoscaling_policy":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/autoscaling-delete-autoscaling-policy.html",
-      "description":"Deletes an autoscaling policy. Designed for indirect use by ECE/ESS and ECK. Direct use is not supported."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-autoscaling-delete-autoscaling-policy",
+      "description":"Delete an autoscaling policy"
     },
     "stability":"stable",
     "visibility":"private",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/autoscaling.get_autoscaling_capacity.json b/rest-api-spec/src/main/resources/rest-api-spec/api/autoscaling.get_autoscaling_capacity.json
index b75ac52e3da23..ff9776b1e358c 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/autoscaling.get_autoscaling_capacity.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/autoscaling.get_autoscaling_capacity.json
@@ -1,8 +1,8 @@
 {
   "autoscaling.get_autoscaling_capacity":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/autoscaling-get-autoscaling-capacity.html",
-      "description": "Gets the current autoscaling capacity based on the configured autoscaling policy. Designed for indirect use by ECE/ESS and ECK. Direct use is not supported."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-autoscaling-get-autoscaling-capacity",
+      "description": "Get the autoscaling capacity"
     },
     "stability":"stable",
     "visibility":"private",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/autoscaling.get_autoscaling_policy.json b/rest-api-spec/src/main/resources/rest-api-spec/api/autoscaling.get_autoscaling_policy.json
index 1b0344245f174..b4b506fb60803 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/autoscaling.get_autoscaling_policy.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/autoscaling.get_autoscaling_policy.json
@@ -1,8 +1,8 @@
 {
   "autoscaling.get_autoscaling_policy":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/autoscaling-get-autoscaling-policy.html",
-      "description": "Retrieves an autoscaling policy. Designed for indirect use by ECE/ESS and ECK. Direct use is not supported."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-autoscaling-get-autoscaling-capacity",
+      "description": "Get an autoscaling policy"
     },
     "stability":"stable",
     "visibility":"private",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/autoscaling.put_autoscaling_policy.json b/rest-api-spec/src/main/resources/rest-api-spec/api/autoscaling.put_autoscaling_policy.json
index 7e835fbe8dc43..dc7c862a2d027 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/autoscaling.put_autoscaling_policy.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/autoscaling.put_autoscaling_policy.json
@@ -1,8 +1,8 @@
 {
   "autoscaling.put_autoscaling_policy":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/autoscaling-put-autoscaling-policy.html",
-      "description": "Creates a new autoscaling policy. Designed for indirect use by ECE/ESS and ECK. Direct use is not supported."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-autoscaling-put-autoscaling-policy",
+      "description": "Create or update an autoscaling policy"
     },
     "stability":"stable",
     "visibility":"private",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/bulk.json b/rest-api-spec/src/main/resources/rest-api-spec/api/bulk.json
index 490bb6fd73bbe..5635d61d61355 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/bulk.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/bulk.json
@@ -1,8 +1,8 @@
 {
   "bulk":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/docs-bulk.html",
-      "description":"Allows to perform multiple index/update/delete operations in a single request."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-bulk",
+      "description":"Bulk index or delete documents"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/cat.aliases.json b/rest-api-spec/src/main/resources/rest-api-spec/api/cat.aliases.json
index 9f97fe6280dc0..6ef0c07637497 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/cat.aliases.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/cat.aliases.json
@@ -1,8 +1,8 @@
 {
   "cat.aliases":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/cat-alias.html",
-      "description":"Shows information about currently configured aliases to indices including filter and routing infos."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-cat-aliases",
+      "description":"Get aliases"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/cat.allocation.json b/rest-api-spec/src/main/resources/rest-api-spec/api/cat.allocation.json
index 9d19d8bb9569d..b729d1a0084c9 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/cat.allocation.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/cat.allocation.json
@@ -1,8 +1,8 @@
 {
   "cat.allocation":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/cat-allocation.html",
-      "description":"Provides a snapshot of how many shards are allocated to each data node and how much disk space they are using."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-cat-allocation",
+      "description":"Get shard allocation information"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/cat.component_templates.json b/rest-api-spec/src/main/resources/rest-api-spec/api/cat.component_templates.json
index 9dfeaf5575967..80ec61b4a85b5 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/cat.component_templates.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/cat.component_templates.json
@@ -1,8 +1,8 @@
 {
   "cat.component_templates":{
     "documentation":{
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/cat-component-templates.html",
-      "description":"Returns information about existing component_templates templates."
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-cat-component-templates",
+      "description":"Get component templates"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/cat.count.json b/rest-api-spec/src/main/resources/rest-api-spec/api/cat.count.json
index 64226f87bfd0f..1ed48e9d3a32c 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/cat.count.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/cat.count.json
@@ -1,8 +1,8 @@
 {
   "cat.count":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/cat-count.html",
-      "description":"Provides quick access to the document count of the entire cluster, or individual indices."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-cat-count",
+      "description":"Get a document count"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/cat.fielddata.json b/rest-api-spec/src/main/resources/rest-api-spec/api/cat.fielddata.json
index 497287a34ade5..4892a4caa3331 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/cat.fielddata.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/cat.fielddata.json
@@ -1,8 +1,8 @@
 {
   "cat.fielddata":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/cat-fielddata.html",
-      "description":"Shows how much heap memory is currently being used by fielddata on every data node in the cluster."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-cat-fielddata",
+      "description":"Get field data cache information"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/cat.health.json b/rest-api-spec/src/main/resources/rest-api-spec/api/cat.health.json
index 6b49c8e4428f7..e3cba20ad6dfd 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/cat.health.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/cat.health.json
@@ -1,8 +1,8 @@
 {
   "cat.health":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/cat-health.html",
-      "description":"Returns a concise representation of the cluster health."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-cat-health",
+      "description":"Get the cluster health status"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/cat.help.json b/rest-api-spec/src/main/resources/rest-api-spec/api/cat.help.json
index d31188fe7f7fc..629246db7f4e3 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/cat.help.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/cat.help.json
@@ -1,8 +1,8 @@
 {
   "cat.help":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/cat.html",
-      "description":"Returns help for the Cat APIs."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/group/endpoint-cat",
+      "description":"Get CAT help"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/cat.indices.json b/rest-api-spec/src/main/resources/rest-api-spec/api/cat.indices.json
index a809c96c3798a..ffc33a3ca16e5 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/cat.indices.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/cat.indices.json
@@ -1,8 +1,8 @@
 {
   "cat.indices":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/cat-indices.html",
-      "description":"Returns information about indices: number of primaries and replicas, document counts, disk size, ..."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-cat-indices",
+      "description":"Get index information"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/cat.master.json b/rest-api-spec/src/main/resources/rest-api-spec/api/cat.master.json
index 9041c48b17ec5..d2c48ebda82db 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/cat.master.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/cat.master.json
@@ -1,8 +1,8 @@
 {
   "cat.master":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/cat-master.html",
-      "description":"Returns information about the master node."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-cat-master",
+      "description":"Get master node information"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/cat.ml_data_frame_analytics.json b/rest-api-spec/src/main/resources/rest-api-spec/api/cat.ml_data_frame_analytics.json
index ded66961c3ed5..e0d52c6d75ed3 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/cat.ml_data_frame_analytics.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/cat.ml_data_frame_analytics.json
@@ -1,8 +1,8 @@
 {
   "cat.ml_data_frame_analytics":{
     "documentation":{
-      "url":"http://www.elastic.co/guide/en/elasticsearch/reference/current/cat-dfanalytics.html",
-      "description": "Gets configuration and usage information about data frame analytics jobs."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-cat-ml-data-frame-analytics",
+      "description": "Get data frame analytics jobs"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/cat.ml_datafeeds.json b/rest-api-spec/src/main/resources/rest-api-spec/api/cat.ml_datafeeds.json
index 884f1bad7583a..8784b2a7c5e19 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/cat.ml_datafeeds.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/cat.ml_datafeeds.json
@@ -1,8 +1,8 @@
 {
   "cat.ml_datafeeds":{
     "documentation":{
-      "url":"http://www.elastic.co/guide/en/elasticsearch/reference/current/cat-datafeeds.html",
-      "description": "Gets configuration and usage information about datafeeds."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-cat-ml-datafeeds",
+      "description": "Get datafeeds"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/cat.ml_jobs.json b/rest-api-spec/src/main/resources/rest-api-spec/api/cat.ml_jobs.json
index 91f0e63742b15..38f3b4fc68d65 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/cat.ml_jobs.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/cat.ml_jobs.json
@@ -1,8 +1,8 @@
 {
   "cat.ml_jobs":{
     "documentation":{
-      "url":"http://www.elastic.co/guide/en/elasticsearch/reference/current/cat-anomaly-detectors.html",
-      "description": "Gets configuration and usage information about anomaly detection jobs."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-cat-ml-jobs",
+      "description": "Get anomaly detection jobs"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/cat.ml_trained_models.json b/rest-api-spec/src/main/resources/rest-api-spec/api/cat.ml_trained_models.json
index 5176b9d4ca69f..c0d95b222fd86 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/cat.ml_trained_models.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/cat.ml_trained_models.json
@@ -1,8 +1,8 @@
 {
   "cat.ml_trained_models":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/cat-trained-model.html",
-      "description": "Gets configuration and usage information about inference trained models."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-cat-ml-trained-models",
+      "description": "Get trained models"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/cat.nodeattrs.json b/rest-api-spec/src/main/resources/rest-api-spec/api/cat.nodeattrs.json
index b92f023323342..8e65962dbafe6 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/cat.nodeattrs.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/cat.nodeattrs.json
@@ -1,8 +1,8 @@
 {
   "cat.nodeattrs":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/cat-nodeattrs.html",
-      "description":"Returns information about custom node attributes."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-cat-nodeattrs",
+      "description":"Get node attribute information"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/cat.nodes.json b/rest-api-spec/src/main/resources/rest-api-spec/api/cat.nodes.json
index b1205e38ecd40..779b7111fb284 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/cat.nodes.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/cat.nodes.json
@@ -1,8 +1,8 @@
 {
   "cat.nodes":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/cat-nodes.html",
-      "description":"Returns basic statistics about performance of cluster nodes."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-cat-nodes",
+      "description":"Get node information"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/cat.pending_tasks.json b/rest-api-spec/src/main/resources/rest-api-spec/api/cat.pending_tasks.json
index 40601a11b6803..214ba308bd34f 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/cat.pending_tasks.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/cat.pending_tasks.json
@@ -1,8 +1,8 @@
 {
   "cat.pending_tasks":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/cat-pending-tasks.html",
-      "description":"Returns a concise representation of the cluster pending tasks."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-cat-pending-tasks",
+      "description":"Get pending task information"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/cat.plugins.json b/rest-api-spec/src/main/resources/rest-api-spec/api/cat.plugins.json
index 48635d2fe06e0..c3bbba5e2aabe 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/cat.plugins.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/cat.plugins.json
@@ -1,8 +1,8 @@
 {
   "cat.plugins":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/cat-plugins.html",
-      "description":"Returns information about installed plugins across nodes node."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-cat-plugins",
+      "description":"Get plugin information"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/cat.recovery.json b/rest-api-spec/src/main/resources/rest-api-spec/api/cat.recovery.json
index 879314629f968..020ad1111be11 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/cat.recovery.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/cat.recovery.json
@@ -1,8 +1,8 @@
 {
   "cat.recovery":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/cat-recovery.html",
-      "description":"Returns information about index shard recoveries, both on-going completed."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-cat-recovery",
+      "description":"Get shard recovery information"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/cat.repositories.json b/rest-api-spec/src/main/resources/rest-api-spec/api/cat.repositories.json
index 3dad7a0039c6c..53c1a9f3033b9 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/cat.repositories.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/cat.repositories.json
@@ -1,8 +1,8 @@
 {
   "cat.repositories":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/cat-repositories.html",
-      "description":"Returns information about snapshot repositories registered in the cluster."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-cat-repositories",
+      "description":"Get snapshot repository information"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/cat.segments.json b/rest-api-spec/src/main/resources/rest-api-spec/api/cat.segments.json
index eee7e5a5c4b29..723b00ddd8d84 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/cat.segments.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/cat.segments.json
@@ -1,8 +1,8 @@
 {
   "cat.segments":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/cat-segments.html",
-      "description":"Provides low-level information about the segments in the shards of an index."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-cat-segments",
+      "description":"Get segment information"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/cat.shards.json b/rest-api-spec/src/main/resources/rest-api-spec/api/cat.shards.json
index 24f4a4beceae5..f19e5b708ed47 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/cat.shards.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/cat.shards.json
@@ -1,8 +1,8 @@
 {
   "cat.shards":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/cat-shards.html",
-      "description":"Provides a detailed view of shard allocation on nodes."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-cat-shards",
+      "description":"Get shard information"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/cat.snapshots.json b/rest-api-spec/src/main/resources/rest-api-spec/api/cat.snapshots.json
index 3b72e8a1ebc1a..6e69435f9d7bc 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/cat.snapshots.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/cat.snapshots.json
@@ -1,8 +1,8 @@
 {
   "cat.snapshots":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/cat-snapshots.html",
-      "description":"Returns all snapshots in a specific repository."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-cat-snapshots",
+      "description":"Get snapshot information"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/cat.tasks.json b/rest-api-spec/src/main/resources/rest-api-spec/api/cat.tasks.json
index e7329cf8dbbf0..25e4a26d98546 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/cat.tasks.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/cat.tasks.json
@@ -1,8 +1,8 @@
 {
   "cat.tasks":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/tasks.html",
-      "description":"Returns information about the tasks currently executing on one or more nodes in the cluster."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-cat-tasks",
+      "description":"Get task information"
     },
     "stability":"experimental",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/cat.templates.json b/rest-api-spec/src/main/resources/rest-api-spec/api/cat.templates.json
index e7ac67c8612b9..3261afdaa7380 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/cat.templates.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/cat.templates.json
@@ -1,8 +1,8 @@
 {
   "cat.templates":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/cat-templates.html",
-      "description":"Returns information about existing templates."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-cat-templates",
+      "description":"Get index template information"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/cat.thread_pool.json b/rest-api-spec/src/main/resources/rest-api-spec/api/cat.thread_pool.json
index 1bd61a29725c1..85e752d3b3718 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/cat.thread_pool.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/cat.thread_pool.json
@@ -1,8 +1,8 @@
 {
   "cat.thread_pool":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/cat-thread-pool.html",
-      "description":"Returns cluster-wide thread pool statistics per node.\nBy default the active, queue and rejected statistics are returned for all thread pools."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-cat-thread-pool",
+      "description":"Get thread pool statistics"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/cat.transforms.json b/rest-api-spec/src/main/resources/rest-api-spec/api/cat.transforms.json
index c0dd769dc3d50..1a3938d275f83 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/cat.transforms.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/cat.transforms.json
@@ -1,8 +1,8 @@
 {
   "cat.transforms":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/cat-transforms.html",
-      "description": "Gets configuration and usage information about transforms."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-cat-transforms",
+      "description": "Get transform information"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ccr.delete_auto_follow_pattern.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ccr.delete_auto_follow_pattern.json
index c316e9fcbd36c..0078a8fa53cc5 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ccr.delete_auto_follow_pattern.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ccr.delete_auto_follow_pattern.json
@@ -1,8 +1,8 @@
 {
   "ccr.delete_auto_follow_pattern":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ccr-delete-auto-follow-pattern.html",
-      "description": "Deletes auto-follow patterns."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ccr-delete-auto-follow-pattern",
+      "description": "Delete auto-follow patterns"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ccr.follow.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ccr.follow.json
index 642477cb45e48..cc019dfeec0ad 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ccr.follow.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ccr.follow.json
@@ -1,8 +1,8 @@
 {
   "ccr.follow":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ccr-put-follow.html",
-      "description": "Creates a new follower index configured to follow the referenced leader index."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ccr-follow",
+      "description": "Create a follower"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ccr.follow_info.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ccr.follow_info.json
index a2af3f9be77d1..2878e0e6fb024 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ccr.follow_info.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ccr.follow_info.json
@@ -1,8 +1,8 @@
 {
   "ccr.follow_info":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ccr-get-follow-info.html",
-      "description": "Retrieves information about all follower indices, including parameters and status for each follower index"
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ccr-follow-info",
+      "description": "Get follower information"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ccr.follow_stats.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ccr.follow_stats.json
index 75d0bafb5083e..ad0fe0960e1ec 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ccr.follow_stats.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ccr.follow_stats.json
@@ -1,8 +1,8 @@
 {
   "ccr.follow_stats":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ccr-get-follow-stats.html",
-      "description": "Retrieves follower stats. return shard-level stats about the following tasks associated with each shard for the specified indices."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ccr-follow-stats",
+      "description": "Get follower stats"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ccr.forget_follower.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ccr.forget_follower.json
index 61a132a1f4ac4..308d1c72b3fe7 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ccr.forget_follower.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ccr.forget_follower.json
@@ -1,8 +1,8 @@
 {
   "ccr.forget_follower":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ccr-post-forget-follower.html",
-      "description": "Removes the follower retention leases from the leader."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ccr-forget-follower",
+      "description": "Forget a follower"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ccr.get_auto_follow_pattern.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ccr.get_auto_follow_pattern.json
index 663f37fca3a9a..b4ddda356f891 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ccr.get_auto_follow_pattern.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ccr.get_auto_follow_pattern.json
@@ -1,8 +1,8 @@
 {
   "ccr.get_auto_follow_pattern":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ccr-get-auto-follow-pattern.html",
-      "description": "Gets configured auto-follow patterns. Returns the specified auto-follow pattern collection."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ccr-get-auto-follow-pattern-1",
+      "description": "Get auto-follow patterns"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ccr.pause_auto_follow_pattern.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ccr.pause_auto_follow_pattern.json
index c766304fc0512..ea1688a30b90c 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ccr.pause_auto_follow_pattern.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ccr.pause_auto_follow_pattern.json
@@ -1,8 +1,8 @@
 {
   "ccr.pause_auto_follow_pattern":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ccr-pause-auto-follow-pattern.html",
-      "description": "Pauses an auto-follow pattern"
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ccr-pause-auto-follow-pattern",
+      "description": "Pause an auto-follow pattern"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ccr.pause_follow.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ccr.pause_follow.json
index 1c1fcf71d08ff..5d850837e42e1 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ccr.pause_follow.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ccr.pause_follow.json
@@ -1,8 +1,8 @@
 {
   "ccr.pause_follow":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ccr-post-pause-follow.html",
-      "description": "Pauses a follower index. The follower index will not fetch any additional operations from the leader index."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ccr-pause-follow",
+      "description": "Pause a follower"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ccr.put_auto_follow_pattern.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ccr.put_auto_follow_pattern.json
index 6f5f03bc9a3d2..77218122120a1 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ccr.put_auto_follow_pattern.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ccr.put_auto_follow_pattern.json
@@ -1,8 +1,8 @@
 {
   "ccr.put_auto_follow_pattern":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ccr-put-auto-follow-pattern.html",
-      "description": "Creates a new named collection of auto-follow patterns against a specified remote cluster. Newly created indices on the remote cluster matching any of the specified patterns will be automatically configured as follower indices."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ccr-put-auto-follow-pattern",
+      "description": "Create or update auto-follow patterns"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ccr.resume_auto_follow_pattern.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ccr.resume_auto_follow_pattern.json
index a4ea108426ed8..5a0c3dd9065fb 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ccr.resume_auto_follow_pattern.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ccr.resume_auto_follow_pattern.json
@@ -1,8 +1,8 @@
 {
   "ccr.resume_auto_follow_pattern":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ccr-resume-auto-follow-pattern.html",
-      "description": "Resumes an auto-follow pattern that has been paused"
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ccr-resume-auto-follow-pattern",
+      "description": "Resume an auto-follow pattern"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ccr.resume_follow.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ccr.resume_follow.json
index 854ff83291a8b..478e26304e22a 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ccr.resume_follow.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ccr.resume_follow.json
@@ -1,8 +1,8 @@
 {
   "ccr.resume_follow":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ccr-post-resume-follow.html",
-      "description": "Resumes a follower index that has been paused"
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ccr-resume-follow",
+      "description": "Resume a follower"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ccr.stats.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ccr.stats.json
index 5ebc781109abd..0cfbb3a42bbc9 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ccr.stats.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ccr.stats.json
@@ -1,8 +1,8 @@
 {
   "ccr.stats":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ccr-get-stats.html",
-      "description": "Gets all stats related to cross-cluster replication."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ccr-stats",
+      "description": "Get cross-cluster replication stats"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ccr.unfollow.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ccr.unfollow.json
index 096d39fa16480..67342c484251c 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ccr.unfollow.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ccr.unfollow.json
@@ -1,8 +1,8 @@
 {
   "ccr.unfollow":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ccr-post-unfollow.html",
-      "description": "Stops the following task associated with a follower index and removes index metadata and settings associated with cross-cluster replication."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ccr-unfollow",
+      "description": "Unfollow an index"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/clear_scroll.json b/rest-api-spec/src/main/resources/rest-api-spec/api/clear_scroll.json
index 2d76e1e10d2ba..c530ee3453e24 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/clear_scroll.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/clear_scroll.json
@@ -1,8 +1,8 @@
 {
   "clear_scroll":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/clear-scroll-api.html",
-      "description":"Explicitly clears the search context for a scroll."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-clear-scroll",
+      "description":"Clear a scrolling search"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/close_point_in_time.json b/rest-api-spec/src/main/resources/rest-api-spec/api/close_point_in_time.json
index c25ac88847d1c..d9c7da2904c65 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/close_point_in_time.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/close_point_in_time.json
@@ -1,7 +1,7 @@
 {
   "close_point_in_time":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/point-in-time-api.html",
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-open-point-in-time",
       "description":"Close a point in time"
     },
     "stability":"stable",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/cluster.allocation_explain.json b/rest-api-spec/src/main/resources/rest-api-spec/api/cluster.allocation_explain.json
index af9cbbc2c049a..6f8eef5766773 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/cluster.allocation_explain.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/cluster.allocation_explain.json
@@ -1,8 +1,8 @@
 {
   "cluster.allocation_explain":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-allocation-explain.html",
-      "description":"Provides explanations for shard allocations in the cluster."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-cluster-allocation-explain",
+      "description":"Explain the shard allocations"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/cluster.delete_component_template.json b/rest-api-spec/src/main/resources/rest-api-spec/api/cluster.delete_component_template.json
index 041c1b35a2e5b..3a261d3d5ff52 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/cluster.delete_component_template.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/cluster.delete_component_template.json
@@ -1,8 +1,8 @@
 {
   "cluster.delete_component_template":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-component-template.html",
-      "description":"Deletes a component template"
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-cluster-put-component-template",
+      "description":"Delete component templates"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/cluster.delete_voting_config_exclusions.json b/rest-api-spec/src/main/resources/rest-api-spec/api/cluster.delete_voting_config_exclusions.json
index fdc2364e456e4..c2dc21e8795e1 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/cluster.delete_voting_config_exclusions.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/cluster.delete_voting_config_exclusions.json
@@ -1,8 +1,8 @@
 {
   "cluster.delete_voting_config_exclusions":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/voting-config-exclusions.html",
-      "description":"Clears cluster voting config exclusions."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-cluster-post-voting-config-exclusions",
+      "description":"Clear cluster voting config exclusions"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/cluster.exists_component_template.json b/rest-api-spec/src/main/resources/rest-api-spec/api/cluster.exists_component_template.json
index b2503659329a3..b81463accafe4 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/cluster.exists_component_template.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/cluster.exists_component_template.json
@@ -1,8 +1,8 @@
 {
   "cluster.exists_component_template":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-component-template.html",
-      "description":"Returns information about whether a particular component template exist"
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-cluster-put-component-template",
+      "description":"Check component templates"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/cluster.get_component_template.json b/rest-api-spec/src/main/resources/rest-api-spec/api/cluster.get_component_template.json
index 9badbb9b092a4..ae556fc86c59b 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/cluster.get_component_template.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/cluster.get_component_template.json
@@ -1,8 +1,8 @@
 {
   "cluster.get_component_template":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-component-template.html",
-      "description":"Returns one or more component templates"
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-cluster-put-component-template",
+      "description":"Get component templates"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/cluster.get_settings.json b/rest-api-spec/src/main/resources/rest-api-spec/api/cluster.get_settings.json
index 5004ab8de697d..978cbc43a3492 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/cluster.get_settings.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/cluster.get_settings.json
@@ -1,8 +1,8 @@
 {
   "cluster.get_settings":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-get-settings.html",
-      "description":"Returns cluster settings."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-cluster-get-settings",
+      "description":"Get cluster-wide settings"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/cluster.health.json b/rest-api-spec/src/main/resources/rest-api-spec/api/cluster.health.json
index 91712bbbded29..177c9efa6410f 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/cluster.health.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/cluster.health.json
@@ -1,8 +1,8 @@
 {
   "cluster.health":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-health.html",
-      "description":"Returns basic information about the health of the cluster."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-cluster-health",
+      "description":"Get the cluster health status"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/cluster.info.json b/rest-api-spec/src/main/resources/rest-api-spec/api/cluster.info.json
index 39f51bf096506..17591d49a6e46 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/cluster.info.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/cluster.info.json
@@ -1,8 +1,8 @@
 {
   "cluster.info": {
       "documentation": {
-          "url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-info.html",
-          "description": "Returns different information about the cluster."
+          "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-cluster-info",
+          "description": "Get cluster info"
       },
       "stability": "stable",
       "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/cluster.pending_tasks.json b/rest-api-spec/src/main/resources/rest-api-spec/api/cluster.pending_tasks.json
index 0ce718b3fffc4..d1e3f70d8f598 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/cluster.pending_tasks.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/cluster.pending_tasks.json
@@ -1,8 +1,8 @@
 {
   "cluster.pending_tasks":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-pending.html",
-      "description":"Returns a list of any cluster-level changes (e.g. create index, update mapping,\nallocate or fail shard) which have not yet been executed."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-cluster-pending-tasks",
+      "description":"Get the pending cluster tasks"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/cluster.post_voting_config_exclusions.json b/rest-api-spec/src/main/resources/rest-api-spec/api/cluster.post_voting_config_exclusions.json
index 591a4e9d27f3e..cc6d0ad27af07 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/cluster.post_voting_config_exclusions.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/cluster.post_voting_config_exclusions.json
@@ -1,8 +1,8 @@
 {
   "cluster.post_voting_config_exclusions":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/voting-config-exclusions.html",
-      "description":"Updates the cluster voting config exclusions by node ids or node names."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-cluster-post-voting-config-exclusions",
+      "description":"Update voting configuration exclusions"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/cluster.put_component_template.json b/rest-api-spec/src/main/resources/rest-api-spec/api/cluster.put_component_template.json
index d953f45d17e4e..3905e89707ddf 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/cluster.put_component_template.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/cluster.put_component_template.json
@@ -1,8 +1,8 @@
 {
   "cluster.put_component_template":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-component-template.html",
-      "description":"Creates or updates a component template"
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-cluster-put-component-template",
+      "description":"Create or update a component template"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/cluster.put_settings.json b/rest-api-spec/src/main/resources/rest-api-spec/api/cluster.put_settings.json
index 77aac96571a38..2ddd9c165e93a 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/cluster.put_settings.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/cluster.put_settings.json
@@ -1,8 +1,8 @@
 {
   "cluster.put_settings":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-update-settings.html",
-      "description":"Updates the cluster settings."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-cluster-put-settings",
+      "description":"Update the cluster settings"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/cluster.remote_info.json b/rest-api-spec/src/main/resources/rest-api-spec/api/cluster.remote_info.json
index 689d10606b0ef..5e0cf3aaa9754 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/cluster.remote_info.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/cluster.remote_info.json
@@ -1,8 +1,8 @@
 {
   "cluster.remote_info":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-remote-info.html",
-      "description":"Returns the information about configured remote clusters."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-cluster-remote-info",
+      "description":"Get remote cluster information"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/cluster.reroute.json b/rest-api-spec/src/main/resources/rest-api-spec/api/cluster.reroute.json
index 81409fa507200..aa7ee0fe00603 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/cluster.reroute.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/cluster.reroute.json
@@ -1,8 +1,8 @@
 {
   "cluster.reroute":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-reroute.html",
-      "description":"Allows to manually change the allocation of individual shards in the cluster."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-cluster-reroute",
+      "description":"Reroute the cluster"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/cluster.state.json b/rest-api-spec/src/main/resources/rest-api-spec/api/cluster.state.json
index 592421c7c192f..9d1204c9a8a2e 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/cluster.state.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/cluster.state.json
@@ -1,8 +1,8 @@
 {
   "cluster.state":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-state.html",
-      "description":"Returns a comprehensive information about the state of the cluster."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-cluster-state",
+      "description":"Get the cluster state"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/cluster.stats.json b/rest-api-spec/src/main/resources/rest-api-spec/api/cluster.stats.json
index 23f6ed4ec5b76..21ba100888780 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/cluster.stats.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/cluster.stats.json
@@ -1,8 +1,8 @@
 {
   "cluster.stats":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-stats.html",
-      "description":"Returns high-level overview of cluster statistics."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-cluster-stats",
+      "description":"Get cluster statistics"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/connector.check_in.json b/rest-api-spec/src/main/resources/rest-api-spec/api/connector.check_in.json
index 36535109df8e7..842c2498d9a5c 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/connector.check_in.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/connector.check_in.json
@@ -1,8 +1,8 @@
 {
   "connector.check_in": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/check-in-connector-api.html",
-      "description": "Updates the last_seen timestamp in the connector document."
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-connector-check-in",
+      "description": "Check in a connector"
     },
     "stability": "experimental",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/connector.delete.json b/rest-api-spec/src/main/resources/rest-api-spec/api/connector.delete.json
index aa5a3dc0a791f..4b71e9968e793 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/connector.delete.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/connector.delete.json
@@ -1,8 +1,8 @@
 {
   "connector.delete": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/delete-connector-api.html",
-      "description": "Deletes a connector."
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-connector-delete",
+      "description": "Delete a connector"
     },
     "stability": "experimental",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/connector.get.json b/rest-api-spec/src/main/resources/rest-api-spec/api/connector.get.json
index 670bb4267bdfa..8644e359382e1 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/connector.get.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/connector.get.json
@@ -1,8 +1,8 @@
 {
   "connector.get": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/get-connector-api.html",
-      "description": "Returns the details about a connector."
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-connector-get",
+      "description": "Get a connector"
     },
     "stability": "experimental",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/connector.last_sync.json b/rest-api-spec/src/main/resources/rest-api-spec/api/connector.last_sync.json
index f6d93555b72ed..8f40fd56ff3f4 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/connector.last_sync.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/connector.last_sync.json
@@ -1,8 +1,8 @@
 {
   "connector.last_sync": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/update-connector-last-sync-api.html",
-      "description": "Updates the stats of last sync in the connector document."
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-connector-last-sync",
+      "description": "Update the connector last sync stats"
     },
     "stability": "experimental",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/connector.list.json b/rest-api-spec/src/main/resources/rest-api-spec/api/connector.list.json
index b8c73a09704f1..23641c3dbaf7b 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/connector.list.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/connector.list.json
@@ -1,8 +1,8 @@
 {
   "connector.list": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/list-connector-api.html",
-      "description": "Lists all connectors."
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-connector-list",
+      "description": "Get all connectors"
     },
     "stability": "experimental",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/connector.post.json b/rest-api-spec/src/main/resources/rest-api-spec/api/connector.post.json
index 365c5353b2f48..08c1170f5057f 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/connector.post.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/connector.post.json
@@ -1,8 +1,8 @@
 {
   "connector.post": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/create-connector-api.html",
-      "description": "Creates a connector."
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-connector-put",
+      "description": "Create a connector"
     },
     "stability": "experimental",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/connector.put.json b/rest-api-spec/src/main/resources/rest-api-spec/api/connector.put.json
index dfcda983cfc45..977a0793ac4b4 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/connector.put.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/connector.put.json
@@ -1,8 +1,8 @@
 {
   "connector.put": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/create-connector-api.html",
-      "description": "Creates or updates a connector."
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-connector-put",
+      "description": "Create or update a connector"
     },
     "stability": "experimental",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/connector.secret_delete.json b/rest-api-spec/src/main/resources/rest-api-spec/api/connector.secret_delete.json
index b93f7ae94d2c4..9c2750b6c736a 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/connector.secret_delete.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/connector.secret_delete.json
@@ -2,7 +2,7 @@
   "connector.secret_delete": {
     "documentation": {
       "url": null,
-      "description": "Deletes a connector secret."
+      "description": "Deletes a connector secret"
     },
     "stability": "experimental",
     "visibility":"private",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/connector.secret_get.json b/rest-api-spec/src/main/resources/rest-api-spec/api/connector.secret_get.json
index a4d6f34290727..5af3195b67ae0 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/connector.secret_get.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/connector.secret_get.json
@@ -2,7 +2,7 @@
   "connector.secret_get": {
     "documentation": {
       "url": null,
-      "description": "Retrieves a secret stored by Connectors."
+      "description": "Retrieves a secret stored by Connectors"
     },
     "stability": "experimental",
     "visibility":"private",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/connector.secret_post.json b/rest-api-spec/src/main/resources/rest-api-spec/api/connector.secret_post.json
index ca61b9165e3b4..1040ac5fc9964 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/connector.secret_post.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/connector.secret_post.json
@@ -2,7 +2,7 @@
   "connector.secret_post": {
     "documentation": {
       "url": null,
-      "description": "Creates a secret for a Connector."
+      "description": "Creates a secret for a Connector"
     },
     "stability": "experimental",
     "visibility":"private",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/connector.secret_put.json b/rest-api-spec/src/main/resources/rest-api-spec/api/connector.secret_put.json
index f99d3f6176f3f..5588ba4c9e2ee 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/connector.secret_put.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/connector.secret_put.json
@@ -2,7 +2,7 @@
   "connector.secret_put": {
     "documentation": {
       "url": null,
-      "description": "Creates or updates a secret for a Connector."
+      "description": "Creates or updates a secret for a Connector"
     },
     "stability": "experimental",
     "visibility":"private",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/connector.sync_job_cancel.json b/rest-api-spec/src/main/resources/rest-api-spec/api/connector.sync_job_cancel.json
index 4f0729a3a11ca..b4b1dc3177bab 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/connector.sync_job_cancel.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/connector.sync_job_cancel.json
@@ -1,8 +1,8 @@
 {
   "connector.sync_job_cancel": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/cancel-connector-sync-job-api.html",
-      "description": "Cancels a connector sync job."
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-connector-sync-job-cancel",
+      "description": "Cancel a connector sync job"
     },
     "stability": "experimental",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/connector.sync_job_check_in.json b/rest-api-spec/src/main/resources/rest-api-spec/api/connector.sync_job_check_in.json
index 10a1a40d616eb..a5aac925c5dfc 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/connector.sync_job_check_in.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/connector.sync_job_check_in.json
@@ -1,8 +1,8 @@
 {
   "connector.sync_job_check_in": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/check-in-connector-sync-job-api.html",
-      "description": "Checks in a connector sync job (refreshes 'last_seen')."
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-connector-sync-job-check-in",
+      "description": "Check in a connector sync job"
     },
     "stability": "experimental",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/connector.sync_job_claim.json b/rest-api-spec/src/main/resources/rest-api-spec/api/connector.sync_job_claim.json
index f8d090264038a..32e4053110a4c 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/connector.sync_job_claim.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/connector.sync_job_claim.json
@@ -1,8 +1,8 @@
 {
   "connector.sync_job_claim": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/claim-connector-sync-job-api.html",
-      "description": "Claims a connector sync job."
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-connector-sync-job-claim",
+      "description": "Claim a connector sync job"
     },
     "stability": "experimental",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/connector.sync_job_delete.json b/rest-api-spec/src/main/resources/rest-api-spec/api/connector.sync_job_delete.json
index 591cb8f0cc695..d7e1ccc229a6d 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/connector.sync_job_delete.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/connector.sync_job_delete.json
@@ -1,8 +1,8 @@
 {
   "connector.sync_job_delete": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/delete-connector-sync-job-api.html",
-      "description": "Deletes a connector sync job."
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-connector-sync-job-delete",
+      "description": "Delete a connector sync job"
     },
     "stability": "experimental",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/connector.sync_job_error.json b/rest-api-spec/src/main/resources/rest-api-spec/api/connector.sync_job_error.json
index ea5c2a0dd0586..4ca98a5c27788 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/connector.sync_job_error.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/connector.sync_job_error.json
@@ -1,8 +1,8 @@
 {
   "connector.sync_job_error": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/set-connector-sync-job-error-api.html",
-      "description": "Sets an error for a connector sync job."
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-connector-sync-job-error",
+      "description": "Set a connector sync job error"
     },
     "stability": "experimental",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/connector.sync_job_get.json b/rest-api-spec/src/main/resources/rest-api-spec/api/connector.sync_job_get.json
index 8a46a1eecc6ec..31f14becd0238 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/connector.sync_job_get.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/connector.sync_job_get.json
@@ -1,8 +1,8 @@
 {
   "connector.sync_job_get": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/get-connector-sync-job-api.html",
-      "description": "Returns the details about a connector sync job."
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-connector-sync-job-get",
+      "description": "Get a connector sync job"
     },
     "stability": "experimental",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/connector.sync_job_list.json b/rest-api-spec/src/main/resources/rest-api-spec/api/connector.sync_job_list.json
index 737028ce782f8..346143a0029e4 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/connector.sync_job_list.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/connector.sync_job_list.json
@@ -1,8 +1,8 @@
 {
   "connector.sync_job_list": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/list-connector-sync-jobs-api.html",
-      "description": "Lists all connector sync jobs."
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-connector-sync-job-list",
+      "description": "Get all connector sync jobs"
     },
     "stability": "experimental",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/connector.sync_job_post.json b/rest-api-spec/src/main/resources/rest-api-spec/api/connector.sync_job_post.json
index 88069718dbd20..74fa61e16a768 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/connector.sync_job_post.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/connector.sync_job_post.json
@@ -1,8 +1,8 @@
 {
   "connector.sync_job_post": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/create-connector-sync-job-api.html",
-      "description": "Creates a connector sync job."
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-connector-sync-job-post",
+      "description": "Create a connector sync job"
     },
     "stability": "experimental",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/connector.sync_job_update_stats.json b/rest-api-spec/src/main/resources/rest-api-spec/api/connector.sync_job_update_stats.json
index 744de17a6ad00..dda4001d08faa 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/connector.sync_job_update_stats.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/connector.sync_job_update_stats.json
@@ -1,8 +1,8 @@
 {
   "connector.sync_job_update_stats": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/set-connector-sync-job-stats-api.html",
-      "description": "Updates the stats fields in the connector sync job document."
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-connector-sync-job-update-stats",
+      "description": "Set the connector sync job stats"
     },
     "stability": "experimental",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/connector.update_active_filtering.json b/rest-api-spec/src/main/resources/rest-api-spec/api/connector.update_active_filtering.json
index 343791e7ac11f..a249f9da7aede 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/connector.update_active_filtering.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/connector.update_active_filtering.json
@@ -1,8 +1,8 @@
 {
   "connector.update_active_filtering": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/update-connector-filtering-api.html",
-      "description": "Activates the draft filtering rules if they are in a validated state."
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-connector-update-filtering",
+      "description": "Activate the connector draft filter"
     },
     "stability": "experimental",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/connector.update_api_key_id.json b/rest-api-spec/src/main/resources/rest-api-spec/api/connector.update_api_key_id.json
index cc989bfec8a8d..4e2f087074fb0 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/connector.update_api_key_id.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/connector.update_api_key_id.json
@@ -1,8 +1,8 @@
 {
   "connector.update_api_key_id": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/update-connector-api-key-id-api.html",
-      "description": "Updates the API key id and/or API key secret id fields in the connector document."
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-connector-update-api-key-id",
+      "description": "Update the connector API key ID"
     },
     "stability": "experimental",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/connector.update_configuration.json b/rest-api-spec/src/main/resources/rest-api-spec/api/connector.update_configuration.json
index 1ececd7ea95f7..b73f5bf586a67 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/connector.update_configuration.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/connector.update_configuration.json
@@ -1,8 +1,8 @@
 {
   "connector.update_configuration": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/update-connector-configuration-api.html",
-      "description": "Updates the connector configuration."
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-connector-update-configuration",
+      "description": "Update the connector configuration"
     },
     "stability": "experimental",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/connector.update_error.json b/rest-api-spec/src/main/resources/rest-api-spec/api/connector.update_error.json
index 150f71ad033ac..4f94a87a00695 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/connector.update_error.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/connector.update_error.json
@@ -1,8 +1,8 @@
 {
   "connector.update_error": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/update-connector-error-api.html",
-      "description": "Updates the error field in the connector document."
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-connector-update-error",
+      "description": "Update the connector error field"
     },
     "stability": "experimental",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/connector.update_features.json b/rest-api-spec/src/main/resources/rest-api-spec/api/connector.update_features.json
index b488e19262c2e..17d89171a3612 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/connector.update_features.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/connector.update_features.json
@@ -1,8 +1,8 @@
 {
   "connector.update_features": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/update-connector-features-api.html",
-      "description": "Updates the connector features in the connector document."
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-connector-update-features",
+      "description": "Update the connector features"
     },
     "stability": "experimental",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/connector.update_filtering.json b/rest-api-spec/src/main/resources/rest-api-spec/api/connector.update_filtering.json
index c2a9bf0720746..1f837ecd351c9 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/connector.update_filtering.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/connector.update_filtering.json
@@ -1,8 +1,8 @@
 {
   "connector.update_filtering": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/update-connector-filtering-api.html",
-      "description": "Updates the filtering field in the connector document."
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-connector-update-filtering",
+      "description": "Update the connector filtering"
     },
     "stability": "experimental",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/connector.update_filtering_validation.json b/rest-api-spec/src/main/resources/rest-api-spec/api/connector.update_filtering_validation.json
index 99b0a9e6116c1..133b05f735bd0 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/connector.update_filtering_validation.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/connector.update_filtering_validation.json
@@ -1,8 +1,8 @@
 {
   "connector.update_filtering_validation": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/update-connector-filtering-api.html",
-      "description": "Updates the validation info of the draft filtering rules."
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-connector-update-filtering-validation",
+      "description": "Update the connector draft filtering validation"
     },
     "stability": "experimental",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/connector.update_index_name.json b/rest-api-spec/src/main/resources/rest-api-spec/api/connector.update_index_name.json
index 97d76f60c0292..c246644342b1f 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/connector.update_index_name.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/connector.update_index_name.json
@@ -1,8 +1,8 @@
 {
   "connector.update_index_name": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/update-connector-index-name-api.html",
-      "description": "Updates the index name of the connector."
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-connector-update-index-name",
+      "description": "Update the connector index name"
     },
     "stability": "experimental",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/connector.update_name.json b/rest-api-spec/src/main/resources/rest-api-spec/api/connector.update_name.json
index a7ca1a9730ab9..0d3a67504fb38 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/connector.update_name.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/connector.update_name.json
@@ -1,8 +1,8 @@
 {
   "connector.update_name": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/update-connector-name-description-api.html",
-      "description": "Updates the name and/or description fields in the connector document."
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-connector-update-name",
+      "description": "Update the connector name and description"
     },
     "stability": "experimental",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/connector.update_native.json b/rest-api-spec/src/main/resources/rest-api-spec/api/connector.update_native.json
index 5a13b44e8202d..4bce8132417cf 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/connector.update_native.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/connector.update_native.json
@@ -1,8 +1,8 @@
 {
   "connector.update_native": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/connector-apis.html",
-      "description": "Updates the is_native flag of the connector."
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-connector-update-native",
+      "description": "Update the connector is_native flag"
     },
     "stability": "experimental",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/connector.update_pipeline.json b/rest-api-spec/src/main/resources/rest-api-spec/api/connector.update_pipeline.json
index b7ab6abcf088d..28f9b09a8ce70 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/connector.update_pipeline.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/connector.update_pipeline.json
@@ -1,8 +1,8 @@
 {
   "connector.update_pipeline": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/update-connector-pipeline-api.html",
-      "description": "Updates the pipeline field in the connector document."
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-connector-update-pipeline",
+      "description": "Update the connector pipeline"
     },
     "stability": "experimental",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/connector.update_scheduling.json b/rest-api-spec/src/main/resources/rest-api-spec/api/connector.update_scheduling.json
index 98cee5c257b90..04a55a4e18ea6 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/connector.update_scheduling.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/connector.update_scheduling.json
@@ -1,8 +1,8 @@
 {
   "connector.update_scheduling": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/update-connector-scheduling-api.html",
-      "description": "Updates the scheduling field in the connector document."
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-connector-update-scheduling",
+      "description": "Update the connector scheduling"
     },
     "stability": "experimental",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/connector.update_service_type.json b/rest-api-spec/src/main/resources/rest-api-spec/api/connector.update_service_type.json
index 279d93c684783..3df77d5dfe85c 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/connector.update_service_type.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/connector.update_service_type.json
@@ -1,8 +1,8 @@
 {
   "connector.update_service_type": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/update-connector-service-type-api.html",
-      "description": "Updates the service type of the connector."
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-connector-update-service-type",
+      "description": "Update the connector service type"
     },
     "stability": "experimental",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/connector.update_status.json b/rest-api-spec/src/main/resources/rest-api-spec/api/connector.update_status.json
index ea5e506faad89..d55b223bf438e 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/connector.update_status.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/connector.update_status.json
@@ -1,8 +1,8 @@
 {
   "connector.update_status": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/update-connector-status-api.html",
-      "description": "Updates the status of the connector."
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-connector-update-status",
+      "description": "Update the connector status"
     },
     "stability": "experimental",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/count.json b/rest-api-spec/src/main/resources/rest-api-spec/api/count.json
index 6ebeb572f0481..fad7e2174591d 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/count.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/count.json
@@ -1,8 +1,8 @@
 {
   "count":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/search-count.html",
-      "description":"Returns number of documents matching a query."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-count",
+      "description":"Count search results"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/create.json b/rest-api-spec/src/main/resources/rest-api-spec/api/create.json
index 88b040d1dbee3..215c756073912 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/create.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/create.json
@@ -1,8 +1,8 @@
 {
   "create":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/docs-index_.html",
-      "description":"Creates a new document in the index.\n\nReturns a 409 response when a document with a same ID already exists in the index."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-create",
+      "description":"Create a new document in the index"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/dangling_indices.delete_dangling_index.json b/rest-api-spec/src/main/resources/rest-api-spec/api/dangling_indices.delete_dangling_index.json
index 8106e80deeaf8..2201aa78cd2b7 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/dangling_indices.delete_dangling_index.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/dangling_indices.delete_dangling_index.json
@@ -1,8 +1,8 @@
 {
   "dangling_indices.delete_dangling_index": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/modules-gateway-dangling-indices.html",
-      "description": "Deletes the specified dangling index"
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-dangling-indices-delete-dangling-index",
+      "description": "Delete a dangling index"
     },
     "stability": "stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/dangling_indices.import_dangling_index.json b/rest-api-spec/src/main/resources/rest-api-spec/api/dangling_indices.import_dangling_index.json
index f81afc3558cbd..5db8840873227 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/dangling_indices.import_dangling_index.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/dangling_indices.import_dangling_index.json
@@ -1,8 +1,8 @@
 {
   "dangling_indices.import_dangling_index": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/modules-gateway-dangling-indices.html",
-      "description": "Imports the specified dangling index"
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-dangling-indices-import-dangling-index",
+      "description": "Import a dangling index"
     },
     "stability": "stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/dangling_indices.list_dangling_indices.json b/rest-api-spec/src/main/resources/rest-api-spec/api/dangling_indices.list_dangling_indices.json
index 4310faa96185f..ce868bdd21ee2 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/dangling_indices.list_dangling_indices.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/dangling_indices.list_dangling_indices.json
@@ -1,8 +1,8 @@
 {
   "dangling_indices.list_dangling_indices": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/modules-gateway-dangling-indices.html",
-      "description": "Returns all dangling indices."
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-dangling-indices-list-dangling-indices",
+      "description": "Get the dangling indices"
     },
     "stability": "stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/delete.json b/rest-api-spec/src/main/resources/rest-api-spec/api/delete.json
index 7fbc693d069bf..15139e81c67d8 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/delete.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/delete.json
@@ -1,8 +1,8 @@
 {
   "delete":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/docs-delete.html",
-      "description":"Removes a document from the index."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-delete",
+      "description":"Delete a document"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/delete_by_query.json b/rest-api-spec/src/main/resources/rest-api-spec/api/delete_by_query.json
index cc36acea13492..c8edc0496cd55 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/delete_by_query.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/delete_by_query.json
@@ -1,8 +1,8 @@
 {
   "delete_by_query":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/docs-delete-by-query.html",
-      "description":"Deletes documents matching the provided query."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-delete-by-query",
+      "description":"Delete documents"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/delete_by_query_rethrottle.json b/rest-api-spec/src/main/resources/rest-api-spec/api/delete_by_query_rethrottle.json
index e8ff1a61f83f8..1c6a89eebf075 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/delete_by_query_rethrottle.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/delete_by_query_rethrottle.json
@@ -1,8 +1,8 @@
 {
   "delete_by_query_rethrottle":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/docs-delete-by-query.html",
-      "description":"Changes the number of requests per second for a particular Delete By Query operation."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-delete-by-query-rethrottle",
+      "description":"Throttle a delete by query operation"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/delete_script.json b/rest-api-spec/src/main/resources/rest-api-spec/api/delete_script.json
index cf6573372ddb2..0071fe8740f9e 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/delete_script.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/delete_script.json
@@ -1,8 +1,8 @@
 {
   "delete_script":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/modules-scripting.html",
-      "description":"Deletes a script."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-delete-script",
+      "description":"Delete a script or search template"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/enrich.delete_policy.json b/rest-api-spec/src/main/resources/rest-api-spec/api/enrich.delete_policy.json
index 5c6b05a548987..99f0a2def7fab 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/enrich.delete_policy.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/enrich.delete_policy.json
@@ -1,8 +1,8 @@
 {
   "enrich.delete_policy": {
     "documentation": {
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/delete-enrich-policy-api.html",
-      "description": "Deletes an existing enrich policy and its enrich index."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-enrich-delete-policy",
+      "description": "Delete an enrich policy"
     },
     "stability" : "stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/enrich.execute_policy.json b/rest-api-spec/src/main/resources/rest-api-spec/api/enrich.execute_policy.json
index 2add255148508..ae84a726df82c 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/enrich.execute_policy.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/enrich.execute_policy.json
@@ -1,8 +1,8 @@
 {
   "enrich.execute_policy": {
     "documentation": {
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/execute-enrich-policy-api.html",
-      "description": "Creates the enrich index for an existing enrich policy."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-enrich-execute-policy",
+      "description": "Run an enrich policy"
     },
     "stability" : "stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/enrich.get_policy.json b/rest-api-spec/src/main/resources/rest-api-spec/api/enrich.get_policy.json
index e735a75f67ee9..5f0f4fc9ca5b5 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/enrich.get_policy.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/enrich.get_policy.json
@@ -1,8 +1,8 @@
 {
   "enrich.get_policy": {
     "documentation": {
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/get-enrich-policy-api.html",
-      "description": "Gets information about an enrich policy."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-enrich-get-policy",
+      "description": "Get an enrich policy"
     },
     "stability" : "stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/enrich.put_policy.json b/rest-api-spec/src/main/resources/rest-api-spec/api/enrich.put_policy.json
index 287c7d96dca9d..cf2c11cc21b12 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/enrich.put_policy.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/enrich.put_policy.json
@@ -1,8 +1,8 @@
 {
   "enrich.put_policy": {
     "documentation": {
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/put-enrich-policy-api.html",
-      "description": "Creates a new enrich policy."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-enrich-put-policy",
+      "description": "Create an enrich policy"
     },
     "stability" : "stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/enrich.stats.json b/rest-api-spec/src/main/resources/rest-api-spec/api/enrich.stats.json
index 835fa3f6ffef2..1bdeccc1c9715 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/enrich.stats.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/enrich.stats.json
@@ -1,8 +1,8 @@
 {
   "enrich.stats": {
     "documentation": {
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/enrich-stats-api.html",
-      "description": "Gets enrich coordinator statistics and information about enrich policies that are currently executing."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-enrich-stats",
+      "description": "Get enrich stats"
     },
     "stability" : "stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/eql.delete.json b/rest-api-spec/src/main/resources/rest-api-spec/api/eql.delete.json
index 18f690227ca3c..4c8c2a2cd54ed 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/eql.delete.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/eql.delete.json
@@ -1,8 +1,8 @@
 {
   "eql.delete":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/eql-search-api.html",
-      "description": "Deletes an async EQL search by ID. If the search is still running, the search request will be cancelled. Otherwise, the saved search results are deleted."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-eql-delete",
+      "description": "Delete an async EQL search"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/eql.get.json b/rest-api-spec/src/main/resources/rest-api-spec/api/eql.get.json
index c7a228da97a53..34b770997eee5 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/eql.get.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/eql.get.json
@@ -1,8 +1,8 @@
 {
   "eql.get":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/eql-search-api.html",
-      "description": "Returns async results from previously executed Event Query Language (EQL) search"
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-eql-get",
+      "description": "Get async EQL search results"
     },
     "stability": "stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/eql.get_status.json b/rest-api-spec/src/main/resources/rest-api-spec/api/eql.get_status.json
index be8a439893362..00e478659b389 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/eql.get_status.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/eql.get_status.json
@@ -1,8 +1,8 @@
 {
   "eql.get_status": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/current/eql-search-api.html",
-      "description": "Returns the status of a previously submitted async or stored Event Query Language (EQL) search"
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-eql-get-status",
+      "description": "Get the async EQL status"
     },
     "stability": "stable",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/eql.search.json b/rest-api-spec/src/main/resources/rest-api-spec/api/eql.search.json
index 9164a15be4cc1..afb3b8508599e 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/eql.search.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/eql.search.json
@@ -1,8 +1,8 @@
 {
   "eql.search":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/eql-search-api.html",
-      "description": "Returns results matching a query expressed in Event Query Language (EQL)"
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-eql-search",
+      "description": "Get EQL search results"
     },
     "stability": "stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/esql.async_query.json b/rest-api-spec/src/main/resources/rest-api-spec/api/esql.async_query.json
index 56895059d499d..f5e7d710242dd 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/esql.async_query.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/esql.async_query.json
@@ -1,8 +1,8 @@
 {
   "esql.async_query":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/esql-async-query-api.html",
-      "description":"Executes an ESQL request asynchronously"
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-esql-async-query",
+      "description":"Run an async ES|QL query"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/esql.async_query_delete.json b/rest-api-spec/src/main/resources/rest-api-spec/api/esql.async_query_delete.json
index a6339559afd72..802c0ae31a9e4 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/esql.async_query_delete.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/esql.async_query_delete.json
@@ -1,8 +1,8 @@
 {
   "esql.async_query_delete": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/esql-async-query-delete-api.html",
-      "description": "Delete an async query request given its ID."
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-esql-async-query-delete",
+      "description": "Delete an async ES|QL query"
     },
     "stability": "stable",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/esql.async_query_get.json b/rest-api-spec/src/main/resources/rest-api-spec/api/esql.async_query_get.json
index 671a8dff42d2c..07454a0877592 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/esql.async_query_get.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/esql.async_query_get.json
@@ -1,8 +1,8 @@
 {
   "esql.async_query_get":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/esql-async-query-get-api.html",
-      "description": "Retrieves the results of a previously submitted async query request given its ID."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-esql-async-query-get",
+      "description": "Get async ES|QL query results"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/esql.async_query_stop.json b/rest-api-spec/src/main/resources/rest-api-spec/api/esql.async_query_stop.json
index 6fbdefef8b689..181ebdaadae2c 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/esql.async_query_stop.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/esql.async_query_stop.json
@@ -1,8 +1,8 @@
 {
   "esql.async_query_stop": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/esql-async-query-stop-api.html",
-      "description": "Stops a previously submitted async query request given its ID and collects the results."
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-esql-async-query-stop",
+      "description": "Stop async ES|QL query"
     },
     "stability": "stable",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/esql.get_query.json b/rest-api-spec/src/main/resources/rest-api-spec/api/esql.get_query.json
index 714db0e472185..781a1c67d70ba 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/esql.get_query.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/esql.get_query.json
@@ -2,7 +2,7 @@
   "esql.get_query": {
     "documentation": {
       "url": null,
-      "description": "Executes a get ESQL query request"
+      "description": "Get a specific running ES|QL query information"
     },
     "stability": "experimental",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/esql.list_queries.json b/rest-api-spec/src/main/resources/rest-api-spec/api/esql.list_queries.json
index c4f5abcdcb7a3..a0d5341a0dacc 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/esql.list_queries.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/esql.list_queries.json
@@ -2,7 +2,7 @@
   "esql.list_queries": {
     "documentation": {
       "url": null,
-      "description": "Executes a list ESQL queries request"
+      "description": "Get running ES|QL queries information"
     },
     "stability": "experimental",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/esql.query.json b/rest-api-spec/src/main/resources/rest-api-spec/api/esql.query.json
index 28a488a20528f..c15f6fb8fe88a 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/esql.query.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/esql.query.json
@@ -1,8 +1,8 @@
 {
   "esql.query":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/esql-query-api.html",
-      "description":"Executes an ESQL request"
+      "url":"https://www.elastic.co/docs/explore-analyze/query-filter/languages/esql-rest",
+      "description":"Run an ES|QL query"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/exists.json b/rest-api-spec/src/main/resources/rest-api-spec/api/exists.json
index 99e9793ebffe4..e1d65a06d3780 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/exists.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/exists.json
@@ -1,8 +1,8 @@
 {
   "exists":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/docs-get.html",
-      "description":"Returns information about whether a document exists in an index."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-get",
+      "description":"Check a document"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/exists_source.json b/rest-api-spec/src/main/resources/rest-api-spec/api/exists_source.json
index 3cad1ab5fd7d0..221a7dac4efd6 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/exists_source.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/exists_source.json
@@ -1,8 +1,8 @@
 {
   "exists_source":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/docs-get.html",
-      "description":"Returns information about whether a document source exists in an index."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-get",
+      "description":"Check for a document source"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/explain.json b/rest-api-spec/src/main/resources/rest-api-spec/api/explain.json
index 8b25836d97154..b3d0aad8aa9ef 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/explain.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/explain.json
@@ -1,8 +1,8 @@
 {
   "explain":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/search-explain.html",
-      "description":"Returns information about why a specific matches (or doesn't match) a query."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-explain",
+      "description":"Explain a document match result"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/features.get_features.json b/rest-api-spec/src/main/resources/rest-api-spec/api/features.get_features.json
index 6d5e8b5aa5698..652ebcf052f21 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/features.get_features.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/features.get_features.json
@@ -1,8 +1,8 @@
 {
   "features.get_features":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/get-features-api.html",
-      "description":"Gets a list of features which can be included in snapshots using the feature_states field when creating a snapshot"
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-features-get-features",
+      "description":"Get the features"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/features.reset_features.json b/rest-api-spec/src/main/resources/rest-api-spec/api/features.reset_features.json
index dec102a681c81..f1791e0ec2e0c 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/features.reset_features.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/features.reset_features.json
@@ -1,8 +1,8 @@
 {
   "features.reset_features":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/modules-snapshots.html",
-      "description":"Resets the internal state of features, usually by deleting system indices"
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-features-reset-features",
+      "description":"Reset the features"
     },
     "stability":"experimental",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/field_caps.json b/rest-api-spec/src/main/resources/rest-api-spec/api/field_caps.json
index 27962b6ac10b2..f062eacdaa505 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/field_caps.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/field_caps.json
@@ -1,8 +1,8 @@
 {
   "field_caps":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/search-field-caps.html",
-      "description":"Returns the information about the capabilities of fields among multiple indices."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-field-caps",
+      "description":"Get the field capabilities"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/fleet.delete_secret.json b/rest-api-spec/src/main/resources/rest-api-spec/api/fleet.delete_secret.json
index fc950dab3f665..9c83cd7d2ace2 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/fleet.delete_secret.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/fleet.delete_secret.json
@@ -2,7 +2,7 @@
   "fleet.delete_secret": {
     "documentation": {
       "url": null,
-      "description": "Deletes a secret stored by Fleet."
+      "description": "Deletes a secret stored by Fleet"
     },
     "stability": "experimental",
     "visibility":"private",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/fleet.get_secret.json b/rest-api-spec/src/main/resources/rest-api-spec/api/fleet.get_secret.json
index f58d0735c8230..861814fa6d873 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/fleet.get_secret.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/fleet.get_secret.json
@@ -2,7 +2,7 @@
   "fleet.get_secret": {
     "documentation": {
       "url": null,
-      "description": "Retrieves a secret stored by Fleet."
+      "description": "Retrieves a secret stored by Fleet"
     },
     "stability": "experimental",
     "visibility":"private",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/fleet.global_checkpoints.json b/rest-api-spec/src/main/resources/rest-api-spec/api/fleet.global_checkpoints.json
index 97618bec8f4fb..f2c67e54d5d13 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/fleet.global_checkpoints.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/fleet.global_checkpoints.json
@@ -1,8 +1,8 @@
 {
   "fleet.global_checkpoints":{
     "documentation":{
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/current/get-global-checkpoints.html",
-      "description": "Returns the current global checkpoints for an index. This API is design for internal use by the fleet server project."
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/group/endpoint-fleet",
+      "description": "Get global checkpoints"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/fleet.msearch.json b/rest-api-spec/src/main/resources/rest-api-spec/api/fleet.msearch.json
index 3a9bf254e53b1..d805fbfb050be 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/fleet.msearch.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/fleet.msearch.json
@@ -2,7 +2,7 @@
   "fleet.msearch":{
     "documentation":{
       "url": null,
-      "description": "Multi Search API where the search will only be executed after specified checkpoints are available due to a refresh. This API is designed for internal use by the fleet server project."
+      "description": "Run multiple Fleet searches"
     },
     "stability":"experimental",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/fleet.post_secret.json b/rest-api-spec/src/main/resources/rest-api-spec/api/fleet.post_secret.json
index a16369cd29e9b..5d5bbef5a3da8 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/fleet.post_secret.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/fleet.post_secret.json
@@ -2,7 +2,7 @@
   "fleet.post_secret": {
     "documentation": {
       "url": null,
-      "description": "Creates a secret stored by Fleet."
+      "description": "Creates a secret stored by Fleet"
     },
     "stability": "experimental",
     "visibility":"private",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/fleet.search.json b/rest-api-spec/src/main/resources/rest-api-spec/api/fleet.search.json
index b4e0ff5b3c5cb..1360853eaa72e 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/fleet.search.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/fleet.search.json
@@ -2,7 +2,7 @@
   "fleet.search":{
     "documentation":{
       "url": null,
-      "description": "Search API where the search will only be executed after specified checkpoints are available due to a refresh. This API is designed for internal use by the fleet server project."
+      "description": "Run a Fleet search"
     },
     "stability":"experimental",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/get.json b/rest-api-spec/src/main/resources/rest-api-spec/api/get.json
index cb696810dbd9b..11ffae42410b5 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/get.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/get.json
@@ -1,8 +1,8 @@
 {
   "get":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/docs-get.html",
-      "description":"Returns a document."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-get",
+      "description":"Get a document by its ID"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/get_script.json b/rest-api-spec/src/main/resources/rest-api-spec/api/get_script.json
index ae11aa0736307..f69f23ea9ae35 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/get_script.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/get_script.json
@@ -1,8 +1,8 @@
 {
   "get_script":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/modules-scripting.html",
-      "description":"Returns a script."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-get-script",
+      "description":"Get a script or search template"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/get_script_context.json b/rest-api-spec/src/main/resources/rest-api-spec/api/get_script_context.json
index 332b57d791779..9886f24a55ceb 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/get_script_context.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/get_script_context.json
@@ -1,8 +1,8 @@
 {
   "get_script_context":{
     "documentation":{
-      "url": "https://www.elastic.co/guide/en/elasticsearch/painless/master/painless-contexts.html",
-      "description":"Returns all script contexts."
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-get-script-context",
+      "description":"Get script contexts"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/get_script_languages.json b/rest-api-spec/src/main/resources/rest-api-spec/api/get_script_languages.json
index 9c228017f0b20..65e84ea4291d3 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/get_script_languages.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/get_script_languages.json
@@ -1,8 +1,8 @@
 {
   "get_script_languages":{
     "documentation":{
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/modules-scripting.html",
-      "description":"Returns available script types, languages and contexts"
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-get-script-languages",
+      "description":"Get script languages"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/get_source.json b/rest-api-spec/src/main/resources/rest-api-spec/api/get_source.json
index a17ae4b027fd5..b5419aed3803e 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/get_source.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/get_source.json
@@ -1,8 +1,8 @@
 {
   "get_source":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/docs-get.html",
-      "description":"Returns the source of a document."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-get",
+      "description":"Get a document's source"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/graph.explore.json b/rest-api-spec/src/main/resources/rest-api-spec/api/graph.explore.json
index 311716fd6b484..aa8fcb57a03aa 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/graph.explore.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/graph.explore.json
@@ -1,8 +1,8 @@
 {
   "graph.explore":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/graph-explore-api.html",
-      "description": "Explore extracted and summarized information about the documents and terms in an index."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/group/endpoint-graph",
+      "description": "Explore graph analytics"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/health_report.json b/rest-api-spec/src/main/resources/rest-api-spec/api/health_report.json
index 2cc9b8f008311..1ea610915cf87 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/health_report.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/health_report.json
@@ -1,8 +1,8 @@
 {
   "health_report": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/current/health-api.html",
-      "description": "Returns the health of the cluster."
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-health-report",
+      "description": "Get the cluster health"
     },
     "stability": "stable",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ilm.delete_lifecycle.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ilm.delete_lifecycle.json
index cd6397fb61586..751bd5888533c 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ilm.delete_lifecycle.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ilm.delete_lifecycle.json
@@ -1,8 +1,8 @@
 {
   "ilm.delete_lifecycle":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ilm-delete-lifecycle.html",
-      "description": "Deletes the specified lifecycle policy definition. A currently used policy cannot be deleted."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ilm-delete-lifecycle",
+      "description": "Delete a lifecycle policy"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ilm.explain_lifecycle.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ilm.explain_lifecycle.json
index 94c37adb802f6..79ae1ad7146ea 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ilm.explain_lifecycle.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ilm.explain_lifecycle.json
@@ -1,8 +1,8 @@
 {
   "ilm.explain_lifecycle":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ilm-explain-lifecycle.html",
-      "description": "Retrieves information about the index's current lifecycle state, such as the currently executing phase, action, and step."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ilm-explain-lifecycle",
+      "description": "Explain the lifecycle state"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ilm.get_lifecycle.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ilm.get_lifecycle.json
index 5abdfac7f5b30..722822fb30c2b 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ilm.get_lifecycle.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ilm.get_lifecycle.json
@@ -1,8 +1,8 @@
 {
   "ilm.get_lifecycle":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ilm-get-lifecycle.html",
-      "description": "Returns the specified policy definition. Includes the policy version and last modified date."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ilm-get-lifecycle",
+      "description": "Get lifecycle policies"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ilm.get_status.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ilm.get_status.json
index eba1b93c1e4b0..ccfb4e53b7837 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ilm.get_status.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ilm.get_status.json
@@ -1,8 +1,8 @@
 {
   "ilm.get_status":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ilm-get-status.html",
-      "description":"Retrieves the current index lifecycle management (ILM) status."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ilm-get-status",
+      "description":"Get the ILM status"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ilm.migrate_to_data_tiers.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ilm.migrate_to_data_tiers.json
index 78bcb182ec74f..d51ec58ed35b3 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ilm.migrate_to_data_tiers.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ilm.migrate_to_data_tiers.json
@@ -1,8 +1,8 @@
 {
   "ilm.migrate_to_data_tiers":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ilm-migrate-to-data-tiers.html",
-      "description": "Migrates the indices and ILM policies away from custom node attribute allocation routing to data tiers routing"
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ilm-migrate-to-data-tiers",
+      "description": "Migrate to data tiers routing"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ilm.move_to_step.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ilm.move_to_step.json
index 3f46b8fa913b0..34485ff1de2e4 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ilm.move_to_step.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ilm.move_to_step.json
@@ -1,8 +1,8 @@
 {
   "ilm.move_to_step":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ilm-move-to-step.html",
-      "description":"Manually moves an index into the specified step and executes that step."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ilm-move-to-step",
+      "description":"Move to a lifecycle step"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ilm.put_lifecycle.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ilm.put_lifecycle.json
index b7fdbe04a0ffb..47c1f6c6d56f6 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ilm.put_lifecycle.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ilm.put_lifecycle.json
@@ -1,8 +1,8 @@
 {
   "ilm.put_lifecycle":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ilm-put-lifecycle.html",
-      "description":"Creates a lifecycle policy"
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ilm-put-lifecycle",
+      "description":"Create or update a lifecycle policy"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ilm.remove_policy.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ilm.remove_policy.json
index bc684186e15a4..020a9cfc05848 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ilm.remove_policy.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ilm.remove_policy.json
@@ -1,8 +1,8 @@
 {
   "ilm.remove_policy":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ilm-remove-policy.html",
-      "description":"Removes the assigned lifecycle policy and stops managing the specified index"
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ilm-remove-policy",
+      "description":"Remove policies from an index"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ilm.retry.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ilm.retry.json
index b567d9b73cb16..2097d90aae59f 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ilm.retry.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ilm.retry.json
@@ -1,8 +1,8 @@
 {
   "ilm.retry":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ilm-retry-policy.html",
-      "description":"Retries executing the policy for an index that is in the ERROR step."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ilm-retry",
+      "description":"Retry a policy"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ilm.start.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ilm.start.json
index 7141673ff9a9d..c2128e04179b4 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ilm.start.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ilm.start.json
@@ -1,8 +1,8 @@
 {
   "ilm.start":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ilm-start.html",
-      "description":"Start the index lifecycle management (ILM) plugin."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ilm-start",
+      "description":"Start the ILM plugin"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ilm.stop.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ilm.stop.json
index 962fa77263ee4..81bcb68ea8873 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ilm.stop.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ilm.stop.json
@@ -1,8 +1,8 @@
 {
   "ilm.stop":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ilm-stop.html",
-      "description":"Halts all lifecycle management operations and stops the index lifecycle management (ILM) plugin"
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ilm-stop",
+      "description":"Stop the ILM plugin"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/index.json b/rest-api-spec/src/main/resources/rest-api-spec/api/index.json
index 79ecbd794024a..e36ebdaaeaad3 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/index.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/index.json
@@ -1,8 +1,8 @@
 {
   "index":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/docs-index_.html",
-      "description":"Creates or updates a document in an index."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-create",
+      "description":"Create or update a document in an index"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.add_block.json b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.add_block.json
index 24738d1f5bb27..8ef8460057347 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.add_block.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.add_block.json
@@ -1,8 +1,8 @@
 {
   "indices.add_block":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/index-modules-blocks.html",
-      "description":"Adds a block to an index."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-indices-add-block",
+      "description":"Add an index block"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.analyze.json b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.analyze.json
index a6d8cf6cfc987..a23fbb4521bef 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.analyze.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.analyze.json
@@ -1,8 +1,8 @@
 {
   "indices.analyze":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-analyze.html",
-      "description":"Performs the analysis process on a text and return the tokens breakdown of the text."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-indices-analyze",
+      "description":"Get tokens from text analysis"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.cancel_migrate_reindex.json b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.cancel_migrate_reindex.json
index 31cff458e357a..df3809405ef1e 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.cancel_migrate_reindex.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.cancel_migrate_reindex.json
@@ -1,8 +1,8 @@
 {
   "indices.cancel_migrate_reindex":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/data-stream-reindex-cancel-api.html",
-      "description":"This API returns the status of a migration reindex attempt for a data stream or index"
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-indices-cancel-migrate-reindex",
+      "description":"Cancel a migration reindex operation"
     },
     "stability":"experimental",
     "visibility":"private",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.clear_cache.json b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.clear_cache.json
index 064a7573b3224..eb4f2cac70e34 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.clear_cache.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.clear_cache.json
@@ -1,8 +1,8 @@
 {
   "indices.clear_cache":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-clearcache.html",
-      "description":"Clears all or specific caches for one or more indices."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-indices-clear-cache",
+      "description":"Clear the cache"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.clone.json b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.clone.json
index 43a6383a1e75f..da6993c25f0c3 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.clone.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.clone.json
@@ -1,8 +1,8 @@
 {
   "indices.clone": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-clone-index.html",
-      "description": "Clones an index"
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-indices-clone",
+      "description": "Clone an index"
     },
     "stability": "stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.close.json b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.close.json
index 0738216d1ee86..04f6e56d591ef 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.close.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.close.json
@@ -1,8 +1,8 @@
 {
   "indices.close":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-open-close.html",
-      "description":"Closes an index."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-indices-close",
+      "description":"Close an index"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.create.json b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.create.json
index 3a3f279775fa8..dd70e98ecd5ce 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.create.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.create.json
@@ -1,8 +1,8 @@
 {
   "indices.create":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-create-index.html",
-      "description":"Creates an index with optional settings and mappings."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-indices-create",
+      "description":"Create an index"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.create_data_stream.json b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.create_data_stream.json
index 3df9232c3a5c2..e1a9454ba143b 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.create_data_stream.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.create_data_stream.json
@@ -1,8 +1,8 @@
 {
   "indices.create_data_stream":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/data-streams.html",
-      "description":"Creates a data stream"
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-indices-create-data-stream",
+      "description":"Create a data stream"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.create_from.json b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.create_from.json
index 435430b7a2673..24c30d76d3b5d 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.create_from.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.create_from.json
@@ -1,8 +1,8 @@
 {
   "indices.create_from":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-create-index-from-source.html",
-      "description":"This API creates a destination from a source index. It copies the mappings and settings from the source index while allowing request settings and mappings to override the source values."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-indices-create-from",
+      "description":"Create an index from a source index"
     },
     "stability":"experimental",
     "visibility":"private",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.data_streams_stats.json b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.data_streams_stats.json
index 90a3574d5b4bc..501e915713181 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.data_streams_stats.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.data_streams_stats.json
@@ -1,8 +1,8 @@
 {
   "indices.data_streams_stats":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/data-streams.html",
-      "description":"Provides statistics on operations happening in a data stream."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-indices-data-streams-stats-1",
+      "description":"Get data stream stats"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.delete.json b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.delete.json
index d066c745b94ac..8ccd387ba8a4c 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.delete.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.delete.json
@@ -1,8 +1,8 @@
 {
   "indices.delete":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-delete-index.html",
-      "description":"Deletes an index."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-indices-delete",
+      "description":"Delete indices"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.delete_alias.json b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.delete_alias.json
index 7ec072a4582d9..10d2b3f08e8c2 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.delete_alias.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.delete_alias.json
@@ -1,8 +1,8 @@
 {
   "indices.delete_alias":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-aliases.html",
-      "description":"Deletes an alias."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-indices-delete-alias",
+      "description":"Delete an alias"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.delete_data_lifecycle.json b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.delete_data_lifecycle.json
index 92b3ce61b4603..e0871e6cf3563 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.delete_data_lifecycle.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.delete_data_lifecycle.json
@@ -1,8 +1,8 @@
 {
   "indices.delete_data_lifecycle":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/data-streams-delete-lifecycle.html",
-      "description":"Deletes the data stream lifecycle of the selected data streams."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-indices-delete-data-lifecycle",
+      "description":"Delete data stream lifecycles"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.delete_data_stream.json b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.delete_data_stream.json
index dc9da50e0417b..a46fbc0b7f98f 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.delete_data_stream.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.delete_data_stream.json
@@ -1,8 +1,8 @@
 {
   "indices.delete_data_stream":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/data-streams.html",
-      "description":"Deletes a data stream."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-indices-delete-data-stream",
+      "description":"Delete data streams"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.delete_data_stream_options.json b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.delete_data_stream_options.json
index 916ee0c5b59df..82393f819ed04 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.delete_data_stream_options.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.delete_data_stream_options.json
@@ -1,8 +1,8 @@
 {
   "indices.delete_data_stream_options":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/index.html",
-      "description":"Deletes the data stream options of the selected data streams."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-indices-delete-data-stream-options",
+      "description":"Delete data stream options"
     },
     "stability": "stable",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.delete_index_template.json b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.delete_index_template.json
index e920ec09351ec..29804904efc4c 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.delete_index_template.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.delete_index_template.json
@@ -1,8 +1,8 @@
 {
   "indices.delete_index_template":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-delete-template.html",
-      "description":"Deletes an index template."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-indices-delete-index-template",
+      "description":"Delete an index template"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.delete_template.json b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.delete_template.json
index b0471b9dafa7e..e35963382361b 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.delete_template.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.delete_template.json
@@ -1,8 +1,8 @@
 {
   "indices.delete_template":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-delete-template-v1.html",
-      "description":"Deletes an index template."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-indices-delete-template",
+      "description":"Delete a legacy index template"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.disk_usage.json b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.disk_usage.json
index 822d6ce9f84df..a2f7a3a216541 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.disk_usage.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.disk_usage.json
@@ -1,8 +1,8 @@
 {
   "indices.disk_usage": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-disk-usage.html",
-      "description": "Analyzes the disk usage of each field of an index or data stream"
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-indices-disk-usage",
+      "description": "Analyze the index disk usage"
     },
     "stability": "experimental",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.downsample.json b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.downsample.json
index c67d566790ea6..bb7dc0bba5f7f 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.downsample.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.downsample.json
@@ -1,7 +1,7 @@
 {
   "indices.downsample":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/xpack-rollup.html",
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-indices-downsample",
       "description":"Downsample an index"
     },
     "stability":"experimental",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.exists.json b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.exists.json
index b8e18348f489a..12bd81748b27b 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.exists.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.exists.json
@@ -1,8 +1,8 @@
 {
   "indices.exists":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-exists.html",
-      "description":"Returns information about whether a particular index exists."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-indices-exists",
+      "description":"Check indices"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.exists_alias.json b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.exists_alias.json
index 7c855335efd00..ae3667770b60b 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.exists_alias.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.exists_alias.json
@@ -1,8 +1,8 @@
 {
   "indices.exists_alias":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-aliases.html",
-      "description":"Returns information about whether a particular alias exists."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-indices-exists-alias",
+      "description":"Check aliases"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.exists_index_template.json b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.exists_index_template.json
index 0163b0bbbd8ce..5c57e705d6194 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.exists_index_template.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.exists_index_template.json
@@ -1,8 +1,8 @@
 {
   "indices.exists_index_template":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/index-templates.html",
-      "description":"Returns information about whether a particular index template exists."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-indices-exists-index-template",
+      "description":"Check index templates"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.exists_template.json b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.exists_template.json
index a7f272af5b307..169c216c8db4e 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.exists_template.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.exists_template.json
@@ -1,8 +1,8 @@
 {
   "indices.exists_template":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-template-exists-v1.html",
-      "description":"Returns information about whether a particular index template exists."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-indices-exists-template",
+      "description":"Check existence of index templates"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.explain_data_lifecycle.json b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.explain_data_lifecycle.json
index 14e07ee28a80d..595c7f917dc56 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.explain_data_lifecycle.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.explain_data_lifecycle.json
@@ -1,8 +1,8 @@
 {
   "indices.explain_data_lifecycle": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/current/data-streams-explain-lifecycle.html",
-      "description": "Retrieves information about the index's current data stream lifecycle, such as any potential encountered error, time since creation etc."
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-indices-explain-data-lifecycle",
+      "description": "Get the status for a data stream lifecycle"
     },
     "stability": "stable",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.field_usage_stats.json b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.field_usage_stats.json
index efdbdfa4d422a..701f13e4555a0 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.field_usage_stats.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.field_usage_stats.json
@@ -1,8 +1,8 @@
 {
   "indices.field_usage_stats": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/field-usage-stats.html",
-      "description": "Returns the field usage stats for each field of an index"
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-indices-field-usage-stats",
+      "description": "Get field usage stats"
     },
     "stability": "experimental",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.flush.json b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.flush.json
index f48f9ad1b1803..4a218bb7d3b11 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.flush.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.flush.json
@@ -1,8 +1,8 @@
 {
   "indices.flush":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-flush.html",
-      "description":"Performs the flush operation on one or more indices."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-indices-flush",
+      "description":"Flush data streams or indices"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.forcemerge.json b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.forcemerge.json
index d6ef92551701e..1b0b90581cd6f 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.forcemerge.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.forcemerge.json
@@ -1,8 +1,8 @@
 {
   "indices.forcemerge":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-forcemerge.html",
-      "description":"Performs the force merge operation on one or more indices."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-indices-forcemerge",
+      "description":"Force a merge"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.get.json b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.get.json
index e0cd96e346a7b..83e6c13ed4b95 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.get.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.get.json
@@ -1,8 +1,8 @@
 {
   "indices.get":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-get-index.html",
-      "description":"Returns information about one or more indices."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-indices-get",
+      "description":"Get index information"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.get_alias.json b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.get_alias.json
index a360582a44a04..e0a59e6782b09 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.get_alias.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.get_alias.json
@@ -1,8 +1,8 @@
 {
   "indices.get_alias":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-aliases.html",
-      "description":"Returns an alias."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-indices-get-alias",
+      "description":"Get aliases"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.get_data_lifecycle.json b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.get_data_lifecycle.json
index a8d2e7185db83..5c46ab33c6411 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.get_data_lifecycle.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.get_data_lifecycle.json
@@ -1,8 +1,8 @@
 {
   "indices.get_data_lifecycle":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/data-streams-get-lifecycle.html",
-      "description":"Returns the data stream lifecycle of the selected data streams."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-indices-get-data-lifecycle",
+      "description":"Get data stream lifecycles"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.get_data_lifecycle_stats.json b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.get_data_lifecycle_stats.json
index 8c9e947903402..d8d83f2b7d51b 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.get_data_lifecycle_stats.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.get_data_lifecycle_stats.json
@@ -1,8 +1,8 @@
 {
   "indices.get_data_lifecycle_stats": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/data-streams-get-lifecycle-stats.html",
-      "description": "Get data stream lifecycle statistics."
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-indices-get-data-lifecycle-stats",
+      "description": "Get data stream lifecycle stats"
     },
     "stability": "stable",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.get_data_stream.json b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.get_data_stream.json
index 2a95e2552bb33..7c59270862b04 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.get_data_stream.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.get_data_stream.json
@@ -1,8 +1,8 @@
 {
   "indices.get_data_stream":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/data-streams.html",
-      "description":"Returns data streams."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-indices-get-data-stream",
+      "description":"Get data streams"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.get_data_stream_mappings.json b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.get_data_stream_mappings.json
index 87c54d2658180..85b6cb5853c77 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.get_data_stream_mappings.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.get_data_stream_mappings.json
@@ -1,8 +1,8 @@
 {
   "indices.get_data_stream_mappings":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/data-streams.html",
-      "description":"Gets a data stream's mappings"
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-indices-get-data-stream-mappings",
+      "description":"Get data stream mappings"
     },
     "stability":"stable",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.get_data_stream_options.json b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.get_data_stream_options.json
index c882dc7f7b0a9..78ce97daa0d9c 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.get_data_stream_options.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.get_data_stream_options.json
@@ -1,8 +1,8 @@
 {
   "indices.get_data_stream_options":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/index.html",
-      "description":"Returns the data stream options of the selected data streams."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-indices-get-data-stream-options",
+      "description":"Get data stream options"
     },
     "stability": "stable",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.get_data_stream_settings.json b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.get_data_stream_settings.json
index 15271890a3b79..625f53a5fed51 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.get_data_stream_settings.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.get_data_stream_settings.json
@@ -1,8 +1,8 @@
 {
   "indices.get_data_stream_settings":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/data-streams.html",
-      "description":"Gets a data stream's settings"
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-indices-get-data-stream-settings",
+      "description":"Get data stream settings"
     },
     "stability":"stable",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.get_field_mapping.json b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.get_field_mapping.json
index 19b3ac54769cc..2329043d93890 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.get_field_mapping.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.get_field_mapping.json
@@ -1,8 +1,8 @@
 {
   "indices.get_field_mapping":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-get-field-mapping.html",
-      "description":"Returns mapping for one or more fields."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-indices-get-mapping",
+      "description":"Get mapping definitions"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.get_index_template.json b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.get_index_template.json
index f0351ce8cfe94..fdf03960defee 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.get_index_template.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.get_index_template.json
@@ -1,8 +1,8 @@
 {
   "indices.get_index_template":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-get-template.html",
-      "description":"Returns an index template."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-indices-get-index-template",
+      "description":"Get index templates"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.get_mapping.json b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.get_mapping.json
index aef4713102553..afc259d84e095 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.get_mapping.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.get_mapping.json
@@ -1,8 +1,8 @@
 {
   "indices.get_mapping":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-get-mapping.html",
-      "description":"Returns mappings for one or more indices."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-indices-get-mapping",
+      "description":"Get mapping definitions"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.get_migrate_reindex_status.json b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.get_migrate_reindex_status.json
index d166f3e99197b..2bc1932513a30 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.get_migrate_reindex_status.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.get_migrate_reindex_status.json
@@ -1,8 +1,8 @@
 {
   "indices.get_migrate_reindex_status":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/data-stream-reindex-status-api.html",
-      "description":"This API returns the status of a migration reindex attempt for a data stream or index"
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/group/endpoint-migration",
+      "description":"Get the migration reindexing status"
     },
     "stability":"experimental",
     "visibility":"private",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.get_settings.json b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.get_settings.json
index 61e785abdfb84..05d5a201b1efd 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.get_settings.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.get_settings.json
@@ -1,8 +1,8 @@
 {
   "indices.get_settings":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-get-settings.html",
-      "description":"Returns settings for one or more indices."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-indices-get-settings",
+      "description":"Get index settings"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.get_template.json b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.get_template.json
index 74fdd1ef5c8a1..7d691a624069d 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.get_template.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.get_template.json
@@ -1,8 +1,8 @@
 {
   "indices.get_template":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-get-template-v1.html",
-      "description":"Returns an index template."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-indices-get-template",
+      "description":"Get legacy index templates"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.migrate_reindex.json b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.migrate_reindex.json
index 28cef97c7360a..ad9f8427ec3ec 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.migrate_reindex.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.migrate_reindex.json
@@ -1,8 +1,8 @@
 {
   "indices.migrate_reindex":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/data-stream-reindex-api.html",
-      "description":"This API reindexes all legacy backing indices for a data stream. It does this in a persistent task. The persistent task id is returned immediately, and the reindexing work is completed in that task"
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-indices-migrate-reindex",
+      "description":"Reindex legacy backing indices"
     },
     "stability":"experimental",
     "visibility":"private",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.migrate_to_data_stream.json b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.migrate_to_data_stream.json
index 879f086cc0675..7d8836b8c7753 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.migrate_to_data_stream.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.migrate_to_data_stream.json
@@ -1,8 +1,8 @@
 {
   "indices.migrate_to_data_stream":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/data-streams.html",
-      "description":"Migrates an alias to a data stream"
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-indices-migrate-to-data-stream",
+      "description":"Convert an index alias to a data stream"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.modify_data_stream.json b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.modify_data_stream.json
index ea095289b72bc..8ccddf926f725 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.modify_data_stream.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.modify_data_stream.json
@@ -1,8 +1,8 @@
 {
   "indices.modify_data_stream":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/data-streams.html",
-      "description":"Modifies a data stream"
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-indices-modify-data-stream",
+      "description":"Update data streams"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.open.json b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.open.json
index e6c1646d2b01b..8f9db2e98629b 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.open.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.open.json
@@ -1,8 +1,8 @@
 {
   "indices.open":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-open-close.html",
-      "description":"Opens an index."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-indices-open",
+      "description":"Open a closed index"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.promote_data_stream.json b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.promote_data_stream.json
index 8c4c747fa8c16..67097fa433673 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.promote_data_stream.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.promote_data_stream.json
@@ -1,8 +1,8 @@
 {
   "indices.promote_data_stream":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/data-streams.html",
-      "description":"Promotes a data stream from a replicated data stream managed by CCR to a regular data stream"
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-indices-promote-data-stream",
+      "description":"Promote a data stream"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.put_alias.json b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.put_alias.json
index 953f119a30a3f..2260449ba7164 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.put_alias.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.put_alias.json
@@ -1,8 +1,8 @@
 {
   "indices.put_alias":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-aliases.html",
-      "description":"Creates or updates an alias."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-indices-put-alias",
+      "description":"Create or update an alias"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.put_data_lifecycle.json b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.put_data_lifecycle.json
index 0a2f7b33498cf..4b08e53f90278 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.put_data_lifecycle.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.put_data_lifecycle.json
@@ -1,8 +1,8 @@
 {
   "indices.put_data_lifecycle":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/data-streams-put-lifecycle.html",
-      "description":"Updates the data stream lifecycle of the selected data streams."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-indices-put-data-lifecycle",
+      "description":"Update data stream lifecycles"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.put_data_stream_mappings.json b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.put_data_stream_mappings.json
index 2240018dda3f6..28c46d3174d58 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.put_data_stream_mappings.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.put_data_stream_mappings.json
@@ -1,8 +1,8 @@
 {
   "indices.put_data_stream_mappings":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/data-streams.html",
-      "description":"Updates a data stream's mappings"
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-indices-put-data-stream-mappings",
+      "description":"Update data stream mappings"
     },
     "stability":"stable",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.put_data_stream_options.json b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.put_data_stream_options.json
index 45c51cdec6282..7fb4a354bc0cc 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.put_data_stream_options.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.put_data_stream_options.json
@@ -1,8 +1,8 @@
 {
   "indices.put_data_stream_options":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/index.html",
-      "description":"Updates the data stream options of the selected data streams."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-indices-put-data-stream-options",
+      "description":"Update data stream options"
     },
     "stability": "stable",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.put_data_stream_settings.json b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.put_data_stream_settings.json
index b358c2d3c864f..290c897fc3a6b 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.put_data_stream_settings.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.put_data_stream_settings.json
@@ -1,8 +1,8 @@
 {
   "indices.put_data_stream_settings":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/data-streams.html",
-      "description":"Updates a data stream's settings"
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-indices-put-data-stream-settings",
+      "description":"Update data stream settings"
     },
     "stability":"stable",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.put_index_template.json b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.put_index_template.json
index 00f6ac88eab45..bdac7e8d51cec 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.put_index_template.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.put_index_template.json
@@ -1,8 +1,8 @@
 {
   "indices.put_index_template":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-put-template.html",
-      "description":"Creates or updates an index template."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-indices-put-index-template",
+      "description":"Create or update an index template"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.put_mapping.json b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.put_mapping.json
index 266a926f8f49c..64743085050bf 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.put_mapping.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.put_mapping.json
@@ -1,8 +1,8 @@
 {
   "indices.put_mapping":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-put-mapping.html",
-      "description":"Updates the index mappings."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-indices-put-mapping",
+      "description":"Update field mappings"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.put_settings.json b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.put_settings.json
index 08134e211a312..f2760363c71b8 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.put_settings.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.put_settings.json
@@ -1,8 +1,8 @@
 {
   "indices.put_settings":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-update-settings.html",
-      "description":"Updates the index settings."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-indices-put-settings",
+      "description":"Update index settings"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.put_template.json b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.put_template.json
index 492a47c19a19b..8036417531c18 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.put_template.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.put_template.json
@@ -1,8 +1,8 @@
 {
   "indices.put_template":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-templates-v1.html",
-      "description":"Creates or updates an index template."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-indices-put-template",
+      "description":"Create or update a legacy index template"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.recovery.json b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.recovery.json
index fe66541fa9b0b..2aeeaba0ef924 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.recovery.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.recovery.json
@@ -1,8 +1,8 @@
 {
   "indices.recovery":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-recovery.html",
-      "description":"Returns information about ongoing index shard recoveries."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-indices-recovery",
+      "description":"Get index recovery information"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.refresh.json b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.refresh.json
index 0932d77e93401..424e40c813e54 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.refresh.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.refresh.json
@@ -1,8 +1,8 @@
 {
   "indices.refresh":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-refresh.html",
-      "description":"Performs the refresh operation in one or more indices."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-indices-refresh",
+      "description":"Refresh an index"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.reload_search_analyzers.json b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.reload_search_analyzers.json
index c158e524683fe..d8872c9c8292e 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.reload_search_analyzers.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.reload_search_analyzers.json
@@ -1,8 +1,8 @@
 {
   "indices.reload_search_analyzers":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-reload-analyzers.html",
-      "description":"Reloads an index's search analyzers and their resources."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-indices-reload-search-analyzers",
+      "description":"Reload search analyzers"
     },
     "stability" : "stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.remove_block.json b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.remove_block.json
index da5f9237422e4..1eeda64556da4 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.remove_block.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.remove_block.json
@@ -1,8 +1,8 @@
 {
   "indices.remove_block": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/index-modules-blocks.html",
-      "description": "Removes a block from an index."
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-indices-remove-block",
+      "description": "Remove an index block"
     },
     "stability": "stable",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.resolve_cluster.json b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.resolve_cluster.json
index c41233664de0e..c848bba18cb42 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.resolve_cluster.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.resolve_cluster.json
@@ -1,8 +1,8 @@
 {
   "indices.resolve_cluster": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-resolve-cluster-api.html",
-      "description": "Resolves the specified index expressions to return information about each cluster. If no index expression is provided, this endpoint will return information about all the remote clusters that are configured on the local cluster."
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-indices-resolve-cluster",
+      "description": "Resolve the cluster"
     },
     "stability": "stable",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.resolve_index.json b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.resolve_index.json
index e27e3a0450bff..770aa8c5ec595 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.resolve_index.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.resolve_index.json
@@ -1,8 +1,8 @@
 {
   "indices.resolve_index":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-resolve-index-api.html",
-      "description":"Returns information about any matching indices, aliases, and data streams"
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-indices-resolve-index",
+      "description":"Resolve indices"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.rollover.json b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.rollover.json
index 47a1bee665506..bcb405a1dc10b 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.rollover.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.rollover.json
@@ -1,8 +1,8 @@
 {
   "indices.rollover":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-rollover-index.html",
-      "description":"Updates an alias to point to a new index when the existing index\nis considered to be too large or too old."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-indices-rollover",
+      "description":"Roll over to a new index"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.segments.json b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.segments.json
index 5e75caaae4bc6..6b8695a4e6a9d 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.segments.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.segments.json
@@ -1,8 +1,8 @@
 {
   "indices.segments":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-segments.html",
-      "description":"Provides low-level information about segments in a Lucene index."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-indices-segments",
+      "description":"Get index segments"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.shard_stores.json b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.shard_stores.json
index 739107dc68681..0d8708aebfa7e 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.shard_stores.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.shard_stores.json
@@ -1,8 +1,8 @@
 {
   "indices.shard_stores":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-shards-stores.html",
-      "description":"Provides store information for shard copies of indices."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-indices-shard-stores",
+      "description":"Get index shard stores"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.shrink.json b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.shrink.json
index cc9bc7c1e2de3..d28ca655afbdc 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.shrink.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.shrink.json
@@ -1,8 +1,8 @@
 {
   "indices.shrink":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-shrink-index.html",
-      "description":"Allow to shrink an existing index into a new index with fewer primary shards."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-indices-shrink",
+      "description":"Shrink an index"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.simulate_index_template.json b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.simulate_index_template.json
index e12b5116ffcdf..57c23ef9fbb1c 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.simulate_index_template.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.simulate_index_template.json
@@ -1,8 +1,8 @@
 {
   "indices.simulate_index_template":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-simulate-index.html",
-      "description": "Simulate matching the given index name against the index templates in the system"
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-indices-simulate-index-template",
+      "description": "Simulate an index"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.simulate_template.json b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.simulate_template.json
index 7958454564c83..3b805ec0ba0d0 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.simulate_template.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.simulate_template.json
@@ -1,8 +1,8 @@
 {
   "indices.simulate_template":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-simulate-template.html",
-      "description": "Simulate resolving the given template name or body"
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-indices-simulate-template",
+      "description": "Simulate an index template"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.split.json b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.split.json
index ed623fd130cc6..8b2169e0014c3 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.split.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.split.json
@@ -1,8 +1,8 @@
 {
   "indices.split":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-split-index.html",
-      "description":"Allows you to split an existing index into a new index with more primary shards."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-indices-split",
+      "description":"Split an index"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.stats.json b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.stats.json
index faafdfcdb588a..53fd94c15554a 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.stats.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.stats.json
@@ -1,8 +1,8 @@
 {
   "indices.stats":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-stats.html",
-      "description":"Provides statistics on operations happening in an index."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-indices-stats",
+      "description":"Get index statistics"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.update_aliases.json b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.update_aliases.json
index 76b33ad11d961..d6a5b62fafc2c 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.update_aliases.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.update_aliases.json
@@ -1,8 +1,8 @@
 {
   "indices.update_aliases":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-aliases.html",
-      "description":"Updates index aliases."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-indices-update-aliases",
+      "description":"Create or update an alias"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.validate_query.json b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.validate_query.json
index 44fbfa18a2261..13cd9527a15fa 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.validate_query.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.validate_query.json
@@ -1,8 +1,8 @@
 {
   "indices.validate_query":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/search-validate.html",
-      "description":"Allows a user to validate a potentially expensive query without executing it."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-indices-validate-query",
+      "description":"Validate a query"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/inference.chat_completion_unified.json b/rest-api-spec/src/main/resources/rest-api-spec/api/inference.chat_completion_unified.json
index 98854625d0471..16f3afcccf2ed 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/inference.chat_completion_unified.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/inference.chat_completion_unified.json
@@ -1,7 +1,7 @@
 {
   "inference.chat_completion_unified": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/chat-completion-inference.html",
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-inference-unified-inference",
       "description": "Perform chat completion inference"
     },
     "stability": "stable",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/inference.completion.json b/rest-api-spec/src/main/resources/rest-api-spec/api/inference.completion.json
index 6c753e59e3434..9ac696d279de7 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/inference.completion.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/inference.completion.json
@@ -1,8 +1,8 @@
 {
   "inference.completion": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/post-inference-api.html",
-      "description": "Perform completion inference"
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-inference-inference",
+      "description": "Perform completion inference on the service"
     },
     "stability": "stable",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/inference.delete.json b/rest-api-spec/src/main/resources/rest-api-spec/api/inference.delete.json
index cb4eee007a246..1ffe8d1e3e664 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/inference.delete.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/inference.delete.json
@@ -1,7 +1,7 @@
 {
   "inference.delete": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/delete-inference-api.html",
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-inference-delete",
       "description": "Delete an inference endpoint"
     },
     "stability": "stable",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/inference.get.json b/rest-api-spec/src/main/resources/rest-api-spec/api/inference.get.json
index 8887d9d0a1ebe..8612869a2b7f0 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/inference.get.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/inference.get.json
@@ -1,7 +1,7 @@
 {
   "inference.get": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/get-inference-api.html",
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-inference-get",
       "description": "Get an inference endpoint"
     },
     "stability": "stable",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/inference.inference.json b/rest-api-spec/src/main/resources/rest-api-spec/api/inference.inference.json
index bf1282dfaaef7..1ada118f0edd8 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/inference.inference.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/inference.inference.json
@@ -1,8 +1,8 @@
 {
   "inference.inference": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/post-inference-api.html",
-      "description": "Perform inference"
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-inference-inference",
+      "description": "Perform inference on the service"
     },
     "stability": "stable",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/inference.put.json b/rest-api-spec/src/main/resources/rest-api-spec/api/inference.put.json
index 4879007724450..7b67b74bed9fc 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/inference.put.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/inference.put.json
@@ -1,8 +1,8 @@
 {
   "inference.put": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/put-inference-api.html",
-      "description": "Configure an inference endpoint for use in the Inference API"
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-inference-put",
+      "description": "Create an inference endpoint"
     },
     "stability": "stable",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/inference.put_ai21.json b/rest-api-spec/src/main/resources/rest-api-spec/api/inference.put_ai21.json
index 6d59087402068..7e7f7579755c7 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/inference.put_ai21.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/inference.put_ai21.json
@@ -1,8 +1,8 @@
 {
   "inference.put_ai21": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/current/infer-service-ai21.html",
-      "description": "Configure a AI21 inference endpoint"
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-inference-put-ai21",
+      "description": "Create a AI21 inference endpoint"
     },
     "stability": "stable",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/inference.put_alibabacloud.json b/rest-api-spec/src/main/resources/rest-api-spec/api/inference.put_alibabacloud.json
index b39d5abe97ca2..2640f47b3c94d 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/inference.put_alibabacloud.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/inference.put_alibabacloud.json
@@ -1,8 +1,8 @@
 {
   "inference.put_alibabacloud": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/current/infer-service-alibabacloud-ai-search.html",
-      "description": "Configure an AlibabaCloud AI Search inference endpoint"
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-inference-put-alibabacloud",
+      "description": "Create an AlibabaCloud AI Search inference endpoint"
     },
     "stability": "stable",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/inference.put_amazonbedrock.json b/rest-api-spec/src/main/resources/rest-api-spec/api/inference.put_amazonbedrock.json
index 266a1800a360e..c313ccba1e1e4 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/inference.put_amazonbedrock.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/inference.put_amazonbedrock.json
@@ -1,8 +1,8 @@
 {
   "inference.put_amazonbedrock": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/current/infer-service-amazon-bedrock.html",
-      "description": "Configure an Amazon Bedrock inference endpoint"
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-inference-put-amazonbedrock",
+      "description": "Create an Amazon Bedrock inference endpoint"
     },
     "stability": "stable",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/inference.put_amazonsagemaker.json b/rest-api-spec/src/main/resources/rest-api-spec/api/inference.put_amazonsagemaker.json
index e2cdb3ad25cf8..415c230f3eb9d 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/inference.put_amazonsagemaker.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/inference.put_amazonsagemaker.json
@@ -1,8 +1,8 @@
 {
   "inference.put_amazonsagemaker": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/current/infer-service-amazon-sagemaker.html",
-      "description": "Configure a Amazon SageMaker inference endpoint"
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-inference-put-amazonsagemaker",
+      "description": "Create an Amazon SageMaker inference endpoint"
     },
     "stability": "stable",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/inference.put_anthropic.json b/rest-api-spec/src/main/resources/rest-api-spec/api/inference.put_anthropic.json
index dce56157c7d0e..6f022c9489c33 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/inference.put_anthropic.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/inference.put_anthropic.json
@@ -1,8 +1,8 @@
 {
   "inference.put_anthropic": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/current/infer-service-anthropic.html",
-      "description": "Configure an Anthropic inference endpoint"
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-inference-put-anthropic",
+      "description": "Create an Anthropic inference endpoint"
     },
     "stability": "stable",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/inference.put_azureaistudio.json b/rest-api-spec/src/main/resources/rest-api-spec/api/inference.put_azureaistudio.json
index 00de83eca7ce2..e0b2ebb49638a 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/inference.put_azureaistudio.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/inference.put_azureaistudio.json
@@ -1,8 +1,8 @@
 {
   "inference.put_azureaistudio": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/current/infer-service-azure-ai-studio.html",
-      "description": "Configure an Azure AI Studio inference endpoint"
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-inference-put-azureaistudio",
+      "description": "Create an Azure AI studio inference endpoint"
     },
     "stability": "stable",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/inference.put_azureopenai.json b/rest-api-spec/src/main/resources/rest-api-spec/api/inference.put_azureopenai.json
index 8739adb1f5fd1..c2d02e513ce42 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/inference.put_azureopenai.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/inference.put_azureopenai.json
@@ -1,8 +1,8 @@
 {
   "inference.put_azureopenai": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/current/infer-service-azure-openai.html",
-      "description": "Configure an Azure OpenAI inference endpoint"
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-inference-put-azureopenai",
+      "description": "Create an Azure OpenAI inference endpoint"
     },
     "stability": "stable",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/inference.put_cohere.json b/rest-api-spec/src/main/resources/rest-api-spec/api/inference.put_cohere.json
index a00518f2c5c9e..153bf2b787920 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/inference.put_cohere.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/inference.put_cohere.json
@@ -1,8 +1,8 @@
 {
   "inference.put_cohere": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/current/infer-service-cohere.html",
-      "description": "Configure a Cohere inference endpoint"
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-inference-put-cohere",
+      "description": "Create a Cohere inference endpoint"
     },
     "stability": "stable",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/inference.put_custom.json b/rest-api-spec/src/main/resources/rest-api-spec/api/inference.put_custom.json
index c12108683d380..d14089cf12217 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/inference.put_custom.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/inference.put_custom.json
@@ -2,7 +2,7 @@
   "inference.put_custom": {
     "documentation": {
       "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-inference-put-custom",
-      "description": "Configure a custom inference endpoint"
+      "description": "Create a custom inference endpoint"
     },
     "stability": "stable",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/inference.put_deepseek.json b/rest-api-spec/src/main/resources/rest-api-spec/api/inference.put_deepseek.json
index e30b6bb8a7e0b..96da2c931231e 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/inference.put_deepseek.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/inference.put_deepseek.json
@@ -1,8 +1,8 @@
 {
   "inference.put_deepseek": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/current/infer-service-deepseek.html",
-      "description": "Configure a DeepSeek inference endpoint"
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-inference-put-deepseek",
+      "description": "Create a DeepSeek inference endpoint"
     },
     "stability": "stable",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/inference.put_elasticsearch.json b/rest-api-spec/src/main/resources/rest-api-spec/api/inference.put_elasticsearch.json
index 0c326b79e93b8..adae4e68838b8 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/inference.put_elasticsearch.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/inference.put_elasticsearch.json
@@ -1,8 +1,8 @@
 {
   "inference.put_elasticsearch": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/current/infer-service-elasticsearch.html",
-      "description": "Configure an Elasticsearch inference endpoint"
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-inference-put-elasticsearch",
+      "description": "Create an Elasticsearch inference endpoint"
     },
     "stability": "stable",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/inference.put_elser.json b/rest-api-spec/src/main/resources/rest-api-spec/api/inference.put_elser.json
index e601e6c8c3bca..fdee3cf2732bd 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/inference.put_elser.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/inference.put_elser.json
@@ -5,8 +5,8 @@
       "description" : "The elser service is deprecated. Use the Elasticsearch inference integration instead, with model_id included in the service_settings."
     },
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/current/infer-service-elser.html",
-      "description": "Configure an ELSER inference endpoint"
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-inference-put-elser",
+      "description": "Create an ELSER inference endpoint"
     },
     "stability": "stable",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/inference.put_googleaistudio.json b/rest-api-spec/src/main/resources/rest-api-spec/api/inference.put_googleaistudio.json
index 4574626b61c00..dce5d98c169e7 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/inference.put_googleaistudio.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/inference.put_googleaistudio.json
@@ -1,8 +1,8 @@
 {
   "inference.put_googleaistudio": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/current/infer-service-google-ai-studio.html",
-      "description": "Configure a Google AI Studio inference endpoint"
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-inference-put-googleaistudio",
+      "description": "Create an Google AI Studio inference endpoint"
     },
     "stability": "stable",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/inference.put_googlevertexai.json b/rest-api-spec/src/main/resources/rest-api-spec/api/inference.put_googlevertexai.json
index 6068d4cbc91ba..6dd400f4d1730 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/inference.put_googlevertexai.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/inference.put_googlevertexai.json
@@ -1,8 +1,8 @@
 {
   "inference.put_googlevertexai": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/current/infer-service-google-vertex-ai.html",
-      "description": "Configure a Google Vertex AI inference endpoint"
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-inference-put-googlevertexai",
+      "description": "Create a Google Vertex AI inference endpoint"
     },
     "stability": "stable",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/inference.put_hugging_face.json b/rest-api-spec/src/main/resources/rest-api-spec/api/inference.put_hugging_face.json
index 76965d61ba839..c0fa9aa65ab01 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/inference.put_hugging_face.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/inference.put_hugging_face.json
@@ -1,8 +1,8 @@
 {
   "inference.put_hugging_face": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/current/infer-service-hugging-face.html",
-      "description": "Configure a HuggingFace inference endpoint"
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-inference-put-hugging-face",
+      "description": "Create a Hugging Face inference endpoint"
     },
     "stability": "stable",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/inference.put_jinaai.json b/rest-api-spec/src/main/resources/rest-api-spec/api/inference.put_jinaai.json
index 80af2a69c9f1c..5d4e8e271924c 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/inference.put_jinaai.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/inference.put_jinaai.json
@@ -1,8 +1,8 @@
 {
   "inference.put_jinaai": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/current/infer-service-jinaai.html",
-      "description": "Configure a JinaAI inference endpoint"
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-inference-put-jinaai",
+      "description": "Create an JinaAI inference endpoint"
     },
     "stability": "stable",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/inference.put_llama.json b/rest-api-spec/src/main/resources/rest-api-spec/api/inference.put_llama.json
index 5551f655cb616..b03aabed905d0 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/inference.put_llama.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/inference.put_llama.json
@@ -1,8 +1,8 @@
 {
   "inference.put_llama": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/current/infer-service-llama.html",
-      "description": "Configure a Llama inference endpoint"
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-inference-put-llama",
+      "description": "Create a Llama inference endpoint"
     },
     "stability": "stable",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/inference.put_mistral.json b/rest-api-spec/src/main/resources/rest-api-spec/api/inference.put_mistral.json
index 97633b233ce83..2738bf4a90e05 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/inference.put_mistral.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/inference.put_mistral.json
@@ -1,8 +1,8 @@
 {
   "inference.put_mistral": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/current/infer-service-mistral.html",
-      "description": "Configure a Mistral inference endpoint"
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-inference-put-mistral",
+      "description": "Create a Mistral inference endpoint"
     },
     "stability": "stable",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/inference.put_openai.json b/rest-api-spec/src/main/resources/rest-api-spec/api/inference.put_openai.json
index 5405206c8cacc..85f14dd206c1a 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/inference.put_openai.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/inference.put_openai.json
@@ -1,8 +1,8 @@
 {
   "inference.put_openai": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/current/infer-service-openai.html",
-      "description": "Configure an OpenAI inference endpoint"
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-inference-put-openai",
+      "description": "Create an OpenAI inference endpoint"
     },
     "stability": "stable",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/inference.put_voyageai.json b/rest-api-spec/src/main/resources/rest-api-spec/api/inference.put_voyageai.json
index 79a1016560f1a..00af79bed8742 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/inference.put_voyageai.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/inference.put_voyageai.json
@@ -1,8 +1,8 @@
 {
     "inference.put_voyageai": {
       "documentation": {
-        "url": "https://www.elastic.co/guide/en/elasticsearch/reference/current/inference-apis.html",
-        "description": "Configure a VoyageAI inference endpoint"
+        "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-inference-put-voyageai",
+        "description": "Create a VoyageAI inference endpoint"
       },
       "stability": "stable",
       "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/inference.put_watsonx.json b/rest-api-spec/src/main/resources/rest-api-spec/api/inference.put_watsonx.json
index db5a42d504b7a..80f9a01ae8571 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/inference.put_watsonx.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/inference.put_watsonx.json
@@ -1,8 +1,8 @@
 {
   "inference.put_watsonx": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/current/infer-service-watsonx-ai.html",
-      "description": "Configure a Watsonx inference endpoint"
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-inference-put-watsonx",
+      "description": "Create a Watsonx inference endpoint"
     },
     "stability": "stable",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/inference.rerank.json b/rest-api-spec/src/main/resources/rest-api-spec/api/inference.rerank.json
index c08a51a8b9b98..797f315970ee4 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/inference.rerank.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/inference.rerank.json
@@ -1,8 +1,8 @@
 {
   "inference.rerank": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/post-inference-api.html",
-      "description": "Perform reranking inference"
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-inference-inference",
+      "description": "Perform reranking inference on the service"
     },
     "stability": "stable",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/inference.sparse_embedding.json b/rest-api-spec/src/main/resources/rest-api-spec/api/inference.sparse_embedding.json
index 90ebb6e6dc4c2..61bfbde36d579 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/inference.sparse_embedding.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/inference.sparse_embedding.json
@@ -1,8 +1,8 @@
 {
   "inference.sparse_embedding": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/post-inference-api.html",
-      "description": "Perform sparse embedding inference"
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-inference-inference",
+      "description": "Perform sparse embedding inference on the service"
     },
     "stability": "stable",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/inference.stream_completion.json b/rest-api-spec/src/main/resources/rest-api-spec/api/inference.stream_completion.json
index b4eddb1641233..6dfd2bc1c7d9c 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/inference.stream_completion.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/inference.stream_completion.json
@@ -1,8 +1,8 @@
 {
   "inference.stream_completion": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/post-stream-inference-api.html",
-      "description": "Perform streaming completion inference"
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-inference-stream-inference",
+      "description": "Perform streaming inference"
     },
     "stability": "stable",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/inference.text_embedding.json b/rest-api-spec/src/main/resources/rest-api-spec/api/inference.text_embedding.json
index 309a1d80b7416..aadf35f009f19 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/inference.text_embedding.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/inference.text_embedding.json
@@ -1,8 +1,8 @@
 {
   "inference.text_embedding": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/post-inference-api.html",
-      "description": "Perform text embedding inference"
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-inference-inference",
+      "description": "Perform text embedding inference on the service"
     },
     "stability": "stable",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/inference.update.json b/rest-api-spec/src/main/resources/rest-api-spec/api/inference.update.json
index 133354e3ec5be..2772c50e893ff 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/inference.update.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/inference.update.json
@@ -1,8 +1,8 @@
 {
   "inference.update": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/update-inference-api.html",
-      "description": "Update inference"
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-inference-update",
+      "description": "Update an inference endpoint"
     },
     "stability": "stable",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/info.json b/rest-api-spec/src/main/resources/rest-api-spec/api/info.json
index 286a06f73671d..d74881f7efef0 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/info.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/info.json
@@ -1,8 +1,8 @@
 {
   "info":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/index.html",
-      "description":"Returns basic information about the cluster."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/group/endpoint-info",
+      "description":"Get cluster info"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ingest.delete_geoip_database.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ingest.delete_geoip_database.json
index f76d328836d90..f5bcf037cf515 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ingest.delete_geoip_database.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ingest.delete_geoip_database.json
@@ -1,8 +1,8 @@
 {
   "ingest.delete_geoip_database":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/delete-geoip-database-api.html",
-      "description":"Deletes a geoip database configuration"
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ingest-delete-geoip-database",
+      "description":"Delete GeoIP database configurations"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ingest.delete_ip_location_database.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ingest.delete_ip_location_database.json
index 341ff5081e270..c6993291ba033 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ingest.delete_ip_location_database.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ingest.delete_ip_location_database.json
@@ -1,8 +1,8 @@
 {
   "ingest.delete_ip_location_database":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/delete-ip-location-database-api.html",
-      "description":"Deletes an ip location database configuration"
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ingest-delete-ip-location-database",
+      "description":"Delete IP geolocation database configurations"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ingest.delete_pipeline.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ingest.delete_pipeline.json
index a1f6c0f72732a..82381a9d0299e 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ingest.delete_pipeline.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ingest.delete_pipeline.json
@@ -1,8 +1,8 @@
 {
   "ingest.delete_pipeline":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/delete-pipeline-api.html",
-      "description":"Deletes a pipeline."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ingest-delete-pipeline",
+      "description":"Delete pipelines"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ingest.geo_ip_stats.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ingest.geo_ip_stats.json
index 1013d7dc6fc5e..e577a5622bfd3 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ingest.geo_ip_stats.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ingest.geo_ip_stats.json
@@ -1,8 +1,8 @@
 {
   "ingest.geo_ip_stats": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/geoip-stats-api.html",
-      "description": "Returns statistical information about geoip databases"
+      "url": "https://www.elastic.co/docs/reference/enrich-processor/geoip-processor",
+      "description": "Get GeoIP statistics"
     },
     "stability": "stable",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ingest.get_geoip_database.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ingest.get_geoip_database.json
index 5c59994d4b22e..a73a59150a0ff 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ingest.get_geoip_database.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ingest.get_geoip_database.json
@@ -1,8 +1,8 @@
 {
   "ingest.get_geoip_database":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/get-geoip-database-api.html",
-      "description":"Returns geoip database configuration."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ingest-get-geoip-database",
+      "description":"Get GeoIP database configurations"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ingest.get_ip_location_database.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ingest.get_ip_location_database.json
index a2e42fe6c8e59..d05595a4efe8b 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ingest.get_ip_location_database.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ingest.get_ip_location_database.json
@@ -1,8 +1,8 @@
 {
   "ingest.get_ip_location_database":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/get-ip-location-database-api.html",
-      "description":"Returns the specified ip location database configuration"
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ingest-get-ip-location-database",
+      "description":"Get IP geolocation database configurations"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ingest.get_pipeline.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ingest.get_pipeline.json
index d6d408eafb85b..639821f8f2416 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ingest.get_pipeline.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ingest.get_pipeline.json
@@ -1,8 +1,8 @@
 {
   "ingest.get_pipeline":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/get-pipeline-api.html",
-      "description":"Returns a pipeline."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ingest-get-pipeline",
+      "description":"Get pipelines"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ingest.processor_grok.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ingest.processor_grok.json
index e150d95343729..cd74e44ad4d90 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ingest.processor_grok.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ingest.processor_grok.json
@@ -1,8 +1,8 @@
 {
   "ingest.processor_grok":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/grok-processor.html#grok-processor-rest-get",
-      "description":"Returns a list of the built-in patterns."
+      "url":"https://www.elastic.co/docs/reference/enrich-processor/grok-processor",
+      "description":"Run a grok processor"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ingest.put_geoip_database.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ingest.put_geoip_database.json
index 9c2677d1f7b2f..7bab03d14a4f1 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ingest.put_geoip_database.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ingest.put_geoip_database.json
@@ -1,8 +1,8 @@
 {
   "ingest.put_geoip_database":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/put-geoip-database-api.html",
-      "description":"Puts the configuration for a geoip database to be downloaded"
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ingest-put-geoip-database",
+      "description":"Create or update a GeoIP database configuration"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ingest.put_ip_location_database.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ingest.put_ip_location_database.json
index 782048b98160a..e98cae991b729 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ingest.put_ip_location_database.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ingest.put_ip_location_database.json
@@ -1,8 +1,8 @@
 {
   "ingest.put_ip_location_database":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/put-ip-location-database-api.html",
-      "description":"Puts the configuration for a ip location database to be downloaded"
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ingest-put-ip-location-database",
+      "description":"Create or update an IP geolocation database configuration"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ingest.put_pipeline.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ingest.put_pipeline.json
index f74fbfbcc4d06..07d5dadf92e29 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ingest.put_pipeline.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ingest.put_pipeline.json
@@ -1,8 +1,8 @@
 {
   "ingest.put_pipeline":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/put-pipeline-api.html",
-      "description":"Creates or updates a pipeline."
+      "url":"https://www.elastic.co/docs/manage-data/ingest/transform-enrich/ingest-pipelines",
+      "description":"Create or update a pipeline"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ingest.simulate.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ingest.simulate.json
index 04b704646d28f..dfa2aa98247f4 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ingest.simulate.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ingest.simulate.json
@@ -1,8 +1,8 @@
 {
   "ingest.simulate":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/simulate-pipeline-api.html",
-      "description":"Allows to simulate a pipeline with example documents."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ingest-simulate",
+      "description":"Simulate a pipeline"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/knn_search.json b/rest-api-spec/src/main/resources/rest-api-spec/api/knn_search.json
index 6faee49d480be..4fb20b686794c 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/knn_search.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/knn_search.json
@@ -1,8 +1,8 @@
 {
   "knn_search":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/search-search.html",
-      "description":"Performs a kNN search."
+      "url":null,
+      "description":"Performs a kNN search"
     },
     "stability":"experimental",
     "deprecated" : {
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/license.delete.json b/rest-api-spec/src/main/resources/rest-api-spec/api/license.delete.json
index 5b32a8b9fc6ff..c79d487fdc3f4 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/license.delete.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/license.delete.json
@@ -1,8 +1,8 @@
 {
   "license.delete":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/delete-license.html",
-      "description":"Deletes licensing information for the cluster"
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-license-delete",
+      "description":"Delete the license"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/license.get.json b/rest-api-spec/src/main/resources/rest-api-spec/api/license.get.json
index 16f2c086f3d3d..4d8a0cc423196 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/license.get.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/license.get.json
@@ -1,8 +1,8 @@
 {
   "license.get":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/get-license.html",
-      "description":"Retrieves licensing information for the cluster"
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-license-get",
+      "description":"Get license information"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/license.get_basic_status.json b/rest-api-spec/src/main/resources/rest-api-spec/api/license.get_basic_status.json
index a689daf4fe88a..a7fa72c5a694b 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/license.get_basic_status.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/license.get_basic_status.json
@@ -1,8 +1,8 @@
 {
   "license.get_basic_status":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/get-basic-status.html",
-      "description":"Retrieves information about the status of the basic license."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-license-get-basic-status",
+      "description":"Get the basic license status"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/license.get_trial_status.json b/rest-api-spec/src/main/resources/rest-api-spec/api/license.get_trial_status.json
index dffa2932a17f9..be3dcb6ef82a0 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/license.get_trial_status.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/license.get_trial_status.json
@@ -1,8 +1,8 @@
 {
   "license.get_trial_status":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/get-trial-status.html",
-      "description":"Retrieves information about the status of the trial license."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-license-get-trial-status",
+      "description":"Get the trial status"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/license.post.json b/rest-api-spec/src/main/resources/rest-api-spec/api/license.post.json
index 25c3093fb0da9..e044bf8012856 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/license.post.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/license.post.json
@@ -1,8 +1,8 @@
 {
   "license.post":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/update-license.html",
-      "description":"Updates the license for the cluster."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-license-post",
+      "description":"Update the license"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/license.post_start_basic.json b/rest-api-spec/src/main/resources/rest-api-spec/api/license.post_start_basic.json
index a0e6776bdbb32..4677cedc39db3 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/license.post_start_basic.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/license.post_start_basic.json
@@ -1,8 +1,8 @@
 {
   "license.post_start_basic":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/start-basic.html",
-      "description":"Starts an indefinite basic license."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-license-post-start-basic",
+      "description":"Start a basic license"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/license.post_start_trial.json b/rest-api-spec/src/main/resources/rest-api-spec/api/license.post_start_trial.json
index 9fb85807d611f..406e11e5e1eb1 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/license.post_start_trial.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/license.post_start_trial.json
@@ -1,8 +1,8 @@
 {
   "license.post_start_trial":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/start-trial.html",
-      "description":"starts a limited time trial license."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-license-post-start-trial",
+      "description":"Start a trial"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/logstash.delete_pipeline.json b/rest-api-spec/src/main/resources/rest-api-spec/api/logstash.delete_pipeline.json
index 8650f5f7cac3c..7434e4a168ff7 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/logstash.delete_pipeline.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/logstash.delete_pipeline.json
@@ -1,8 +1,8 @@
 {
   "logstash.delete_pipeline":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/logstash-api-delete-pipeline.html",
-      "description":"Deletes Logstash Pipelines used by Central Management"
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-logstash-delete-pipeline",
+      "description":"Delete a Logstash pipeline"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/logstash.get_pipeline.json b/rest-api-spec/src/main/resources/rest-api-spec/api/logstash.get_pipeline.json
index 201721268588a..7c41efdc27fa9 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/logstash.get_pipeline.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/logstash.get_pipeline.json
@@ -1,8 +1,8 @@
 {
   "logstash.get_pipeline":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/logstash-api-get-pipeline.html",
-      "description":"Retrieves Logstash Pipelines used by Central Management"
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-logstash-get-pipeline",
+      "description":"Get Logstash pipelines"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/logstash.put_pipeline.json b/rest-api-spec/src/main/resources/rest-api-spec/api/logstash.put_pipeline.json
index e8ec9b0d99178..936b0728a7aa7 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/logstash.put_pipeline.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/logstash.put_pipeline.json
@@ -1,8 +1,8 @@
 {
   "logstash.put_pipeline":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/logstash-api-put-pipeline.html",
-      "description":"Adds and updates Logstash Pipelines used for Central Management"
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-logstash-put-pipeline",
+      "description":"Create or update a Logstash pipeline"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/mget.json b/rest-api-spec/src/main/resources/rest-api-spec/api/mget.json
index 28542bd91a7cb..dafc12b278247 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/mget.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/mget.json
@@ -1,8 +1,8 @@
 {
   "mget":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/docs-multi-get.html",
-      "description":"Allows to get multiple documents in one request."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-mget",
+      "description":"Get multiple documents"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/migration.deprecations.json b/rest-api-spec/src/main/resources/rest-api-spec/api/migration.deprecations.json
index 6906cacc2bdaf..a98913ee69cdb 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/migration.deprecations.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/migration.deprecations.json
@@ -1,8 +1,8 @@
 {
   "migration.deprecations":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/migration-api-deprecation.html",
-      "description":"Retrieves information about different cluster, node, and index level settings that use deprecated features that will be removed or changed in the next major version."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-migration-deprecations",
+      "description":"Get deprecation information"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/migration.get_feature_upgrade_status.json b/rest-api-spec/src/main/resources/rest-api-spec/api/migration.get_feature_upgrade_status.json
index 27e142c6f3462..f4a7e2fa1fe65 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/migration.get_feature_upgrade_status.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/migration.get_feature_upgrade_status.json
@@ -1,8 +1,8 @@
 {
   "migration.get_feature_upgrade_status":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/migration-api-feature-upgrade.html",
-      "description":"Find out whether system features need to be upgraded or not"
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-migration-get-feature-upgrade-status",
+      "description":"Get feature migration information"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/migration.post_feature_upgrade.json b/rest-api-spec/src/main/resources/rest-api-spec/api/migration.post_feature_upgrade.json
index 6bafdfc69fde7..2bc5066b7a0ee 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/migration.post_feature_upgrade.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/migration.post_feature_upgrade.json
@@ -1,8 +1,8 @@
 {
   "migration.post_feature_upgrade":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/migration-api-feature-upgrade.html",
-      "description":"Begin upgrades for system features"
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-migration-get-feature-upgrade-status",
+      "description":"Start the feature migration"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.clear_trained_model_deployment_cache.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.clear_trained_model_deployment_cache.json
index 81f396a30b366..c68e43fb70df5 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.clear_trained_model_deployment_cache.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.clear_trained_model_deployment_cache.json
@@ -1,8 +1,8 @@
 {
   "ml.clear_trained_model_deployment_cache":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/clear-trained-model-deployment-cache.html",
-      "description":"Clear the cached results from a trained model deployment"
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ml-clear-trained-model-deployment-cache",
+      "description":"Clear trained model deployment cache"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.close_job.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.close_job.json
index 4361439579da8..4782dd01867f9 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.close_job.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.close_job.json
@@ -1,8 +1,8 @@
 {
   "ml.close_job":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-close-job.html",
-      "description":"Closes one or more anomaly detection jobs. A job can be opened and closed multiple times throughout its lifecycle."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ml-close-job",
+      "description":"Close anomaly detection jobs"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.delete_calendar.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.delete_calendar.json
index b224c870ed426..2d9937b622b02 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.delete_calendar.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.delete_calendar.json
@@ -1,8 +1,8 @@
 {
   "ml.delete_calendar":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-delete-calendar.html",
-      "description":"Deletes a calendar."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ml-delete-calendar",
+      "description":"Delete a calendar"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.delete_calendar_event.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.delete_calendar_event.json
index 92fe4ea3486b9..3a00fd1d1f840 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.delete_calendar_event.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.delete_calendar_event.json
@@ -1,8 +1,8 @@
 {
   "ml.delete_calendar_event":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-delete-calendar-event.html",
-      "description":"Deletes scheduled events from a calendar."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ml-delete-calendar-event",
+      "description":"Delete events from a calendar"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.delete_calendar_job.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.delete_calendar_job.json
index e122c41f20858..ef25e742e0c5d 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.delete_calendar_job.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.delete_calendar_job.json
@@ -1,8 +1,8 @@
 {
   "ml.delete_calendar_job":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-delete-calendar-job.html",
-      "description":"Deletes anomaly detection jobs from a calendar."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ml-delete-calendar-job",
+      "description":"Delete anomaly jobs from a calendar"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.delete_data_frame_analytics.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.delete_data_frame_analytics.json
index 353f9a09023bc..cd7c65cd5617c 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.delete_data_frame_analytics.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.delete_data_frame_analytics.json
@@ -1,8 +1,8 @@
 {
   "ml.delete_data_frame_analytics":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/delete-dfanalytics.html",
-      "description":"Deletes an existing data frame analytics job."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ml-delete-data-frame-analytics",
+      "description":"Delete a data frame analytics job"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.delete_datafeed.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.delete_datafeed.json
index 8cff1cbf83e58..f3aaf05a371dc 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.delete_datafeed.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.delete_datafeed.json
@@ -1,8 +1,8 @@
 {
   "ml.delete_datafeed":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-delete-datafeed.html",
-      "description":"Deletes an existing datafeed."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ml-delete-datafeed",
+      "description":"Delete a datafeed"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.delete_expired_data.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.delete_expired_data.json
index f2e8446934c1a..94045a1d9dd95 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.delete_expired_data.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.delete_expired_data.json
@@ -1,8 +1,8 @@
 {
   "ml.delete_expired_data":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-delete-expired-data.html",
-      "description":"Deletes expired and unused machine learning data."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ml-delete-expired-data",
+      "description":"Delete expired ML data"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.delete_filter.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.delete_filter.json
index e275a9dc9ede8..7565e9c0e98fc 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.delete_filter.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.delete_filter.json
@@ -1,8 +1,8 @@
 {
   "ml.delete_filter":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-delete-filter.html",
-      "description":"Deletes a filter."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ml-delete-filter",
+      "description":"Delete a filter"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.delete_forecast.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.delete_forecast.json
index 45235187b3550..b42f312d4cc1a 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.delete_forecast.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.delete_forecast.json
@@ -1,8 +1,8 @@
 {
   "ml.delete_forecast":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-delete-forecast.html",
-      "description":"Deletes forecasts from a machine learning job."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ml-delete-forecast",
+      "description":"Delete forecasts from a job"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.delete_job.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.delete_job.json
index 696c0082d11f8..34d2bcd7732bf 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.delete_job.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.delete_job.json
@@ -1,8 +1,8 @@
 {
   "ml.delete_job":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-delete-job.html",
-      "description":"Deletes an existing anomaly detection job."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ml-delete-job",
+      "description":"Delete an anomaly detection job"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.delete_model_snapshot.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.delete_model_snapshot.json
index 499cb3b19bbbd..da2958e59efec 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.delete_model_snapshot.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.delete_model_snapshot.json
@@ -1,8 +1,8 @@
 {
   "ml.delete_model_snapshot":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-delete-snapshot.html",
-      "description":"Deletes an existing model snapshot."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ml-delete-model-snapshot",
+      "description":"Delete a model snapshot"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.delete_trained_model.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.delete_trained_model.json
index 5d63138c320ed..1f13c27527815 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.delete_trained_model.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.delete_trained_model.json
@@ -1,8 +1,8 @@
 {
   "ml.delete_trained_model":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/delete-trained-models.html",
-      "description":"Deletes an existing trained inference model that is currently not referenced by an ingest pipeline."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ml-delete-trained-model",
+      "description":"Delete an unreferenced trained model"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.delete_trained_model_alias.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.delete_trained_model_alias.json
index 8c2142260fbed..14c31c6c087ae 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.delete_trained_model_alias.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.delete_trained_model_alias.json
@@ -1,8 +1,8 @@
 {
   "ml.delete_trained_model_alias":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/delete-trained-models-aliases.html",
-      "description":"Deletes a model alias that refers to the trained model"
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ml-delete-trained-model-alias",
+      "description":"Delete a trained model alias"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.estimate_model_memory.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.estimate_model_memory.json
index 75bff3b52d99a..e94a12f861e03 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.estimate_model_memory.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.estimate_model_memory.json
@@ -1,8 +1,8 @@
 {
   "ml.estimate_model_memory":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-apis.html",
-      "description":"Estimates the model memory"
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ml-estimate-model-memory",
+      "description":"Estimate job model memory usage"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.evaluate_data_frame.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.evaluate_data_frame.json
index d2c39612b866c..073fe8028091c 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.evaluate_data_frame.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.evaluate_data_frame.json
@@ -1,8 +1,8 @@
 {
   "ml.evaluate_data_frame":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/evaluate-dfanalytics.html",
-      "description":"Evaluates the data frame analytics for an annotated index."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ml-evaluate-data-frame",
+      "description":"Evaluate data frame analytics"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.explain_data_frame_analytics.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.explain_data_frame_analytics.json
index 3fd82e3603d08..f87653eea45eb 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.explain_data_frame_analytics.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.explain_data_frame_analytics.json
@@ -1,8 +1,8 @@
 {
   "ml.explain_data_frame_analytics":{
     "documentation":{
-      "url":"http://www.elastic.co/guide/en/elasticsearch/reference/current/explain-dfanalytics.html",
-      "description":"Explains a data frame analytics config."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ml-explain-data-frame-analytics",
+      "description":"Explain data frame analytics config"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.flush_job.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.flush_job.json
index 71abaf9528183..92ee21828e02d 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.flush_job.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.flush_job.json
@@ -1,8 +1,8 @@
 {
   "ml.flush_job":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-flush-job.html",
-      "description":"Forces any buffered data to be processed by the job."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ml-flush-job",
+      "description":"Force buffered data to be processed"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.forecast.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.forecast.json
index a468741815b12..546444d05ee74 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.forecast.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.forecast.json
@@ -1,8 +1,8 @@
 {
   "ml.forecast":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-forecast.html",
-      "description":"Predicts the future behavior of a time series by using its historical behavior."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ml-forecast",
+      "description":"Predict future behavior of a time series"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.get_buckets.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.get_buckets.json
index dcf9a2cbe3067..15939f86aa69e 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.get_buckets.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.get_buckets.json
@@ -1,8 +1,8 @@
 {
   "ml.get_buckets":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-get-bucket.html",
-      "description":"Retrieves anomaly detection job results for one or more buckets."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ml-get-buckets",
+      "description":"Get anomaly detection job results for buckets"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.get_calendar_events.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.get_calendar_events.json
index 0b3435ff3f935..81ef3c27d0814 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.get_calendar_events.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.get_calendar_events.json
@@ -1,8 +1,8 @@
 {
   "ml.get_calendar_events":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-get-calendar-event.html",
-      "description":"Retrieves information about the scheduled events in calendars."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ml-get-calendar-events",
+      "description":"Get info about events in calendars"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.get_calendars.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.get_calendars.json
index d7666f69d1da9..6c21b9ba7aa46 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.get_calendars.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.get_calendars.json
@@ -1,8 +1,8 @@
 {
   "ml.get_calendars":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-get-calendar.html",
-      "description":"Retrieves configuration information for calendars."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ml-get-calendars",
+      "description":"Get calendar configuration info"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.get_categories.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.get_categories.json
index 69f8dd74e3d55..e78abfe87b8e2 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.get_categories.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.get_categories.json
@@ -1,8 +1,8 @@
 {
   "ml.get_categories":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-get-category.html",
-      "description":"Retrieves anomaly detection job results for one or more categories."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ml-get-categories",
+      "description":"Get anomaly detection job results for categories"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.get_data_frame_analytics.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.get_data_frame_analytics.json
index aa1b3e5dea7a5..1afc924a5a919 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.get_data_frame_analytics.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.get_data_frame_analytics.json
@@ -1,8 +1,8 @@
 {
   "ml.get_data_frame_analytics":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/get-dfanalytics.html",
-      "description":"Retrieves configuration information for data frame analytics jobs."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ml-get-data-frame-analytics",
+      "description":"Get data frame analytics job configuration info"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.get_data_frame_analytics_stats.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.get_data_frame_analytics_stats.json
index f62d36d1c5bd6..ccdf1eb57e68b 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.get_data_frame_analytics_stats.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.get_data_frame_analytics_stats.json
@@ -1,8 +1,8 @@
 {
   "ml.get_data_frame_analytics_stats":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/get-dfanalytics-stats.html",
-      "description":"Retrieves usage information for data frame analytics jobs."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ml-get-data-frame-analytics-stats",
+      "description":"Get data frame analytics job stats"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.get_datafeed_stats.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.get_datafeed_stats.json
index a7d3693bc2274..cf79250fbbe0b 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.get_datafeed_stats.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.get_datafeed_stats.json
@@ -1,8 +1,8 @@
 {
   "ml.get_datafeed_stats":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-get-datafeed-stats.html",
-      "description":"Retrieves usage information for datafeeds."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ml-get-datafeed-stats",
+      "description":"Get datafeed stats"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.get_datafeeds.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.get_datafeeds.json
index 8eb6624213bd9..8790a792ad86d 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.get_datafeeds.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.get_datafeeds.json
@@ -1,8 +1,8 @@
 {
   "ml.get_datafeeds":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-get-datafeed.html",
-      "description":"Retrieves configuration information for datafeeds."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ml-get-datafeeds",
+      "description":"Get datafeeds configuration info"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.get_filters.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.get_filters.json
index 1f195a4260c44..aeaf0a0135e30 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.get_filters.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.get_filters.json
@@ -1,8 +1,8 @@
 {
   "ml.get_filters":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-get-filter.html",
-      "description":"Retrieves filters."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ml-get-filters",
+      "description":"Get filters"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.get_influencers.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.get_influencers.json
index bf4e43d4b0302..88d901b7f9edd 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.get_influencers.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.get_influencers.json
@@ -1,8 +1,8 @@
 {
   "ml.get_influencers":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-get-influencer.html",
-      "description":"Retrieves anomaly detection job results for one or more influencers."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ml-get-influencers",
+      "description":"Get anomaly detection job results for influencers"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.get_job_stats.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.get_job_stats.json
index d19b858d8fd51..e270ea207b032 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.get_job_stats.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.get_job_stats.json
@@ -1,8 +1,8 @@
 {
   "ml.get_job_stats":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-get-job-stats.html",
-      "description":"Retrieves usage information for anomaly detection jobs."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ml-get-job-stats",
+      "description":"Get anomaly detection job stats"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.get_jobs.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.get_jobs.json
index 3de361872d180..97267ec66c6ab 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.get_jobs.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.get_jobs.json
@@ -1,8 +1,8 @@
 {
   "ml.get_jobs":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-get-job.html",
-      "description":"Retrieves configuration information for anomaly detection jobs."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ml-get-jobs",
+      "description":"Get anomaly detection jobs configuration info"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.get_memory_stats.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.get_memory_stats.json
index 272f2264292d3..341aa4fe5bf4b 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.get_memory_stats.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.get_memory_stats.json
@@ -1,8 +1,8 @@
 {
   "ml.get_memory_stats":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/get-ml-memory.html",
-      "description":"Returns information on how ML is using memory."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ml-get-memory-stats",
+      "description":"Get machine learning memory usage info"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.get_model_snapshot_upgrade_stats.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.get_model_snapshot_upgrade_stats.json
index f20b770501133..fe054c827b857 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.get_model_snapshot_upgrade_stats.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.get_model_snapshot_upgrade_stats.json
@@ -1,8 +1,8 @@
 {
   "ml.get_model_snapshot_upgrade_stats":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-get-job-model-snapshot-upgrade-stats.html",
-      "description":"Gets stats for anomaly detection job model snapshot upgrades that are in progress."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ml-get-model-snapshot-upgrade-stats",
+      "description":"Get anomaly detection job model snapshot upgrade usage info"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.get_model_snapshots.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.get_model_snapshots.json
index 1a9c91478b325..d03aa02949d58 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.get_model_snapshots.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.get_model_snapshots.json
@@ -1,8 +1,8 @@
 {
   "ml.get_model_snapshots":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-get-snapshot.html",
-      "description":"Retrieves information about model snapshots."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ml-get-model-snapshots",
+      "description":"Get model snapshots info"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.get_overall_buckets.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.get_overall_buckets.json
index a8e97ac87b1ef..1bf5bccc199e2 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.get_overall_buckets.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.get_overall_buckets.json
@@ -1,8 +1,8 @@
 {
   "ml.get_overall_buckets":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-get-overall-buckets.html",
-      "description":"Retrieves overall bucket results that summarize the bucket results of multiple anomaly detection jobs."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ml-get-overall-buckets",
+      "description":"Get overall bucket results"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.get_records.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.get_records.json
index 9af20f7019929..25cc0984c3ca6 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.get_records.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.get_records.json
@@ -1,8 +1,8 @@
 {
   "ml.get_records":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-get-record.html",
-      "description":"Retrieves anomaly records for an anomaly detection job."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ml-get-records",
+      "description":"Get anomaly records for an anomaly detection job"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.get_trained_models.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.get_trained_models.json
index e5b635b02075c..69960e00e2110 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.get_trained_models.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.get_trained_models.json
@@ -1,8 +1,8 @@
 {
   "ml.get_trained_models":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/get-trained-models.html",
-      "description":"Retrieves configuration information for a trained inference model."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ml-get-trained-models",
+      "description":"Get trained model configuration info"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.get_trained_models_stats.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.get_trained_models_stats.json
index c04b265b36c83..ad1a8fecdc3f7 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.get_trained_models_stats.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.get_trained_models_stats.json
@@ -1,8 +1,8 @@
 {
   "ml.get_trained_models_stats":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/get-trained-models-stats.html",
-      "description":"Retrieves usage information for trained inference models."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ml-get-trained-models-stats",
+      "description":"Get trained models usage info"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.infer_trained_model.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.infer_trained_model.json
index 95d389266302c..a3dba67c2425f 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.infer_trained_model.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.infer_trained_model.json
@@ -1,8 +1,8 @@
 {
   "ml.infer_trained_model":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/infer-trained-model.html",
-      "description":"Evaluate a trained model."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ml-infer-trained-model",
+      "description":"Evaluate a trained model"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.info.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.info.json
index 25659abf3f662..8ed321939c20a 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.info.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.info.json
@@ -1,8 +1,8 @@
 {
   "ml.info":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/get-ml-info.html",
-      "description":"Returns defaults and limits used by machine learning."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ml-info",
+      "description":"Get machine learning information"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.open_job.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.open_job.json
index b93b9cff82568..a4ecabe13ec9b 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.open_job.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.open_job.json
@@ -1,8 +1,8 @@
 {
   "ml.open_job":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-open-job.html",
-      "description":"Opens one or more anomaly detection jobs."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ml-open-job",
+      "description":"Open anomaly detection jobs"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.post_calendar_events.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.post_calendar_events.json
index a23472b752a38..1b01dd16f7f5d 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.post_calendar_events.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.post_calendar_events.json
@@ -1,8 +1,8 @@
 {
   "ml.post_calendar_events":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-post-calendar-event.html",
-      "description":"Posts scheduled events in a calendar."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ml-post-calendar-events",
+      "description":"Add scheduled events to the calendar"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.post_data.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.post_data.json
index cd2deb1024c1e..f2567ea1ad69a 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.post_data.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.post_data.json
@@ -1,8 +1,8 @@
 {
   "ml.post_data":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-post-data.html",
-      "description":"Sends data to an anomaly detection job for analysis."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ml-post-data",
+      "description":"Send data to an anomaly detection job for analysis"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.preview_data_frame_analytics.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.preview_data_frame_analytics.json
index 363318c319b54..242b7b4241635 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.preview_data_frame_analytics.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.preview_data_frame_analytics.json
@@ -1,8 +1,8 @@
 {
   "ml.preview_data_frame_analytics":{
     "documentation":{
-      "url":"http://www.elastic.co/guide/en/elasticsearch/reference/current/preview-dfanalytics.html",
-      "description":"Previews that will be analyzed given a data frame analytics config."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ml-preview-data-frame-analytics",
+      "description":"Preview features used by data frame analytics"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.preview_datafeed.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.preview_datafeed.json
index 7af47194aa4a7..0a3b618bf7065 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.preview_datafeed.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.preview_datafeed.json
@@ -1,8 +1,8 @@
 {
   "ml.preview_datafeed":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-preview-datafeed.html",
-      "description":"Previews a datafeed."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ml-preview-datafeed",
+      "description":"Preview a datafeed"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.put_calendar.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.put_calendar.json
index 597b5d958193d..91b6cf27d2638 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.put_calendar.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.put_calendar.json
@@ -1,8 +1,8 @@
 {
   "ml.put_calendar":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-put-calendar.html",
-      "description":"Instantiates a calendar."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ml-put-calendar",
+      "description":"Create a calendar"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.put_calendar_job.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.put_calendar_job.json
index e7e0476a790da..d197a80ba1357 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.put_calendar_job.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.put_calendar_job.json
@@ -1,8 +1,8 @@
 {
   "ml.put_calendar_job":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-put-calendar-job.html",
-      "description":"Adds an anomaly detection job to a calendar."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ml-put-calendar-job",
+      "description":"Add anomaly detection job to calendar"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.put_data_frame_analytics.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.put_data_frame_analytics.json
index 747f018428aa4..688a958c5a254 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.put_data_frame_analytics.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.put_data_frame_analytics.json
@@ -1,8 +1,8 @@
 {
   "ml.put_data_frame_analytics":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/put-dfanalytics.html",
-      "description":"Instantiates a data frame analytics job."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ml-put-data-frame-analytics",
+      "description":"Create a data frame analytics job"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.put_datafeed.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.put_datafeed.json
index 147290cfaf520..af2abad602e6f 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.put_datafeed.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.put_datafeed.json
@@ -1,8 +1,8 @@
 {
   "ml.put_datafeed":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-put-datafeed.html",
-      "description":"Instantiates a datafeed."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ml-put-datafeed",
+      "description":"Create a datafeed"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.put_filter.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.put_filter.json
index 0e7de69a9fed1..4e89bc8a62f77 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.put_filter.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.put_filter.json
@@ -1,8 +1,8 @@
 {
   "ml.put_filter":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-put-filter.html",
-      "description":"Instantiates a filter."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ml-put-filter",
+      "description":"Create a filter"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.put_job.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.put_job.json
index 52cb95fc56b5b..dc955cc48141c 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.put_job.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.put_job.json
@@ -1,8 +1,8 @@
 {
   "ml.put_job":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-put-job.html",
-      "description":"Instantiates an anomaly detection job."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ml-put-job",
+      "description":"Create an anomaly detection job"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.put_trained_model.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.put_trained_model.json
index 33e6aee74e8fa..c633693599a33 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.put_trained_model.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.put_trained_model.json
@@ -1,8 +1,8 @@
 {
   "ml.put_trained_model":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/put-trained-models.html",
-      "description":"Creates an inference trained model."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ml-put-trained-model",
+      "description":"Create a trained model"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.put_trained_model_alias.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.put_trained_model_alias.json
index 3f953d1b9d693..27719f0bea339 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.put_trained_model_alias.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.put_trained_model_alias.json
@@ -1,8 +1,8 @@
 {
   "ml.put_trained_model_alias":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/put-trained-models-aliases.html",
-      "description":"Creates a new model alias (or reassigns an existing one) to refer to the trained model"
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ml-put-trained-model-alias",
+      "description":"Create or update a trained model alias"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.put_trained_model_definition_part.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.put_trained_model_definition_part.json
index bf826f36e93c6..fb484915c92f8 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.put_trained_model_definition_part.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.put_trained_model_definition_part.json
@@ -1,8 +1,8 @@
 {
   "ml.put_trained_model_definition_part":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/put-trained-model-definition-part.html",
-      "description":"Creates part of a trained model definition"
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ml-put-trained-model-definition-part",
+      "description":"Create part of a trained model definition"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.put_trained_model_vocabulary.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.put_trained_model_vocabulary.json
index f6fd70a75c000..b35c95b36f39a 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.put_trained_model_vocabulary.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.put_trained_model_vocabulary.json
@@ -1,8 +1,8 @@
 {
   "ml.put_trained_model_vocabulary":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/put-trained-model-vocabulary.html",
-      "description":"Creates a trained model vocabulary"
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ml-put-trained-model-vocabulary",
+      "description":"Create a trained model vocabulary"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.reset_job.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.reset_job.json
index bcfb48871371b..ef32819cb5386 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.reset_job.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.reset_job.json
@@ -1,8 +1,8 @@
 {
   "ml.reset_job":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-reset-job.html",
-      "description":"Resets an existing anomaly detection job."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ml-reset-job",
+      "description":"Reset an anomaly detection job"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.revert_model_snapshot.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.revert_model_snapshot.json
index 02ae0edd610e6..8859e57ee1e39 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.revert_model_snapshot.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.revert_model_snapshot.json
@@ -1,8 +1,8 @@
 {
   "ml.revert_model_snapshot":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-revert-snapshot.html",
-      "description":"Reverts to a specific snapshot."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ml-revert-model-snapshot",
+      "description":"Revert to a snapshot"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.set_upgrade_mode.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.set_upgrade_mode.json
index 0ef2ad9a4b650..912c6f04c1e3e 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.set_upgrade_mode.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.set_upgrade_mode.json
@@ -1,8 +1,8 @@
 {
   "ml.set_upgrade_mode":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-set-upgrade-mode.html",
-      "description":"Sets a cluster wide upgrade_mode setting that prepares machine learning indices for an upgrade."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ml-set-upgrade-mode",
+      "description":"Set upgrade_mode for ML indices"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.start_data_frame_analytics.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.start_data_frame_analytics.json
index 039bc24a141ed..078d65cd60d3c 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.start_data_frame_analytics.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.start_data_frame_analytics.json
@@ -1,8 +1,8 @@
 {
   "ml.start_data_frame_analytics":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/start-dfanalytics.html",
-      "description":"Starts a data frame analytics job."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ml-start-data-frame-analytics",
+      "description":"Start a data frame analytics job"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.start_datafeed.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.start_datafeed.json
index 9e9231805ea91..804c4ba22990f 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.start_datafeed.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.start_datafeed.json
@@ -1,8 +1,8 @@
 {
   "ml.start_datafeed":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-start-datafeed.html",
-      "description":"Starts one or more datafeeds."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ml-start-datafeed",
+      "description":"Start datafeeds"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.start_trained_model_deployment.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.start_trained_model_deployment.json
index 3abf072e2efe5..5fd3c0f69fe14 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.start_trained_model_deployment.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.start_trained_model_deployment.json
@@ -1,8 +1,8 @@
 {
   "ml.start_trained_model_deployment":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/start-trained-model-deployment.html",
-      "description":"Start a trained model deployment."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ml-start-trained-model-deployment",
+      "description":"Start a trained model deployment"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.stop_data_frame_analytics.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.stop_data_frame_analytics.json
index 3fc6c3046524f..4e7e0a4f4d675 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.stop_data_frame_analytics.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.stop_data_frame_analytics.json
@@ -1,8 +1,8 @@
 {
   "ml.stop_data_frame_analytics":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/stop-dfanalytics.html",
-      "description":"Stops one or more data frame analytics jobs."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ml-stop-data-frame-analytics",
+      "description":"Stop data frame analytics jobs"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.stop_datafeed.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.stop_datafeed.json
index 6eb64661f6f41..998b7edcb135a 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.stop_datafeed.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.stop_datafeed.json
@@ -1,8 +1,8 @@
 {
   "ml.stop_datafeed":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-stop-datafeed.html",
-      "description":"Stops one or more datafeeds."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ml-stop-datafeed",
+      "description":"Stop datafeeds"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.stop_trained_model_deployment.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.stop_trained_model_deployment.json
index 016d88c684e43..46f64bdb446d9 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.stop_trained_model_deployment.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.stop_trained_model_deployment.json
@@ -1,8 +1,8 @@
 {
   "ml.stop_trained_model_deployment":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/stop-trained-model-deployment.html",
-      "description":"Stop a trained model deployment."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ml-stop-trained-model-deployment",
+      "description":"Stop a trained model deployment"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.update_data_frame_analytics.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.update_data_frame_analytics.json
index a7ea3bb22e513..c35c242fe1a54 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.update_data_frame_analytics.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.update_data_frame_analytics.json
@@ -1,8 +1,8 @@
 {
   "ml.update_data_frame_analytics":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/update-dfanalytics.html",
-      "description":"Updates certain properties of a data frame analytics job."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ml-update-data-frame-analytics",
+      "description":"Update a data frame analytics job"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.update_datafeed.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.update_datafeed.json
index 8c353a550d9c7..c618997252941 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.update_datafeed.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.update_datafeed.json
@@ -1,8 +1,8 @@
 {
   "ml.update_datafeed":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-update-datafeed.html",
-      "description":"Updates certain properties of a datafeed."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ml-update-datafeed",
+      "description":"Update a datafeed"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.update_filter.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.update_filter.json
index f237c45c4b241..2714d76071ac6 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.update_filter.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.update_filter.json
@@ -1,8 +1,8 @@
 {
   "ml.update_filter":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-update-filter.html",
-      "description":"Updates the description of a filter, adds items, or removes items."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ml-update-filter",
+      "description":"Update a filter"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.update_job.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.update_job.json
index 69bdcd0100d49..226f11554ef32 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.update_job.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.update_job.json
@@ -1,8 +1,8 @@
 {
   "ml.update_job":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-update-job.html",
-      "description":"Updates certain properties of an anomaly detection job."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ml-update-job",
+      "description":"Update an anomaly detection job"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.update_model_snapshot.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.update_model_snapshot.json
index 77414590371f1..36c9be3c03c82 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.update_model_snapshot.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.update_model_snapshot.json
@@ -1,8 +1,8 @@
 {
   "ml.update_model_snapshot":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-update-snapshot.html",
-      "description":"Updates certain properties of a snapshot."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ml-update-model-snapshot",
+      "description":"Update a snapshot"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.update_trained_model_deployment.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.update_trained_model_deployment.json
index cc505e873b442..09201207ebce2 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.update_trained_model_deployment.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.update_trained_model_deployment.json
@@ -1,8 +1,8 @@
 {
   "ml.update_trained_model_deployment":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/update-trained-model-deployment.html",
-      "description":"Updates certain properties of trained model deployment."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ml-update-trained-model-deployment",
+      "description":"Update a trained model deployment"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.upgrade_job_snapshot.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.upgrade_job_snapshot.json
index 22de8d4915ad0..14a3fda799d79 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.upgrade_job_snapshot.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.upgrade_job_snapshot.json
@@ -1,8 +1,8 @@
 {
   "ml.upgrade_job_snapshot":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-upgrade-job-model-snapshot.html",
-      "description":"Upgrades a given job snapshot to the current major version."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ml-upgrade-job-snapshot",
+      "description":"Upgrade a snapshot"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.validate.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.validate.json
index b57f1bb69ffa1..86520a1d15edd 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.validate.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.validate.json
@@ -2,7 +2,7 @@
   "ml.validate":{
     "documentation":{
       "url":"https://www.elastic.co/guide/en/machine-learning/current/ml-jobs.html",
-      "description":"Validates an anomaly detection job."
+      "description":"Validate an anomaly detection job"
     },
     "stability":"stable",
     "visibility":"private",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.validate_detector.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.validate_detector.json
index 1400da1ccee09..8af3d9c0414c9 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ml.validate_detector.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ml.validate_detector.json
@@ -2,7 +2,7 @@
   "ml.validate_detector":{
     "documentation":{
       "url":"https://www.elastic.co/guide/en/machine-learning/current/ml-jobs.html",
-      "description":"Validates an anomaly detection detector."
+      "description":"Validate an anomaly detection job"
     },
     "stability":"stable",
     "visibility":"private",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/monitoring.bulk.json b/rest-api-spec/src/main/resources/rest-api-spec/api/monitoring.bulk.json
index 35f1a9dd13646..08019b70f9114 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/monitoring.bulk.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/monitoring.bulk.json
@@ -1,8 +1,8 @@
 {
   "monitoring.bulk":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/monitor-elasticsearch-cluster.html",
-      "description":"Used by the monitoring features to send monitoring data."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch",
+      "description":"Send monitoring data"
     },
     "stability":"stable",
     "visibility":"private",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/msearch.json b/rest-api-spec/src/main/resources/rest-api-spec/api/msearch.json
index 0d8223a71c79d..9f39bfb12dc5e 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/msearch.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/msearch.json
@@ -1,8 +1,8 @@
 {
   "msearch":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/search-multi-search.html",
-      "description":"Allows to execute several search operations in one request."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-msearch",
+      "description":"Run multiple searches"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/msearch_template.json b/rest-api-spec/src/main/resources/rest-api-spec/api/msearch_template.json
index 38b1d5b6add09..a8c4ebd526031 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/msearch_template.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/msearch_template.json
@@ -1,8 +1,8 @@
 {
   "msearch_template":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/search-multi-search.html",
-      "description":"Allows to execute several search template operations in one request."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-msearch-template",
+      "description":"Run multiple templated searches"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/mtermvectors.json b/rest-api-spec/src/main/resources/rest-api-spec/api/mtermvectors.json
index fd7a5493363e3..55b5b6796e727 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/mtermvectors.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/mtermvectors.json
@@ -1,8 +1,8 @@
 {
   "mtermvectors":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/docs-multi-termvectors.html",
-      "description":"Returns multiple termvectors in one request."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-mtermvectors",
+      "description":"Get multiple term vectors"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/nodes.clear_repositories_metering_archive.json b/rest-api-spec/src/main/resources/rest-api-spec/api/nodes.clear_repositories_metering_archive.json
index 3edcb98e8b2e3..767662682f6b4 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/nodes.clear_repositories_metering_archive.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/nodes.clear_repositories_metering_archive.json
@@ -1,8 +1,8 @@
 {
   "nodes.clear_repositories_metering_archive":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/clear-repositories-metering-archive-api.html",
-      "description":"Removes the archived repositories metering information present in the cluster."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-nodes-clear-repositories-metering-archive",
+      "description":"Clear the archived repositories metering"
     },
     "stability":"experimental",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/nodes.get_repositories_metering_info.json b/rest-api-spec/src/main/resources/rest-api-spec/api/nodes.get_repositories_metering_info.json
index 312b6b6c82eea..5d9c5e9edca3c 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/nodes.get_repositories_metering_info.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/nodes.get_repositories_metering_info.json
@@ -1,8 +1,8 @@
 {
   "nodes.get_repositories_metering_info":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/get-repositories-metering-api.html",
-      "description":"Returns cluster repositories metering information."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-nodes-get-repositories-metering-info",
+      "description":"Get cluster repositories metering"
     },
     "stability":"experimental",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/nodes.hot_threads.json b/rest-api-spec/src/main/resources/rest-api-spec/api/nodes.hot_threads.json
index 8c8794e05c282..ed47c7a3b2601 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/nodes.hot_threads.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/nodes.hot_threads.json
@@ -1,8 +1,8 @@
 {
   "nodes.hot_threads":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-nodes-hot-threads.html",
-      "description":"Returns information about hot threads on each node in the cluster."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-nodes-hot-threads",
+      "description":"Get the hot threads for nodes"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/nodes.info.json b/rest-api-spec/src/main/resources/rest-api-spec/api/nodes.info.json
index a4cf6481c553f..5f33d6084c9ac 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/nodes.info.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/nodes.info.json
@@ -1,8 +1,8 @@
 {
   "nodes.info":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-nodes-info.html",
-      "description":"Returns information about nodes in the cluster."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-nodes-info",
+      "description":"Get node information"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/nodes.reload_secure_settings.json b/rest-api-spec/src/main/resources/rest-api-spec/api/nodes.reload_secure_settings.json
index 777a62a7dc3af..adc2bf8c2f4d2 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/nodes.reload_secure_settings.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/nodes.reload_secure_settings.json
@@ -1,8 +1,8 @@
 {
   "nodes.reload_secure_settings":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/secure-settings.html#reloadable-secure-settings",
-      "description":"Reloads secure settings."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-nodes-reload-secure-settings",
+      "description":"Reload the keystore on nodes in the cluster"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/nodes.stats.json b/rest-api-spec/src/main/resources/rest-api-spec/api/nodes.stats.json
index e3ae508b8b1ce..56ac9cce6ba80 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/nodes.stats.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/nodes.stats.json
@@ -1,8 +1,8 @@
 {
   "nodes.stats":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-nodes-stats.html",
-      "description":"Returns statistical information about nodes in the cluster."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-nodes-stats",
+      "description":"Get node statistics"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/nodes.usage.json b/rest-api-spec/src/main/resources/rest-api-spec/api/nodes.usage.json
index 09aeaba8fec01..3620ad69af42c 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/nodes.usage.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/nodes.usage.json
@@ -1,8 +1,8 @@
 {
   "nodes.usage":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-nodes-usage.html",
-      "description":"Returns low-level information about REST actions usage on nodes."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-nodes-usage",
+      "description":"Get feature usage information"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/open_point_in_time.json b/rest-api-spec/src/main/resources/rest-api-spec/api/open_point_in_time.json
index 37ef3b10a02dd..e06050283ca9a 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/open_point_in_time.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/open_point_in_time.json
@@ -1,8 +1,8 @@
 {
   "open_point_in_time":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/point-in-time-api.html",
-      "description":"Open a point in time that can be used in subsequent searches"
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-open-point-in-time",
+      "description":"Open a point in time"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ping.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ping.json
index 6615f789623f8..99c9b19c27803 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ping.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ping.json
@@ -1,8 +1,8 @@
 {
   "ping":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/index.html",
-      "description":"Returns whether the cluster is running."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/group/endpoint-cluster",
+      "description":"Ping the cluster"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/profiling.flamegraph.json b/rest-api-spec/src/main/resources/rest-api-spec/api/profiling.flamegraph.json
index 51e313178ecbe..390c950951516 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/profiling.flamegraph.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/profiling.flamegraph.json
@@ -2,7 +2,7 @@
   "profiling.flamegraph":{
     "documentation":{
       "url":"https://www.elastic.co/guide/en/observability/current/universal-profiling.html",
-      "description":"Extracts a UI-optimized structure to render flamegraphs from Universal Profiling."
+      "description":"Extracts a UI-optimized structure to render flamegraphs from Universal Profiling"
     },
     "stability":"stable",
     "visibility":"private",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/profiling.stacktraces.json b/rest-api-spec/src/main/resources/rest-api-spec/api/profiling.stacktraces.json
index 13d44dc61db13..5242ec630da61 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/profiling.stacktraces.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/profiling.stacktraces.json
@@ -2,7 +2,7 @@
   "profiling.stacktraces":{
     "documentation":{
       "url":"https://www.elastic.co/guide/en/observability/current/universal-profiling.html",
-      "description":"Extracts raw stacktrace information from Universal Profiling."
+      "description":"Extracts raw stacktrace information from Universal Profiling"
     },
     "stability":"stable",
     "visibility":"private",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/profiling.status.json b/rest-api-spec/src/main/resources/rest-api-spec/api/profiling.status.json
index 76296e1079be2..adc7c3d4f7355 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/profiling.status.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/profiling.status.json
@@ -2,7 +2,7 @@
   "profiling.status":{
     "documentation":{
       "url":"https://www.elastic.co/guide/en/observability/current/universal-profiling.html",
-      "description":"Returns basic information about the status of Universal Profiling."
+      "description":"Returns basic information about the status of Universal Profiling"
     },
     "stability":"stable",
     "visibility":"private",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/profiling.topn_functions.json b/rest-api-spec/src/main/resources/rest-api-spec/api/profiling.topn_functions.json
index 3b4db3abf2cca..3643f3b0268d1 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/profiling.topn_functions.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/profiling.topn_functions.json
@@ -2,7 +2,7 @@
   "profiling.topn_functions":{
     "documentation":{
       "url":"https://www.elastic.co/guide/en/observability/current/universal-profiling.html",
-      "description":"Extracts a list of topN functions from Universal Profiling."
+      "description":"Extracts a list of topN functions from Universal Profiling"
     },
     "stability":"stable",
     "visibility":"private",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/put_script.json b/rest-api-spec/src/main/resources/rest-api-spec/api/put_script.json
index 29e951848ddd8..e300335770c31 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/put_script.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/put_script.json
@@ -1,8 +1,8 @@
 {
   "put_script":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/modules-scripting.html",
-      "description":"Creates or updates a script."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-put-script",
+      "description":"Create or update a script or search template"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/query_rules.delete_rule.json b/rest-api-spec/src/main/resources/rest-api-spec/api/query_rules.delete_rule.json
index 8a97dcd311237..49331c28a355a 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/query_rules.delete_rule.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/query_rules.delete_rule.json
@@ -1,8 +1,8 @@
 {
   "query_rules.delete_rule": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/delete-query-rule.html",
-      "description": "Deletes an individual query rule within a ruleset."
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-query-rules-delete-rule",
+      "description": "Delete a query rule"
     },
     "stability": "stable",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/query_rules.delete_ruleset.json b/rest-api-spec/src/main/resources/rest-api-spec/api/query_rules.delete_ruleset.json
index 90144ca9f3cf5..c1c4a1537bedf 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/query_rules.delete_ruleset.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/query_rules.delete_ruleset.json
@@ -1,8 +1,8 @@
 {
   "query_rules.delete_ruleset": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/delete-query-ruleset.html",
-      "description": "Deletes a query ruleset."
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-query-rules-delete-ruleset",
+      "description": "Delete a query ruleset"
     },
     "stability": "stable",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/query_rules.get_rule.json b/rest-api-spec/src/main/resources/rest-api-spec/api/query_rules.get_rule.json
index 681b68ab583d8..a24dea752459c 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/query_rules.get_rule.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/query_rules.get_rule.json
@@ -1,8 +1,8 @@
 {
   "query_rules.get_rule": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/get-query-rule.html",
-      "description": "Returns the details about an individual query rule within a ruleset."
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-query-rules-get-rule",
+      "description": "Get a query rule"
     },
     "stability": "stable",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/query_rules.get_ruleset.json b/rest-api-spec/src/main/resources/rest-api-spec/api/query_rules.get_ruleset.json
index 28268ea667b8c..cf89a9db50fb6 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/query_rules.get_ruleset.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/query_rules.get_ruleset.json
@@ -1,8 +1,8 @@
 {
   "query_rules.get_ruleset": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/get-query-ruleset.html",
-      "description": "Returns the details about a query ruleset."
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-query-rules-get-ruleset",
+      "description": "Get a query ruleset"
     },
     "stability": "stable",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/query_rules.list_rulesets.json b/rest-api-spec/src/main/resources/rest-api-spec/api/query_rules.list_rulesets.json
index e3e98adedb147..cc4138f0a554d 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/query_rules.list_rulesets.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/query_rules.list_rulesets.json
@@ -1,8 +1,8 @@
 {
   "query_rules.list_rulesets": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/list-query-rulesets.html",
-      "description": "Lists query rulesets."
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-query-rules-list-rulesets",
+      "description": "Get all query rulesets"
     },
     "stability": "stable",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/query_rules.put_rule.json b/rest-api-spec/src/main/resources/rest-api-spec/api/query_rules.put_rule.json
index 5cc21b4f3249c..c2fefafe842a6 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/query_rules.put_rule.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/query_rules.put_rule.json
@@ -1,8 +1,8 @@
 {
   "query_rules.put_rule": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/put-query-rule.html",
-      "description": "Creates or updates a query rule within a ruleset."
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-query-rules-put-rule",
+      "description": "Create or update a query rule"
     },
     "stability": "stable",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/query_rules.put_ruleset.json b/rest-api-spec/src/main/resources/rest-api-spec/api/query_rules.put_ruleset.json
index 12cbccc6b7651..ae1b8efc3dd95 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/query_rules.put_ruleset.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/query_rules.put_ruleset.json
@@ -1,8 +1,8 @@
 {
   "query_rules.put_ruleset": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/put-query-ruleset.html",
-      "description": "Creates or updates a query ruleset."
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-query-rules-put-ruleset",
+      "description": "Create or update a query ruleset"
     },
     "stability": "stable",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/query_rules.test.json b/rest-api-spec/src/main/resources/rest-api-spec/api/query_rules.test.json
index c82b45771ac7f..82c236d57dbc7 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/query_rules.test.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/query_rules.test.json
@@ -1,8 +1,8 @@
 {
   "query_rules.test": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/test-query-ruleset.html",
-      "description": "Tests a query ruleset to identify the rules that would match input criteria"
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-query-rules-test",
+      "description": "Test a query ruleset"
     },
     "stability": "experimental",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/rank_eval.json b/rest-api-spec/src/main/resources/rest-api-spec/api/rank_eval.json
index e7d40bbe3bdf0..b1f7567bc5938 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/rank_eval.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/rank_eval.json
@@ -1,8 +1,8 @@
 {
   "rank_eval":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/search-rank-eval.html",
-      "description":"Allows to evaluate the quality of ranked search results over a set of typical search queries"
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-rank-eval",
+      "description":"Evaluate ranked search results"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/reindex.json b/rest-api-spec/src/main/resources/rest-api-spec/api/reindex.json
index c28e2f8417883..ef420a4a16b45 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/reindex.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/reindex.json
@@ -1,8 +1,8 @@
 {
   "reindex":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/docs-reindex.html",
-      "description":"Allows to copy documents from one index to another, optionally filtering the source\ndocuments by a query, changing the destination index settings, or fetching the\ndocuments from a remote cluster."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-reindex",
+      "description":"Reindex documents"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/reindex_rethrottle.json b/rest-api-spec/src/main/resources/rest-api-spec/api/reindex_rethrottle.json
index f53157c36cc64..03cba3a7fa4a8 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/reindex_rethrottle.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/reindex_rethrottle.json
@@ -1,8 +1,8 @@
 {
   "reindex_rethrottle":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/docs-reindex.html",
-      "description":"Changes the number of requests per second for a particular Reindex operation."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-reindex",
+      "description":"Throttle a reindex operation"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/render_search_template.json b/rest-api-spec/src/main/resources/rest-api-spec/api/render_search_template.json
index 5a29c99612a75..8ecb065adc19f 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/render_search_template.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/render_search_template.json
@@ -1,8 +1,8 @@
 {
   "render_search_template":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/render-search-template-api.html",
-      "description":"Allows to use the Mustache language to pre-render a search definition."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-render-search-template",
+      "description":"Render a search template"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/rollup.delete_job.json b/rest-api-spec/src/main/resources/rest-api-spec/api/rollup.delete_job.json
index 0a60a10ed8315..fa82143228f12 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/rollup.delete_job.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/rollup.delete_job.json
@@ -1,8 +1,8 @@
 {
   "rollup.delete_job":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/rollup-delete-job.html",
-      "description":"Deletes an existing rollup job."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-rollup-delete-job",
+      "description":"Delete a rollup job"
     },
     "stability":"experimental",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/rollup.get_jobs.json b/rest-api-spec/src/main/resources/rest-api-spec/api/rollup.get_jobs.json
index e373c9f08bfd5..c15aee0ce06f4 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/rollup.get_jobs.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/rollup.get_jobs.json
@@ -1,8 +1,8 @@
 {
   "rollup.get_jobs":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/rollup-get-job.html",
-      "description":"Retrieves the configuration, stats, and status of rollup jobs."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-rollup-get-jobs",
+      "description":"Get rollup job information"
     },
     "stability":"experimental",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/rollup.get_rollup_caps.json b/rest-api-spec/src/main/resources/rest-api-spec/api/rollup.get_rollup_caps.json
index a72187f9ca926..cc3729ced3307 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/rollup.get_rollup_caps.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/rollup.get_rollup_caps.json
@@ -1,8 +1,8 @@
 {
   "rollup.get_rollup_caps":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/rollup-get-rollup-caps.html",
-      "description":"Returns the capabilities of any rollup jobs that have been configured for a specific index or index pattern."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-rollup-get-rollup-caps",
+      "description":"Get the rollup job capabilities"
     },
     "stability":"experimental",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/rollup.get_rollup_index_caps.json b/rest-api-spec/src/main/resources/rest-api-spec/api/rollup.get_rollup_index_caps.json
index c0e81ff7abcf4..e0220773d8f1e 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/rollup.get_rollup_index_caps.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/rollup.get_rollup_index_caps.json
@@ -1,8 +1,8 @@
 {
   "rollup.get_rollup_index_caps":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/rollup-get-rollup-index-caps.html",
-      "description":"Returns the rollup capabilities of all jobs inside of a rollup index (e.g. the index where rollup data is stored)."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-rollup-get-rollup-index-caps",
+      "description":"Get the rollup index capabilities"
     },
     "stability":"experimental",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/rollup.put_job.json b/rest-api-spec/src/main/resources/rest-api-spec/api/rollup.put_job.json
index 2ba845cfab506..f508d9cd5b153 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/rollup.put_job.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/rollup.put_job.json
@@ -1,8 +1,8 @@
 {
   "rollup.put_job":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/rollup-put-job.html",
-      "description":"Creates a rollup job."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-rollup-put-job",
+      "description":"Create a rollup job"
     },
     "stability":"experimental",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/rollup.rollup_search.json b/rest-api-spec/src/main/resources/rest-api-spec/api/rollup.rollup_search.json
index dfd8c7dec5241..738bebe9df9e8 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/rollup.rollup_search.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/rollup.rollup_search.json
@@ -1,8 +1,8 @@
 {
   "rollup.rollup_search":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/rollup-search.html",
-      "description":"Enables searching rolled-up data using the standard query DSL."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-rollup-rollup-search",
+      "description":"Search rolled-up data"
     },
     "stability":"experimental",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/rollup.start_job.json b/rest-api-spec/src/main/resources/rest-api-spec/api/rollup.start_job.json
index 85250cfcfcdcd..216f0c2909ffe 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/rollup.start_job.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/rollup.start_job.json
@@ -1,8 +1,8 @@
 {
   "rollup.start_job":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/rollup-start-job.html",
-      "description":"Starts an existing, stopped rollup job."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-rollup-start-job",
+      "description":"Start rollup jobs"
     },
     "stability":"experimental",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/rollup.stop_job.json b/rest-api-spec/src/main/resources/rest-api-spec/api/rollup.stop_job.json
index f6405cc99eb02..6ba9d7dc822f8 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/rollup.stop_job.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/rollup.stop_job.json
@@ -1,8 +1,8 @@
 {
   "rollup.stop_job":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/rollup-stop-job.html",
-      "description":"Stops an existing, started rollup job."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-rollup-stop-job",
+      "description":"Stop rollup jobs"
     },
     "stability":"experimental",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/scripts_painless_execute.json b/rest-api-spec/src/main/resources/rest-api-spec/api/scripts_painless_execute.json
index b26d31fb6c0ce..dd7ea1bc9970d 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/scripts_painless_execute.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/scripts_painless_execute.json
@@ -1,8 +1,8 @@
 {
   "scripts_painless_execute":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/painless/master/painless-execute-api.html",
-      "description":"Allows an arbitrary script to be executed and a result to be returned"
+      "url":"https://www.elastic.co/docs/reference/scripting-languages/painless/painless-api-examples",
+      "description":"Run a script"
     },
     "stability":"experimental",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/scroll.json b/rest-api-spec/src/main/resources/rest-api-spec/api/scroll.json
index 553ee83587198..b29a4fbc6db54 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/scroll.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/scroll.json
@@ -1,8 +1,8 @@
 {
   "scroll":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/search-request-body.html#request-body-search-scroll",
-      "description":"Allows to retrieve a large numbers of results from a single search request."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-scroll",
+      "description":"Run a scrolling search"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/search.json b/rest-api-spec/src/main/resources/rest-api-spec/api/search.json
index 0cbe1f94f14d5..86eb79034adee 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/search.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/search.json
@@ -1,8 +1,8 @@
 {
   "search":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/search-search.html",
-      "description":"Returns results matching a query."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-search",
+      "description":"Run a search"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/search_application.delete.json b/rest-api-spec/src/main/resources/rest-api-spec/api/search_application.delete.json
index 19bba8738c029..10f64f991a480 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/search_application.delete.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/search_application.delete.json
@@ -1,8 +1,8 @@
 {
   "search_application.delete": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/delete-search-application.html",
-      "description": "Deletes a search application."
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-search-application-delete",
+      "description": "Delete a search application"
     },
     "stability": "experimental",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/search_application.delete_behavioral_analytics.json b/rest-api-spec/src/main/resources/rest-api-spec/api/search_application.delete_behavioral_analytics.json
index 77a99c4c5d836..41bf1bdb654e0 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/search_application.delete_behavioral_analytics.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/search_application.delete_behavioral_analytics.json
@@ -1,8 +1,8 @@
 {
   "search_application.delete_behavioral_analytics": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/delete-analytics-collection.html",
-      "description": "Delete a behavioral analytics collection."
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-search-application-delete-behavioral-analytics",
+      "description": "Delete a behavioral analytics collection"
     },
     "stability": "experimental",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/search_application.get.json b/rest-api-spec/src/main/resources/rest-api-spec/api/search_application.get.json
index d91b2b2498eb7..82d38d53115ba 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/search_application.get.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/search_application.get.json
@@ -1,8 +1,8 @@
 {
   "search_application.get": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/get-search-application.html",
-      "description": "Returns the details about a search application."
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-search-application-get",
+      "description": "Get search application details"
     },
     "stability": "experimental",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/search_application.get_behavioral_analytics.json b/rest-api-spec/src/main/resources/rest-api-spec/api/search_application.get_behavioral_analytics.json
index c4d2edcf42fc2..dcc9b6a4e4e1a 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/search_application.get_behavioral_analytics.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/search_application.get_behavioral_analytics.json
@@ -1,8 +1,8 @@
 {
   "search_application.get_behavioral_analytics": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/list-analytics-collection.html",
-      "description": "Returns the existing behavioral analytics collections."
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-search-application-get-behavioral-analytics",
+      "description": "Get behavioral analytics collections"
     },
     "stability": "experimental",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/search_application.list.json b/rest-api-spec/src/main/resources/rest-api-spec/api/search_application.list.json
index 19e75a1b92dd9..2374f86dc3174 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/search_application.list.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/search_application.list.json
@@ -1,8 +1,8 @@
 {
   "search_application.list": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/list-search-applications.html",
-      "description": "Returns the existing search applications."
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-search-application-get-behavioral-analytics",
+      "description": "Get search applications"
     },
     "stability": "experimental",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/search_application.post_behavioral_analytics_event.json b/rest-api-spec/src/main/resources/rest-api-spec/api/search_application.post_behavioral_analytics_event.json
index b497c3b1314bc..2ab8f7dee7d09 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/search_application.post_behavioral_analytics_event.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/search_application.post_behavioral_analytics_event.json
@@ -1,8 +1,8 @@
 {
   "search_application.post_behavioral_analytics_event": {
     "documentation": {
-      "url": "http://todo.com/tbd",
-      "description": "Creates a behavioral analytics event for existing collection."
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-search-application-post-behavioral-analytics-event",
+      "description": "Create a behavioral analytics collection event"
     },
     "stability": "experimental",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/search_application.put.json b/rest-api-spec/src/main/resources/rest-api-spec/api/search_application.put.json
index b20df20bd234e..4de074863e320 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/search_application.put.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/search_application.put.json
@@ -1,8 +1,8 @@
 {
   "search_application.put": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/put-search-application.html",
-      "description": "Creates or updates a search application."
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-search-application-put",
+      "description": "Create or update a search application"
     },
     "stability": "experimental",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/search_application.put_behavioral_analytics.json b/rest-api-spec/src/main/resources/rest-api-spec/api/search_application.put_behavioral_analytics.json
index 811791dd586dd..cc8963ca08c23 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/search_application.put_behavioral_analytics.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/search_application.put_behavioral_analytics.json
@@ -1,8 +1,8 @@
 {
   "search_application.put_behavioral_analytics": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/put-analytics-collection.html",
-      "description": "Creates a behavioral analytics collection."
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-search-application-put-behavioral-analytics",
+      "description": "Create a behavioral analytics collection"
     },
     "stability": "experimental",
     "deprecated": {
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/search_application.render_query.json b/rest-api-spec/src/main/resources/rest-api-spec/api/search_application.render_query.json
index 5aece1b626898..2769e88d3161d 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/search_application.render_query.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/search_application.render_query.json
@@ -1,8 +1,8 @@
 {
   "search_application.render_query": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/search-application-render-query.html",
-      "description": "Renders a query for given search application search parameters"
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-search-application-render-query",
+      "description": "Render a search application query"
     },
     "stability": "experimental",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/search_application.search.json b/rest-api-spec/src/main/resources/rest-api-spec/api/search_application.search.json
index d0a8d36d9b46d..5d58147ab5cf6 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/search_application.search.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/search_application.search.json
@@ -1,8 +1,8 @@
 {
   "search_application.search": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/search-application-search.html",
-      "description": "Perform a search against a search application"
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-search-application-search",
+      "description": "Run a search application search"
     },
     "stability": "experimental",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/search_mvt.json b/rest-api-spec/src/main/resources/rest-api-spec/api/search_mvt.json
index faa67132f3aca..af0e15bca9337 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/search_mvt.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/search_mvt.json
@@ -1,8 +1,8 @@
 {
   "search_mvt": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/search-vector-tile-api.html",
-      "description": "Searches a vector tile for geospatial values. Returns results as a binary Mapbox vector tile."
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-search-mvt",
+      "description": "Search a vector tile"
     },
     "stability": "experimental",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/search_shards.json b/rest-api-spec/src/main/resources/rest-api-spec/api/search_shards.json
index 8e80cd15d9ea2..d55e24837c0b5 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/search_shards.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/search_shards.json
@@ -1,8 +1,8 @@
 {
   "search_shards":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/search-shards.html",
-      "description":"Returns information about the indices and shards that a search request would be executed against."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-search-shards",
+      "description":"Get the search shards"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/search_template.json b/rest-api-spec/src/main/resources/rest-api-spec/api/search_template.json
index 22a2a8367bc17..5dabae85f7760 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/search_template.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/search_template.json
@@ -1,8 +1,8 @@
 {
   "search_template":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/search-template.html",
-      "description":"Allows to use the Mustache language to pre-render a search definition."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-search-template",
+      "description":"Run a search with a search template"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/searchable_snapshots.cache_stats.json b/rest-api-spec/src/main/resources/rest-api-spec/api/searchable_snapshots.cache_stats.json
index 3cfb71bb11e14..0a0413500b40e 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/searchable_snapshots.cache_stats.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/searchable_snapshots.cache_stats.json
@@ -1,8 +1,8 @@
 {
   "searchable_snapshots.cache_stats": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/searchable-snapshots-apis.html",
-      "description": "Retrieve node-level cache statistics about searchable snapshots."
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-searchable-snapshots-cache-stats",
+      "description": "Get cache statistics"
     },
     "stability": "experimental",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/searchable_snapshots.clear_cache.json b/rest-api-spec/src/main/resources/rest-api-spec/api/searchable_snapshots.clear_cache.json
index 8b39cdcb24218..f599bf736a488 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/searchable_snapshots.clear_cache.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/searchable_snapshots.clear_cache.json
@@ -1,7 +1,7 @@
 {
   "searchable_snapshots.clear_cache": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/searchable-snapshots-apis.html",
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-searchable-snapshots-clear-cache",
       "description" : "Clear the cache of searchable snapshots."
     },
     "stability": "experimental",
@@ -25,7 +25,7 @@
           "parts": {
             "index": {
               "type": "list",
-              "description": "A comma-separated list of index names"
+              "description": "Clear the cache"
             }
           }
         }
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/searchable_snapshots.mount.json b/rest-api-spec/src/main/resources/rest-api-spec/api/searchable_snapshots.mount.json
index b1a3893760a98..70d975a4b53d7 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/searchable_snapshots.mount.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/searchable_snapshots.mount.json
@@ -1,8 +1,8 @@
 {
   "searchable_snapshots.mount": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/searchable-snapshots-api-mount-snapshot.html",
-      "description": "Mount a snapshot as a searchable index."
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-searchable-snapshots-mount",
+      "description": "Mount a snapshot"
     },
     "stability": "stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/searchable_snapshots.stats.json b/rest-api-spec/src/main/resources/rest-api-spec/api/searchable_snapshots.stats.json
index 9c35e51c70636..612130cbb86c8 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/searchable_snapshots.stats.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/searchable_snapshots.stats.json
@@ -1,8 +1,8 @@
 {
   "searchable_snapshots.stats": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/searchable-snapshots-apis.html",
-      "description": "Retrieve shard-level statistics about searchable snapshots."
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-searchable-snapshots-stats",
+      "description": "Get searchable snapshot statistics"
     },
     "stability": "stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/security.activate_user_profile.json b/rest-api-spec/src/main/resources/rest-api-spec/api/security.activate_user_profile.json
index f03c79b876f80..8d5a5610b4328 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/security.activate_user_profile.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/security.activate_user_profile.json
@@ -1,8 +1,8 @@
 {
   "security.activate_user_profile":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-activate-user-profile.html",
-      "description":"Creates or updates the user profile on behalf of another user."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-security-activate-user-profile",
+      "description":"Activate a user profile"
     },
     "stability":"stable",
     "visibility":"private",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/security.authenticate.json b/rest-api-spec/src/main/resources/rest-api-spec/api/security.authenticate.json
index 3b65a7eebca10..15d41962f4616 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/security.authenticate.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/security.authenticate.json
@@ -1,8 +1,8 @@
 {
   "security.authenticate":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-authenticate.html",
-      "description":"Enables authentication as a user and retrieve information about the authenticated user."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-security-authenticate",
+      "description":"Authenticate a user"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/security.bulk_delete_role.json b/rest-api-spec/src/main/resources/rest-api-spec/api/security.bulk_delete_role.json
index 8810602aa2c18..2c562c9c4ab8d 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/security.bulk_delete_role.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/security.bulk_delete_role.json
@@ -1,8 +1,8 @@
 {
   "security.bulk_delete_role": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-bulk-delete-role.html",
-      "description": "Bulk delete roles in the native realm."
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-security-bulk-delete-role",
+      "description": "Bulk delete roles"
     },
     "stability": "stable",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/security.bulk_put_role.json b/rest-api-spec/src/main/resources/rest-api-spec/api/security.bulk_put_role.json
index f8916a48b31e6..fe8f54e104c2c 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/security.bulk_put_role.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/security.bulk_put_role.json
@@ -1,8 +1,8 @@
 {
   "security.bulk_put_role": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-bulk-put-role.html",
-      "description": "Bulk adds and updates roles in the native realm."
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-security-bulk-put-role",
+      "description": "Bulk create or update roles"
     },
     "stability": "stable",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/security.bulk_update_api_keys.json b/rest-api-spec/src/main/resources/rest-api-spec/api/security.bulk_update_api_keys.json
index 69d3255776f37..33dd038c38f60 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/security.bulk_update_api_keys.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/security.bulk_update_api_keys.json
@@ -1,8 +1,8 @@
 {
   "security.bulk_update_api_keys": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-bulk-update-api-keys.html",
-      "description": "Updates the attributes of multiple existing API keys."
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-security-bulk-update-api-keys",
+      "description": "Bulk update API keys"
     },
     "stability": "stable",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/security.change_password.json b/rest-api-spec/src/main/resources/rest-api-spec/api/security.change_password.json
index c2b1391c1127d..6a5578118a007 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/security.change_password.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/security.change_password.json
@@ -1,8 +1,8 @@
 {
   "security.change_password":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-change-password.html",
-      "description":"Changes the passwords of users in the native realm and built-in users."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-security-change-password",
+      "description":"Change passwords"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/security.clear_api_key_cache.json b/rest-api-spec/src/main/resources/rest-api-spec/api/security.clear_api_key_cache.json
index 2f3ce2f27e071..1c9063affc2d3 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/security.clear_api_key_cache.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/security.clear_api_key_cache.json
@@ -1,8 +1,8 @@
 {
   "security.clear_api_key_cache":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-clear-api-key-cache.html",
-      "description":"Clear a subset or all entries from the API key cache."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-security-clear-api-key-cache",
+      "description":"Clear the API key cache"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/security.clear_cached_privileges.json b/rest-api-spec/src/main/resources/rest-api-spec/api/security.clear_cached_privileges.json
index f90fbf9c1b4dd..14edc27ad6ac2 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/security.clear_cached_privileges.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/security.clear_cached_privileges.json
@@ -1,8 +1,8 @@
 {
   "security.clear_cached_privileges":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-clear-privilege-cache.html",
-      "description":"Evicts application privileges from the native application privileges cache."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-security-clear-cached-privileges",
+      "description":"Clear the privileges cache"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/security.clear_cached_realms.json b/rest-api-spec/src/main/resources/rest-api-spec/api/security.clear_cached_realms.json
index 3b24c6ef423af..6221e0308fe85 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/security.clear_cached_realms.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/security.clear_cached_realms.json
@@ -1,8 +1,8 @@
 {
   "security.clear_cached_realms":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-clear-cache.html",
-      "description":"Evicts users from the user cache. Can completely clear the cache or evict specific users."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-security-clear-cached-realms",
+      "description":"Clear the user cache"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/security.clear_cached_roles.json b/rest-api-spec/src/main/resources/rest-api-spec/api/security.clear_cached_roles.json
index 64a0efe551212..cd0d93db0be60 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/security.clear_cached_roles.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/security.clear_cached_roles.json
@@ -1,8 +1,8 @@
 {
   "security.clear_cached_roles":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-clear-role-cache.html",
-      "description":"Evicts roles from the native role cache."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-security-clear-cached-roles",
+      "description":"Clear the roles cache"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/security.clear_cached_service_tokens.json b/rest-api-spec/src/main/resources/rest-api-spec/api/security.clear_cached_service_tokens.json
index 72c10d006569b..5481437841e2f 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/security.clear_cached_service_tokens.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/security.clear_cached_service_tokens.json
@@ -1,8 +1,8 @@
 {
   "security.clear_cached_service_tokens":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-clear-service-token-caches.html",
-      "description":"Evicts tokens from the service account token caches."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-security-clear-cached-service-tokens",
+      "description":"Clear service account token caches"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/security.create_api_key.json b/rest-api-spec/src/main/resources/rest-api-spec/api/security.create_api_key.json
index 31ab3993ce9c4..73e76154c06bd 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/security.create_api_key.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/security.create_api_key.json
@@ -1,8 +1,8 @@
 {
   "security.create_api_key":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-create-api-key.html",
-      "description":"Creates an API key for access without requiring basic authentication."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-security-create-api-key",
+      "description":"Create an API key"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/security.create_cross_cluster_api_key.json b/rest-api-spec/src/main/resources/rest-api-spec/api/security.create_cross_cluster_api_key.json
index 88d6b97067492..179e85d2bc9bd 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/security.create_cross_cluster_api_key.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/security.create_cross_cluster_api_key.json
@@ -1,8 +1,8 @@
 {
   "security.create_cross_cluster_api_key": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-create-cross-cluster-api-key.html",
-      "description": "Creates a cross-cluster API key for API key based remote cluster access."
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-security-create-cross-cluster-api-key",
+      "description": "Create a cross-cluster API key"
     },
     "stability": "stable",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/security.create_service_token.json b/rest-api-spec/src/main/resources/rest-api-spec/api/security.create_service_token.json
index 33bdf709fb7a2..fc531d714e2cf 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/security.create_service_token.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/security.create_service_token.json
@@ -1,8 +1,8 @@
 {
   "security.create_service_token":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-create-service-token.html",
-      "description":"Creates a service account token for access without requiring basic authentication."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-security-create-service-token",
+      "description":"Create a service account token"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/security.delegate_pki.json b/rest-api-spec/src/main/resources/rest-api-spec/api/security.delegate_pki.json
index 752ea35028b4f..f808d900033c2 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/security.delegate_pki.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/security.delegate_pki.json
@@ -1,8 +1,8 @@
 {
   "security.delegate_pki": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/security-api-delegate-pki-authentication.html",
-      "description": "Delegate PKI authentication."
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-security-delegate-pki",
+      "description": "Delegate PKI authentication"
     },
     "stability": "stable",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/security.delete_privileges.json b/rest-api-spec/src/main/resources/rest-api-spec/api/security.delete_privileges.json
index 533473743f02a..8b85099ad7a07 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/security.delete_privileges.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/security.delete_privileges.json
@@ -1,8 +1,8 @@
 {
   "security.delete_privileges":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-delete-privilege.html",
-      "description":"Removes application privileges."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-security-delete-privileges",
+      "description":"Delete application privileges"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/security.delete_role.json b/rest-api-spec/src/main/resources/rest-api-spec/api/security.delete_role.json
index 65b2495f01995..abcb6c9ea54bd 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/security.delete_role.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/security.delete_role.json
@@ -1,8 +1,8 @@
 {
   "security.delete_role":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-delete-role.html",
-      "description":"Removes roles in the native realm."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-security-delete-role",
+      "description":"Delete roles"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/security.delete_role_mapping.json b/rest-api-spec/src/main/resources/rest-api-spec/api/security.delete_role_mapping.json
index ac73fb4d7ccbb..c19c283a475fa 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/security.delete_role_mapping.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/security.delete_role_mapping.json
@@ -1,8 +1,8 @@
 {
   "security.delete_role_mapping":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-delete-role-mapping.html",
-      "description":"Removes role mappings."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-security-delete-role-mapping",
+      "description":"Delete role mappings"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/security.delete_service_token.json b/rest-api-spec/src/main/resources/rest-api-spec/api/security.delete_service_token.json
index 4da3ec30b5ce7..0c24e6e3d22af 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/security.delete_service_token.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/security.delete_service_token.json
@@ -1,8 +1,8 @@
 {
   "security.delete_service_token":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-delete-service-token.html",
-      "description":"Deletes a service account token."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-security-delete-service-token",
+      "description":"Delete service account tokens"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/security.delete_user.json b/rest-api-spec/src/main/resources/rest-api-spec/api/security.delete_user.json
index 2c7e1091a0e82..54e1bc07e0dbe 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/security.delete_user.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/security.delete_user.json
@@ -1,8 +1,8 @@
 {
   "security.delete_user":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-delete-user.html",
-      "description":"Deletes users from the native realm."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-security-delete-user",
+      "description":"Delete users"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/security.disable_user.json b/rest-api-spec/src/main/resources/rest-api-spec/api/security.disable_user.json
index 0dead4d592d96..f7413181f27e0 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/security.disable_user.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/security.disable_user.json
@@ -1,8 +1,8 @@
 {
   "security.disable_user":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-disable-user.html",
-      "description":"Disables users in the native realm."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-security-disable-user",
+      "description":"Disable users"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/security.disable_user_profile.json b/rest-api-spec/src/main/resources/rest-api-spec/api/security.disable_user_profile.json
index 77e8744f03056..0402d658c6852 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/security.disable_user_profile.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/security.disable_user_profile.json
@@ -1,8 +1,8 @@
 {
   "security.disable_user_profile":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/security-api-disable-user-profile.html",
-      "description":"Disables a user profile so it's not visible in user profile searches."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-security-disable-user-profile",
+      "description":"Disable a user profile"
     },
     "stability":"stable",
     "visibility":"private",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/security.enable_user.json b/rest-api-spec/src/main/resources/rest-api-spec/api/security.enable_user.json
index 6218a04c9ae06..565cab13de39e 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/security.enable_user.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/security.enable_user.json
@@ -1,8 +1,8 @@
 {
   "security.enable_user":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-enable-user.html",
-      "description":"Enables users in the native realm."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-security-enable-user",
+      "description":"Enable users"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/security.enable_user_profile.json b/rest-api-spec/src/main/resources/rest-api-spec/api/security.enable_user_profile.json
index 1b42ec401440f..58b939042686f 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/security.enable_user_profile.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/security.enable_user_profile.json
@@ -1,8 +1,8 @@
 {
   "security.enable_user_profile":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/security-api-enable-user-profile.html",
-      "description":"Enables a user profile so it's visible in user profile searches."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-security-enable-user-profile",
+      "description":"Enable a user profile"
     },
     "stability":"stable",
     "visibility":"private",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/security.enroll_kibana.json b/rest-api-spec/src/main/resources/rest-api-spec/api/security.enroll_kibana.json
index b3e961d64df6e..49bd75777bd0c 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/security.enroll_kibana.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/security.enroll_kibana.json
@@ -1,8 +1,8 @@
 {
   "security.enroll_kibana":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/security-api-kibana-enrollment.html",
-      "description":"Allows a kibana instance to configure itself to communicate with a secured elasticsearch cluster."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-security-enroll-kibana",
+      "description":"Enroll Kibana"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/security.enroll_node.json b/rest-api-spec/src/main/resources/rest-api-spec/api/security.enroll_node.json
index 17b88859033b4..f047ef728941c 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/security.enroll_node.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/security.enroll_node.json
@@ -1,8 +1,8 @@
 {
   "security.enroll_node":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/security-api-node-enrollment.html",
-      "description":"Allows a new node to enroll to an existing cluster with security enabled."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-security-enroll-node",
+      "description":"Enroll a node"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/security.get_api_key.json b/rest-api-spec/src/main/resources/rest-api-spec/api/security.get_api_key.json
index 4df007a072bf1..679c60ce89291 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/security.get_api_key.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/security.get_api_key.json
@@ -1,8 +1,8 @@
 {
   "security.get_api_key":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-get-api-key.html",
-      "description":"Retrieves information for one or more API keys."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-security-get-api-key",
+      "description":"Get API key information"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/security.get_builtin_privileges.json b/rest-api-spec/src/main/resources/rest-api-spec/api/security.get_builtin_privileges.json
index 96ab86a613bad..f2fff0a5e8ccf 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/security.get_builtin_privileges.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/security.get_builtin_privileges.json
@@ -1,8 +1,8 @@
 {
   "security.get_builtin_privileges":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-get-builtin-privileges.html",
-      "description":"Retrieves the list of cluster privileges and index privileges that are available in this version of Elasticsearch."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-security-get-builtin-privileges",
+      "description":"Get builtin privileges"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/security.get_privileges.json b/rest-api-spec/src/main/resources/rest-api-spec/api/security.get_privileges.json
index 278e8ad2b2e1c..f9d612f557e75 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/security.get_privileges.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/security.get_privileges.json
@@ -1,8 +1,8 @@
 {
   "security.get_privileges":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-get-privileges.html",
-      "description":"Retrieves application privileges."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-security-get-privileges",
+      "description":"Get application privileges"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/security.get_role.json b/rest-api-spec/src/main/resources/rest-api-spec/api/security.get_role.json
index d5a583f0dda98..7f8fb60e9f396 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/security.get_role.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/security.get_role.json
@@ -1,8 +1,8 @@
 {
   "security.get_role":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-get-role.html",
-      "description":"Retrieves roles in the native realm."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-security-get-role",
+      "description":"Get roles"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/security.get_role_mapping.json b/rest-api-spec/src/main/resources/rest-api-spec/api/security.get_role_mapping.json
index 88a2f33d22876..6eef7de6a819b 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/security.get_role_mapping.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/security.get_role_mapping.json
@@ -1,8 +1,8 @@
 {
   "security.get_role_mapping":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-get-role-mapping.html",
-      "description":"Retrieves role mappings."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-security-get-role-mapping",
+      "description":"Get role mappings"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/security.get_service_accounts.json b/rest-api-spec/src/main/resources/rest-api-spec/api/security.get_service_accounts.json
index 019fdddd7f17c..38e638a8bcfb4 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/security.get_service_accounts.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/security.get_service_accounts.json
@@ -1,8 +1,8 @@
 {
   "security.get_service_accounts":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-get-service-accounts.html",
-      "description":"Retrieves information about service accounts."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-security-get-service-accounts",
+      "description":"Get service accounts"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/security.get_service_credentials.json b/rest-api-spec/src/main/resources/rest-api-spec/api/security.get_service_credentials.json
index d3668cbabc8ef..a77225499c03c 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/security.get_service_credentials.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/security.get_service_credentials.json
@@ -1,8 +1,8 @@
 {
   "security.get_service_credentials":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-get-service-credentials.html",
-      "description":"Retrieves information of all service credentials for a service account."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-security-get-service-credentials",
+      "description":"Get service account credentials"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/security.get_settings.json b/rest-api-spec/src/main/resources/rest-api-spec/api/security.get_settings.json
index 6339d8a6dee9c..2bb8b3a595374 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/security.get_settings.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/security.get_settings.json
@@ -1,8 +1,8 @@
 {
   "security.get_settings":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-get-settings.html",
-      "description":"Retrieve settings for the security system indices"
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-security-get-settings",
+      "description":"Get security index settings"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/security.get_token.json b/rest-api-spec/src/main/resources/rest-api-spec/api/security.get_token.json
index 356391a61b5d4..d33eac18b9572 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/security.get_token.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/security.get_token.json
@@ -1,8 +1,8 @@
 {
   "security.get_token":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-get-token.html",
-      "description":"Creates a bearer token for access without requiring basic authentication."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-security-get-token",
+      "description":"Get a token"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/security.get_user.json b/rest-api-spec/src/main/resources/rest-api-spec/api/security.get_user.json
index 4545d932e6956..6516b70a7e9a5 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/security.get_user.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/security.get_user.json
@@ -1,8 +1,8 @@
 {
   "security.get_user":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-get-user.html",
-      "description":"Retrieves information about users in the native realm and built-in users."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-security-get-user",
+      "description":"Get users"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/security.get_user_privileges.json b/rest-api-spec/src/main/resources/rest-api-spec/api/security.get_user_privileges.json
index a67a327b71f30..fa746abeb22be 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/security.get_user_privileges.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/security.get_user_privileges.json
@@ -1,8 +1,8 @@
 {
   "security.get_user_privileges":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-get-user-privileges.html",
-      "description":"Retrieves security privileges for the logged in user."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-security-get-user-privileges",
+      "description":"Get user privileges"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/security.get_user_profile.json b/rest-api-spec/src/main/resources/rest-api-spec/api/security.get_user_profile.json
index 7ba652b9bd74b..f378decda09cb 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/security.get_user_profile.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/security.get_user_profile.json
@@ -1,8 +1,8 @@
 {
   "security.get_user_profile":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-get-user-profile.html",
-      "description":"Retrieves user profiles for the given unique ID(s)."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-security-get-user-profile",
+      "description":"Get a user profile"
     },
     "stability":"stable",
     "visibility":"private",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/security.grant_api_key.json b/rest-api-spec/src/main/resources/rest-api-spec/api/security.grant_api_key.json
index f3cc37bd7450e..e24e3cf357dd1 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/security.grant_api_key.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/security.grant_api_key.json
@@ -1,8 +1,8 @@
 {
   "security.grant_api_key":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-grant-api-key.html",
-      "description":"Creates an API key on behalf of another user."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-security-grant-api-key",
+      "description":"Grant an API key"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/security.has_privileges.json b/rest-api-spec/src/main/resources/rest-api-spec/api/security.has_privileges.json
index 3e6efeb1c2e51..3b66c470846fd 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/security.has_privileges.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/security.has_privileges.json
@@ -1,8 +1,8 @@
 {
   "security.has_privileges":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-has-privileges.html",
-      "description":"Determines whether the specified user has a specified list of privileges."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-security-has-privileges",
+      "description":"Check user privileges"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/security.has_privileges_user_profile.json b/rest-api-spec/src/main/resources/rest-api-spec/api/security.has_privileges_user_profile.json
index 8152170ac939a..66e23de3f56ca 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/security.has_privileges_user_profile.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/security.has_privileges_user_profile.json
@@ -1,8 +1,8 @@
 {
   "security.has_privileges_user_profile":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-has-privileges-user-profile.html",
-      "description":"Determines whether the users associated with the specified profile IDs have all the requested privileges."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-security-has-privileges-user-profile",
+      "description":"Check user profile privileges"
     },
     "stability":"stable",
     "visibility":"private",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/security.invalidate_api_key.json b/rest-api-spec/src/main/resources/rest-api-spec/api/security.invalidate_api_key.json
index bdf33859d03c0..5618faf0cbf77 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/security.invalidate_api_key.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/security.invalidate_api_key.json
@@ -1,8 +1,8 @@
 {
   "security.invalidate_api_key":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-invalidate-api-key.html",
-      "description":"Invalidates one or more API keys."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-security-invalidate-api-key",
+      "description":"Invalidate API keys"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/security.invalidate_token.json b/rest-api-spec/src/main/resources/rest-api-spec/api/security.invalidate_token.json
index cf4b56a4e2f07..20dc23f1234b2 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/security.invalidate_token.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/security.invalidate_token.json
@@ -1,8 +1,8 @@
 {
   "security.invalidate_token":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-invalidate-token.html",
-      "description":"Invalidates one or more access tokens or refresh tokens."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-security-invalidate-token",
+      "description":"Invalidate a token"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/security.oidc_authenticate.json b/rest-api-spec/src/main/resources/rest-api-spec/api/security.oidc_authenticate.json
index 969f5e350705f..5ef393cf64d36 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/security.oidc_authenticate.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/security.oidc_authenticate.json
@@ -1,8 +1,8 @@
 {
   "security.oidc_authenticate":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-oidc-authenticate.html",
-      "description":"Exchanges an OpenID Connection authentication response message for an Elasticsearch access token and refresh token pair"
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-security-oidc-authenticate",
+      "description":"Authenticate OpenID Connect"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/security.oidc_logout.json b/rest-api-spec/src/main/resources/rest-api-spec/api/security.oidc_logout.json
index 83f16e5c4de6c..29b07956b62d9 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/security.oidc_logout.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/security.oidc_logout.json
@@ -1,8 +1,8 @@
 {
   "security.oidc_logout":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-oidc-logout.html",
-      "description":"Invalidates a refresh token and access token that was generated from the OpenID Connect Authenticate API"
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-security-oidc-logout",
+      "description":"Logout of OpenID Connect"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/security.oidc_prepare_authentication.json b/rest-api-spec/src/main/resources/rest-api-spec/api/security.oidc_prepare_authentication.json
index fed4897037435..d1b8727f8caa7 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/security.oidc_prepare_authentication.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/security.oidc_prepare_authentication.json
@@ -1,8 +1,8 @@
 {
   "security.oidc_prepare_authentication":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-oidc-prepare-authentication.html",
-      "description":"Creates an OAuth 2.0 authentication request as a URL string"
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-security-oidc-prepare-authentication",
+      "description":"Prepare OpenID connect authentication"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/security.put_privileges.json b/rest-api-spec/src/main/resources/rest-api-spec/api/security.put_privileges.json
index 8c920e10f285b..63f235c41c31d 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/security.put_privileges.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/security.put_privileges.json
@@ -1,8 +1,8 @@
 {
   "security.put_privileges":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-put-privileges.html",
-      "description":"Adds or updates application privileges."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-security-put-privileges",
+      "description":"Create or update application privileges"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/security.put_role.json b/rest-api-spec/src/main/resources/rest-api-spec/api/security.put_role.json
index 687bbe561390d..5c09d59be45b1 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/security.put_role.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/security.put_role.json
@@ -1,8 +1,8 @@
 {
   "security.put_role":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-put-role.html",
-      "description":"Adds and updates roles in the native realm."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-security-put-role",
+      "description":"Create or update roles"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/security.put_role_mapping.json b/rest-api-spec/src/main/resources/rest-api-spec/api/security.put_role_mapping.json
index 12c7e8b1b722c..3d3a8762099ea 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/security.put_role_mapping.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/security.put_role_mapping.json
@@ -1,8 +1,8 @@
 {
   "security.put_role_mapping":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-put-role-mapping.html",
-      "description":"Creates and updates role mappings."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-security-put-role-mapping",
+      "description":"Create or update role mappings"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/security.put_user.json b/rest-api-spec/src/main/resources/rest-api-spec/api/security.put_user.json
index a3a170b2ecf0b..68b8332f8ecf7 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/security.put_user.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/security.put_user.json
@@ -1,8 +1,8 @@
 {
   "security.put_user":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-put-user.html",
-      "description":"Adds and updates users in the native realm. These users are commonly referred to as native users."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-security-put-user",
+      "description":"Create or update users"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/security.query_api_keys.json b/rest-api-spec/src/main/resources/rest-api-spec/api/security.query_api_keys.json
index de95f76ad49db..720ed55ffd252 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/security.query_api_keys.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/security.query_api_keys.json
@@ -1,8 +1,8 @@
 {
   "security.query_api_keys":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-query-api-key.html",
-      "description":"Retrieves information for API keys using a subset of query DSL"
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-security-query-api-keys",
+      "description":"Find API keys with a query"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/security.query_role.json b/rest-api-spec/src/main/resources/rest-api-spec/api/security.query_role.json
index d9f9d9f45ff69..4b41fb079ffc6 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/security.query_role.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/security.query_role.json
@@ -1,8 +1,8 @@
 {
   "security.query_role": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-query-role.html",
-      "description": "Retrieves information for Roles using a subset of query DSL"
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-security-query-role",
+      "description": "Find roles with a query"
     },
     "stability": "stable",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/security.query_user.json b/rest-api-spec/src/main/resources/rest-api-spec/api/security.query_user.json
index 9793e424e6f52..6173ec374c510 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/security.query_user.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/security.query_user.json
@@ -1,8 +1,8 @@
 {
   "security.query_user": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-query-user.html",
-      "description": "Retrieves information for Users using a subset of query DSL"
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-security-query-user",
+      "description": "Find users with a query"
     },
     "stability": "stable",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/security.saml_authenticate.json b/rest-api-spec/src/main/resources/rest-api-spec/api/security.saml_authenticate.json
index e1247d87319ea..67b4de67e2539 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/security.saml_authenticate.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/security.saml_authenticate.json
@@ -1,8 +1,8 @@
 {
   "security.saml_authenticate":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-saml-authenticate.html",
-      "description":"Exchanges a SAML Response message for an Elasticsearch access token and refresh token pair"
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-security-saml-authenticate",
+      "description":"Authenticate SAML"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/security.saml_complete_logout.json b/rest-api-spec/src/main/resources/rest-api-spec/api/security.saml_complete_logout.json
index 8a17b7a81c107..106973088c27f 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/security.saml_complete_logout.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/security.saml_complete_logout.json
@@ -1,8 +1,8 @@
 {
   "security.saml_complete_logout":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-saml-complete-logout.html",
-      "description":"Verifies the logout response sent from the SAML IdP"
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-security-saml-complete-logout",
+      "description":"Logout of SAML completely"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/security.saml_invalidate.json b/rest-api-spec/src/main/resources/rest-api-spec/api/security.saml_invalidate.json
index c18c338817901..2f523f9787157 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/security.saml_invalidate.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/security.saml_invalidate.json
@@ -1,8 +1,8 @@
 {
   "security.saml_invalidate":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-saml-invalidate.html",
-      "description":"Consumes a SAML LogoutRequest"
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-security-saml-invalidate",
+      "description":"Invalidate SAML"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/security.saml_logout.json b/rest-api-spec/src/main/resources/rest-api-spec/api/security.saml_logout.json
index 148805b16a853..3415cd92d836e 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/security.saml_logout.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/security.saml_logout.json
@@ -1,8 +1,8 @@
 {
   "security.saml_logout":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-saml-logout.html",
-      "description":"Invalidates an access token and a refresh token that were generated via the SAML Authenticate API"
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-security-saml-logout",
+      "description":"Logout of SAML"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/security.saml_prepare_authentication.json b/rest-api-spec/src/main/resources/rest-api-spec/api/security.saml_prepare_authentication.json
index 5691e0d0792ff..a336d45626332 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/security.saml_prepare_authentication.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/security.saml_prepare_authentication.json
@@ -1,8 +1,8 @@
 {
   "security.saml_prepare_authentication":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-saml-prepare-authentication.html",
-      "description":"Creates a SAML authentication request"
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-security-saml-prepare-authentication",
+      "description":"Prepare SAML authentication"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/security.saml_service_provider_metadata.json b/rest-api-spec/src/main/resources/rest-api-spec/api/security.saml_service_provider_metadata.json
index 7f7cd557821cc..3d9ffe33f3d74 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/security.saml_service_provider_metadata.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/security.saml_service_provider_metadata.json
@@ -1,8 +1,8 @@
 {
   "security.saml_service_provider_metadata":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-saml-sp-metadata.html",
-      "description":"Generates SAML metadata for the Elastic stack SAML 2.0 Service Provider"
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-security-saml-service-provider-metadata",
+      "description":"Create SAML service provider metadata"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/security.suggest_user_profiles.json b/rest-api-spec/src/main/resources/rest-api-spec/api/security.suggest_user_profiles.json
index b52b2b74469e8..1846497e4fa20 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/security.suggest_user_profiles.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/security.suggest_user_profiles.json
@@ -1,8 +1,8 @@
 {
   "security.suggest_user_profiles":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/security-api-suggest-user-profile.html",
-      "description":"Get suggestions for user profiles that match specified search criteria."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-security-suggest-user-profiles",
+      "description":"Suggest a user profile"
     },
     "stability":"stable",
     "visibility":"private",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/security.update_api_key.json b/rest-api-spec/src/main/resources/rest-api-spec/api/security.update_api_key.json
index ff79d3737113f..fce390eadbf13 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/security.update_api_key.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/security.update_api_key.json
@@ -1,8 +1,8 @@
 {
   "security.update_api_key": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-update-api-key.html",
-      "description": "Updates attributes of an existing API key."
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-security-update-api-key",
+      "description": "Update an API key"
     },
     "stability": "stable",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/security.update_cross_cluster_api_key.json b/rest-api-spec/src/main/resources/rest-api-spec/api/security.update_cross_cluster_api_key.json
index e59d6c1efccf8..de518d73732b2 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/security.update_cross_cluster_api_key.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/security.update_cross_cluster_api_key.json
@@ -1,8 +1,8 @@
 {
   "security.update_cross_cluster_api_key": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-update-cross-cluster-api-key.html",
-      "description": "Updates attributes of an existing cross-cluster API key."
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-security-update-cross-cluster-api-key",
+      "description": "Update a cross-cluster API key"
     },
     "stability": "stable",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/security.update_settings.json b/rest-api-spec/src/main/resources/rest-api-spec/api/security.update_settings.json
index 998548408c5db..bd71a49d99bb0 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/security.update_settings.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/security.update_settings.json
@@ -1,8 +1,8 @@
 {
   "security.update_settings":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-update-settings.html",
-      "description":"Update settings for the security system index"
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-security-update-settings",
+      "description":"Update security index settings"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/security.update_user_profile_data.json b/rest-api-spec/src/main/resources/rest-api-spec/api/security.update_user_profile_data.json
index 8324606a75b44..08089460c1127 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/security.update_user_profile_data.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/security.update_user_profile_data.json
@@ -1,8 +1,8 @@
 {
   "security.update_user_profile_data":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-update-user-profile-data.html",
-      "description":"Update application specific data for the user profile of the given unique ID."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-security-update-user-profile-data",
+      "description":"Update user profile data"
     },
     "stability":"stable",
     "visibility":"private",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/shutdown.delete_node.json b/rest-api-spec/src/main/resources/rest-api-spec/api/shutdown.delete_node.json
index 6f1ec484e94d0..cc7144077e4e9 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/shutdown.delete_node.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/shutdown.delete_node.json
@@ -1,8 +1,8 @@
 {
   "shutdown.delete_node":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current",
-      "description":"Removes a node from the shutdown list. Designed for indirect use by ECE/ESS and ECK. Direct use is not supported."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-shutdown-delete-node",
+      "description":"Cancel node shutdown preparations"
     },
     "stability":"stable",
     "visibility":"private",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/shutdown.get_node.json b/rest-api-spec/src/main/resources/rest-api-spec/api/shutdown.get_node.json
index b29bf5304f782..450f3a5088650 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/shutdown.get_node.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/shutdown.get_node.json
@@ -1,8 +1,8 @@
 {
   "shutdown.get_node":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current",
-      "description":"Retrieve status of a node or nodes that are currently marked as shutting down. Designed for indirect use by ECE/ESS and ECK. Direct use is not supported."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-shutdown-get-node",
+      "description":"Get the shutdown status"
     },
     "stability":"stable",
     "visibility":"private",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/shutdown.put_node.json b/rest-api-spec/src/main/resources/rest-api-spec/api/shutdown.put_node.json
index 90b19557f5fb2..3df5f36b48119 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/shutdown.put_node.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/shutdown.put_node.json
@@ -1,8 +1,8 @@
 {
   "shutdown.put_node":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current",
-      "description":"Adds a node to be shut down. Designed for indirect use by ECE/ESS and ECK. Direct use is not supported."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-shutdown-put-node",
+      "description":"Prepare a node to be shut down"
     },
     "stability":"stable",
     "visibility":"private",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/simulate.ingest.json b/rest-api-spec/src/main/resources/rest-api-spec/api/simulate.ingest.json
index 0c90514692f95..72cc80aef4db7 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/simulate.ingest.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/simulate.ingest.json
@@ -1,8 +1,8 @@
 {
   "simulate.ingest":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/simulate-ingest-api.html",
-      "description":"Simulates running ingest with example documents."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-simulate-ingest",
+      "description":"Simulate data ingestion"
     },
     "stability":"experimental",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/slm.delete_lifecycle.json b/rest-api-spec/src/main/resources/rest-api-spec/api/slm.delete_lifecycle.json
index 1d66312f053c7..a29caba21a016 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/slm.delete_lifecycle.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/slm.delete_lifecycle.json
@@ -1,8 +1,8 @@
 {
   "slm.delete_lifecycle":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/slm-api-delete-policy.html",
-      "description":"Deletes an existing snapshot lifecycle policy."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-slm-delete-lifecycle",
+      "description":"Delete a policy"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/slm.execute_lifecycle.json b/rest-api-spec/src/main/resources/rest-api-spec/api/slm.execute_lifecycle.json
index 71f1727a8638b..e2ff85a2c4697 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/slm.execute_lifecycle.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/slm.execute_lifecycle.json
@@ -1,8 +1,8 @@
 {
   "slm.execute_lifecycle":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/slm-api-execute-lifecycle.html",
-      "description":"Immediately creates a snapshot according to the lifecycle policy, without waiting for the scheduled time."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-slm-execute-lifecycle",
+      "description":"Run a policy"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/slm.execute_retention.json b/rest-api-spec/src/main/resources/rest-api-spec/api/slm.execute_retention.json
index 4166122d5bf1d..dc3777d8a9b97 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/slm.execute_retention.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/slm.execute_retention.json
@@ -1,8 +1,8 @@
 {
   "slm.execute_retention":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/slm-api-execute-retention.html",
-      "description":"Deletes any snapshots that are expired according to the policy's retention rules."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-slm-execute-retention",
+      "description":"Run a retention policy"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/slm.get_lifecycle.json b/rest-api-spec/src/main/resources/rest-api-spec/api/slm.get_lifecycle.json
index 406fee6015522..5f543ba257953 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/slm.get_lifecycle.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/slm.get_lifecycle.json
@@ -1,8 +1,8 @@
 {
   "slm.get_lifecycle":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/slm-api-get-policy.html",
-      "description":"Retrieves one or more snapshot lifecycle policy definitions and information about the latest snapshot attempts."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-slm-get-lifecycle",
+      "description":"Get policy information"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/slm.get_stats.json b/rest-api-spec/src/main/resources/rest-api-spec/api/slm.get_stats.json
index 05281ff46cb8d..ffe51da671641 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/slm.get_stats.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/slm.get_stats.json
@@ -1,8 +1,8 @@
 {
   "slm.get_stats":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/slm-api-get-stats.html",
-      "description":"Returns global and policy-level statistics about actions taken by snapshot lifecycle management."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-slm-get-stats",
+      "description":"Get snapshot lifecycle management statistics"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/slm.get_status.json b/rest-api-spec/src/main/resources/rest-api-spec/api/slm.get_status.json
index 404f92f55921f..95b583e5c57fd 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/slm.get_status.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/slm.get_status.json
@@ -1,8 +1,8 @@
 {
   "slm.get_status":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/slm-api-get-status.html",
-      "description":"Retrieves the status of snapshot lifecycle management (SLM)."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-slm-get-status",
+      "description":"Get the snapshot lifecycle management status"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/slm.put_lifecycle.json b/rest-api-spec/src/main/resources/rest-api-spec/api/slm.put_lifecycle.json
index 621ed870ffdbe..9e6c32289b632 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/slm.put_lifecycle.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/slm.put_lifecycle.json
@@ -1,8 +1,8 @@
 {
   "slm.put_lifecycle":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/slm-api-put-policy.html",
-      "description":"Creates or updates a snapshot lifecycle policy."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-slm-put-lifecycle",
+      "description":"Create or update a policy"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/slm.start.json b/rest-api-spec/src/main/resources/rest-api-spec/api/slm.start.json
index e8932ab3020a0..d293b169f0dfc 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/slm.start.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/slm.start.json
@@ -1,8 +1,8 @@
 {
   "slm.start":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/slm-api-start.html",
-      "description":"Turns on snapshot lifecycle management (SLM)."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-slm-start",
+      "description":"Start snapshot lifecycle management"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/slm.stop.json b/rest-api-spec/src/main/resources/rest-api-spec/api/slm.stop.json
index 3762a237d2168..3fe7c78ac3334 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/slm.stop.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/slm.stop.json
@@ -1,8 +1,8 @@
 {
   "slm.stop":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/slm-api-stop.html",
-      "description":"Turns off snapshot lifecycle management (SLM)."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-slm-stop",
+      "description":"Stop snapshot lifecycle management"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/snapshot.cleanup_repository.json b/rest-api-spec/src/main/resources/rest-api-spec/api/snapshot.cleanup_repository.json
index 3d048bf671c49..3e80fb4dbc0d5 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/snapshot.cleanup_repository.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/snapshot.cleanup_repository.json
@@ -1,8 +1,8 @@
 {
   "snapshot.cleanup_repository": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/clean-up-snapshot-repo-api.html",
-      "description": "Removes stale data from repository."
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-snapshot-cleanup-repository",
+      "description": "Clean up the snapshot repository"
     },
     "stability": "stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/snapshot.clone.json b/rest-api-spec/src/main/resources/rest-api-spec/api/snapshot.clone.json
index da9409110aab4..3006a514bc6df 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/snapshot.clone.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/snapshot.clone.json
@@ -1,8 +1,8 @@
 {
   "snapshot.clone":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/modules-snapshots.html",
-      "description":"Clones indices from one snapshot into another snapshot in the same repository."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-snapshot-clone",
+      "description":"Clone a snapshot"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/snapshot.create.json b/rest-api-spec/src/main/resources/rest-api-spec/api/snapshot.create.json
index 7f70def77adf5..352f68ab2f988 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/snapshot.create.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/snapshot.create.json
@@ -1,8 +1,8 @@
 {
   "snapshot.create":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/modules-snapshots.html",
-      "description":"Creates a snapshot in a repository."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-snapshot-create",
+      "description":"Create a snapshot"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/snapshot.create_repository.json b/rest-api-spec/src/main/resources/rest-api-spec/api/snapshot.create_repository.json
index 504abd3d0765d..de7430167b4d8 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/snapshot.create_repository.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/snapshot.create_repository.json
@@ -1,8 +1,8 @@
 {
   "snapshot.create_repository":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/modules-snapshots.html",
-      "description":"Creates a repository."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-snapshot-create-repository",
+      "description":"Create or update a snapshot repository"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/snapshot.delete.json b/rest-api-spec/src/main/resources/rest-api-spec/api/snapshot.delete.json
index 74a6a0a76eda6..af0adb7f24d25 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/snapshot.delete.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/snapshot.delete.json
@@ -1,8 +1,8 @@
 {
   "snapshot.delete":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/modules-snapshots.html",
-      "description":"Deletes one or more snapshots."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-snapshot-delete",
+      "description":"Delete snapshots"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/snapshot.delete_repository.json b/rest-api-spec/src/main/resources/rest-api-spec/api/snapshot.delete_repository.json
index 8b6ce52d382f5..58d09fb7a07cd 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/snapshot.delete_repository.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/snapshot.delete_repository.json
@@ -1,8 +1,8 @@
 {
   "snapshot.delete_repository":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/modules-snapshots.html",
-      "description":"Deletes a repository."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-snapshot-delete-repository",
+      "description":"Delete snapshot repositories"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/snapshot.get.json b/rest-api-spec/src/main/resources/rest-api-spec/api/snapshot.get.json
index f40042c1b0dac..b5f6fd5d2997f 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/snapshot.get.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/snapshot.get.json
@@ -1,8 +1,8 @@
 {
   "snapshot.get":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/modules-snapshots.html",
-      "description":"Returns information about a snapshot."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-snapshot-get",
+      "description":"Get snapshot information"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/snapshot.get_repository.json b/rest-api-spec/src/main/resources/rest-api-spec/api/snapshot.get_repository.json
index c85d018079697..6e857896ff925 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/snapshot.get_repository.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/snapshot.get_repository.json
@@ -1,8 +1,8 @@
 {
   "snapshot.get_repository":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/modules-snapshots.html",
-      "description":"Returns information about a repository."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-snapshot-get-repository",
+      "description":"Get snapshot repository information"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/snapshot.repository_analyze.json b/rest-api-spec/src/main/resources/rest-api-spec/api/snapshot.repository_analyze.json
index 0b2bb66c709d7..cdaba4ea5809b 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/snapshot.repository_analyze.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/snapshot.repository_analyze.json
@@ -1,8 +1,8 @@
 {
   "snapshot.repository_analyze":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/modules-snapshots.html",
-      "description":"Analyzes a repository for correctness and performance"
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-snapshot-repository-analyze",
+      "description":"Analyze a snapshot repository"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/snapshot.repository_verify_integrity.json b/rest-api-spec/src/main/resources/rest-api-spec/api/snapshot.repository_verify_integrity.json
index 746b8ec36e993..f01ac84484692 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/snapshot.repository_verify_integrity.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/snapshot.repository_verify_integrity.json
@@ -1,8 +1,8 @@
 {
   "snapshot.repository_verify_integrity":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/modules-snapshots.html",
-      "description":"Verifies the integrity of the contents of a snapshot repository"
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-snapshot-repository-verify-integrity",
+      "description":"Verify the repository integrity"
     },
     "stability":"experimental",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/snapshot.restore.json b/rest-api-spec/src/main/resources/rest-api-spec/api/snapshot.restore.json
index c4ecb5571dafe..cffff36bdafe9 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/snapshot.restore.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/snapshot.restore.json
@@ -1,8 +1,8 @@
 {
   "snapshot.restore":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/modules-snapshots.html",
-      "description":"Restores a snapshot."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-snapshot-restore",
+      "description":"Restore a snapshot"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/snapshot.status.json b/rest-api-spec/src/main/resources/rest-api-spec/api/snapshot.status.json
index e5f1af202d3e9..abf7d598fb0a4 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/snapshot.status.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/snapshot.status.json
@@ -1,8 +1,8 @@
 {
   "snapshot.status":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/modules-snapshots.html",
-      "description":"Returns information about the status of a snapshot."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-snapshot-status",
+      "description":"Get the snapshot status"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/snapshot.verify_repository.json b/rest-api-spec/src/main/resources/rest-api-spec/api/snapshot.verify_repository.json
index ce5c1d2935ddb..c64301de4d303 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/snapshot.verify_repository.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/snapshot.verify_repository.json
@@ -1,8 +1,8 @@
 {
   "snapshot.verify_repository":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/modules-snapshots.html",
-      "description":"Verifies a repository."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-snapshot-verify-repository",
+      "description":"Verify a snapshot repository"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/sql.clear_cursor.json b/rest-api-spec/src/main/resources/rest-api-spec/api/sql.clear_cursor.json
index f36f623816b6f..a70c9c07ccba6 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/sql.clear_cursor.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/sql.clear_cursor.json
@@ -1,8 +1,8 @@
 {
   "sql.clear_cursor":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/clear-sql-cursor-api.html",
-      "description":"Clears the SQL cursor"
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-sql-clear-cursor",
+      "description":"Clear an SQL search cursor"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/sql.delete_async.json b/rest-api-spec/src/main/resources/rest-api-spec/api/sql.delete_async.json
index 1a2a6f6c4c052..bc0165b0eed68 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/sql.delete_async.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/sql.delete_async.json
@@ -1,8 +1,8 @@
 {
   "sql.delete_async": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/delete-async-sql-search-api.html",
-      "description": "Deletes an async SQL search or a stored synchronous SQL search. If the search is still running, the API cancels it."
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-sql-delete-async",
+      "description": "Delete an async SQL search"
     },
     "stability": "stable",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/sql.get_async.json b/rest-api-spec/src/main/resources/rest-api-spec/api/sql.get_async.json
index d0a5a3c565a18..fda1c3e40b861 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/sql.get_async.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/sql.get_async.json
@@ -1,8 +1,8 @@
 {
   "sql.get_async": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/get-async-sql-search-api.html",
-      "description": "Returns the current status and available results for an async SQL search or stored synchronous SQL search"
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-sql-get-async",
+      "description": "Get async SQL search results"
     },
     "stability": "stable",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/sql.get_async_status.json b/rest-api-spec/src/main/resources/rest-api-spec/api/sql.get_async_status.json
index d433063d93c85..739116eb79d63 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/sql.get_async_status.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/sql.get_async_status.json
@@ -1,8 +1,8 @@
 {
   "sql.get_async_status": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/get-async-sql-search-status-api.html",
-      "description": "Returns the current status of an async SQL search or a stored synchronous SQL search"
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-sql-get-async-status",
+      "description": "Get the async SQL search status"
     },
     "stability": "stable",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/sql.query.json b/rest-api-spec/src/main/resources/rest-api-spec/api/sql.query.json
index a3fe47ecdf40e..64a9e6a3c4fd0 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/sql.query.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/sql.query.json
@@ -1,8 +1,8 @@
 {
   "sql.query":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-search-api.html",
-      "description":"Executes a SQL request"
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-sql-query",
+      "description":"Get SQL search results"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/sql.translate.json b/rest-api-spec/src/main/resources/rest-api-spec/api/sql.translate.json
index 99f9216f88ce6..70bb7928eaedb 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/sql.translate.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/sql.translate.json
@@ -1,8 +1,8 @@
 {
   "sql.translate":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-translate-api.html",
-      "description":"Translates SQL into Elasticsearch queries"
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-sql-translate",
+      "description":"Translate SQL into Elasticsearch queries"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ssl.certificates.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ssl.certificates.json
index 233bc0882a87f..62864e3e08a0f 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ssl.certificates.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ssl.certificates.json
@@ -1,8 +1,8 @@
 {
   "ssl.certificates":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-ssl.html",
-      "description":"Retrieves information about the X.509 certificates used to encrypt communications in the cluster."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-ssl-certificates",
+      "description":"Get SSL certificates"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/synonyms.delete_synonym.json b/rest-api-spec/src/main/resources/rest-api-spec/api/synonyms.delete_synonym.json
index 9273a8dea87c3..8e57140c98db2 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/synonyms.delete_synonym.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/synonyms.delete_synonym.json
@@ -1,8 +1,8 @@
 {
   "synonyms.delete_synonym": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/delete-synonyms-set.html",
-      "description": "Deletes a synonym set"
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-synonyms-delete-synonym",
+      "description": "Delete a synonym set"
     },
     "stability": "stable",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/synonyms.delete_synonym_rule.json b/rest-api-spec/src/main/resources/rest-api-spec/api/synonyms.delete_synonym_rule.json
index e2285bbd6d4ae..27f1f8a0e6c3d 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/synonyms.delete_synonym_rule.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/synonyms.delete_synonym_rule.json
@@ -1,8 +1,8 @@
 {
   "synonyms.delete_synonym_rule": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/delete-synonym-rule.html",
-      "description": "Deletes a synonym rule in a synonym set"
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-synonyms-delete-synonym-rule",
+      "description": "Delete a synonym rule"
     },
     "stability": "stable",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/synonyms.get_synonym.json b/rest-api-spec/src/main/resources/rest-api-spec/api/synonyms.get_synonym.json
index 25c177cabbdf1..0ad768f17af2c 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/synonyms.get_synonym.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/synonyms.get_synonym.json
@@ -1,8 +1,8 @@
 {
   "synonyms.get_synonym": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/get-synonyms-set.html",
-      "description": "Retrieves a synonym set"
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-synonyms-get-synonym",
+      "description": "Get a synonym set"
     },
     "stability": "stable",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/synonyms.get_synonym_rule.json b/rest-api-spec/src/main/resources/rest-api-spec/api/synonyms.get_synonym_rule.json
index ff9e7eb57b8a7..6d2ffa94454f2 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/synonyms.get_synonym_rule.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/synonyms.get_synonym_rule.json
@@ -1,8 +1,8 @@
 {
   "synonyms.get_synonym_rule": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/get-synonym-rule.html",
-      "description": "Retrieves a synonym rule from a synonym set"
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-synonyms-get-synonym-rule",
+      "description": "Get a synonym rule"
     },
     "stability": "stable",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/synonyms.get_synonyms_sets.json b/rest-api-spec/src/main/resources/rest-api-spec/api/synonyms.get_synonyms_sets.json
index d94bef32cddcd..ebe170994f534 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/synonyms.get_synonyms_sets.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/synonyms.get_synonyms_sets.json
@@ -1,8 +1,8 @@
 {
   "synonyms.get_synonyms_sets": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/list-synonyms-sets.html",
-      "description": "Retrieves a summary of all defined synonym sets"
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-synonyms-get-synonym",
+      "description": "Get all synonym sets"
     },
     "stability": "stable",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/synonyms.put_synonym.json b/rest-api-spec/src/main/resources/rest-api-spec/api/synonyms.put_synonym.json
index 3e700163e1738..627f364a465ea 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/synonyms.put_synonym.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/synonyms.put_synonym.json
@@ -1,8 +1,8 @@
 {
   "synonyms.put_synonym": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/put-synonyms-set.html",
-      "description": "Creates or updates a synonyms set"
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-synonyms-put-synonym",
+      "description": "Create or update a synonym set"
     },
     "stability": "stable",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/synonyms.put_synonym_rule.json b/rest-api-spec/src/main/resources/rest-api-spec/api/synonyms.put_synonym_rule.json
index 55edd65a8beb2..f0a028ecbe9e2 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/synonyms.put_synonym_rule.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/synonyms.put_synonym_rule.json
@@ -1,8 +1,8 @@
 {
   "synonyms.put_synonym_rule": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/put-synonym-rule.html",
-      "description": "Creates or updates a synonym rule in a synonym set"
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-synonyms-put-synonym-rule",
+      "description": "Create or update a synonym rule"
     },
     "stability": "stable",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/tasks.cancel.json b/rest-api-spec/src/main/resources/rest-api-spec/api/tasks.cancel.json
index 525c72aaa2748..039dd8770a858 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/tasks.cancel.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/tasks.cancel.json
@@ -1,8 +1,8 @@
 {
   "tasks.cancel":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/tasks.html",
-      "description":"Cancels a task, if it can be cancelled through an API."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/group/endpoint-tasks",
+      "description":"Cancel a task"
     },
     "stability":"experimental",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/tasks.get.json b/rest-api-spec/src/main/resources/rest-api-spec/api/tasks.get.json
index 0863e05b97f93..3b3a3b94c84e5 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/tasks.get.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/tasks.get.json
@@ -1,8 +1,8 @@
 {
   "tasks.get":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/tasks.html",
-      "description":"Returns information about a task."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/group/endpoint-tasks",
+      "description":"Get task information"
     },
     "stability":"experimental",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/tasks.list.json b/rest-api-spec/src/main/resources/rest-api-spec/api/tasks.list.json
index 058ff36368308..ce3098994fac6 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/tasks.list.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/tasks.list.json
@@ -1,8 +1,8 @@
 {
   "tasks.list":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/tasks.html",
-      "description":"Returns a list of tasks."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/group/endpoint-tasks",
+      "description":"Get all tasks"
     },
     "stability":"experimental",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/terms_enum.json b/rest-api-spec/src/main/resources/rest-api-spec/api/terms_enum.json
index 1050eb4b18fe8..ee13ef6a464f0 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/terms_enum.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/terms_enum.json
@@ -1,8 +1,8 @@
 {
   "terms_enum":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/search-terms-enum.html",
-      "description": "The terms enum API  can be used to discover terms in the index that begin with the provided string. It is designed for low-latency look-ups used in auto-complete scenarios."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-terms-enum",
+      "description": "Get terms in an index"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/termvectors.json b/rest-api-spec/src/main/resources/rest-api-spec/api/termvectors.json
index de8cfc684b36a..57bbc21b260f6 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/termvectors.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/termvectors.json
@@ -1,8 +1,8 @@
 {
   "termvectors":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/docs-termvectors.html",
-      "description":"Returns information and statistics about terms in the fields of a particular document."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-termvectors",
+      "description":"Get term vector information"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/text_structure.find_field_structure.json b/rest-api-spec/src/main/resources/rest-api-spec/api/text_structure.find_field_structure.json
index f82e2ca2d190f..2674dd5b4dffb 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/text_structure.find_field_structure.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/text_structure.find_field_structure.json
@@ -1,8 +1,8 @@
 {
   "text_structure.find_field_structure":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/find-field-structure.html",
-      "description":"Finds the structure of a text field in an index."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/group/endpoint-text_structure",
+      "description":"Find the structure of a text field"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/text_structure.find_message_structure.json b/rest-api-spec/src/main/resources/rest-api-spec/api/text_structure.find_message_structure.json
index d839e4b048f7d..852607cb4296f 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/text_structure.find_message_structure.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/text_structure.find_message_structure.json
@@ -1,8 +1,8 @@
 {
   "text_structure.find_message_structure":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/find-message-structure.html",
-      "description":"Finds the structure of a list of messages. The messages must contain data that is suitable to be ingested into Elasticsearch."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-text-structure-find-message-structure",
+      "description":"Find the structure of text messages"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/text_structure.find_structure.json b/rest-api-spec/src/main/resources/rest-api-spec/api/text_structure.find_structure.json
index c244db7aa8351..64370a67e617c 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/text_structure.find_structure.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/text_structure.find_structure.json
@@ -1,8 +1,8 @@
 {
   "text_structure.find_structure":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/find-structure.html",
-      "description":"Finds the structure of a text file. The text file must contain data that is suitable to be ingested into Elasticsearch."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-text-structure-find-structure",
+      "description":"Find the structure of a text file"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/text_structure.test_grok_pattern.json b/rest-api-spec/src/main/resources/rest-api-spec/api/text_structure.test_grok_pattern.json
index b291ce6b87e8e..c8ee70313d31c 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/text_structure.test_grok_pattern.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/text_structure.test_grok_pattern.json
@@ -1,8 +1,8 @@
 {
   "text_structure.test_grok_pattern": {
     "documentation": {
-      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/test-grok-pattern.html",
-      "description": "Tests a Grok pattern on some text."
+      "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-text-structure-test-grok-pattern",
+      "description": "Test a Grok pattern"
     },
     "stability": "stable",
     "visibility": "public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/transform.delete_transform.json b/rest-api-spec/src/main/resources/rest-api-spec/api/transform.delete_transform.json
index 1af53ec0e8c3a..b9f1b7419568a 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/transform.delete_transform.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/transform.delete_transform.json
@@ -1,8 +1,8 @@
 {
   "transform.delete_transform":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/delete-transform.html",
-      "description":"Deletes an existing transform."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-transform-delete-transform",
+      "description":"Delete a transform"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/transform.get_node_stats.json b/rest-api-spec/src/main/resources/rest-api-spec/api/transform.get_node_stats.json
index ca3fde65f6363..a4c1fdc5b0ca2 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/transform.get_node_stats.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/transform.get_node_stats.json
@@ -2,7 +2,7 @@
   "transform.get_node_stats":{
     "documentation":{
       "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/get-transform-node-stats.html",
-      "description":"Retrieves transform usage information for transform nodes."
+      "description":"Retrieves transform usage information for transform nodes"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/transform.get_transform.json b/rest-api-spec/src/main/resources/rest-api-spec/api/transform.get_transform.json
index 334537d49a716..f47c5eedd0ba5 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/transform.get_transform.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/transform.get_transform.json
@@ -1,8 +1,8 @@
 {
   "transform.get_transform":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/get-transform.html",
-      "description":"Retrieves configuration information for transforms."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-transform-get-transform",
+      "description":"Get transforms"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/transform.get_transform_stats.json b/rest-api-spec/src/main/resources/rest-api-spec/api/transform.get_transform_stats.json
index 8139fac7a818e..3805804becb13 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/transform.get_transform_stats.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/transform.get_transform_stats.json
@@ -1,8 +1,8 @@
 {
   "transform.get_transform_stats":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/get-transform-stats.html",
-      "description":"Retrieves usage information for transforms."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-transform-get-transform-stats",
+      "description":"Get transform stats"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/transform.preview_transform.json b/rest-api-spec/src/main/resources/rest-api-spec/api/transform.preview_transform.json
index 5740f5d9ab2e0..f55b8631aacf9 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/transform.preview_transform.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/transform.preview_transform.json
@@ -1,8 +1,8 @@
 {
   "transform.preview_transform":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/preview-transform.html",
-      "description":"Previews a transform."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-transform-preview-transform",
+      "description":"Preview a transform"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/transform.put_transform.json b/rest-api-spec/src/main/resources/rest-api-spec/api/transform.put_transform.json
index 5f4b986d831ef..9e10a8b9189a1 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/transform.put_transform.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/transform.put_transform.json
@@ -1,8 +1,8 @@
 {
   "transform.put_transform":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/put-transform.html",
-      "description":"Instantiates a transform."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-transform-put-transform",
+      "description":"Create a transform"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/transform.reset_transform.json b/rest-api-spec/src/main/resources/rest-api-spec/api/transform.reset_transform.json
index d86b9290e8dac..f9fedf2e63cbd 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/transform.reset_transform.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/transform.reset_transform.json
@@ -1,8 +1,8 @@
 {
   "transform.reset_transform":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/reset-transform.html",
-      "description":"Resets an existing transform."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-transform-reset-transform",
+      "description":"Reset a transform"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/transform.schedule_now_transform.json b/rest-api-spec/src/main/resources/rest-api-spec/api/transform.schedule_now_transform.json
index 81ba9e071cfd1..849670fd6b63b 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/transform.schedule_now_transform.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/transform.schedule_now_transform.json
@@ -1,8 +1,8 @@
 {
   "transform.schedule_now_transform":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/schedule-now-transform.html",
-      "description":"Schedules now a transform."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-transform-schedule-now-transform",
+      "description":"Schedule a transform to start now"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/transform.set_upgrade_mode.json b/rest-api-spec/src/main/resources/rest-api-spec/api/transform.set_upgrade_mode.json
index 3fe554e7b00f6..32e2afdebad13 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/transform.set_upgrade_mode.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/transform.set_upgrade_mode.json
@@ -1,8 +1,8 @@
 {
   "transform.set_upgrade_mode":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/transform-set-upgrade-mode.html",
-      "description":"Sets a cluster wide upgrade_mode setting that prepares transform indices for an upgrade."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-transform-set-upgrade-mode",
+      "description":"Set upgrade_mode for transform indices"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/transform.start_transform.json b/rest-api-spec/src/main/resources/rest-api-spec/api/transform.start_transform.json
index b7fb849987afb..624ffa430bd20 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/transform.start_transform.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/transform.start_transform.json
@@ -1,8 +1,8 @@
 {
   "transform.start_transform":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/start-transform.html",
-      "description":"Starts one or more transforms."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-transform-start-transform",
+      "description":"Start a transform"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/transform.stop_transform.json b/rest-api-spec/src/main/resources/rest-api-spec/api/transform.stop_transform.json
index 1beb8066c1803..6de4567b6ae4d 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/transform.stop_transform.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/transform.stop_transform.json
@@ -1,8 +1,8 @@
 {
   "transform.stop_transform":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/stop-transform.html",
-      "description":"Stops one or more transforms."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-transform-stop-transform",
+      "description":"Stop transforms"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/transform.update_transform.json b/rest-api-spec/src/main/resources/rest-api-spec/api/transform.update_transform.json
index 61734de8bef78..12ced0c2b551c 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/transform.update_transform.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/transform.update_transform.json
@@ -1,8 +1,8 @@
 {
   "transform.update_transform":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/update-transform.html",
-      "description":"Updates certain properties of a transform."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-transform-update-transform",
+      "description":"Update a transform"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/transform.upgrade_transforms.json b/rest-api-spec/src/main/resources/rest-api-spec/api/transform.upgrade_transforms.json
index 0ad1412d06e9e..8484ff2b811f3 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/transform.upgrade_transforms.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/transform.upgrade_transforms.json
@@ -1,8 +1,8 @@
 {
   "transform.upgrade_transforms":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/upgrade-transforms.html",
-      "description":"Upgrades all transforms."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-transform-upgrade-transforms",
+      "description":"Upgrade all transforms"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/update.json b/rest-api-spec/src/main/resources/rest-api-spec/api/update.json
index 9e47e80547e88..6486e0a4f3c3e 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/update.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/update.json
@@ -1,8 +1,8 @@
 {
   "update":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/docs-update.html",
-      "description":"Updates a document with a script or partial document."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-update",
+      "description":"Update a document"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/update_by_query.json b/rest-api-spec/src/main/resources/rest-api-spec/api/update_by_query.json
index 8cf44f289ce01..0af360fb24eaa 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/update_by_query.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/update_by_query.json
@@ -1,8 +1,8 @@
 {
   "update_by_query":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/docs-update-by-query.html",
-      "description":"Performs an update on every document in the index without changing the source,\nfor example to pick up a mapping change."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-update-by-query",
+      "description":"Update documents"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/update_by_query_rethrottle.json b/rest-api-spec/src/main/resources/rest-api-spec/api/update_by_query_rethrottle.json
index 18895ad443c6f..c76fcbaeb3353 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/update_by_query_rethrottle.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/update_by_query_rethrottle.json
@@ -1,8 +1,8 @@
 {
   "update_by_query_rethrottle":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/docs-update-by-query.html",
-      "description":"Changes the number of requests per second for a particular Update By Query operation."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-update-by-query-rethrottle",
+      "description":"Throttle an update by query operation"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/watcher.ack_watch.json b/rest-api-spec/src/main/resources/rest-api-spec/api/watcher.ack_watch.json
index 0c04888991fc5..7946eba4296a5 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/watcher.ack_watch.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/watcher.ack_watch.json
@@ -1,8 +1,8 @@
 {
   "watcher.ack_watch":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/watcher-api-ack-watch.html",
-      "description":"Acknowledges a watch, manually throttling the execution of the watch's actions."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-watcher-ack-watch",
+      "description":"Acknowledge a watch"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/watcher.activate_watch.json b/rest-api-spec/src/main/resources/rest-api-spec/api/watcher.activate_watch.json
index 698b08f3fdc8a..1b26599ec6aed 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/watcher.activate_watch.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/watcher.activate_watch.json
@@ -1,8 +1,8 @@
 {
   "watcher.activate_watch":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/watcher-api-activate-watch.html",
-      "description":"Activates a currently inactive watch."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-watcher-activate-watch",
+      "description":"Activate a watch"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/watcher.deactivate_watch.json b/rest-api-spec/src/main/resources/rest-api-spec/api/watcher.deactivate_watch.json
index e9b7407eb5c9d..505500c61a438 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/watcher.deactivate_watch.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/watcher.deactivate_watch.json
@@ -1,8 +1,8 @@
 {
   "watcher.deactivate_watch":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/watcher-api-deactivate-watch.html",
-      "description":"Deactivates a currently active watch."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-watcher-deactivate-watch",
+      "description":"Deactivate a watch"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/watcher.delete_watch.json b/rest-api-spec/src/main/resources/rest-api-spec/api/watcher.delete_watch.json
index 9417a8a57b56b..881fddcb1d7a1 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/watcher.delete_watch.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/watcher.delete_watch.json
@@ -1,8 +1,8 @@
 {
   "watcher.delete_watch":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/watcher-api-delete-watch.html",
-      "description":"Removes a watch from Watcher."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-watcher-delete-watch",
+      "description":"Delete a watch"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/watcher.execute_watch.json b/rest-api-spec/src/main/resources/rest-api-spec/api/watcher.execute_watch.json
index a011669ce373c..395f7512be0e4 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/watcher.execute_watch.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/watcher.execute_watch.json
@@ -1,8 +1,8 @@
 {
   "watcher.execute_watch":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/watcher-api-execute-watch.html",
-      "description":"Forces the execution of a stored watch."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-watcher-execute-watch",
+      "description":"Run a watch"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/watcher.get_settings.json b/rest-api-spec/src/main/resources/rest-api-spec/api/watcher.get_settings.json
index 3ae59c9d024a7..ef02edd190cb8 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/watcher.get_settings.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/watcher.get_settings.json
@@ -1,8 +1,8 @@
 {
   "watcher.get_settings":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/watcher-api-get-settings.html",
-      "description":"Retrieve settings for the watcher system index"
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-watcher-get-settings",
+      "description":"Get Watcher index settings"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/watcher.get_watch.json b/rest-api-spec/src/main/resources/rest-api-spec/api/watcher.get_watch.json
index 26899aefc53bb..c03842bebee1d 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/watcher.get_watch.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/watcher.get_watch.json
@@ -1,8 +1,8 @@
 {
   "watcher.get_watch":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/watcher-api-get-watch.html",
-      "description":"Retrieves a watch by its ID."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-watcher-get-watch",
+      "description":"Get a watch"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/watcher.put_watch.json b/rest-api-spec/src/main/resources/rest-api-spec/api/watcher.put_watch.json
index 462580198932c..090bf2f799dca 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/watcher.put_watch.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/watcher.put_watch.json
@@ -1,8 +1,8 @@
 {
   "watcher.put_watch":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/watcher-api-put-watch.html",
-      "description":"Creates a new watch, or updates an existing one."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-watcher-put-watch",
+      "description":"Create or update a watch"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/watcher.query_watches.json b/rest-api-spec/src/main/resources/rest-api-spec/api/watcher.query_watches.json
index b730f66af3617..4b2d49bc09bda 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/watcher.query_watches.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/watcher.query_watches.json
@@ -1,8 +1,8 @@
 {
   "watcher.query_watches":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/watcher-api-query-watches.html",
-      "description":"Retrieves stored watches."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-watcher-query-watches",
+      "description":"Query watches"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/watcher.start.json b/rest-api-spec/src/main/resources/rest-api-spec/api/watcher.start.json
index ad0682c8d7b19..c77b5f46b75a6 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/watcher.start.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/watcher.start.json
@@ -1,8 +1,8 @@
 {
   "watcher.start":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/watcher-api-start.html",
-      "description":"Starts Watcher if it is not already running."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-watcher-start",
+      "description":"Start the watch service"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/watcher.stats.json b/rest-api-spec/src/main/resources/rest-api-spec/api/watcher.stats.json
index 35e90cbd1cddb..ad174ab44b1bf 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/watcher.stats.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/watcher.stats.json
@@ -1,8 +1,8 @@
 {
   "watcher.stats":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/watcher-api-stats.html",
-      "description":"Retrieves the current Watcher metrics."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-watcher-stats",
+      "description":"Get Watcher statistics"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/watcher.stop.json b/rest-api-spec/src/main/resources/rest-api-spec/api/watcher.stop.json
index b1a67119df153..d142ba43eec70 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/watcher.stop.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/watcher.stop.json
@@ -1,8 +1,8 @@
 {
   "watcher.stop":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/watcher-api-stop.html",
-      "description":"Stops Watcher if it is running."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-watcher-stop",
+      "description":"Stop the watch service"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/watcher.update_settings.json b/rest-api-spec/src/main/resources/rest-api-spec/api/watcher.update_settings.json
index 5a6a8d4a787ad..6c48a6e201fa0 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/watcher.update_settings.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/watcher.update_settings.json
@@ -1,8 +1,8 @@
 {
   "watcher.update_settings":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/watcher-api-update-settings.html",
-      "description":"Update settings for the watcher system index"
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-watcher-update-settings",
+      "description":"Update Watcher index settings"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/xpack.info.json b/rest-api-spec/src/main/resources/rest-api-spec/api/xpack.info.json
index 35895f0ddb581..2412307de4f70 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/xpack.info.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/xpack.info.json
@@ -1,8 +1,8 @@
 {
   "xpack.info":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/info-api.html",
-      "description":"Retrieves information about the installed X-Pack features."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-info",
+      "description":"Get information"
     },
     "stability":"stable",
     "visibility":"public",
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/xpack.usage.json b/rest-api-spec/src/main/resources/rest-api-spec/api/xpack.usage.json
index e01f40348eadc..d48a6f3e6f607 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/xpack.usage.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/xpack.usage.json
@@ -1,8 +1,8 @@
 {
   "xpack.usage":{
     "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/usage-api.html",
-      "description":"Retrieves usage information about the installed X-Pack features."
+      "url":"https://www.elastic.co/docs/api/doc/elasticsearch/group/endpoint-xpack",
+      "description":"Get usage information"
     },
     "stability":"stable",
     "visibility":"public",