Skip to content

Commit 217c423

Browse files
committed
Merge branch 'mapping/fix-404s' of github.com:KOTungseth/docs into mapping/fix-404s
2 parents 0cf3943 + 1048aeb commit 217c423

File tree

7 files changed

+26
-27
lines changed

7 files changed

+26
-27
lines changed

Dockerfile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,11 @@ RUN echo "deb http://archive.debian.org/debian/ buster main" > /etc/apt/sources.
1616
# TODO install_packages calls apt-get update and then nukes the list files after. We should avoid multiple calls to apt-get update.....
1717
# We could probably fix this by running the update and installs ourself with `RUN --mount type=cache` but that is "experimental"
1818

19+
# Fix for Debian Buster EOL - point to archive repositories
20+
RUN sed -i 's/deb.debian.org/archive.debian.org/g' /etc/apt/sources.list && \
21+
sed -i 's/security.debian.org/archive.debian.org/g' /etc/apt/sources.list && \
22+
sed -i '/buster-updates/d' /etc/apt/sources.list
23+
1924
RUN install_packages apt-transport-https gnupg2 ca-certificates
2025
COPY .docker/apt/keys/nodesource.gpg /
2126
RUN apt-key add /nodesource.gpg

README.asciidoc

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
= Docs HOWTO
22

3+
[IMPORTANT]
4+
====
5+
This repo pertains to the asciidoc system used for pre-9.0 Elastic docs.
6+
To build the markdown docs for versions 9.0+, refer to https://elastic.github.io/docs-builder/contribute/locally/.
7+
====
8+
39
include::{docs-root}/shared/versions/stack/current.asciidoc[]
410
include::{docs-root}/shared/attributes.asciidoc[]
511

resources/asciidoctor/lib/chunker/v3-mapping.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3856,6 +3856,7 @@
38563856
"/en/elasticsearch/client/curator/*/option_ignore.html": "/docs/reference/elasticsearch/curator/option_ignore",
38573857
"/en/elasticsearch/client/curator/*/option_include_aliases.html": "/docs/reference/elasticsearch/curator/option_include_aliases",
38583858
"/en/elasticsearch/client/curator/*/option_include_gs.html": "/docs/reference/elasticsearch/curator/option_include_gs",
3859+
"/en/elasticsearch/client/curator/*/option_include_hidden.html": "/docs/reference/elasticsearch/curator/option_include_hidden",
38593860
"/en/elasticsearch/client/curator/*/option_indices.html": "/docs/reference/elasticsearch/curator/option_indices",
38603861
"/en/elasticsearch/client/curator/*/option_key.html": "/docs/reference/elasticsearch/curator/option_key",
38613862
"/en/elasticsearch/client/curator/*/option_max_age.html": "/docs/reference/elasticsearch/curator/option_max_age",
@@ -4915,6 +4916,8 @@
49154916
"/en/elasticsearch/reference/*/explain-dfanalytics.html": "/docs/api/doc/elasticsearch/operation/operation-ml-explain-data-frame-analytics",
49164917
"/en/elasticsearch/reference/*/explicit-mapping.html": "/docs/manage-data/data-store/mapping/explicit-mapping",
49174918
"/en/elasticsearch/reference/*/fail-processor.html": "/docs/reference/enrich-processor/fail-processor",
4919+
"/en/elasticsearch/reference/*/failure-store.html": "/docs/manage-data/data-store/data-streams/failure-store",
4920+
"/en/elasticsearch/reference/*/failure-store-recipes.html": "/docs/manage-data/data-store/data-streams/failure-store-recipes",
49184921
"/en/elasticsearch/reference/*/feature-migration-api.html": "/docs/api/doc/elasticsearch/operation/operation-migration-get-feature-upgrade-status",
49194922
"/en/elasticsearch/reference/*/features-apis.html": "/docs/api/doc/elasticsearch/group/endpoint-features",
49204923
"/en/elasticsearch/reference/*/field-alias.html": "/docs/reference/elasticsearch/mapping-reference/field-alias",

