Merge remote-tracking branch 'upstream/master'

mkdocs.yml

@@ -16,7 +16,7 @@ nav:
   - Getting started:
       - Getting Started: 'getting-started/index.md'
       - Running Backstage locally: 'getting-started/running-backstage-locally.md'
-      - Local development: 'getting-started/development-environment.md'
+      - Contributors: 'getting-started/contributors.md'
       - Demo deployment: https://backstage-demo.roadie.io
       - Production deployments:
           - Create an App: 'getting-started/create-an-app.md'
@@ -24,6 +24,7 @@ nav:
               - Configuring App with plugins: 'getting-started/configure-app-with-plugins.md'
               - Customize the look-and-feel of your App: 'getting-started/app-custom-theme.md'
           - Deployment scenarios:
+              - Docker: 'getting-started/deployment-docker.md'
               - Kubernetes: 'getting-started/deployment-k8s.md'
               - Kubernetes and Helm: 'getting-started/deployment-helm.md'
               - Other: 'getting-started/deployment-other.md'
@@ -64,6 +65,11 @@ nav:
           - FAQ: 'features/techdocs/FAQ.md'
       - Kubernetes:
           - Overview: 'features/kubernetes/index.md'
+  - Integrations:
+      - GitHub:
+          - Org Data: 'integrations/github/org.md'
+      - LDAP:
+          - Org Data: 'integrations/ldap/org.md'
   - Plugins:
       - Overview: 'plugins/index.md'
       - Existing plugins: 'plugins/existing-plugins.md'
@@ -80,6 +86,7 @@ nav:
       - Publishing:
           - Open source and npm: 'plugins/publishing.md'
           - Private/internal (non-open source): 'plugins/publish-private.md'
+          - Observability: 'plugins/observability.md'
   - Configuration:
       - Overview: 'conf/index.md'
       - Reading Configuration: 'conf/reading.md'