Merge branch 'main' into github#268-active-language-display

.github/workflows/enterprise-dates.yml

@@ -30,11 +30,19 @@ jobs:
         run: |
           echo 'The repo is currently frozen! Exiting this workflow.'
           exit 1 # prevents further steps from running
+
+      - name: Checkout repository code
+        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
+
+      - name: Install Node.js dependencies
+        run: npm ci
+
       - name: Run script/update-enterprise-dates.js
         run: |
           script/update-enterprise-dates.js
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Create pull request
         id: create-pull-request
         uses: peter-evans/create-pull-request@8c603dbb04b917a9fc2dd991dc54fef54b640b43
@@ -50,23 +58,26 @@ jobs:
           labels: automerge,autoupdate
           branch: enterprise-server-dates-update
           delete-branch: true
+
       - if: ${{ failure() }}
         name: Delete remote branch (if previous steps failed)
         uses: dawidd6/action-delete-branch@47743101a121ad657031e6704086271ca81b1911
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           branches: enterprise-server-dates-update
+
       - if: ${{ steps.create-pull-request.outputs.pull-request-number }}
         name: Approve
         uses: juliangruber/approve-pull-request-action@c530832d4d346c597332e20e03605aa94fa150a8
         with:
           github-token: ${{ secrets.DOCUBOT_REPO_PAT }}
           number: ${{ steps.create-pull-request.outputs.pull-request-number }}
+
       - name: Send Slack notification if workflow fails
         uses: someimportantcompany/github-actions-slack-message@0b470c14b39da4260ed9e3f9a4f1298a74ccdefd
         if: failure()
         with:
           channel: ${{ secrets.DOCS_ALERTS_SLACK_CHANNEL_ID }}
           bot-token: ${{ secrets.SLACK_DOCS_BOT_TOKEN }}
           color: failure
-          text: The last enterprise-dates run for ${{github.repository}} failed. See https://github.com/github/${{github.repository}}/actions/workflows/enterprise-dates.yml
+          text: The last enterprise-dates run for ${{github.repository}} failed. See https://github.com/${{github.repository}}/actions/workflows/enterprise-dates.yml

.github/workflows/update-graphql-files.yml

@@ -79,4 +79,4 @@ jobs:
           channel: ${{ secrets.DOCS_ALERTS_SLACK_CHANNEL_ID }}
           bot-token: ${{ secrets.SLACK_DOCS_BOT_TOKEN }}
           color: failure
-          text: The last update-graphql-files run for ${{github.repository}} failed. See https://github.com/github/${{github.repository}}/actions/workflows/update-graphql-files.yml
+          text: The last update-graphql-files run for ${{github.repository}} failed. See https://github.com/${{github.repository}}/actions/workflows/update-graphql-files.yml

content/actions/guides/about-packaging-with-github-actions.md

@@ -18,39 +18,7 @@ topics:
 {% data reusables.actions.enterprise-github-hosted-runners %}
 {% data reusables.actions.ae-beta %}
 
