Merge pull request #110 from github/minor-edits-and-formatting-spring-2018

bluemazzoo · web-flow · commit abb0b833124f · 2018-05-29T19:38:50.000-07:00
Minor edits and formatting
diff --git a/Policies/github-corporate-terms-of-service.md b/Policies/github-corporate-terms-of-service.md
@@ -37,7 +37,7 @@ Effective date: May 25, 2018
 1. The &ldquo;Agreement&rdquo; refers, collectively, to all the terms, conditions, notices contained or referenced in this document (the &ldquo;Corporate Terms of Service&rdquo; or the "Terms") and all other operating rules, policies (including the GitHub Privacy Statement, available at [github.com/site/privacy](https://github.com/site/privacy)) and procedures that we may publish from time to time on the Website. Most of our site policies are available at [help.github.com/categories/site-policy](/categories/site-policy/).
 2. The &ldquo;Service&rdquo; refers to the applications, software, products, and services provided by GitHub.
 3. The &ldquo;Website&rdquo; refers to GitHub&rsquo;s website located at [github.com](https://github.com/), and all content, services, and products provided by GitHub at or through the Website. It also refers to GitHub-owned subdomains of github.com, such as [education.github.com](https://education.github.com/) and [pages.github.com](https://pages.github.com/). These Terms also govern GitHub&rsquo;s conference websites, such as [githubuniverse.com](https://githubuniverse.com/), and product websites, such as [atom.io](https://atom.io/). Occasionally, websites owned by GitHub may provide different or additional terms of service. If those additional terms conflict with this Agreement, the more specific terms apply to the relevant page or service.
-4. "Customer", &ldquo;You,&rdquo; and &ldquo;Your&rdquo; refer to the company, or organization that has visited or is using the Website or Service; that accesses or uses any part of the account; or that directs the use of the account in the performance of its functions. Special terms may apply for business or government accounts (See [Section B(6): Additional Terms](#6-additional-terms)).
+4. "Customer", &ldquo;You,&rdquo; and &ldquo;Your&rdquo; refer to the company, or organization that has visited or is using the Website or Service; that accesses or uses any part of the account; or that directs the use of the account in the performance of its functions. Special terms may apply for business or government accounts (See [Section B(7): Additional Terms](#7-additional-terms)).
 5. "User" refers to the individual who has visited or is using the Website or Service on your behalf; that accesses or uses any part of the account on your behalf; or that directs the use of the account in the performance of their functions on your behalf. All Users must be at least 13 years of age. "Other Users" refers to the individuals, not including your Users, who visit or use the Website or Service. &ldquo;Users&rdquo; and &ldquo;Other Users&rdquo; are collectively referred to as &ldquo;All Users&rdquo;.
 6. &ldquo;GitHub,&rdquo; &ldquo;We,&rdquo; and &ldquo;Us&rdquo; refer to GitHub, Inc., as well as our affiliates, directors, subsidiaries, contractors, licensors, officers, agents, and employees.
 7. An "Account" represents your legal relationship with GitHub. A &ldquo;User Account&rdquo; represents an individual User&rsquo;s authorization to log in to and use the Service and serves as a User&rsquo;s identity on GitHub. A "Corporate Account" refers to an Account created by a User on behalf of an entity, such as a company, non-profit organization, or group. A Corporate Account may include a Business plan or a Team plan. &ldquo;Organizations&rdquo; are shared workspaces that may be associated with a single entity or with one or more Users where multiple Users can collaborate across many projects at once. A User Account can be a member of any number of Organizations.
@@ -240,7 +240,7 @@ If you list a Developer Product through GitHub Marketplace, then you must agree
 
 #### 2. 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-privacy-statement.md#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](/articles/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.**
 
diff --git a/Policies/github-privacy-statement.md b/Policies/github-privacy-statement.md
@@ -57,13 +57,13 @@ If you **create an account**, we require some basic information at the time of a
 
 User Personal Information does not include aggregated, non-personally identifying information. We may use aggregated, non-personally identifying information to operate, improve, and optimize our website and service.
 
-##### Why we collect this
+##### Why we collect this information
 
 - We need your User Personal Information to create your account, and to provide the services you request, including to provide the GitHub service, the Marketplace service, or to respond to support requests.
 - We use your User Personal Information, specifically your user name, to identify you on GitHub.
 - We use it to fill out your profile and share that profile with other users if you ask us to.
 - We will use your email address to communicate with you, if you've said that's okay, **and only for the reasons you&rsquo;ve said that&rsquo;s okay**. Please see our section on [email communication](#how-we-and-others-communicate-with-you) for more information.
-- We use User Personal Information to make recommendations for you, such as to suggest projects you may want to follow or contribute to. For example, when you fill out your biography in your Account Settings, we learn from it &mdash; as well as from your public behavior on GitHub &mdash; to determine your coding interests. These recommendations are automated decisions, but they have no legal impact on your rights.
+- We use User Personal Information and other data to make recommendations for you, such as to suggest projects you may want to follow or contribute to. For example, when you fill out an interest survey at account creation, we learn from it &mdash; as well as from your public behavior on GitHub, such as the projects you star &mdash; to determine your coding interests, and we recommend similar projects. These recommendations are automated decisions, but they have no legal impact on your rights.
 - We use your User Personal Information for internal purposes, such as to maintain logs for security reasons, for training purposes, and for legal documentation.
 - We limit our use of your User Personal Information to the purposes listed in this Privacy Statement. If we need to use your User Personal Information for other purposes, we will ask your permission first. You can always see what information we have, how we're using it, and what permissions you have given us in your [user profile](https://github.com/settings/admin).
 
@@ -114,7 +114,7 @@ We may share User Personal Information if we are involved in a merger, sale, or
 
 Much of GitHub is public-facing. If your content is public-facing, third parties may access and use it in compliance with our Terms of Service, such as by viewing your profile or repositories or pulling data via our API. We do not sell that content; it is yours. However, we do allow third parties, such as research organizations or archives, to compile public-facing GitHub information. Other third parties, such as data brokers, have been known to scrape GitHub and compile data as well.
 
-Your Personal Information, associated with your content, could be gathered by third parties in these compilations of GitHub data. If you do not want your Personal Information to appear in third parties&rsquo; compilations of GitHub data, please do not make your Personal Information publicly available and be sure to [configure your email address to be private in your user profile](https://github.com/settings/emails). We set current users' email address private by default, but legacy GitHub users may need to update their settings.
+Your Personal Information, associated with your content, could be gathered by third parties in these compilations of GitHub data. If you do not want your Personal Information to appear in third parties&rsquo; compilations of GitHub data, please do not make your Personal Information publicly available and be sure to [configure your email address to be private in your user profile](https://github.com/settings/emails) and in your [git commit settings](/articles/about-commit-email-addresses/). We currently set users' email address private by default, but legacy GitHub users may need to update their settings.
 
 If you would like to compile GitHub data, you must comply with our Terms of Service regarding [scraping](/articles/github-terms-of-service/#5-scraping) and [privacy](/articles/github-terms-of-service/#6-privacy), and you may only use any public-facing Personal Information you gather for the purpose for which our user has authorized it. For example, where a GitHub user has made an email address public-facing for the purpose of identification and attribution, do not use that email address for commercial advertising. We expect you to reasonably secure any Personal Information you have gathered from GitHub, and to respond promptly to complaints, removal requests, and "do not contact" requests from GitHub or GitHub users.
 
@@ -134,17 +134,19 @@ If you're already a GitHub user, you may access, update, alter, or delete your b
 
 #### Data portability
 
-As a GitHub User, you can always take your data with you. You can [clone your repositories to your desktop](https://help.github.com/desktop/guides/contributing-to-projects/cloning-a-repository-from-github-desktop/), for example, or you can use our [Data Portability tools](https://developer.github.com/changes/2018-05-24-user-migration-api/) to download all of the data we have about you.
+As a GitHub User, you can always take your data with you. You can [clone your repositories to your desktop](/desktop/guides/contributing-to-projects/cloning-a-repository-from-github-desktop/), for example, or you can use our [Data Portability tools](https://developer.github.com/changes/2018-05-24-user-migration-api/) to download all of the data we have about you.
 
-#### Data retention and deletion
+#### Data retention and deletion of data
 
 Generally, GitHub will retain User Personal Information for as long as your account is active or as needed to provide you services.
 
 We may retain certain User Personal Information indefinitely, unless you delete it or request its deletion. For example, we don&rsquo;t automatically delete inactive user accounts, so unless you choose to delete your account, we will retain your account information indefinitely.
 
 If you would like to cancel your account or delete your User Personal Information, you may do so in your [user profile](https://github.com/settings/admin). We will retain and use your information as necessary to comply with our legal obligations, resolve disputes, and enforce our agreements, but barring legal requirements, we will delete your full profile (within reason) within 90 days. You may contact {{ site.data.variables.contact.contact_support }} to request the erasure of the data we process on the basis of consent within 30 days.
 
-After an account has been deleted, certain data, such as contributions to others' repositories and comments in others' issues, will remain. However, we will delete or deidentify your personal information, including your user name and email address, from the author field (see https://github.com/ghost). 
+After an account has been deleted, certain data, such as contributions to others' repositories and comments in others' issues, will remain. However, we will delete or deidentify your personal information, including your user name and email address, from the author field of issues, pull requests, and comments by associating them with the [ghost user](https://github.com/ghost). 
+
+The email address you have supplied [via your Git commit settings](/articles/setting-your-commit-email-address-in-git/) will always be associated with your commits in the Git system. If you chose to make your email address private, you should also update your Git commit settings. We are unable to change or delete data in the Git commit history &mdash; the Git software is designed to maintain a record &mdash; but we do enable you to control what information you put in that record.
 
 ### Our use of cookies and tracking
 
@@ -172,7 +174,7 @@ GitHub enforces a written security information program. Our program:
 - includes incident response and data breach notification processes; and
 - complies with applicable information security related laws and regulations in the geographic regions where GitHub does business.
 
-In the event of a data breach that affects your User Personal Information, we will act promptly to mitigate the impact of a breach and notify any affected users.
+In the event of a data breach that affects your User Personal Information, we will act promptly to mitigate the impact of a breach and notify any affected users without undue delay.
 
 Transmission of data on GitHub is encrypted using SSH, HTTPS, and SSL/TLS. While our data is not encrypted at rest, we manage our own cages and racks at top-tier data centers with excellent physical and network security, and when data is stored with a third party storage provider, it is encrypted.
 
@@ -207,7 +209,7 @@ For more information, see our [Guidelines for Legal Requests of User Data](/arti
 
 We will use your email address to communicate with you, if you've said that's okay, **and only for the reasons you&rsquo;ve said that&rsquo;s okay**. For example, if you contact our Support team with a request, we will respond to you via email. You have a lot of control over how your email address is used and shared on and through GitHub. You may manage your communication preferences in your [user profile](https://github.com/settings/emails).
 
-By design, the Git version control system associates many actions with a user's email address, such as commit messages. We are not able to change many aspects of the Git system. If you would like your email address to remain private, even when you&rsquo;re commenting on public repositories, you can [create a private email address in your user profile](https://github.com/settings/emails). You should also [update your local Git configuration to use your private email address](/articles/setting-your-commit-email-address-on-github/). This will not change how we contact you, but it will affect how others see you. We set current users' email address private by default, but legacy GitHub users may need to update their settings. Please see more about email addresses in commit messages [here](https://help.github.com/articles/about-commit-email-addresses/).
+By design, the Git version control system associates many actions with a user's email address, such as commit messages. We are not able to change many aspects of the Git system. If you would like your email address to remain private, even when you&rsquo;re commenting on public repositories, you can [create a private email address in your user profile](https://github.com/settings/emails). You should also [update your local Git configuration to use your private email address](/articles/setting-your-commit-email-address-on-github/). This will not change how we contact you, but it will affect how others see you. We set current users' email address private by default, but legacy GitHub users may need to update their settings. Please see more about email addresses in commit messages [here](/articles/about-commit-email-addresses/).
 
 Depending on your email settings, GitHub may occasionally send notification emails about changes in a repository you&rsquo;re watching, new features, requests for feedback, important policy changes, or offer customer support. We also send marketing emails, but only with your consent, if you opt in to our list. There's an unsubscribe link located at the bottom of each of the marketing emails we send you. Please note that you can not opt out of receiving important communications from us, such as mails from our Support team or system emails, but you can configure your notifications settings in your profile.
 
diff --git a/Policies/github-subprocessors-and-cookies.md b/Policies/github-subprocessors-and-cookies.md
@@ -13,7 +13,7 @@ GitHub provides a great deal of transparency regarding how we use your data, how
 
 ### GitHub Subprocessors
 
-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 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/)).
 
 | Name of Subprocessor | Description of Processing | Location of Processing |
 |---|---|---|
diff --git a/Policies/github-terms-of-service.md b/Policies/github-terms-of-service.md

-Original file line number
+Diff line change
 . The “Agreement” refers, collectively, to all the terms, conditions, notices contained or referenced in this document (the “Corporate Terms of Service” or the "Terms") and all other operating rules, policies (including the GitHub Privacy Statement, available at [github.com/site/privacy](https://github.com/site/privacy)) and procedures that we may publish from time to time on the Website. Most of our site policies are available at [help.github.com/categories/site-policy](/categories/site-policy/).
 . The “Service” refers to the applications, software, products, and services provided by GitHub.
 . The “Website” refers to GitHub’s website located at [github.com](https://github.com/), and all content, services, and products provided by GitHub at or through the Website. It also refers to GitHub-owned subdomains of github.com, such as [education.github.com](https://education.github.com/) and [pages.github.com](https://pages.github.com/). These Terms also govern GitHub’s conference websites, such as [githubuniverse.com](https://githubuniverse.com/), and product websites, such as [atom.io](https://atom.io/). Occasionally, websites owned by GitHub may provide different or additional terms of service. If those additional terms conflict with this Agreement, the more specific terms apply to the relevant page or service.
 -4. "Customer", “You,” and “Your” refer to the company, or organization that has visited or is using the Website or Service; that accesses or uses any part of the account; or that directs the use of the account in the performance of its functions. Special terms may apply for business or government accounts (See [Section B(6): Additional Terms](#6-additional-terms)).
 +4. "Customer", “You,” and “Your” refer to the company, or organization that has visited or is using the Website or Service; that accesses or uses any part of the account; or that directs the use of the account in the performance of its functions. Special terms may apply for business or government accounts (See [Section B(7): Additional Terms](#7-additional-terms)).
 . "User" refers to the individual who has visited or is using the Website or Service on your behalf; that accesses or uses any part of the account on your behalf; or that directs the use of the account in the performance of their functions on your behalf. All Users must be at least 13 years of age. "Other Users" refers to the individuals, not including your Users, who visit or use the Website or Service. “Users” and “Other Users” are collectively referred to as “All Users”.
 . “GitHub,” “We,” and “Us” refer to GitHub, Inc., as well as our affiliates, directors, subsidiaries, contractors, licensors, officers, agents, and employees.
 . An "Account" represents your legal relationship with GitHub. A “User Account” represents an individual User’s authorization to log in to and use the Service and serves as a User’s identity on GitHub. A "Corporate Account" refers to an Account created by a User on behalf of an entity, such as a company, non-profit organization, or group. A Corporate Account may include a Business plan or a Team plan. “Organizations” are shared workspaces that may be associated with a single entity or with one or more Users where multiple Users can collaborate across many projects at once. A User Account can be a member of any number of Organizations.
 #### 2. 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-privacy-statement.md#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](/articles/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.**