Merge branch 'main' into patch-1

Author: ethanpalm

content/actions/learn-github-actions/finding-and-customizing-actions.md

@@ -114,6 +114,12 @@ outputs:
     description: "Path to results file"
 ```
 
+{% if currentVersion == "github-ae@latest" %}
+### Using the actions included with {% data variables.product.prodname_ghe_managed %}
+
+By default, you can use most of the official {% data variables.product.prodname_dotcom %}-authored actions in {% data variables.product.prodname_ghe_managed %}. For more information, see "[Using actions in {% data variables.product.prodname_ghe_managed %}](/admin/github-actions/using-actions-in-github-ae)."
+{% endif %}
+
 ### Referencing an action in the same repository where a workflow file uses the action
 
 If an action is defined in the same repository where your workflow file uses the action, you can reference the action with either the ‌`{owner}/{repo}@{ref}` or `./path/to/dir` syntax in your workflow file.

content/actions/using-github-hosted-runners/about-ae-hosted-runners.md

@@ -29,6 +29,10 @@ To add {% data variables.actions.hosted_runner %}s to your organization or enter
 
 Your {% data variables.actions.hosted_runner %}s are allocated to the same pool as your {% data variables.product.prodname_ghe_managed %} instance. No other customers have access to this pool, and as a result, {% data variables.actions.hosted_runner %}s are not shared with any other customers.
 
+### Managing your {% data variables.actions.hosted_runner %}s
+
+During the {% data variables.actions.hosted_runner %} beta, you can manage your {% data variables.actions.hosted_runner %}s by contacting {% data variables.product.prodname_dotcom %} support. For example, {% data variables.product.prodname_dotcom %} support can assist you with adding a new {% data variables.actions.hosted_runner %}, assigning labels, or moving a {% data variables.actions.hosted_runner %} to a different group.
+
 ### Billing
 
 {% data variables.product.prodname_actions %} is currently in beta for {% data variables.product.prodname_ghe_managed %}. During this beta period, {% data variables.actions.hosted_runner %}s are not billed, and can be used for free.

content/admin/github-actions/index.md

@@ -16,6 +16,7 @@ versions:
 
 {% topic_link_in_list /using-github-actions-in-github-ae %}
   {% link_in_list /getting-started-with-github-actions-for-github-ae %}
+  {% link_in_list /using-actions-in-github-ae %}
 
 {% topic_link_in_list /enabling-github-actions-for-github-enterprise-server %}
   {% link_in_list /getting-started-with-github-actions-for-github-enterprise-server %}

content/admin/github-actions/using-actions-in-github-ae.md

@@ -0,0 +1,20 @@
+---
+title: Using actions in GitHub AE
+intro: '{% data variables.product.prodname_ghe_managed %} includes most of the {% data variables.product.prodname_dotcom %}-authored actions.'
+versions:
+  github-ae: '*'
+---
+
+{% data reusables.actions.ae-beta %}
+
+{% data variables.product.prodname_actions %} workflows can use _actions_, which are individual tasks that you can combine to create jobs and customize your workflow. You can create your own actions, or use and customize actions shared by the {% data variables.product.prodname_dotcom %} community.
+
+### Official actions bundled with {% data variables.product.prodname_ghe_managed %}
+
+Most official {% data variables.product.prodname_dotcom %}-authored actions are automatically bundled with {% data variables.product.prodname_ghe_managed %}, and are captured at a point in time from {% data variables.product.prodname_marketplace %}. When your {% data variables.product.prodname_ghe_managed %} instance is updated, the bundled official actions are also updated.
+
+The bundled official actions include `actions/checkout`, `actions/upload-artifact`, `actions/download-artifact`, `actions/labeler`, and various `actions/setup-` actions, among others. To see which of the official actions are included, browse to the following organizations on your instance: 
+- <code>https://<em>HOSTNAME</em>/actions</code>
+- <code>https://<em>HOSTNAME</em>/github</code>
+
+Each action's files are kept in a repository in the `actions` and `github` organizations. Each action repository includes the necessary tags, branches, and commit SHAs that your workflows can use to reference the action.

content/developers/apps/authenticating-with-github-apps.md

@@ -77,8 +77,8 @@ private_key = OpenSSL::PKey::RSA.new(private_pem)
 
 # Generate the JWT
 payload = {
-  # issued at time
-  iat: Time.now.to_i,
+  # issued at time, 60 seconds in the past to allow for clock drift
+  iat: Time.now.to_i - 60,
   # JWT expiration time (10 minute maximum)
   exp: Time.now.to_i + (10 * 60),
   # {% data variables.product.prodname_github_app %}'s identifier

content/developers/apps/setting-up-your-development-environment-to-create-a-github-app.md

@@ -151,7 +151,7 @@ You need to add these variables to the `.env` file:
 Here is an example `.env` file:
 
 ```