-### About packaging steps
-
-A packaging step is a common part of a continuous integration or continuous delivery workflow. After building and testing your application, a runnable or deployable artifact is produced in the form of a package. For example, a continuous integration workflow for a Java project may run `mvn package` to produce a JAR file. Or, a CI workflow for a Node.js application may create a Docker container.
-
-Depending on the kind of application you're building, this package can be downloaded locally for manual testing, made available for users to download, or deployed to a staging or production environment.
-
-### Packaging in continuous integration workflows
-
-Creating a package at the end of a continuous integration workflow can help during code reviews on a pull request. After building and testing your code, a packaging step can produce a runnable or deployable artifact. Your workflow can then take that artifact and upload it as part of the workflow.
-
-Now, when reviewing a pull request, you'll be able to look at the workflow run and download the artifact that was produced.
-
-{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@3.0" or currentVersion == "github-ae@latest" %}
-![Download artifact drop-down menu](/assets/images/help/repository/artifact-drop-down-updated.png)
-{% else %}
-![Download artifact drop-down menu](/assets/images/help/repository/artifact-drop-down.png)
-{% endif %}
-
-This will let you run the code in the pull request on your machine, which can help with debugging or testing the pull request.
-
-### Workflows for publishing packages
-
-In addition to uploading packaging artifacts for testing in a continuous integration workflow, you can create workflows that build your project and publish packages to a package registry.
-
-* **Publish packages to {% data variables.product.prodname_registry %}**  
-  {% data variables.product.prodname_registry %} can act as a package hosting service for many types of packages. You can choose to share your packages with all of {% data variables.product.prodname_dotcom %}, or private packages to share with collaborators or an organization. For more information, see "[About {% data variables.product.prodname_registry %}](/github/managing-packages-with-github-packages/about-github-packages)."
-
-  You may want to publish packages to {% data variables.product.prodname_registry %} on every push into the default branch. This will allow developers on your project to always be able to run and test the latest build out of the main branch easily, by installing it from {% data variables.product.prodname_registry %}.
-
-* **Publish packages to a package registry**  
-  For many projects, publishing to a package registry is performed whenever a new version of a project is released. For example, a project that produces a JAR file may upload new releases to the Maven Central repository. Or, a .NET project may produce a nuget package and upload it to the NuGet Gallery.
-
-  You can automate this by creating a workflow that publishes packages to a package registry on every release creation. For more information, see "[Creating releases](/github/administering-a-repository/creating-releases)."
+{% data reusables.package_registry.about-packaging-and-actions %}
 
 ### Further reading
 

content/actions/guides/publishing-docker-images.md

@@ -37,7 +37,7 @@ You might also find it helpful to have a basic understanding of the following:
 
 - "[Encrypted secrets](/actions/reference/encrypted-secrets)"
 - "[Authentication in a workflow](/actions/reference/authentication-in-a-workflow)"
-- "[Configuring Docker for use with {% data variables.product.prodname_registry %}](/packages/using-github-packages-with-your-projects-ecosystem/configuring-docker-for-use-with-github-packages)"
+- "[Working with the Docker registry](/packages/working-with-a-github-packages-registry/working-with-the-docker-registry)"
 
 ### About image configuration
 

content/actions/guides/publishing-java-packages-with-gradle.md

@@ -32,7 +32,7 @@ For more information about creating a CI workflow for your Java project with Gra
 
 You may also find it helpful to have a basic understanding of the following:
 
-- "[Configuring npm for use with {% data variables.product.prodname_registry %}](/github/managing-packages-with-github-packages/configuring-npm-for-use-with-github-packages)"
+- "[Working with the npm registry](/packages/working-with-a-github-packages-registry/working-with-the-npm-registry)"
 - "[Environment variables](/actions/reference/environment-variables)"
 - "[Encrypted secrets](/actions/reference/encrypted-secrets)"
 - "[Authentication in a workflow](/actions/reference/authentication-in-a-workflow)"

content/actions/guides/publishing-java-packages-with-maven.md

@@ -32,7 +32,7 @@ For more information about creating a CI workflow for your Java project with Mav
 
 You may also find it helpful to have a basic understanding of the following:
 
-- "[Configuring npm for use with {% data variables.product.prodname_registry %}](/github/managing-packages-with-github-packages/configuring-npm-for-use-with-github-packages)"
+- "[Working with the npm registry](/packages/working-with-a-github-packages-registry/working-with-the-npm-registry)"
 - "[Environment variables](/actions/reference/environment-variables)"
 - "[Encrypted secrets](/actions/reference/encrypted-secrets)"
 - "[Authentication in a workflow](/actions/reference/authentication-in-a-workflow)"

content/actions/guides/publishing-nodejs-packages.md

@@ -33,7 +33,7 @@ For more information about creating a CI workflow for your Node.js project, see
 
 You may also find it helpful to have a basic understanding of the following:
 
-- "[Configuring npm for use with {% data variables.product.prodname_registry %}](/github/managing-packages-with-github-packages/configuring-npm-for-use-with-github-packages)"
+- "[Working with the npm registry](/packages/working-with-a-github-packages-registry/working-with-the-npm-registry)"
 - "[Environment variables](/actions/reference/environment-variables)"
 - "[Encrypted secrets](/actions/reference/encrypted-secrets)"
 - "[Authentication in a workflow](/actions/reference/authentication-in-a-workflow)"

content/actions/reference/workflow-syntax-for-github-actions.md

@@ -341,7 +341,7 @@ runs-on: [AE-runner-for-CI]
 
 For more information, see "[About {% data variables.actions.hosted_runner %}s](/actions/using-github-hosted-runners/about-ae-hosted-runners)."
 
-{% else %} 
+{% else %}
 {% data reusables.actions.enterprise-github-hosted-runners %}
 
 #### {% data variables.product.prodname_dotcom %}-hosted runners
@@ -695,11 +695,11 @@ jobs:
 ```
 
 {% if currentVersion == "free-pro-team@latest" %}
-##### Example using the {% data variables.product.prodname_github_container_registry %}
+##### Example using the {% data variables.product.prodname_registry %} {% data variables.product.prodname_capitalized_container_registry %}
 
 `docker://{host}/{image}:{tag}`
 
-A Docker image in the {% data variables.product.prodname_github_container_registry %}.
+A Docker image in the {% data variables.product.prodname_registry %} {% data variables.product.prodname_capitalized_container_registry %}.
 
 ```yaml
 jobs:
@@ -851,7 +851,7 @@ steps:
     shell: perl {0}
 ```
 
-The command used, `perl` in this example, must be installed on the runner. 
+The command used, `perl` in this example, must be installed on the runner.
 
 
 {% if currentVersion == "github-ae@latest" %}For instructions on how to make sure your {% data variables.actions.hosted_runner %} has the required software installed, see "[Creating custom images](/actions/using-github-hosted-runners/creating-custom-images)."
@@ -1267,7 +1267,7 @@ The Docker image to use as the service container to run the action. The value ca
 {% raw %}
 ```yaml
 services:
-  myservice1: 
+  myservice1:
     image: ghcr.io/owner/myservice1
     credentials:
       username: ${{ github.actor }}

content/admin/configuration/configuring-data-encryption-for-your-enterprise.md

@@ -16,56 +16,4 @@ versions:
 
 To provide a high level of security, {% data variables.product.product_name %} encrypts your data while at rest in the data centers and while your data is in transit between users' machines and the data centers.
 
-For encryption in transit, {% data variables.product.product_name %} uses Transport Layer Security (TLS). For encryption at rest, {% data variables.product.product_name %} provides a default RSA key. After you've initialized your enterprise, you can choose to provide your own key instead. Your key should be a 2048 bit RSA private key in PEM format.
-
-The key that you provide is stored in a FIPS 140-2 compliant hardware security module (HSM) in a key vault that {% data variables.product.company_short %} manages.
-
-To configure your encryption key, use the REST API. There are a number of API endpoints, for example to check the status of encryption, update your encryption key, and disable your encryption key. Note that disabling your key will freeze your enterprise. For more information about the API endpoints, see "[Encryption at rest](/rest/reference/enterprise-admin#encryption-at-rest)" in the REST API documentation.
-
-### Adding or updating an encryption key
-
-You can add a new encryption key as often as you need. When you add a new key, the old key is discarded. Your enterprise won't experience downtime when you update the key.
-
-Your 2048 bit RSA private key should be in PEM format, for example in a file called _private-key.pem_.
-
-   ```
-   -----BEGIN RSA PRIVATE KEY-----
-   XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-   XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-   -----END RSA PRIVATE KEY-----
-   ```
-
-1. To add your key, use the `PATCH /enterprise/encryption` endpoint, replacing *~/private-key.pem* with the path to your private key.
-
-   ```shell
-   curl -X PATCH http(s)://<em>hostname</em>/api/v3/enterprise/encryption \
-     -d "{ \"key\": \"$(awk '{printf "%s\\n", $0}' ~/private-key.pem)\" }"
-   ```
-
-2. Optionally, check the status of the update operation.
-
-   ```shell
-   curl -X GET http(s)://<em>hostname</em>/api/v3/enterprise/encryption/status/<em>request_id</em>
-   ```
-
-### Disabling your encryption key
-
-To freeze your enterprise, for example in the case of a breach, you can disable encryption at rest by marking your encryption key as disabled.
-
-1. To disable your key and encryption at rest, use the `DELETE /enterprise/encryption` endpoint. This operation does not delete the key permanently.
-
-   ```shell
-   curl -X DELETE http(s)://<em>hostname</em>/api/v3/enterprise/encryption
-   ```
-
-2. Optionally, check the status of the delete operation. It takes approximately ten minutes to disable encryption at rest.
-
-   ```shell
-   curl -X GET http(s)://<em>hostname</em>/api/v3/enterprise/encryption/status/<em>request_id</em>
-   ```
-
-To unfreeze your enterprise after you've disabled your encryption key, contact support. For more information, see "[About {% data variables.contact.enterprise_support %}](/admin/enterprise-support/about-github-enterprise-support)."
-
-### Further reading
-
-- "[Encryption at rest](/rest/reference/enterprise-admin#encryption-at-rest)" in the REST API documentation 
+For encryption in transit, {% data variables.product.product_name %} uses Transport Layer Security (TLS). For encryption at rest, {% data variables.product.product_name %} provides a default RSA key. 

content/admin/configuration/enabling-subdomain-isolation.md

@@ -18,7 +18,7 @@ Subdomain isolation mitigates cross-site scripting and other related vulnerabili
 When subdomain isolation is enabled, {% data variables.product.prodname_ghe_server %} replaces several paths with subdomains.
 
 {% if currentVersion == "enterprise-server@2.22" %}
-To use Docker with {% data variables.product.prodname_registry %}, you must also enable subdomain isolation. For more information, see "[Configuring Docker for use with {% data variables.product.prodname_registry %}](/enterprise/{{ currentVersion }}/user/packages/using-github-packages-with-your-projects-ecosystem/configuring-docker-for-use-with-github-packages)."
+To use Docker with {% data variables.product.prodname_registry %}, you must also enable subdomain isolation. For more information, see "[Working with the Docker registry](/enterprise/{{ currentVersion }}/user/packages/working-with-a-github-packages-registry/working-with-the-docker-registry)."
 
 {% data reusables.package_registry.packages-ghes-release-stage %}
 

content/admin/overview/about-github-ae.md

@@ -21,7 +21,7 @@ All of your data is stored within the geographic region of your choosing. You ca
 
 ### Encryption on your terms 
 
-All customer data is encrypted at rest, and you can provide your own encryption key to encrypt your data under your encryption policies. You control your key and access to all of your data. For more information, see "[Configuring data encryption for your enterprise](/admin/configuration/configuring-data-encryption-for-your-enterprise)."
+All customer data is encrypted at rest. For more information, see "[Configuring data encryption for your enterprise](/admin/configuration/configuring-data-encryption-for-your-enterprise)."
 
 ### Isolated accounts
 

content/github/authenticating-to-github/recovering-your-account-if-you-lose-your-2fa-credentials.md

@@ -67,7 +67,7 @@ You can use your two-factor authentication credentials or two-factor authenticat
   ![One-time password field](/assets/images/help/2fa/one-time-password-field.png)
 6. Click **Verify email address**.
 7. Choose an alternative verification factor.
-    - If you've used your current device to log into this account before and would like to use the device for verification, click **Verify this device**.
+    - If you've used your current device to log into this account before and would like to use the device for verification, click **Verify with this device**.
     - If you've previously set up an SSH key on this account and would like to use the SSH key for verification, click **SSH key**.
     - If you've previously set up a personal access token and would like to use the personal access token for verification, click **Personal access token**.
   ![Alternative verification buttons](/assets/images/help/2fa/alt-verifications.png)

content/github/collaborating-with-issues-and-pull-requests/about-collaborative-development-models.md

@@ -1,6 +1,6 @@
 ---
 title: About collaborative development models
-intro: The way you use pull requests depends on the type of development model you use in your project.
+intro: The way you use pull requests depends on the type of development model you use in your project. You can use the fork and pull model or the shared repository model.
 redirect_from:
   - /articles/types-of-collaborative-development-models/
   - /articles/about-collaborative-development-models
@@ -12,15 +12,19 @@ topics:
   - pull requests
 ---
 
-There are two main types of development models with which you'd use pull requests. In the *fork and pull model*, anyone can fork an existing repository and push changes to their personal fork. You do not need permission to the source repository to push to a user-owned fork. The changes can be pulled into the source repository by the project maintainer. When you open a pull request proposing changes from your user-owned fork to a branch in the source (upstream) repository, you can allow anyone with push access to the upstream repository to make changes to your pull request.  This model is popular with open source projects as it reduces the amount of friction for new contributors and allows people to work independently without upfront coordination.
+### Fork and pull model
+
+In the fork and pull model, anyone can fork an existing repository and push changes to their personal fork. You do not need permission to the source repository to push to a user-owned fork. The changes can be pulled into the source repository by the project maintainer. When you open a pull request proposing changes from your user-owned fork to a branch in the source (upstream) repository, you can allow anyone with push access to the upstream repository to make changes to your pull request.  This model is popular with open source projects as it reduces the amount of friction for new contributors and allows people to work independently without upfront coordination.
 
 {% tip %}
 
 **Tip:** {% data reusables.open-source.open-source-guide-general %} {% data reusables.open-source.open-source-learning-lab %}
 
 {% endtip %}
 
-In the *shared repository model*, collaborators are granted push access to a single shared repository and topic branches are created when changes need to be made. Pull requests are useful in this model as they initiate code review and general discussion about a set of changes before the changes are merged into the main development branch. This model is more prevalent with small teams and organizations collaborating on private projects.
+### Shared repository model
+
+In the shared repository model, collaborators are granted push access to a single shared repository and topic branches are created when changes need to be made. Pull requests are useful in this model as they initiate code review and general discussion about a set of changes before the changes are merged into the main development branch. This model is more prevalent with small teams and organizations collaborating on private projects.
 
 ### Further reading