Merge branch 'main' into repo-sync

Author: Octomerger

assets/images/help/repository/security-and-analysis-disable-or-enable-fpt-private.png

@@ -65,7 +65,7 @@ You'll see updates in your news feed when a user you follow:
 - Forks a public repository.{% endif %}
 - Publishes a new release.
 
-For more information about starring repositories and following people, see "[Following people](/articles/following-people)" and "[Be social](/get-started/quickstart/be-social)."
+For more information about following people and watching repositories, see "[Following people](/get-started/exploring-projects-on-github/following-people)" and "[Be social](/get-started/quickstart/be-social)."
 
 {% if for-you-feed %}
 ### For you feed

content/account-and-profile/setting-up-and-managing-your-github-user-account/managing-user-account-settings/about-your-personal-dashboard.md

@@ -16,14 +16,14 @@ shortTitle: GitHub's use of your data
 
 ## About {% data variables.product.product_name %}'s use of your data
 
-{% data variables.product.product_name %} aggregates metadata and parses content patterns for the purposes of delivering generalized insights within the product. It uses data from public repositories, and also uses metadata and aggregate data from private repositories when a repository's owner has chosen to share the data with {% data variables.product.product_name %} through an opt-in. If you opt a private repository into data use, then it will perform read-only analysis of that specific private repository.
+{% data variables.product.product_name %} aggregates metadata and parses content patterns for the purposes of delivering generalized insights within the product. It uses data from public repositories, and also uses metadata and aggregate data from private repositories when a repository's owner has chosen to share the data with {% data variables.product.product_name %} by enabling the dependency graph. If you enable the dependency graph for a private repository, then {% data variables.product.product_name %} will perform read-only analysis of that specific private repository.
+
+If you enable data use for a private repository, we will continue to treat your private data, source code, or trade secrets as confidential and private consistent with our [Terms of Service](/free-pro-team@latest/github/site-policy/github-terms-of-service). The information we learn only comes from aggregated data. For more information, see "[Managing data use settings for your private repository](/get-started/privacy-on-github/managing-data-use-settings-for-your-private-repository)."
 
 {% data reusables.repositories.about-github-archive-program %} For more information, see "[About archiving content and data on {% data variables.product.prodname_dotcom %}](/github/creating-cloning-and-archiving-repositories/about-archiving-content-and-data-on-github#about-the-github-archive-program)."
 
 {% data reusables.user-settings.export-data %} For more information, see "[Requesting an archive of your personal account's data](/articles/requesting-an-archive-of-your-personal-account-s-data)."
 
-If you opt in to data use for a private repository, we will continue to treat your private data, source code, or trade secrets as confidential and private consistent with our [Terms of Service](/free-pro-team@latest/github/site-policy/github-terms-of-service). The information we learn only comes from aggregated data. For more information, see "[Managing data use settings for your private repository](/get-started/privacy-on-github/managing-data-use-settings-for-your-private-repository)."
-
 We'll announce substantial new features that use metadata or aggregate data on the [{% data variables.product.prodname_dotcom %} blog](https://github.com/blog).
 
 ## How data improves security recommendations

content/get-started/privacy-on-github/about-githubs-use-of-your-data.md

@@ -16,9 +16,22 @@ shortTitle: Manage data use for private repo
 
 ## About data use for your private repository
 
+
+You can control data use for your private repository with the security and analysis features. 
+
+- Enable the dependency graph to allow read-only data analysis on your repository. 
+- Disable the dependency graph to block read-only data analysis of your repository. 
+
 When you enable data use for your private repository, you'll be able to access the dependency graph, where you can track your repository's dependencies and receive {% data variables.product.prodname_dependabot_alerts %} when {% data variables.product.product_name %} detects vulnerable dependencies. For more information, see "[About {% data variables.product.prodname_dependabot_alerts %}](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies#dependabot-alerts-for-vulnerable-dependencies)."
 
-## Enabling or disabling data use features
+
+{% note %}
+
+**Note:** If you disable the dependency graph, {% data variables.product.prodname_dependabot_alerts %} and {% data variables.product.prodname_dependabot_security_updates %} are also disabled. For more information, see "[About the dependency graph](/code-security/supply-chain-security/understanding-your-software-supply-chain/about-the-dependency-graph)." 
+
+{% endnote %}
+
+## Enabling or disabling data use through security and analysis features
 
 {% data reusables.security.security-and-analysis-features-enable-read-only %}
 

content/get-started/privacy-on-github/managing-data-use-settings-for-your-private-repository.md

@@ -6,15 +6,15 @@ topics:
   - Policy
   - Legal
 children:
-  - github-sexually-obscene-content
+  - github-acceptable-use-policies
+  - github-active-malware-or-exploits
+  - github-bullying-and-harassment
   - github-disrupting-the-experience-of-other-users
   - github-doxxing-and-invasion-of-privacy
   - github-hate-speech-and-discrimination
-  - github-acceptable-use-policies
-  - github-bullying-and-harassment
-  - github-active-malware-or-exploits
-  - github-threats-of-violence-and-gratuitously-violent-content
   - github-impersonation
   - github-misinformation-and-disinformation
