Merge branch 'main' into DOCSS-1857-remove-h5-6

Author: rosieyohannan

.htmltest.yml

@@ -6,10 +6,8 @@ BaseURL: https://circleci.com/docs
 IgnoreAltEmpty: true
 IgnoreInternalEmptyHash: true
 IgnoreURLs:
-  - "[url]"
-  - "[path]"
-  - "/docs/"
-  - "/docs/_/img/x-icon.svg"
+  - "\\[url\\]"                          # Escaped literal [url] placeholder in search templates
+  - "^/docs/"                            # All absolute paths from 404 page (navigation + assets)
 IgnoreDirs:
   - "api"
 OutputDir: ".htmltest"

docs/guides/modules/ROOT/nav.adoc

@@ -269,7 +269,7 @@
 *** xref:integration:version-control-system-integration-overview.adoc[VCS integration overview]
 *** xref:integration:github-apps-integration.adoc[GitHub App integration]
 *** xref:integration:github-integration.adoc[GitHub OAuth app integration]
-*** xref:integration:using-the-circleci-github-app-in-an-oauth-org.adoc[Using the CircleCI GitHub App in an OAuth org]
+*** xref:guides:integration:using-the-circleci-github-app-in-an-oauth-org.adoc[Using the CircleCI GitHub App in an OAuth org]
 *** xref:integration:gitlab-integration.adoc[GitLab integration]
 *** xref:integration:bitbucket-data-center-integration.adoc[Bitbucket data center integration]
 *** xref:integration:bitbucket-integration.adoc[Bitbucket Cloud integration]

docs/guides/modules/ROOT/partials/faq/pipelines-faq-snip.adoc

@@ -5,7 +5,7 @@ If your code is stored in GitHub you can split your configuration into multiple
 
 include::ROOT:partial$tips/check-github-type-org.adoc[]
 
-If your organization is currently integrated with GitHub only through OAuth, an admin can take the one-time action of installing the CircleCI GitHub App to enable this functionality. For more information, see the xref:guides:integration:github-integration.adoc#installing-github-app-alongside-github-oauth-app[GitHub integration] page.
+If your organization is currently integrated with GitHub only through OAuth, an admin can take the one-time action of installing the CircleCI GitHub App to enable this functionality. For more information, see the xref:guides:integration:using-the-circleci-github-app-in-an-oauth-org.adoc[Using the CircleCI GitHub App in an OAuth organization] page.
 
 While splitting configuration files is only available for GitHub App integrations, CircleCI does support dynamic configuration, which allows you to create configuration files based on specific pipeline values or paths, and continue one pipeline to another. See the xref:guides:orchestrate:dynamic-config.adoc[Dynamic configuration] page for more information.
 

docs/guides/modules/deploy/pages/deployment-overview.adoc

@@ -198,8 +198,8 @@ To add or edit labels for a component, follow these steps:
 
 . Select *Deploys* in the CircleCI web app sidebar.
 . You are now in the timeline view. Select the **Components** tab.
-. Select the cog icon image:guides:ROOT:icons/settings.svg[settings icon, role="no-border"] for your component. You can use the filter at the top of the page to help find the component you want.
-. You are now on the component settings page. Select the edit button image:guides:ROOT:icons/edit-solid.svg[edit icon, role="no-border"] in the labels panel.
+. Select the component by name. You can use the filter at the top of the page to help find the component you want.
+. You are now on the component view page. Select the edit button image:guides:ROOT:icons/edit-solid.svg[edit icon, role="no-border"] in the labels panel.
 . Enter or edit your label(s) and select btn:[Done].
 
 ==== Environment labels

docs/guides/modules/integration/pages/bitbucket-data-center-integration.adoc

