Resolve merge conflicts (#5957)

Signed-off-by: Fanit Kolchina <[email protected]> Co-authored-by: astephanus <[email protected]>
opensearch-project · Dec 21, 2023 · 8c456d3 · 8c456d3
1 parent acebb9b
commit 8c456d3
Show file tree

Hide file tree

Showing 26 changed files with 3,244 additions and 1,034 deletions.
diff --git a/_dashboards/search-telemetry.md b/_dashboards/search-telemetry.md
@@ -1,12 +1,7 @@
 ---
 layout: default
-<<<<<<< HEAD
-title: Search telemetry
-nav_order: 30
-=======
 title: Managing search telemetry settings
 nav_order: 100
->>>>>>> 7ba0d6d1 (Updates title (#2762))
 ---
 
 

diff --git a/_data/alert.yml b/_data/alert.yml
@@ -1 +1 @@
-message: "[OpenSearch 2.0 is live 🍾!](/downloads.html)"
+message: false
diff --git a/_data/footer.yml b/_data/footer.yml
@@ -6,47 +6,56 @@ columns:
         title: Code of Conduct
         url: '/codeofconduct.html'
       -
-        title: 'Forums'
-        url: 'https://discuss.opendistrocommunity.dev/'
+        title: 'Forum'
+        url: 'https://forum.opensearch.org/'
       -
         title: 'Github'
         url: 'https://github.com/opensearch-project'
       -
-        title: 'Partners'
-        url: '/partners/'
-      -
-        title: 'Community Projects'
-        url: '/community_projects'
+        title: 'Slack'
+        url: '/slack.html'
   -
     title: 'Resources'
     links:
-      #-
-      #  title: 'Documentation'
-      #  url: 'https://github.com/opensearch/documentation'
-      -
+      - 
+        title: About
+        url: '/about.html'
+      - 
+        title: Release Schedule
+        url: '/releases.html'
+      - 
+        title: Maintenance Policy
+        url: '/releases.html#maintenance-policy'
+      - 
         title: FAQ
         url: '/faq/'
       -
-        title: Testimonials
-        url: '/testimonials.html'
+        title: 'Testimonials'
+        url: '/testimonials/'
       -
-        title: 'Brand Guidelines'
-        url: '/brand.html'
+        title: 'Trademark and Brand Policy'
+        url: '/trademark-brand-policy.html'
       -
-        title: 'Trademark Usage Policy'
-        url: '/trademark-usage.html'
-      -
-        title: OpenSearch Disambiguation
-        url: '/disambiguation.html'
+        title: 'Privacy'
+        url: 'https://aws.amazon.com/privacy/'
   -
-    title: 'Connect'
+    title: 'Contact Us'
     links:
-      # -
-      #  title: 'Twitter'
-      #  url: 'https://twitter.com/opensearch_project'
-      #-
-      #  title: 'Facebook'
-      #  url: 'http://www.facebook.com/opensearch'
       -
         title: 'Connect'
-        url: 'https://opensearch.org/connect.html'
+        url: '/connect.html'
+      -
+        title: 'Twitter'
+        url: 'https://twitter.com/OpenSearchProj'
+      -
+        title: 'LinkedIn'
+        url: 'https://www.linkedin.com/company/opensearch-project/'
+      -
+        title: 'YouTube'
+        url: 'https://www.youtube.com/c/OpenSearchProject'
+      -
+        title: 'Meetup'
+        url: 'https://www.meetup.com/pro/opensearchproject/'
+      -
+        title: 'Facebook'
+        url: 'https://www.facebook.com/OpenSearchProject/'
diff --git a/_data/top_nav.yml b/_data/top_nav.yml
@@ -0,0 +1,115 @@
+items:
+  -
+    label: OpenSearchCon
+    fragments: 
+      - opensearchcon
+      - sessions
+      - speakers
+      - exhibitors
+      - workshops
+      - unconference
+      - opensearchcon2023-cfp
+    children:
+      -
+        label: 2024 - Stay Informed
+        url: /events/opensearchcon/
+      -
+        label: Sessions
+        url: /events/opensearchcon/sessions/
+      -
+        label: Speakers
+        url: /events/opensearchcon/speakers/
+      -
+        label: Exhibitors
+        url: /events/opensearchcon/exhibitors/
+      -
+        label: Workshops
+        url: /events/opensearchcon/workshops/
+      -
+        label: Unconference
+        url: /events/opensearchcon/unconference/
+      -
+        label: CFP is closed
+        url: /opensearchcon2023-cfp.html
+  -
+    label: Download
+    fragments:
+      - downloads
+      - versions
+    url: /downloads.html
+  -
+    label: About
+    url: /about.html
+    fragments:
+      - about
+      - releases
+      - roadmap
+      - faq
+    children:
+      -
+       label: Releases
+       url: /releases.html
+      -
+       label: Roadmap
+       url: https://github.com/orgs/opensearch-project/projects/1
+      -
+       label: FAQ
+       url: /faq
+  -
+    label: Community
+    fragments:
+      - events
+      - community_projects
+      - blog
+      - partners
+      - slack
+    children:
+      -
+        label: Blog
+        url: /blog
+      -
+        label: Forum
+        url: https://forum.opensearch.org/
+      -
+        label: Slack
+        url: /slack.html
+      -
+        label: Events
+        url: /events
+      -
+        label: Partners
+        url: /partners
+      -
+        label: Projects
+        url: /community_projects
+  -
+    label: Documentation
+    fragment: docs
+    url: /docs/
+  -
+    label: Platform
+    url: /platform/index.html
+    fragments: 
+      - platform
+      - search
+      - observability
+      - security-analytics
+      - vector-database
+      - benchmarks
+    children:
+      - label: Search
+        url: /platform/search/index.html
+      - label: Observability
+        url: /platform/observability/index.html
+      -
+        label: Security Analytics
+        url: /platform/security-analytics/index.html
+      -
+        label: Vector Database
+        url: /platform/search/vector-database.html
+      -
+        label: Playground Demo
+        url: https://playground.opensearch.org/
+      -
+        label: Performance Benchmarks
+        url: /benchmarks