Merge pull request #53876 from github/mchammer01/remove-unneeded-fbv3

Hack week 2025: remove unneeded FBV instances (3)

Author: mchammer01

content/admin/managing-code-security/managing-github-advanced-security-for-your-enterprise/configuring-code-scanning-for-your-appliance.md

@@ -69,7 +69,7 @@ If you are provisioning a self-hosted runner for {% data variables.product.prodn
 
 If you are using default setup for {% data variables.product.prodname_code_scanning %}, you can assign self-hosted runners {% ifversion code-scanning-default-setup-customize-labels %}with the default `code-scanning` label, or you can optionally give them custom labels so that individual repositories can use different runners.{% else %}with the `code-scanning` label.{% endif %} See [AUTOTITLE](/code-security/code-scanning/enabling-code-scanning/configuring-default-setup-for-code-scanning#assigning-labels-to-runners).
 
-{% ifversion code-scanning-default-setup-self-hosted-310 or default-setup-self-hosted-runners-GHEC %} For information about using default setup for code scanning analysis of compiled languages, see [AUTOTITLE](/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/codeql-code-scanning-for-compiled-languages).{% endif %}
+For information about using default setup for code scanning analysis of compiled languages, see [AUTOTITLE](/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/codeql-code-scanning-for-compiled-languages).
 
 {% endif %}
 

content/authentication/keeping-your-account-and-data-secure/reviewing-your-security-log.md

@@ -39,9 +39,7 @@ The events listed in your security log are triggered by your actions. Actions ar
 | `marketplace_agreement_signature` | Contains all activities related to signing the {% data variables.product.prodname_marketplace %} Developer Agreement. |
 | `marketplace_listing`| Contains all activities related to listing apps in {% data variables.product.prodname_marketplace %}. |
 |  {% endif %} |
-|  {% ifversion security-log-oauth-access-tokens %} |
 | `oauth_access` | Contains all activities related to OAuth access tokens. |
-|  {% endif %} |
 | `oauth_authorization` | Contains all activities related to authorizing {% data variables.product.prodname_oauth_apps %}. For more information, see [AUTOTITLE](/apps/oauth-apps/using-oauth-apps/authorizing-oauth-apps). |
 |  {% ifversion passkeys %} |
 | `passkey` | Contains activities related to your passkeys. See [AUTOTITLE](/authentication/authenticating-with-a-passkey/about-passkeys). |

content/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages.md

@@ -295,7 +295,7 @@ If you added manual build steps for compiled languages and {% data variables.pro
 
 ## Autobuild steps for compiled languages
 
-{% ifversion fpt or ghec %}{% data variables.product.prodname_dotcom %}-hosted runners are always run with the software required by `autobuild`.{% endif %} If you use self-hosted runners for {% data variables.product.prodname_actions %}, you may need to install additional software to use the `autobuild` process. Additionally, if your repository requires a specific version of a build tool, you may need to install it manually. {% ifversion code-scanning-default-setup-self-hosted-310 or default-setup-self-hosted-runners-GHEC %} For self-hosted runners, you should install dependencies directly in the runners themselves. We provide examples of common dependencies for C/C++, C#, and Java in each of the `autobuild` sections of this article for those languages. For more information, see [AUTOTITLE](/actions/hosting-your-own-runners/managing-self-hosted-runners/about-self-hosted-runners).{% endif %}
+{% ifversion fpt or ghec %}{% data variables.product.prodname_dotcom %}-hosted runners are always run with the software required by `autobuild`.{% endif %} If you use self-hosted runners for {% data variables.product.prodname_actions %}, you may need to install additional software to use the `autobuild` process. Additionally, if your repository requires a specific version of a build tool, you may need to install it manually. {% ifversion ghes or default-setup-self-hosted-runners-GHEC %} For self-hosted runners, you should install dependencies directly in the runners themselves. We provide examples of common dependencies for C/C++, C#, and Java in each of the `autobuild` sections of this article for those languages. For more information, see [AUTOTITLE](/actions/hosting-your-own-runners/managing-self-hosted-runners/about-self-hosted-runners).{% endif %}
 
 * [Building C/C++](#building-cc)
 * [Building C#](#building-c)
@@ -468,7 +468,7 @@ The `autobuild` process attempts to autodetect a suitable way to install the dep
 1. Extract all Go code in the repository, similar to running `go build ./...`.
 
 > [!NOTE]
-> If you use default setup, it will look for a `go.mod` file to automatically install a compatible version of the Go language.{% ifversion code-scanning-default-setup-self-hosted-310 %} If you're using a self-hosted runner with default setup that doesn't have internet access, you can manually install a compatible version of Go.{% endif %}
+> If you use default setup, it will look for a `go.mod` file to automatically install a compatible version of the Go language.{% ifversion ghes %} If you're using a self-hosted runner with default setup that doesn't have internet access, you can manually install a compatible version of Go.{% endif %}
 
 ### Extractor options for Go
 

content/code-security/getting-started/auditing-security-alerts.md

@@ -31,7 +31,7 @@ Many of the events in the timeline also create an event in the audit log, which
 
 Security overview consolidates information about security alerts and provides high-level summaries of the security status of your enterprise or organization.
 
-In security overview you can see repositories with open security alerts{% ifversion security-overview-org-risk-coverage %}, as well as which repositories have enabled specific security features{% endif %}. You can also use security overview to filter and sort security alerts using interactive views.
+In security overview you can see repositories with open security alerts{% ifversion ghec or ghes %}, as well as which repositories have enabled specific security features{% endif %}. You can also use security overview to filter and sort security alerts using interactive views.
 
 For more information, see [AUTOTITLE](/code-security/security-overview/about-security-overview).
 

content/code-security/security-overview/assessing-adoption-code-security.md

@@ -12,7 +12,8 @@ topics:
   - Organizations
   - Teams
 versions:
-  feature: security-overview-org-risk-coverage
+  ghes: '*'
+  ghec: '*'
 ---
 
 {% data reusables.security-overview.beta-org-risk-coverage %}

content/code-security/security-overview/filtering-alerts-in-security-overview.md

@@ -65,7 +65,7 @@ These qualifiers are available in all views.
 
 | Qualifier | Description |
 |--------|--------|
-| `team` | Display data for all repositories that the specified team has {% ifversion security-overview-team-write-access -%} write access or {% endif -%} admin access to. For more information on repository roles, see [AUTOTITLE](/organizations/managing-user-access-to-your-organizations-repositories/managing-repository-roles/repository-roles-for-an-organization). |
+| `team` | Display data for all repositories that the specified team has write access or admin access to. For more information on repository roles, see [AUTOTITLE](/organizations/managing-user-access-to-your-organizations-repositories/managing-repository-roles/repository-roles-for-an-organization). |
 | `topic` | Display data for all repositories that are classified with a specific topic. For more information on repository topics, see [AUTOTITLE](/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/classifying-your-repository-with-topics). |
 
 {% ifversion security-overview-repository-properties %}
@@ -97,7 +97,7 @@ In enterprise-level views, you can limit the data to repositories owned by a sin
 |  {% endif %} |
 | `org` | Display data for repositories owned by one organization. | {% data variables.product.prodname_dependabot_alerts %} and {% data variables.product.prodname_code_scanning %} alerts |
 
-{% elsif security-overview-org-risk-coverage-enterprise %}
+{% else %}
 
 In enterprise-level views, you can limit the data to repositories owned by a single organization in your enterprise. Use the `org` qualifier to display data for repositories owned by one organization.
 
@@ -126,21 +126,9 @@ In the "Risk" and "Coverage" views, you can show data only for repositories wher
 | `dependabot-security-updates` | Display data for repositories where {% data variables.product.prodname_dependabot_security_updates %} is enabled or not enabled.  |
 | `secret-scanning-push-protection` | Display data for repositories where push protection for {% data variables.product.prodname_secret_scanning %} is enabled or not enabled. |
 
-{% ifversion security-overview-org-risk-coverage-enterprise %}{% else %}
-
-## Repository risk-level filtering
-
-The level of risk for a repository is determined by the number and severity of alerts from security features. You can filter on the level of risk using the `risk` qualifier.
-
-* The level of risk can be one of `high`, `medium`, or `low`.
-* If one or more security features are not enabled for a repository, the repository has an `unknown` level of risk.
-* If all security features are enabled and no alerts are report, the repository has a `clear` level of risk.
-
-{% endif %}
-
 ## Alert number filters
 
-{% ifversion security-overview-org-risk-coverage-enterprise %}In the "Risk" view, you can filter repositories by the number of alerts they have of a specific type.{% else %}These qualifiers are available in the enterprise-level "Overview" and in the organization-level "Security risk" view.{% endif %}
+In the "Risk" view, you can filter repositories by the number of alerts they have of a specific type.
 
 | Qualifier | Description |
 | -------- | -------- |

content/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/about-pull-request-merges.md

@@ -24,25 +24,14 @@ topics:
 
 ### Merge message for a squash merge
 
-{% ifversion default-merge-squash-commit-message %}
 When you squash and merge, {% data variables.product.prodname_dotcom %} generates a default commit message, which you can edit. Depending on how the repository is configured and the number of commits in the pull request, not including merge commits, this message may include the pull request title, pull request description, or information about the commits.
-{% else %}
-When you squash and merge, {% data variables.product.prodname_dotcom %} generates a default commit message, which you can edit. The default message depends on the number of commits in the pull request, not including merge commits.
 
 | Number of commits | Summary | Description |
 | ----------------- | ------- | ----------- |
 | One commit | The title of the commit message for the single commit, followed by the pull request number | The body text of the commit message for the single commit |
 | More than one commit | The pull request title, followed by the pull request number | A list of the commit messages for all of the squashed commits, in date order |
 
-{% endif %}
-
-| Number of commits | Summary | Description |
-| ----------------- | ------- | ----------- |
-| One commit | The title of the commit message for the single commit, followed by the pull request number | The body text of the commit message for the single commit |
-| More than one commit | The pull request title, followed by the pull request number | A list of the commit messages for all of the squashed commits, in date order |
-
-{% ifversion default-merge-squash-commit-message %}
-People with maintainer or admin access to a repository can configure their repository's default merge message for all squashed commits to use the pull request title, the pull request title and commit details, or the pull request title and description. For more information, see [AUTOTITLE](/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/configuring-commit-squashing-for-pull-requests).{% endif %}
+People with maintainer or admin access to a repository can configure their repository's default merge message for all squashed commits to use the pull request title, the pull request title and commit details, or the pull request title and description. For more information, see [AUTOTITLE](/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/configuring-commit-squashing-for-pull-requests).
 
 ### Squashing and merging a long-running branch
 

content/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/configuring-commit-merging-for-pull-requests.md

@@ -14,11 +14,9 @@ shortTitle: Configure commit merging
 {% data reusables.repositories.navigate-to-repo %}
 {% data reusables.repositories.sidebar-settings %}
 1. Under "Pull Requests", select **Allow merge commits**. This allows contributors to merge a pull request with a full history of commits.
-{% ifversion default-merge-squash-commit-message %}
 1. Optionally, under **Allow merge commits**, select the dropdown menu, then click the format of the commit message presented to contributors when merging.
 
    The default message includes the pull request number and title. For example, `Merge pull request #123 from patch-1`. You can also choose to use just the pull request title, or the pull request title and description.
-{% endif %}
 
 If you select more than one merge method, collaborators can choose which type of merge commit to use when they merge a pull request. {% data reusables.repositories.squash-and-rebase-linear-commit-history %}
 

content/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/configuring-commit-squashing-for-pull-requests.md

@@ -21,11 +21,9 @@ shortTitle: Configure commit squashing
 {% data reusables.repositories.sidebar-settings %}
 1. On the "General" settings page (which is selected by default), scroll down to the section marked "Pull Requests".
 1. Under "Pull Requests", select **Allow squash merging**. This allows contributors to merge a pull request by squashing all commits into a single commit. The default commit message presented to contributors when merging is the commit title and message if the pull request contains only 1 commit, or the pull request title and list of commits if the pull request contains 2 or more commits.
-{% ifversion default-merge-squash-commit-message %}
 1. Optionally, under **Allow squash merging**, select the dropdown menu, then click the format of the default squash commit message presented to contributors when merging.
 
    The default message uses the commit title and message if the pull request contains only 1 commit, or the pull request title and list of commits if the pull request contains 2 or more commits. You can also choose to use just the pull request title, the pull request title and commit details, or the pull request title and description.
-{% endif %}
 
 If you select more than one merge method, collaborators can choose which type of merge commit to use when they merge a pull request. {% data reusables.repositories.squash-and-rebase-linear-commit-history %}