Repo sync

content/billing/managing-your-billing/managing-your-payment-and-billing-information.md

@@ -10,6 +10,10 @@ redirect_from:
   - /billing/using-the-billing-platform/adding-information-to-your-receipts
   - /billing/using-the-billing-platform/setting-your-billing-email
   - /billing/using-the-new-billing-platform/managing-your-payment-and-billing-information
+  - /billing/managing-your-github-billing-settings/adding-or-editing-a-payment-method
+  - /billing/managing-your-github-billing-settings/adding-information-to-your-receipts
+  - /billing/managing-your-github-billing-settings/setting-your-billing-email
+  - /billing/managing-your-github-billing-settings/viewing-your-payment-history-and-receipts
 type: how_to
 topics:
   - Enterprise
@@ -101,18 +105,26 @@ You can view and edit your billing information, update your payment method, and
 
 You can view your payment history, including the date, amount, and payment method. You can also download past payments.
 
-1. Display the **Billing & Licensing** section of the sidebar of the {% data variables.enterprise.enterprise_or_org %} settings.
+1. Display the **Billing and Licensing** {% ifversion fpt %}section of the sidebar of the organization settings{% else %}page for the enterprise{% endif %}.
 1. Click **Payment history**.
 
-{% ifversion ghec %}
-
 ## Managing billing contacts
 
 You can add an email address to receive billing notifications regarding payments and budget threshold alerts.
 
-1. Display the **Billing & Licensing** section of the sidebar of the enterprise settings.
+{% ifversion fpt %}
+
+1. Display the **Billing and Licensing** section of the sidebar of the organization settings.
+1. Click **Additional billing details**.
+1. In the table of "Email recipients":
+   * Click **Add** and follow the prompt to add a new billing contact.
+   * Use the **Edit** drop-down for a contact to either remove the contact or make that contact the primary billing contact.
+
+{% else %}
+
+1. Display the **Billing and Licensing** page for the enterprise.
 1. Click **Billing contacts**.
 1. Click **Add** in the upper-right corner and follow the prompt.
-1. Click {% octicon "pencil" aria-label="The edit icon" %} to edit the primary billing contact or {% octicon "kebab-horizontal" aria-label="Show options" %} to either remove or make a contact the primary billing contact.
+1. Click {% octicon "pencil" aria-label="The edit icon" %} to edit the primary billing contact or {% octicon "kebab-horizontal" aria-label="Show options" %} to either remove a contact or make a contact the primary billing contact.
 
 {% endif %}

content/code-security/secret-scanning/managing-alerts-from-secret-scanning/about-alerts.md

@@ -25,12 +25,12 @@ allowTitleToDifferFromFilename: true
 
 When {% data variables.product.company_short %} detects a supported secret in a repository that has {% data variables.product.prodname_secret_scanning %} enabled, a {% ifversion fpt or ghec %}user {% else %}{% data variables.product.prodname_secret_scanning %}{% endif %} alert is generated and displayed in the **Security** tab of the repository.
 
-{% ifversion fpt or ghec %}User {% else %}{% data variables.product.prodname_secret_scanning %} {% endif %}alerts can be of the following types:
+{% ifversion fpt or ghec %}User {% else %}{% data variables.product.prodname_secret_scanning_caps %} {% endif %}alerts can be of the following types:
 
 * {% ifversion secret-scanning-alert-experimental-list %}Default{% else %}High confidence{% endif %} alerts, which relate to supported patterns and specified custom patterns.
-* {% ifversion secret-scanning-alert-experimental-list %}Experimental{% else %}Other{% endif %} alerts, which can have a higher ratio of false positives or secrets used in tests.
+* {% ifversion secret-scanning-generic-tab %}Generic{% elsif ghes = 3.16 %}Experimental{% else %}Other{% endif %} alerts, which can have a higher ratio of false positives or secrets used in tests.
 
-{% data variables.product.prodname_dotcom %} displays {% ifversion secret-scanning-alert-experimental-list %}experimental{% else %}these "other"{% endif %} alerts in a different list to {% ifversion secret-scanning-alert-experimental-list %}default{% else %}high confidence{% endif %} alerts, making triaging a better experience for users. For more information, see [AUTOTITLE](/code-security/secret-scanning/managing-alerts-from-secret-scanning/viewing-alerts).
+{% data variables.product.prodname_dotcom %} displays {% ifversion secret-scanning-generic-tab %}generic{% elsif ghes = 3.16 %}experimental{% else %}these "other"{% endif %} alerts in a different list to {% ifversion secret-scanning-alert-experimental-list %}default{% else %}high confidence{% endif %} alerts, making triaging a better experience for users. For more information, see [AUTOTITLE](/code-security/secret-scanning/managing-alerts-from-secret-scanning/viewing-alerts).
 
 {% data reusables.secret-scanning.secret-scanning-pattern-pair-matches %}
 

content/code-security/secret-scanning/managing-alerts-from-secret-scanning/viewing-alerts.md

@@ -23,15 +23,20 @@ allowTitleToDifferFromFilename: true
 To help you triage alerts more effectively, {% data variables.product.company_short %} separates alerts into two lists:
 
 {% ifversion secret-scanning-alert-experimental-list %}
