Skip to content

Commit

Permalink
Merge branch 'master' of github.com:elastic/docs into move-apm-docs-t…
Browse files Browse the repository at this point in the history
…o-obs

# Conflicts:
#	conf.yaml
  • Loading branch information
bmorelli25 committed Dec 18, 2023
2 parents e1f1f51 + 549adb0 commit 16f46d9
Showing 1 changed file with 16 additions and 16 deletions.
32 changes: 16 additions & 16 deletions conf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1936,6 +1936,22 @@ contents:

- title: "Cloud: Provision, Manage and Monitor the Elastic Stack"
sections:
- title: Elastic Cloud, Hosted Elastic Stack
prefix: en/cloud
tags: Cloud/Reference
subject: Elastic Cloud
current: *cloudSaasCurrent
branches: [ { *cloudSaasCurrent : latest} ]
index: docs/saas/index.asciidoc
chunk: 1
private: 1
sources:
-
repo: cloud
path: docs/saas
-
repo: cloud
path: docs/shared
- title: Amazon Kinesis Data Firehose Ingest Guide
prefix: en/kinesis
index: docs/en/aws-firehose/index.asciidoc
Expand Down Expand Up @@ -2149,22 +2165,6 @@ contents:
-
repo: docs
path: shared/attributes.asciidoc
- title: Elasticsearch Service - Hosted Elastic Stack
prefix: en/cloud
tags: Cloud/Reference
subject: Elastic Cloud
current: *cloudSaasCurrent
branches: [ { *cloudSaasCurrent : latest} ]
index: docs/saas/index.asciidoc
chunk: 1
private: 1
sources:
-
repo: cloud
path: docs/saas
-
repo: cloud
path: docs/shared

- title: Legacy Documentation
sections:
Expand Down

0 comments on commit 16f46d9

Please sign in to comment.