-PRIVATE_KEY="-----BEGIN RSA PRIVATE KEY-----
+GITHUB_PRIVATE_KEY="-----BEGIN RSA PRIVATE KEY-----
 ...
 HkVN9...
 ...
@@ -402,7 +402,7 @@ Here are a few common problems and some suggested solutions. If you run into any
     **A:** You probably haven't set up your private key environment variable quite right. Your `GITHUB_PRIVATE_KEY` variable should look like this:
 
     ```
-    PRIVATE_KEY="-----BEGIN RSA PRIVATE KEY-----
+    GITHUB_PRIVATE_KEY="-----BEGIN RSA PRIVATE KEY-----
     ...
     HkVN9...
     ...

content/developers/webhooks-and-events/webhook-events-and-payloads.md

@@ -1335,9 +1335,8 @@ When a {% data variables.product.prodname_actions %} workflow run is requested o
 
 #### Webhook payload object
 
-Key | Type | Description
-----|------|-------------
-`action` | `string` | Most webhook payloads contain an `action` property that contains the specific activity that triggered the event.
+{% data reusables.webhooks.workflow_run_properties %}
+{% data reusables.webhooks.workflow_desc %}
 {% data reusables.webhooks.org_desc %}
 {% data reusables.webhooks.repo_desc %}
 {% data reusables.webhooks.sender_desc %}

content/github/administering-a-repository/viewing-branches-in-your-repository.md

@@ -16,6 +16,8 @@ versions:
     - **Stale branches**: The **Stale** view shows all branches that no one has committed to in the last three months, ordered by the branches with the oldest commits first. Use this list to determine [which branches to delete](/articles/creating-and-deleting-branches-within-your-repository).
     - **All branches**: The **All** view shows the default branch, followed by all other branches ordered by the branches with the most recent commits first.
 
+4. Optionally, use the search field on the top right. It provides a simple, case-insensitive, sub-string search on the branch name. It does not support any additional query syntax.
+
 ![The branches page for the Atom repository](/assets/images/help/branches/branches-overview-atom.png)
 
 ### Further reading

content/github/setting-up-and-managing-organizations-and-teams/permission-levels-for-an-organization.md

@@ -131,7 +131,7 @@ When you designate a user as a {% data variables.product.prodname_github_app %}
 
 ### Outside collaborators
 
-To keep your organization data secure while allowing access to repositories, you can add *outside collaborators*. {% data reusables.organizations.outside_collaborators_description %}
+To keep your organization's data secure while allowing access to repositories, you can add *outside collaborators*. {% data reusables.organizations.outside_collaborators_description %}
 
 ### Further reading
 

content/rest/reference/activity.md

@@ -33,8 +33,6 @@ $    -H 'If-None-Match: "a18c3bded88eb5dbb5c849a489412bf3"'
 > X-Poll-Interval: 60
 ```
 
-Events support pagination, however the `per_page` option is unsupported. The fixed page size is 30 items. Fetching up to ten pages is supported, for a total of 300 events. For information, see "[Traversing with pagination](/rest/guides/traversing-with-pagination)."
-
 Only events created within the past 90 days will be included in timelines. Events older than 90 days will not be included (even if the total number of events in the timeline is less than 300).
 
 {% for operation in currentRestOperations %}