Merge branch 'main' into patch-1

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

@@ -811,7 +811,7 @@ The `inputs` context contains input properties passed to an action{% ifversion a
 
 There are no standard properties in the `inputs` context, only those which are defined in the workflow file.
 
-{% data reusables.actions.reusable-workflows-ghes-beta %}
+{% data reusables.actions.reusable-workflows-enterprise-beta %}
 
 | Property name | Type | Description |
 |---------------|------|-------------|

content/actions/learn-github-actions/usage-limits-billing-and-administration.md

@@ -88,7 +88,7 @@ In addition to the usage limits, you must ensure that you use {% data variables.
 {% ifversion fpt or ghes > 3.3 or ghec %}
 ## Billing for reusable workflows
 
-{% data reusables.actions.reusable-workflows-ghes-beta %}
+{% data reusables.actions.reusable-workflows-enterprise-beta %}
 
 If you reuse a workflow, billing is always associated with the caller workflow. Assignment of {% data variables.product.prodname_dotcom %}-hosted runners is always evaluated using only the caller's context. The caller cannot use {% data variables.product.prodname_dotcom %}-hosted runners from the called repository. 
 

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

@@ -16,7 +16,7 @@ topics:
 ---
 
 {% data reusables.actions.enterprise-beta %}
-{% data reusables.actions.reusable-workflows-ghes-beta %}
+{% data reusables.actions.reusable-workflows-enterprise-beta %}
 {% data reusables.actions.enterprise-github-hosted-runners %}
 
 ## Overview

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

@@ -123,7 +123,7 @@ You can use activity types and filters to further control when your workflow wil
 {% ifversion fpt or ghes > 3.3 or ghae > 3.3 or ghec %}
 ## Defining inputs, outputs, and secrets for reusable workflows
 
-{% data reusables.actions.reusable-workflows-ghes-beta %}
+{% 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 "[Reusing workflows](/actions/using-workflows/reusing-workflows)."
 

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

@@ -72,7 +72,7 @@ run-name: Deploy to ${{ inputs.deploy_target }} by @${{ github.actor }}
 {% ifversion fpt or ghes > 3.3 or ghae > 3.3 or ghec %}
 ## `on.workflow_call`
 
-{% data reusables.actions.reusable-workflows-ghes-beta %}
+{% data reusables.actions.reusable-workflows-enterprise-beta %}
 
 Use `on.workflow_call` to define the inputs and outputs for a reusable workflow. You can also map the secrets that are available to the called workflow. For more information on reusable workflows, see "[Reusing workflows](/actions/using-workflows/reusing-workflows)."
 
@@ -945,7 +945,7 @@ Additional Docker container resource options. For a list of options, see "[`dock
 {% ifversion fpt or ghes > 3.3 or ghae > 3.3 or ghec %}
 ## `jobs.<job_id>.uses`
 
-{% data reusables.actions.reusable-workflows-ghes-beta %}
+{% data reusables.actions.reusable-workflows-enterprise-beta %}
 
 The location and version of a reusable workflow file to run as a job. {% ifversion fpt or ghec or ghes > 3.4 or ghae > 3.4 %}Use one of the following syntaxes:{% endif %}
 

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

@@ -72,7 +72,7 @@ Think about how your enterprise can use features of {% data variables.product.pr
 {% data reusables.actions.internal-actions-summary %}
 
 {% ifversion ghec or ghes > 3.3 or ghae > 3.3 %}
-{% data reusables.actions.reusable-workflows-ghes-beta %}
+{% 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 "[Reusing workflows](/actions/learn-github-actions/reusing-workflows)."
 {% endif %}
 

data/release-notes/github-ae/3-4/0.yml

@@ -20,6 +20,8 @@ sections:
       notes:
         - |
           Users can reuse a workflow with a single line of configuration. Reusable workflows save time and maintenance by removing the need to copy and paste workflow definitions across repositories. Reusable workflows are in beta and subject to change. For more information, see "[Reusing workflows](/actions/using-workflows/reusing-workflows)."
+          
+          - **Note**: This feature is currently unavailable, but will be available in a future update. [Updated: 2022-12-05]
         - |
           The updated management experience for self-hosted runners simplifies management of runner groups and provides an improved overview of your runners. For more information, see "[About self-hosted runners](/actions/hosting-your-own-runners/about-self-hosted-runners)" and "[Managing access to self-hosted runners using groups](/actions/hosting-your-own-runners/managing-access-to-self-hosted-runners-using-groups)."
         - |

data/reusables/actions/reusable-workflows-enterprise-beta.md

@@ -0,0 +1,17 @@
+{% ifversion ghes = 3.4 %}
+
+{% note %}
+
+**Note**: Reusable workflows are currently in beta and subject to change.
+
+{% endnote %}
+
+{% elsif ghae > 3.3 %}
+
+{% note %}
+
+**Note**: Reusable workflows are currently unavailable in {% data variables.product.product_name %}, but will be available in a future update.
+
+{% endnote %}
+
+{% endif %}

data/reusables/actions/reusable-workflows-ghes-beta.md

@@ -1,9 +0,0 @@
-{% ifversion ghes = 3.4 %}
-
-{% note %}
-
-**Note**: Reusable workflows are currently in beta and subject to change.
-
-{% endnote %}
-
-{% endif %}