-* **Default** alerts
-* **Experimental** alerts
+* **Default** alerts{% ifversion secret-scanning-generic-tab %}
+* **Generic** alerts{% elsif ghes = 3.16 %}
+* **Experimental** alerts{% endif %}
+
+{% ifversion ghes = 3.16 %}
 
 {% ifversion secret-scanning-alert-experimental-list-toggle %}
 ![Screenshot of the {% data variables.product.prodname_secret_scanning %} alert view. The button to toggle between "Default" and "Experimental" alerts is highlighted with an orange outline.](/assets/images/enterprise/3.16/help/security/secret-scanning-default-alert-view.png)
 {% else %}
 ![Screenshot of the {% data variables.product.prodname_secret_scanning %} alert view. The sidebar menu items for "Default" and "Experimental" alerts are highlighted with an orange outline.](/assets/images/help/security/secret-scanning-default-alert-view.png)
 {% endif %}
 
+{% endif %}
+
 {% else %}
 * **High confidence** alerts.
 * **Other** alerts.
@@ -46,9 +51,9 @@ To help you triage alerts more effectively, {% data variables.product.company_sh
 
 The default alerts list displays alerts that relate to supported patterns and specified custom patterns. This is the main view for alerts.
 
-### Experimental alerts list
+### {% ifversion secret-scanning-generic-tab %}Generic{% elsif ghes = 3.16 %}Experimental{% endif %} alerts list
 
-The experimental alerts list displays alerts that relate to non-provider patterns (such as private keys){% ifversion secret-scanning-ai-generic-secret-detection %}, or generic secrets detected using AI (such as passwords){% endif %}. These types of alerts can have a higher rate of false positives or secrets used in tests. You can toggle to the experimental alerts list from the default alerts list.
+The {% ifversion secret-scanning-generic-tab %}generic{% elsif ghes = 3.16 %}experimental{% endif %} alerts list displays alerts that relate to non-provider patterns (such as private keys){% ifversion secret-scanning-ai-generic-secret-detection %}, or generic secrets detected using AI (such as passwords){% endif %}. These types of alerts can have a higher rate of false positives or secrets used in tests. You can toggle to the {% ifversion secret-scanning-generic-tab %}generic{% elsif ghes = 3.16 %}experimental{% endif %} alerts list from the default alerts list.
 
 {% else %}
 
@@ -71,7 +76,7 @@ For {% data variables.product.company_short %} to scan for non-provider patterns
 
 {% ifversion secret-scanning-alert-experimental-list %}
 
-{% data variables.product.github %} will continue to release new patterns and secret types to the experimental alerts list and will promote them to the default list when feature-complete (e.g. when they have an appropriately low volume and false positive rate).
+{% data variables.product.github %} will continue to release new patterns and secret types to the {% ifversion secret-scanning-generic-tab %}generic{% elsif ghes = 3.16 %}experimental{% endif %} alerts list and will promote them to the default list when feature-complete (e.g. when they have an appropriately low volume and false positive rate).
 
 {% endif %}
 
@@ -82,7 +87,7 @@ Alerts for {% data variables.product.prodname_secret_scanning %} are displayed u
 {% data reusables.repositories.navigate-to-repo %}
 {% data reusables.repositories.sidebar-security %}
 1. In the left sidebar, under "Vulnerability alerts", click **{% data variables.product.prodname_secret_scanning_caps %}**.
-1. Optionally, toggle to {% ifversion secret-scanning-alert-experimental-list %}"Experimental"{% else %}"Other"{% endif %} to see alerts for non-provider patterns{% ifversion secret-scanning-ai-generic-secret-detection %} or generic secrets detected using AI{% endif %}.
+1. Optionally, toggle to {% ifversion secret-scanning-generic-tab %}"Generic"{% elsif ghes = 3.16 %}"Experimental"{% else %}"Other"{% endif %} to see alerts for non-provider patterns{% ifversion secret-scanning-ai-generic-secret-detection %} or generic secrets detected using AI{% endif %}.
 1. Under "{% data variables.product.prodname_secret_scanning_caps %}", click the alert you want to view.
    {% ifversion secret-scanning-user-owned-repos %}
 
@@ -110,7 +115,9 @@ You can apply various filters to the alerts list to help you find the alerts you
 |`secret-type:SECRET-NAME`| Displays alerts for a specific secret type, for example, `secret-type:github_personal_access_token`. For a list of supported secret types, see [AUTOTITLE](/code-security/secret-scanning/introduction/supported-secret-scanning-patterns#supported-secret). |
 |`provider:PROVIDER-NAME`|Displays alerts for a specific provider, for example, `provider:github`. For a list of supported partners, see [AUTOTITLE](/code-security/secret-scanning/introduction/supported-secret-scanning-patterns#supported-secrets).|
 |{% ifversion secret-scanning-alert-experimental-list %}`results:default`{% else %}`confidence:high`{% endif %}| Displays alerts for {% ifversion secret-scanning-alert-experimental-list %}{% else %}high-confidence secrets, which relate to {% endif %}supported secrets and custom patterns. For a list of supported patterns, see [AUTOTITLE](/code-security/secret-scanning/introduction/supported-secret-scanning-patterns). |
-|{% ifversion secret-scanning-alert-experimental-list %}`results:experimental`{% else %}`confidence:other`{% endif %}| Displays alerts for non-provider patterns, such as private keys{% ifversion secret-scanning-ai-generic-secret-detection %}, and AI-detected generic secrets, such as passwords{% endif %}. For a list of supported non-provider patterns, see [AUTOTITLE](/code-security/secret-scanning/introduction/supported-secret-scanning-patterns#non-provider-patterns). {% ifversion secret-scanning-ai-generic-secret-detection %}For more information about AI-detected generic secrets, see [AUTOTITLE](/code-security/secret-scanning/copilot-secret-scanning/responsible-ai-generic-secrets).{% endif %}|
+|{% ifversion secret-scanning-generic-tab %}`results:generic`| Displays alerts for non-provider patterns, such as private keys{% ifversion secret-scanning-ai-generic-secret-detection %}, and AI-detected generic secrets, such as passwords{% endif %}. For a list of supported non-provider patterns, see [AUTOTITLE](/code-security/secret-scanning/introduction/supported-secret-scanning-patterns#non-provider-patterns). {% ifversion secret-scanning-ai-generic-secret-detection %}For more information about AI-detected generic secrets, see [AUTOTITLE](/code-security/secret-scanning/copilot-secret-scanning/responsible-ai-generic-secrets).{% endif %}{% endif %}|
+|{% ifversion ghes = 3.16 %}`results:experimental`| Displays alerts for non-provider patterns, such as private keys. For a list of supported non-provider patterns, see [AUTOTITLE](/code-security/secret-scanning/introduction/supported-secret-scanning-patterns#non-provider-patterns).{% endif %}|
+|{% ifversion ghes < 3.16 %}`confidence:other`| Displays alerts for non-provider patterns, such as private keys. For a list of supported non-provider patterns, see [AUTOTITLE](/code-security/secret-scanning/introduction/supported-secret-scanning-patterns#non-provider-patterns).{% endif %}|
 
 ## Next steps
 

content/code-security/security-overview/filtering-alerts-in-security-overview.md

@@ -194,11 +194,15 @@ All {% data variables.product.prodname_code_scanning %} alerts have one of the c
 | Qualifier | Description |
 | -------- | -------- |
 |`bypassed` | Display {% data variables.secret-scanning.alerts %} where push protection was bypassed (`true`) or not bypassed (`false`).|
-|{% ifversion secret-scanning-alert-experimental-list %}|
+|{% ifversion secret-scanning-generic-tab %}|
+|`results`|Display default (`default`) or generic (`generic`) {% data variables.secret-scanning.alerts %}.|
+|{% endif %}|
+| {% ifversion ghes = 3.16 %} |
 |`results`|Display default (`default`) or experimental (`experimental`) {% data variables.secret-scanning.alerts %}.|
-|{% else %}|
-|`confidence`|Display {% data variables.secret-scanning.alerts %} of high (`high`) or other (`other`) confidence.|
 |{% endif %}|
+|{% ifversion ghes < 3.16 %}|
+|`confidence`|Display {% data variables.secret-scanning.alerts %} of high (`high`) or other (`other`) confidence.|
+|{% endif %} |
 |`is`|Display {% data variables.secret-scanning.alerts %} that are open (`open`) or closed (`closed`).|
 |`provider` | Display alerts for all secrets issued by a specified provider, for example: `adafruit`.  |
 |`resolution`| Display {% data variables.secret-scanning.alerts %} closed as "false positive" (`false-positive`), "pattern deleted" (`pattern-deleted`), "pattern edited' (`pattern-edited`), "revoked" (`revoked`) "used in tests" (`used-in-tests`), or "won't fix" (`wont-fix`).|

data/features/secret-scanning-generic-tab.yml

@@ -0,0 +1,5 @@
+# Reference: #17438 - Rename the secret scanning "Experimental" tab to curb confusion on alert confidence [GA]
+versions:
+  fpt: '*'
+  ghec: '*'
+  ghes: '>3.16'

src/secret-scanning/data/public-docs.yml

@@ -4198,7 +4198,7 @@
   versions:
     fpt: '*'
     ghec: '*'
-  isPublic: false
+  isPublic: true
   isPrivateWithGhas: true
   hasPushProtection: false
   hasValidityCheck: false

src/secret-scanning/lib/config.json

@@ -1,5 +1,5 @@
 {
-  "sha": "b457d82c2b0f5088913dcd44896a3db352cc1155",
-  "blob-sha": "a08e918ef003ca9b95ddb1ad930e8f333beeb7a9",
+  "sha": "f1b9f72ec20df903039f28b8ff8abb0ec25d5a89",
+  "blob-sha": "3faaa576314802c2b4bfa13b6c57adbc19edd8e6",
   "targetFilename": "code-security/secret-scanning/introduction/supported-secret-scanning-patterns"
 }