Repo sync

components/ui/MarkdownContent/stylesheets/table.scss

@@ -6,18 +6,19 @@
     font-size: 90%;
     width: 100%;
     line-height: 1.5;
-    /* We want to keep table-layout: auto so that column widths dynamically adjust;
-  otherwise entries get needlessly squashed into narrow columns. As a workaround,
-  we use components/lib/wrap-code-terms.js to prevent some reference table content
-  from expanding beyond the horizontal boundaries of the parent element. */
-    table-layout: auto;
 
-    /* For mobile (small viewports) we need to fix the table because if the table 
-    is larger than the viewport it will force the width of the table causing issues
-    with the header on scroll 
-    */
-    @media (max-width: 544px) {
-      table-layout: fixed;
+    // For mobile (small viewports) we need to fix the table
+    // because if the table is larger than the viewport
+    // it will force the width of the table causing issues
+    // with the header on scroll
+    table-layout: fixed;
+
+    // We want to keep table-layout: auto so that column widths dynamically adjust;
+    // otherwise entries get needlessly squashed into narrow columns. As a workaround,
+    // we use components/lib/wrap-code-terms.js to prevent some reference table content
+    // from expanding beyond the horizontal boundaries of the parent element.
+    @media (min-width: 544px) {
+      table-layout: auto;
     }
 
     code {

content/authentication/securing-your-account-with-two-factor-authentication-2fa/configuring-two-factor-authentication.md

@@ -107,8 +107,10 @@ Before using this method, be sure that you can receive text messages. Carrier ra
 {% data reusables.user-settings.security %}
 {% data reusables.two_fa.enable-two-factor-authentication %}
 1. At the bottom of the page, next to "SMS authentication", click **Select**.
+1. Complete the CAPTCHA challenge, which helps protect against spam and abuse. 
 1. Under "Setup SMS authentication", select your country code and type your mobile phone number, including the area code. When your information is correct, click **Send authentication code**.
 1. You'll receive a text message with a security code. On {% data variables.product.product_name %}, type the code into the field under "Verify the code sent to your phone" and click **Continue**.
+   - If you need to edit the phone number you entered, you'll need to complete another CAPTCHA challenge.
 {% data reusables.two_fa.save_your_recovery_codes_during_2fa_setup %}
 {% data reusables.two_fa.backup_options_during_2fa_enrollment %}
 

content/billing/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security.md

@@ -56,7 +56,9 @@ You can determine how many licenses you'll need for {% data variables.product.pr
 {% endif %}
 
 {% ifversion ghec %}
-If you use {% data variables.product.prodname_ghe_cloud %} with an enterprise account and pay with a credit card, you can purchase a {% data variables.product.prodname_GH_advanced_security %} license from your enterprise account settings. For more information, see "[AUTOTITLE](/billing/managing-billing-for-github-advanced-security/signing-up-for-github-advanced-security)."
+If you use {% data variables.product.prodname_ghe_cloud %} with an enterprise account and pay with a credit card, you can purchase a {% data variables.product.prodname_GH_advanced_security %} license or start a free trial from your enterprise account settings. For more information, see "[AUTOTITLE](/billing/managing-billing-for-github-advanced-security/signing-up-for-github-advanced-security)" and "[AUTOTITLE](/billing/managing-billing-for-github-advanced-security/setting-up-a-trial-of-github-advanced-security)." 
+
+You can not purchase {% data variables.product.prodname_GH_advanced_security %} or start a {% data variables.product.prodname_GH_advanced_security %} trial if you are currently on a {% data variables.product.prodname_ghe_cloud %} trial.
 
 If you pay by invoice, contact {% data variables.contact.contact_enterprise_sales %} to discuss licensing {% data variables.product.prodname_GH_advanced_security %} for your enterprise.
 

content/billing/managing-billing-for-github-advanced-security/index.md

@@ -11,6 +11,7 @@ versions:
   ghes: '*'
   ghec: '*'
 children:
+  - /setting-up-a-trial-of-github-advanced-security
   - /about-billing-for-github-advanced-security
   - /signing-up-for-github-advanced-security
   - /viewing-committer-information-for-github-advanced-security

content/billing/managing-billing-for-github-advanced-security/setting-up-a-trial-of-github-advanced-security.md

@@ -0,0 +1,41 @@
+---
+title: Setting up a trial of GitHub Advanced Security
+intro: 'You can evaluate the extra security features that {% data variables.product.prodname_dotcom %} makes available to customers with a {% data variables.product.prodname_GH_advanced_security %} license by setting up a free trial of {% data variables.product.prodname_GH_advanced_security %}.'
+product: '{% data reusables.gated-features.ghas %}'
+versions:
+  ghec: '*'
+type: how_to
+topics:
+  - Advanced Security
+  - Enterprise
+shortTitle: Set up an Advanced Security trial
+---
+
+## About trials of {% data variables.product.prodname_GH_advanced_security %}
+{% data variables.product.prodname_GH_advanced_security %} provides features that help you improve and maintain the security and quality of code. For more information, see "[AUTOTITLE](/get-started/learning-about-github/about-github-advanced-security)."
+
+ If you use {% data variables.product.prodname_ghe_cloud %} with an enterprise account and pay with a credit card, you can set up a 14-day trial to evaluate the features that come with {% data variables.product.prodname_GH_advanced_security %}, such as code scanning, secret scanning, and dependency review. During the trial, you can add any number of committers and enable {% data variables.product.prodname_GH_advanced_security %} for any number of organizations.
+
+## Setting up your trial of {% data variables.product.prodname_GH_advanced_security %}
+
+{% data reusables.enterprise-accounts.access-enterprise %}
+{% data reusables.enterprise-accounts.settings-tab %}
+{% data reusables.enterprise-accounts.license-tab %}
+1. To the right of "{% data variables.product.prodname_GH_advanced_security %}", click **Start free trial**. 
+2. Click **Start trial**.
+
+## Finishing your trial
+
+You can finish your trial at any time by purchasing {% data variables.product.prodname_GH_advanced_security %}. If you haven't purchased {% data variables.product.prodname_GH_advanced_security %} by the end of the 14 days, your trial will expire.
+
+{% data reusables.enterprise-accounts.access-enterprise %}
+{% data reusables.enterprise-accounts.settings-tab %}
+{% data reusables.enterprise-accounts.license-tab %}
+1. To the right of "{% data variables.product.prodname_GH_advanced_security %} trial", select the **Manage** dropdown menu and click **Purchase**.
+{% data reusables.advanced-security.purchase-ghas %}
+
+## Further reading
+
+- "[AUTOTITLE](/get-started/learning-about-github/about-github-advanced-security)"
+- "[AUTOTITLE](/code-security/adopting-github-advanced-security-at-scale)"
+- "[AUTOTITLE](/code-security/getting-started/securing-your-organization)"

content/billing/managing-billing-for-github-advanced-security/signing-up-for-github-advanced-security.md

@@ -1,6 +1,6 @@
 ---
 title: Signing up for GitHub Advanced Security
-intro: 'You can sign up for {% data variables.product.prodname_GH_advanced_security %} from your enterprise account''s settings to take advantage of extra security features that {% data variables.product.prodname_dotcom %} makes available to customers under a {% data variables.product.prodname_GH_advanced_security %} license.'
+intro: "You can sign up for {% data variables.product.prodname_GH_advanced_security %} from your enterprise account's settings to take advantage of extra security features that {% data variables.product.prodname_dotcom %} makes available to customers under a {% data variables.product.prodname_GH_advanced_security %} license."
 permissions: 'Enterprise owners can sign up for {% data variables.product.prodname_GH_advanced_security %}.'
 product: '{% data reusables.gated-features.ghas-ghec %}'
 versions:
@@ -18,9 +18,7 @@ shortTitle: Sign up for Advanced Security
 1. To the right of "GitHub Advanced Security", click **Buy Advanced Security**. 
 
    ![Screenshot of the {% data variables.product.prodname_GH_advanced_security %} section of the enterprise licensing screen. The "Buy Advanced Security" button is highlighted with an orange outline.](/assets/images/help/enterprises/ghas-buy-advanced-security-button.png)
-2. Under "How many committers do you want to include?", enter the number of committers for which you want to purchase licenses. For more information about committer numbers, see "[AUTOTITLE](/billing/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security)."
-3. Confirm your billing information and payment method.
-4. Click **Purchase Advanced Security**.
+1. {% data reusables.advanced-security.purchase-ghas %}
 
 ## Further reading
 * [Introduction to adopting {% data variables.product.prodname_GH_advanced_security %} at scale](/code-security/adopting-github-advanced-security-at-scale/introduction-to-adopting-github-advanced-security-at-scale)

content/billing/managing-billing-for-github-codespaces/about-billing-for-github-codespaces.md

@@ -203,6 +203,10 @@ If a machine type that has more resources is chosen, this will affect the per-ho
 
 Organization owners can create a policy to limit the choice of machine types available to users for codespaces that are billed to an organization or enterprise account. For more information, see "[AUTOTITLE](/codespaces/managing-codespaces-for-your-organization/restricting-access-to-machine-types)."
 
+## Limiting the number of organization-owned codespaces
+
+Organization owners can limit the number of codespaces that people can create, where the organization will be billed for the codespace. This can help to reduce storage charges for the organization. For more information, see "[AUTOTITLE](/codespaces/managing-codespaces-for-your-organization/restricting-the-number-of-organization-billed-codespaces-a-user-can-create)."
+
 ## How billing is handled for forked repositories
 
 Usage of codespaces created from a forked repository will be billed to your personal account unless the upstream (or parent) repository is in an organization that has allowed you - as a member, or outside collaborator, of the organization - to use codespaces at the organization's expense.

content/code-security/getting-started/github-security-features.md

@@ -87,6 +87,8 @@ The following {% data variables.product.prodname_GH_advanced_security %} feature
 {% elsif ghec %}
 Many {% data variables.product.prodname_GH_advanced_security %} features are available and free of charge for public repositories on {% data variables.product.prodname_dotcom_the_website %}. Organizations within an enterprise that have a {% data variables.product.prodname_GH_advanced_security %} license can use the following features on all their repositories. {% data reusables.advanced-security.more-info-ghas %}
 
+{% data reusables.advanced-security.ghas-trial %}
+
 {% elsif ghes %}
 {% data variables.product.prodname_GH_advanced_security %} features are available for enterprises with a license for {% data variables.product.prodname_GH_advanced_security %}. The features are restricted to repositories owned by an organization. {% data reusables.advanced-security.more-info-ghas %}
 

content/codespaces/managing-codespaces-for-your-organization/index.md

@@ -16,6 +16,7 @@ children:
   - /managing-repository-access-for-your-organizations-codespaces
   - /reviewing-your-organizations-audit-logs-for-github-codespaces
   - /restricting-access-to-machine-types
+  - /restricting-the-number-of-organization-billed-codespaces-a-user-can-create
   - /restricting-the-base-image-for-codespaces
   - /restricting-the-visibility-of-forwarded-ports
   - /restricting-the-idle-timeout-period

content/codespaces/managing-codespaces-for-your-organization/managing-the-cost-of-github-codespaces-in-your-organization.md

@@ -44,6 +44,8 @@ You can disable all use of {% data variables.product.prodname_github_codespaces
 
 {% data reusables.codespaces.codespaces-disabling-org-billing %}
 
+You can limit the number of codespaces that people can create, where the organization will be billed for the codespace. This can help to reduce codespace storage charges for your organization. For more information, see "[AUTOTITLE](/codespaces/managing-codespaces-for-your-organization/restricting-the-number-of-organization-billed-codespaces-a-user-can-create)."
+
 You can configure which repositories can be accessed from codespaces created for a particular repository. For more information, see "[AUTOTITLE](/codespaces/managing-your-codespaces/managing-repository-access-for-your-codespaces)."
 
 You can limit the choice of types of machine that are available for codespaces created from repositories owned by your organization. This allows you to prevent people using overly resourced machines for their codespaces, and incurring unnecessary charges. For more information, see "[AUTOTITLE](/codespaces/managing-codespaces-for-your-organization/restricting-access-to-machine-types)."

content/codespaces/managing-codespaces-for-your-organization/restricting-access-to-machine-types.md

@@ -57,8 +57,10 @@ If you add an organization-wide policy, you should set it to the largest choice
 
    ![Screenshot of the "Allowed values" dropdown with options for four machine types. The options for 2-core and 4-core machines are selected.](/assets/images/help/codespaces/edit-machine-constraint.png)
 
+1. Click outside of the dialog box to close it.
 {% data reusables.codespaces.codespaces-policy-targets %}
 1. If you want to add another constraint to the policy, click **Add constraint** and choose another constraint. For information about other constraints, see:
+   * "[AUTOTITLE](/codespaces/managing-codespaces-for-your-organization/restricting-the-number-of-organization-billed-codespaces-a-user-can-create)"
    * "[AUTOTITLE](/codespaces/managing-codespaces-for-your-organization/restricting-the-base-image-for-codespaces)"
    * "[AUTOTITLE](/codespaces/managing-codespaces-for-your-organization/restricting-the-visibility-of-forwarded-ports)"
    * "[AUTOTITLE](/codespaces/managing-codespaces-for-your-organization/restricting-the-idle-timeout-period)"

content/codespaces/managing-codespaces-for-your-organization/restricting-the-base-image-for-codespaces.md

@@ -67,9 +67,11 @@ For example, you could create an organization-wide policy that restricts the bas
 
 1. Click {% octicon "plus" aria-label="Add button" %} to add the value.
 1. If required, repeat the previous two steps to add more image URLs.
+1. Click outside of the dialog box to close it.
 {% data reusables.codespaces.codespaces-policy-targets %}
 1. If you want to add another constraint to the policy, click **Add constraint** and choose another constraint. For information about other constraints, see:
    * "[AUTOTITLE](/codespaces/managing-codespaces-for-your-organization/restricting-access-to-machine-types)"
+   * "[AUTOTITLE](/codespaces/managing-codespaces-for-your-organization/restricting-the-number-of-organization-billed-codespaces-a-user-can-create)"
    * "[AUTOTITLE](/codespaces/managing-codespaces-for-your-organization/restricting-the-visibility-of-forwarded-ports)"
    * "[AUTOTITLE](/codespaces/managing-codespaces-for-your-organization/restricting-the-idle-timeout-period)"
    * "[AUTOTITLE](/codespaces/managing-codespaces-for-your-organization/restricting-the-retention-period-for-codespaces)"

content/codespaces/managing-codespaces-for-your-organization/restricting-the-idle-timeout-period.md

@@ -56,6 +56,7 @@ If you add an organization-wide policy with a timeout constraint, you should set
 {% data reusables.codespaces.codespaces-policy-targets %}
 1. If you want to add another constraint to the policy, click **Add constraint** and choose another constraint. For information about other constraints, see:
    * "[AUTOTITLE](/codespaces/managing-codespaces-for-your-organization/restricting-access-to-machine-types)"
+   * "[AUTOTITLE](/codespaces/managing-codespaces-for-your-organization/restricting-the-number-of-organization-billed-codespaces-a-user-can-create)"
    * "[AUTOTITLE](/codespaces/managing-codespaces-for-your-organization/restricting-the-base-image-for-codespaces)"
    * "[AUTOTITLE](/codespaces/managing-codespaces-for-your-organization/restricting-the-visibility-of-forwarded-ports)"
    * "[AUTOTITLE](/codespaces/managing-codespaces-for-your-organization/restricting-the-retention-period-for-codespaces)"