Skip to content

Commit aa12bcd

Browse files
authored
Merge branch 'main' into curator-8-to-legacy
2 parents 4d11b0d + 6a86bc4 commit aa12bcd

File tree

101 files changed

+4168
-217
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

101 files changed

+4168
-217
lines changed

Directory.Packages.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<PackageVersion Include="Elastic.Aspire.Hosting.Elasticsearch" Version="9.3.0" />
3030
<PackageVersion Include="Elastic.Clients.Elasticsearch" Version="9.1.4" />
3131
<PackageVersion Include="FakeItEasy" Version="8.3.0" />
32-
<PackageVersion Include="Elastic.Ingest.Elasticsearch" Version="0.16.0" />
32+
<PackageVersion Include="Elastic.Ingest.Elasticsearch" Version="0.16.3" />
3333
<PackageVersion Include="InMemoryLogger" Version="1.0.66" />
3434
<PackageVersion Include="MartinCostello.Logging.XUnit.v3" Version="0.6.0" />
3535
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.7" />

config/navigation.yml

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -22,24 +22,7 @@ toc:
2222
- toc: deploy-manage
2323
- toc: cloud-account
2424
- toc: troubleshoot
25-
- toc: contribute-docs
2625

27-
##########
28-
# EXTEND #
29-
##########
30-
# I didn't touch this section (yet?)
31-
- toc: extend
32-
children:
33-
- toc: kibana://extend
34-
path_prefix: extend/kibana
35-
- toc: logstash://extend
36-
path_prefix: extend/logstash
37-
- toc: beats://extend
38-
path_prefix: extend/beats
39-
- toc: elasticsearch://extend
40-
path_prefix: extend/elasticsearch
41-
- toc: integrations://extend
42-
path_prefix: extend/integrations
4326

4427
#################
4528
# RELEASE NOTES #
@@ -605,3 +588,24 @@ toc:
605588
# https://github.com/elastic/docs-content/blob/main/reference/glossary/toc.yml
606589
- toc: docs-content://reference/glossary
607590
path_prefix: reference/glossary
591+
592+
##########
593+
# EXTEND #
594+
##########
595+
- toc: extend
596+
children:
597+
- toc: kibana://extend
598+
path_prefix: extend/kibana
599+
- toc: logstash://extend
600+
path_prefix: extend/logstash
601+
- toc: beats://extend
602+
path_prefix: extend/beats
603+
- toc: elasticsearch://extend
604+
path_prefix: extend/elasticsearch
605+
- toc: integrations://extend
606+
path_prefix: extend/integrations
607+
608+
#############
609+
# CONTRIBUTE 2 DOCS #
610+
#############
611+
- toc: contribute-docs

config/synonyms.yml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
synonyms:
2+
- [ ".net", "c#", "csharp", "dotnet", "net" ]
3+
- [ "esql", "es|ql" ]
4+
- [ "motlp", "managed otlp" ]
5+
- [ "s3", "aws s3", "amazon s3" ]
6+
- [ "es", "elasticsearch" ]
7+
- [ "elastic learned sparse encoder", "elser" ]
8+
- [ "ccs", "cross cluster search", "cross-cluster search", "spaghetti" ]
9+
- [ "cps", "cross project search", "cross-project search" ]
10+
- [ "apm", "application performance monitoring" ]
11+
- [ "ecctl", "elastic cloud control" ]
12+
- [ "opentelemetry", "otel" ]
13+
- [ "elastic distributions of opentelemetry", "edot" ]
14+
- [ "eck", "elastic cloud on kubernetes" ]
15+
- [ "ece", "elastic cloud enterprise" ]
16+
- [ "elv2", "elastic license v2" ]
17+
- [ "kql", "kibana query language" ]
18+
- [ "ccr", "cross-cluster replication", "cross cluster replication" ]
19+
- [ "esaas", "elastic stack as a service" ]
20+
- [ "knn", "k-nearest neighbors" ]
21+
- [ "ech", "elastic cloud hosted", "ess" ]
22+
- [ "elasticsearch service", "elastic cloud" ]
23+
- [ "aws", "amazon" ]
24+
- [ "gcp", "google cloud platform" ]
25+
- [ "ilm", "index lifecycle management" ]
26+
- [ "javascript", "js", "node", "nodejs", "node.js" ]
27+
- [ "edot", "elastic distribution of opentelemetry" ]
28+
- [ "k8s", "kubernetes" ]
29+
- [ "ecs", "elastic common schema" ]
30+
- [ "ml", "machine learning" ]
31+
- [ "eis", "elastic inference service" ]
32+
- [ "traffic filter", "network security" ]

