Merge pull request #3393 from adamdmharvey/doco-updates

Fixes when referring to entity YAML filename to use new standard catalog-info.yaml

.changeset/tidy-brooms-look.md

@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-scaffolder-backend': patch
+---
+
+Fix React entity YAML filename to new standard

docs/features/software-catalog/descriptor-format.md

@@ -43,7 +43,7 @@ software catalog API.
   "kind": "Component",
   "metadata": {
     "annotations": {
-      "backstage.io/managed-by-location": "file:/tmp/component-info.yaml",
+      "backstage.io/managed-by-location": "file:/tmp/catalog-info.yaml",
       "example.com/service-discovery": "artistweb",
       "circleci.com/project-slug": "github/example-org/artist-website"
     },

plugins/circleci/README.md

@@ -61,7 +61,7 @@ proxy:
 ```
 
 5. Get and provide `CIRCLECI_AUTH_TOKEN` as env variable (https://circleci.com/docs/api/#add-an-api-token)
-6. Add `circleci.com/project-slug` annotation to your component-info.yaml file in format <git-provider>/<owner>/<project> (https://backstage.io/docs/architecture-decisions/adrs-adr002#format)
+6. Add `circleci.com/project-slug` annotation to your catalog-info.yaml file in format <git-provider>/<owner>/<project> (https://backstage.io/docs/architecture-decisions/adrs-adr002#format)
 
 ```yaml
 apiVersion: backstage.io/v1alpha1
@@ -88,4 +88,4 @@ spec:
 ## Limitations
 
 - CircleCI has pretty strict rate limits per token, be careful with opened tabs
-- CircelCI doesn't provide a way to auth by 3rd party (e.g. GitHub) token, nor by calling their OAuth endpoints, which currently stands in the way of better auth integration with Backstage (https://discuss.circleci.com/t/circleci-api-authorization-with-github-token/5356)
+- CircleCI doesn't provide a way to auth by 3rd party (e.g. GitHub) token, nor by calling their OAuth endpoints, which currently stands in the way of better auth integration with Backstage (https://discuss.circleci.com/t/circleci-api-authorization-with-github-token/5356)

plugins/jenkins/README.md

@@ -41,7 +41,7 @@ export JENKINS_BASIC_AUTH_HEADER="Basic $HEADER"
 ```
 
 5. Run app with `yarn start`
-6. Add the Jenkins folder annotation to your `component-info.yaml`, (note: currently this plugin only supports folders and Git SCM)
+6. Add the Jenkins folder annotation to your `catalog-info.yaml`, (note: currently this plugin only supports folders and Git SCM)
 
 ```yaml
 apiVersion: backstage.io/v1alpha1

plugins/scaffolder-backend/src/scaffolder/stages/templater/cra.ts

@@ -48,7 +48,7 @@ export class CreateReactAppTemplater implements TemplaterBase {
       },
     });
 
-    // Need to also make a component-info.yaml to store the data about the service.
+    // Need to also make a catalog-info.yaml to store the data about the service.
     const componentInfo = {
       apiVersion: 'backstage.io/v1alpha1',
       kind: 'Component',