resolve conflict

Author: heiskr

.github/instructions/instruction-architecture.instructions.md

@@ -8,6 +8,6 @@ This applies when you add, edit, or remove a Copilot instruction or shared agent
 
 When it applies, you **must** first read the instruction-architecture doc in full and follow it:
 
-https://github.com/github/docs-team/blob/main/contributing-to-docs/docs-work/copilot-instruction-architecture.md
+https://github.com/github/technical-content/blob/main/contributing-to-docs/docs-work/copilot-instruction-architecture.md
 
-Read the current version every time (from a local `github/docs-team` checkout if you have one, otherwise fetch the URL); do not rely on your memory of it, because it changes. If you cannot access it, say so and stop rather than guessing.
+Read the current version every time (from a local `github/technical-content` checkout if you have one, otherwise fetch the URL); do not rely on your memory of it, because it changes. If you cannot access it, say so and stop rather than guessing.

.github/workflows/auto-add-ready-for-doc-review.yml

@@ -36,7 +36,7 @@ jobs:
             try {
               await github.rest.teams.getMembershipForUserInOrg({
                 org: 'github',
-                team_slug: 'docs',
+                team_slug: 'technical-content',
                 username: context.payload.sender.login,
               });
               return true

.github/workflows/confirm-internal-staff-work-in-docs.yml

@@ -48,7 +48,7 @@ jobs:
             try {
               await github.rest.teams.getMembershipForUserInOrg({
                 org: 'github',
-                team_slug: 'docs',
+                team_slug: 'technical-content',
                 username: context.payload.sender.login,
               });
               // If the user is a Docs team member, we should stop here and not send

.github/workflows/copy-api-issue-to-internal.yml

@@ -27,7 +27,7 @@ jobs:
           script: |
             const triggerer_login = context.payload.sender.login
             const teamMembers = await github.request(
-              `/orgs/github/teams/docs/members?per_page=100`
+              `/orgs/github/teams/technical-content/members?per_page=100`
             )
             const logins = teamMembers.data.map(member => member.login)
             if (logins.includes(triggerer_login)) {

.github/workflows/hubber-contribution-help.yml

@@ -33,7 +33,7 @@ jobs:
             try {
               await github.rest.teams.getMembershipForUserInOrg({
                 org: 'github',
-                team_slug: 'docs',
+                team_slug: 'technical-content',
                 username: context.payload.sender.login,
               });
               return true

.github/workflows/os-ready-for-review.yml

@@ -31,7 +31,7 @@ jobs:
           script: |
             const triggerer_login = context.payload.sender.login
             const teamMembers = await github.request(
-              `/orgs/github/teams/docs/members?per_page=100`
+              `/orgs/github/teams/technical-content/members?per_page=100`
             )
             const logins = teamMembers.data.map(member => member.login)
             if (logins.includes(triggerer_login)) {

.github/workflows/review-comment.yml

@@ -97,6 +97,6 @@ jobs:
             🤖 This comment is [automatically generated][workflow].
 
             [workflow]: ${{ github.server_url }}/${{ github.repository }}/blob/${{ github.workflow_sha }}/.github/workflows/review-comment.yml
-            [codespace]: ${{ github.repository == 'github/docs-internal' && 'https://github.com/github/docs-team/blob/main/contributing-to-docs/tips-and-tricks/use-a-codespace-to-review.md' || 'https://docs.github.com/en/contributing/setting-up-your-environment-to-work-on-github-docs/working-on-github-docs-in-a-codespace' }}
+            [codespace]: ${{ github.repository == 'github/docs-internal' && 'https://github.com/github/technical-content/blob/main/contributing-to-docs/tips-and-tricks/use-a-codespace-to-review.md' || 'https://docs.github.com/en/contributing/setting-up-your-environment-to-work-on-github-docs/working-on-github-docs-in-a-codespace' }}
             [local]: https://docs.github.com/en/contributing/setting-up-your-environment-to-work-on-github-docs/creating-a-local-environment#setting-up-your-local-environment
-            [staging]: https://github.com/github/docs-team/blob/main/contributing-to-docs/tips-and-tricks/deploying-pr-to-staging-servers.md
+            [staging]: https://github.com/github/technical-content/blob/main/contributing-to-docs/tips-and-tricks/deploying-pr-to-staging-servers.md

.github/workflows/sme-review-tracking-issue.yml

@@ -31,10 +31,10 @@ jobs:
 
             const issueNo = context.number || context.issue.number
 
-            // Create an issue in docs-team repo
+            // Create an issue in technical-content repo
             await github.rest.issues.create({
               owner: 'github',
-              repo: 'docs-team',
+              repo: 'technical-content',
               title: `SME tracking issue for \#${issueNo}`,
               body: `### Issue / PR that requires an SME review
 

.github/workflows/sync-openapi.yml

@@ -102,7 +102,7 @@ jobs:
             --title "Update OpenAPI Description" \
             --body '👋 humans. This PR updates the OpenAPI description with the latest changes. (Synced from github/rest-api-description@${{ steps.rest-api-description.outputs.OPENAPI_COMMIT_SHA }})
 
-            Docs First Responders should follow [the acting-as-the-first-responder instructions](https://github.com/github/docs-team/blob/main/contributing-to-docs/first-responder/acting-as-the-first-responder.md?plain=1#L156).
+            Docs First Responders should follow [the acting-as-the-first-responder instructions](https://github.com/github/technical-content/blob/main/contributing-to-docs/first-responder/acting-as-the-first-responder.md?plain=1#L156).
 
             If CI does not pass or other problems arise, contact #docs-engineering on slack.
 

content/admin/all-releases.md

@@ -57,6 +57,7 @@ If you run analysis in an external CI system, we recommend using the same versio
 
 | {% data variables.product.prodname_ghe_server %} version | Recommended {% data variables.product.prodname_codeql_cli %} version |
 | ------------------------------------------------- | ---------------------- |
+| 3.22 | 2.25.6 ([changelog](https://codeql.github.com/docs/codeql-overview/codeql-changelog/codeql-cli-2.25.6/)) |
 | 3.21 | 2.24.3 ([changelog](https://codeql.github.com/docs/codeql-overview/codeql-changelog/codeql-cli-2.24.3/)) |
 | 3.20 | 2.23.9 ([changelog](https://codeql.github.com/docs/codeql-overview/codeql-changelog/codeql-cli-2.23.9/)) |
 | 3.19 | 2.22.4 ([changelog](https://codeql.github.com/docs/codeql-overview/codeql-changelog/codeql-cli-2.22.4/)) |
@@ -80,6 +81,7 @@ For instances with {% data variables.product.prodname_actions %} enabled, self-h
 
 | {% data variables.product.prodname_ghe_server %} version | Minimum Runner version |
 | ------------------------------------------------- | ---------------------- |
+| 3.22 | 2.334.0 ([release notes](https://github.com/actions/runner/releases/tag/v2.334.0)) |
 | 3.21 | 2.331.0 ([release notes](https://github.com/actions/runner/releases/tag/v2.331.0)) |
 | 3.20 | 2.330.0 ([release notes](https://github.com/actions/runner/releases/tag/v2.330.0)) |
 | 3.19 | 2.328.0 ([release notes](https://github.com/actions/runner/releases/tag/v2.328.0)) |