Skip to content

Commit 26e57bc

Browse files
committed
Re-add master branches
1 parent 478b85f commit 26e57bc

File tree

1 file changed

+23
-25
lines changed

1 file changed

+23
-25
lines changed

conf.yaml

Lines changed: 23 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ contents:
203203
map_branches: *mapMasterToMain
204204
- title: Glossary
205205
prefix: en/elastic-stack-glossary
206-
current: main
206+
current: master
207207
index: docs/en/glossary/index.asciidoc
208208
branches: [ {main: master}, main ]
209209
tags: Elastic Stack/Glossary
@@ -265,7 +265,7 @@ contents:
265265
prefix: en/elastic-stack-deploy
266266
current: 7.11
267267
index: docs/index.asciidoc
268-
branches: [ {master: main}, 7.11, 7.10, 7.9, 7.8, 7.7, 7.6, 7.5, 7.4, 7.3, 7.2, 7.1, 7.0, 6.7, 6.6, 6.5, 6.4, 6.3 ]
268+
branches: [ master, {master: main}, 7.11, 7.10, 7.9, 7.8, 7.7, 7.6, 7.5, 7.4, 7.3, 7.2, 7.1, 7.0, 6.7, 6.6, 6.5, 6.4, 6.3 ]
269269
chunk: 1
270270
tags: Elastic Stack/Azure
271271
subject: Azure Marketplace and Resource Manager (ARM) template
@@ -558,7 +558,7 @@ contents:
558558
- title: PHP Client
559559
prefix: php-api
560560
current: *stackcurrent
561-
branches: [ {master: main}, main, 8.6, 8.5, 8.4, 8.3, 8.2, 8.1, 8.0, 7.17, 7.16, 7.x, 6.x, 5.x, 2.x, 1.x, 0.4 ]
561+
branches: [ {main: master}, main, 8.6, 8.5, 8.4, 8.3, 8.2, 8.1, 8.0, 7.17, 7.16, 7.x, 6.x, 5.x, 2.x, 1.x, 0.4 ]
562562
live: *stacklivemain
563563
index: docs/index.asciidoc
564564
chunk: 1
@@ -575,9 +575,9 @@ contents:
575575
map_branches: *mapMainToMaster
576576
- title: Perl Client
577577
prefix: perl-api
578-
current: main
579-
branches: [ {master: main}, main, 8.6, 8.5, 8.4, 8.3, 8.2, 8.1, 8.0 ]
580-
live: [ main, 8.6, 8.5, 8.4, 8.3, 8.2, 8.1, 8.0 ]
578+
current: master
579+
branches: [ master, {master: main}, 8.6, 8.5, 8.4, 8.3, 8.2, 8.1, 8.0 ]
580+
live: [ master, 8.6, 8.5, 8.4, 8.3, 8.2, 8.1, 8.0 ]
581581
index: docs/index.asciidoc
582582
chunk: 1
583583
tags: Clients/Perl
@@ -615,9 +615,9 @@ contents:
615615
path: docs/guide
616616
- title: Rust Client
617617
prefix: rust-api
618-
current: main
619-
branches: [ {master: main}, main, 8.6, 8.5, 8.4, 8.3, 8.2, 8.1, 8.0 ]
620-
live: [ main, 8.6, 8.5, 8.4, 8.3, 8.2, 8.1, 8.0 ]
618+
current: master
619+
branches: [ master, {master: main}, 8.6, 8.5, 8.4, 8.3, 8.2, 8.1, 8.0 ]
620+
live: [ master, 8.6, 8.5, 8.4, 8.3, 8.2, 8.1, 8.0 ]
621621
index: docs/index.asciidoc
622622
chunk: 1
623623
tags: Clients/Rust
@@ -972,7 +972,7 @@ contents:
972972
tags: CloudControl/Reference
973973
subject: ECCTL
974974
current: 1.8
975-
branches: [ {master: main}, 1.8, 1.7, 1.6, 1.5, 1.4, 1.3, 1.2, 1.1, 1.0 ]
975+
branches: [ master, {master: main}, 1.8, 1.7, 1.6, 1.5, 1.4, 1.3, 1.2, 1.1, 1.0 ]
976976
index: docs/index.asciidoc
977977
chunk: 1
978978
sources:
@@ -985,7 +985,7 @@ contents:
985985
tags: CloudTerraform/Reference
986986
subject: TPEC
987987
current: 0.2
988-
branches: [ {master: main}, 0.2, 0.1 ]
988+
branches: [ master, {master: main}, 0.2, 0.1 ]
989989
index: docs-elastic/index.asciidoc
990990
single: 1
991991
chunk: 1
@@ -1110,16 +1110,15 @@ contents:
11101110
prefix: en/swiftype/sitesearch
11111111
index: docs/sitesearch/index.asciidoc
11121112
private: 1
1113-
current: main
1114-
branches: [ {main: master}, main ]
1113+
current: master
1114+
branches: [ master, {master: main} ]
11151115
single: 1
11161116
tags: Site Search/Reference
11171117
subject: Swiftype
11181118
sources:
11191119
-
11201120
repo: swiftype
11211121
path: docs
1122-
map_branches: *mapMasterToMain
11231122
- title: Enterprise Search Clients
11241123
base_dir: en/enterprise-search-clients
11251124
sections:
@@ -1189,7 +1188,6 @@ contents:
11891188
-
11901189
repo: enterprise-search-php
11911190
path: docs/guide/
1192-
map_branches: *mapMainToMaster
11931191
-
11941192
repo: docs
11951193
path: shared/versions/stack/{version}.asciidoc
@@ -1325,7 +1323,7 @@ contents:
13251323
- title: APM Go Agent
13261324
prefix: go
13271325
current: 2.x
1328-
branches: [ main, 2.x, 1.x, 0.5 ]
1326+
branches: [ {main: master}, main, 2.x, 1.x, 0.5 ]
13291327
live: [ main, 2.x, 1.x ]
13301328
index: docs/index.asciidoc
13311329
tags: APM Go Agent/Reference
@@ -1358,7 +1356,7 @@ contents:
13581356
- title: APM Java Agent
13591357
prefix: java
13601358
current: 1.x
1361-
branches: [ main, 1.x, 0.7, 0.6 ]
1359+
branches: [ {main: master}, main, 1.x, 0.7, 0.6 ]
13621360
live: [ main, 1.x ]
13631361
index: docs/index.asciidoc
13641362
tags: APM Java Agent/Reference
@@ -1397,7 +1395,7 @@ contents:
13971395
- title: APM Node.js Agent
13981396
prefix: nodejs
13991397
current: 3.x
1400-
branches: [ main, 3.x, 2.x, 1.x, 0.x ]
1398+
branches: [ {main: master}, main, 3.x, 2.x, 1.x, 0.x ]
14011399
live: [ main, 3.x ]
14021400
index: docs/index.asciidoc
14031401
tags: APM Node.js Agent/Reference
@@ -1420,7 +1418,7 @@ contents:
14201418
- title: APM PHP Agent
14211419
prefix: php
14221420
current: 1.x
1423-
branches: [ main, 1.x ]
1421+
branches: [ {main: master}, main, 1.x ]
14241422
live: [ main, 1.x ]
14251423
index: docs/index.asciidoc
14261424
tags: APM PHP Agent/Reference
@@ -1436,7 +1434,7 @@ contents:
14361434
- title: APM Python Agent
14371435
prefix: python
14381436
current: 6.x
1439-
branches: [ main, 6.x, 5.x, 4.x, 3.x, 2.x, 1.x ]
1437+
branches: [ {main: master}, main, 6.x, 5.x, 4.x, 3.x, 2.x, 1.x ]
14401438
live: [ main, 6.x, 5.x ]
14411439
index: docs/index.asciidoc
14421440
tags: APM Python Agent/Reference
@@ -1459,7 +1457,7 @@ contents:
14591457
- title: APM Ruby Agent
14601458
prefix: ruby
14611459
current: 4.x
1462-
branches: [ main, 4.x, 3.x, 2.x, 1.x ]
1460+
branches: [ {main: master}, main, 4.x, 3.x, 2.x, 1.x ]
14631461
live: [ main, 4.x ]
14641462
index: docs/index.asciidoc
14651463
tags: APM Ruby Agent/Reference
@@ -1476,7 +1474,7 @@ contents:
14761474
- title: APM Real User Monitoring JavaScript Agent
14771475
prefix: rum-js
14781476
current: 5.x
1479-
branches: [ main, 5.x, 4.x, 3.x, 2.x, 1.x, 0.x ]
1477+
branches: [ {main: master}, main, 5.x, 4.x, 3.x, 2.x, 1.x, 0.x ]
14801478
live: [ main, 5.x, 4.x]
14811479
index: docs/index.asciidoc
14821480
tags: APM Real User Monitoring JavaScript Agent/Reference
@@ -2840,7 +2838,7 @@ contents:
28402838
- title: Elasticsearch - The Definitive Guide
28412839
prefix: en/elasticsearch/guide
28422840
current: 2.x
2843-
branches: [ {master: main}, 2.x, 1.x ]
2841+
branches: [ master, {master: main}, 2.x, 1.x ]
28442842
index: book.asciidoc
28452843
chunk: 1
28462844
noindex: 1
@@ -2856,12 +2854,12 @@ contents:
28562854
-
28572855
repo: docs
28582856
path: shared/legacy-attrs.asciidoc
2859-
exclude_branches: [ main, 2.x]
2857+
exclude_branches: [ master, main, 2.x]
28602858
map_branches: *mapMainToMaster
28612859
- title: Sense Editor for 4.x
28622860
prefix: en/sense
28632861
current: master
2864-
branches: [ {master: main} ]
2862+
branches: [ master, {master: main} ]
28652863
index: docs/index.asciidoc
28662864
noindex: 1
28672865
private: 1

0 commit comments

Comments
 (0)