Merge branch 'main' into jo-docs-thanks-pagejo-docs-thanks-page

5 files changed, 54 insertions, 20 deletions

diff --git a/site/data/core-team.yml b/site/data/core-team.yml
index 2966b9daf..3552f6f38 100644
--- a/site/data/core-team.yml
+++ b/site/data/core-team.yml
@@ -7,20 +7,26 @@
 - name: XhmikosR
   user: xhmikosr
 
-- name: Patrick H. Lauke
-  user: patrickhlauke
+- name: GeoSot
+  user: geosot
 
-- name: Gleb Mazovetskiy
-  user: glebm
+- name: Rohit Sharma
+  user: rohit2sharma95
 
-- name: Johann-S
-  user: johann-s
+- name: alpadev
+  user: alpadev
+
+- name: Gaël Poupard
+  user: ffoodd
+
+- name: Patrick H. Lauke
+  user: patrickhlauke
 
 - name: Martijn Cuppens
   user: martijncuppens
 
-- name: Shohei Yoshida
-  user: ysds
+- name: Johann-S
+  user: johann-s
 
-- name: Gaël Poupard
-  user: ffoodd
+- name: Gleb Mazovetskiy
+  user: glebm
diff --git a/site/data/docs-versions.yml b/site/data/docs-versions.yml
index 0fc7cea8a..b4fb88f05 100644
--- a/site/data/docs-versions.yml
+++ b/site/data/docs-versions.yml
@@ -36,7 +36,7 @@
 
 - group: v4.x
   baseurl: "https://getbootstrap.com/docs"
-  description: "Our previous major release with its minor releases. Last update was v4.5.3."
+  description: "Our previous major release with its minor releases. Last update was v4.6.0."
   versions:
     - v: "4.0"
     - v: "4.1"
@@ -44,9 +44,10 @@
     - v: "4.3"
     - v: "4.4"
     - v: "4.5"
+    - v: "4.6"
 
 - group: v5.x
-  baseurl: "https://v5.getbootstrap.com/docs"
-  description: "Current major release. Last update was v5.0.0-alpha3."
+  baseurl: "https://getbootstrap.com/docs"
+  description: "Current major release. Last update was v5.0.0-beta3."
   versions:
     - v: "5.0"
diff --git a/site/data/examples.yml b/site/data/examples.yml
index 0ddafaf41..9898363d6 100644
--- a/site/data/examples.yml
+++ b/site/data/examples.yml
@@ -1,3 +1,15 @@
+- category: Snippets
+  description: "Common patterns for building sites and apps that build on existing components and utilities with custom CSS and more."
+  examples:
+    - name: Headers
+      description: "Display your branding, navigation, search, and more with these header components"
+    - name: Heroes
+      description: "Set the stage on your homepage with heroes that feature clear calls to action."
+    - name: Features
+      description: "Explain the features, benefits, or other details in your marketing content."
+    - name: Sidebars
+      description: "Common navigation patterns ideal for offcanvas or multi-column layouts."
+
 - category: Custom Components
   description: "Brand new components and templates to help folks quickly get started with Bootstrap and demonstrate best practices for adding onto the framework."
   examples:
@@ -23,6 +35,8 @@
       description: "Attach a footer to the bottom of the viewport when page content is short."
     - name: Sticky footer navbar
       description: "Attach a footer to the bottom of the viewport with a fixed top navbar."
+    - name: Jumbotron
+      description: "Use utilities to recreate and enhance Bootstrap 4's jumbotron."
 
 - category: Framework
   description: "Examples that focus on implementing uses of built-in components provided by Bootstrap."
@@ -47,12 +61,8 @@
       description: "Single navbar example with a fixed top navbar along with some additional content."
     - name: Navbar bottom
       description: "Single navbar example with a bottom navbar along with some additional content."
-
-- category: Experiments
-  description: "Examples that focus on future-friendly features or techniques."
-  examples:
-    - name: Offcanvas
-      description: "Turn your expandable navbar into a sliding offcanvas menu."
+    - name: Offcanvas navbar
+      description: "Turn your expandable navbar into a sliding offcanvas menu (doesn't use our offcanvas component)."
 
 - category: RTL
   description: "See Bootstrap's RTL version in action with these modified Custom Components examples."
diff --git a/site/data/sidebar.yml b/site/data/sidebar.yml
index 80256e9f0..4e43255a3 100644
--- a/site/data/sidebar.yml
+++ b/site/data/sidebar.yml
@@ -1,3 +1,6 @@
+# This file holds all sidebar menu's entries.
+# The logic for the sidebar generation is in "site/layouts/partials/docs-sidebar.html".
+
 - title: Getting started
   pages:
     - title: Introduction
@@ -7,6 +10,7 @@
     - title: JavaScript
     - title: Build tools
     - title: Webpack
+    - title: Parcel
     - title: Accessibility
     - title: RFS
     - title: RTL
@@ -26,7 +30,6 @@
     - title: Breakpoints
     - title: Containers
     - title: Grid
-    # - title: Rows
     - title: Columns
     - title: Gutters
     - title: Utilities
@@ -69,6 +72,7 @@
     - title: Modal
     - title: Navs & tabs
     - title: Navbar
+    - title: Offcanvas
     - title: Pagination
     - title: Popovers
     - title: Progress
@@ -90,6 +94,7 @@
 - title: Utilities
   pages:
     - title: API
+    - title: Background
     - title: Borders
     - title: Colors
     - title: Display
@@ -117,3 +122,5 @@
     - title: Brand
     - title: License
     - title: Translations
+
+- title: Migration
diff --git a/site/data/translations.yml b/site/data/translations.yml
index 275356985..a17163cfa 100644
--- a/site/data/translations.yml
+++ b/site/data/translations.yml
@@ -22,3 +22,13 @@
   code: ru
   description: Bootstrap 5 на русском
   url: https://getbootstrap.su/
+
+- name: Korean
+  code: ko
+  description: Bootstrap 5 한국어 문서
+  url: https://getbootstrap.kr/
+
+- name: 中文(繁體)
+  code: zh-tw
+  description: Bootstrap 5 繁體中文手冊
+  url: https://bootstrap5.hexschool.com/