docs-builder.sln

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "config", "config", "{6FAB56
122122
config\legacy-url-mappings.yml = config\legacy-url-mappings.yml
123123
config\navigation.yml = config\navigation.yml
124124
config\products.yml = config\products.yml
125+
config\synonyms.yml = config\synonyms.yml
125126
EndProjectSection
126127
EndProject
127128
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests-integration", "tests-integration", "{BCAD38D5-6C83-46E2-8398-4BE463931098}"

docs/_docset.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ toc:
7070
- file: products.md
7171
- file: versions.md
7272
- file: legacy-url-mappings.md
73+
- file: synonyms.md
7374
- folder: content-set
7475
children:
7576
- file: index.md
@@ -102,6 +103,7 @@ toc:
102103
- file: icons.md
103104
- file: images.md
104105
- file: kbd.md
106+
- file: math.md
105107
- file: lists.md
106108
- file: line_breaks.md
107109
- file: links.md
@@ -123,6 +125,7 @@ toc:
123125
- file: index.md
124126
- file: build.md
125127
- file: diff-validate.md
128+
- file: format.md
126129
- file: index-command.md
127130
- file: mv.md
128131
- file: serve.md

docs/cli/docset/format.md

Lines changed: 114 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,114 @@
1+
# format
2+
3+
Format documentation files by fixing common issues like irregular space
4+
5+
## Usage
6+
7+
```
8+
docs-builder format --check [options...]
9+
docs-builder format --write [options...]
10+
```
11+
12+
## Options
13+
14+
`--check`
15+
: Check if files need formatting without modifying them. Exits with code 1 if formatting is needed, 0 if all files are properly formatted. (required, mutually exclusive with --write)
16+
17+
`--write`
18+
: Write formatting changes to files. (required, mutually exclusive with --check)
19+
20+
`-p|--path` `<string>`
21+
: Path to the documentation folder, defaults to pwd. (optional)
22+
23+
## Description
24+
25+
The `format` command automatically detects and fixes formatting issues in your documentation files. The command only processes Markdown files (`.md`) that are included in your `_docset.yml` table of contents, ensuring that only intentional documentation files are modified.
26+
27+
You must specify exactly one of `--check` or `--write`:
28+
- `--check` validates formatting without modifying files, useful for CI/CD pipelines
29+
- `--write` applies formatting changes to files
30+
31+
Currently, it handles irregular space characters that may impair Markdown rendering.
32+
33+
### Irregular Space Detection
34+
35+
The format command detects and replaces 24 types of irregular space characters with regular spaces, including:
36+
37+
- No-Break Space (U+00A0)
38+
- En Space (U+2002)
39+
- Em Space (U+2003)
40+
- Zero Width Space (U+200B)
41+
- Line Separator (U+2028)
42+
- Paragraph Separator (U+2029)
43+
- And 18 other irregular space variants
44+
45+
These characters can cause unexpected rendering issues in Markdown and are often introduced accidentally through copy-paste operations from other applications.
46+
47+
## Examples
48+
49+
### Check if formatting is needed (CI/CD)
50+
51+
```bash
52+
docs-builder format --check
53+
```
54+
55+
Exit codes:
56+
- `0`: All files are properly formatted
57+
- `1`: Some files need formatting
58+
59+
### Apply formatting changes
60+
61+
```bash
62+
docs-builder format --write
63+
```
64+
65+
### Check specific documentation folder
66+
67+
```bash
68+
docs-builder format --check --path /path/to/docs
69+
```
70+
71+
### Format specific documentation folder
72+
73+
```bash
74+
docs-builder format --write --path /path/to/docs
75+
```
76+
77+
## Output
78+
79+
### Check mode output
80+
81+
When using `--check`, the command reports which files need formatting:
82+
83+
```
84+
Checking documentation in: /path/to/docs
85+
86+
Formatting needed:
87+
Files needing formatting: 2
88+
irregular space fixes needed: 3
89+
90+
Run 'docs-builder format --write' to apply changes
91+
```
92+
93+
### Write mode output
94+
95+
When using `--write`, the command reports the changes made:
96+
97+
```
98+
Formatting documentation in: /path/to/docs
99+
Formatted index.md (2 change(s))
100+
101+
Formatting complete:
102+
Files processed: 155
103+
Files modified: 1
104+
irregular space fixes: 2
105+
```
106+
107+
## Future Enhancements
108+
109+
The format command is designed to be extended with additional formatting capabilities in the future, such as:
110+
111+
- Line ending normalization
112+
- Trailing whitespace removal
113+
- Consistent heading spacing
114+
- And other formatting fixes

