Merge branch 'master' of github.com:spotify/backstage into shmidt-i/app-catalog-tabs-routes-everything-is-connected

microsite/sidebars.json

@@ -5,7 +5,9 @@
       "overview/architecture-overview",
       "overview/architecture-terminology",
       "overview/roadmap",
-      "overview/vision"
+      "overview/vision",
+      "overview/background",
+      "overview/adopting"
     ],
     "Getting Started": [
       "getting-started/index",
@@ -37,7 +39,6 @@
           "features/software-catalog/software-catalog-overview",
           "features/software-catalog/system-model",
           "features/software-catalog/descriptor-format",
-          "features/software-catalog/populating-catalog",
           "features/software-catalog/extending-the-model",
           "features/software-catalog/external-integrations",
           "features/software-catalog/software-catalog-api"
@@ -91,7 +92,7 @@
       {
         "type": "subcategory",
         "label": "Publishing",
-        "ids": ["plugins/publishing", "plugins/publish-private"]
+        "ids": ["plugins/publishing", "plugins/publish-private", "plugins/add-to-marketplace"]
       }
     ],
     "Configuration": [
@@ -132,7 +133,7 @@
         "ids": ["api/backend"]
       }
     ],
-    "Tutorials": ["tutorials/index"],
+    "Tutorials": ["tutorials/journey"],
     "Architecture Decision Records (ADRs)": [
       "architecture-decisions/adrs-overview",
       "architecture-decisions/adrs-adr001",