Repo sync

content/account-and-profile/concepts/personal-profile.md

@@ -54,7 +54,7 @@ To hide parts of your profile page, you can make your profile private. This also
 
 After making your profile private, you can still view all your information when you visit your own profile.
 
-For more information, see [AUTOTITLE](/account-and-profile/how-tos/setting-up-and-managing-your-github-profile/customizing-your-profile/setting-your-profile-to-private).
+For more information, see [AUTOTITLE](/account-and-profile/how-tos/profile-customization/setting-your-profile-to-private).
 
 ### Differences between private and public profiles
 
@@ -91,5 +91,5 @@ You can control the visibility of specific profile elements or set your entire p
 ## Next steps
 
 * For a general tutorial on personalizing your profile, see [AUTOTITLE](/account-and-profile/tutorials/personalize-your-profile).
-* For more specific profile customization, see [AUTOTITLE](/account-and-profile/how-tos/setting-up-and-managing-your-github-profile).
+* For more specific profile customization, see [AUTOTITLE](/account-and-profile/how-tos).
 * For reference information, see [AUTOTITLE](/account-and-profile/reference/profile-reference).

content/account-and-profile/get-started/account.md

@@ -25,10 +25,10 @@ If you're a member of an {% data variables.enterprise.prodname_emu_enterprise %}
 
 ## Next steps
 
-* For conceptual information about accounts, see [AUTOTITLE](/account-and-profile/concepts/personal-account-management).
+* For conceptual information about accounts, see [AUTOTITLE](/account-and-profile/concepts/account-management).
 * For information about managing your account, see [AUTOTITLE](/account-and-profile/how-tos/setting-up-and-managing-your-personal-account-on-github).
 * For reference information, see [AUTOTITLE](/account-and-profile/reference/personal-account-reference).
 {%- ifversion ghec %}
 * For information about {% data variables.enterprise.prodname_managed_users %}, see [AUTOTITLE](/admin/identity-and-access-management/using-enterprise-managed-users-for-iam/about-enterprise-managed-users).
