diff --git a/docs/faq/product.md b/docs/faq/product.md
index edbb1ffb4d..f09b5696b8 100644
--- a/docs/faq/product.md
+++ b/docs/faq/product.md
@@ -1,6 +1,6 @@
---
id: product
-title: Product FAQ
+title: Non-technical FAQ
description: Questions related to product and design.
---
diff --git a/docs/overview/logos.md b/docs/overview/logos.md
index fe993cc378..3198b38b71 100644
--- a/docs/overview/logos.md
+++ b/docs/overview/logos.md
@@ -7,36 +7,5 @@ description: Guidelines for how to use the Backstage logos and icons
Guidelines for how to use the Backstage logo and icon can be found
[here](https://backstage.io/logo_assets/Backstage_Identity_Assets_Overview.pdf).
-The assets below are all in `.svg` format. Other formats are available in the
-[repository](https://github.com/backstage/backstage/tree/master/microsite/static/logo_assets).
-## Backstage logo
-
-
-
-
-
-
-
-
-
-
-
-
-
-## Backstage icon
-
-
+You can find the assets at https://github.com/cncf/artwork/tree/main/projects/backstage.
diff --git a/docs/overview/threat-model.md b/docs/overview/threat-model.md
index 2461f002c8..6f06fbd527 100644
--- a/docs/overview/threat-model.md
+++ b/docs/overview/threat-model.md
@@ -1,6 +1,7 @@
---
id: threat-model
title: Backstage Threat Model
+sidebar_label: Security & Thread Model
description: A document describing the threat model for Backstage.
---
diff --git a/microsite/docusaurus.config.ts b/microsite/docusaurus.config.ts
index 43bde19e35..e07ff68c18 100644
--- a/microsite/docusaurus.config.ts
+++ b/microsite/docusaurus.config.ts
@@ -405,6 +405,10 @@ const config: Config = {
label: 'GitHub',
to: 'https://github.com/backstage/',
},
+ {
+ label: 'Assets',
+ to: 'https://github.com/cncf/artwork/tree/main/projects/backstage',
+ },
],
},
],
diff --git a/microsite/sidebars.js b/microsite/sidebars.js
index e18fc5a229..46240cb649 100644
--- a/microsite/sidebars.js
+++ b/microsite/sidebars.js
@@ -5,14 +5,11 @@ module.exports = {
Overview: [
'overview/what-is-backstage',
'overview/architecture-overview',
- 'overview/roadmap',
- 'overview/vision',
'overview/background',
- 'overview/adopting',
- 'overview/versioning-policy',
+ 'overview/vision',
+ 'overview/roadmap',
'overview/threat-model',
- 'overview/support',
- 'overview/logos',
+ 'overview/versioning-policy',
],
'Getting Started': [
'getting-started/index',
@@ -46,6 +43,7 @@ module.exports = {
'getting-started/create-a-component',
],
},
+ 'overview/support',
'getting-started/keeping-backstage-updated',
],
'Core Features': [
@@ -494,36 +492,46 @@ module.exports = {
],
},
],
- 'Designing for Backstage': [
- 'dls/design',
- 'dls/component-design-guidelines',
- 'dls/contributing-to-storybook',
- 'dls/figma',
- ],
Tutorials: [
- 'tutorials/quickstart-app-plugin',
- 'tutorials/react-router-stable-migration',
- 'tutorials/react18-migration',
- 'tutorials/package-role-migration',
- 'tutorials/migrating-away-from-core',
- 'tutorials/configuring-plugin-databases',
- 'tutorials/switching-sqlite-postgres',
- 'tutorials/using-backstage-proxy-within-plugin',
- 'tutorials/yarn-migration',
- 'tutorials/migrate-to-mui5',
- 'tutorials/auth-service-migration',
- 'tutorials/enable-public-entry',
- 'tutorials/setup-opentelemetry',
+ { 'Non-technical': ['overview/adopting'] },
+ {
+ Techical: [
+ 'tutorials/quickstart-app-plugin',
+ 'tutorials/configuring-plugin-databases',
+ 'tutorials/switching-sqlite-postgres',
+ 'tutorials/using-backstage-proxy-within-plugin',
+ 'tutorials/enable-public-entry',
+ 'tutorials/setup-opentelemetry',
+ 'accessibility/index',
+ ],
+ },
+ {
+ Migrations: [
+ 'tutorials/react-router-stable-migration',
+ 'tutorials/react18-migration',
+ 'tutorials/package-role-migration',
+ 'tutorials/migrating-away-from-core',
+ 'tutorials/yarn-migration',
+ 'tutorials/migrate-to-mui5',
+ 'tutorials/auth-service-migration',
+ ],
+ },
],
-
FAQ: ['faq/index', 'faq/product', 'faq/technical'],
- Accessibility: ['accessibility/index'],
Contribute: [
'contribute/index',
'contribute/getting-involved',
'contribute/project-structure',
],
References: [
+ {
+ 'Designing for Backstage': [
+ 'dls/design',
+ 'dls/component-design-guidelines',
+ 'dls/contributing-to-storybook',
+ 'dls/figma',
+ ],
+ },
{
type: 'category',
label: 'Architecture Decision Records (ADRs)',