diff --git a/opensearch-api/lib/opensearch/api/actions/cat/allocation.rb b/opensearch-api/lib/opensearch/api/actions/cat/allocation.rb
index 43bf1a517..7d2649b2a 100644
--- a/opensearch-api/lib/opensearch/api/actions/cat/allocation.rb
+++ b/opensearch-api/lib/opensearch/api/actions/cat/allocation.rb
@@ -34,8 +34,7 @@ module Actions
# @option arguments [String] :format a short version of the Accept header, e.g. json, yaml
# @option arguments [String] :bytes The unit in which to display byte values (options: b, k, kb, m, mb, g, gb, t, tb, p, pb)
# @option arguments [Boolean] :local Return local information, do not retrieve the state from cluster_manager node (default: false)
- # DEPRECATED: Please use cluster_manager_timeout instead.
- # @option arguments [Time] :master_timeout Explicit operation timeout for connection to master node
+ # @option arguments [Time] :master_timeout (DEPRECATED: use cluster_manager_timeout instead) Explicit operation timeout for connection to master node
# @option arguments [Time] :cluster_manager_timeout Explicit operation timeout for connection to cluster_manager node
# @option arguments [List] :h Comma-separated list of column names to display
# @option arguments [Boolean] :help Return help information
diff --git a/opensearch-api/lib/opensearch/api/actions/cat/indices.rb b/opensearch-api/lib/opensearch/api/actions/cat/indices.rb
index 28ae6826c..d9df4e828 100644
--- a/opensearch-api/lib/opensearch/api/actions/cat/indices.rb
+++ b/opensearch-api/lib/opensearch/api/actions/cat/indices.rb
@@ -33,9 +33,8 @@ module Actions
# @option arguments [List] :index A comma-separated list of index names to limit the returned information
# @option arguments [String] :format a short version of the Accept header, e.g. json, yaml
# @option arguments [String] :bytes The unit in which to display byte values (options: b, k, kb, m, mb, g, gb, t, tb, p, pb)
- # @option arguments [Boolean] :local Return local information, do not retrieve the state from cluster_manager node (default: false) *Deprecated*
- # DEPRECATED: Please use cluster_manager_timeout instead.
- # @option arguments [Time] :master_timeout Explicit operation timeout for connection to master node
+ # @option arguments [Boolean] :local Return local information, do not retrieve the state from cluster_manager node (default: false)
+ # @option arguments [Time] :master_timeout (DEPRECATED: use cluster_manager_timeout instead) Explicit operation timeout for connection to master node
# @option arguments [Time] :cluster_manager_timeout Explicit operation timeout for connection to cluster_manager node
# @option arguments [List] :h Comma-separated list of column names to display
# @option arguments [String] :health A health status ("green", "yellow", or "red" to filter only indices matching the specified health status (options: green, yellow, red)
diff --git a/opensearch-api/lib/opensearch/api/actions/cat/master.rb b/opensearch-api/lib/opensearch/api/actions/cat/master.rb
index 00b0fe3f5..b99a65aad 100644
--- a/opensearch-api/lib/opensearch/api/actions/cat/master.rb
+++ b/opensearch-api/lib/opensearch/api/actions/cat/master.rb
@@ -24,7 +24,7 @@
# specific language governing permissions and limitations
# under the License.
-# DEPRECATED: Please use cluster_manager instead.
+# @deprecated Please use cluster_manager instead.
module OpenSearch
module API
module Cat
diff --git a/opensearch-api/lib/opensearch/api/actions/cat/nodeattrs.rb b/opensearch-api/lib/opensearch/api/actions/cat/nodeattrs.rb
index 817391b82..ef34d1cb3 100644
--- a/opensearch-api/lib/opensearch/api/actions/cat/nodeattrs.rb
+++ b/opensearch-api/lib/opensearch/api/actions/cat/nodeattrs.rb
@@ -32,8 +32,7 @@ module Actions
#
# @option arguments [String] :format a short version of the Accept header, e.g. json, yaml
# @option arguments [Boolean] :local Return local information, do not retrieve the state from cluster_manager node (default: false)
- # DEPRECATED: Please use cluster_manager_timeout instead.
- # @option arguments [Time] :master_timeout Explicit operation timeout for connection to master node
+ # @option arguments [Time] :master_timeout (DEPRECATED: use cluster_manager_timeout instead) Explicit operation timeout for connection to master node
# @option arguments [Time] :cluster_manager_timeout Explicit operation timeout for connection to cluster_manager node
# @option arguments [List] :h Comma-separated list of column names to display
# @option arguments [Boolean] :help Return help information
diff --git a/opensearch-api/lib/opensearch/api/actions/cat/nodes.rb b/opensearch-api/lib/opensearch/api/actions/cat/nodes.rb
index 3781d40c9..29a75b05d 100644
--- a/opensearch-api/lib/opensearch/api/actions/cat/nodes.rb
+++ b/opensearch-api/lib/opensearch/api/actions/cat/nodes.rb
@@ -34,8 +34,7 @@ module Actions
# @option arguments [String] :format a short version of the Accept header, e.g. json, yaml
# @option arguments [Boolean] :full_id Return the full node ID instead of the shortened version (default: false)
# @option arguments [Boolean] :local Calculate the selected nodes using the local cluster state rather than the state from cluster_manager node (default: false) *Deprecated*
- # DEPRECATED: Please use cluster_manager_timeout instead.
- # @option arguments [Time] :master_timeout Explicit operation timeout for connection to master node
+ # @option arguments [Time] :master_timeout (DEPRECATED: use cluster_manager_timeout instead) Explicit operation timeout for connection to master node
# @option arguments [Time] :cluster_manager_timeout Explicit operation timeout for connection to cluster_manager node
# @option arguments [List] :h Comma-separated list of column names to display
# @option arguments [Boolean] :help Return help information
diff --git a/opensearch-api/lib/opensearch/api/actions/cat/pending_tasks.rb b/opensearch-api/lib/opensearch/api/actions/cat/pending_tasks.rb
index dea6514e4..c3f325d5a 100644
--- a/opensearch-api/lib/opensearch/api/actions/cat/pending_tasks.rb
+++ b/opensearch-api/lib/opensearch/api/actions/cat/pending_tasks.rb
@@ -32,8 +32,7 @@ module Actions
#
# @option arguments [String] :format a short version of the Accept header, e.g. json, yaml
# @option arguments [Boolean] :local Return local information, do not retrieve the state from cluster_manager node (default: false)
- # DEPRECATED: Please use cluster_manager_timeout instead.
- # @option arguments [Time] :master_timeout Explicit operation timeout for connection to master node
+ # @option arguments [Time] :master_timeout (DEPRECATED: use cluster_manager_timeout instead) Explicit operation timeout for connection to master node
# @option arguments [Time] :cluster_manager_timeout Explicit operation timeout for connection to cluster_manager node
# @option arguments [List] :h Comma-separated list of column names to display
# @option arguments [Boolean] :help Return help information
diff --git a/opensearch-api/lib/opensearch/api/actions/cat/plugins.rb b/opensearch-api/lib/opensearch/api/actions/cat/plugins.rb
index dd9099de2..c0c8ae92a 100644
--- a/opensearch-api/lib/opensearch/api/actions/cat/plugins.rb
+++ b/opensearch-api/lib/opensearch/api/actions/cat/plugins.rb
@@ -32,8 +32,7 @@ module Actions
#
# @option arguments [String] :format a short version of the Accept header, e.g. json, yaml
# @option arguments [Boolean] :local Return local information, do not retrieve the state from cluster_manager node (default: false)
- # DEPRECATED: Please use cluster_manager_timeout instead.
- # @option arguments [Time] :master_timeout Explicit operation timeout for connection to master node
+ # @option arguments [Time] :master_timeout (DEPRECATED: use cluster_manager_timeout instead) Explicit operation timeout for connection to master node
# @option arguments [Time] :cluster_manager_timeout Explicit operation timeout for connection to cluster_manager node
# @option arguments [List] :h Comma-separated list of column names to display
# @option arguments [Boolean] :help Return help information
diff --git a/opensearch-api/lib/opensearch/api/actions/cat/repositories.rb b/opensearch-api/lib/opensearch/api/actions/cat/repositories.rb
index ddfc59af6..bf486e29d 100644
--- a/opensearch-api/lib/opensearch/api/actions/cat/repositories.rb
+++ b/opensearch-api/lib/opensearch/api/actions/cat/repositories.rb
@@ -33,8 +33,7 @@ module Actions
#
# @option arguments [String] :format a short version of the Accept header, e.g. json, yaml
# @option arguments [Boolean] :local Return local information, do not retrieve the state from cluster_manager node
- # DEPRECATED: Please use cluster_manager_timeout instead.
- # @option arguments [Time] :master_timeout Explicit operation timeout for connection to master node
+ # @option arguments [Time] :master_timeout (DEPRECATED: use cluster_manager_timeout instead) Explicit operation timeout for connection to master node
# @option arguments [Time] :cluster_manager_timeout Explicit operation timeout for connection to cluster_manager node
# @option arguments [List] :h Comma-separated list of column names to display
# @option arguments [Boolean] :help Return help information
diff --git a/opensearch-api/lib/opensearch/api/actions/cat/shards.rb b/opensearch-api/lib/opensearch/api/actions/cat/shards.rb
index 3b928b9a7..24bb9e6b2 100644
--- a/opensearch-api/lib/opensearch/api/actions/cat/shards.rb
+++ b/opensearch-api/lib/opensearch/api/actions/cat/shards.rb
@@ -34,8 +34,7 @@ module Actions
# @option arguments [String] :format a short version of the Accept header, e.g. json, yaml
# @option arguments [String] :bytes The unit in which to display byte values (options: b, k, kb, m, mb, g, gb, t, tb, p, pb)
# @option arguments [Boolean] :local Return local information, do not retrieve the state from cluster_manager node (default: false) *Deprecated*
- # DEPRECATED: Please use cluster_manager_timeout instead.
- # @option arguments [Time] :master_timeout Explicit operation timeout for connection to master node
+ # @option arguments [Time] :master_timeout (DEPRECATED: use cluster_manager_timeout instead) Explicit operation timeout for connection to master node
# @option arguments [Time] :cluster_manager_timeout Explicit operation timeout for connection to cluster_manager node
# @option arguments [List] :h Comma-separated list of column names to display
# @option arguments [Boolean] :help Return help information
diff --git a/opensearch-api/lib/opensearch/api/actions/cat/snapshots.rb b/opensearch-api/lib/opensearch/api/actions/cat/snapshots.rb
index da7c4c5c1..3ca82c48f 100644
--- a/opensearch-api/lib/opensearch/api/actions/cat/snapshots.rb
+++ b/opensearch-api/lib/opensearch/api/actions/cat/snapshots.rb
@@ -33,8 +33,7 @@ module Actions
# @option arguments [List] :repository Name of repository from which to fetch the snapshot information
# @option arguments [String] :format a short version of the Accept header, e.g. json, yaml
# @option arguments [Boolean] :ignore_unavailable Set to true to ignore unavailable snapshots
- # DEPRECATED: Please use cluster_manager_timeout instead.
- # @option arguments [Time] :master_timeout Explicit operation timeout for connection to master node
+ # @option arguments [Time] :master_timeout (DEPRECATED: use cluster_manager_timeout instead) Explicit operation timeout for connection to master node
# @option arguments [Time] :cluster_manager_timeout Explicit operation timeout for connection to cluster_manager node
# @option arguments [List] :h Comma-separated list of column names to display
# @option arguments [Boolean] :help Return help information
diff --git a/opensearch-api/lib/opensearch/api/actions/cat/templates.rb b/opensearch-api/lib/opensearch/api/actions/cat/templates.rb
index 3fdc2e12c..f17d02a53 100644
--- a/opensearch-api/lib/opensearch/api/actions/cat/templates.rb
+++ b/opensearch-api/lib/opensearch/api/actions/cat/templates.rb
@@ -33,8 +33,7 @@ module Actions
# @option arguments [String] :name A pattern that returned template names must match
# @option arguments [String] :format a short version of the Accept header, e.g. json, yaml
# @option arguments [Boolean] :local Return local information, do not retrieve the state from cluster_manager node (default: false)
- # DEPRECATED: Please use cluster_manager_timeout instead.
- # @option arguments [Time] :master_timeout Explicit operation timeout for connection to master node
+ # @option arguments [Time] :master_timeout (DEPRECATED: use cluster_manager_timeout instead) Explicit operation timeout for connection to master node
# @option arguments [Time] :cluster_manager_timeout Explicit operation timeout for connection to cluster_manager node
# @option arguments [List] :h Comma-separated list of column names to display
# @option arguments [Boolean] :help Return help information
diff --git a/opensearch-api/lib/opensearch/api/actions/cat/thread_pool.rb b/opensearch-api/lib/opensearch/api/actions/cat/thread_pool.rb
index a9c0f2d64..a92aa9563 100644
--- a/opensearch-api/lib/opensearch/api/actions/cat/thread_pool.rb
+++ b/opensearch-api/lib/opensearch/api/actions/cat/thread_pool.rb
@@ -35,8 +35,7 @@ module Actions
# @option arguments [String] :format a short version of the Accept header, e.g. json, yaml
# @option arguments [String] :size The multiplier in which to display values *Deprecated* (options: , k, m, g, t, p)
# @option arguments [Boolean] :local Return local information, do not retrieve the state from cluster_manager node (default: false)
- # DEPRECATED: Please use cluster_manager_timeout instead.
- # @option arguments [Time] :master_timeout Explicit operation timeout for connection to master node
+ # @option arguments [Time] :master_timeout (DEPRECATED: use cluster_manager_timeout instead) Explicit operation timeout for connection to master node
# @option arguments [Time] :cluster_manager_timeout Explicit operation timeout for connection to cluster_manager node
# @option arguments [List] :h Comma-separated list of column names to display
# @option arguments [Boolean] :help Return help information
diff --git a/opensearch-api/lib/opensearch/api/actions/cluster/delete_component_template.rb b/opensearch-api/lib/opensearch/api/actions/cluster/delete_component_template.rb
index 57724f40b..9fa138f6d 100644
--- a/opensearch-api/lib/opensearch/api/actions/cluster/delete_component_template.rb
+++ b/opensearch-api/lib/opensearch/api/actions/cluster/delete_component_template.rb
@@ -32,8 +32,7 @@ module Actions
#
# @option arguments [String] :name The name of the template
# @option arguments [Time] :timeout Explicit operation timeout
- # DEPRECATED: Please use cluster_manager_timeout instead.
- # @option arguments [Time] :master_timeout Specify timeout for connection to master
+ # @option arguments [Time] :master_timeout (DEPRECATED: use cluster_manager_timeout instead) Specify timeout for connection to master
# @option arguments [Time] :cluster_manager_timeout Specify timeout for connection to cluster_manager
# @option arguments [Hash] :headers Custom HTTP headers
#
diff --git a/opensearch-api/lib/opensearch/api/actions/cluster/exists_component_template.rb b/opensearch-api/lib/opensearch/api/actions/cluster/exists_component_template.rb
index 5f408da06..d568ab6aa 100644
--- a/opensearch-api/lib/opensearch/api/actions/cluster/exists_component_template.rb
+++ b/opensearch-api/lib/opensearch/api/actions/cluster/exists_component_template.rb
@@ -31,8 +31,7 @@ module Actions
# Returns information about whether a particular component template exist
#
# @option arguments [String] :name The name of the template
- # DEPRECATED: Please use cluster_manager_timeout instead.
- # @option arguments [Time] :master_timeout Explicit operation timeout for connection to master node
+ # @option arguments [Time] :master_timeout (DEPRECATED: use cluster_manager_timeout instead) Explicit operation timeout for connection to master node
# @option arguments [Time] :cluster_manager_timeout Explicit operation timeout for connection to cluster_manager node
# @option arguments [Boolean] :local Return local information, do not retrieve the state from cluster_manager node (default: false)
# @option arguments [Hash] :headers Custom HTTP headers
diff --git a/opensearch-api/lib/opensearch/api/actions/cluster/get_component_template.rb b/opensearch-api/lib/opensearch/api/actions/cluster/get_component_template.rb
index 2477aa0d4..4a7b29eb4 100644
--- a/opensearch-api/lib/opensearch/api/actions/cluster/get_component_template.rb
+++ b/opensearch-api/lib/opensearch/api/actions/cluster/get_component_template.rb
@@ -31,8 +31,7 @@ module Actions
# Returns one or more component templates
#
# @option arguments [List] :name The comma separated names of the component templates
- # DEPRECATED: Please use cluster_manager_timeout instead.
- # @option arguments [Time] :master_timeout Explicit operation timeout for connection to master node
+ # @option arguments [Time] :master_timeout (DEPRECATED: use cluster_manager_timeout instead) Explicit operation timeout for connection to master node
# @option arguments [Time] :cluster_manager_timeout Explicit operation timeout for connection to cluster_manager node
# @option arguments [Boolean] :local Return local information, do not retrieve the state from cluster_manager node (default: false)
# @option arguments [Hash] :headers Custom HTTP headers
diff --git a/opensearch-api/lib/opensearch/api/actions/cluster/get_settings.rb b/opensearch-api/lib/opensearch/api/actions/cluster/get_settings.rb
index 45b1da91a..74ab37659 100644
--- a/opensearch-api/lib/opensearch/api/actions/cluster/get_settings.rb
+++ b/opensearch-api/lib/opensearch/api/actions/cluster/get_settings.rb
@@ -31,8 +31,7 @@ module Actions
# Returns cluster settings.
#
# @option arguments [Boolean] :flat_settings Return settings in flat format (default: false)
- # DEPRECATED: Please use cluster_manager_timeout instead.
- # @option arguments [Time] :master_timeout Explicit operation timeout for connection to master node
+ # @option arguments [Time] :master_timeout (DEPRECATED: use cluster_manager_timeout instead) Explicit operation timeout for connection to master node
# @option arguments [Time] :cluster_manager_timeout Explicit operation timeout for connection to cluster_manager node
# @option arguments [Time] :timeout Explicit operation timeout
# @option arguments [Boolean] :include_defaults Whether to return all default clusters setting.
diff --git a/opensearch-api/lib/opensearch/api/actions/cluster/health.rb b/opensearch-api/lib/opensearch/api/actions/cluster/health.rb
index b374a57e8..76bb55c25 100644
--- a/opensearch-api/lib/opensearch/api/actions/cluster/health.rb
+++ b/opensearch-api/lib/opensearch/api/actions/cluster/health.rb
@@ -34,8 +34,7 @@ module Actions
# @option arguments [String] :expand_wildcards Whether to expand wildcard expression to concrete indices that are open, closed or both. (options: open, closed, hidden, none, all)
# @option arguments [String] :level Specify the level of detail for returned information (options: cluster, indices, shards)
# @option arguments [Boolean] :local Return local information, do not retrieve the state from cluster_manager node (default: false)
- # DEPRECATED: Please use cluster_manager_timeout instead.
- # @option arguments [Time] :master_timeout Explicit operation timeout for connection to master node
+ # @option arguments [Time] :master_timeout (DEPRECATED: use cluster_manager_timeout instead) Explicit operation timeout for connection to master node
# @option arguments [Time] :cluster_manager_timeout Explicit operation timeout for connection to cluster_manager node
# @option arguments [Time] :timeout Explicit operation timeout
# @option arguments [String] :wait_for_active_shards Wait until the specified number of shards is active
diff --git a/opensearch-api/lib/opensearch/api/actions/cluster/pending_tasks.rb b/opensearch-api/lib/opensearch/api/actions/cluster/pending_tasks.rb
index 64394938f..8f0a13f32 100644
--- a/opensearch-api/lib/opensearch/api/actions/cluster/pending_tasks.rb
+++ b/opensearch-api/lib/opensearch/api/actions/cluster/pending_tasks.rb
@@ -32,8 +32,7 @@ module Actions
# allocate or fail shard) which have not yet been executed.
#
# @option arguments [Boolean] :local Return local information, do not retrieve the state from cluster_manager node (default: false)
- # DEPRECATED: Please use cluster_manager_timeout instead.
- # @option arguments [Time] :master_timeout Specify timeout for connection to master
+ # @option arguments [Time] :master_timeout (DEPRECATED: use cluster_manager_timeout instead) Specify timeout for connection to master
# @option arguments [Time] :cluster_manager_timeout Specify timeout for connection to cluster_manager
# @option arguments [Hash] :headers Custom HTTP headers
#
diff --git a/opensearch-api/lib/opensearch/api/actions/cluster/put_component_template.rb b/opensearch-api/lib/opensearch/api/actions/cluster/put_component_template.rb
index da6f45039..daa9c0282 100644
--- a/opensearch-api/lib/opensearch/api/actions/cluster/put_component_template.rb
+++ b/opensearch-api/lib/opensearch/api/actions/cluster/put_component_template.rb
@@ -33,8 +33,7 @@ module Actions
# @option arguments [String] :name The name of the template
# @option arguments [Boolean] :create Whether the index template should only be added if new or can also replace an existing one
# @option arguments [Time] :timeout Explicit operation timeout
- # DEPRECATED: Please use cluster_manager_timeout instead.
- # @option arguments [Time] :master_timeout Specify timeout for connection to master
+ # @option arguments [Time] :master_timeout (DEPRECATED: use cluster_manager_timeout instead) Specify timeout for connection to master
# @option arguments [Time] :cluster_manager_timeout Specify timeout for connection to cluster_manager
# @option arguments [Hash] :headers Custom HTTP headers
# @option arguments [Hash] :body The template definition (*Required*)
diff --git a/opensearch-api/lib/opensearch/api/actions/cluster/put_settings.rb b/opensearch-api/lib/opensearch/api/actions/cluster/put_settings.rb
index 38611068a..2ad8fa3be 100644
--- a/opensearch-api/lib/opensearch/api/actions/cluster/put_settings.rb
+++ b/opensearch-api/lib/opensearch/api/actions/cluster/put_settings.rb
@@ -31,8 +31,7 @@ module Actions
# Updates the cluster settings.
#
# @option arguments [Boolean] :flat_settings Return settings in flat format (default: false)
- # DEPRECATED: Please use cluster_manager_timeout instead
- # @option arguments [Time] :master_timeout Explicit operation timeout for connection to master node
+ # @option arguments [Time] :master_timeout (DEPRECATED: use cluster_manager_timeout instead) Explicit operation timeout for connection to master node
# @option arguments [Time] :cluster_manager_timeout Explicit operation timeout for connection to cluster_manager node
# @option arguments [Time] :timeout Explicit operation timeout
# @option arguments [Hash] :headers Custom HTTP headers
diff --git a/opensearch-api/lib/opensearch/api/actions/cluster/reroute.rb b/opensearch-api/lib/opensearch/api/actions/cluster/reroute.rb
index f0b6896d2..0e0a1b010 100644
--- a/opensearch-api/lib/opensearch/api/actions/cluster/reroute.rb
+++ b/opensearch-api/lib/opensearch/api/actions/cluster/reroute.rb
@@ -34,8 +34,7 @@ module Actions
# @option arguments [Boolean] :explain Return an explanation of why the commands can or cannot be executed
# @option arguments [Boolean] :retry_failed Retries allocation of shards that are blocked due to too many subsequent allocation failures
# @option arguments [List] :metric Limit the information returned to the specified metrics. Defaults to all but metadata (options: _all, blocks, metadata, nodes, routing_table, cluster_manager_node, version)
- # DEPRECATED: Please use cluster_manager_timeout instead.
- # @option arguments [Time] :master_timeout Explicit operation timeout for connection to master node
+ # @option arguments [Time] :master_timeout (DEPRECATED: use cluster_manager_timeout instead) Explicit operation timeout for connection to master node
# @option arguments [Time] :cluster_manager_timeout Explicit operation timeout for connection to cluster_manager node
# @option arguments [Time] :timeout Explicit operation timeout
# @option arguments [Hash] :headers Custom HTTP headers
diff --git a/opensearch-api/lib/opensearch/api/actions/cluster/state.rb b/opensearch-api/lib/opensearch/api/actions/cluster/state.rb
index b5585d832..5c293cabe 100644
--- a/opensearch-api/lib/opensearch/api/actions/cluster/state.rb
+++ b/opensearch-api/lib/opensearch/api/actions/cluster/state.rb
@@ -33,8 +33,7 @@ module Actions
# @option arguments [List] :metric Limit the information returned to the specified metrics (options: _all, blocks, metadata, nodes, routing_table, routing_nodes, cluster_manager_node, version)
# @option arguments [List] :index A comma-separated list of index names; use `_all` or empty string to perform the operation on all indices
# @option arguments [Boolean] :local Return local information, do not retrieve the state from cluster_manager node (default: false)
- # DEPRECATED: Please use cluster_manager_timeout instead.
- # @option arguments [Time] :master_timeout Specify timeout for connection to master
+ # @option arguments [Time] :master_timeout (DEPRECATED: use cluster_manager_timeout instead) Specify timeout for connection to master
# @option arguments [Time] :cluster_manager_timeout Specify timeout for connection to cluster_manager
# @option arguments [Boolean] :flat_settings Return settings in flat format (default: false)
# @option arguments [Number] :wait_for_metadata_version Wait for the metadata version to be equal or greater than the specified metadata version
diff --git a/opensearch-api/lib/opensearch/api/actions/dangling_indices/delete_dangling_index.rb b/opensearch-api/lib/opensearch/api/actions/dangling_indices/delete_dangling_index.rb
index eff748dab..e5c2adf51 100644
--- a/opensearch-api/lib/opensearch/api/actions/dangling_indices/delete_dangling_index.rb
+++ b/opensearch-api/lib/opensearch/api/actions/dangling_indices/delete_dangling_index.rb
@@ -33,8 +33,7 @@ module Actions
# @option arguments [String] :index_uuid The UUID of the dangling index
# @option arguments [Boolean] :accept_data_loss Must be set to true in order to delete the dangling index
# @option arguments [Time] :timeout Explicit operation timeout
- # DEPRECATED: Please use cluster_manager_timeout instead.
- # @option arguments [Time] :master_timeout Specify timeout for connection to master
+ # @option arguments [Time] :master_timeout (DEPRECATED: use cluster_manager_timeout instead) Specify timeout for connection to master
# @option arguments [Time] :cluster_manager_timeout Specify timeout for connection to cluster_manager
# @option arguments [Hash] :headers Custom HTTP headers
#
diff --git a/opensearch-api/lib/opensearch/api/actions/dangling_indices/import_dangling_index.rb b/opensearch-api/lib/opensearch/api/actions/dangling_indices/import_dangling_index.rb
index c2f59b96b..63c0e0af8 100644
--- a/opensearch-api/lib/opensearch/api/actions/dangling_indices/import_dangling_index.rb
+++ b/opensearch-api/lib/opensearch/api/actions/dangling_indices/import_dangling_index.rb
@@ -33,8 +33,7 @@ module Actions
# @option arguments [String] :index_uuid The UUID of the dangling index
# @option arguments [Boolean] :accept_data_loss Must be set to true in order to import the dangling index
# @option arguments [Time] :timeout Explicit operation timeout
- # DEPRECATED: Please use cluster_manager_timeout instead.
- # @option arguments [Time] :master_timeout Specify timeout for connection to master
+ # @option arguments [Time] :master_timeout (DEPRECATED: use cluster_manager_timeout instead) Specify timeout for connection to master
# @option arguments [Time] :cluster_manager_timeout Specify timeout for connection to cluster_manager
# @option arguments [Hash] :headers Custom HTTP headers
#
diff --git a/opensearch-api/lib/opensearch/api/actions/delete_script.rb b/opensearch-api/lib/opensearch/api/actions/delete_script.rb
index 5be35f6fe..15fd9a9fd 100644
--- a/opensearch-api/lib/opensearch/api/actions/delete_script.rb
+++ b/opensearch-api/lib/opensearch/api/actions/delete_script.rb
@@ -31,8 +31,7 @@ module Actions
#
# @option arguments [String] :id Script ID
# @option arguments [Time] :timeout Explicit operation timeout
- # DEPRECATED: Please use cluster_manager_timeout instead.
- # @option arguments [Time] :master_timeout Specify timeout for connection to master
+ # @option arguments [Time] :master_timeout (DEPRECATED: use cluster_manager_timeout instead) Specify timeout for connection to master
# @option arguments [Time] :cluster_manager_timeout Specify timeout for connection to cluster_manager
# @option arguments [Hash] :headers Custom HTTP headers
#
diff --git a/opensearch-api/lib/opensearch/api/actions/features/get_features.rb b/opensearch-api/lib/opensearch/api/actions/features/get_features.rb
index 2c20dc515..ce2955632 100644
--- a/opensearch-api/lib/opensearch/api/actions/features/get_features.rb
+++ b/opensearch-api/lib/opensearch/api/actions/features/get_features.rb
@@ -30,8 +30,7 @@ module Features
module Actions
# Gets a list of features which can be included in snapshots using the feature_states field when creating a snapshot
#
- # DEPRECATED: Please use cluster_manager_timeout instead.
- # @option arguments [Time] :master_timeout Explicit operation timeout for connection to master node
+ # @option arguments [Time] :master_timeout (DEPRECATED: use cluster_manager_timeout instead) Explicit operation timeout for connection to master node
# @option arguments [Time] :cluster_manager_timeout Explicit operation timeout for connection to cluster_manager node
# @option arguments [Hash] :headers Custom HTTP headers
#
diff --git a/opensearch-api/lib/opensearch/api/actions/get_script.rb b/opensearch-api/lib/opensearch/api/actions/get_script.rb
index a22c52d5b..ef2855122 100644
--- a/opensearch-api/lib/opensearch/api/actions/get_script.rb
+++ b/opensearch-api/lib/opensearch/api/actions/get_script.rb
@@ -30,8 +30,7 @@ module Actions
# Returns a script.
#
# @option arguments [String] :id Script ID
- # DEPRECATED: Please use cluster_manager_timeout instead.
- # @option arguments [Time] :master_timeout Specify timeout for connection to master
+ # @option arguments [Time] :master_timeout (DEPRECATED: use cluster_manager_timeout instead) Specify timeout for connection to master
# @option arguments [Time] :cluster_manager_timeout Specify timeout for connection to cluster_manager
# @option arguments [Hash] :headers Custom HTTP headers
#
diff --git a/opensearch-api/lib/opensearch/api/actions/indices/add_block.rb b/opensearch-api/lib/opensearch/api/actions/indices/add_block.rb
index 22fb69adb..153f33e00 100644
--- a/opensearch-api/lib/opensearch/api/actions/indices/add_block.rb
+++ b/opensearch-api/lib/opensearch/api/actions/indices/add_block.rb
@@ -33,8 +33,7 @@ module Actions
# @option arguments [List] :index A comma separated list of indices to add a block to
# @option arguments [String] :block The block to add (one of read, write, read_only or metadata)
# @option arguments [Time] :timeout Explicit operation timeout
- # DEPRECATED: Please use cluster_manager_timeout instead.
- # @option arguments [Time] :master_timeout Specify timeout for connection to master
+ # @option arguments [Time] :master_timeout (DEPRECATED: use cluster_manager_timeout instead) Specify timeout for connection to master
# @option arguments [Time] :cluster_manager_timeout Specify timeout for connection to cluster_manager
# @option arguments [Boolean] :ignore_unavailable Whether specified concrete indices should be ignored when unavailable (missing or closed)
# @option arguments [Boolean] :allow_no_indices Whether to ignore if a wildcard indices expression resolves into no concrete indices. (This includes `_all` string or when no indices have been specified)
diff --git a/opensearch-api/lib/opensearch/api/actions/indices/clone.rb b/opensearch-api/lib/opensearch/api/actions/indices/clone.rb
index 6e7ec2539..a770dae79 100644
--- a/opensearch-api/lib/opensearch/api/actions/indices/clone.rb
+++ b/opensearch-api/lib/opensearch/api/actions/indices/clone.rb
@@ -33,8 +33,7 @@ module Actions
# @option arguments [String] :index The name of the source index to clone
# @option arguments [String] :target The name of the target index to clone into
# @option arguments [Time] :timeout Explicit operation timeout
- # DEPRECATED: Please use cluster_manager_timeout instead.
- # @option arguments [Time] :master_timeout Specify timeout for connection to master
+ # @option arguments [Time] :master_timeout (DEPRECATED: use cluster_manager_timeout instead) Specify timeout for connection to master
# @option arguments [Time] :cluster_manager_timeout Specify timeout for connection to cluster_manager
# @option arguments [String] :wait_for_active_shards Set the number of active shards to wait for on the cloned index before the operation returns.
# @option arguments [Hash] :headers Custom HTTP headers
diff --git a/opensearch-api/lib/opensearch/api/actions/indices/close.rb b/opensearch-api/lib/opensearch/api/actions/indices/close.rb
index 93d4faa2b..7b0d7bb87 100644
--- a/opensearch-api/lib/opensearch/api/actions/indices/close.rb
+++ b/opensearch-api/lib/opensearch/api/actions/indices/close.rb
@@ -32,8 +32,7 @@ module Actions
#
# @option arguments [List] :index A comma separated list of indices to close
# @option arguments [Time] :timeout Explicit operation timeout
- # DEPRECATED: Please use cluster_manager_timeout instead.
- # @option arguments [Time] :master_timeout Specify timeout for connection to master
+ # @option arguments [Time] :master_timeout (DEPRECATED: use cluster_manager_timeout instead) Specify timeout for connection to master
# @option arguments [Time] :cluster_manager_timeout Specify timeout for connection to cluster_manager
# @option arguments [Boolean] :ignore_unavailable Whether specified concrete indices should be ignored when unavailable (missing or closed)
# @option arguments [Boolean] :allow_no_indices Whether to ignore if a wildcard indices expression resolves into no concrete indices. (This includes `_all` string or when no indices have been specified)
diff --git a/opensearch-api/lib/opensearch/api/actions/indices/create.rb b/opensearch-api/lib/opensearch/api/actions/indices/create.rb
index 0ab4e42c7..f934e99e2 100644
--- a/opensearch-api/lib/opensearch/api/actions/indices/create.rb
+++ b/opensearch-api/lib/opensearch/api/actions/indices/create.rb
@@ -33,8 +33,7 @@ module Actions
# @option arguments [String] :index The name of the index
# @option arguments [String] :wait_for_active_shards Set the number of active shards to wait for before the operation returns.
# @option arguments [Time] :timeout Explicit operation timeout
- # DEPRECATED: Please use cluster_manager_timeout instead.
- # @option arguments [Time] :master_timeout Specify timeout for connection to master
+ # @option arguments [Time] :master_timeout (DEPRECATED: use cluster_manager_timeout instead) Specify timeout for connection to master
# @option arguments [Time] :cluster_manager_timeout Specify timeout for connection to cluster_manager
# @option arguments [Hash] :headers Custom HTTP headers
# @option arguments [Hash] :body The configuration for the index (`settings` and `mappings`)
diff --git a/opensearch-api/lib/opensearch/api/actions/indices/delete.rb b/opensearch-api/lib/opensearch/api/actions/indices/delete.rb
index ea2386965..db72a0543 100644
--- a/opensearch-api/lib/opensearch/api/actions/indices/delete.rb
+++ b/opensearch-api/lib/opensearch/api/actions/indices/delete.rb
@@ -32,8 +32,7 @@ module Actions
#
# @option arguments [List] :index A comma-separated list of indices to delete; use `_all` or `*` string to delete all indices
# @option arguments [Time] :timeout Explicit operation timeout
- # DEPRECATED: Please use cluster_manager_timeout instead.
- # @option arguments [Time] :master_timeout Specify timeout for connection to master
+ # @option arguments [Time] :master_timeout (DEPRECATED: use cluster_manager_timeout instead) Specify timeout for connection to master
# @option arguments [Time] :cluster_manager_timeout Specify timeout for connection to cluster_manager
# @option arguments [Boolean] :ignore_unavailable Ignore unavailable indexes (default: false)
# @option arguments [Boolean] :allow_no_indices Ignore if a wildcard expression resolves to no concrete indices (default: false)
diff --git a/opensearch-api/lib/opensearch/api/actions/indices/delete_alias.rb b/opensearch-api/lib/opensearch/api/actions/indices/delete_alias.rb
index e817c18b5..eeb03ce3a 100644
--- a/opensearch-api/lib/opensearch/api/actions/indices/delete_alias.rb
+++ b/opensearch-api/lib/opensearch/api/actions/indices/delete_alias.rb
@@ -33,8 +33,7 @@ module Actions
# @option arguments [List] :index A comma-separated list of index names (supports wildcards); use `_all` for all indices
# @option arguments [List] :name A comma-separated list of aliases to delete (supports wildcards); use `_all` to delete all aliases for the specified indices.
# @option arguments [Time] :timeout Explicit timestamp for the document
- # DEPRECATED: Please use cluster_manager_timeout instead.
- # @option arguments [Time] :master_timeout Specify timeout for connection to master
+ # @option arguments [Time] :master_timeout (DEPRECATED: use cluster_manager_timeout instead) Specify timeout for connection to master
# @option arguments [Time] :cluster_manager_timeout Specify timeout for connection to cluster_manager
# @option arguments [Hash] :headers Custom HTTP headers
#
diff --git a/opensearch-api/lib/opensearch/api/actions/indices/delete_index_template.rb b/opensearch-api/lib/opensearch/api/actions/indices/delete_index_template.rb
index ffbc23d53..230a9e0fe 100644
--- a/opensearch-api/lib/opensearch/api/actions/indices/delete_index_template.rb
+++ b/opensearch-api/lib/opensearch/api/actions/indices/delete_index_template.rb
@@ -32,8 +32,7 @@ module Actions
#
# @option arguments [String] :name The name of the template
# @option arguments [Time] :timeout Explicit operation timeout
- # DEPRECATED: Please use cluster_manager_timeout instead.
- # @option arguments [Time] :master_timeout Specify timeout for connection to master
+ # @option arguments [Time] :master_timeout (DEPRECATED: use cluster_manager_timeout instead) Specify timeout for connection to master
# @option arguments [Time] :cluster_manager_timeout Specify timeout for connection to cluster_manager
# @option arguments [Hash] :headers Custom HTTP headers
#
diff --git a/opensearch-api/lib/opensearch/api/actions/indices/delete_template.rb b/opensearch-api/lib/opensearch/api/actions/indices/delete_template.rb
index c2255dbfd..ac29dcaa5 100644
--- a/opensearch-api/lib/opensearch/api/actions/indices/delete_template.rb
+++ b/opensearch-api/lib/opensearch/api/actions/indices/delete_template.rb
@@ -32,8 +32,7 @@ module Actions
#
# @option arguments [String] :name The name of the template
# @option arguments [Time] :timeout Explicit operation timeout
- # DEPRECATED: Please use cluster_manager_timeout instead.
- # @option arguments [Time] :master_timeout Specify timeout for connection to master
+ # @option arguments [Time] :master_timeout (DEPRECATED: use cluster_manager_timeout instead) Specify timeout for connection to master
# @option arguments [Time] :cluster_manager_timeout Specify timeout for connection to cluster_manager
# @option arguments [Hash] :headers Custom HTTP headers
#
diff --git a/opensearch-api/lib/opensearch/api/actions/indices/exists_index_template.rb b/opensearch-api/lib/opensearch/api/actions/indices/exists_index_template.rb
index 8047c5463..7012c27e7 100644
--- a/opensearch-api/lib/opensearch/api/actions/indices/exists_index_template.rb
+++ b/opensearch-api/lib/opensearch/api/actions/indices/exists_index_template.rb
@@ -32,8 +32,7 @@ module Actions
#
# @option arguments [String] :name The name of the template
# @option arguments [Boolean] :flat_settings Return settings in flat format (default: false)
- # DEPRECATED: Please use cluster_manager_timeout instead.
- # @option arguments [Time] :master_timeout Explicit operation timeout for connection to master node
+ # @option arguments [Time] :master_timeout (DEPRECATED: use cluster_manager_timeout instead) Explicit operation timeout for connection to master node
# @option arguments [Time] :cluster_manager_timeout Explicit operation timeout for connection to cluster_manager node
# @option arguments [Boolean] :local Return local information, do not retrieve the state from cluster_manager node (default: false)
# @option arguments [Hash] :headers Custom HTTP headers
diff --git a/opensearch-api/lib/opensearch/api/actions/indices/exists_template.rb b/opensearch-api/lib/opensearch/api/actions/indices/exists_template.rb
index a0df35d2f..524cbf85f 100644
--- a/opensearch-api/lib/opensearch/api/actions/indices/exists_template.rb
+++ b/opensearch-api/lib/opensearch/api/actions/indices/exists_template.rb
@@ -32,8 +32,7 @@ module Actions
#
# @option arguments [List] :name The comma separated names of the index templates
# @option arguments [Boolean] :flat_settings Return settings in flat format (default: false)
- # DEPRECATED: Please use cluster_manager_timeout instead.
- # @option arguments [Time] :master_timeout Explicit operation timeout for connection to master node
+ # @option arguments [Time] :master_timeout (DEPRECATED: use cluster_manager_timeout instead) Explicit operation timeout for connection to master node
# @option arguments [Time] :cluster_manager_timeout Explicit operation timeout for connection to cluster_manager node
# @option arguments [Boolean] :local Return local information, do not retrieve the state from cluster_manager node (default: false)
# @option arguments [Hash] :headers Custom HTTP headers
diff --git a/opensearch-api/lib/opensearch/api/actions/indices/get.rb b/opensearch-api/lib/opensearch/api/actions/indices/get.rb
index 6ef773316..ef43fc809 100644
--- a/opensearch-api/lib/opensearch/api/actions/indices/get.rb
+++ b/opensearch-api/lib/opensearch/api/actions/indices/get.rb
@@ -37,8 +37,7 @@ module Actions
# @option arguments [String] :expand_wildcards Whether wildcard expressions should get expanded to open or closed indices (default: open) (options: open, closed, hidden, none, all)
# @option arguments [Boolean] :flat_settings Return settings in flat format (default: false)
# @option arguments [Boolean] :include_defaults Whether to return all default setting for each of the indices.
- # DEPRECATED: Please use cluster_manager_timeout instead.
- # @option arguments [Time] :master_timeout Specify timeout for connection to master
+ # @option arguments [Time] :master_timeout (DEPRECATED: use cluster_manager_timeout instead) Specify timeout for connection to master
# @option arguments [Time] :cluster_manager_timeout Specify timeout for connection to cluster_manager
# @option arguments [Hash] :headers Custom HTTP headers
#
diff --git a/opensearch-api/lib/opensearch/api/actions/indices/get_index_template.rb b/opensearch-api/lib/opensearch/api/actions/indices/get_index_template.rb
index b90c93e34..b3062d931 100644
--- a/opensearch-api/lib/opensearch/api/actions/indices/get_index_template.rb
+++ b/opensearch-api/lib/opensearch/api/actions/indices/get_index_template.rb
@@ -32,8 +32,7 @@ module Actions
#
# @option arguments [List] :name The comma separated names of the index templates
# @option arguments [Boolean] :flat_settings Return settings in flat format (default: false)
- # DEPRECATED: Please use cluster_manager_timeout instead.
- # @option arguments [Time] :master_timeout Explicit operation timeout for connection to master node
+ # @option arguments [Time] :master_timeout (DEPRECATED: use cluster_manager_timeout instead) Explicit operation timeout for connection to master node
# @option arguments [Time] :cluster_manager_timeout Explicit operation timeout for connection to cluster_manager node
# @option arguments [Boolean] :local Return local information, do not retrieve the state from cluster_manager node (default: false)
# @option arguments [Hash] :headers Custom HTTP headers
diff --git a/opensearch-api/lib/opensearch/api/actions/indices/get_mapping.rb b/opensearch-api/lib/opensearch/api/actions/indices/get_mapping.rb
index 7cc1be655..91a1c27d4 100644
--- a/opensearch-api/lib/opensearch/api/actions/indices/get_mapping.rb
+++ b/opensearch-api/lib/opensearch/api/actions/indices/get_mapping.rb
@@ -34,8 +34,7 @@ module Actions
# @option arguments [Boolean] :ignore_unavailable Whether specified concrete indices should be ignored when unavailable (missing or closed)
# @option arguments [Boolean] :allow_no_indices Whether to ignore if a wildcard indices expression resolves into no concrete indices. (This includes `_all` string or when no indices have been specified)
# @option arguments [String] :expand_wildcards Whether to expand wildcard expression to concrete indices that are open, closed or both. (options: open, closed, hidden, none, all)
- # DEPRECATED: Please use cluster_manager_timeout instead.
- # @option arguments [Time] :master_timeout Specify timeout for connection to master
+ # @option arguments [Time] :master_timeout (DEPRECATED: use cluster_manager_timeout instead) Specify timeout for connection to master
# @option arguments [Time] :cluster_manager_timeout Specify timeout for connection to cluster_manager
# @option arguments [Boolean] :local Return local information, do not retrieve the state from cluster_manager node (default: false) *Deprecated*
# @option arguments [Hash] :headers Custom HTTP headers
diff --git a/opensearch-api/lib/opensearch/api/actions/indices/get_settings.rb b/opensearch-api/lib/opensearch/api/actions/indices/get_settings.rb
index fcd73de24..cc43ec691 100644
--- a/opensearch-api/lib/opensearch/api/actions/indices/get_settings.rb
+++ b/opensearch-api/lib/opensearch/api/actions/indices/get_settings.rb
@@ -32,8 +32,7 @@ module Actions
#
# @option arguments [List] :index A comma-separated list of index names; use `_all` or empty string to perform the operation on all indices
# @option arguments [List] :name The name of the settings that should be included
- # DEPRECATED: Please use cluster_manager_timeout instead.
- # @option arguments [Time] :master_timeout Specify timeout for connection to master
+ # @option arguments [Time] :master_timeout (DEPRECATED: use cluster_manager_timeout instead) Specify timeout for connection to master
# @option arguments [Time] :cluster_manager_timeout Specify timeout for connection to cluster_manager
# @option arguments [Boolean] :ignore_unavailable Whether specified concrete indices should be ignored when unavailable (missing or closed)
# @option arguments [Boolean] :allow_no_indices Whether to ignore if a wildcard indices expression resolves into no concrete indices. (This includes `_all` string or when no indices have been specified)
diff --git a/opensearch-api/lib/opensearch/api/actions/indices/get_template.rb b/opensearch-api/lib/opensearch/api/actions/indices/get_template.rb
index a4f490458..4c030d2e3 100644
--- a/opensearch-api/lib/opensearch/api/actions/indices/get_template.rb
+++ b/opensearch-api/lib/opensearch/api/actions/indices/get_template.rb
@@ -32,8 +32,7 @@ module Actions
#
# @option arguments [List] :name The comma separated names of the index templates
# @option arguments [Boolean] :flat_settings Return settings in flat format (default: false)
- # DEPRECATED: Please use cluster_manager_timeout instead.
- # @option arguments [Time] :master_timeout Explicit operation timeout for connection to master node
+ # @option arguments [Time] :master_timeout (DEPRECATED: use cluster_manager_timeout instead) Explicit operation timeout for connection to master node
# @option arguments [Time] :cluster_manager_timeout Explicit operation timeout for connection to cluster_manager node
# @option arguments [Boolean] :local Return local information, do not retrieve the state from cluster_manager node (default: false)
# @option arguments [Hash] :headers Custom HTTP headers
diff --git a/opensearch-api/lib/opensearch/api/actions/indices/open.rb b/opensearch-api/lib/opensearch/api/actions/indices/open.rb
index 7ea0efefa..ad2cc5e49 100644
--- a/opensearch-api/lib/opensearch/api/actions/indices/open.rb
+++ b/opensearch-api/lib/opensearch/api/actions/indices/open.rb
@@ -32,8 +32,7 @@ module Actions
#
# @option arguments [List] :index A comma separated list of indices to open
# @option arguments [Time] :timeout Explicit operation timeout
- # DEPRECATED: Please use cluster_manager_timeout instead.
- # @option arguments [Time] :cluster_manager_timeout Specify timeout for connection to cluster_manager
+ # @option arguments [Time] :master_timeout (DEPRECATED: use cluster_manager_timeout instead) Specify timeout for connection to master
# @option arguments [Boolean] :ignore_unavailable Whether specified concrete indices should be ignored when unavailable (missing or closed)
# @option arguments [Boolean] :allow_no_indices Whether to ignore if a wildcard indices expression resolves into no concrete indices. (This includes `_all` string or when no indices have been specified)
# @option arguments [String] :expand_wildcards Whether to expand wildcard expression to concrete indices that are open, closed or both. (options: open, closed, hidden, none, all)
diff --git a/opensearch-api/lib/opensearch/api/actions/indices/put_alias.rb b/opensearch-api/lib/opensearch/api/actions/indices/put_alias.rb
index a09c6623d..398ca166a 100644
--- a/opensearch-api/lib/opensearch/api/actions/indices/put_alias.rb
+++ b/opensearch-api/lib/opensearch/api/actions/indices/put_alias.rb
@@ -33,8 +33,7 @@ module Actions
# @option arguments [List] :index A comma-separated list of index names the alias should point to (supports wildcards); use `_all` to perform the operation on all indices.
# @option arguments [String] :name The name of the alias to be created or updated
# @option arguments [Time] :timeout Explicit timestamp for the document
- # DEPRECATED: Please use cluster_manager_timeout instead.
- # @option arguments [Time] :master_timeout Specify timeout for connection to master
+ # @option arguments [Time] :master_timeout (DEPRECATED: use cluster_manager_timeout instead) Specify timeout for connection to master
# @option arguments [Time] :cluster_manager_timeout Specify timeout for connection to cluster_manager
# @option arguments [Hash] :headers Custom HTTP headers
# @option arguments [Hash] :body The settings for the alias, such as `routing` or `filter`
diff --git a/opensearch-api/lib/opensearch/api/actions/indices/put_index_template.rb b/opensearch-api/lib/opensearch/api/actions/indices/put_index_template.rb
index 963b60717..86428bdfa 100644
--- a/opensearch-api/lib/opensearch/api/actions/indices/put_index_template.rb
+++ b/opensearch-api/lib/opensearch/api/actions/indices/put_index_template.rb
@@ -33,8 +33,7 @@ module Actions
# @option arguments [String] :name The name of the template
# @option arguments [Boolean] :create Whether the index template should only be added if new or can also replace an existing one
# @option arguments [String] :cause User defined reason for creating/updating the index template
- # DEPRECATED: Please use cluster_manager_timeout instead.
- # @option arguments [Time] :master_timeout Specify timeout for connection to master
+ # @option arguments [Time] :master_timeout (DEPRECATED: use cluster_manager_timeout instead) Specify timeout for connection to master
# @option arguments [Time] :cluster_manager_timeout Specify timeout for connection to cluster_manager
# @option arguments [Hash] :headers Custom HTTP headers
# @option arguments [Hash] :body The template definition (*Required*)
diff --git a/opensearch-api/lib/opensearch/api/actions/indices/put_mapping.rb b/opensearch-api/lib/opensearch/api/actions/indices/put_mapping.rb
index 316d3003a..53e4621eb 100644
--- a/opensearch-api/lib/opensearch/api/actions/indices/put_mapping.rb
+++ b/opensearch-api/lib/opensearch/api/actions/indices/put_mapping.rb
@@ -32,8 +32,7 @@ module Actions
#
# @option arguments [List] :index A comma-separated list of index names the mapping should be added to (supports wildcards); use `_all` or omit to add the mapping on all indices.
# @option arguments [Time] :timeout Explicit operation timeout
- # DEPRECATED: Please use cluster_manager_timeout instead.
- # @option arguments [Time] :master_timeout Specify timeout for connection to master
+ # @option arguments [Time] :master_timeout (DEPRECATED: use cluster_manager_timeout instead) Specify timeout for connection to master
# @option arguments [Time] :cluster_manager_timeout Specify timeout for connection to cluster_manager
# @option arguments [Boolean] :ignore_unavailable Whether specified concrete indices should be ignored when unavailable (missing or closed)
# @option arguments [Boolean] :allow_no_indices Whether to ignore if a wildcard indices expression resolves into no concrete indices. (This includes `_all` string or when no indices have been specified)
diff --git a/opensearch-api/lib/opensearch/api/actions/indices/put_settings.rb b/opensearch-api/lib/opensearch/api/actions/indices/put_settings.rb
index 50a852b5d..e80d450e9 100644
--- a/opensearch-api/lib/opensearch/api/actions/indices/put_settings.rb
+++ b/opensearch-api/lib/opensearch/api/actions/indices/put_settings.rb
@@ -31,8 +31,7 @@ module Actions
# Updates the index settings.
#
# @option arguments [List] :index A comma-separated list of index names; use `_all` or empty string to perform the operation on all indices
- # DEPRECATED: Please use cluster_manager_timeout instead.
- # @option arguments [Time] :master_timeout Specify timeout for connection to master
+ # @option arguments [Time] :master_timeout (DEPRECATED: use cluster_manager_timeout instead) Specify timeout for connection to master
# @option arguments [Time] :cluster_manager_timeout Specify timeout for connection to cluster_manager
# @option arguments [Time] :timeout Explicit operation timeout
# @option arguments [Boolean] :preserve_existing Whether to update existing settings. If set to `true` existing settings on an index remain unchanged, the default is `false`
diff --git a/opensearch-api/lib/opensearch/api/actions/indices/put_template.rb b/opensearch-api/lib/opensearch/api/actions/indices/put_template.rb
index 3d5032ec5..eb8440a7a 100644
--- a/opensearch-api/lib/opensearch/api/actions/indices/put_template.rb
+++ b/opensearch-api/lib/opensearch/api/actions/indices/put_template.rb
@@ -33,8 +33,7 @@ module Actions
# @option arguments [String] :name The name of the template
# @option arguments [Number] :order The order for this template when merging multiple matching ones (higher numbers are merged later, overriding the lower numbers)
# @option arguments [Boolean] :create Whether the index template should only be added if new or can also replace an existing one
- # DEPRECATED: Please use cluster_manager_timeout instead.
- # @option arguments [Time] :master_timeout Specify timeout for connection to master
+ # @option arguments [Time] :master_timeout (DEPRECATED: use cluster_manager_timeout instead) Specify timeout for connection to master
# @option arguments [Time] :cluster_manager_timeout Specify timeout for connection to cluster_manager
# @option arguments [Hash] :headers Custom HTTP headers
# @option arguments [Hash] :body The template definition (*Required*)
diff --git a/opensearch-api/lib/opensearch/api/actions/indices/rollover.rb b/opensearch-api/lib/opensearch/api/actions/indices/rollover.rb
index 93f381b33..e8561b534 100644
--- a/opensearch-api/lib/opensearch/api/actions/indices/rollover.rb
+++ b/opensearch-api/lib/opensearch/api/actions/indices/rollover.rb
@@ -35,8 +35,7 @@ module Actions
# @option arguments [String] :new_index The name of the rollover index
# @option arguments [Time] :timeout Explicit operation timeout
# @option arguments [Boolean] :dry_run If set to true the rollover action will only be validated but not actually performed even if a condition matches. The default is false
- # DEPRECATED: Please use cluster_manager_timeout instead.
- # @option arguments [Time] :master_timeout Specify timeout for connection to master
+ # @option arguments [Time] :master_timeout (DEPRECATED: use cluster_manager_timeout instead) Specify timeout for connection to master
# @option arguments [Time] :cluster_manager_timeout Specify timeout for connection to cluster_manager
# @option arguments [String] :wait_for_active_shards Set the number of active shards to wait for on the newly created rollover index before the operation returns.
# @option arguments [Hash] :headers Custom HTTP headers
diff --git a/opensearch-api/lib/opensearch/api/actions/indices/shrink.rb b/opensearch-api/lib/opensearch/api/actions/indices/shrink.rb
index 7123a7267..6aaa8f6c4 100644
--- a/opensearch-api/lib/opensearch/api/actions/indices/shrink.rb
+++ b/opensearch-api/lib/opensearch/api/actions/indices/shrink.rb
@@ -34,8 +34,7 @@ module Actions
# @option arguments [String] :target The name of the target index to shrink into
# @option arguments [Boolean] :copy_settings whether or not to copy settings from the source index (defaults to false)
# @option arguments [Time] :timeout Explicit operation timeout
- # DEPRECATED: Please use cluster_manager_timeout instead.
- # @option arguments [Time] :master_timeout Specify timeout for connection to master
+ # @option arguments [Time] :master_timeout (DEPRECATED: use cluster_manager_timeout instead) Specify timeout for connection to master
# @option arguments [Time] :cluster_manager_timeout Specify timeout for connection to cluster_manager
# @option arguments [String] :wait_for_active_shards Set the number of active shards to wait for on the shrunken index before the operation returns.
# @option arguments [Hash] :headers Custom HTTP headers
diff --git a/opensearch-api/lib/opensearch/api/actions/indices/simulate_index_template.rb b/opensearch-api/lib/opensearch/api/actions/indices/simulate_index_template.rb
index 30aefe8cf..03f4c5561 100644
--- a/opensearch-api/lib/opensearch/api/actions/indices/simulate_index_template.rb
+++ b/opensearch-api/lib/opensearch/api/actions/indices/simulate_index_template.rb
@@ -33,8 +33,7 @@ module Actions
# @option arguments [String] :name The name of the index (it must be a concrete index name)
# @option arguments [Boolean] :create Whether the index template we optionally defined in the body should only be dry-run added if new or can also replace an existing one
# @option arguments [String] :cause User defined reason for dry-run creating the new template for simulation purposes
- # DEPRECATED: Please use cluster_manager_timeout instead.
- # @option arguments [Time] :master_timeout Specify timeout for connection to master
+ # @option arguments [Time] :master_timeout (DEPRECATED: use cluster_manager_timeout instead) Specify timeout for connection to master
# @option arguments [Time] :cluster_manager_timeout Specify timeout for connection to cluster_manager
# @option arguments [Hash] :headers Custom HTTP headers
# @option arguments [Hash] :body New index template definition, which will be included in the simulation, as if it already exists in the system
diff --git a/opensearch-api/lib/opensearch/api/actions/indices/simulate_template.rb b/opensearch-api/lib/opensearch/api/actions/indices/simulate_template.rb
index 253c4c8b8..7a3bc01c0 100644
--- a/opensearch-api/lib/opensearch/api/actions/indices/simulate_template.rb
+++ b/opensearch-api/lib/opensearch/api/actions/indices/simulate_template.rb
@@ -33,8 +33,7 @@ module Actions
# @option arguments [String] :name The name of the index template
# @option arguments [Boolean] :create Whether the index template we optionally defined in the body should only be dry-run added if new or can also replace an existing one
# @option arguments [String] :cause User defined reason for dry-run creating the new template for simulation purposes
- # DEPRECATED: Please use cluster_manager_timeout instead.
- # @option arguments [Time] :master_timeout Specify timeout for connection to master
+ # @option arguments [Time] :master_timeout (DEPRECATED: use cluster_manager_timeout instead) Specify timeout for connection to master
# @option arguments [Time] :cluster_manager_timeout Specify timeout for connection to cluster_manager
# @option arguments [Hash] :headers Custom HTTP headers
# @option arguments [Hash] :body New index template definition to be simulated, if no index template name is specified
diff --git a/opensearch-api/lib/opensearch/api/actions/indices/split.rb b/opensearch-api/lib/opensearch/api/actions/indices/split.rb
index 1d8b57252..912c16561 100644
--- a/opensearch-api/lib/opensearch/api/actions/indices/split.rb
+++ b/opensearch-api/lib/opensearch/api/actions/indices/split.rb
@@ -34,8 +34,7 @@ module Actions
# @option arguments [String] :target The name of the target index to split into
# @option arguments [Boolean] :copy_settings whether or not to copy settings from the source index (defaults to false)
# @option arguments [Time] :timeout Explicit operation timeout
- # DEPRECATED: Please use cluster_manager_timeout instead.
- # @option arguments [Time] :master_timeout Specify timeout for connection to master
+ # @option arguments [Time] :master_timeout (DEPRECATED: use cluster_manager_timeout instead) Specify timeout for connection to master
# @option arguments [Time] :cluster_manager_timeout Specify timeout for connection to cluster_manager
# @option arguments [String] :wait_for_active_shards Set the number of active shards to wait for on the shrunken index before the operation returns.
# @option arguments [Hash] :headers Custom HTTP headers
diff --git a/opensearch-api/lib/opensearch/api/actions/indices/update_aliases.rb b/opensearch-api/lib/opensearch/api/actions/indices/update_aliases.rb
index e25a43b02..6e1c456c2 100644
--- a/opensearch-api/lib/opensearch/api/actions/indices/update_aliases.rb
+++ b/opensearch-api/lib/opensearch/api/actions/indices/update_aliases.rb
@@ -31,8 +31,7 @@ module Actions
# Updates index aliases.
#
# @option arguments [Time] :timeout Request timeout
- # DEPRECATED: Please use cluster_manager_timeout instead.
- # @option arguments [Time] :master_timeout Specify timeout for connection to master
+ # @option arguments [Time] :master_timeout (DEPRECATED: use cluster_manager_timeout instead) Specify timeout for connection to master
# @option arguments [Time] :cluster_manager_timeout Specify timeout for connection to cluster_manager
# @option arguments [Hash] :headers Custom HTTP headers
# @option arguments [Hash] :body The definition of `actions` to perform (*Required*)
diff --git a/opensearch-api/lib/opensearch/api/actions/ingest/delete_pipeline.rb b/opensearch-api/lib/opensearch/api/actions/ingest/delete_pipeline.rb
index 3ae3a985b..c3c9fd31e 100644
--- a/opensearch-api/lib/opensearch/api/actions/ingest/delete_pipeline.rb
+++ b/opensearch-api/lib/opensearch/api/actions/ingest/delete_pipeline.rb
@@ -31,8 +31,7 @@ module Actions
# Deletes a pipeline.
#
# @option arguments [String] :id Pipeline ID
- # DEPRECATED: Please use cluster_manager_timeout instead.
- # @option arguments [Time] :master_timeout Explicit operation timeout for connection to master node
+ # @option arguments [Time] :master_timeout (DEPRECATED: use cluster_manager_timeout instead) Explicit operation timeout for connection to master node
# @option arguments [Time] :cluster_manager_timeout Explicit operation timeout for connection to cluster_manager node
# @option arguments [Time] :timeout Explicit operation timeout
# @option arguments [Hash] :headers Custom HTTP headers
diff --git a/opensearch-api/lib/opensearch/api/actions/ingest/get_pipeline.rb b/opensearch-api/lib/opensearch/api/actions/ingest/get_pipeline.rb
index 0d44e5942..13906b6e6 100644
--- a/opensearch-api/lib/opensearch/api/actions/ingest/get_pipeline.rb
+++ b/opensearch-api/lib/opensearch/api/actions/ingest/get_pipeline.rb
@@ -32,8 +32,7 @@ module Actions
#
# @option arguments [String] :id Comma separated list of pipeline ids. Wildcards supported
# @option arguments [Boolean] :summary Return pipelines without their definitions (default: false)
- # DEPRECATED: Please use cluster_manager_timeout instead.
- # @option arguments [Time] :master_timeout Explicit operation timeout for connection to master node
+ # @option arguments [Time] :master_timeout (DEPRECATED: use cluster_manager_timeout instead) Explicit operation timeout for connection to master node
# @option arguments [Time] :cluster_manager_timeout Explicit operation timeout for connection to cluster_manager node
# @option arguments [Hash] :headers Custom HTTP headers
#
diff --git a/opensearch-api/lib/opensearch/api/actions/ingest/put_pipeline.rb b/opensearch-api/lib/opensearch/api/actions/ingest/put_pipeline.rb
index 14168f68b..12f3ece46 100644
--- a/opensearch-api/lib/opensearch/api/actions/ingest/put_pipeline.rb
+++ b/opensearch-api/lib/opensearch/api/actions/ingest/put_pipeline.rb
@@ -31,8 +31,7 @@ module Actions
# Creates or updates a pipeline.
#
# @option arguments [String] :id Pipeline ID
- # DEPRECATED: Please use cluster_manager_timeout instead.
- # @option arguments [Time] :master_timeout Explicit operation timeout for connection to master node
+ # @option arguments [Time] :master_timeout (DEPRECATED: use cluster_manager_timeout instead) Explicit operation timeout for connection to master node
# @option arguments [Time] :cluster_manager_timeout Explicit operation timeout for connection to cluster_manager node
# @option arguments [Time] :timeout Explicit operation timeout
# @option arguments [Hash] :headers Custom HTTP headers
diff --git a/opensearch-api/lib/opensearch/api/actions/put_script.rb b/opensearch-api/lib/opensearch/api/actions/put_script.rb
index 297a2273c..eeab28cd4 100644
--- a/opensearch-api/lib/opensearch/api/actions/put_script.rb
+++ b/opensearch-api/lib/opensearch/api/actions/put_script.rb
@@ -32,8 +32,7 @@ module Actions
# @option arguments [String] :id Script ID
# @option arguments [String] :context Script context
# @option arguments [Time] :timeout Explicit operation timeout
- # DEPRECATED: Please use cluster_manager_timeout instead.
- # @option arguments [Time] :master_timeout Specify timeout for connection to master
+ # @option arguments [Time] :master_timeout (DEPRECATED: use cluster_manager_timeout instead) Specify timeout for connection to master
# @option arguments [Time] :cluster_manager_timeout Specify timeout for connection to cluster_manager
# @option arguments [Hash] :headers Custom HTTP headers
# @option arguments [Hash] :body The document (*Required*)
diff --git a/opensearch-api/lib/opensearch/api/actions/snapshot/cleanup_repository.rb b/opensearch-api/lib/opensearch/api/actions/snapshot/cleanup_repository.rb
index 633f36905..f9c5f7b29 100644
--- a/opensearch-api/lib/opensearch/api/actions/snapshot/cleanup_repository.rb
+++ b/opensearch-api/lib/opensearch/api/actions/snapshot/cleanup_repository.rb
@@ -31,8 +31,7 @@ module Actions
# Removes stale data from repository.
#
# @option arguments [String] :repository A repository name
- # DEPRECATED: Please use cluster_manager_timeout instead.
- # @option arguments [Time] :master_timeout Explicit operation timeout for connection to master node
+ # @option arguments [Time] :master_timeout (DEPRECATED: use cluster_manager_timeout instead) Explicit operation timeout for connection to master node
# @option arguments [Time] :cluster_manager_timeout Explicit operation timeout for connection to cluster_manager node
# @option arguments [Time] :timeout Explicit operation timeout
# @option arguments [Hash] :headers Custom HTTP headers
diff --git a/opensearch-api/lib/opensearch/api/actions/snapshot/clone.rb b/opensearch-api/lib/opensearch/api/actions/snapshot/clone.rb
index 28ae1e5da..9b365689f 100644
--- a/opensearch-api/lib/opensearch/api/actions/snapshot/clone.rb
+++ b/opensearch-api/lib/opensearch/api/actions/snapshot/clone.rb
@@ -33,8 +33,7 @@ module Actions
# @option arguments [String] :repository A repository name
# @option arguments [String] :snapshot The name of the snapshot to clone from
# @option arguments [String] :target_snapshot The name of the cloned snapshot to create
- # DEPRECATED: Please use cluster_manager_timeout instead.
- # @option arguments [Time] :master_timeout Explicit operation timeout for connection to master node
+ # @option arguments [Time] :master_timeout (DEPRECATED: use cluster_manager_timeout instead) Explicit operation timeout for connection to master node
# @option arguments [Time] :cluster_manager_timeout Explicit operation timeout for connection to cluster_manager node
# @option arguments [Hash] :headers Custom HTTP headers
# @option arguments [Hash] :body The snapshot clone definition (*Required*)
diff --git a/opensearch-api/lib/opensearch/api/actions/snapshot/create.rb b/opensearch-api/lib/opensearch/api/actions/snapshot/create.rb
index 89f904c9d..e80cc12f5 100644
--- a/opensearch-api/lib/opensearch/api/actions/snapshot/create.rb
+++ b/opensearch-api/lib/opensearch/api/actions/snapshot/create.rb
@@ -32,8 +32,7 @@ module Actions
#
# @option arguments [String] :repository A repository name
# @option arguments [String] :snapshot A snapshot name
- # DEPRECATED: Please use cluster_manager_timeout instead.
- # @option arguments [Time] :master_timeout Explicit operation timeout for connection to master node
+ # @option arguments [Time] :master_timeout (DEPRECATED: use cluster_manager_timeout instead) Explicit operation timeout for connection to master node
# @option arguments [Time] :cluster_manager_timeout Explicit operation timeout for connection to cluster_manager node
# @option arguments [Boolean] :wait_for_completion Should this request wait until the operation has completed before returning
# @option arguments [Hash] :headers Custom HTTP headers
diff --git a/opensearch-api/lib/opensearch/api/actions/snapshot/create_repository.rb b/opensearch-api/lib/opensearch/api/actions/snapshot/create_repository.rb
index aada35467..d5b0db02a 100644
--- a/opensearch-api/lib/opensearch/api/actions/snapshot/create_repository.rb
+++ b/opensearch-api/lib/opensearch/api/actions/snapshot/create_repository.rb
@@ -31,8 +31,7 @@ module Actions
# Creates a repository.
#
# @option arguments [String] :repository A repository name
- # DEPRECATED: Please use cluster_manager_timeout instead.
- # @option arguments [Time] :master_timeout Explicit operation timeout for connection to master node
+ # @option arguments [Time] :master_timeout (DEPRECATED: use cluster_manager_timeout instead) Explicit operation timeout for connection to master node
# @option arguments [Time] :cluster_manager_timeout Explicit operation timeout for connection to cluster_manager node
# @option arguments [Time] :timeout Explicit operation timeout
# @option arguments [Boolean] :verify Whether to verify the repository after creation
diff --git a/opensearch-api/lib/opensearch/api/actions/snapshot/delete.rb b/opensearch-api/lib/opensearch/api/actions/snapshot/delete.rb
index 30a7b02f6..787f2dde7 100644
--- a/opensearch-api/lib/opensearch/api/actions/snapshot/delete.rb
+++ b/opensearch-api/lib/opensearch/api/actions/snapshot/delete.rb
@@ -32,8 +32,7 @@ module Actions
#
# @option arguments [String] :repository A repository name
# @option arguments [String] :snapshot A snapshot name
- # DEPRECATED: Please use cluster_manager_timeout instead.
- # @option arguments [Time] :cluster_manager_timeout Explicit operation timeout for connection to cluster_manager node
+ # @option arguments [Time] :master_timeout (DEPRECATED: use cluster_manager_timeout instead) Explicit operation timeout for connection to cluster_manager node
# @option arguments [Hash] :headers Custom HTTP headers
#
#
diff --git a/opensearch-api/lib/opensearch/api/actions/snapshot/delete_repository.rb b/opensearch-api/lib/opensearch/api/actions/snapshot/delete_repository.rb
index d3155e6f8..4e57efbbf 100644
--- a/opensearch-api/lib/opensearch/api/actions/snapshot/delete_repository.rb
+++ b/opensearch-api/lib/opensearch/api/actions/snapshot/delete_repository.rb
@@ -31,8 +31,7 @@ module Actions
# Deletes a repository.
#
# @option arguments [List] :repository Name of the snapshot repository to unregister. Wildcard (`*`) patterns are supported.
- # DEPRECATED: Please use cluster_manager_timeout instead.
- # @option arguments [Time] :master_timeout Explicit operation timeout for connection to master node
+ # @option arguments [Time] :master_timeout (DEPRECATED: use cluster_manager_timeout instead) Explicit operation timeout for connection to master node
# @option arguments [Time] :cluster_manager_timeout Explicit operation timeout for connection to cluster_manager node
# @option arguments [Time] :timeout Explicit operation timeout
# @option arguments [Hash] :headers Custom HTTP headers
diff --git a/opensearch-api/lib/opensearch/api/actions/snapshot/get.rb b/opensearch-api/lib/opensearch/api/actions/snapshot/get.rb
index 7adfbed44..a79123da6 100644
--- a/opensearch-api/lib/opensearch/api/actions/snapshot/get.rb
+++ b/opensearch-api/lib/opensearch/api/actions/snapshot/get.rb
@@ -32,8 +32,7 @@ module Actions
#
# @option arguments [String] :repository A repository name
# @option arguments [List] :snapshot A comma-separated list of snapshot names
- # DEPRECATED: Please use cluster_manager_timeout instead.
- # @option arguments [Time] :master_timeout Explicit operation timeout for connection to master node
+ # @option arguments [Time] :master_timeout (DEPRECATED: use cluster_manager_timeout instead) Explicit operation timeout for connection to master node
# @option arguments [Time] :cluster_manager_timeout Explicit operation timeout for connection to cluster_manager node
# @option arguments [Boolean] :ignore_unavailable Whether to ignore unavailable snapshots, defaults to false which means a SnapshotMissingException is thrown
# @option arguments [Boolean] :index_details Whether to include details of each index in the snapshot, if those details are available. Defaults to false.
diff --git a/opensearch-api/lib/opensearch/api/actions/snapshot/get_features.rb b/opensearch-api/lib/opensearch/api/actions/snapshot/get_features.rb
index dbd865ce1..be1115cc0 100644
--- a/opensearch-api/lib/opensearch/api/actions/snapshot/get_features.rb
+++ b/opensearch-api/lib/opensearch/api/actions/snapshot/get_features.rb
@@ -30,8 +30,7 @@ module Snapshot
module Actions
# Returns a list of features which can be snapshotted in this cluster.
#
- # DEPRECATED: Please use cluster_manager_timeout instead.
- # @option arguments [Time] :cluster_manager_timeout Explicit operation timeout for connection to cluster_manager node
+ # @option arguments [Time] :master_timeout (DEPRECATED: use cluster_manager_timeout instead) Explicit operation timeout for connection to cluster_manager node
# @option arguments [Hash] :headers Custom HTTP headers
#
#
diff --git a/opensearch-api/lib/opensearch/api/actions/snapshot/get_repository.rb b/opensearch-api/lib/opensearch/api/actions/snapshot/get_repository.rb
index a03ba8053..c3d76bdca 100644
--- a/opensearch-api/lib/opensearch/api/actions/snapshot/get_repository.rb
+++ b/opensearch-api/lib/opensearch/api/actions/snapshot/get_repository.rb
@@ -31,8 +31,7 @@ module Actions
# Returns information about a repository.
#
# @option arguments [List] :repository A comma-separated list of repository names
- # DEPRECATED: Please use cluster_manager_timeout instead.
- # @option arguments [Time] :cluster_manager_timeout Explicit operation timeout for connection to cluster_manager node
+ # @option arguments [Time] :master_timeout (DEPRECATED: use cluster_manager_timeout instead) Explicit operation timeout for connection to cluster_manager node
# @option arguments [Boolean] :local Return local information, do not retrieve the state from cluster_manager node (default: false)
# @option arguments [Hash] :headers Custom HTTP headers
#
diff --git a/opensearch-api/lib/opensearch/api/actions/snapshot/restore.rb b/opensearch-api/lib/opensearch/api/actions/snapshot/restore.rb
index 7d9f5b555..0110b1304 100644
--- a/opensearch-api/lib/opensearch/api/actions/snapshot/restore.rb
+++ b/opensearch-api/lib/opensearch/api/actions/snapshot/restore.rb
@@ -32,8 +32,7 @@ module Actions
#
# @option arguments [String] :repository A repository name
# @option arguments [String] :snapshot A snapshot name
- # DEPRECATED: Please use cluster_manager_timeout instead.
- # @option arguments [Time] :master_timeout Explicit operation timeout for connection to master node
+ # @option arguments [Time] :master_timeout (DEPRECATED: use cluster_manager_timeout instead) Explicit operation timeout for connection to master node
# @option arguments [Time] :cluster_manager_timeout Explicit operation timeout for connection to cluster_manager node
# @option arguments [Boolean] :wait_for_completion Should this request wait until the operation has completed before returning
# @option arguments [Hash] :headers Custom HTTP headers
diff --git a/opensearch-api/lib/opensearch/api/actions/snapshot/status.rb b/opensearch-api/lib/opensearch/api/actions/snapshot/status.rb
index 08721379e..55ac7ccad 100644
--- a/opensearch-api/lib/opensearch/api/actions/snapshot/status.rb
+++ b/opensearch-api/lib/opensearch/api/actions/snapshot/status.rb
@@ -32,8 +32,7 @@ module Actions
#
# @option arguments [String] :repository A repository name
# @option arguments [List] :snapshot A comma-separated list of snapshot names
- # DEPRECATED: Please use cluster_manager_timeout instead.
- # @option arguments [Time] :master_timeout Explicit operation timeout for connection to master node
+ # @option arguments [Time] :master_timeout (DEPRECATED: use cluster_manager_timeout instead) Explicit operation timeout for connection to master node
# @option arguments [Time] :cluster_manager_timeout Explicit operation timeout for connection to cluster_manager node
# @option arguments [Boolean] :ignore_unavailable Whether to ignore unavailable snapshots, defaults to false which means a SnapshotMissingException is thrown
# @option arguments [Hash] :headers Custom HTTP headers
diff --git a/opensearch-api/lib/opensearch/api/actions/snapshot/verify_repository.rb b/opensearch-api/lib/opensearch/api/actions/snapshot/verify_repository.rb
index bc38f8952..bb1f352c5 100644
--- a/opensearch-api/lib/opensearch/api/actions/snapshot/verify_repository.rb
+++ b/opensearch-api/lib/opensearch/api/actions/snapshot/verify_repository.rb
@@ -31,8 +31,7 @@ module Actions
# Verifies a repository.
#
# @option arguments [String] :repository A repository name
- # DEPRECATED: Please use cluster_manager_timeout instead.
- # @option arguments [Time] :master_timeout Explicit operation timeout for connection to master node
+ # @option arguments [Time] :master_timeout (DEPRECATED: use cluster_manager_timeout instead) Explicit operation timeout for connection to master node
# @option arguments [Time] :cluster_manager_timeout Explicit operation timeout for connection to cluster_manager node
# @option arguments [Time] :timeout Explicit operation timeout
# @option arguments [Hash] :headers Custom HTTP headers
diff --git a/opensearch-api/spec/opensearch/api/actions/cat/master_spec.rb b/opensearch-api/spec/opensearch/api/actions/cat/master_spec.rb
index e895370c5..84efbb12c 100644
--- a/opensearch-api/spec/opensearch/api/actions/cat/master_spec.rb
+++ b/opensearch-api/spec/opensearch/api/actions/cat/master_spec.rb
@@ -26,7 +26,6 @@
require 'spec_helper'
-# DEPRECATED: Please use cluster_manager instead.
describe 'client.cat#master' do
let(:expected_args) do