-* For information about managing multiple accounts, see [AUTOTITLE](/account-and-profile/concepts/personal-account-management#about-management-of-multiple-accounts).
+* For information about managing multiple accounts, see [AUTOTITLE](/account-and-profile/concepts/account-management#about-management-of-multiple-accounts).
 {%- endif %}

content/account-and-profile/how-tos/contribution-settings/viewing-contributions-on-your-profile.md

@@ -22,7 +22,7 @@ category:
 
 ## Prerequisites
 
-Before you view contributions on your profile, you should understand what counts as a contribution, and what other information your profile displays. See [AUTOTITLE](/account-and-profile/concepts/contributions-visible-on-your-profile).
+Before you view contributions on your profile, you should understand what counts as a contribution, and what other information your profile displays. See [AUTOTITLE](/account-and-profile/concepts/contributions-on-your-profile).
 
 ## Viewing contributions in a specific time range
 

content/account-and-profile/how-tos/profile-customization/setting-your-profile-to-private.md

@@ -21,5 +21,5 @@ category:
 
 ## Next steps
 
-* For more information about private profiles, see [AUTOTITLE](/account-and-profile/concepts/about-your-profile#private-profiles).
+* For more information about private profiles, see [AUTOTITLE](/account-and-profile/concepts/personal-profile#private-profiles).
 * For reference information, see [AUTOTITLE](/account-and-profile/reference/profile-reference#limitations-of-private-profiles).

content/authentication/keeping-your-account-and-data-secure/managing-your-personal-access-tokens.md

@@ -208,6 +208,9 @@ Repository permissions work for both user and organization resource owners.
 | `artifact_metadata` | Artifact Metadata | `read`, `write` |
 | {% endif %} |
 | `attestations` | Attestations | `read`, `write` |
+| {% ifversion code-quality %} |
+| `code_quality` | Code quality | `read`, `write` |
+| {% endif %} |
 | `security_events` | Code scanning alerts | `read`, `write` |
 | `codespaces` | Codespaces | `read`, `write` |
 | `codespaces_lifecycle_admin` | Codespaces lifecycle admin | `read`, `write` |

content/billing/concepts/product-billing/github-codespaces.md

@@ -35,6 +35,11 @@ In addition, any prebuilt codespaces are generated using actions minutes, see [A
 
 The compute time for a codespace is the length of time for which that codespace is active. Total use of compute time for each processor type is calculated by summing the time used by all codespaces billable to a particular account. These totals are reported to the billing service every hour, and are billed monthly.
 
+* **Compute time:** Your included compute hours reset to the full amount at the start of each billing cycle. Compute usage is charged to the account that owns the codespace.
+* **Storage:** Storage charges accumulate throughout the month based on hourly usage. Your accrued storage charges reset to zero at the start of each billing cycle.
+
+For more information about billing cycles, see [AUTOTITLE](/billing/concepts/billing-cycles).
+
 ### Storage volume for codespaces
 
 Storage is a time-based measurement of the amount of storage used in GB-hours. The storage measured for codespaces includes:

content/billing/how-tos/set-up-payment/manage-payment-info.md

@@ -24,7 +24,7 @@ category:
   - Set up payment
 ---
 
-The payment methods available depend on your account type. Enterprise and organization accounts have more payment options than personal accounts. Invoiced enterprise accounts make their payments using other methods. For more information, see [AUTOTITLE](/billing/reference/supported-payment-methods).
+The payment methods available depend on your account type. Enterprise and organization accounts have more payment options than personal accounts. Invoiced enterprise accounts make their payments using other methods. For more information, see [AUTOTITLE](/billing/reference/payment-methods).
 
 ## Managing payment information
 

content/billing/reference/index.md

@@ -20,6 +20,6 @@ children:
   - /product-and-sku-names
   - /product-usage-included
   - /roles-for-visual-studio
-  - /supported-payment-methods
+  - /payment-methods
 contentType: reference
 ---

content/billing/reference/payment-methods.md

@@ -0,0 +1,41 @@
+---
+title: Payment methods
+shortTitle: Payment methods
+intro: 'Reference information for supported payment methods for {% data variables.product.github %}.'
+versions:
+  fpt: '*'
+  ghec: '*'
+  ghes: '*'
+contentType: reference
+category:
+  - Set up payment
+redirect_from:
+  - /billing/reference/supported-payment-methods
+---
+
+The payment methods available to you depend on your account type and the products you use.
+
+## Self-serve accounts
+
+Self-serve accounts can use the following payment methods:
+
+* Credit card
+* PayPal
+* Azure Subscription ID (not personal accounts)
+
+## Invoiced accounts
+
+Invoiced accounts can use different payment methods for volume-licensed products (such as {% data variables.product.prodname_ghe_cloud %} and {% data variables.product.prodname_GH_advanced_security %}) and metered products (such as {% data variables.product.prodname_github_codespaces %}). You can combine payment methods for different product types. For example, you can use invoice for volume products and Azure Subscription ID for metered products.
+
+| Payment method | Volume products | Metered products |
+|---|---|---|
+| Credit card | {% octicon "x" aria-label="Not supported" %} | {% octicon "check" aria-label="Supported" %} |
+| PayPal | {% octicon "x" aria-label="Not supported" %} | {% octicon "check" aria-label="Supported" %} |
+| Azure Subscription ID | {% octicon "x" aria-label="Not supported" %} | {% octicon "check" aria-label="Supported" %} |
+| Invoice | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} |
+| Prepaid credits | {% octicon "check" aria-label="Supported" %} | {% octicon "x" aria-label="Not supported" %} |
+| Purchase order | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} |
+| ACH | {% octicon "x" aria-label="Not supported" %} | {% octicon "check" aria-label="Supported" %} |
+
+> [!NOTE]
+> For purchase orders, contact [{% data variables.product.github %}'s Sales team](https://github.com/enterprise/contact?scid=&utm_campaign=2023q3-site-ww-PremiumSupport&utm_content=Premium+Support&utm_medium=referral&utm_source=github).

content/code-security/reference/secret-security/supported-secret-scanning-patterns.md

@@ -109,11 +109,7 @@ Precision levels are estimated based on the pattern type's typical false positiv
 >[!NOTE] Push protection and validity checks are not supported for passwords.
 {% endif %}
 
-<<<<<<< HEAD
-### Default patterns
-=======
 ## Supported provider patterns
->>>>>>> origin/main
 
 Use the table below to search, filter, and browse all supported patterns. You can filter by provider name, push protection support, validity checks, and more.
 

content/copilot/concepts/mcp-management.md

@@ -10,7 +10,7 @@ category:
   - Manage Copilot for a team
 ---
 
-You can manage Model Context Protocol (MCP) server usage in your organization or enterprise by configuring a series of MCP policies on {% data variables.product.prodname_dotcom_the_website %}. Through these policies, you can allow or block MCP server usage entirely, or restrict access to a list of servers that you define in an MCP registry.
+You can manage Model Context Protocol (MCP) server usage in your organization or enterprise by configuring a series of MCP policies on {% data variables.product.prodname_dotcom_the_website %}. Through these policies, you can allow or block MCP server usage entirely, or restrict access to a list of servers that you define in an MCP registry. These policies apply to supported IDEs and {% data variables.copilot.copilot_cli_short %}.
 
 ## MCP registries
 

content/copilot/get-started/resources-for-approval.md

@@ -68,7 +68,3 @@ Even if you're only using {% data variables.product.github %} to grant access to
 ## Further questions
 
 If teams have questions that aren't addressed by these resources, contact your account manager or {% data variables.contact.contact_enterprise_sales %}.
-
-## Next steps
-
-Once teams have signed off on {% data variables.product.prodname_copilot_short %}, you can choose a plan for your enterprise. See [AUTOTITLE](/copilot/get-started/choose-enterprise-plan).

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

@@ -62,11 +62,4 @@ If your enterprise has a {% data variables.copilot.copilot_enterprise_short %} p
        * If your enterprise has a {% data variables.copilot.copilot_business_short %} plan, click **Enabled**.
        * If your enterprise has a {% data variables.copilot.copilot_enterprise_short %} plan, click either **Copilot: Enterprise** or **Copilot: Business** to assign a specific Copilot plan to the organization.
 
-### Next steps
-
 After you've enabled {% data variables.product.prodname_copilot_short %} for an organization in your enterprise, owners of the organization can grant access to some or all members of the organization. See [AUTOTITLE](/copilot/managing-github-copilot-in-your-organization/managing-access-for-copilot-business-in-your-organization).
-
-## Further reading
-
-* [AUTOTITLE](/billing/managing-billing-for-github-copilot/about-billing-for-github-copilot)
-* [AUTOTITLE](/copilot/managing-copilot/managing-copilot-for-your-enterprise/managing-policies-and-features-for-copilot-in-your-enterprise)

content/copilot/how-tos/administer-copilot/manage-for-enterprise/manage-agents/monitor-agentic-activity.md

@@ -23,6 +23,4 @@ category:
 {% data reusables.enterprise-accounts.ai-controls-tab %}
 1. To see a list of agentic activity in your enterprise over the last 180 days, at the bottom of the page, click {% octicon "log" aria-hidden="true" aria-label="log" %} **Audit logs**.
 
-## Next steps
-
 For help interpreting the audit log events for agentic activity, see [AUTOTITLE](/copilot/reference/agentic-audit-log-events).

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

@@ -49,7 +49,3 @@ To view a record of agent activity, use the `actor:Copilot` search term. See [AU
 ## 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-mcp-usage/configure-mcp-registry.md

@@ -41,16 +41,17 @@ For more details and example JSON responses to requests, see the [Official MCP R
 
 #### Support for the v0.1 specification
 
-While the MCP registry launched using the v0 specification, that version is now considered unstable and should not be implemented. Instead, create your registry according to the v0.1 specification, which is supported in the following IDEs:
+While the MCP registry launched using the v0 specification, that version is now considered unstable and should not be implemented. Instead, create your registry according to the v0.1 specification, which is supported in the following surfaces:
 
-| IDE           | v0.1 support |
+| Surface       | v0.1 support |
 | ---------------------- | ----------------- |
 | {% data variables.product.prodname_vscode_shortname %} Insiders | {% octicon "check" aria-label="Supported" %}  |
 | {% data variables.product.prodname_vscode_shortname %}   | {% octicon "check" aria-label="Supported" %} |
 | {% data variables.product.prodname_vs %}      | {% octicon "check" aria-label="Supported" %} |
 | Eclipse | {% octicon "check" aria-label="Supported" %} |
 | JetBrains IDEs     | {% octicon "check" aria-label="Supported" %} |
 | Xcode    | {% octicon "check" aria-label="Supported" %} |
+| {% data variables.copilot.copilot_cli_short %} | {% octicon "check" aria-label="Supported" %} |
 
 ### Cross-Origin Resource Sharing requirements
 

content/copilot/how-tos/administer-copilot/manage-mcp-usage/configure-mcp-server-access.md

@@ -1,6 +1,6 @@
 ---
 title: Configure MCP server access for your organization or enterprise
-intro: You can configure an MCP registry URL and access control policy to determine which MCP servers developers can discover and use in supported IDEs with {% data variables.product.prodname_copilot %}.
+intro: You can configure an MCP registry URL and access control policy to determine which MCP servers developers can discover and use in supported IDEs and {% data variables.copilot.copilot_cli_short %}.
 permissions: Enterprise owners and organization owners
 product: '{% data variables.copilot.copilot_enterprise_short %} or {% data variables.copilot.copilot_business_short %}'
 versions:

content/copilot/how-tos/copilot-cli/administer-copilot-cli-for-your-enterprise.md

@@ -4,6 +4,7 @@ shortTitle: Administer for enterprise
 intro: 'Control the use of {% data variables.copilot.copilot_cli_short %} within your enterprise.'
 versions:
   feature: copilot
+permissions: Enterprise owners and AI managers
 contentType: how-tos
 allowTitleToDifferFromFilename: true
 category:
@@ -15,7 +16,7 @@ docsTeamMetrics:
 
 ## Enabling or disabling {% data variables.copilot.copilot_cli_short %}
 
-**Enterprise owners** can control the use of {% data variables.copilot.copilot_cli_short %} by configuring a policy.
+You can control the use of {% data variables.copilot.copilot_cli_short %} by configuring a policy.
 
 {% data reusables.enterprise-accounts.access-enterprise %}
 {% data reusables.enterprise-accounts.ai-controls-tab %}
@@ -38,6 +39,10 @@ Users can only access AI models that are enabled at the enterprise level. When y
 
 Enterprise-configured custom agents are available to use with {% data variables.copilot.copilot_cli_short %}.
 
+### MCP server policies
+
+Enterprise and organization MCP policies apply to {% data variables.copilot.copilot_cli_short %}. You can configure an MCP registry URL so developers can discover approved servers, and set an allowlist policy to restrict which MCP servers can run. For more information, see [AUTOTITLE](/copilot/how-tos/administer-copilot/manage-mcp-usage/configure-mcp-server-access).
+
 ### {% data variables.copilot.copilot_cloud_agent %} enablement
 
 Both the {% data variables.copilot.copilot_cli_short %} policy and the {% data variables.copilot.copilot_cloud_agent %} policy must be enabled for users to be able to use the `/delegate` command in {% data variables.copilot.copilot_cli_short %}.
@@ -54,7 +59,6 @@ Users must have an assigned {% data variables.product.prodname_copilot %} seat t
 
 All other controls do **not** affect {% data variables.copilot.copilot_cli_short %}, notably:
 
-* **Model Context Protocol (MCP) server policies**: Enterprise policies that control whether MCP servers can be used, or which MCP registry servers are allowed
 * **IDE-specific policies**: Policies configured for specific IDEs or editor extensions
 * **Content exclusions**: File path-based content exclusions
 * **User-configured model providers (BYOK)**: Users can configure {% data variables.copilot.copilot_cli_short %} to use their own model providers via environment variables. This is configured at the _user level_ and cannot be controlled by enterprise policies.