Merge branch 'main' into docs-base-branch-pencil-icon-43423

Author: XiaoPengMei

.github/workflows/content-pipelines.yml

@@ -71,12 +71,12 @@ jobs:
           git config user.email "github-actions[bot]@users.noreply.github.com"
 
           if git ls-remote --exit-code --heads origin "$UPDATE_BRANCH" > /dev/null 2>&1; then
-            git fetch origin "$UPDATE_BRANCH" main
+            git fetch --unshallow origin "$UPDATE_BRANCH" main 2>/dev/null || git fetch origin "$UPDATE_BRANCH" main
             git checkout "$UPDATE_BRANCH"
             git merge origin/main --no-edit || {
               echo "Merge conflict with main — resetting branch to main"
               git merge --abort 2>/dev/null || true
-              git checkout main
+              git checkout -f main
               git branch -D "$UPDATE_BRANCH"
               if [ -z "$PR_NUMBER" ]; then
                 git push origin --delete "$UPDATE_BRANCH" || true

Dockerfile

@@ -10,7 +10,7 @@
 # ---------------------------------------------------------------
 # To update the sha:
 # https://github.com/github/gh-base-image/pkgs/container/gh-base-image%2Fgh-base-noble
-FROM ghcr.io/github/gh-base-image/gh-base-noble:20260218-111945-g0ef8bb15f@sha256:03eb088f3581049afaf2984f917a3a9be7e5efc248049f4156cd83481579fb59 AS base
+FROM ghcr.io/github/gh-base-image/gh-base-noble:20260320-170214-g814cb7830@sha256:90350e63f9b56ec3f60f5ef9f51b489c4eef6462c7727e0d6729a1c8d95a4aa7 AS base
 
 # Install curl for Node install and determining the early access branch
 # Install git for cloning docs-early-access & translations repos

content/actions/how-tos/manage-runners/larger-runners/use-custom-images.md

@@ -10,8 +10,6 @@ category:
 contentType: how-tos
 ---
 
-{% data reusables.actions.custom-images-public-preview-note %}
-
 ## Custom images
 
 You can create a custom image to define the exact environment that your {% data variables.actions.github_hosted_larger_runners %} use. Custom images let you preinstall tools, dependencies, and configurations to speed up workflows and improve consistency across jobs.

content/code-security/concepts/index.md

@@ -14,3 +14,4 @@ children:
   - supply-chain-security
   - /vulnerability-reporting-and-management
   - /security-at-scale
+---

content/copilot/concepts/agents/coding-agent/about-coding-agent.md

@@ -30,6 +30,7 @@ With {% data variables.copilot.copilot_coding_agent %}, {% data variables.produc
 * Improve test coverage
 * Update documentation
 * Address technical debt
+* Resolve merge conflicts
 
 To delegate tasks to {% data variables.copilot.copilot_coding_agent %}, you can:
 

content/copilot/how-tos/administer-copilot/manage-for-enterprise/index.md

@@ -11,9 +11,11 @@ children:
   - /manage-agents
   - /manage-spark
   - /use-your-own-api-keys
+  - /review-audit-logs
 redirect_from:
   - /copilot/managing-copilot/managing-copilot-for-your-enterprise
   - /copilot/how-tos/administer/enterprises
   - /copilot/how-tos/administer/manage-for-enterprise
 contentType: how-tos
 ---
+

content/copilot/how-tos/administer-copilot/manage-for-enterprise/review-audit-logs.md

@@ -0,0 +1,55 @@
+---
+title: Reviewing audit logs for GitHub Copilot
+shortTitle: Review audit logs
+intro: Check for changes to settings or licenses in your {% data variables.product.prodname_copilot_short %} plan.
+product: '{% data variables.copilot.copilot_business_short %} or {% data variables.copilot.copilot_enterprise_short %}'
+permissions: Enterprise owners or users with the "Read enterprise audit logs" custom role
+redirect_from:
+  - /copilot/managing-copilot-for-business/reviewing-your-organization-or-enterprises-audit-logs-for-copilot-for-business
+  - /copilot/managing-copilot-business/reviewing-your-organization-or-enterprises-audit-logs-for-copilot-business
+  - /copilot/managing-github-copilot-in-your-organization/reviewing-your-organization-or-enterprises-audit-logs-for-copilot-business
+  - /copilot/managing-github-copilot-in-your-organization/reviewing-audit-logs-for-copilot-business
+  - /copilot/managing-copilot/managing-github-copilot-in-your-organization/reviewing-audit-logs-for-copilot-business
+  - /copilot/managing-copilot/managing-github-copilot-in-your-organization/reviewing-github-copilot-activity-in-your-organization/reviewing-audit-logs-for-copilot-business
+  - /copilot/managing-copilot/managing-github-copilot-in-your-organization/managing-access-to-github-copilot-in-your-organization/reviewing-audit-logs-for-copilot-business
+  - /copilot/managing-copilot/managing-github-copilot-in-your-organization/reviewing-activity-related-to-github-copilot-in-your-organization/reviewing-audit-logs-for-copilot-business
+  - /copilot/how-tos/administer/organizations/reviewing-activity-related-to-github-copilot-in-your-organization/reviewing-audit-logs-for-copilot-business
+  - /copilot/how-tos/administer/organizations/reviewing-activity-related-to-github-copilot-in-your-organization/review-audit-logs
+  - /copilot/how-tos/administer/organizations/review-activity/review-audit-logs
+  - /copilot/how-tos/administer/manage-for-organization/review-activity/review-audit-logs
+  - /copilot/how-tos/administer-copilot/manage-for-organization/review-activity/review-audit-logs
+versions:
+  feature: copilot
+contentType: how-tos
+category:
+  - Manage Copilot for a team
+---
+
+You can use the audit log to review actions taken in your enterprise. The audit log includes a record of:
+
+* Changes to your {% data variables.product.prodname_copilot_short %} plan, such as changes to settings and policies or a user losing or receiving a license
+* Agent activity on the {% data variables.product.github %} website
+
+The audit log does **not** include client session data, such as the prompts a user sends to {% data variables.product.prodname_copilot_short %} locally. A custom solution is required to access this data: for example, some companies use custom hooks to send {% data variables.copilot.copilot_cli_short %} events to their own logging service.
+
+## Viewing your enterprise's audit logs
+
+{% data reusables.enterprise-accounts.access-enterprise %}
+{% data reusables.enterprise-accounts.settings-tab %}
+{% data reusables.enterprise-accounts.audit-log-tab %}
+
+## Searching audit log events
+
+Use the `action:copilot` search term to view all events related to your {% data variables.product.prodname_copilot_short %} plan.
+
+You can also filter by a specific event. For example, `action:copilot.cfb_seat_assignment_created` returns events related to a license being assigned to a new user. For a full list of {% data variables.product.prodname_copilot_short %} events, see [AUTOTITLE](/enterprise-cloud@latest/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/audit-log-events-for-your-enterprise#copilot) or [AUTOTITLE](/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/audit-log-events-for-your-organization#copilot).
+
+To view a record of agent activity, use the `actor:Copilot` search term. See [AUTOTITLE](/copilot/reference/agentic-audit-log-events).
+
+## Retaining audit log history
+
+The audit log retains events for the last 180 days. We recommend streaming the audit log to a Security Information and Event Management (SIEM) platform, where you can view long-term history and set up alerts for anomalous activity. See [AUTOTITLE](/enterprise-cloud@latest/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/streaming-the-audit-log-for-your-enterprise).
+
+## Further reading
+
+* [AUTOTITLE](/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/reviewing-the-audit-log-for-your-organization)

content/copilot/how-tos/administer-copilot/manage-for-organization/review-activity/index.md

@@ -1,12 +1,11 @@
 ---
 title: Reviewing activity related to GitHub Copilot in your organization
 shortTitle: Review activity
-intro: 'Organization owners can review {% data variables.product.prodname_copilot_short %} usage in their organization.'
+intro: Organization owners can review {% data variables.product.prodname_copilot_short %} usage in their organization.
 versions:
   feature: copilot
 children:
   - /review-user-activity-data
-  - /review-audit-logs
 redirect_from:
   - /copilot/managing-copilot/managing-github-copilot-in-your-organization/reviewing-activity-related-to-github-copilot-in-your-organization
   - /copilot/how-tos/administer/organizations/reviewing-activity-related-to-github-copilot-in-your-organization

content/copilot/how-tos/administer-copilot/manage-for-organization/review-activity/review-audit-logs.md

@@ -75,23 +75,19 @@ If you ever need to switch to an account on {% data variables.product.prodname_d
 
 {% endxcode %}
 
-{% cli %}
+{% copilotcli %}
 
 ## Authenticating from the command line
 
-To use the `gh-copilot` extension for the {% data variables.product.prodname_cli %}, you must:
+To use {% data variables.copilot.copilot_cli_short %}, you must:
 
-1. Download and install the extension. To do this, you must be authenticated to an account on {% data variables.product.prodname_dotcom_the_website %}. See [AUTOTITLE](/copilot/managing-copilot/configure-personal-settings/installing-github-copilot-in-the-cli#installing-copilot-in-the-cli).
-1. Authenticate to the account on {% data variables.enterprise.data_residency_site %} where you receive your {% data variables.product.prodname_copilot_short %} license.
+1. Download and install {% data variables.copilot.copilot_cli_short %}. See [AUTOTITLE](/copilot/how-tos/copilot-cli/set-up-copilot-cli/install-copilot-cli).
+1. Authenticate to the account on {% data variables.enterprise.data_residency_site %} where you receive your {% data variables.product.prodname_copilot_short %} license with `copilot login --host {% data variables.enterprise.data_residency_domain %}`.
 
-{% data variables.product.prodname_dotcom_the_website %} is the default destination of {% data variables.product.prodname_cli %} requests. To use `gh copilot`, you must ensure requests are sent to {% data variables.enterprise.data_residency_site %}, where you receive your license. You have the following options:
-* Include the flag `--hostname SUBDOMAIN.ghe.com` in all `gh copilot` commands.
-* Set the `GH_HOST` environment variable to change the default host for all {% data variables.product.prodname_cli %} commands.
-* Sign out of {% data variables.product.prodname_dotcom_the_website %} with `gh auth logout`. However, you will need to sign back in to get updates to `gh-copilot`.
 
-For general information on using the {% data variables.product.prodname_cli %} across platforms, see [AUTOTITLE](/github-cli/github-cli/using-multiple-accounts).
+For general information on using {% data variables.copilot.copilot_cli_short %}, see [AUTOTITLE](/copilot/how-tos/copilot-cli).
 
-{% endcli %}
+{% endcopilotcli %}
 
 {% visualstudio %}