resources/web/template.html

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,9 @@
66
<meta http-equiv="X-UA-Compatible" content="IE=edge">
77
<meta name="viewport" content="width=device-width, initial-scale=1">
88
<script src="https://cdn.optimizely.com/js/18132920325.js"></script>
9-
<link rel="apple-touch-icon" sizes="57x57" href="/apple-icon-57x57.png">
10-
<link rel="apple-touch-icon" sizes="60x60" href="/apple-icon-60x60.png">
11-
<link rel="apple-touch-icon" sizes="72x72" href="/apple-icon-72x72.png">
12-
<link rel="apple-touch-icon" sizes="76x76" href="/apple-icon-76x76.png">
13-
<link rel="apple-touch-icon" sizes="114x114" href="/apple-icon-114x114.png">
14-
<link rel="apple-touch-icon" sizes="120x120" href="/apple-icon-120x120.png">
15-
<link rel="apple-touch-icon" sizes="144x144" href="/apple-icon-144x144.png">
16-
<link rel="apple-touch-icon" sizes="152x152" href="/apple-icon-152x152.png">
17-
<link rel="apple-touch-icon" sizes="180x180" href="/apple-icon-180x180.png">
18-
<link rel="icon" type="image/png" href="/favicon-32x32.png" sizes="32x32">
19-
<link rel="icon" type="image/png" href="/android-chrome-192x192.png" sizes="192x192">
20-
<link rel="icon" type="image/png" href="/favicon-96x96.png" sizes="96x96">
21-
<link rel="icon" type="image/png" href="/favicon-16x16.png" sizes="16x16">
9+
<link rel="icon" href="/favicon.ico" sizes="32x32"/>
10+
<link rel="icon" href="/favicon.svg" type="image/svg+xml"/>
11+
<link rel="apple-touch-icon" href="/apple-touch-icon.png" sizes="180x180"/>
2212
<link rel="manifest" href="/manifest.json">
2313
<meta name="apple-mobile-web-app-title" content="Elastic">
2414
<meta name="application-name" content="Elastic">
@@ -32,11 +22,6 @@
3222
<meta property="og:image" content="https://static-www.elastic.co/v3/assets/bltefdd0b53724fa2ce/blt280217a63b82a734/6202d3378b1f312528798412/elastic-logo.svg" />
3323
<meta property="og:image:width" content="500" />
3424
<meta property="og:image:height" content="172" />
35-
<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
36-
<link rel="icon" href="/favicon.ico" type="image/x-icon">
37-
<link rel="apple-touch-icon-precomposed" sizes="64x64" href="/favicon_64x64_16bit.png">
38-
<link rel="apple-touch-icon-precomposed" sizes="32x32" href="/favicon_32x32.png">
39-
<link rel="apple-touch-icon-precomposed" sizes="16x16" href="/favicon_16x16.png">
4025
<!-- Give IE8 a fighting chance -->
4126
<!--[if lt IE 9]>
4227
<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>

shared/attributes.asciidoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -202,8 +202,8 @@ Elastic Cloud
202202
:ess-deployments: https://cloud.elastic.co/deployments{ess-utm-params}
203203
:ece-ref: https://www.elastic.co/guide/en/cloud-enterprise/{ece-version-link}
204204
:eck-ref: https://www.elastic.co/guide/en/cloud-on-k8s/current
205-
:ess-leadin: You can run Elasticsearch on your own hardware or use our hosted Elasticsearch Service that is available on AWS, GCP, and Azure. {ess-trial}[Try the Elasticsearch Service for free].
206-
:ess-leadin-short: Our hosted Elasticsearch Service is available on AWS, GCP, and Azure, and you can {ess-trial}[try it for free].
205+
:ess-leadin: You can run Elasticsearch on your own hardware or use Elastic Cloud Hosted, available on AWS, GCP, and Azure. {ess-trial}[Try Elastic Cloud Hosted for free].
206+
:ess-leadin-short: Elastic Cloud Hosted is available on AWS, GCP, and Azure, and you can {ess-trial}[try it for free].
207207
:ess-icon: image:https://doc-icons.s3.us-east-2.amazonaws.com/logo_cloud.svg[link="{ess-trial}", title="Supported on {ess}"]
208208
:ece-icon: image:https://doc-icons.s3.us-east-2.amazonaws.com/logo_cloud_ece.svg[link="{ess-trial}", title="Supported on {ece}"]
209209
:cloud-only: This feature is designed for indirect use by {ess-trial}[{ess}], {ece-ref}[{ece}], and {eck-ref}[{eck}]. Direct use is not supported.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
:ece-version: 3.8.1
1+
:ece-version: 3.8.2
22
:ece-version-short: 3.8
33
:ece-version-link: 3.8

shared/versions/stack/8.19.asciidoc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
:version: 8.19.5
1+
:version: 8.19.6
22
////
33
bare_version never includes -alpha or -beta
44
////
5-
:bare_version: 8.19.5
6-
:logstash_version: 8.19.5
7-
:elasticsearch_version: 8.19.5
8-
:kibana_version: 8.19.5
9-
:apm_server_version: 8.19.5
5+
:bare_version: 8.19.6
6+
:logstash_version: 8.19.6
7+
:elasticsearch_version: 8.19.6
8+
:kibana_version: 8.19.6
9+
:apm_server_version: 8.19.6
1010
:branch: 8.19
1111
:minor-version: 8.19
1212
:major-version: 8.x

0 commit comments

Comments
 (0)