Merge branch 'main' into sidebar-assignee-menu

Author: ethanpalm

.github/workflows/repo-freeze-check.yml

@@ -22,7 +22,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Fail if repo merges are paused
-        if: ${{ env.FREEZE == 'true' }}
+        if: ${{ env.FREEZE == 'true' && github.ref != 'refs/heads/repo-sync' }}
         run: |
           echo 'Merges into the "main" branch on this repo are currently paused!'
           exit 1

.github/workflows/repo-sync-stalls.yml

@@ -5,20 +5,7 @@ on:
   schedule:
     - cron: '0 */2 * * *'
 
-env:
-  FREEZE: ${{ secrets.FREEZE }}
-
 jobs:
-  check-freezer:
-    name: Check for deployment freezes
-    runs-on: ubuntu-latest
-    steps:
-      - name: Exit if repo is frozen
-        if: ${{ env.FREEZE == 'true' }}
-        run: |
-          echo 'The repo is currently frozen! Exiting this workflow.'
-          exit 1 # prevents further steps from running
-
   repo-sync-stalls:
     runs-on: ubuntu-latest
     steps:
@@ -60,7 +47,7 @@ jobs:
             })
       - name: Send Slack notification if workflow fails
         uses: someimportantcompany/github-actions-slack-message@0b470c14b39da4260ed9e3f9a4f1298a74ccdefd
-        if: ${{ failure() && env.FREEZE != 'true' }}
+        if: ${{ failure() }}
         with:
           channel: ${{ secrets.DOCS_ALERTS_SLACK_CHANNEL_ID }}
           bot-token: ${{ secrets.SLACK_DOCS_BOT_TOKEN }}

.github/workflows/repo-sync.yml

@@ -11,24 +11,10 @@ on:
   schedule:
     - cron: '*/15 * * * *' # every 15 minutes
 
-env:
-  FREEZE: ${{ secrets.FREEZE }}
-
 jobs:
-  check-freezer:
-    name: Check for deployment freezes
-    runs-on: ubuntu-latest
-    steps:
-      - name: Exit if repo is frozen
-        if: ${{ env.FREEZE == 'true' }}
-        run: |
-          echo 'The repo is currently frozen! Exiting this workflow.'
-          exit 1 # prevents further steps from running
-
   repo-sync:
     if: github.repository == 'github/docs-internal' || github.repository == 'github/docs'
     name: Repo Sync
-    needs: check-freezer
     runs-on: ubuntu-latest
     steps:
       - name: Check out repo

content/actions/managing-workflow-runs/adding-a-workflow-status-badge.md

@@ -12,52 +12,31 @@ versions:
 
 {% data reusables.repositories.actions-workflow-status-badge-into %}
 
-If your workflow uses the `name` keyword, you must reference the workflow by name. If the name of your workflow contains white space, you'll need to replace the space with the URL encoded string `%20`. For more information about the `name` keyword, see "[Workflow syntax for {% data variables.product.prodname_actions %}](/articles/workflow-syntax-for-github-actions#name)."
+You reference the workflow by the name of your workflow file.
 
 ```
-https://github.com/<OWNER>/<REPOSITORY>/workflows/<WORKFLOW_NAME>/badge.svg
+https://github.com/<OWNER>/<REPOSITORY>/actions/workflows/<WORKFLOW_FILE>/badge.svg
 ```
+### Using the workflow file name
 