docs/configure/site/index.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@ Configure the documentation site in these files:
1616

1717
Redirects are also configured at the site-level. See [](../../contribute/redirects.md) for more information.
1818

19+
## Synonyms
20+
21+
Synonyms applied to our Serverless observability project are declared as a site-level configuration. See [](./synonyms.md) for more information.
22+
1923
## V3 site-level diagram
2024

2125
*Coming soon*

docs/configure/site/synonyms.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# `synonyms.yml`
2+
3+
The [`synonyms.yml`](https://github.com/elastic/docs-builder/blob/main/config/synonyms.yml) file provides a way to define synonyms for our Serverless observability project.
4+
5+
Synonyms updates are sent during Elasticsearch-specific export procedures in the CI workflow.
6+
7+
```yml
8+
synonyms:
9+
- [ ".net", "c#", "csharp", "dotnet", "net" ]
10+
- [ "esql", "es|ql" ]
11+
- [ "motlp", "managed otlp" ]
12+
```

docs/contribute/on-the-web.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
This section will help you understand how to update and contribute to our documentation post-migration.
44

5+
:::{tip}
6+
Every documentation page includes a **Learn how to contribute** link in the sidebar that takes you to the [Elastic Docs contribution guide](https://docs-v3-preview.elastic.dev/elastic/docs-builder/tree/main/contribute/). Use it whenever you want to contribute!
7+
:::
8+
59
## Updating documentation
610

711
:::{include} _snippets/two-systems.md
@@ -56,4 +60,4 @@ If you need to merge changes that are published in both systems (usually because
5660

5761
## Migration considerations
5862

59-
During the migration, content may be moved around, and there won't be a 1-to-1 mapping between old and new locations. This means updates may need to be applied in multiple places. If your changes affect /guide content, consider merging those changes in the /docs content first and then add it to the appropriate /guide content. If you have any issues, create an issue in the [`docs-content`](https://github.com/elastic/docs-content) or [`docs-content-internal`](https://github.com/elastic/docs-content-internal) repository.
63+
During the migration, content may be moved around, and there won't be a 1-to-1 mapping between old and new locations. This means updates may need to be applied in multiple places. If your changes affect /guide content, consider merging those changes in the /docs content first and then add it to the appropriate /guide content. If you have any issues, create an issue in the [`docs-content`](https://github.com/elastic/docs-content) or [`docs-content-internal`](https://github.com/elastic/docs-content-internal) repository.

docs/syntax/directives.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ The following directives are available:
7272
- [Dropdowns](dropdowns.md) - Collapsible content
7373
- [Images](images.md) - Enhanced image handling
7474
- [Include](file_inclusion.md) - Include content from other files
75+
- [Math](math.md) - Mathematical expressions and equations
7576
- [Settings](automated_settings.md) - Configuration blocks
7677
- [Stepper](stepper.md) - Step-by-step content
7778
- [Tabs](tabs.md) - Tabbed content organization

0 commit comments

Comments
 (0)