+  - github-sexually-obscene-content
+  - github-threats-of-violence-and-gratuitously-violent-content
   - github-appeal-and-reinstatement
 ---

content/site-policy/acceptable-use-policies/index.md

@@ -7,10 +7,10 @@ topics:
   - Legal
 children:
   - /submitting-content-removal-requests
+  - /dmca-takedown-policy
   - /github-private-information-removal-policy
   - /github-trademark-policy
   - /guide-to-submitting-a-dmca-counter-notice
   - /guide-to-submitting-a-dmca-takedown-notice
-  - /dmca-takedown-policy
 ---
 

content/site-policy/content-removal-policies/index.md

@@ -6,12 +6,12 @@ topics:
   - Policy
   - Legal
 children:
+  - /github-terms-of-service
   - /github-corporate-terms-of-service
-  - /github-community-forum-code-of-conduct
+  - /github-terms-for-additional-products-and-features
   - /github-community-guidelines
-  - /github-terms-of-service
+  - /github-community-forum-code-of-conduct
   - /github-sponsors-additional-terms
-  - /github-terms-for-additional-products-and-features
   - /github-registered-developer-agreement
   - /github-marketplace-terms-of-service
   - /github-marketplace-developer-agreement

content/site-policy/github-terms/index.md

@@ -6,12 +6,12 @@ topics:
   - Policy
   - Legal
 children:
-  - /github-codespaces-privacy-statement
+  - /github-privacy-statement
   - /global-privacy-practices
   - /github-data-protection-agreement
-  - /github-privacy-statement
   - /github-subprocessors-and-cookies
   - /githubs-notice-about-the-california-consumer-privacy-act
+  - /github-codespaces-privacy-statement
   - /github-candidate-privacy-policy
 ---
 

content/site-policy/privacy-policies/index.md

@@ -5,6 +5,7 @@ Check out our [contributing guide](../CONTRIBUTING.md) to see all the ways you c
 Here, you'll find additional information that might be helpful as you work on a pull request in this repo.
 
 - [development](./development.md) - steps for getting this app running on your local machine
+- [codespace](./codespace.md) - use GitHub Codespaces to work on documentation markdown files
 - [content markup reference](./content-markup-reference.md) - how to use markup and features specific to the GitHub Docs site 
 - [content style guide](./content-style-guide.md) - style guidance specific to GitHub Docs content and additional resources for writing clear, helpful content
 - [content model](./content-model.md) - the content types that make up GitHub Docs and how to write them

contributing/README.md

@@ -0,0 +1,33 @@
+# Working in a codespace
+
+This document describes how to use GitHub Codespaces for working on articles for docs.github.com.
+
+## About GitHub Codespaces 
+
+GitHub Codespaces allows you to work in a development environment that's hosted remotely from your machine. You can get started very quickly, with no need to set up the working environment, and without having to download files to your local computer.
+
+**Note**: GitHub Codespaces is currently only available if you are a member of an organization using GitHub Team or GitHub Enterprise Cloud. 
+
+For more information, see "[GitHub Codespaces overview](https://docs.github.com/en/codespaces/overview)."
+
+## Work on documentation in a codespace
+
+The steps described below assume you have GitHub Codespaces set up to edit files using Visual Studio Code for Web. The steps are very similar if you have configured a different editor. For more information, see "[Setting your default editor for GitHub Codespaces](https://docs.github.com/en/codespaces/customizing-your-codespace/setting-your-default-editor-for-codespaces)."
+
+1. Go to the `docs` repository: [https://github.com/github/docs](https://github.com/github/docs).
+1. [Fork the repository](https://docs.github.com/en/get-started/quickstart/fork-a-repo) to your own organization.
+1. [Create a branch to work on](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-and-deleting-branches-within-your-repository).
+1. On the main page of the new `docs` repository, click the **Code** button and click **Create codespace on BRANCHNAME**.<br>
+   The "Setting up your codespace" page is displayed. After a short time the browser-based version of Visual Studio Code is displayed.
+1. Use the Explorer to navigate to the markdown file you want to edit. This will be located below the `content` directory. <br>
+   In most cases, the path to the file, below the `content` directory, matches the path in URL, minus the `.md` file name extension. For example, the source for the article <code>https<span></span>://docs.github.com/en/**codespaces/getting-started/quickstart**</code> is the markdown file <code>content/**codespaces/getting-started/quickstart**.md</code>.
+1. Edit the markdown file as required.
+1. Save your changes.
+1. Commit and push your changes, either using the Source Control pane, or using Git commands from the Terminal. For more information, see "[About Git](https://docs.github.com/en/get-started/using-git/about-git)."
+1. Go to the **Pull requests** tab of the `github/docs` repository: https://github.com/github/docs/pulls
+1. Click **New pull request**.
+1. Click **compare across forks** and choose the forked repository you created, and your working branch.
+1. Check that the changes displayed include all of the changes you made in the codespace. If they do not, it indicates there are changes you have not pushed from the codespace to GitHub.
+1. Click **Create pull request**.
+1. Fill out the details for your pull request and click **Create pull request**.<br>
+   Your pull request will be reviewed by a member of the GitHub documentation team.