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

docs/features/software-catalog/configuration.md

@@ -23,30 +23,31 @@ configuration.
 ## Catalog Rules
 
 By default the catalog will only allow ingestion of entities with the kind
-`Component` and `API`. In order to allow entities of other kinds to be added,
-you need to add rules to the catalog. Rules are added either in a separate
-`catalog.rules` key, or added to statically configured locations.
+`Component`, `API` and `Location`. In order to allow entities of other kinds to
+be added, you need to add rules to the catalog. Rules are added either in a
+separate `catalog.rules` key, or added to statically configured locations.
 
 For example, given the following configuration:
 
 ```yaml
 catalog:
   rules:
-    - allow: [Component, API, Template]
+    - allow: [Component, API, Location, Template]
 
   locations:
     - type: github
       target: https://github.com/org/example/blob/master/org-data.yaml
-      allow: [Group]
+      rules:
+        - allow: [Group]
 ```
 
-We are able to add entities of kind `Component`, `API`, or `Template` from any
-location, and `Group` entities from the `org-data.yaml`, which will also be read
-as statically configured location.
+We are able to add entities of kind `Component`, `API`, `Location`, or
+`Template` from any location, and `Group` entities from the `org-data.yaml`,
+which will also be read as statically configured location.
 
 Note that if the `catalog.rules` key is present it will replace the default
-value, meaning that you need to add rules for `Component` and `API` kinds if you
-want those to be allowed.
+value, meaning that you need to add rules for the default kinds if you want
+those to still be allowed.
 
 The following configuration will reject any kind of entities from being added to
 the catalog:

docs/features/software-templates/adding-templates.md

@@ -67,7 +67,8 @@ catalog:
   locations:
     - type: github
       target: https://github.com/spotify/cookiecutter-golang/blob/master/template.yaml
-      allow: [Template]
+      rules:
+        - allow: [Template]
 ```
 
 Templates can also be added by posting the to the catalog directly. Note that if
@@ -77,7 +78,7 @@ to be ingested from any source, for example:
 ```yaml
 catalog:
   rules:
-    allow: [Component, API, Template]
+    - allow: [Component, API, Template]
 ```
 
 For loading from a file, the following command should work when the backend is

docs/overview/roadmap.md

@@ -79,18 +79,26 @@ guidelines to get started.
 
 - Further improvements to platform documentation
 
+### Plugins
+
+Building and maintaining [plugins](https://backstage.io/plugins) is the work of
+the entire Backstage community.
+
+A list of plugins that are in development is
+[available here](https://github.com/spotify/backstage/issues?q=is%3Aissue+is%3Aopen+label%3Aplugin+sort%3Areactions-%2B1-desc).
+We strongly recommend to upvote 👍 plugins you are interested in. This helps us
+and the community prioritize what plugins to build.
+
+Are you missing a plugin for your favorite tool? Please
+[suggest a new one](https://github.com/spotify/backstage/issues/new?labels=plugin&template=plugin_template.md&title=%5BPlugin%5D+THE+PLUGIN+NAME).
+Chances are that someone will jump in and help build it.
+
 ### Future work 🔮
 
 - **[Backstage platform is stable](https://github.com/spotify/backstage/milestone/19)** -
   The platform APIs and features are stable and can be depended on for
   production use. After this plugins will require little to no maintenance.
 
-- **[Plugin marketplace](https://github.com/spotify/backstage/issues/2009)** -
-  As the ecosystem of Backstage plugins continues to grow it is becoming
-  increasingly hard to keep track of what plugins are available. To solve this
-  we imagine a "Plugin marketplace" that helps with discovery and installation
-  of plugins.
-
 - **Deploy a product demo at `demo.backstage.io`** - Deploy a typical Backstage
   deployment available publicly so that people can click around and get a feel
   for the product without having to install anything.
@@ -111,6 +119,7 @@ guidelines to get started.
 
 ### Completed milestones ✅
 
+- [Plugin marketplace](https://backstage.io/plugins)
 - [Improved and move documentation to backstage.io](https://backstage.io/docs/overview/what-is-backstage)
 - [Backstage Service Catalog (alpha)](https://backstage.io/blog/2020/06/22/backstage-service-catalog-alpha)
 - [Backstage Software Templates (alpha)](https://backstage.io/blog/2020/08/05/announcing-backstage-software-templates)

docs/plugins/publishing.md

@@ -39,4 +39,18 @@ $ git push origin -u new-release
 And then create a PR. Once the PR is approved and merged into master, the master
 build will publish new versions of all bumped packages.
 
+### Include new changes in existing release PR
+
+If you want to include some last minute changes to an existing release PR,
+follow these instructions:
+
+```sh
+$ git checkout master
+$ git pull
+$ git checkout new-release
+$ git reset --hard master
+$ yarn release
+$ git push --force
+```
+
 [Back to Docs](../README.md)