Enterprise bug fixes for the week of February 17, 2023 (#34882)

Co-authored-by: Laura Coursen <lecoursen@github.com>
Co-authored-by: Matt Pollard <mattpollard@users.noreply.github.com>

content/account-and-profile/managing-subscriptions-and-notifications-on-github/managing-subscriptions-for-activity-on-github/managing-your-subscriptions.md

@@ -72,7 +72,6 @@ When you unwatch a repository, you unsubscribe from future updates from that rep
    - Ignore all notifications for a repository
    - If enabled, customize the types of event you receive notifications for ({% data reusables.notifications-v2.custom-notification-types %})
 
-{%- ifversion fpt or ghec or ghes or ghae > 3.3 %}
 1. Optionally, to unsubscribe from all repositories owned by a given user or organization, select the **Unwatch all** dropdown and click the organization whose repositories you'd like to unsubscribe from. The button to unwatch all repositories is only available if you are watching all activity or custom notifications on over 10 repositories.
 
    ![Screenshot of the Unwatch All button.](/assets/images/help/notifications-v2/unsubscribe-from-all-repos.png)
@@ -80,5 +79,3 @@ When you unwatch a repository, you unsubscribe from future updates from that rep
    - Click **Unwatch** to confirm that you want to unwatch the repositories owned by the selected user or organization, or click **Cancel** to cancel.
 
    ![Screenshot of the unwatch all confirmation dialogue.](/assets/images/help/notifications-v2/unwatch-repo-dialog.png)
-
-{% endif %}

content/account-and-profile/managing-subscriptions-and-notifications-on-github/setting-up-notifications/configuring-notifications.md

@@ -151,8 +151,8 @@ Email notifications from {% data variables.location.product_location %} contain
     - There are updates in repositories or team discussions you're watching or in a conversation you're participating in. For more information, see "[About participating and watching notifications](#about-participating-and-watching-notifications)."
     - You gain access to a new repository or you've joined a new team. For more information, see "[Automatic watching](#automatic-watching)."
     - There are new {% data variables.product.prodname_dependabot_alerts %} in your repository. For more information, see "[{% data variables.product.prodname_dependabot_alerts %} notification options](#dependabot-alerts-notification-options)."  {% ifversion fpt or ghec %}
-    - There are workflow runs updates on repositories set up with {% data variables.product.prodname_actions %}. For more information, see "[{% data variables.product.prodname_actions %} notification options](#github-actions-notification-options)."{% endif %}{% ifversion fpt or ghec or ghes or ghae > 3.3 %}
+    - There are workflow runs updates on repositories set up with {% data variables.product.prodname_actions %}. For more information, see "[{% data variables.product.prodname_actions %} notification options](#github-actions-notification-options)."{% endif %}
-    - There are new deploy keys added to repositories that belong to organizations that you're an owner of. For more information, see "[Organization alerts notification options](#organization-alerts-notification-options)."{% endif %}
+    - There are new deploy keys added to repositories that belong to organizations that you're an owner of. For more information, see "[Organization alerts notification options](#organization-alerts-notification-options)."
 
 ## Automatic watching
 
@@ -256,13 +256,10 @@ Choose how you want to receive workflow run updates for repositories that you ar
 {% ifversion ghes %}
   ![Screenshot of the notification options for {% data variables.product.prodname_actions %}](/assets/images/help/notifications-v2/github-actions-notification-options.png){% endif %}
 
-{% ifversion fpt or ghec or ghes or ghae > 3.3 %}
 ## Organization alerts notification options
 
 If you're an organization owner, you'll receive email notifications by default when organization members add new deploy keys to repositories within the organization. You can unsubscribe from these notifications. On the notification settings page, under "Organization alerts", unselect **Email**.
 
-{% endif %}
-
 {% ifversion fpt or ghes or ghec %}
 ## Managing your notification settings with {% data variables.product.prodname_mobile %}
 

content/actions/creating-actions/creating-a-javascript-action.md

@@ -37,10 +37,9 @@ Once you complete this project, you should understand how to build your own Java
 
 Before you begin, you'll need to download Node.js and create a public {% data variables.product.prodname_dotcom %} repository.
 
-1. Download and install Node.js {% ifversion fpt or ghes or ghae > 3.3 or ghec %}16.x{% else %}12.x{% endif %}, which includes npm.
+1. Download and install Node.js 16.x, which includes npm.
-
-  {% ifversion fpt or ghes or ghae > 3.3 or ghec %}https://nodejs.org/en/download/{% else %}https://nodejs.org/en/download/releases/{% endif %}
 
+   https://nodejs.org/en/download/
 1. Create a new public repository on {% data variables.location.product_location %} and call it "hello-world-javascript-action". For more information, see "[AUTOTITLE](/repositories/creating-and-managing-repositories/creating-a-new-repository)."
 
 1. Clone your repository to your computer. For more information, see "[AUTOTITLE](/repositories/creating-and-managing-repositories/cloning-a-repository)."
@@ -73,7 +72,7 @@ outputs:
   time: # id of output
     description: 'The time we greeted you'
 runs:
-  using: {% ifversion fpt or ghes or ghae > 3.3 or ghec %}'node16'{% else %}'node12'{% endif %}
+  using: 'node16'
   main: 'index.js'
 ```
 

content/actions/creating-actions/metadata-syntax-for-github-actions.md

@@ -148,11 +148,11 @@ For more information on how to use context syntax, see "[AUTOTITLE](/actions/lea
 
 **Required** Configures the path to the action's code and the runtime used to execute the code.
 
-### Example: Using Node.js {% ifversion fpt or ghes or ghae > 3.3 or ghec %}v16{% else %}v12{% endif %}
+### Example: Using Node.js v16
 
 ```yaml
 runs:
-  using: {% ifversion fpt or ghes or ghae > 3.3 or ghec %}'node16'{% else %}'node12'{% endif %}
+  using: 'node16'
   main: 'main.js'
 ```
 
@@ -160,8 +160,7 @@ runs:
 
 **Required** The runtime used to execute the code specified in [`main`](#runsmain).
 
-- Use `node12` for Node.js v12.{% ifversion fpt or ghes or ghae > 3.3 or ghec %}
+- Use `node16` for Node.js v16.
-- Use `node16` for Node.js v16.{% endif %}
 
 ### `runs.main`
 
@@ -175,7 +174,7 @@ In this example, the `pre:` action runs a script called `setup.js`:
 
 ```yaml
 runs:
-  using: {% ifversion fpt or ghes or ghae > 3.3 or ghec %}'node16'{% else %}'node12'{% endif %}
+  using: 'node16'
   pre: 'setup.js'
   main: 'index.js'
   post: 'cleanup.js'
@@ -202,7 +201,7 @@ In this example, the `post:` action runs a script called `cleanup.js`:
 
 ```yaml
 runs:
-  using: {% ifversion fpt or ghes or ghae > 3.3 or ghec %}'node16'{% else %}'node12'{% endif %}
+  using: 'node16'
   main: 'index.js'
   post: 'cleanup.js'
 ```
@@ -262,7 +261,6 @@ For more information, see "[AUTOTITLE](/actions/learn-github-actions/contexts#gi
 
 **Optional** The shell where you want to run the command. You can use any of the shells listed [here](/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsshell). Required if `run` is set.
 
-{% ifversion fpt or ghes or ghae > 3.3 or ghec %}
 #### `runs.steps[*].if`
 
 **Optional** You can use the `if` conditional to prevent a step from running unless a condition is met. You can use any supported context and expression to create a conditional.
@@ -291,7 +289,6 @@ steps:
     if: {% raw %}${{ failure() }}{% endraw %}
     uses: actions/heroku@1.0.0
 ```
-{% endif %}
 
 #### `runs.steps[*].name`
 

content/actions/hosting-your-own-runners/adding-self-hosted-runners.md

@@ -46,13 +46,11 @@ You can set up automation to scale the number of self-hosted runners. For more i
 
 You can add self-hosted runners to a single repository. To add a self-hosted runner to a user repository, you must be the repository owner. For an organization repository, you must be an organization owner or have admin access to the repository. For information about how to add a self-hosted runner with the REST API, see "[AUTOTITLE](/rest/actions#self-hosted-runners)."
 
-{% ifversion fpt or ghec or ghes or ghae > 3.3 %}
 {% data reusables.repositories.navigate-to-repo %}
 {% data reusables.repositories.sidebar-settings %}
 {% data reusables.repositories.settings-sidebar-actions-runners %}
 1. Click **New self-hosted runner**.
 {% data reusables.actions.self-hosted-runner-configure %}
-{% endif %}
 {% data reusables.actions.self-hosted-runner-check-installation-success %}
 
 For more information, see "[AUTOTITLE](/actions/hosting-your-own-runners/monitoring-and-troubleshooting-self-hosted-runners)."
@@ -61,13 +59,12 @@ For more information, see "[AUTOTITLE](/actions/hosting-your-own-runners/monitor
 
 You can add self-hosted runners at the organization level, where they can be used to process jobs for multiple repositories in an organization. To add a self-hosted runner to an organization, you must be an organization owner. For information about how to add a self-hosted runner with the REST API, see "[AUTOTITLE](/rest/actions#self-hosted-runners)."
 
-{% ifversion fpt or ghec or ghes or ghae > 3.3 %}
+
 {% data reusables.organizations.navigate-to-org %}
 {% data reusables.organizations.org_settings %}
 {% data reusables.organizations.settings-sidebar-actions-runners %}
 {% ifversion actions-hosted-runners %}1. Click **New runner**, then click **New self-hosted runner**.{% else %}1. Click **New runner**.{% endif %}
 {% data reusables.actions.self-hosted-runner-configure %}
-{% endif %}
 {% data reusables.actions.self-hosted-runner-check-installation-success %}
 
 For more information, see "[AUTOTITLE](/actions/hosting-your-own-runners/monitoring-and-troubleshooting-self-hosted-runners)."
@@ -81,7 +78,7 @@ For more information, see "[AUTOTITLE](/actions/hosting-your-own-runners/monitor
 {% ifversion ghec or ghes or ghae %}
 New runners are assigned to the default group. You can modify the runner's group after you've registered the runner. For more information, see "[AUTOTITLE](/actions/hosting-your-own-runners/managing-access-to-self-hosted-runners-using-groups#moving-a-self-hosted-runner-to-a-group)."
 
-{% ifversion ghec or ghes or ghae > 3.3 %}
+{% ifversion ghec or ghes or ghae %}
 
 To add a self-hosted runner to an enterprise, you must be an enterprise owner. For information about how to add a self-hosted runner with the REST API,  see the enterprise endpoints in the [{% data variables.product.prodname_actions %} REST API](/rest/actions#self-hosted-runners).
 

content/actions/hosting-your-own-runners/removing-self-hosted-runners.md

@@ -29,13 +29,11 @@ shortTitle: Remove self-hosted runners
 To remove a self-hosted runner from a user repository you must be the repository owner. For an organization repository, you must be an organization owner or have admin access to the repository. We recommend that you also have access to the self-hosted runner machine. For information about how to remove a self-hosted runner with the REST API, see "[AUTOTITLE](/rest/actions#self-hosted-runners)."
 
 {% data reusables.actions.self-hosted-runner-reusing %}
-{% ifversion fpt or ghec or ghes or ghae > 3.3 %}
 {% data reusables.repositories.navigate-to-repo %}
 {% data reusables.repositories.sidebar-settings %}
 {% data reusables.repositories.settings-sidebar-actions-runners %}
 {% data reusables.actions.settings-sidebar-actions-runner-selection %}
 {% data reusables.actions.self-hosted-runner-removing-a-runner-updated %}
-{% endif %}
 
 ## Removing a runner from an organization
 
@@ -73,7 +71,7 @@ If you use {% data variables.product.prodname_ghe_cloud %}, you can also remove
 To remove a self-hosted runner from an enterprise, you must be an enterprise owner. We recommend that you also have access to the self-hosted runner machine. For information about how to remove a self-hosted runner with the REST API, see the enterprise endpoints in the [{% data variables.product.prodname_actions %} REST API](/rest/actions#self-hosted-runners).
 
 {% data reusables.actions.self-hosted-runner-reusing %}
-{% ifversion ghec or ghes or ghae > 3.3 %}
+{% ifversion ghec or ghes or ghae %}
 {% data reusables.enterprise-accounts.access-enterprise %}
 {% data reusables.enterprise-accounts.policies-tab %}
 {% data reusables.enterprise-accounts.actions-tab %}

content/actions/hosting-your-own-runners/using-labels-with-self-hosted-runners.md

@@ -19,31 +19,25 @@ For information on how to use labels to route jobs to specific types of self-hos
 
 ## Creating a custom label
 
-{% ifversion fpt or ghec or ghes or ghae > 3.3 %}
 {% data reusables.actions.self-hosted-runner-navigate-to-repo-org-enterprise %}
  {% data reusables.actions.settings-sidebar-actions-runner-selection %}
  1. In the "Labels" section, click {% octicon "gear" aria-label="The Gear icon" %}.
  1. In the "Find or create a label" field, type the name of your new label and click **Create new label**.
  The custom label is created and assigned to the self-hosted runner. Custom labels can be removed from self-hosted runners, but they currently can't be manually deleted. {% data reusables.actions.actions-unused-labels %}
-{% endif %}
 
 ## Assigning a label to a self-hosted runner
 
-{% ifversion fpt or ghec or ghes or ghae > 3.3 %}
 {% data reusables.actions.self-hosted-runner-navigate-to-repo-org-enterprise %}
 {% data reusables.actions.settings-sidebar-actions-runner-selection %}
 {% data reusables.actions.runner-label-settings %}
   1. To assign a label to your self-hosted runner, in the "Find or create a label" field, click the label.
-{% endif %}
 
 ## Removing a custom label from a self-hosted runner
 
-{% ifversion fpt or ghec or ghes or ghae > 3.3 %}
 {% data reusables.actions.self-hosted-runner-navigate-to-repo-org-enterprise %}
 {% data reusables.actions.settings-sidebar-actions-runner-selection %}
 {% data reusables.actions.runner-label-settings %}
   1. In the "Find or create a label" field, assigned labels are marked with the {% octicon "check" aria-label="The Check icon" %} icon. Click on a marked label to unassign it from your self-hosted runner.
-{% endif %}
 
 ## Programmatically assign labels
 

content/actions/learn-github-actions/contexts.md

@@ -39,16 +39,14 @@ You can access contexts using the expression syntax. For more information, see "
 {%- ifversion actions-configuration-variables %}
 | `vars` | `object` | Contains variables set at the repository, organization, or environment levels. For more information, see [`vars` context](#vars-context). |{% endif %}
 | `job` | `object` | Information about the currently running job. For more information, see [`job` context](#job-context). |
-{%- ifversion fpt or ghes or ghae > 3.3 or ghec %}
+| `jobs` | `object` | For reusable workflows only, contains outputs of jobs from the reusable workflow. For more information, see [`jobs` context](#jobs-context). |
-| `jobs` | `object` | For reusable workflows only, contains outputs of jobs from the reusable workflow. For more information, see [`jobs` context](#jobs-context). |{% endif %}
 | `steps` | `object` | Information about the steps that have been run in the current job. For more information, see [`steps` context](#steps-context). |
 | `runner` | `object` | Information about the runner that is running the current job. For more information, see [`runner` context](#runner-context). |
 | `secrets` | `object` | Contains the names and values of secrets that are available to a workflow run. For more information, see [`secrets` context](#secrets-context). |
 | `strategy` | `object` | Information about the matrix execution strategy for the current job. For more information, see [`strategy` context](#strategy-context). |
 | `matrix` | `object` | Contains the matrix properties defined in the workflow that apply to the current job. For more information, see [`matrix` context](#matrix-context). |
 | `needs` | `object` | Contains the outputs of all jobs that are defined as a dependency of the current job. For more information, see [`needs` context](#needs-context). |
-{%- ifversion fpt or ghec or ghes or ghae > 3.3 %}
+| `inputs` | `object` | Contains the inputs of a reusable {% ifversion actions-unified-inputs %}or manually triggered {% endif %}workflow. For more information, see [`inputs` context](#inputs-context). |
-| `inputs` | `object` | Contains the inputs of a reusable {% ifversion actions-unified-inputs %}or manually triggered {% endif %}workflow. For more information, see [`inputs` context](#inputs-context). |{% endif %}
 
 As part of an expression, you can access context information using one of two syntaxes.
 
@@ -71,8 +69,6 @@ In addition, some functions may only be used in certain places. For example, the
 
 The following table indicates where each context and special function can be used within a workflow. Unless listed below, a function can be used anywhere.
 
-{% ifversion fpt or ghes or ghae > 3.3 or ghec %}
-
 | Workflow key | Context | Special functions |
 | ---- | ------- | ----------------- |
 {%- ifversion actions-run-name %}
@@ -110,38 +106,6 @@ The following table indicates where each context and special function can be use
 | <code>jobs.&lt;job_id&gt;.with.&lt;with_id&gt;</code> | <code>github, needs{% ifversion actions-reusable-workflow-matrix %}, strategy, matrix{% endif %}{% ifversion actions-unified-inputs %}, inputs{% endif %}{% ifversion actions-configuration-variables %}, vars{% endif %}</code> | |
 | <code>on.workflow_call.inputs.&lt;inputs_id&gt;.default</code> | <code>github{% ifversion actions-unified-inputs %}, inputs{% endif %}{% ifversion actions-configuration-variables %}, vars{% endif %}</code> | |
 | <code>on.workflow_call.outputs.&lt;output_id&gt;.value</code> | <code>github, jobs, {% ifversion actions-configuration-variables %}vars, {% endif %}inputs</code> | |
-{% else %}
-| Path | Context | Special functions |
-| ---- | ------- | ----------------- |
-| <code>concurrency</code> | <code>github</code> | |
-| <code>env</code> | <code>github, secrets</code> | |
-| <code>jobs.&lt;job_id&gt;.concurrency</code> | <code>github, needs, strategy, matrix</code> | |
-| <code>jobs.&lt;job_id&gt;.container</code> | <code>github, needs, strategy, matrix</code> | |
-| <code>jobs.&lt;job_id&gt;.container.credentials</code> | <code>github, needs, strategy, matrix, env, {% ifversion actions-configuration-variables %}vars, {% endif %}secrets</code> | |
-| <code>jobs.&lt;job_id&gt;.container.env.&lt;env_id&gt;</code> | <code>github, needs, strategy, matrix, job, runner, env, {% ifversion actions-configuration-variables %}vars, {% endif %}secrets</code> | |
-| <code>jobs.&lt;job_id&gt;.continue-on-error</code> | <code>github, needs, strategy, matrix</code> | |
-| <code>jobs.&lt;job_id&gt;.defaults.run</code> | <code>github, needs, strategy, matrix, env, {% ifversion actions-configuration-variables %}vars, {% endif %}</code> | |
-| <code>jobs.&lt;job_id&gt;.env</code> | <code>github, needs, strategy, matrix, secrets</code> | |
-| <code>jobs.&lt;job_id&gt;.environment</code> | <code>github, needs, strategy, matrix</code> | |
-| <code>jobs.&lt;job_id&gt;.environment.url</code> | <code>github, needs, strategy, matrix, job, runner, env, {% ifversion actions-configuration-variables %}vars, {% endif %}steps</code> | |
-| <code>jobs.&lt;job_id&gt;.if</code> | <code>github, needs</code> | <code>always, cancelled, success, failure</code> |
-| <code>jobs.&lt;job_id&gt;.name</code> | <code>github, needs, strategy, matrix</code> | |
-| <code>jobs.&lt;job_id&gt;.outputs.&lt;output_id&gt;</code> | <code>github, needs, strategy, matrix, job, runner, env, {% ifversion actions-configuration-variables %}vars, {% endif %}secrets, steps</code> | |
-| <code>jobs.&lt;job_id&gt;.runs-on</code> | <code>github, needs, strategy, matrix</code> | |
-| <code>jobs.&lt;job_id&gt;.services</code> | <code>github, needs, strategy, matrix</code> | |
-| <code>jobs.&lt;job_id&gt;.services.&lt;service_id&gt;.credentials</code> | <code>github, needs, strategy, matrix, env, {% ifversion actions-configuration-variables %}vars, {% endif %}secrets</code> | |
-| <code>jobs.&lt;job_id&gt;.services.&lt;service_id&gt;.env.&lt;env_id&gt;</code> | <code>github, needs, strategy, matrix, job, runner, env, {% ifversion actions-configuration-variables %}vars, {% endif %}secrets</code> | |
-| <code>jobs.&lt;job_id&gt;.steps.continue-on-error</code> | <code>github, needs, strategy, matrix, job, runner, env, {% ifversion actions-configuration-variables %}vars, {% endif %}secrets, steps</code> | <code>hashFiles</code> |
-| <code>jobs.&lt;job_id&gt;.steps.env</code> | <code>github, needs, strategy, matrix, job, runner, env, {% ifversion actions-configuration-variables %}vars, {% endif %}secrets, steps</code> | <code>hashFiles</code> |
-| <code>jobs.&lt;job_id&gt;.steps.if</code> | <code>github, needs, strategy, matrix, job, runner, env, {% ifversion actions-configuration-variables %}vars, {% endif %}steps</code> | <code>always, cancelled, success, failure, hashFiles</code> |
-| <code>jobs.&lt;job_id&gt;.steps.name</code> | <code>github, needs, strategy, matrix, job, runner, env, {% ifversion actions-configuration-variables %}vars, {% endif %}secrets, steps</code> | <code>hashFiles</code> |
-| <code>jobs.&lt;job_id&gt;.steps.run</code> | <code>github, needs, strategy, matrix, job, runner, env, {% ifversion actions-configuration-variables %}vars, {% endif %}secrets, steps</code> | <code>hashFiles</code> |
-| <code>jobs.&lt;job_id&gt;.steps.timeout-minutes</code> | <code>github, needs, strategy, matrix, job, runner, env, {% ifversion actions-configuration-variables %}vars, {% endif %}secrets, steps</code> | <code>hashFiles</code> |
-| <code>jobs.&lt;job_id&gt;.steps.with</code> | <code>github, needs, strategy, matrix, job, runner, env, {% ifversion actions-configuration-variables %}vars, {% endif %}secrets, steps</code> | <code>hashFiles</code> |
-| <code>jobs.&lt;job_id&gt;.steps.working-directory</code> | <code>github, needs, strategy, matrix, job, runner, env, {% ifversion actions-configuration-variables %}vars, {% endif %}secrets, steps</code> | <code>hashFiles</code> |
-| <code>jobs.&lt;job_id&gt;.strategy</code> | <code>github, needs</code> | |
-| <code>jobs.&lt;job_id&gt;.timeout-minutes</code> | <code>github, needs, strategy, matrix</code> | |
-{% endif %}
 
 ### Example: printing context information to the log
 
@@ -207,11 +171,9 @@ The `github` context contains information about the workflow run and the event t
 {%- endif %}
 | `github.path` | `string` | Path on the runner to the file that sets system `PATH` variables from workflow commands. This file is unique to the current step and is a different file for each step in a job. For more information, see "[AUTOTITLE](/actions/using-workflows/workflow-commands-for-github-actions#adding-a-system-path)." |
 | `github.ref` | `string` | {% data reusables.actions.ref-description %} |
-{%- ifversion fpt or ghec or ghes or ghae > 3.3 %}
 | `github.ref_name` | `string` | {% data reusables.actions.ref_name-description %} |
 | `github.ref_protected` | `boolean` | {% data reusables.actions.ref_protected-description %} |
 | `github.ref_type` | `string` | {% data reusables.actions.ref_type-description %} |
-{%- endif %}
 | `github.repository` | `string` | The owner and repository name. For example, `octocat/Hello-World`. |
 {%- ifversion actions-oidc-custom-claims %}
 | `github.repository_id` | `string` | {% data reusables.actions.repository_id-description %} |
@@ -227,9 +189,7 @@ The `github` context contains information about the workflow run and the event t
 {%- ifversion fpt or ghec or ghes > 3.5 or ghae > 3.4 %}
 | `github.run_attempt` | `string` | A unique number for each attempt of a particular workflow run in a repository. This number begins at 1 for the workflow run's first attempt, and increments with each re-run. |
 {%- endif %}
-{%- ifversion fpt or ghec or ghes or ghae > 3.3 %}
 | `github.secret_source` | `string` | The source of a secret used in a workflow. Possible values are `None`, `Actions`, `Dependabot`, or `Codespaces`. |
-{%- endif %}
 | `github.server_url` | `string` | The URL of the GitHub server. For example: `https://github.com`. |
 | `github.sha` | `string` | {% data reusables.actions.github_sha_description %} |
 | `github.token` | `string` | A token to authenticate on behalf of the GitHub App installed on your repository. This is functionally equivalent to the `GITHUB_TOKEN` secret. For more information, see "[AUTOTITLE](/actions/security-guides/automatic-token-authentication)."  <br /> Note: This context property is set by the Actions runner, and is only available within the execution `steps` of a job. Otherwise, the value of this property will be `null`. |{% ifversion actions-stable-actor-ids %}
@@ -455,8 +415,6 @@ jobs:
       - run: ./run-tests
 ```
 
-{% ifversion fpt or ghes or ghae > 3.3 or ghec %}
-
 ## `jobs` context
 
 The `jobs` context is only available in reusable workflows, and can only be used to set outputs for a reusable workflow. For more information, see "[AUTOTITLE](/actions/using-workflows/reusing-workflows#using-outputs-from-a-reusable-workflow)."
@@ -527,8 +485,6 @@ jobs:
 ```
 {% endraw %}
 
-{% endif %}
-
 ## `steps` context
 
 The `steps` context contains information about the steps in the current job that have an [`id`](/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsid) specified and have already run.
@@ -846,8 +802,6 @@ jobs:
       - uses: {% data reusables.actions.action-checkout %}
       - run: ./debug
 ```
-
-{% ifversion fpt or ghec or ghes or ghae > 3.3 %}
 ## `inputs` context
 
 The `inputs` context contains input properties passed to an action{% ifversion actions-unified-inputs %},{% else %} or{% endif %} to a reusable workflow{% ifversion actions-unified-inputs %}, or to a manually triggered workflow{% endif %}. {% ifversion actions-unified-inputs %}For reusable workflows, the{% else %}The{% endif %} input names and types are defined in the [`workflow_call` event configuration](/actions/using-workflows/events-that-trigger-workflows#workflow-reuse-events) of a reusable workflow, and the input values are passed from [`jobs.<job_id>.with`](/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idwith) in an external workflow that calls the reusable workflow. {% ifversion actions-unified-inputs %}For manually triggered workflows, the inputs are defined in the [`workflow_dispatch` event configuration](/actions/using-workflows/events-that-trigger-workflows#workflow_dispatch) of a workflow.{% endif %}
@@ -933,5 +887,3 @@ jobs:
 ```
 {% endraw %}
 {% endif %}
-
-{% endif %}

content/actions/learn-github-actions/expressions.md

@@ -283,14 +283,9 @@ Creates a hash for any `package-lock.json` and `Gemfile.lock` files in the repos
 
 `hashFiles('**/package-lock.json', '**/Gemfile.lock')`
 
-{% ifversion fpt or ghes or ghae > 3.3 or ghec %}
 ## Status check functions
 
 You can use the following status check functions as expressions in `if` conditionals. A default status check of `success()` is applied unless you include one of these functions. For more information about `if` conditionals, see "[AUTOTITLE](/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idif)" and "[AUTOTITLE](/actions/creating-actions/metadata-syntax-for-github-actions#runsstepsif)".
-{% else %}
-## Check Functions
-You can use the following status check functions as expressions in `if` conditionals. A default status check of `success()` is applied unless you include one of these functions. For more information about `if` conditionals, see "[AUTOTITLE](/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idif)".
-{% endif %}
 
 ### success
 

content/actions/learn-github-actions/understanding-github-actions.md

@@ -52,7 +52,7 @@ You can configure a {% data variables.product.prodname_actions %} _workflow_ to
 
 {% data reusables.actions.about-workflows-long %}
 
-{% ifversion fpt or ghes or ghae > 3.3 or ghec %}You can reference a workflow within another workflow, see "[AUTOTITLE](/actions/using-workflows/reusing-workflows)."{% endif %}
+You can reference a workflow within another workflow. For more information, see "[AUTOTITLE](/actions/using-workflows/reusing-workflows)."
 
 For more information about workflows, see "[AUTOTITLE](/actions/using-workflows)."
 

content/actions/learn-github-actions/variables.md

@@ -259,11 +259,9 @@ We strongly recommend that actions use variables to access the filesystem rather
 | `GITHUB_JOB` | The [job_id](/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_id) of the current job. For example, `greeting_job`. |
 | `GITHUB_PATH` | The path on the runner to the file that sets system `PATH` variables from workflow commands. This file is unique to the current step and changes for each step in a job.  For example, `/home/runner/work/_temp/_runner_file_commands/add_path_899b9445-ad4a-400c-aa89-249f18632cf5`. For more information, see "[AUTOTITLE](/actions/using-workflows/workflow-commands-for-github-actions#adding-a-system-path)." |
 | `GITHUB_REF` | {% data reusables.actions.ref-description %} |
-{%- ifversion fpt or ghec or ghes or ghae > 3.3 %}
 | `GITHUB_REF_NAME` | {% data reusables.actions.ref_name-description %} |
 | `GITHUB_REF_PROTECTED` | {% data reusables.actions.ref_protected-description %} |
 | `GITHUB_REF_TYPE` | {% data reusables.actions.ref_type-description %} |
-{%- endif %}
 | `GITHUB_REPOSITORY` | The owner and repository name. For example, `octocat/Hello-World`. |
 {%- ifversion actions-oidc-custom-claims %}
 | `GITHUB_REPOSITORY_ID` | {% data reusables.actions.repository_id-description %} |

content/actions/security-guides/encrypted-secrets.md

@@ -223,12 +223,8 @@ You can check which access policies are being applied to a secret in your organi
 
 * {% data reusables.actions.forked-secrets %}
 
-{% ifversion fpt or ghec or ghes or ghae > 3.3 %}
-
 * Secrets are not automatically passed to reusable workflows. For more information, see "[AUTOTITLE](/actions/using-workflows/reusing-workflows#passing-inputs-and-secrets-to-a-reusable-workflow)."
 
-{% endif %}
-
 {% endnote %}
 
 To provide an action with a secret as an input or environment variable, you can use the `secrets` context to access secrets you've created in your repository. For more information, see "[AUTOTITLE](/actions/learn-github-actions/contexts)" and "[AUTOTITLE](/actions/using-workflows/workflow-syntax-for-github-actions)."

content/actions/security-guides/security-hardening-for-github-actions.md

@@ -186,11 +186,9 @@ You can help mitigate this risk by following these good practices:
 
   Although pinning to a commit SHA is the most secure option, specifying a tag is more convenient and is widely used. If you’d like to specify a tag, then be sure that you trust the action's creators. The ‘Verified creator’ badge on {% data variables.product.prodname_marketplace %} is a useful signal, as it indicates that the action was written by a team whose identity has been verified by {% data variables.product.prodname_dotcom %}. Note that there is risk to this approach even if you trust the author, because a tag can be moved or deleted if a bad actor gains access to the repository storing the action.
 
-{% ifversion fpt or ghes or ghae > 3.3 or ghec %}
 ## Reusing third-party workflows
 
 The same principles described above for using third-party actions also apply to using third-party workflows. You can help mitigate the risks associated with reusing workflows by following the same good practices outlined above. For more information, see "[AUTOTITLE](/actions/using-workflows/reusing-workflows)."
-{% endif %}
 
 {% ifversion required-workflows %}
 

content/actions/using-workflows/about-workflows.md

@@ -193,10 +193,8 @@ To learn more about self-hosted runner labels, see "[AUTOTITLE](/actions/hosting
 To learn more about {% data variables.product.prodname_dotcom %}-hosted runner labels, see "[AUTOTITLE](/actions/using-github-hosted-runners/about-github-hosted-runners#supported-runners-and-hardware-resources)."
 {% endif %}
 
-{% ifversion fpt or ghes or ghae > 3.3 or ghec %}
 ### Reusing workflows
 {% data reusables.actions.reusable-workflows %}
-{% endif %}
 
 ### Using environments
 

content/actions/using-workflows/creating-starter-workflows-for-your-organization.md

@@ -34,13 +34,11 @@ Starter workflows can be created by users with write access to the organization'
 Starter workflows created by users can only be used to create workflows in public repositories. Organizations using {% data variables.product.prodname_ghe_cloud %} can also use starter workflows to create workflows in private repositories. For more information, see the [{% data variables.product.prodname_ghe_cloud %} documentation](/enterprise-cloud@latest/actions/using-workflows/creating-starter-workflows-for-your-organization).
 {% endif %}
 
-{% ifversion fpt or ghes or ghae > 3.3 or ghec %}
 {% note %}
 
 **Note:** To avoid duplication among starter workflows you can call reusable workflows from within a workflow. This can help make your workflows easier to maintain. For more information, see "[AUTOTITLE](/actions/using-workflows/reusing-workflows)."
 
 {% endnote %}
-{% endif %}
 
 This procedure demonstrates how to create a starter workflow and metadata file. The metadata file describes how the starter workflows will be presented to users when they are creating a new workflow.
 

content/actions/using-workflows/events-that-trigger-workflows.md

@@ -1238,8 +1238,6 @@ on:
     types: [started]
 ```
 
-{% ifversion fpt or ghes or ghae > 3.3 or ghec %}
-
 ### `workflow_call`
 
 | Webhook event payload | Activity types | `GITHUB_SHA` | `GITHUB_REF` |
@@ -1254,8 +1252,6 @@ The example below only runs the workflow when it's called from another workflow:
 on: workflow_call
 ```
 
-{% endif %}
-
 ### `workflow_dispatch`
 
 | Webhook event payload | Activity types | `GITHUB_SHA` | `GITHUB_REF` |
@@ -1274,7 +1270,6 @@ You can configure custom-defined input properties, default input values, and req
 
 {% data reusables.actions.inputs-vs-github-event-inputs %}
 
-{% ifversion fpt or ghec or ghes or ghae > 3.3 %}
 This example defines inputs called `logLevel`, `tags`, and `environment`. You pass values for these inputs to the workflow when you run it. This workflow then prints the values to the log, using the {% ifversion actions-unified-inputs %}`inputs.logLevel`, `inputs.tags`, and  `inputs.environment`{% else %}`github.event.inputs.logLevel`, `github.event.inputs.tags`, and  `github.event.inputs.environment`{% endif %} context properties.
 
 ```yaml
@@ -1325,36 +1320,6 @@ gh workflow run run-tests.yml -f logLevel=warning -f tags=false -f environment=s
 
 For more information, see the {% data variables.product.prodname_cli %} information in "[AUTOTITLE](/actions/managing-workflow-runs/manually-running-a-workflow)."
 
-{% else %}
-This example defines the `name` and `home` inputs and prints them using the {% ifversion actions-unified-inputs %}`inputs.name` and `inputs.home`{% else %}`github.event.inputs.name` and `github.event.inputs.home`{% endif %} contexts. If a `home` isn't provided, the default value 'The Octoverse' is printed.
-
-```yaml
-name: Manually triggered workflow
-on:
-  workflow_dispatch:
-    inputs:
-      name:
-        description: 'Person to greet'
-        required: true
-        default: 'Mona the Octocat'
-      home:
-        description: 'location'
-        required: false
-        default: 'The Octoverse'
-
-jobs:
-  say_hello:
-    runs-on: ubuntu-latest
-    steps:
-      - run: |
-          echo Hello $NAME!
-          echo -in $HOME
-        env:
-          NAME: {% ifversion actions-unified-inputs %}{% raw %}${{ inputs.name }}{% endraw %}{% else %}{% raw %}${{ github.event.inputs.name }}{% endraw %}{% endif %}
-          HOME: {% ifversion actions-unified-inputs %}{% raw %}${{ github.event.inputs.home }}{% endraw %}{% else %}{% raw %}${{ github.event.inputs.home }}{% endraw %}{% endif %}
-```
-{% endif %}
-
 ### `workflow_run`
 
 | Webhook event payload | Activity types | `GITHUB_SHA` | `GITHUB_REF` |

content/actions/using-workflows/sharing-workflows-secrets-and-runners-with-your-organization.md

@@ -34,11 +34,9 @@ Your organization can share workflows by reusing the workflows exactly or by cre
 {% data reusables.actions.internal-actions-summary %}
 {% endif %}
 
-{% ifversion fpt or ghes or ghae > 3.3 or ghec %}
 ### Reusing workflows
 
 {% data reusables.actions.reusable-workflows %}
-{% endif %}
 
 ### Using starter workflows
 

content/actions/using-workflows/triggering-a-workflow.md

@@ -121,15 +121,12 @@ You can use activity types and filters to further control when your workflow wil
 {% data reusables.actions.workflow-dispatch-inputs %}
 {% data reusables.actions.workflow-dispatch-inputs-example %}
 
-{% ifversion fpt or ghes or ghae > 3.3 or ghec %}
 ## Defining inputs, outputs, and secrets for reusable workflows
 
 {% data reusables.actions.reusable-workflows-enterprise-beta %}
 
 You can define inputs and secrets that a reusable workflow should receive from a calling workflow. You can also specify outputs that a reusable workflow will make available to a calling workflow. For more information, see "[AUTOTITLE](/actions/using-workflows/reusing-workflows)."
 
-{% endif %}
-
 ## Using event information
 
 Information about the event that triggered a workflow run is available in the `github.event` context. The properties in the `github.event` context depend on the type of event that triggered the workflow. For example, a workflow triggered when an issue is labeled would have information about the issue and label.

content/actions/using-workflows/workflow-syntax-for-github-actions.md

@@ -68,7 +68,6 @@ run-name: Deploy to ${{ inputs.deploy_target }} by @${{ github.actor }}
 
 {% data reusables.actions.workflows.section-triggering-a-workflow-schedule %}
 
-{% ifversion fpt or ghes or ghae > 3.3 or ghec %}
 ## `on.workflow_call`
 
 {% data reusables.actions.reusable-workflows-enterprise-beta %}
@@ -192,7 +191,6 @@ A string identifier to associate with the secret.
 #### `on.workflow_call.secrets.<secret_id>.required`
 
 A boolean specifying whether the secret must be supplied.
-{% endif %}
 
 ## `on.workflow_run.<branches|branches-ignore>`
 
@@ -214,11 +212,9 @@ A boolean specifying whether the secret must be supplied.
 
 A boolean specifying whether the input must be supplied.
 
-{% ifversion fpt or ghec or ghes > 3.3 or ghae > 3.3 %}
 #### `on.workflow_dispatch.inputs.<input_id>.type`
 
 The value of this parameter is a string specifying the data type of the input. This must be one of: `boolean`, `choice`, `environment`, or `string`.
-{% endif %}
 
 ## `permissions`
 
@@ -980,7 +976,6 @@ Additional Docker container resource options. For a list of options, see "[`dock
 
 {% endwarning %}
 
-{% ifversion fpt or ghes or ghae > 3.3 or ghec %}
 ## `jobs.<job_id>.uses`
 
 {% data reusables.actions.reusable-workflows-enterprise-beta %}
@@ -1071,8 +1066,6 @@ jobs:
 
 {% endraw %}
 
-{%endif%}
-
 ### `jobs.<job_id>.secrets.<secret_id>`
 
 A pair consisting of a string identifier for the secret and the value of the secret. The identifier must match the name of a secret defined by [`on.workflow_call.secrets.<secret_id>`](#onworkflow_callsecretssecret_id) in the called workflow.

content/admin/github-actions/getting-started-with-github-actions-for-your-enterprise/getting-started-with-self-hosted-runners-for-your-enterprise.md

@@ -99,18 +99,12 @@ You can create a runner group to manage access to the runner that you added to y
    {% endwarning %}
 {%- endif %}
 {% data reusables.actions.create-runner-group %}
-{%- ifversion ghec or ghes or ghae > 3.3 %}
 1. Click the "Runners" tab.
 1. In the list of runners, click the runner that you deployed in the previous section.
 1. Click **Edit**.
 1. Click **Runner groups {% octicon "gear" aria-label="The Gear icon" %}**.
 1. In the list of runner groups, click the name of the group that you previously created.
 1. Click **Save** to move the runner to the group.
-{%- elsif ghae %}
-1. To the right of "Default", click the number of runners in the group to show the runners.
-1. Select the runner that you deployed.
-1. To the right of "Runner groups", select the **Move to group** dropdown, and click the group that you previously created.
-{%- endif %}
 
 You've now deployed a self-hosted runner that can run jobs from {% data variables.product.prodname_actions %} within the organizations that you specified.
 

content/admin/github-actions/getting-started-with-github-actions-for-your-enterprise/introducing-github-actions-to-your-enterprise.md

@@ -65,10 +65,8 @@ Think about how your enterprise can use features of {% data variables.product.pr
 
 {% data reusables.actions.internal-actions-summary %}
 
-{% ifversion ghec or ghes or ghae > 3.3 %}
 {% data reusables.actions.reusable-workflows-enterprise-beta %}
 With reusable workflows, your team can call one workflow from another workflow, avoiding exact duplication. Reusable workflows promote best practice by helping your team use workflows that are well designed and have already been tested. For more information, see "[AUTOTITLE](/actions/using-workflows/reusing-workflows)."
-{% endif %}
 
 To provide a starting place for developers building new workflows, you can use starter workflows. This not only saves time for your developers, but promotes consistency and best practice across your enterprise. For more information, see "[AUTOTITLE](/actions/using-workflows/creating-starter-workflows-for-your-organization)."
 

content/admin/user-management/managing-users-in-your-enterprise/removing-a-member-from-your-enterprise.md

@@ -12,12 +12,14 @@ shortTitle: Remove member
 
 ## About removal of enterprise members
 
-When you remove an enterprise member from your enterprise, the member is removed from all organizations owned by your enterprise.
+If you enterprise does not use {% data variables.product.prodname_emus %}, you can remove an enterprise member from {% data variables.product.prodname_dotcom %}. When you remove a member from your enterprise, the member is removed from all organizations owned by your enterprise.
 
 If the enterprise member you're removing is the last owner of an organization owned by your enterprise, you will become an owner of that organization.
 
 If your enterprise or any of the organizations owned by your enterprise uses an identity provider (IdP) to manage organization membership, the member may be added back to the organization by the IdP. Make sure to also make any necessary changes in your IdP.
 
+If your enterprise does use {% data variables.product.prodname_emus %}, you must remove the enterprise members through your identity provider (IdP) and the SCIM integration instead. For more information, see "[AUTOTITLE](/admin/identity-and-access-management/using-enterprise-managed-users-for-iam/about-enterprise-managed-users#about-organization-membership-management)."
+
 ## Removing a member from your enterprise
 
 {% note %}

content/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/customizing-code-scanning.md

@@ -528,7 +528,7 @@ For more information about using `exclude` and `include` filters in your custom
 
 ### Specifying directories to scan
 
-For the interpreted languages that {% data variables.product.prodname_codeql %} supports (Python{% ifversion fpt or ghes or ghae > 3.3 %}, Ruby{% endif %} and JavaScript/TypeScript), you can restrict {% data variables.product.prodname_code_scanning %} to files in specific directories by adding a `paths` array to the configuration file. You can exclude the files in specific directories from analysis by adding a `paths-ignore` array.
+For the interpreted languages that {% data variables.product.prodname_codeql %} supports (Python, Ruby, and JavaScript/TypeScript), you can restrict {% data variables.product.prodname_code_scanning %} to files in specific directories by adding a `paths` array to the configuration file. You can exclude the files in specific directories from analysis by adding a `paths-ignore` array.
 
 ``` yaml{:copy}
 paths:

content/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/troubleshooting-the-codeql-workflow.md

@@ -39,8 +39,6 @@ allowTitleToDifferFromFilename: true
 
 To produce more detailed logging output, you can enable step debug logging. For more information, see "[AUTOTITLE](/actions/monitoring-and-troubleshooting-workflows/enabling-debug-logging#enabling-step-debug-logging)."
 
-{% ifversion fpt or ghec or ghes or ghae > 3.3 %}
-
 ## Creating {% data variables.product.prodname_codeql %} debugging artifacts
 
 You can obtain artifacts to help you debug {% data variables.product.prodname_codeql %}.
@@ -48,8 +46,6 @@ The debug artifacts will be uploaded to the workflow run as an artifact named `d
 
 These artifacts will help you debug problems with {% data variables.product.prodname_codeql %} {% data variables.product.prodname_code_scanning %}. If you contact GitHub support, they might ask for this data.
 
-{% endif %}
-
 {% ifversion codeql-action-debug-logging %}
 
 ### Creating {% data variables.product.prodname_codeql %} debugging artifacts by re-running jobs with debug logging enabled
@@ -60,8 +56,6 @@ You need to ensure that you select **Enable debug logging** . This option enable
 
 {% endif %}
 
-{% ifversion fpt or ghec or ghes or ghae > 3.3 %}
-
 ### Creating {% data variables.product.prodname_codeql %} debugging artifacts using a workflow flag
 
 You can create {% data variables.product.prodname_codeql %} debugging artifacts by using a flag in your workflow. For this, you need to modify the `init` step of your {% data variables.code-scanning.codeql_workflow %} file and set `debug: true`.
@@ -73,8 +67,6 @@ You can create {% data variables.product.prodname_codeql %} debugging artifacts
     debug: true
 ```
 
-{% endif %}
-
 {% ifversion code-scanning-without-workflow %}
 
 ## Results are different than expected

content/code-security/dependabot/working-with-dependabot/automating-dependabot-with-github-actions.md

@@ -32,16 +32,12 @@ redirect_from:
 
 {% data variables.product.prodname_dependabot %} is able to trigger {% data variables.product.prodname_actions %} workflows on its pull requests and comments; however, certain events are treated differently.
 
-{% ifversion fpt or ghec or ghes or ghae > 3.3 %}
 For workflows initiated by {% data variables.product.prodname_dependabot %} (`github.actor == 'dependabot[bot]'`) using the `pull_request`, `pull_request_review`, `pull_request_review_comment`, `push`, `create`, `deployment`, and `deployment_status` events, the following restrictions apply:
-{% endif %}
 
 - `GITHUB_TOKEN` has read-only permissions by default.
 - Secrets are populated from {% data variables.product.prodname_dependabot %} secrets. {% data variables.product.prodname_actions %} secrets are not available.
 
-{% ifversion fpt or ghec or ghes or ghae > 3.3 %}
 For workflows initiated by {% data variables.product.prodname_dependabot %} (`github.actor == 'dependabot[bot]'`) using the `pull_request_target` event, if the base ref of the pull request was created by {% data variables.product.prodname_dependabot %} (`github.actor == 'dependabot[bot]'`), the `GITHUB_TOKEN` will be read-only and secrets are not available.
-{% endif %}
 
 {% ifversion actions-stable-actor-ids %}These restrictions apply even if the workflow is re-run by a different actor.{% endif %}
 

content/code-security/getting-started/securing-your-repository.md

@@ -32,8 +32,8 @@ The first step to securing a repository is to establish who can see and modify y
 
 From the main page of your repository, click **{% octicon "gear" aria-label="The Settings gear" %} Settings**, then scroll down to the "Danger Zone."
 
-- To change who can view your repository, click **Change visibility**. For more information, see "[AUTOTITLE](/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/setting-repository-visibility)."{% ifversion fpt or ghec or ghes or ghae > 3.3 %}
+- To change who can view your repository, click **Change visibility**. For more information, see "[AUTOTITLE](/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/setting-repository-visibility)."
-- To change who can access your repository and adjust permissions, click **Manage access**. For more information, see"[AUTOTITLE](/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/managing-teams-and-people-with-access-to-your-repository)."{% endif %}
+- To change who can access your repository and adjust permissions, click **Manage access**. For more information, see"[AUTOTITLE](/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/managing-teams-and-people-with-access-to-your-repository)."
 
 ## Managing the dependency graph
 

content/code-security/supply-chain-security/understanding-your-software-supply-chain/about-the-dependency-graph.md

@@ -94,9 +94,7 @@ The recommended formats explicitly define which versions are used for all direct
 {%- ifversion dependency-graph-dart-support %}
 | pub             | Dart                    | `pubspec.lock` | `pubspec.yaml`, `pubspec.lock` |
 {%- endif %}
-{%- ifversion fpt or ghec or ghes or ghae > 3.3 %}
 | Python Poetry | Python                    | `poetry.lock` | `poetry.lock`, `pyproject.toml` |
-{%- endif %}
 | RubyGems             | Ruby           | `Gemfile.lock` | `Gemfile.lock`, `Gemfile`, `*.gemspec` |
 | Yarn | JavaScript | `yarn.lock` | `package.json`, `yarn.lock` |
 

content/get-started/onboarding/getting-started-with-github-enterprise-cloud.md

@@ -46,7 +46,8 @@ Organizations are shared accounts where groups of people can collaborate across
 
 To use an organization account with {% data variables.product.prodname_ghe_cloud %}, you will first need to create an organization. When prompted to choose a plan, select "Enterprise". For more information, see "[AUTOTITLE](/organizations/collaborating-with-groups-in-organizations/creating-a-new-organization-from-scratch)."
 
-Alternatively, if you have an existing organization account that you would like to upgrade, follow the steps in "[AUTOTITLE](/billing/managing-billing-for-your-github-account/upgrading-your-github-subscription#upgrading-your-organizations-subscription)."
+Alternatively, if you have an existing organization account and would like to upgrade to {% data variables.product.prodname_ghe_cloud %} for additional security, compliance, and deployment controls, follow the steps in "[AUTOTITLE](/billing/managing-billing-for-your-github-account/upgrading-your-github-subscription#upgrading-your-organizations-subscription)."
+
 #### 3. Setting up and managing billing
 
 When you choose to use an organization account with {% data variables.product.prodname_ghe_cloud %}, you'll first have access to a [30-day trial](/get-started/signing-up-for-github/setting-up-a-trial-of-github-enterprise-cloud). If you don't purchase {% data variables.product.prodname_enterprise %} or {% data variables.product.prodname_team %} before your trial ends, your organization will be downgraded to {% data variables.product.prodname_free_user %} and lose access to any advanced tooling and features that are only included with paid products. For more information, see "[AUTOTITLE](/get-started/signing-up-for-github/setting-up-a-trial-of-github-enterprise-cloud#finishing-your-trial)."

content/get-started/using-github/keyboard-shortcuts.md

@@ -91,8 +91,8 @@ For more keyboard shortcuts, see the [CodeMirror documentation](https://codemirr
 |-----------|------------
 |<kbd>Command</kbd>+<kbd>B</kbd> (Mac) or </br> <kbd>Ctrl</kbd>+<kbd>B</kbd> (Windows/Linux) | Inserts Markdown formatting for bolding text
 |<kbd>Command</kbd>+<kbd>I</kbd> (Mac) or </br> <kbd>Ctrl</kbd>+<kbd>I</kbd> (Windows/Linux) | Inserts Markdown formatting for italicizing text
-|<kbd>Command</kbd>+<kbd>E</kbd> (Mac) or </br> <kbd>Ctrl</kbd>+<kbd>E</kbd> (Windows/Linux) | Inserts Markdown formatting for code or a command within a line{% ifversion fpt or ghae > 3.3 or ghes or ghec %}
+|<kbd>Command</kbd>+<kbd>E</kbd> (Mac) or </br> <kbd>Ctrl</kbd>+<kbd>E</kbd> (Windows/Linux) | Inserts Markdown formatting for code or a command within a line
-|<kbd>Command</kbd>+<kbd>K</kbd> (Mac) or </br> <kbd>Ctrl</kbd>+<kbd>K</kbd> (Windows/Linux) | Inserts Markdown formatting for creating a link{% endif %}{% ifversion fpt or ghae > 3.5 or ghes > 3.5 or ghec %}
+|<kbd>Command</kbd>+<kbd>K</kbd> (Mac) or </br> <kbd>Ctrl</kbd>+<kbd>K</kbd> (Windows/Linux) | Inserts Markdown formatting for creating a link{% ifversion fpt or ghae > 3.5 or ghes > 3.5 or ghec %}
 |<kbd>Command</kbd>+<kbd>V</kbd> (Mac) or </br> <kbd>Ctrl</kbd>+<kbd>V</kbd> (Windows/Linux) | Creates a Markdown link when applied over highlighted text{% endif %}
 |<kbd>Command</kbd>+<kbd>Shift</kbd>+<kbd>P</kbd> (Mac) or </br> <kbd>Ctrl</kbd>+<kbd>Shift</kbd>+<kbd>P</kbd> (Windows/Linux) | Toggles between the **Write** and **Preview** comment tabs
 |<kbd>Command</kbd>+<kbd>Shift</kbd>+<kbd>V</kbd> (Mac) or </br> <kbd>Ctrl</kbd>+<kbd>Shift</kbd>+<kbd>V</kbd> (Windows/Linux) | Pastes HTML link as plain text

content/get-started/writing-on-github/getting-started-with-writing-and-formatting-on-github/basic-writing-and-formatting-syntax.md

@@ -116,7 +116,7 @@ Here are the currently supported color models.
 
 ## Links
 
-You can create an inline link by wrapping link text in brackets `[ ]`, and then wrapping the URL in parentheses `( )`. You can also use the keyboard shortcut <kbd>Command</kbd>+<kbd>K</kbd> to create a link.{% ifversion fpt or ghae > 3.3 or ghes or ghec %} When you have text selected, you can paste a URL from your clipboard to automatically create a link from the selection.{% endif %}
+You can create an inline link by wrapping link text in brackets `[ ]`, and then wrapping the URL in parentheses `( )`. You can also use the keyboard shortcut <kbd>Command</kbd>+<kbd>K</kbd> to create a link. When you have text selected, you can paste a URL from your clipboard to automatically create a link from the selection.
 
 {% ifversion fpt or ghae > 3.5 or ghes > 3.5 or ghec %} You can also create a Markdown hyperlink by highlighting the text and using the keyboard shortcut <kbd>Command</kbd>+<kbd>V</kbd>. If you'd like to replace the text with the link, use the keyboard shortcut <kbd>Command</kbd>+<kbd>Shift</kbd>+<kbd>V</kbd>.{% endif %}
 
@@ -172,7 +172,6 @@ Here are some examples for using relative links to display an image.
 
 For more information, see "[Relative Links](#relative-links)."
 
-{% ifversion fpt or ghec or ghes or ghae > 3.3 %}
 ### Specifying the theme an image is shown to
 
 You can specify the theme an image is displayed for in Markdown by using the HTML `<picture>` element in combination with the `prefers-color-scheme` media feature. We distinguish between light and dark color modes, so there are two options available. You can use these options to display images optimized for dark or light backgrounds. This is particularly helpful for transparent PNG images.
@@ -182,7 +181,6 @@ For example, the following code displays a sun image for light themes and a moon
 {% data reusables.getting-started.picture-element-example %}
 
 The old method of specifying images based on the theme, by using a fragment appended to the URL (`#gh-dark-mode-only` or `#gh-light-mode-only`), is deprecated and will be removed in favor of the new method described above.
-{% endif %}
 
 ## Lists
 

content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/reviewing-the-audit-log-for-your-organization.md

@@ -903,7 +903,6 @@ For more information, see "[AUTOTITLE](/organizations/managing-organization-sett
 {% data reusables.actions.actions-audit-events-workflow %}
 ## Further reading
 
-- "[AUTOTITLE](/organizations/keeping-your-organization-secure)"{% ifversion fpt or ghec or ghes or ghae > 3.3 %}
+- "[AUTOTITLE](/organizations/keeping-your-organization-secure)"
 {%- ifversion fpt or ghec %}
 - "[AUTOTITLE](/organizations/managing-membership-in-your-organization/exporting-member-information-for-your-organization)"{% endif %}
-{%- endif %}

content/organizations/managing-peoples-access-to-your-organization-with-roles/managing-security-managers-in-your-organization.md

@@ -28,7 +28,7 @@ Members of a team with the security manager role have only the permissions requi
 Additional functionality, including a security overview for the organization, is available in organizations that use {% data variables.product.prodname_ghe_cloud %} with {% data variables.product.prodname_advanced_security %}. For more information, see the [{% data variables.product.prodname_ghe_cloud %} documentation](/enterprise-cloud@latest/organizations/managing-peoples-access-to-your-organization-with-roles/managing-security-managers-in-your-organization).
 {% endif %}
 
-If a team has the security manager role, people with admin access to the team and a specific repository can change the team's level of access to that repository but cannot remove the access. For more information, see "[AUTOTITLE](/organizations/managing-user-access-to-your-organizations-repositories/managing-team-access-to-an-organization-repository){% ifversion fpt or ghec or ghes or ghae > 3.3 %}" and "[AUTOTITLE](/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/managing-teams-and-people-with-access-to-your-repository)."{% else %}."{% endif %}
+If a team has the security manager role, people with admin access to the team and a specific repository can change the team's level of access to that repository but cannot remove the access. For more information, see "[AUTOTITLE](/organizations/managing-user-access-to-your-organizations-repositories/managing-team-access-to-an-organization-repository)" and "[AUTOTITLE](/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/managing-teams-and-people-with-access-to-your-repository)."
 
   ![Manage repository access UI with security managers](/assets/images/help/organizations/repo-access-security-managers.png)
 

content/organizations/managing-user-access-to-your-organizations-repositories/adding-outside-collaborators-to-repositories-in-your-organization.md

@@ -39,15 +39,4 @@ If your organization requires two-factor authentication, all outside collaborato
 
 ## Adding outside collaborators to a repository
 
-{% ifversion fpt or ghec or ghes or ghae > 3.3 %}
 You can give outside collaborators access to a repository in your repository settings. For more information, see "[AUTOTITLE](/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/managing-teams-and-people-with-access-to-your-repository#inviting-a-team-or-person)."
-{% else %}
-{% data reusables.repositories.navigate-to-repo %}
-{% data reusables.repositories.sidebar-settings %}
-5. In the left sidebar, click **Collaborators & teams**.
-  ![Repository settings sidebar with Collaborators & teams highlighted](/assets/images/help/repository/org-repo-settings-collaborators-and-teams.png)
-6. Under "Collaborators", type the name of the person you'd like to give access to the repository, then click **Add collaborator**.
-![The Collaborators section with the Octocat's username entered in the search field](/assets/images/help/repository/org-repo-collaborators-find-name.png)
-7. Next to the new collaborator's name, use the drop-down menu and select the appropriate access level.
-![The repository permissions picker](/assets/images/help/repository/org-repo-collaborators-choose-permissions.png)
-{% endif %}

content/organizations/managing-user-access-to-your-organizations-repositories/managing-an-individuals-access-to-an-organization-repository.md

@@ -25,34 +25,9 @@ When you remove a collaborator from a repository in your organization, the colla
 
 {% data reusables.repositories.deleted_forks_from_private_repositories_warning %}
 
-{% ifversion fpt or ghec or ghes or ghae > 3.3 %}
 ## Managing an individual's access to an organization repository
 You can give a person access to a repository or change a person's level of access to a repository in your repository settings. For more information, see "[AUTOTITLE](/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/managing-teams-and-people-with-access-to-your-repository)."
-{% else %}
-## Giving a person access to a repository
 
-{% data reusables.repositories.navigate-to-repo %}
-{% data reusables.repositories.sidebar-settings %}
-{% data reusables.repositories.navigate-to-manage-access %}
-{% data reusables.organizations.invite-teams-or-people %}
-1. In the search field, start typing the name of the person to invite, then click a name in the list of matches.
-  ![Search field for typing the name of a team or person to invite to the repository](/assets/images/help/repository/manage-access-invite-search-field.png)
-6. Under "Choose a role", select the repository role to assign the person, then click **Add NAME to REPOSITORY**.
-  ![Selecting permissions for the team or person](/assets/images/help/repository/manage-access-invite-choose-role-add.png)
-
-## Managing an individual's access to an organization repository
-
-{% data reusables.profile.access_org %}
-{% data reusables.user-settings.access_org %}
-{% data reusables.organizations.people %}
-4. Click either **Members** or **Outside collaborators** to manage people with different types of access. ![Button to invite members or outside collaborators to an organization](/assets/images/help/organizations/select-outside-collaborators.png)
-5. To the right of the name of the person you'd like to manage, use the {% octicon "gear" aria-label="The Settings gear" %} drop-down menu, and click **Manage**.
-  ![The manage access link](/assets/images/help/organizations/member-manage-access.png)
-6. On the "Manage access" page, next to the repository, click **Manage access**.
-![Manage access button for a repository](/assets/images/help/organizations/repository-manage-access.png)
-7. Review the person's access to a given repository, such as whether they're a collaborator or have access to the repository via team membership.
-![Repository access matrix for the user](/assets/images/help/organizations/repository-access-matrix-for-user.png)
-{% endif %}
 ## Further reading
 
 {% ifversion fpt or ghec %}- "[AUTOTITLE](/communities/moderating-comments-and-conversations/limiting-interactions-in-your-repository)"{% endif %}

content/organizations/managing-user-access-to-your-organizations-repositories/managing-team-access-to-an-organization-repository.md

@@ -29,46 +29,16 @@ People with admin access to a repository can manage team access to the repositor
 
 ## Giving a team access to a repository
 
-{% ifversion fpt or ghec or ghes or ghae > 3.3 %}
 You can give a team access to a repository or change a team's level of access to a repository in your repository settings. For more information, see "[AUTOTITLE](/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/managing-teams-and-people-with-access-to-your-repository#inviting-a-team-or-person)."
-{% else %}
+
-{% data reusables.profile.access_org %}
-{% data reusables.user-settings.access_org %}
-{% data reusables.organizations.specific_team %}
-{% data reusables.organizations.team-repositories-tab %}
-5. Above the list of repositories, click **Add repository**.
-  ![The Add repository button](/assets/images/help/organizations/add-repositories-button.png)
-6. Type the name of a repository, then click **Add repository to team**.
-  ![Repository search field](/assets/images/help/organizations/team-repositories-add.png)
-7. Optionally, to the right of the repository name, use the drop-down menu and choose a different permission level for the team.
-  ![Repository access level dropdown](/assets/images/help/organizations/team-repositories-change-permission-level.png)
-{% endif %}
 ## Removing a team's access to a repository
 
-{% ifversion fpt or ghec or ghes or ghae > 3.3 %}
 You can remove a team's access to an organization repository in your repository settings. For more information, see "[AUTOTITLE](/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/managing-teams-and-people-with-access-to-your-repository#removing-access-for-a-team-or-person)."
 
 If a team has direct access to a repository, you can remove that team's access to the repository. If a team's access to the repository is inherited from a parent team, you must remove the repository from the parent team in order to remove the repository from child teams.
 
 {% data reusables.repositories.deleted_forks_from_private_repositories_warning %}
 
-{% else %}
-
-You can remove a team's access to a repository if the team has direct access to a repository. If a team's access to the repository is inherited from a parent team, you must remove the repository from the parent team in order to remove the repository from child teams.
-
-{% data reusables.repositories.deleted_forks_from_private_repositories_warning %}
-
-{% data reusables.profile.access_org %}
-{% data reusables.user-settings.access_org %}
-{% data reusables.organizations.specific_team %}
-{% data reusables.organizations.team-repositories-tab %}
-5. Select the repository or repositories you'd like to remove from the team.
-  ![List of team repositories with the checkboxes for some repositories selected](/assets/images/help/teams/select-team-repositories-bulk.png)
-6. Above the list of repositories, use the drop-down menu, and click **Remove from team**.
-  ![Drop-down menu with the option to remove a repository from a team](/assets/images/help/teams/remove-team-repo-dropdown.png)
-7. Review the repository or repositories that will be removed from the team, then click **Remove repositories**.
-  ![Modal box with a list of repositories that the team will no longer have access to](/assets/images/help/teams/confirm-remove-team-repos.png)
-{% endif %}
 ## Further reading
 
 - "[AUTOTITLE](/organizations/managing-user-access-to-your-organizations-repositories/repository-roles-for-an-organization)"

content/organizations/managing-user-access-to-your-organizations-repositories/removing-an-outside-collaborator-from-an-organization-repository.md

@@ -61,9 +61,8 @@ If you only want to remove an outside collaborator from certain repositories in
 8. To confirm, click **Remove access**.
 ![Confirm outside collaborator who will be removed from the repository](/assets/images/help/teams/confirm-remove-outside-collaborator-from-a-repository.png)
 
-{% ifversion fpt or ghec or ghes or ghae > 3.3 %}
 You can also remove an outside collaborator from a repository in the access overview in your repository settings. For more information, see "[AUTOTITLE](/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/managing-teams-and-people-with-access-to-your-repository#removing-access-for-a-team-or-person)."
-{% endif %}
+
 ## Further reading
 
 - "[AUTOTITLE](/organizations/managing-user-access-to-your-organizations-repositories/adding-outside-collaborators-to-repositories-in-your-organization)"

content/organizations/managing-user-access-to-your-organizations-repositories/viewing-people-with-access-to-your-repository.md

@@ -25,11 +25,8 @@ You can use this information to help off-board people, gather data for complianc
 Organizations that use {% data variables.product.prodname_ghe_cloud %} can also export a CSV list of people who have access to a repository. For more information, see [the {% data variables.product.prodname_ghe_cloud %} documentation](/enterprise-cloud@latest/organizations/managing-user-access-to-your-organizations-repositories/viewing-people-with-access-to-your-repository).
 {% endif %}
 
-{% ifversion fpt or ghec or ghes or ghae > 3.3 %}
 ![Access management overview](/assets/images/help/repository/manage-access-overview.png)
-{% else %}
+
-![Repository people permissions list](/assets/images/help/repository/repository-permissions-list.png)
-{% endif %}
 ## Viewing people with access to your repository
 
 You can see a combined overview of teams and people with access to your repository in your repository settings. For more information, see "[AUTOTITLE](/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/managing-teams-and-people-with-access-to-your-repository#about-access-management-for-repositories)."

content/organizations/organizing-members-into-teams/managing-code-review-settings-for-your-team.md

@@ -83,12 +83,9 @@ Any team members that have set their status to "Busy" will not be selected for r
 ![Routing algorithm dropdown](/assets/images/help/teams/review-assignment-algorithm.png)
 1. Optionally, to always skip certain members of the team, select **Never assign certain team members**. Then, select one or more team members you'd like to always skip.
 ![Never assign certain team members checkbox and dropdown](/assets/images/help/teams/review-assignment-skip-members.png)
-
-{% ifversion fpt or ghec or ghes or ghae > 3.3 %}
 1. Optionally, to include members of child teams as potential reviewers when assigning requests, select **Child team members**.
 1. Optionally, to count any members whose review has already been requested against the total number of members to assign, select **Count existing requests**.
 1. Optionally, to remove the review request from the team when assigning team members, select **Team review request**.
-{%- endif %}
 1. Click **Save changes**.
 
 ## Disabling auto assignment

content/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/about-protected-branches.md

@@ -99,7 +99,7 @@ Before you can enable required status checks, you must configure the repository
 
 After enabling required status checks, all required status checks must pass before collaborators can merge changes into the protected branch. After all required status checks pass, any commits must either be pushed to another branch and then merged or pushed directly to the protected branch.
 
-Any person or integration with write permissions to a repository can set the state of any status check in the repository{% ifversion fpt or ghes or ghae > 3.3 or ghec %}, but in some cases you may only want to accept a status check from a specific {% data variables.product.prodname_github_app %}. When you add a required status check, you can select an app that has recently set this check as the expected source of status updates.{% endif %} If the status is set by any other person or integration, merging won't be allowed. If you select "any source", you can still manually verify the author of each status, listed in the merge box.
+Any person or integration with write permissions to a repository can set the state of any status check in the repository, but in some cases you may only want to accept a status check from a specific {% data variables.product.prodname_github_app %}. When you add a required status check, you can select an app that has recently set this check as the expected source of status updates. If the status is set by any other person or integration, merging won't be allowed. If you select "any source", you can still manually verify the author of each status, listed in the merge box.
 
 You can set up required status checks to either be "loose" or "strict." The type of required status check you choose determines whether your branch is required to be up to date with the base branch before merging.
 
@@ -191,7 +191,6 @@ You can only give push access to a protected branch, or give permission to creat
 
 ### Allow force pushes
 
-{% ifversion fpt or ghec or ghes or ghae > 3.3 %}
 By default, {% data variables.product.product_name %} blocks force pushes on all protected branches. When you enable force pushes to a protected branch, you can choose one of two groups who can force push:
 
 1. Allow everyone with at least write permissions to the repository to force push to the branch, including those with admin permissions.
@@ -199,10 +198,6 @@ By default, {% data variables.product.product_name %} blocks force pushes on all
 
 If someone force pushes to a branch, the force push may overwrite commits that other collaborators based their work on. People may have merge conflicts or corrupted pull requests.
 
-{% else %}
-By default, {% data variables.product.product_name %} blocks force pushes on all protected branches. When you enable force pushes to a protected branch, anyone with at least write permissions to the repository can force push to the branch, including those with admin permissions. If someone force pushes to a branch, the force push may overwrite commits that other collaborators based their work on. People may have merge conflicts or corrupted pull requests.
-{% endif %}
-
 Enabling force pushes will not override any other branch protection rules. For example, if a branch requires a linear commit history, you cannot force push merge commits to that branch.
 
 {% ifversion ghes or ghae %}You cannot enable force pushes for a protected branch if a site administrator has blocked force pushes to all branches in your repository. For more information, see "[AUTOTITLE](/admin/policies/enforcing-policies-for-your-enterprise/enforcing-repository-management-policies-in-your-enterprise)."

content/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/managing-a-branch-protection-rule.md

@@ -50,27 +50,17 @@ When you create a branch rule, the branch you specify doesn't have to exist yet
 {% data reusables.repositories.sidebar-settings %}
 {% data reusables.repositories.repository-branches %}
 {% data reusables.repositories.add-branch-protection-rules %}
-{% ifversion fpt or ghec or ghes or ghae > 3.3 %}
 1. Optionally, enable required pull requests.
    - Under "Protect matching branches", select **Require a pull request before merging**.
      ![Pull request review restriction checkbox](/assets/images/help/repository/PR-reviews-required-updated.png)
    - Optionally, to require approvals before a pull request can be merged, select **Require approvals**, click the **Required number of approvals before merging** drop-down menu, then select the number of approving reviews you would like to require on the branch.
      ![Drop-down menu to select number of required review approvals](/assets/images/help/repository/number-of-required-review-approvals-updated.png)
-{% else %}
-1. Optionally, enable required pull request reviews.
-   - Under "Protect matching branches", select **Require pull request reviews before merging**.
-     ![Pull request review restriction checkbox](/assets/images/help/repository/PR-reviews-required.png)
-   - Click the **Required approving reviews** drop-down menu, then select the number of approving reviews you would like to require on the branch. 
-     ![Drop-down menu to select number of required review approvals](/assets/images/help/repository/number-of-required-review-approvals.png)
-{% endif %}
    - Optionally, to dismiss a pull request approval review when a code-modifying commit is pushed to the branch, select **Dismiss stale pull request approvals when new commits are pushed**.
      ![Dismiss stale pull request approvals when new commits are pushed checkbox](/assets/images/help/repository/PR-reviews-required-dismiss-stale.png)
    - Optionally, to require review from a code owner when the pull request affects code that has a designated owner, select **Require review from Code Owners**. For more information, see "[AUTOTITLE](/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners)."
      ![Require review from code owners](/assets/images/help/repository/PR-review-required-code-owner.png)
-{% ifversion fpt or ghec or ghes or ghae > 3.3 %}
    - Optionally, to allow specific actors to push code to the branch without creating pull requests when they're required, select **Allow specified actors to bypass required pull requests**. Then, search for and select the actors who should be allowed to skip creating a pull request.
      ![Allow specific actors to bypass pull request requirements checkbox]{% ifversion integration-branch-protection-exceptions %}(/assets/images/help/repository/PR-bypass-requirements-with-apps.png){% else %}(/assets/images/help/repository/PR-bypass-requirements.png){% endif %}
-{% endif %}
    - Optionally, if the repository is part of an organization, select **Restrict who can dismiss pull request reviews**. Then, search for and select the actors who are allowed to dismiss pull request reviews. For more information, see "[AUTOTITLE](/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/dismissing-a-pull-request-review)."
      ![Restrict who can dismiss pull request reviews checkbox]{% ifversion integration-branch-protection-exceptions %}(/assets/images/help/repository/PR-review-required-dismissals-with-apps.png){% else %}(/assets/images/help/repository/PR-review-required-dismissals.png){% endif %}
 {% ifversion last-pusher-require-approval %}
@@ -121,12 +111,10 @@ When you create a branch rule, the branch you specify doesn't have to exist yet
      ![Branch restriction search]{% ifversion restrict-pushes-create-branch %}(/assets/images/help/repository/restrict-branch-search-with-create.png){% else %}(/assets/images/help/repository/restrict-branch-search.png){% endif %}
 1. Optionally, under "Rules applied to everyone including administrators", select **Allow force pushes**.
   ![Allow force pushes option](/assets/images/help/repository/allow-force-pushes.png)
-{% ifversion fpt or ghec or ghes or ghae > 3.3 %}
   Then, choose who can force push to the branch.
     - Select **Everyone** to allow everyone with at least write permissions to the repository to force push to the branch, including those with admin permissions.
     - Select **Specify who can force push** to allow only specific actors to force push to the branch. Then, search for and select those actors.
       ![Screenshot of the options to specify who can force push]{% ifversion integration-branch-protection-exceptions %}(/assets/images/help/repository/allow-force-pushes-specify-who-with-apps.png){% else %}(/assets/images/help/repository/allow-force-pushes-specify-who.png){% endif %}
-{% endif %}
 
     For more information about force pushes, see "[AUTOTITLE](/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/about-protected-branches#allow-force-pushes)."
 1. Optionally, select **Allow deletions**.

content/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/troubleshooting-required-status-checks.md

@@ -111,7 +111,6 @@ Now the checks will always pass whenever someone sends a pull request that doesn
 
 {% endnote %}
 
-{% ifversion fpt or ghes or ghae > 3.3 or ghec %}
 ## Required status checks from unexpected sources
 
 It's also possible for a protected branch to require a status check from a specific {% data variables.product.prodname_github_app %}. If you see a message similar to the following, then you should verify that the check listed in the merge box was set by the expected app.
@@ -119,4 +118,3 @@ It's also possible for a protected branch to require a status check from a speci
 ```
 Required status check "build" was not set by the expected {% data variables.product.prodname_github_app %}.
 ```
-{% endif %}

content/repositories/managing-your-repositorys-settings-and-features/enabling-features-for-your-repository/managing-github-actions-settings-for-a-repository.md

@@ -138,7 +138,7 @@ By default, when you create a new repository in your personal account, workflows
 1. Click **Save** to apply the settings.
 {% endif %}
 
-{% ifversion ghes or ghae > 3.3 or ghec %}
+{% ifversion ghes or ghae or ghec %}
 ## Allowing access to components in an internal repository
 
 {% ifversion internal-actions %}Actions and reusable workflows in your internal repositories can be shared with internal and private repositories in the same organization or enterprise.{% else %}Members of your enterprise can use internal repositories to work on projects without sharing information publicly.{% endif %} For information about internal repositories, see "[AUTOTITLE](/repositories/creating-and-managing-repositories/about-repositories#about-internal-repositories)."

content/repositories/releasing-projects-on-github/about-releases.md

@@ -27,9 +27,7 @@ You can receive notifications when new releases are published in a repository wi
 
 Anyone with read access to a repository can view and compare releases, but only people with write permissions to a repository can manage releases. For more information, see "[AUTOTITLE](/repositories/releasing-projects-on-github/managing-releases-in-a-repository)."
 
-{% ifversion fpt or ghec or ghes or ghae > 3.3 %}
 You can manually create release notes while managing a release. Alternatively, you can automatically generate release notes from a default template, or customize your own release notes template. For more information, see "[AUTOTITLE](/repositories/releasing-projects-on-github/automatically-generated-release-notes)."
-{% endif %}
 
 {% ifversion fpt or ghec or ghes > 3.5 or ghae > 3.6 %}
 When viewing the details for a release, the creation date for each release asset is shown next to the release asset.

content/repositories/releasing-projects-on-github/comparing-releases.md

@@ -15,6 +15,7 @@ redirect_from:
 ---
 {% data reusables.repositories.navigate-to-repo %}
 {% data reusables.repositories.releases %}
+
 1. Next to the release you want to use as your base, select the **Compare** dropdown menu, then click the tag you want to compare.
 
    ![Screenshot of a release in the releases list. A dropdown menu, labeled "Compare, is highlighted with an orange outline.](/assets/images/help/releases/refreshed-compare-tags.png)

content/repositories/releasing-projects-on-github/linking-to-releases.md

@@ -24,4 +24,4 @@ To link directly to a download of your latest release asset that was manually up
 
 {% data reusables.repositories.navigate-to-repo %}
 {% data reusables.repositories.releases %}
-3. To copy a unique URL to your clipboard, find the release you want to link to, right click the title, and copy the URL.
+1. To copy a unique URL to your clipboard, find the release you want to link to, right click the title, and copy the URL.

content/repositories/releasing-projects-on-github/managing-releases-in-a-repository.md

@@ -40,9 +40,7 @@ You can choose whether {% data variables.large_files.product_name_long %} ({% da
 {% data reusables.releases.previous-release-tag %}
 {% data reusables.releases.release-title %}
 1. In the "Describe this release" field, type a description for your release.
-   {%- ifversion fpt or ghec or ghes or ghae > 3.3 %}
    If you @mention anyone in the description, the published release will include a **Contributors** section with an avatar list of all the mentioned users.
-   {%- endif %}
    {% ifversion fpt or ghec or ghes %} Alternatively, you can automatically generate your release notes by clicking {% ifversion previous-release-tag %}**Generate release notes**{% else %}**Auto-generate release notes**{% endif %}.{% endif %}
 {% data reusables.releases.finish-release %}
 
@@ -63,9 +61,8 @@ You can choose whether {% data variables.large_files.product_name_long %} ({% da
    ```shell
    gh release create v1.3.2 --title "v1.3.2 (beta)" --notes "this is a beta release" --prerelease
    ```
-{% ifversion fpt or ghes or ghae > 3.3 or ghec %}
+
 If you @mention any {% data variables.product.product_name %} users in the notes, the published release on {% data variables.product.prodname_dotcom_the_website %} will include a **Contributors** section with an avatar list of all the mentioned users.
-{% endif %}
 
 {% endcli %}
 
@@ -76,11 +73,7 @@ If you @mention any {% data variables.product.product_name %} users in the notes
 {% data reusables.repositories.navigate-to-repo %}
 {% data reusables.repositories.releases %}
 {% data reusables.releases.edit-release %}
-4. Edit the details for the release in the form, then click **Update release**.
+4. Edit the details for the release in the form, then click **Update release**. If you add or remove any @mentions of GitHub users in the description, those users will be added or removed from the avatar list in the **Contributors** section of the release.
-
-   {%- ifversion fpt or ghec or ghes or ghae > 3.3 %}
-   If you add or remove any @mentions of GitHub users in the description, those users will be added or removed from the avatar list in the **Contributors** section of the release.
-   {%- endif %}
 
 {% endwebui %}
 
@@ -96,14 +89,9 @@ Releases cannot currently be edited with {% data variables.product.prodname_cli
 
 {% data reusables.repositories.navigate-to-repo %}
 {% data reusables.repositories.releases %}
-{% ifversion fpt or ghec or ghes > 3.4 or ghae > 3.3 %}
 3. On the right side of the page, next to the release you want to delete, click {% octicon "trash" aria-label="Delete" %}.
 
    ![Screenshot of a release in the releases list. A trash icon is highlighted with an orange outline.](/assets/images/help/releases/delete-release-trash.png)
-{% else %}
-3. Click the name of the release you wish to delete.
-4. In the upper-right corner of the page, click **Delete**.
-{% endif %}
 5. Click **Delete this release**.
 
 {% endwebui %}

data/reusables/actions/changing-the-access-policy-of-a-runner-group.md

@@ -11,14 +11,11 @@ For runner groups in an enterprise, you can change what organizations in the ent
 
 ### Changing what organizations or repositories can access a runner group
 
-{% ifversion fpt or ghec or ghes or ghae > 3.3 %}
 {% data reusables.actions.runner-groups-navigate-to-repo-org-enterprise %}
 {% data reusables.actions.settings-sidebar-actions-runner-groups-selection %}
 1. For runner groups in an enterprise, under **Organization access**, modify what organizations can access the runner group. For runner groups in an organization, under **Repository access**, modify what repositories can access the runner group.
 
-{% elsif ghae < 3.4 %}
 {% data reusables.actions.configure-runner-group-access %}
-{% endif %}
 
 {% ifversion restrict-groups-to-workflows %}
 ### Changing what workflows can access a runner group

data/reusables/actions/changing-the-name-of-a-runner-group.md

@@ -1,9 +1,5 @@
-{% ifversion fpt or ghec or ghes or ghae > 3.3 %}
 {% data reusables.actions.runner-groups-navigate-to-repo-org-enterprise %}
 {% data reusables.actions.settings-sidebar-actions-runner-groups-selection %}
 1. Change the runner group name.
-
-{% elsif ghae < 3.4 %}
 {% data reusables.actions.configure-runner-group %}
 1. Change the runner group name.
-{% endif %}

data/reusables/actions/create-runner-group.md

@@ -1 +1 @@
-1. Click **{% ifversion ghec or ghes or ghae > 3.3 %}Create{%- elsif ghae < 3.4 %}Save{% endif %} group** to create the group and apply the policy.
+1. Click **Create group** to create the group and apply the policy.

data/reusables/actions/creating-a-runner-group-for-an-organization.md

@@ -13,7 +13,7 @@ Runners are automatically assigned to the default group when created, and can on
 
 When creating a group, you must choose a policy that defines which repositories{% ifversion restrict-groups-to-workflows %} and workflows{% endif %} have access to the runner group.
 
-{% ifversion ghec or ghes or ghae > 3.3 %}
+{% ifversion ghec or ghes or ghae %}
 {% data reusables.organizations.navigate-to-org %}
 {% data reusables.organizations.org_settings %}
 {% data reusables.organizations.settings-sidebar-actions-runner-groups %}

data/reusables/actions/moving-a-runner-to-a-group.md

@@ -1,15 +1,6 @@
 If you don't specify a runner group during the registration process, your new runners are automatically assigned to the default group, and can then be moved to another group.
 
 {% data reusables.actions.self-hosted-runner-navigate-to-org-enterprise %}
-{% ifversion ghec or ghes or ghae > 3.3 %}
 1. In the "Runners" list, click the runner that you want to configure.
 2. Select the **Runner group** drop-down.
 3. In "Move runner to group", choose a destination group for the runner.
-{% elsif ghae < 3.4 %}
-1. In the {% ifversion ghes or ghae %}"Runner groups"{% endif %} section of the settings page, locate the current group of the runner you want to move and expand the list of group members.
-    ![View runner group members](/assets/images/help/settings/actions-org-runner-group-members.png)
-2. Select the checkbox next to the self-hosted runner, and then click **Move to group** to see the available destinations.
-    ![Runner group member move](/assets/images/help/settings/actions-org-runner-group-member-move.png)
-3. To move the runner, click on the destination group.
-    ![Runner group member move](/assets/images/help/settings/actions-org-runner-group-member-move-destination.png)
-{% endif %}

data/reusables/actions/reusable-workflow-artifacts.md

@@ -1,3 +1 @@
-{% ifversion fpt or ghes or ghae > 3.3 or ghec %}
 All actions and workflows called within a run have write access to that run's artifacts.
-{% endif %}

data/reusables/actions/reusable-workflows.md

@@ -1,4 +1 @@
-{% ifversion fpt or ghes or ghae > 3.3 or ghec %}
-
 {% ifversion ghes or ghec or ghae %}You can share workflows with your organization, publicly or privately, by calling{% else %} You can call{% endif %} one workflow from within another workflow. This allows you to reuse workflows, avoiding duplication and making your workflows easier to maintain. For more information, see "[AUTOTITLE](/actions/using-workflows/reusing-workflows)."
-{% endif %}

data/reusables/actions/runner-groups-add-to-enterprise-first-steps.md

@@ -1,11 +1,6 @@
 {% data reusables.enterprise-accounts.access-enterprise %}
 {% data reusables.enterprise-accounts.policies-tab %}
 {% data reusables.enterprise-accounts.actions-tab %}
-{%- ifversion ghec or ghes or ghae > 3.3 %}
 {% data reusables.enterprise-accounts.actions-runner-groups-tab %}
 1. Click **New runner group**.
-{%- elsif ghae %}
-{% data reusables.enterprise-accounts.actions-runners-tab %}
-1. Use the **Add new** drop-down, and select **New group**.
-{%- endif %}
 1. Under "Group name", type a name for your runner group.

data/reusables/actions/self-hosted-runner-add-to-enterprise.md

@@ -1,16 +1,6 @@
-{%- ifversion ghec or ghes or ghae > 3.3 %}
 {% data reusables.enterprise-accounts.access-enterprise %}
 {% data reusables.enterprise-accounts.policies-tab %}
 {% data reusables.enterprise-accounts.actions-tab %}
 {% data reusables.enterprise-accounts.actions-runners-tab %}
 {% ifversion actions-hosted-runners %}1. Click **New runner**, then click **New self-hosted runner**.{% else %}1. Click **New runner**.{% endif %}
 {% data reusables.actions.self-hosted-runner-configure %}
-{%- elsif ghae %}
-To add a self-hosted runner to an enterprise, you must be an enterprise owner.
-{% data reusables.enterprise-accounts.access-enterprise %}
-{% data reusables.enterprise-accounts.policies-tab %}
-{% data reusables.enterprise-accounts.actions-tab %}
-{% data reusables.enterprise-accounts.actions-runners-tab %}
-1. Click **Add new**, then click **New runner**.
-{% data reusables.actions.self-hosted-runner-configure %}
-{%- endif %}

data/reusables/actions/settings-ui/settings-actions-runner-groups.md

@@ -1,5 +1,5 @@
 {% comment %}This reusable is only to be used in other repo/org/enterprise setting reusables.{%- endcomment -%}
-1. In the left sidebar, click {% ifversion fpt or ghec or ghes > 3.4 or ghae > 3.4 %}{% octicon "play" aria-label="The {% data variables.product.prodname_actions %} icon" %} **Actions**, then click **Runner groups**.{% else %}**Actions**.{% ifversion ghes or ghae > 3.3 %}
+1. In the left sidebar, click {% ifversion fpt or ghec or ghes > 3.4 or ghae > 3.4 %}{% octicon "play" aria-label="The {% data variables.product.prodname_actions %} icon" %} **Actions**, then click **Runner groups**.{% else %}**Actions**.{% ifversion ghes or ghae %}
 1. In the left sidebar, under "Actions", click **Runner groups**.
 {%- elsif ghes or ghae %}
 1. In the left sidebar, under "Actions", click **Runners**.{% endif %}{% endif %}

data/reusables/actions/workflow-dispatch-inputs-example.md

@@ -5,24 +5,24 @@ on:
       logLevel:
         description: 'Log level'
         required: true
-        default: 'warning' {% ifversion fpt or ghec or ghes > 3.3 or ghae > 3.3 %}
+        default: 'warning'
         type: choice
         options:
           - info
           - warning
-          - debug {% endif %}
+          - debug
       print_tags:
         description: 'True to print to STDOUT'
-        required: true {% ifversion fpt or ghec or ghes > 3.3 or ghae > 3.3 %}
+        required: true
-        type: boolean {% endif %}
+        type: boolean
       tags:
         description: 'Test scenario tags'
-        required: true {% ifversion fpt or ghec or ghes > 3.3 or ghae > 3.3 %}
+        required: true
         type: string
       environment:
         description: 'Environment to run tests against'
         type: environment
-        required: true {% endif %}
+        required: true
 
 jobs:
   print-tag:

data/reusables/actions/workflow-dispatch-inputs.md

@@ -9,24 +9,24 @@ on:
       logLevel:
         description: 'Log level'
         required: true
-        default: 'warning' {% ifversion fpt or ghec or ghes or ghae > 3.3 %}
+        default: 'warning'
         type: choice
         options:
         - info
         - warning
-        - debug {% endif %}
+        - debug
       print_tags:
         description: 'True to print to STDOUT'
-        required: true {% ifversion fpt or ghec or ghes or ghae > 3.3 %}
+        required: true
-        type: boolean {% endif %}
+        type: boolean
       tags:
         description: 'Test scenario tags'
-        required: true {% ifversion fpt or ghec or ghes or ghae > 3.3 %}
+        required: true
         type: string
       environment:
         description: 'Environment to run tests against'
         type: environment
-        required: true {% endif %}
+        required: true
 
 jobs:
   print-tag:

data/reusables/code-scanning/codeql-languages-bullets.md

@@ -4,8 +4,8 @@
 - Go
 - Java{% ifversion codeql-kotlin-beta %}/Kotlin{% endif %}
 - JavaScript/TypeScript
-- Python{% ifversion fpt or ghes or ghec or ghae > 3.3 %}
+- Python
-- Ruby{% endif %}
+- Ruby
 
 {% note %}
 

data/reusables/code-scanning/codeql-languages-keywords.md

@@ -1 +1 @@
-`cpp`, `csharp`, `go`, `java`, `javascript`,{% ifversion fpt or ghes or ghae > 3.3 %} `python`, and `ruby`{% else %} and `python`{% endif %}
+`cpp`, `csharp`, `go`, `java`, `javascript`, `python`, and `ruby`

data/reusables/secret-scanning/partner-secret-list-private-repo.md

@@ -6,20 +6,17 @@ Adobe | Adobe Service Token | adobe_service_token
 Adobe | Adobe Short-Lived Access Token | adobe_short_lived_access_token
 Adobe | Adobe JSON Web Token | adobe_jwt
 Alibaba Cloud | Alibaba Cloud Access Key ID with Alibaba Cloud Access Key Secret| alibaba_cloud_access_key_id </br>alibaba_cloud_access_key_secret
-{%- ifversion fpt or ghec or ghes or ghae > 3.3 %}
+Amazon | Amazon OAuth Client ID with Amazon OAuth Client Secret | amazon_oauth_client_id </br>amazon_oauth_client_secret
-Amazon | Amazon OAuth Client ID with Amazon OAuth Client Secret | amazon_oauth_client_id </br>amazon_oauth_client_secret{% endif %}
 Amazon Web Services (AWS) | Amazon AWS Access Key ID with Amazon AWS Secret Access Key | aws_access_key_id </br>aws_secret_access_key
 Amazon Web Services (AWS) | Amazon AWS Session Token with Amazon AWS Temporary Access Key ID and Amazon AWS Secret Access Key | aws_session_token </br>aws_temporary_access_key_id </br>aws_secret_access_key
 Asana | Asana {% data variables.product.pat_generic_title_case %} | asana_personal_access_token
 Atlassian | Atlassian API Token | atlassian_api_token
 Atlassian | Atlassian JSON Web Token | atlassian_jwt
 Atlassian | Bitbucket Server {% data variables.product.pat_generic_title_case %} | bitbucket_server_personal_access_token
-{%- ifversion fpt or ghec or ghes or ghae > 3.3 %}
+Azure | Azure Active Directory Application Secret | azure_active_directory_application_secret
-Azure | Azure Active Directory Application Secret | azure_active_directory_application_secret{% endif %}
 {%- ifversion fpt or ghec or ghes > 3.8 or ghae > 3.8 %}
 Azure | Azure Batch Key Identifiable | azure_batch_key_identifiable{% endif %}
-{%- ifversion fpt or ghec or ghes or ghae > 3.3 %}
+Azure | Azure Cache for Redis Access Key | azure_cache_for_redis_access_key
-Azure | Azure Cache for Redis Access Key | azure_cache_for_redis_access_key{% endif %}
 {%- ifversion fpt or ghec or ghes > 3.8 or ghae > 3.8 %}
 Azure | Azure CosmosDB Key Identifiable | azure_cosmosdb_key_identifiable{% endif %}
 Azure | Azure DevOps {% data variables.product.pat_generic_title_case %} | azure_devops_personal_access_token
@@ -84,8 +81,7 @@ GitHub | GitHub OAuth Access Token | github_oauth_access_token
 GitHub | GitHub Refresh Token | github_refresh_token
 GitHub | GitHub App Installation Access Token | github_app_installation_access_token
 GitHub | GitHub SSH Private Key | github_ssh_private_key
-{%- ifversion fpt or ghec or ghes or ghae > 3.3 %}
+GitLab | GitLab Access Token | gitlab_access_token
-GitLab | GitLab Access Token | gitlab_access_token{% endif %}
 GoCardless | GoCardless Live Access Token | gocardless_live_access_token
 GoCardless | GoCardless Sandbox Access Token | gocardless_sandbox_access_token
 Google | Firebase Cloud Messaging Server Key | firebase_cloud_messaging_server_key
@@ -94,12 +90,9 @@ Google | Google API Key | google_api_key
 Google | Google Cloud Private Key ID | google_cloud_private_key_id{% endif %}
 Google | Google Cloud Storage Service Account Access Key ID with Google Cloud Storage Access Key Secret | google_cloud_storage_service_account_access_key_id </br>google_cloud_storage_access_key_secret
 Google | Google Cloud Storage User Access Key ID with Google Cloud Storage Access Key Secret | google_cloud_storage_user_access_key_id </br>google_cloud_storage_access_key_secret
-{%- ifversion fpt or ghec or ghes or ghae > 3.3 %}
+Google | Google OAuth Access Token | google_oauth_access_token
-Google | Google OAuth Access Token | google_oauth_access_token{% endif %}
+Google | Google OAuth Client ID with Google OAuth Client Secret | google_oauth_client_id </br>google_oauth_client_secret
-{%- ifversion fpt or ghec or ghes or ghae > 3.3 %}
+Google | Google OAuth Refresh Token | google_oauth_refresh_token
-Google | Google OAuth Client ID with Google OAuth Client Secret | google_oauth_client_id </br>google_oauth_client_secret{% endif %}
-{%- ifversion fpt or ghec or ghes or ghae > 3.3 %}
-Google | Google OAuth Refresh Token | google_oauth_refresh_token{% endif %}
 Grafana | Grafana API Key | grafana_api_key
 {%- ifversion fpt or ghec or ghes > 3.7 or ghae > 3.7 %}
 Grafana | Grafana Cloud API Key | grafana_cloud_api_key
@@ -136,28 +129,22 @@ LogicMonitor | LogicMonitor Bearer Token | logicmonitor_bearer_token
 LogicMonitor | LogicMonitor LMV1 Access Key | logicmonitor_lmv1_access_key{% endif %}
 Mailchimp | Mailchimp API Key | mailchimp_api_key
 Mailgun | Mailgun API Key | mailgun_api_key
-{%- ifversion fpt or ghec or ghes or ghae > 3.3 %}
+Mapbox | Mapbox Secret Access Token | mapbox_secret_access_token
-Mapbox | Mapbox Secret Access Token | mapbox_secret_access_token{% endif %}
 MessageBird | MessageBird API Key | messagebird_api_key
 Meta | Facebook Access Token | facebook_access_token
-{%- ifversion fpt or ghec or ghes or ghae > 3.3 %}
+Midtrans | Midtrans Production Server Key | midtrans_production_server_key
-Midtrans | Midtrans Production Server Key | midtrans_production_server_key{% endif %}
+Midtrans | Midtrans Sandbox Server Key | midtrans_sandbox_server_key
-{%- ifversion fpt or ghec or ghes or ghae > 3.3 %}
-Midtrans | Midtrans Sandbox Server Key | midtrans_sandbox_server_key{% endif %}
 New Relic | New Relic Personal API Key | new_relic_personal_api_key
 New Relic | New Relic REST API Key | new_relic_rest_api_key
 New Relic | New Relic Insights Query Key | new_relic_insights_query_key
 New Relic | New Relic License Key | new_relic_license_key
-{%- ifversion fpt or ghec or ghes or ghae > 3.3 %}
+Notion | Notion Integration Token | notion_integration_token
-Notion | Notion Integration Token | notion_integration_token{% endif %}
+Notion | Notion OAuth Client Secret | notion_oauth_client_secret
-{%- ifversion fpt or ghec or ghes or ghae > 3.3 %}
-Notion | Notion OAuth Client Secret | notion_oauth_client_secret{% endif %}
 npm | npm Access Token | npm_access_token
 NuGet | NuGet API Key | nuget_api_key
 {%- ifversion fpt or ghec or ghes > 3.9 or ghae > 3.9 %}
 Oculus | Oculus Very Tiny Encrypted Session | oculus_very_tiny_encrypted_session{% endif %}
-{%- ifversion fpt or ghec or ghes or ghae > 3.3 %}
+Octopus Deploy | Octopus Deploy API Key | octopus_deploy_api_key
-Octopus Deploy | Octopus Deploy API Key | octopus_deploy_api_key{% endif %}
 Onfido | Onfido Live API Token | onfido_live_api_token
 Onfido | Onfido Sandbox API Token | onfido_sandbox_api_token
 OpenAI | OpenAI API Key | openai_api_key
@@ -209,12 +196,9 @@ Shopify | Shopify Private App Password | shopify_private_app_password
 Slack | Slack API Token | slack_api_token
 Slack | Slack Incoming Webhook URL | slack_incoming_webhook_url
 Slack | Slack Workflow Webhook URL | slack_workflow_webhook_url
-{%- ifversion fpt or ghec or ghes or ghae > 3.3 %}
+Square | Square Access Token | square_access_token
-Square | Square Access Token | square_access_token{% endif %}
+Square | Square Production Application Secret | square_production_application_secret
-{%- ifversion fpt or ghec or ghes or ghae > 3.3 %}
+Square | Square Sandbox Application Secret | square_sandbox_application_secret
-Square | Square Production Application Secret | square_production_application_secret{% endif %}
-{%- ifversion fpt or ghec or ghes or ghae > 3.3 %}
-Square | Square Sandbox Application Secret | square_sandbox_application_secret{% endif %}
 SSLMate | SSLMate API Key | sslmate_api_key
 SSLMate | SSLMate Cluster Secret | sslmate_cluster_secret
 Stripe | Stripe API Key | stripe_api_key
@@ -223,8 +207,7 @@ Stripe | Stripe Test API Secret Key | stripe_test_secret_key
 Stripe | Stripe Live API Restricted Key | stripe_live_restricted_key
 Stripe | Stripe Test API Restricted Key | stripe_test_restricted_key
 Stripe | Stripe Webhook Signing Secret | stripe_webhook_signing_secret
-{%- ifversion fpt or ghec or ghes or ghae > 3.3 %}
+Supabase | Supabase Service Key | supabase_service_key
-Supabase | Supabase Service Key | supabase_service_key{% endif %}
 Tableau | Tableau {% data variables.product.pat_generic_title_case %} | tableau_personal_access_token
 Telegram | Telegram Bot Token | telegram_bot_token
 {%- ifversion fpt or ghec or ghes > 3.7 or ghae > 3.7 %}
@@ -232,12 +215,10 @@ Telnyx | Telnyx API V2 Key | telnyx_api_v2_key{% endif %}
 Tencent Cloud | Tencent Cloud Secret ID | tencent_cloud_secret_id
 {%- ifversion fpt or ghec or ghes > 3.7 or ghae > 3.7 %}
 Tencent WeChat | Tencent WeChat API App ID | tencent_wechat_api_app_id{% endif %}
-{%- ifversion fpt or ghec or ghes or ghae > 3.3 %}
+Twilio | Twilio Access Token | twilio_access_token
-Twilio | Twilio Access Token | twilio_access_token{% endif %}
 Twilio | Twilio Account String Identifier | twilio_account_sid
 Twilio | Twilio API Key | twilio_api_key
-{%- ifversion fpt or ghec or ghes or ghae > 3.3 %}
+Typeform | Typeform {% data variables.product.pat_generic_title_case %} | typeform_personal_access_token
-Typeform | Typeform {% data variables.product.pat_generic_title_case %} | typeform_personal_access_token{% endif %}
 {%- ifversion fpt or ghec or ghes > 3.6 or ghae > 3.6 %}
 Uniwise | WISEflow API Key | wiseflow_api_key{% endif %}
 {%- ifversion fpt or ghec or ghes > 3.9 or ghae > 3.9 %}
@@ -248,19 +229,13 @@ WakaTime | WakaTime OAuth Refresh Token | wakatime_oauth_refresh_token{% endif %
 WorkOS | WorkOS Production API Key | workos_production_api_key{% endif %}
 {%- ifversion fpt or ghec or ghes > 3.4 or ghae > 3.4 %}
 WorkOS | WorkOS Staging API Key | workos_staging_api_key{% endif %}
-{%- ifversion fpt or ghec or ghes or ghae > 3.3 %}
+Yandex | Yandex.Cloud API Key | yandex_cloud_api_key
-Yandex | Yandex.Cloud API Key | yandex_cloud_api_key{% endif %}
+Yandex | Yandex.Cloud IAM Cookie | yandex_cloud_iam_cookie
-{%- ifversion fpt or ghec or ghes or ghae > 3.3 %}
+Yandex | Yandex.Cloud IAM Token | yandex_cloud_iam_token
-Yandex | Yandex.Cloud IAM Cookie | yandex_cloud_iam_cookie{% endif %}
+Yandex | Yandex.Dictionary API Key | yandex_dictionary_api_key
-{%- ifversion fpt or ghec or ghes or ghae > 3.3 %}
-Yandex | Yandex.Cloud IAM Token | yandex_cloud_iam_token{% endif %}
-{%- ifversion fpt or ghec or ghes or ghae > 3.3 %}
-Yandex | Yandex.Dictionary API Key | yandex_dictionary_api_key{% endif %}
 {%- ifversion fpt or ghec or ghes > 3.4 or ghae > 3.4 %}
 Yandex | Yandex.Cloud Access Secret | yandex_iam_access_secret{% endif %}
-{%- ifversion fpt or ghec or ghes or ghae > 3.3 %}
+Yandex | Yandex.Predictor API Key | yandex_predictor_api_key
-Yandex | Yandex.Predictor API Key | yandex_predictor_api_key{% endif %}
+Yandex | Yandex.Translate API Key | yandex_translate_api_key
-{%- ifversion fpt or ghec or ghes or ghae > 3.3 %}
-Yandex | Yandex.Translate API Key | yandex_translate_api_key{% endif %}
 {%- ifversion fpt or ghec or ghes > 3.6 or ghae > 3.6 %}
 Zuplo | Zuplo Consumer API Key | zuplo_consumer_api_key{% endif %}