Merge branch 'main' into 4169-remove-github-one
This commit is contained in:
Amy Burns
@@ -17,13 +17,13 @@ topics:
|
||||
|
||||
Personal access tokens (PATs) are an alternative to using passwords for authentication to {% data variables.product.product_name %} when using the [GitHub API](/rest/overview/other-authentication-methods#via-oauth-and-personal-access-tokens) or the [command line](#using-a-token-on-the-command-line).
|
||||
|
||||
{% if currentVersion == "free-pro-team@latest" %}If you want to use a PAT to access resources owned by an organization that uses SAML SSO, you must authorize the PAT. For more information, see "[About authentication with SAML single sign-on](/articles/about-authentication-with-saml-single-sign-on)" and "[Authorizing a personal access token for use with SAML single sign-on](/articles/authorizing-a-personal-access-token-for-use-with-saml-single-sign-on)."{% endif %}
|
||||
{% if currentVersion == "free-pro-team@latest" %}If you want to use a PAT to access resources owned by an organization that uses SAML SSO, you must authorize the PAT. For more information, see "[About authentication with SAML single sign-on](/github/authenticating-to-github/about-authentication-with-saml-single-sign-on)" and "[Authorizing a personal access token for use with SAML single sign-on](/github/authenticating-to-github/authorizing-a-personal-access-token-for-use-with-saml-single-sign-on)."{% endif %}
|
||||
|
||||
{% if currentVersion == "free-pro-team@latest" %}{% data reusables.user_settings.removes-personal-access-tokens %}{% endif %}
|
||||
|
||||
### Creating a token
|
||||
|
||||
{% if currentVersion == "free-pro-team@latest" %}1. [Verify your email address](/articles/verifying-your-email-address), if it hasn't been verified yet.{% endif %}
|
||||
{% if currentVersion == "free-pro-team@latest" %}1. [Verify your email address](/github/getting-started-with-github/verifying-your-email-address), if it hasn't been verified yet.{% endif %}
|
||||
{% data reusables.user_settings.access_settings %}
|
||||
{% data reusables.user_settings.developer_settings %}
|
||||
{% data reusables.user_settings.personal_access_tokens %}
|
||||
@@ -47,13 +47,13 @@ Personal access tokens (PATs) are an alternative to using passwords for authenti
|
||||
{% else %}
|
||||
|
||||
{% endif %}
|
||||
|
||||
{% warning %}
|
||||
|
||||
**Warning:** Treat your tokens like passwords and keep them secret. When working with the API, use tokens as environment variables instead of hardcoding them into your programs.
|
||||
|
||||
{% endwarning %}
|
||||
{% if currentVersion == "free-pro-team@latest" %}9. To use your token to authenticate to an organization that uses SAML SSO, [authorize the token for use with a SAML single-sign-on organization](/articles/authorizing-a-personal-access-token-for-use-with-saml-single-sign-on).{% endif %}
|
||||
|
||||
{% if currentVersion == "free-pro-team@latest" %}9. To use your token to authenticate to an organization that uses SAML SSO, [authorize the token for use with a SAML single-sign-on organization](/github/authenticating-to-github/authorizing-a-personal-access-token-for-use-with-saml-single-sign-on).{% endif %}
|
||||
|
||||
### Using a token on the command line
|
||||
|
||||
@@ -61,7 +61,7 @@ Personal access tokens (PATs) are an alternative to using passwords for authenti
|
||||
|
||||
Personal access tokens can only be used for HTTPS Git operations. If your repository uses an SSH remote URL, you will need to [switch the remote from SSH to HTTPS](/github/getting-started-with-github/managing-remote-repositories/#switching-remote-urls-from-ssh-to-https).
|
||||
|
||||
If you are not prompted for your username and password, your credentials may be cached on your computer. You can [update your credentials in the Keychain](/articles/updating-credentials-from-the-osx-keychain) to replace your old password with the token.
|
||||
If you are not prompted for your username and password, your credentials may be cached on your computer. You can [update your credentials in the Keychain](/github/getting-started-with-github/updating-credentials-from-the-macos-keychain) to replace your old password with the token.
|
||||
|
||||
### Further reading
|
||||
|
||||
|
||||
@@ -186,7 +186,6 @@ An overview of some of the most common actions that are recorded as events in th
|
||||
|
||||
| Action | Description
|
||||
|------------------|-------------------
|
||||
| `repo_funding_link_button_toggle` | Triggered when you enable or disable a sponsor button in your repository (see "[Displaying a sponsor button in your repository](/articles/displaying-a-sponsor-button-in-your-repository)")
|
||||
| `repo_funding_links_file_action` | Triggered when you change the FUNDING file in your repository (see "[Displaying a sponsor button in your repository](/articles/displaying-a-sponsor-button-in-your-repository)")
|
||||
| `sponsor_sponsorship_cancel` | Triggered when you cancel a sponsorship (see "[Downgrading a sponsorship](/articles/downgrading-a-sponsorship)")
|
||||
| `sponsor_sponsorship_create` | Triggered when you sponsor an account (see "[Sponsoring an open source contributor](/github/supporting-the-open-source-community-with-github-sponsors/sponsoring-an-open-source-contributor)")
|
||||
@@ -194,9 +193,11 @@ An overview of some of the most common actions that are recorded as events in th
|
||||
| `sponsor_sponsorship_tier_change` | Triggered when you upgrade or downgrade your sponsorship (see "[Upgrading a sponsorship](/articles/upgrading-a-sponsorship)" and "[Downgrading a sponsorship](/articles/downgrading-a-sponsorship)")
|
||||
| `sponsored_developer_approve` | Triggered when your {% data variables.product.prodname_sponsors %} account is approved (see "[Setting up {% data variables.product.prodname_sponsors %} for your user account](/github/supporting-the-open-source-community-with-github-sponsors/setting-up-github-sponsors-for-your-user-account)")
|
||||
| `sponsored_developer_create` | Triggered when your {% data variables.product.prodname_sponsors %} account is created (see "[Setting up {% data variables.product.prodname_sponsors %} for your user account](/github/supporting-the-open-source-community-with-github-sponsors/setting-up-github-sponsors-for-your-user-account)")
|
||||
| `sponsored_developer_disable` | Triggered when your {% data variables.product.prodname_sponsors %} account is disabled
|
||||
| `sponsored_developer_redraft` | Triggered when your {% data variables.product.prodname_sponsors %} account is returned to draft state from approved state
|
||||
| `sponsored_developer_profile_update` | Triggered when you edit your sponsored developer profile (see "[Editing your profile details for {% data variables.product.prodname_sponsors %}](/github/supporting-the-open-source-community-with-github-sponsors/editing-your-profile-details-for-github-sponsors)")
|
||||
| `sponsored_developer_request_approval` | Triggered when you submit your application for {% data variables.product.prodname_sponsors %} for approval (see "[Setting up {% data variables.product.prodname_sponsors %} for your user account](/github/supporting-the-open-source-community-with-github-sponsors/setting-up-github-sponsors-for-your-user-account)")
|
||||
| `sponsored_developer_tier_description_update` | Triggered when you change the description for a sponsorship tier (see "[Changing your sponsorship tiers](/articles/changing-your-sponsorship-tiers)")
|
||||
| `sponsored_developer_tier_description_update` | Triggered when you change the description for a sponsorship tier (see "[Managing your sponsorship tiers](/github/supporting-the-open-source-community-with-github-sponsors/managing-your-sponsorship-tiers)")
|
||||
| `sponsored_developer_update_newsletter_send` | Triggered when you send an email update to your sponsors (see "[Contacting your sponsors](/articles/contacting-your-sponsors)")
|
||||
| `waitlist_invite_sponsored_developer` | Triggered when you are invited to join {% data variables.product.prodname_sponsors %} from the waitlist (see "[Setting up {% data variables.product.prodname_sponsors %} for your user account](/github/supporting-the-open-source-community-with-github-sponsors/setting-up-github-sponsors-for-your-user-account)")
|
||||
| `waitlist_join` | Triggered when you join the waitlist to become a sponsored developer (see "[Setting up {% data variables.product.prodname_sponsors %} for your user account](/github/supporting-the-open-source-community-with-github-sponsors/setting-up-github-sponsors-for-your-user-account)")
|
||||
|
||||
@@ -19,15 +19,15 @@ When you downgrade or cancel a sponsorship, the change will become effective on
|
||||
|
||||
{% data reusables.sponsors.navigate-to-sponsored-account %}
|
||||
{% data reusables.sponsors.sponsorship-dashboard %}
|
||||
{% data reusables.sponsors.review-tiers-to-select %}
|
||||
{% data reusables.sponsors.select-a-tier %}
|
||||
{% data reusables.sponsors.update-sponsorship %}
|
||||
|
||||
### Canceling a sponsorship
|
||||
|
||||
{% data reusables.user_settings.access_settings %}
|
||||
{% data reusables.user_settings.billing %}
|
||||
{% data reusables.user_settings.billing_plans %}
|
||||
{% data reusables.sponsors.billing-switcher %}
|
||||
{% data reusables.user_settings.subscriptions-tab %}
|
||||
3. Under "{% data variables.product.prodname_sponsors %}", to the right of the sponsored open source contributor, click {% octicon "triangle-down" aria-label="The down triangle octicon" %} next to your sponsored amount, then click **Cancel sponsorship**.
|
||||
|
||||
4. Review the information about canceling your sponsorship, then click **OK**.
|
||||
|
||||
@@ -19,5 +19,6 @@ When you upgrade your sponsorship tier, the change will become effective immedia
|
||||
|
||||
{% data reusables.sponsors.navigate-to-sponsored-account %}
|
||||
{% data reusables.sponsors.sponsorship-dashboard %}
|
||||
{% data reusables.sponsors.review-tiers-to-select %}
|
||||
{% data reusables.sponsors.select-a-tier %}
|
||||
{% data reusables.sponsors.update-sponsorship %}
|
||||
|
||||
@@ -13,7 +13,7 @@ topics:
|
||||
- legal
|
||||
---
|
||||
|
||||
Effective date: **January 29, 2021**
|
||||
Effective date: **April 2, 2021**
|
||||
|
||||
GitHub provides a great deal of transparency regarding how we use your data, how we collect your data, and with whom we share your data. To that end, we provide this page, which details [our subprocessors](#github-subprocessors), and how we use [cookies](#cookies-on-github).
|
||||
|
||||
@@ -33,7 +33,6 @@ When we share your information with third party subprocessors, such as our vendo
|
||||
| MailChimp | Customer ticketing mail services provider | United States | United States |
|
||||
| Mailgun | Transactional mail services provider | United States | United States |
|
||||
| Microsoft | Microsoft Services | United States | United States |
|
||||
| Monday.com | Team collaboration and project management platform | United States | Israel |
|
||||
| Nexmo | SMS notification provider | United States | United States |
|
||||
| Salesforce.com | Customer relations management | United States | United States |
|
||||
| Sentry.io | Application monitoring provider | United States | United States |
|
||||
|
||||
@@ -24,7 +24,9 @@ You can set a goal for your sponsorships. For more information, see "[Managing y
|
||||
|
||||
### Sponsorship tiers
|
||||
|
||||
{% data reusables.sponsors.tier-details %} For more information, see "[Setting up {% data variables.product.prodname_sponsors %} for your user account](/github/supporting-the-open-source-community-with-github-sponsors/setting-up-github-sponsors-for-your-user-account)," "[Setting up {% data variables.product.prodname_sponsors %} for your organization](/github/supporting-the-open-source-community-with-github-sponsors/setting-up-github-sponsors-for-your-organization), and "[Changing your sponsorship tiers](/articles/changing-your-sponsorship-tiers)."
|
||||
{% data reusables.sponsors.tier-details %} For more information, see "[Setting up {% data variables.product.prodname_sponsors %} for your user account](/github/supporting-the-open-source-community-with-github-sponsors/setting-up-github-sponsors-for-your-user-account)," "[Setting up {% data variables.product.prodname_sponsors %} for your organization](/github/supporting-the-open-source-community-with-github-sponsors/setting-up-github-sponsors-for-your-organization), and "[Managing your sponsorship tiers](/github/supporting-the-open-source-community-with-github-sponsors/managing-your-sponsorship-tiers)."
|
||||
|
||||
It's best to set up a range of different sponsorship options, including monthly and one-time tiers, to make it easy for anyone to support your work. In particular, one-time payments allow people to reward your efforts without worrying about whether their finances will support a regular payment schedule.
|
||||
|
||||
### Sponsorship payouts
|
||||
|
||||
@@ -34,5 +36,9 @@ You can set a goal for your sponsorships. For more information, see "[Managing y
|
||||
|
||||
For more information, see "[Managing your payouts from {% data variables.product.prodname_sponsors %}](/github/supporting-the-open-source-community-with-github-sponsors/managing-your-payouts-from-github-sponsors)."
|
||||
|
||||
### Sharing feedback about {% data variables.product.prodname_sponsors %}
|
||||
|
||||
{% data reusables.sponsors.feedback %}
|
||||
|
||||
### Further reading
|
||||
- "[FAQ with the {% data variables.product.prodname_sponsors %} team](https://github.blog/2019-06-12-faq-with-the-github-sponsors-team/)" on {% data variables.product.prodname_blog %}
|
||||
|
||||
@@ -37,7 +37,7 @@ To be eligible for the {% data variables.product.prodname_matching_fund %}, you
|
||||
|
||||
### Sharing feedback about {% data variables.product.prodname_sponsors %}
|
||||
|
||||
This is just the beginning — we'd love your input to make sure {% data variables.product.prodname_sponsors %} serves your needs into the future. Please send us your feedback or suggestions by contacting [{% data variables.contact.github_support %}](https://support.github.com/contact?form%5Bsubject%5D=GitHub+Sponsors).
|
||||
{% data reusables.sponsors.feedback %}
|
||||
|
||||
### Further reading
|
||||
- "[Sponsoring open source contributors](/github/supporting-the-open-source-community-with-github-sponsors/sponsoring-open-source-contributors)"
|
||||
|
||||
@@ -15,6 +15,8 @@ Your sponsors can choose whether they receive email updates about your work. For
|
||||
|
||||
For sponsored developer accounts, the update will come from your user account's primary email address. If you've enabled email address privacy on your user account, the update will come from `noreply@github.com` instead. For sponsored organizations, the update will come from the organization's `noreply@github.com` email address. For more information, see "[Setting your commit email address](/articles/setting-your-commit-email-address)."
|
||||
|
||||
You can also contact any one-time sponsors who contributed within the last 30 days and enabled updates.
|
||||
|
||||
### Contacting your sponsors
|
||||
|
||||
{% data reusables.sponsors.navigate-to-sponsors-dashboard %}
|
||||
|
||||
@@ -25,7 +25,7 @@ topics:
|
||||
{% link_in_list /setting-up-github-sponsors-for-your-organization %}
|
||||
{% link_in_list /editing-your-profile-details-for-github-sponsors %}
|
||||
{% link_in_list /managing-your-sponsorship-goal %}
|
||||
{% link_in_list /changing-your-sponsorship-tiers %}
|
||||
{% link_in_list /managing-your-sponsorship-tiers %}
|
||||
{% link_in_list /viewing-your-sponsors-and-sponsorships %}
|
||||
{% link_in_list /managing-your-payouts-from-github-sponsors %}
|
||||
{% link_in_list /configuring-webhooks-for-events-in-your-sponsored-account %}
|
||||
|
||||
@@ -13,6 +13,12 @@ You can set a funding goal for your sponsored account and share the goal with yo
|
||||
|
||||
Your goal can set a target for the number of sponsors you want to have or the amount of money you want to earn each month. You can only set one goal up at a time. After you reach a goal, you can set another goal.
|
||||
|
||||
{% note %}
|
||||
|
||||
**Note:** Goals are intended to help people track momentum so only monthly sponsors contribute toward your goal.
|
||||
|
||||
{% endnote %}
|
||||
|
||||
### Setting a goal
|
||||
|
||||
{% data reusables.sponsors.navigate-to-sponsors-dashboard %}
|
||||
|
||||
@@ -1,8 +1,9 @@
|
||||
---
|
||||
title: Changing your sponsorship tiers
|
||||
title: Managing your sponsorship tiers
|
||||
intro: 'You can add a new sponsorship tier, or edit or retire an existing tier.'
|
||||
redirect_from:
|
||||
- /articles/changing-your-sponsorship-tiers
|
||||
- /github/supporting-the-open-source-community-with-github-sponsors/changing-your-sponsorship-tiers
|
||||
versions:
|
||||
free-pro-team: '*'
|
||||
topics:
|
||||
@@ -32,3 +33,13 @@ topics:
|
||||
{% data reusables.sponsors.tier-price-description %}
|
||||
{% data reusables.sponsors.tier-update %}
|
||||
{% data reusables.sponsors.retire-tier %}
|
||||
|
||||
### Enabling tiers with custom amounts
|
||||
|
||||
{% data reusables.sponsors.navigate-to-sponsors-dashboard %}
|
||||
{% data reusables.sponsors.navigate-to-sponsor-tiers-tab %}
|
||||
{% data reusables.sponsors.enable-custom-amounts %}
|
||||
|
||||
### Disabling tiers with custom amounts
|
||||
|
||||
You can disable tiers with custom amounts by deselecting the **Enable custom amounts** option on the **Sponsor tiers** tab. If you disable custom amounts, all custom tiers are retired.
|
||||
@@ -48,6 +48,7 @@ To join {% data variables.product.prodname_sponsors %} as an individual contribu
|
||||
{% data reusables.sponsors.tier-price-description %}
|
||||
{% data reusables.sponsors.save-tier-draft %}
|
||||
{% data reusables.sponsors.review-and-publish-tier %}
|
||||
{% data reusables.sponsors.enable-custom-amounts %}
|
||||
{% data reusables.sponsors.add-more-tiers %}
|
||||
|
||||
### Submitting your bank information
|
||||
|
||||
@@ -48,6 +48,7 @@ After {% data variables.product.prodname_dotcom %} reviews your application, you
|
||||
{% data reusables.sponsors.tier-price-description %}
|
||||
{% data reusables.sponsors.save-tier-draft %}
|
||||
{% data reusables.sponsors.review-and-publish-tier %}
|
||||
{% data reusables.sponsors.enable-custom-amounts %}
|
||||
{% data reusables.sponsors.add-more-tiers %}
|
||||
|
||||
### Submitting your bank information
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
---
|
||||
title: Sponsoring an open source contributor
|
||||
intro: 'You can make a monthly recurring payment to a developer or organization who designs, creates, or maintains open source projects you depend on.'
|
||||
intro: 'You can make a one-time or monthly recurring payment to a developer or organization who designs, creates, or maintains open source projects you depend on.'
|
||||
redirect_from:
|
||||
- /articles/sponsoring-a-developer
|
||||
- /articles/sponsoring-an-open-source-contributor
|
||||
@@ -24,11 +24,11 @@ You can sponsor an account on behalf of your user account to invest in projects
|
||||
- Developing brand awareness as an organization that values open source
|
||||
- Thanking open source developers for building libraries that complement the product your organization offers
|
||||
|
||||
You can use a credit card to sponsor an account on {% data variables.product.product_name %}. If your organization wants to pay by invoice, [contact us](https://support.github.com/contact/org-sponsors-waitlist).
|
||||
You use your normal payment method to sponsor an account on {% data variables.product.product_name %}. If your organization wants to pay by invoice, [contact us](https://support.github.com/contact/org-sponsors-waitlist).
|
||||
|
||||
{% data reusables.sponsors.no-fees %} For more information, see "[About billing for {% data variables.product.prodname_sponsors %}](/articles/about-billing-for-github-sponsors)."
|
||||
|
||||
When you sponsor an account using a credit card, the change will become effective immediately. {% data reusables.sponsors.prorated-sponsorship %}
|
||||
When you sponsor an account the change is effective immediately, unless you are sponsoring on behalf of an organization that pays by invoice. {% data reusables.sponsors.prorated-sponsorship %} Your sponsorship is included in the next scheduled payment to the sponsored account.
|
||||
|
||||
{% data reusables.sponsors.manage-updates-for-orgs %}
|
||||
|
||||
@@ -56,6 +56,7 @@ Before you can sponsor an account, you must have a verified email address. For m
|
||||
|
||||
1. Optionally, on the right side of the page, to sponsor the account on behalf of your organization, use the **Sponsor as** drop-down menu, and click the organization.
|
||||
|
||||
{% data reusables.sponsors.review-tiers-to-select %}
|
||||
{% data reusables.sponsors.select-a-tier %}
|
||||
{% data reusables.sponsors.pay-prorated-amount %}
|
||||
{% data reusables.sponsors.select-sponsorship-billing %}
|
||||
|
||||
Reference in New Issue
Block a user