From 93d98d8786e73b343a5835b6a2847b3d3ed7308a Mon Sep 17 00:00:00 2001 From: Peter Bengtsson Date: Tue, 15 Nov 2022 16:08:29 +0100 Subject: [PATCH] www.github.com redirects to github.com (#32084) --- content/get-started/quickstart/contributing-to-projects.md | 4 ++-- .../privacy-policies/github-subprocessors-and-cookies.md | 6 +++--- ...-of-service-applicable-to-us-federal-government-users.md | 2 +- .../github-ae-data-protection-agreement.md | 2 +- .../github-ae-product-specific-terms.md | 2 +- .../github-enterprise-cloud-evaluation-agreement.md | 2 +- .../github-enterprise-server-license-agreement.md | 2 +- .../github-enterprise-service-level-agreement.md | 2 +- .../github-enterprise-subscription-agreement.md | 2 +- ...hub-supplemental-terms-for-microsoft-volume-licensing.md | 2 +- data/reusables/dependabot/dependabot-tos.md | 2 +- data/reusables/support/data-protection-and-privacy.md | 4 +--- 12 files changed, 15 insertions(+), 17 deletions(-) diff --git a/content/get-started/quickstart/contributing-to-projects.md b/content/get-started/quickstart/contributing-to-projects.md index 4bd5001966..a725011596 100644 --- a/content/get-started/quickstart/contributing-to-projects.md +++ b/content/get-started/quickstart/contributing-to-projects.md @@ -29,7 +29,7 @@ This tutorial uses [the Spoon-Knife project](https://github.com/octocat/Spoon-Kn ![Fork button](/assets/images/help/repository/fork_button.png){% ifversion fpt or ghec or ghes > 3.5 or ghae > 3.5 %} 3. Select an owner for the forked repository. ![Create a new fork page with owner dropdown emphasized](/assets/images/help/repository/fork-choose-owner.png) -4. By default, forks are named the same as their parent repositories. You can change the name of the fork to distinguish it further. +4. By default, forks are named the same as their parent repositories. You can change the name of the fork to distinguish it further. ![Create a new fork page with repository name field emphasized](/assets/images/help/repository/fork-choose-repo-name.png) 5. Optionally, add a description of your fork. ![Create a new fork page with description field emphasized](/assets/images/help/repository/fork-description.png) @@ -184,7 +184,7 @@ For more information about how to push changes in {% data variables.product.prod At last, you're ready to propose changes into the main project! This is the final step in producing a fork of someone else's project, and arguably the most important. If you've made a change that you feel would benefit the community as a whole, you should definitely consider contributing back. -To do so, head on over to the repository on {% data variables.product.product_name %} where your project lives. For this example, it would be at `https://www.github.com//Spoon-Knife`. You'll see a banner indicating that your branch is one commit ahead of `octocat:main`. Click **Contribute** and then **Open a pull request**. +To do so, head on over to the repository on {% data variables.product.product_name %} where your project lives. For this example, it would be at `https://github.com//Spoon-Knife`. You'll see a banner indicating that your branch is one commit ahead of `octocat:main`. Click **Contribute** and then **Open a pull request**. {% data variables.product.product_name %} will bring you to a page that shows the differences between your fork and the `octocat/Spoon-Knife` repository. Click **Create pull request**. diff --git a/content/site-policy/privacy-policies/github-subprocessors-and-cookies.md b/content/site-policy/privacy-policies/github-subprocessors-and-cookies.md index fe406b940e..6a0c90a164 100644 --- a/content/site-policy/privacy-policies/github-subprocessors-and-cookies.md +++ b/content/site-policy/privacy-policies/github-subprocessors-and-cookies.md @@ -23,14 +23,14 @@ GitHub provides a great deal of transparency regarding how we use your data, how When we share your information with third party subprocessors, such as our vendors and service providers, we remain responsible for it. We work very hard to maintain your trust when we bring on new vendors, and we require all vendors to enter into data protection agreements with us that restrict their processing of Users' Personal Information (as defined in the [Privacy Statement](/articles/github-privacy-statement/)). -When we bring on a new subprocessor who handles our Users' Personal Information, or remove a subprocessor, or we change how we use a subprocessor, we will update the list of subprocessors. You can view the current list of subprocessors, and sign up to receive subprocessor list updates, at [https://www.github.com/privacy/subprocessors](https://www.github.com/privacy/subprocessors). +When we bring on a new subprocessor who handles our Users' Personal Information, or remove a subprocessor, or we change how we use a subprocessor, we will update the list of subprocessors. You can view the current list of subprocessors, and sign up to receive subprocessor list updates, at [https://github.com/privacy/subprocessors](https://github.com/privacy/subprocessors). If you have questions or concerns about a new subprocessor, we'd be happy to help. Please contact us via {% data variables.contact.contact_privacy %}. ## Cookies on GitHub -GitHub uses cookies to provide and secure our websites, as well as to analyze the usage of our websites, in order to offer you a great user experience. Please take a look at our [Privacy Statement](/github/site-policy/github-privacy-statement#our-use-of-cookies-and-tracking) if you’d like more information about cookies, and on how and why we use them. - +GitHub uses cookies to provide and secure our websites, as well as to analyze the usage of our websites, in order to offer you a great user experience. Please take a look at our [Privacy Statement](/github/site-policy/github-privacy-statement#our-use-of-cookies-and-tracking) if you’d like more information about cookies, and on how and why we use them. + You can view the current list of cookies on GitHub, and sign up to receive cookie list updates, at [https://github.com/privacy/cookies](https://github.com/privacy/cookies). (!) Please note while we limit our use of third party cookies to those necessary to provide external functionality when rendering external content, certain pages on our website may set other third party cookies. For example, we may embed content, such as videos, from another site that sets a cookie. While we try to minimize these third party cookies, we can’t always control what cookies this third party content sets. diff --git a/content/site-policy/site-policy-deprecated/amendment-to-github-terms-of-service-applicable-to-us-federal-government-users.md b/content/site-policy/site-policy-deprecated/amendment-to-github-terms-of-service-applicable-to-us-federal-government-users.md index c45d7f47b0..31831755ac 100644 --- a/content/site-policy/site-policy-deprecated/amendment-to-github-terms-of-service-applicable-to-us-federal-government-users.md +++ b/content/site-policy/site-policy-deprecated/amendment-to-github-terms-of-service-applicable-to-us-federal-government-users.md @@ -12,7 +12,7 @@ versions: fpt: '*' --- -_These terms apply to Customers who licensed the Products prior to January 4, 2021. Customers who purchase GitHub Products after that date are directed to https://www.github.com/enterprise-legal for current terms._ +_These terms apply to Customers who licensed the Products prior to January 4, 2021. Customers who purchase GitHub Products after that date are directed to https://github.com/customer-terms for current terms._ {% tip %} diff --git a/content/site-policy/site-policy-deprecated/github-ae-data-protection-agreement.md b/content/site-policy/site-policy-deprecated/github-ae-data-protection-agreement.md index 227e8b51cb..38711e27d2 100644 --- a/content/site-policy/site-policy-deprecated/github-ae-data-protection-agreement.md +++ b/content/site-policy/site-policy-deprecated/github-ae-data-protection-agreement.md @@ -9,7 +9,7 @@ redirect_from: - /github/site-policy-deprecated/github-ae-data-protection-agreement --- -_These terms apply to Customers who licensed the Products prior to January 4, 2021. Customers who purchase GitHub Products after that date are directed to https://www.github.com/enterprise-legal for current terms._ +_These terms apply to Customers who licensed the Products prior to January 4, 2021. Customers who purchase GitHub Products after that date are directed to https://github.com/customer-terms for current terms._ ## INTRODUCTION diff --git a/content/site-policy/site-policy-deprecated/github-ae-product-specific-terms.md b/content/site-policy/site-policy-deprecated/github-ae-product-specific-terms.md index 78afe6f2df..4177210bb7 100644 --- a/content/site-policy/site-policy-deprecated/github-ae-product-specific-terms.md +++ b/content/site-policy/site-policy-deprecated/github-ae-product-specific-terms.md @@ -9,7 +9,7 @@ redirect_from: - /github/site-policy-deprecated/github-ae-product-specific-terms --- -_These terms apply to Customers who licensed the Products prior to January 4, 2021. Customers who purchase GitHub Products after that date are directed to https://www.github.com/enterprise-legal for current terms._ +_These terms apply to Customers who licensed the Products prior to January 4, 2021. Customers who purchase GitHub Products after that date are directed to https://github.com/customer-terms for current terms._ The Agreement consists of these GitHub AE Product Specific Terms, the General Terms that Customer accepted, and any additional terms GitHub or its Affiliates present when an order is placed. diff --git a/content/site-policy/site-policy-deprecated/github-enterprise-cloud-evaluation-agreement.md b/content/site-policy/site-policy-deprecated/github-enterprise-cloud-evaluation-agreement.md index 8c0f9bc7d4..8415ab0366 100644 --- a/content/site-policy/site-policy-deprecated/github-enterprise-cloud-evaluation-agreement.md +++ b/content/site-policy/site-policy-deprecated/github-enterprise-cloud-evaluation-agreement.md @@ -9,7 +9,7 @@ versions: fpt: '*' --- -_These terms apply to Customers who licensed the Products prior to January 4, 2021. Customers who purchase GitHub Products after that date are directed to https://www.github.com/enterprise-legal for current terms._ +_These terms apply to Customers who licensed the Products prior to January 4, 2021. Customers who purchase GitHub Products after that date are directed to https://github.com/customer-terms for current terms._ THANK YOU FOR CHOOSING GITHUB FOR YOUR COMPANY'S BUSINESS NEEDS. PLEASE READ THESE TERMS CAREFULLY AS IT GOVERNS YOUR EVALUATION USE OF THE SERVICE, UNLESS GITHUB HAS EXECUTED A SEPARATE WRITTEN AGREEMENT WITH YOU FOR THAT PURPOSE. BY CLICKING ON THE "I AGREE" OR SIMILAR BUTTON OR BY ACCESSING THE SERVICE ON A TRIAL BASIS, YOU ACCEPT ALL THE TERMS AND CONDITIONS OF THIS EVALUATION AGREEMENT. IF YOU ARE ENTERING INTO THIS EVALUATION AGREEMENT ON BEHALF OF A COMPANY OR OTHER LEGAL ENTITY (HEREINAFTER REFERRED TO AS "**CUSTOMER**"), CUSTOMER REPRESENTS THAT IT HAS THE LEGAL AUTHORITY TO BIND THE COMPANY OR OTHER LEGAL ENTITY TO THIS EVALUATION AGREEMENT. ALSO, BY ACCEPTING THESE TERMS, CUSTOMER AGREES THAT IT HAS READ GITHUB'S PRIVACY STATEMENT. diff --git a/content/site-policy/site-policy-deprecated/github-enterprise-server-license-agreement.md b/content/site-policy/site-policy-deprecated/github-enterprise-server-license-agreement.md index ebea98f905..6eb8454d50 100644 --- a/content/site-policy/site-policy-deprecated/github-enterprise-server-license-agreement.md +++ b/content/site-policy/site-policy-deprecated/github-enterprise-server-license-agreement.md @@ -9,7 +9,7 @@ versions: fpt: '*' --- -_These terms apply to Customers who have executed agreements in place referencing them. All other corporate customers are directed to https://www.github.com/customer-terms for current terms._ +_These terms apply to Customers who have executed agreements in place referencing them. All other corporate customers are directed to https://github.com/customer-terms for current terms._ This Agreement applies to the following GitHub offerings, as further defined below (collectively, the **“Products”**): diff --git a/content/site-policy/site-policy-deprecated/github-enterprise-service-level-agreement.md b/content/site-policy/site-policy-deprecated/github-enterprise-service-level-agreement.md index 4eac09e7c3..09fd5975d6 100644 --- a/content/site-policy/site-policy-deprecated/github-enterprise-service-level-agreement.md +++ b/content/site-policy/site-policy-deprecated/github-enterprise-service-level-agreement.md @@ -11,7 +11,7 @@ versions: fpt: '*' --- -_These terms apply to Customers who licensed the Products prior to January 4, 2021. Customers who purchase GitHub Products after that date are directed to https://www.github.com/enterprise-legal for current terms._ +_These terms apply to Customers who licensed the Products prior to January 4, 2021. Customers who purchase GitHub Products after that date are directed to https://github.com/customer-terms for current terms._ **Short version:** GitHub guarantees a 99.9% quarterly uptime commitment for the applicable GitHub service (the “**Service Level**” or “**SLA**”). If GitHub does not meet the SLA, then Customer will be entitled to a service credit to Customer’s account (“**Service Credits**”). diff --git a/content/site-policy/site-policy-deprecated/github-enterprise-subscription-agreement.md b/content/site-policy/site-policy-deprecated/github-enterprise-subscription-agreement.md index 8f69d988ac..3f8b6d4957 100644 --- a/content/site-policy/site-policy-deprecated/github-enterprise-subscription-agreement.md +++ b/content/site-policy/site-policy-deprecated/github-enterprise-subscription-agreement.md @@ -10,7 +10,7 @@ versions: fpt: '*' --- -_These terms apply to Customers who have executed agreements in place referencing them. All other corporate customers are directed to https://www.github.com/customer-terms for current terms._ +_These terms apply to Customers who have executed agreements in place referencing them. All other corporate customers are directed to https://github.com/customer-terms for current terms._ This Agreement applies to the following GitHub offerings, as further defined below (collectively, the **"Products"**): diff --git a/content/site-policy/site-policy-deprecated/github-supplemental-terms-for-microsoft-volume-licensing.md b/content/site-policy/site-policy-deprecated/github-supplemental-terms-for-microsoft-volume-licensing.md index 30e5562738..1bc2f0e243 100644 --- a/content/site-policy/site-policy-deprecated/github-supplemental-terms-for-microsoft-volume-licensing.md +++ b/content/site-policy/site-policy-deprecated/github-supplemental-terms-for-microsoft-volume-licensing.md @@ -10,7 +10,7 @@ versions: fpt: '*' --- -_These terms apply to Customers who licensed the Products prior to January 4, 2021. Customers who purchase GitHub Products after that date are directed to https://www.github.com/enterprise-legal for current terms._ +_These terms apply to Customers who licensed the Products prior to January 4, 2021. Customers who purchase GitHub Products after that date are directed to https://github.com/customer-terms for current terms._ The following GitHub Supplemental Terms (including any applicable Order Forms) supplement Customer's Microsoft volume licensing agreement ("**Microsoft Customer Agreement**") and, together with the Microsoft Customer Agreement, govern Customer's use of the Products (as defined below). The Microsoft Customer Agreement is incorporated herein by this reference. Capitalized terms used but not defined in these supplemental terms have the meanings assigned to them in the Microsoft Customer Agreement. diff --git a/data/reusables/dependabot/dependabot-tos.md b/data/reusables/dependabot/dependabot-tos.md index c22b0988af..9b930dd763 100644 --- a/data/reusables/dependabot/dependabot-tos.md +++ b/data/reusables/dependabot/dependabot-tos.md @@ -1,5 +1,5 @@ {% ifversion fpt %} {% data variables.product.prodname_dependabot %} and all related features are covered by [{% data variables.product.prodname_dotcom %}'s Terms of Service](/free-pro-team@latest/github/site-policy/github-terms-of-service). {% elsif ghec %} -{% data variables.product.prodname_dependabot %} and all related features are covered by your license agreement. For more information, see "[{% data variables.product.company_short %} Enterprise Customer Terms](https://github.com/enterprise-legal)." +{% data variables.product.prodname_dependabot %} and all related features are covered by your license agreement. For more information, see "[{% data variables.product.company_short %} Enterprise Customer Terms](https://github.com/customer-terms)." {% endif %} diff --git a/data/reusables/support/data-protection-and-privacy.md b/data/reusables/support/data-protection-and-privacy.md index 847be5aeb5..b48aa6aa7b 100644 --- a/data/reusables/support/data-protection-and-privacy.md +++ b/data/reusables/support/data-protection-and-privacy.md @@ -1,3 +1 @@ -When you use {% data variables.product.prodname_dotcom %}'s support offerings, the terms of your Agreement, the [GitHub Privacy Statement](/free-pro-team@latest/github/site-policy/github-privacy-statement), and the [GitHub Data Protection Agreement](/free-pro-team@latest/github/site-policy/github-data-protection-agreement) apply. By Agreement, we mean your main agreement with us — i.e. the [GitHub Corporate Terms of Service](/free-pro-team@latest/github/site-policy/github-corporate-terms-of-service), the [GitHub Customer Agreement](https://github.com/enterprise-legal), or your [Microsoft volume licensing agreement](/free-pro-team@latest/github/site-policy-deprecated/github-supplemental-terms-for-microsoft-volume-licensing). - - +When you use {% data variables.product.prodname_dotcom %}'s support offerings, the terms of your Agreement, the [GitHub Privacy Statement](/free-pro-team@latest/github/site-policy/github-privacy-statement), and the [GitHub Data Protection Agreement](/free-pro-team@latest/github/site-policy/github-data-protection-agreement) apply. By Agreement, we mean your main agreement with us — i.e. the [GitHub Corporate Terms of Service](/free-pro-team@latest/github/site-policy/github-corporate-terms-of-service), the [GitHub Customer Agreement](https://github.com/customer-terms), or your [Microsoft volume licensing agreement](/free-pro-team@latest/github/site-policy-deprecated/github-supplemental-terms-for-microsoft-volume-licensing).