Skip to content

Commit

Permalink
Merge pull request github#213 from github/repo-sync
Browse files Browse the repository at this point in the history
syncing with GitHub Help
  • Loading branch information
vollmera authored Feb 10, 2020
2 parents e34a0e4 + 2ac6f1d commit 3c81029
Show file tree
Hide file tree
Showing 37 changed files with 274 additions and 56 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ redirect_from:
- /articles/amendment-to-github-terms-of-service-applicable-to-government-users/
- /articles/proposed-amendment-to-github-terms-of-service-applicable-to-u-s-federal-government-users/
- /articles/amendment-to-github-terms-of-service-applicable-to-u-s-federal-government-users
- /articles/amendment-to-github-terms-of-service-applicable-to-us-federal-government-users
productVersions:
dotcom: '*'
englishOnly: true
---

{{#tip}}
Expand Down
2 changes: 1 addition & 1 deletion Policies/dmca-takedown-policy.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ redirect_from:
- /dmca-takedown/
- /dmca-takedown-policy/
- /articles/dmca-takedown/
- /articles/dmca-takedown-policy
productVersions:
dotcom: '*'
englishOnly: true
---

Welcome to GitHub's Guide to the Digital Millennium Copyright Act, commonly known as the "DMCA." This page is not meant as a comprehensive primer to the statute. However, if you've received a DMCA takedown notice targeting content you've posted on GitHub or if you're a rights-holder looking to issue such a notice, this page will hopefully help to demystify the law a bit as well as our policies for complying with it.
Expand Down
12 changes: 6 additions & 6 deletions Policies/github-additional-product-terms.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
title: GitHub Additional Product Terms
productVersions:
dotcom: '*'
englishOnly: true
---

When you create an Account, you're given access to lots of different features and products that are all a part of the Service. Because many of these features and products offer different functionality, they may require additional terms and conditions specific to that feature or product. Below, we've listed those features and products, along with the corresponding additional rules that apply to those parts of the Service.
Expand All @@ -11,22 +10,22 @@ Your use of GitHub is subject to your applicable terms (the "Agreement") as well

### 1. Marketplace

If you list a Developer Product through GitHub Marketplace, then you must agree to the [GitHub Marketplace Developer Agreement](/github/site-policy/github-marketplace-developer-agreement), prior to submitting the product to be listed.
If you list a Developer Product through GitHub Marketplace, then you must agree to the [GitHub Marketplace Developer Agreement](/github/site-policy/github-marketplace-developer-agreement), prior to submitting the project to be listed.

If you buy Developer Products through GitHub Marketplace, the [GitHub Marketplace Terms of Service](/github/site-policy/github-marketplace-terms-of-service) controls your purchase. The Agreement, as well as the [GitHub Marketplace Terms of Service](/github/site-policy/github-marketplace-terms-of-service), will govern your use of GitHub Marketplace.

### 2. Third Party Integrations

#### a. Creating Applications
If you create a third-party application or other developer product that collects User Personal Information or User-Generated Content and integrates with the Service through GitHub's API, OAuth mechanism, or otherwise ("Developer Product"), and make it available for other Users, then you must comply with the following requirements:
- You must comply with the Agreement, the Additional Terms, and the GitHub Privacy Statement.
- You must comply with this Agreement and the GitHub Privacy Statement.
- Except as otherwise permitted, such as by law or by a license, you must limit your usage of the User Personal Information or User-Generated Content you collect to that purpose for which the User has authorized its collection.
- You must take all reasonable security measures appropriate to the risks, such as against accidental or unlawful destruction, or accidental loss, alteration, unauthorized disclosure or access, presented by processing the User Personal Information or User-Generated Content.
- You must not hold yourself out as collecting any User Personal Information or User-Generated Content on GitHub’s behalf, and provide sufficient notice of your privacy practices to the User, such as by posting a privacy policy.
- You must provide Users with a method of deleting any User Personal Information or User-Generated Content you have collected through GitHub after it is no longer needed for the limited and specified purposes for which the User authorized its collection, except where retention is required by law or otherwise permitted, such as through a license.

#### b. Using Third-Party Applications
You may grant a Developer Product authorization to use, access, and disclose the contents of your repositories, including your private repositories. Some Developer Products are available through [GitHub Marketplace](https://github.com/marketplace). Some Developer Products can be used for performing automated tasks, and often times, multiple Users may direct the actions of a Developer Product. However, if you purchase and/or set up a Developer Product on your Account, or you are an owner of an Account with an integrated Developer Product, then you will be responsible for the Developer Product's actions that are performed on or through your Account. Please see our [Privacy Statement](/github/site-policy/github-privacy-statement#third-party-applications) for more information about how we share data with Developer Products.
You may grant a Developer Product authorization to use, access, and disclose the contents of your repositories, including your private repositories. Some Developer Products are available through [GitHub Marketplace](https://github.com/marketplace). Some Developer Products can be used for performing automated tasks, and often times multiple Users may direct the actions of a Developer Product. However, if you purchase and/or set up a Developer Product on your Account, or you are an owner of an Account with an integrated Developer Product, then you will be responsible for the Developer Product's actions that are performed on or through your Account. Please see our [Privacy Statement](/github/site-policy/github-privacy-statement#third-party-applications) for more information about how we share data with Developer Products.

**GitHub makes no warranties of any kind in relation to Developer Products and is not liable for disclosures to third parties that you authorize to access Your Content. Your use of any third-party applications is at your sole risk.**

Expand All @@ -47,7 +46,7 @@ GitHub Actions enables you to create custom software development lifecycle workf

Compute usage for included and paid quantities is calculated in minutes based on the type of Actions you execute (e.g. Linux, Windows, macOS). The minutes used for each Action's job or task will be rounded up to the nearest minute. For included quantities and depending on the type of Action, a multiplier may be applied to the amount of time used to execute each job or task, prior to being rounded up to the nearest minute. Overage minutes are charged at the [stated per minute price](https://github.com/features/actions) based on the type of Actions you execute. Actions and Packages share storage, and your storage usage is displayed within your [account settings](https://github.com/settings/billing). For additional details about included quantity usage calculations, see the [Actions documentation](/github/automating-your-workflow-with-github-actions/about-github-actions#about-github-actions).

Actions and any elements of the Action service may not be used in violation of the Agreement, the Additional Terms, the [Acceptable Use Policy](/github/site-policy/github-acceptable-use-policies), or the GitHub Actions [service limitations](/github/automating-your-workflow-with-github-actions/about-github-actions#usage-limits). Additionally, Actions should not be used for:
Actions and any elements of the Action service may not be used in violation of the Agreement, the [Acceptable Use Policy](/github/site-policy/github-acceptable-use-policies), or the GitHub Actions [service limitations](/github/automating-your-workflow-with-github-actions/about-github-actions#usage-limits). Additionally, Actions should not be used for:
- cryptomining;
- serverless computing;
- using our servers to disrupt, or to gain or to attempt to gain unauthorized access to, any service, device, data, account or network (other than those authorized by the [GitHub Bug Bounty program](https://bounty.github.com))
Expand Down Expand Up @@ -82,7 +81,7 @@ In order to become a Sponsored Developer, you must agree to the [GitHub Sponsors

### 9. Dependabot Preview

Your use of Dependabot Preview is governed by a separate [Terms of Service](https://dependabot.com/terms.html) and [Privacy Policy](https://dependabot.com/privacy.html).
Your use of Dependabot Preview is governed by a separate [Terms of Service](https://dependabot.com/terms) and [Privacy Policy](https://dependabot.com/privacy).

### 10. Spectrum

Expand All @@ -97,3 +96,4 @@ We need the legal right to submit your contributions to the GitHub Advisory Data
#### b. License to the GitHub Advisory Database

The GitHub Advisory Database is licensed under the [Creative Commons Attribution 4.0 license](https://creativecommons.org/licenses/by/4.0/). The attribution term may be fulfilled by linking to the GitHub Advisory Database at <https://github.com/advisories> or to individual GitHub Advisory Database records used, prefixed by <https://github.com/advisories>.

Loading

0 comments on commit 3c81029

Please sign in to comment.