Merge branch 'master' into generic-grid-page

README.md

@@ -60,6 +60,6 @@ Check out [the documentation](https://backstage.io/docs/getting-started) on how
 
 ## License
 
-Copyright 2020-2021 © Backstage Project Authors. All rights reserved. The Linux Foundation has registered trademarks and uses trademarks. For a list of trademarks of The Linux Foundation, please see our Trademark Usage page: https://www.linuxfoundation.org/trademark-usage
+Copyright 2020-2021 © The Backstage Authors. All rights reserved. The Linux Foundation has registered trademarks and uses trademarks. For a list of trademarks of The Linux Foundation, please see our Trademark Usage page: https://www.linuxfoundation.org/trademark-usage
 
 Licensed under the Apache License, Version 2.0: http://www.apache.org/licenses/LICENSE-2.0

docs/features/software-templates/writing-custom-actions.md

@@ -101,9 +101,7 @@ should have something similar to the below in
 
 ```ts
 return await createRouter({
-  preparers,
-  templaters,
-  publishers,
+  containerRunner,
   logger,
   config,
   database,
@@ -118,9 +116,7 @@ will set the available actions that the scaffolder has access to.
 ```ts
 const actions = [createNewFileAction()];
 return await createRouter({
-  preparers,
-  templaters,
-  publishers,
+  containerRunner,
   logger,
   config,
   database,
@@ -137,18 +133,17 @@ want to have those as well as your new one, you'll need to do the following:
 import { createBuiltinActions } from '@backstage/plugin-scaffolder-backend';
 
 const builtInActions = createBuiltinActions({
+  containerRunner,
   integrations,
+  config,
   catalogClient,
-  templaters,
   reader,
 });
 
 const actions = [...builtInActions, createNewFileAction()];
 
 return await createRouter({
-  preparers,
-  templaters,
-  publishers,
+  containerRunner,
   logger,
   config,
   database,