-Alternatively, if your workflow doesn't have a `name`, you must reference the workflow file using the file path relative to the repository's root directory.
-
-{% note %}
-
-**Note:** Referencing the workflow file using the file path does not work if the workflow has a `name`.
-
-{% endnote %}
-
-```
-https://github.com/<OWNER>/<REPOSITORY>/workflows/<WORKFLOW_FILE_PATH>/badge.svg
-```
-
-### Using a workflow name
-
-This Markdown example adds a status badge for a workflow with the name "Greet Everyone." The `OWNER` of the repository is the `actions` organization and the `REPOSITORY` name is `hello-world`.
-
-```markdown
-![example workflow name](https://github.com/actions/hello-world/workflows/Greet%20Everyone/badge.svg)
-```
-
-### Using a workflow file path
-
-This Markdown example adds a status badge for a workflow with the file path `.github/workflows/main.yml`. The `OWNER` of the repository is the `actions` organization and the `REPOSITORY` name is `hello-world`.
+This Markdown example adds a status badge for a workflow with the file path `.github/workflows/main.yml`. The `OWNER` of the repository is the `github` organization and the `REPOSITORY` name is `docs`.
 
 ```markdown
-![example workflow file path](https://github.com/actions/hello-world/workflows/.github/workflows/main.yml/badge.svg)
+![example workflow](https://github.com/github/docs/actions/workflows/main.yml/badge.svg)
 ```
 
 ### Using the `branch` parameter
 
 This Markdown example adds a status badge for a branch with the name `feature-1`.
 
 ```markdown
-![example branch parameter](https://github.com/actions/hello-world/workflows/Greet%20Everyone/badge.svg?branch=feature-1)
+![example branch parameter](https://github.com/github/docs/actions/workflows/main.yml/badge.svg?branch=feature-1)
 ```
 
 ### Using the `event` parameter
 
 This Markdown example adds a badge that displays the status of workflow runs triggered by the `pull_request` event.
 
 ```markdown
-![example event parameter](https://github.com/actions/hello-world/workflows/Greet%20Everyone/badge.svg?event=pull_request)
+![example event parameter](https://github.com/github/docs/actions/workflows/main.yml/badge.svg?event=pull_request)
 ```

content/github/working-with-github-pages/managing-a-custom-domain-for-your-github-pages-site.md

@@ -35,7 +35,7 @@ The `dig` command, which can be used to verify correct configuration of DNS reco
 
 ### Configuring a subdomain
 
-To set up a `www` or custom subdomain, such as `www.example.com` or `blog.example.com`, you must create a _CNAME_ file in your site's repository and configure a `CNAME` record with your DNS provider.
+To set up a `www` or custom subdomain, such as `www.example.com` or `blog.example.com`, you must add your domain in the repository settings, which will create a CNAME file in your site’s repository. After that, configure a CNAME record with your DNS provider.
 
 {% data reusables.pages.navigate-site-repo %}
 {% data reusables.repositories.sidebar-settings %}

data/graphql/ghae/schema.docs-ghae.graphql

@@ -37067,7 +37067,7 @@ type VerifiableDomain implements Node {
   id: ID!
 
   """
-  Whether this domain is required to exist for an organization policy to be enforced.
+  Whether this domain is required to exist for an organization or enterprise policy to be enforced.
   """
   isRequiredForPolicyEnforcement: Boolean!
 

data/graphql/schema.docs.graphql

@@ -40380,7 +40380,7 @@ type VerifiableDomain implements Node {
   id: ID!
 
   """
-  Whether this domain is required to exist for an organization policy to be enforced.
+  Whether this domain is required to exist for an organization or enterprise policy to be enforced.
   """
   isRequiredForPolicyEnforcement: Boolean!
 

lib/graphql/static/prerendered-objects.json

@@ -55978,7 +55978,7 @@
         },
         {
           "name": "isRequiredForPolicyEnforcement",
-          "description": "<p>Whether this domain is required to exist for an organization policy to be enforced.</p>",
+          "description": "<p>Whether this domain is required to exist for an organization or enterprise policy to be enforced.</p>",
           "type": "Boolean!",
           "id": "boolean",
           "kind": "scalars",

lib/graphql/static/schema-dotcom.json

@@ -51817,7 +51817,7 @@
         },
         {
           "name": "isRequiredForPolicyEnforcement",
-          "description": "<p>Whether this domain is required to exist for an organization policy to be enforced.</p>",
+          "description": "<p>Whether this domain is required to exist for an organization or enterprise policy to be enforced.</p>",
           "type": "Boolean!",
           "id": "boolean",
           "kind": "scalars",