@@ -217,7 +217,7 @@ The ability to xref:orchestrate:scheduled-pipelines.adoc[schedule pipelines] is
 [#stop-building]
 === Stop building
 
-Bitbucket Data Center integrations do not currently support the **Stop Building** xref:security:stop-building-a-project-on-circleci.adoc#stop-building-a-project[option] that can normally be found in **Project settings**. As an alternative, you can xref:security:stop-building-a-project-on-circleci.adoc#remove-a-project-from-circleci[Delete a project].
+Bitbucket Data Center integrations do not currently support the **Stop Building** xref:security:stop-building-a-project-on-circleci.adoc#stop-building-a-project[option] that can normally be found in **Project settings**. As an alternative, you can xref:security:delete-organizations-and-projects.adoc#delete-a-project[Delete a project].
 
 [#additional-ssh-keys-only]
 === Additional SSH keys only

docs/guides/modules/integration/pages/github-apps-integration.adoc

@@ -6,7 +6,7 @@
 If your CircleCI organization is integrated with GitHub through the **CircleCI GitHub App**, the content on this page is for you.
 
 ****
-The **CircleCI GitHub App** is an add-on integration. All organizations that have `/github/` or `/circleci/` in the URL can install the GitHub App, including xref:integration:using-the-circleci-github-app-in-an-oauth-org.adoc[those already integrated through the GitHub OAuth app].
+The **CircleCI GitHub App** is an add-on integration. All organizations that have `/github/` or `/circleci/` in the URL can install the GitHub App, including xref:guides:integration:using-the-circleci-github-app-in-an-oauth-org.adoc[those already integrated through the GitHub OAuth app].
 To check whether you organization has the CircleCI GitHub App installed, navigate to menu:Organization Settings[VCS Connections].
 ****
 
@@ -119,7 +119,7 @@ A subset of built-in environment variables are not available in GitHub-based pro
 
 Before attempting to move your information from an org integrated with the GitHub OAuth app to an org integrated with CircleCI’s GitHub App, consider the following:
 
-* If the motivation for moving is to **leverage new functionality that is only available to the GitHub App integration**, consider using your existing organization and installing the GitHub App alongside your OAuth app integration, as described in xref:integration:using-the-circleci-github-app-in-an-oauth-org.adoc[this guide].
+* If the motivation for moving is to **leverage new functionality that is only available to the GitHub App integration**, consider using your existing organization and installing the GitHub App alongside your OAuth app integration, as described in xref:guides:integration:using-the-circleci-github-app-in-an-oauth-org.adoc[this guide].
 * If the motivation is to **completely remove the OAuth app integration** for security, compliance, or other reasons, follow the steps below.
 
 [#Steps-to-migrate-to-an-organization-without-default-GitHub-OAuth-integration]

docs/guides/modules/integration/pages/github-integration.adoc

@@ -346,7 +346,7 @@ Key functionality enabled through the GitHub App integration includes the follow
 ** **Cross-repo triggers**: Events in one repository can trigger builds on one or many other repositories.
 ** **More GitHub events as triggers**: Pipelines can be set up to run on events other than "push", including pull request events, with more powerful customization of trigger conditions. For full details, see the xref:orchestrate:github-trigger-event-options.adoc[GitHub trigger event options] page.
 
-More information is available on the xref:integration:using-the-circleci-github-app-in-an-oauth-org.adoc[Using the CircleCI GitHub App in an OAuth organization] page.
+More information is available on the xref:guides:integration:using-the-circleci-github-app-in-an-oauth-org.adoc[Using the CircleCI GitHub App in an OAuth organization] page.
 
 [#next-steps]
 == Next steps

docs/guides/modules/orchestrate/pages/github-trigger-event-options.adoc

@@ -28,7 +28,7 @@ If your CircleCI organization is integrated with GitHub only through the **GitHu
 .Trigger options during project creation
 image::guides:ROOT:triggers/create-project-run-on.png[Create a project trigger and access trigger options]
 
-If your CircleCI org is integrated via **GitHub OAuth** (see tip above), an org admin can install the CircleCI GitHub App to enable the full range of GitHub trigger events, as well as all other functionality enabled by the GitHub App. Installing the CircleCI GitHub App is a one-time action. For more information, see the xref:integration:github-integration.adoc#installing-github-app-alongside-github-oauth-app[GitHub OAuth integration overview].
+If your CircleCI org is integrated via **GitHub OAuth** (see tip above), an org admin can install the CircleCI GitHub App to enable the full range of GitHub trigger events, as well as all other functionality enabled by the GitHub App. Installing the CircleCI GitHub App is a one-time action. For more information, see the xref:guides:integration:using-the-circleci-github-app-in-an-oauth-org.adoc[Using the CircleCI GitHub App in an OAuth organization] page.
 
 == Supported trigger options
 

docs/guides/modules/orchestrate/pages/orchestration-cookbook.adoc

@@ -24,7 +24,7 @@ image::guides:ROOT:triggers/run-on-open.png[Run on trigger options for GitHub Ap
 
 === Notes
 
-* This option is only available for GitHub App pipelines. If you have a GitHub OAuth integration you can install the GitHub App into your GitHub org and then create GitHub App pipelines. This is a quick one-time action, as described in the xref:integration:github-integration.adoc#installing-github-app-alongside-github-oauth-app[GitHub integration] page.
+* This option is only available for GitHub App pipelines. If you have a GitHub OAuth integration you can install the GitHub App into your GitHub org and then create GitHub App pipelines. This is a quick one-time action, as described in the xref:guides:integration:using-the-circleci-github-app-in-an-oauth-org.adoc[Using the CircleCI GitHub App in an OAuth organization] page.
 +
 include::ROOT:partial$tips/check-github-type-org.adoc[]
 
@@ -46,7 +46,7 @@ image::guides:ROOT:triggers/run-on-open.png[Run on trigger options for GitHub Ap
 
 === Notes
 
-* This option is only available for GitHub App pipelines. If you have a GitHub OAuth integration you can install the GitHub App into your GitHub org and then create GitHub App pipelines. This is a quick one-time action, as described in the xref:integration:github-integration.adoc#installing-github-app-alongside-github-oauth-app[GitHub integration] page.
+* This option is only available for GitHub App pipelines. If you have a GitHub OAuth integration you can install the GitHub App into your GitHub org and then create GitHub App pipelines. This is a quick one-time action, as described in the xref:guides:integration:using-the-circleci-github-app-in-an-oauth-org.adoc[Using the CircleCI GitHub App in an OAuth organization] page.
 +
 include::ROOT:partial$tips/check-github-type-org.adoc[]
 
@@ -73,7 +73,7 @@ workflows:
 
 === Notes
 
-* The `pipeline.event.name` and `pipeline.event.action` variables are only available for GitHub App pipelines. If you have a GitHub OAuth integration you can install the GitHub App into your GitHub org and then create GitHub App pipelines. This is a quick one-time action, as described in the xref:integration:github-integration.adoc#installing-github-app-alongside-github-oauth-app[GitHub integration] page.
+* The `pipeline.event.name` and `pipeline.event.action` variables are only available for GitHub App pipelines. If you have a GitHub OAuth integration you can install the GitHub App into your GitHub org and then create GitHub App pipelines. This is a quick one-time action, as described in the xref:guides:integration:using-the-circleci-github-app-in-an-oauth-org.adoc[Using the CircleCI GitHub App in an OAuth organization] page.
 +
 include::ROOT:partial$tips/check-github-type-org.adoc[]
 
@@ -244,7 +244,7 @@ include::ROOT:example$logic-statement-examples/when-in-workflows/pr-synced-or-la
 
 === Notes
 
-* The `pipeline.event.name` and `pipeline.event.action` variables are only available for GitHub App pipelines. If you have a GitHub OAuth integration you can install the GitHub App into your GitHub org and then create GitHub App pipelines. This is a quick one-time action, as described in the xref:integration:github-integration.adoc#installing-github-app-alongside-github-oauth-app[GitHub integration] page.
+* The `pipeline.event.name` and `pipeline.event.action` variables are only available for GitHub App pipelines. If you have a GitHub OAuth integration you can install the GitHub App into your GitHub org and then create GitHub App pipelines. This is a quick one-time action, as described in the xref:guides:integration:using-the-circleci-github-app-in-an-oauth-org.adoc[Using the CircleCI GitHub App in an OAuth organization] page.
 
 include::ROOT:partial$using-expressions/env-vars-in-conditional-caveat.adoc[]
 

docs/guides/modules/orchestrate/pages/triggers-overview.adoc

@@ -30,7 +30,7 @@ image::guides:ROOT:triggers/run-on-open.png[Trigger "Run on" menu open]
 
 If you only use the **GitHub OAuth** integration, once a project is set up in CircleCI, a pipeline is triggered each time a commit is pushed on a branch that has a `.circleci/config.yml` file included. One exception to this is if you use the "Only build pull requests" option. For more information on "Only build pull requests", see the xref:integration:oss.adoc[Build open source projects] page.
 
-TIP: If your org uses the **GitHub OAuth** integration, you can install the GitHub App into your org to set up GitHub App pipelines and access the trigger options described above. An org admin must take the one-time action of installing the CircleCI GitHub App to enable this functionality. For more information, see the xref:integration:github-integration.adoc#installing-github-app-alongside-github-oauth-app[GitHub OAuth integration overview].
+TIP: If your org uses the **GitHub OAuth** integration, you can install the GitHub App into your org to set up GitHub App pipelines and access the trigger options described above. An org admin must take the one-time action of installing the CircleCI GitHub App to enable this functionality. For more information, see the xref:guides:integration:using-the-circleci-github-app-in-an-oauth-org.adoc[Using the CircleCI GitHub App in an OAuth organization] page.
 --
 GitLab::
 +