Skip to content

Commit b694bc8

Browse files
committed
Merge branch 'main' into fix/aws_cli_redirects
# Conflicts: # src/tooling/docs-assembler/Deploying/AwsCloudFrontKeyValueStoreProxy.cs
2 parents 2248d21 + d565b78 commit b694bc8

File tree

9 files changed

+134
-145
lines changed

9 files changed

+134
-145
lines changed

.github/dependabot.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,11 @@ updates:
1717
day: 'monday'
1818
time: '08:00'
1919
groups:
20+
eslint:
21+
patterns:
22+
- 'eslint'
23+
- '@eslint/*'
24+
- 'typescript-eslint'
2025
eui:
2126
patterns:
2227
- '@elastic/eui*'

docs/migration/guide/mapping.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ navigation_title: What books were migrated?
66

77
We did not migrate all Elastic documentation. We are purposefully leaving the majority of content behind in the legacy Asciidoc build system. This system will turn into our documentation archive.
88

9-
A full list of the content that was migrated to the V3 format is available [here](https://github.com/elastic/asciidocalypse/blob/main/docs/readme.md).
9+
A full list of the content that was migrated to the V3 format is available [here](https://github.com/elastic/asciidocalypse/tree/main-archive/docs#readme).

docs/migration/versioning.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ Tagged deployment
4747

4848
This is the default. To get started, follow our [guide](guide/index.md) to set up the new docs folder structure and CI configuration
4949

50-
Once setup ensure the repository is added to our `assembler.yml` under `references`.
50+
Once setup ensure the repository is added to our [`assembler.yml`](https://github.com/elastic/docs-builder/blob/main/src/tooling/docs-assembler/assembler.yml) under `references`.
5151

5252
For example say you want to onboard `elastic/my-repository` into the production build:
5353

@@ -113,4 +113,4 @@ jobs:
113113
pull-requests: read
114114
```
115115

116-
1. Ensure version branches are built and publish their links ahead of time.
116+
1. Ensure version branches are built and publish their links ahead of time.

src/Elastic.Documentation.Configuration/Versions/Version.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,9 @@ public enum VersioningSystemId
8282
[Display(Name = "edot_php")]
8383
EdotPhp,
8484
[Display(Name = "edot_python")]
85-
EdotPython
85+
EdotPython,
86+
[Display(Name = "edot_cf_aws")]
87+
EdotCfAws
8688
}
8789

8890
[YamlSerializable]

src/Elastic.Documentation.Configuration/versions.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,3 +85,7 @@ versioning_systems:
8585
edot_python:
8686
base: 1.0
8787
current: 1.3.0
88+
edot_cf_aws:
89+
base: 0.1
90+
current: 0.1.6
91+

0 commit comments

Comments
 (0)