Skip to content

Commit cbc4169

Browse files
authored
Merge branch 'main' into repo-sync
2 parents 4419c9d + 8fa75ba commit cbc4169

2 files changed

Lines changed: 12 additions & 6 deletions

File tree

content/github/site-policy/github-terms-for-additional-products-and-features.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ When you use GitHub, you may be given access to lots of additional products and
1616
By using the Additional Products and Features, you also agree to the applicable GitHub Terms for Additional Products and Features listed below. A violation of these GitHub terms for Additional Product and Features is a violation of the Agreement. Capitalized terms not defined here have the meaning given in the Agreement.
1717

1818
**For Enterprise users**
19-
- **GitHub Enterprise Cloud** users may have access to the following Additional Products and Features: Actions, Advanced Security, Advisory Database, Codespaces, Dependabot Preview, Learning Lab, Octoshift, Packages and Pages.
19+
- **GitHub Enterprise Cloud** users may have access to the following Additional Products and Features: Actions, Advanced Security, Advisory Database, Codespaces, Dependabot Preview, GitHub Enterprise Importer, Learning Lab, Packages, and Pages.
2020

21-
- **GitHub Enterprise Server** users may have access to the following Additional Products and Features: Actions, Advanced Security, Advisory Database, Connect, Dependabot Preview, Learning Lab, Octoshift, Packages, Pages and SQL Server Images.
21+
- **GitHub Enterprise Server** users may have access to the following Additional Products and Features: Actions, Advanced Security, Advisory Database, Connect, Dependabot Preview, GitHub Enterprise Importer, Learning Lab, Packages, Pages, and SQL Server Images.
2222

23-
- **GitHub AE** users may have access to the following Additional Products and Features: Actions, Advanced Security, Advisory Database,{% ifversion ghae-next %}Connect, {% endif %}Dependabot Preview, Octoshift, Packages and Pages.
23+
- **GitHub AE** users may have access to the following Additional Products and Features: Actions, Advanced Security, Advisory Database, {% ifversion ghae-next %}Connect, {% endif %}Dependabot Preview, GitHub Enterprise Importer, Packages and Pages.
2424

2525
## Actions
2626
GitHub Actions enables you to create custom software development lifecycle workflows directly in your GitHub repository. Actions is billed on a usage basis. The [Actions documentation](/actions) includes details, including compute and storage quantities (depending on your Account plan), and how to monitor your Actions minutes usage and set usage limits.
@@ -70,6 +70,9 @@ The generally available version of Codespaces is not currently available for U.S
7070
## Connect
7171
With GitHub Connect, you can share certain features and data between your GitHub Enterprise Server {% ifversion ghae-next %}or GitHub AE {% endif %}instance and your GitHub Enterprise Cloud organization or enterprise account on GitHub.com. In order to enable GitHub Connect, you must have at least one (1) account on GitHub Enterprise Cloud or GitHub.com, and one (1) licensed instance of GitHub Enterprise Server{% ifversion ghae-next %} or GitHub AE{% endif %}. Your use of GitHub Enterprise Cloud or GitHub.com through Connect is governed by the terms under which you license GitHub Enterprise Cloud or GitHub.com. Use of Personal Data is governed by the [GitHub Privacy Statement](/github/site-policy/github-privacy-statement).
7272

73+
## GitHub Enterprise Importer
74+
Importer is a framework for exporting data from other sources to be imported to the GitHub platform. Importer is provided “AS-IS”.
75+
7376
## Learning Lab
7477
GitHub Learning Lab offers free interactive courses that are built into GitHub with instant automated feedback and help.
7578

@@ -86,9 +89,6 @@ Use of Personal Data is governed by the [GitHub Privacy Statement](/github/site-
8689
## npm
8790
npm is a software package hosting service that allows you to host your software packages privately or publicly and use packages as dependencies in your projects. npm is the registry of record for the JavaScript ecosystem. The npm public registry is free to use but customers are billed if they want to publish private packages or manage private packages using teams. The [npm documentation](https://docs.npmjs.com/) includes details about the limitation of account types and how to manage [private packages](https://docs.npmjs.com/about-private-packages) and [organizations](https://docs.npmjs.com/organizations). Acceptable use of the npm registry is outlined in the [open-source terms](https://www.npmjs.com/policies/open-source-terms). There are supplementary terms for both the npm [solo](https://www.npmjs.com/policies/solo-plan) and [org](https://www.npmjs.com/policies/orgs-plan) plans. The npm [Terms of Use](https://www.npmjs.com/policies/terms) apply to your use of npm.
8891

89-
## Octoshift
90-
Octoshift is a framework for exporting data from other sources to be imported to the GitHub platform. Octoshift is provided “AS-IS”.
91-
9292
## Packages
9393
GitHub Packages is a software package hosting service that allows you to host your software packages privately or publicly and use packages as dependencies in your projects. GitHub Packages is billed on a usage basis. The [Packages documentation](/packages/learn-github-packages/introduction-to-github-packages) includes details, including bandwidth and storage quantities (depending on your Account plan), and how to monitor your Packages usage and set usage limits. Packages bandwidth usage is limited by the [GitHub Acceptable Use Polices](/github/site-policy/github-acceptable-use-policies).
9494

data/reusables/secret-scanning/partner-secret-list-private-repo.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,3 +211,9 @@ Twilio | Twilio Account String Identifier | twilio_account_sid
211211
Twilio | Twilio API Key | twilio_api_key
212212
{%- ifversion fpt or ghec or ghes > 3.3 %}
213213
Typeform | Typeform Personal Access Token | typeform_personal_access_token{% endif %}
214+
{%- ifversion fpt or ghec or ghes > 3.3 %}
215+
Yandex | Yandex.Cloud API Key | yandex_cloud_api_key{% endif %}
216+
{%- ifversion fpt or ghec or ghes > 3.3 %}
217+
Yandex | Yandex.Cloud IAM Cookie | yandex_cloud_iam_cookie{% endif %}
218+
{%- ifversion fpt or ghec or ghes > 3.3 %}
219+
Yandex | Yandex.Cloud IAM Token | yandex_cloud_iam_token{% endif %}

0 commit comments

Comments
 (0)