diff --git a/docs/reference/alias.asciidoc b/docs/reference/alias.asciidoc
index 5f2515f2452dd..afc86a8b68cdb 100644
--- a/docs/reference/alias.asciidoc
+++ b/docs/reference/alias.asciidoc
@@ -1,5 +1,5 @@
[chapter]
-[[alias]]
+[[aliases]]
= Aliases
An alias is a secondary name for a group of data streams or indices. Most {es}
diff --git a/docs/reference/cat/alias.asciidoc b/docs/reference/cat/alias.asciidoc
index 9ccf529f0e2fa..95082a7d21db5 100644
--- a/docs/reference/cat/alias.asciidoc
+++ b/docs/reference/cat/alias.asciidoc
@@ -4,7 +4,7 @@
cat aliases
++++
-Retrieves the cluster's <>, including filter and routing
+Retrieves the cluster's <>, including filter and routing
information. The API does not return data stream aliases.
[[cat-alias-api-request]]
diff --git a/docs/reference/ilm/actions/ilm-rollover.asciidoc b/docs/reference/ilm/actions/ilm-rollover.asciidoc
index dd3aec7fe0ea7..d6c2d70a5ac1e 100644
--- a/docs/reference/ilm/actions/ilm-rollover.asciidoc
+++ b/docs/reference/ilm/actions/ilm-rollover.asciidoc
@@ -12,7 +12,7 @@ policy execution waits until the leader index rolls over (or is
then converts the follower index into a regular index with the
<>.
-A rollover target can be a <> or an <> or an <>. When targeting a data stream, the new index becomes the data stream's
write index and its generation is incremented.
diff --git a/docs/reference/ilm/index-rollover.asciidoc b/docs/reference/ilm/index-rollover.asciidoc
index a73d7ca889310..85e8c87ec902d 100644
--- a/docs/reference/ilm/index-rollover.asciidoc
+++ b/docs/reference/ilm/index-rollover.asciidoc
@@ -28,7 +28,7 @@ Each data stream requires an <> that contains:
Data streams are designed for append-only data, where the data stream name
can be used as the operations (read, write, rollover, shrink etc.) target.
If your use case requires data to be updated in place, you can instead manage
-your time series data using <>. However, there are a few
+your time series data using <>. However, there are a few
more configuration steps and concepts:
* An _index template_ that specifies the settings for each new index in the series.
diff --git a/docs/reference/indices/add-alias.asciidoc b/docs/reference/indices/add-alias.asciidoc
index e0204dd8c1f77..cba7d70e24e16 100644
--- a/docs/reference/indices/add-alias.asciidoc
+++ b/docs/reference/indices/add-alias.asciidoc
@@ -4,7 +4,7 @@
Create or update alias
++++
-Adds a data stream or index to an <>.
+Adds a data stream or index to an <>.
[source,console]
----
diff --git a/docs/reference/indices/alias-exists.asciidoc b/docs/reference/indices/alias-exists.asciidoc
index 0645cac7c2813..997dbad5bd6c8 100644
--- a/docs/reference/indices/alias-exists.asciidoc
+++ b/docs/reference/indices/alias-exists.asciidoc
@@ -4,7 +4,7 @@
Alias exists
++++
-Checks if an <> exists.
+Checks if an <> exists.
[source,console]
----
diff --git a/docs/reference/indices/aliases.asciidoc b/docs/reference/indices/aliases.asciidoc
index 198d6aff8b7fb..b235da45dd700 100644
--- a/docs/reference/indices/aliases.asciidoc
+++ b/docs/reference/indices/aliases.asciidoc
@@ -4,7 +4,7 @@
Aliases
++++
-Performs one or more <> actions in a single atomic operation.
+Performs one or more <> actions in a single atomic operation.
[source,console]
----
diff --git a/docs/reference/indices/create-index.asciidoc b/docs/reference/indices/create-index.asciidoc
index 82a4449f418bc..d0004d76bf10e 100644
--- a/docs/reference/indices/create-index.asciidoc
+++ b/docs/reference/indices/create-index.asciidoc
@@ -192,7 +192,7 @@ include_type_name is set. For more details, please see <>.
[[create-index-aliases]]
===== Aliases
-The create index API allows also to provide a set of <>:
+The create index API allows also to provide a set of <>:
[source,console]
--------------------------------------------------
diff --git a/docs/reference/indices/delete-alias.asciidoc b/docs/reference/indices/delete-alias.asciidoc
index 8d9cf98f59735..680e255a9728a 100644
--- a/docs/reference/indices/delete-alias.asciidoc
+++ b/docs/reference/indices/delete-alias.asciidoc
@@ -4,7 +4,7 @@
Delete alias
++++
-Removes a data stream or index from an <>.
+Removes a data stream or index from an <>.
[source,console]
----
diff --git a/docs/reference/indices/delete-index-template.asciidoc b/docs/reference/indices/delete-index-template.asciidoc
index 3edb52c66e486..f410f091f6864 100644
--- a/docs/reference/indices/delete-index-template.asciidoc
+++ b/docs/reference/indices/delete-index-template.asciidoc
@@ -49,7 +49,7 @@ privilege>> to use this API.
Use the delete index template API to delete one or more index templates.
Index templates define <>, <>,
-and <> that can be applied automatically to new indices.
+and <> that can be applied automatically to new indices.
[[delete-template-api-path-params]]
diff --git a/docs/reference/indices/delete-index.asciidoc b/docs/reference/indices/delete-index.asciidoc
index 21bc2c27e26f0..d83643fc61125 100644
--- a/docs/reference/indices/delete-index.asciidoc
+++ b/docs/reference/indices/delete-index.asciidoc
@@ -31,7 +31,7 @@ or `manage` <> for the target index.
+
--
(Required, string) Comma-separated list of indices to delete. You cannot specify
-<>.
+<>.
To delete all indices, use `_all` or `*` . To disallow the deletion of indices
with `_all` or wildcard expressions, change the
diff --git a/docs/reference/indices/get-alias.asciidoc b/docs/reference/indices/get-alias.asciidoc
index 89a5683714dd2..7c2f414ce5f40 100644
--- a/docs/reference/indices/get-alias.asciidoc
+++ b/docs/reference/indices/get-alias.asciidoc
@@ -4,7 +4,7 @@
Get alias
++++
-Retrieves information for one or more <>.
+Retrieves information for one or more <>.
[source,console]
----
diff --git a/docs/reference/indices/index-template-exists-v1.asciidoc b/docs/reference/indices/index-template-exists-v1.asciidoc
index 7be99ee6da9c1..888a967056eeb 100644
--- a/docs/reference/indices/index-template-exists-v1.asciidoc
+++ b/docs/reference/indices/index-template-exists-v1.asciidoc
@@ -38,7 +38,7 @@ Use the index template exists API
to determine whether one or more index templates exist.
Index templates define <>, <>,
-and <> that can be applied automatically to new indices.
+and <> that can be applied automatically to new indices.
[[template-exists-api-path-params]]
==== {api-path-parms-title}
diff --git a/docs/reference/indices/migrate-to-data-stream.asciidoc b/docs/reference/indices/migrate-to-data-stream.asciidoc
index 22768c264af5a..48302761c7dc9 100644
--- a/docs/reference/indices/migrate-to-data-stream.asciidoc
+++ b/docs/reference/indices/migrate-to-data-stream.asciidoc
@@ -5,7 +5,7 @@
Migrate to data stream
++++
-Converts an <> to a <>.
+Converts an <> to a <>.
////
[source,console]
diff --git a/docs/reference/indices/put-component-template.asciidoc b/docs/reference/indices/put-component-template.asciidoc
index 7852718d2fef1..676ca104ed056 100644
--- a/docs/reference/indices/put-component-template.asciidoc
+++ b/docs/reference/indices/put-component-template.asciidoc
@@ -7,7 +7,7 @@
Creates or updates a component template. Component templates are building blocks
for constructing <> that specify index
<>, <>, and
-<>.
+<>.
[source,console]
--------------------------------------------------
@@ -168,7 +168,7 @@ This map is not automatically generated by {es}.
===== Component template with index aliases
-You can include <> in a component template.
+You can include <> in a component template.
[source,console]
--------------------------------------------------
diff --git a/docs/reference/indices/put-index-template-v1.asciidoc b/docs/reference/indices/put-index-template-v1.asciidoc
index 7b898c6e5d4a3..5b7713656c4d3 100644
--- a/docs/reference/indices/put-index-template-v1.asciidoc
+++ b/docs/reference/indices/put-index-template-v1.asciidoc
@@ -143,7 +143,7 @@ This number is not automatically generated by {es}.
===== Index template with index aliases
-You can include <> in an index template.
+You can include <> in an index template.
[source,console]
--------------------------------------------------
diff --git a/docs/reference/indices/put-index-template.asciidoc b/docs/reference/indices/put-index-template.asciidoc
index 4b830c6b2f083..a277d4aa39ac5 100644
--- a/docs/reference/indices/put-index-template.asciidoc
+++ b/docs/reference/indices/put-index-template.asciidoc
@@ -5,7 +5,7 @@
++++
Creates or updates an index template. Index templates define
-<>, <>, and <>
+<>, <>, and <>
that can be applied automatically to new indices.
[source,console]
@@ -163,7 +163,7 @@ This number is not automatically generated by {es}.
===== Index template with index aliases
-You can include <> in an index template.
+You can include <> in an index template.
[source,console]
--------------------------------------------------
diff --git a/docs/reference/indices/rollover-index.asciidoc b/docs/reference/indices/rollover-index.asciidoc
index 26d13634b5c89..52891992e8957 100644
--- a/docs/reference/indices/rollover-index.asciidoc
+++ b/docs/reference/indices/rollover-index.asciidoc
@@ -4,7 +4,7 @@
Rollover
++++
-Creates a new index for a <> or <>.
+Creates a new index for a <> or <>.
[source,console]
----
diff --git a/docs/reference/redirects.asciidoc b/docs/reference/redirects.asciidoc
index df4e235d5b26b..d10cc0828732a 100644
--- a/docs/reference/redirects.asciidoc
+++ b/docs/reference/redirects.asciidoc
@@ -3,6 +3,13 @@
The following pages have moved or been deleted.
+[role="exclude",id="alias"]
+=== Aliases
+
+For field aliases, refer to the <>.
+
+For index and data stream aliases, refer to <>.
+
[role="exclude",id="modules-scripting-other-layers"]
=== Other security layers
@@ -404,7 +411,7 @@ See <>.
See <>.
[role="exclude", id="getting-started-modify-data"]
-== Modifying your data
+=== Modifying your data
See <>.
[role="exclude", id="indexing-replacing-documents"]
diff --git a/docs/reference/rest-api/common-parms.asciidoc b/docs/reference/rest-api/common-parms.asciidoc
index 2c6b3d9476abd..87e8739ef804f 100644
--- a/docs/reference/rest-api/common-parms.asciidoc
+++ b/docs/reference/rest-api/common-parms.asciidoc
@@ -24,7 +24,7 @@ tag::allow-no-indices[]
`allow_no_indices`::
(Optional, Boolean)
If `false`, the request returns an error if any wildcard expression,
-<>, or `_all` value targets only missing or closed indices.
+<>, or `_all` value targets only missing or closed indices.
This behavior applies even if the request targets other open indices. For
example, a request targeting `foo*,bar*` returns an error if an index starts
with `foo` but no index starts with `bar`.
@@ -602,13 +602,13 @@ end::memory[]
tag::bulk-require-alias[]
`require_alias`::
(Optional, Boolean)
-If `true`, the action must target an <>. Defaults to
+If `true`, the action must target an <>. Defaults to
`false`.
end::bulk-require-alias[]
tag::require-alias[]
`require_alias`::
-(Optional, Boolean) If `true`, the destination must be an <>.
+(Optional, Boolean) If `true`, the destination must be an <>.
Defaults to `false`.
end::require-alias[]
diff --git a/docs/reference/search/multi-search.asciidoc b/docs/reference/search/multi-search.asciidoc
index f635267a2a183..29755482bbd89 100644
--- a/docs/reference/search/multi-search.asciidoc
+++ b/docs/reference/search/multi-search.asciidoc
@@ -184,7 +184,7 @@ line.
If `true`, the request does *not* return an error if a wildcard expression or
`_all` value retrieves only missing or closed indices.
+
-This parameter also applies to <> that point to a missing
+This parameter also applies to <> that point to a missing
or closed index.
include::{es-repo-dir}/rest-api/common-parms.asciidoc[tag=expand-wildcards]
diff --git a/x-pack/docs/en/security/authorization/alias-privileges.asciidoc b/x-pack/docs/en/security/authorization/alias-privileges.asciidoc
index 41aadb22f3439..c10cd05565991 100644
--- a/x-pack/docs/en/security/authorization/alias-privileges.asciidoc
+++ b/x-pack/docs/en/security/authorization/alias-privileges.asciidoc
@@ -3,7 +3,7 @@
=== Granting privileges for data streams and aliases
{es} {security-features} allow you to secure operations executed against
-<> and <>.
+<> and <>.
[[data-stream-privileges]]
==== Data stream privileges
@@ -66,7 +66,7 @@ GET .ds-my-data-stream-2099.03.09-000003/_doc/2
==== Alias privileges
Use <> to control access to an
-<>. Privileges on an index or data stream do not grant privileges
+<>. Privileges on an index or data stream do not grant privileges
on its aliases. For information about managing aliases, see <>.
IMPORTANT: Don't use <> in place of
diff --git a/x-pack/docs/en/watcher/example-watches/example-watch-meetupdata.asciidoc b/x-pack/docs/en/watcher/example-watches/example-watch-meetupdata.asciidoc
index 02a160ae4627b..24be5c6cdb978 100644
--- a/x-pack/docs/en/watcher/example-watches/example-watch-meetupdata.asciidoc
+++ b/x-pack/docs/en/watcher/example-watches/example-watch-meetupdata.asciidoc
@@ -145,7 +145,7 @@ To set up the watch:
},
-------------------------------------------------
// NOTCONSOLE
-<1> `logstash` is the default <> for the {ls} indices
+<1> `logstash` is the default <> for the {ls} indices
containing the meetup data. By default, the {ls}
<> policy rolls this alias to a
new index when the index size reaches 50GB or becomes 30 days old. For more