From e907960b0b995cbd3a1f7a83206388e6061d36be Mon Sep 17 00:00:00 2001 From: bl-ue Date: Wed, 23 Jun 2021 13:41:24 -0400 Subject: [PATCH] Fix typos --- ...-palette.png => codespaces-command-palette.png} | Bin ...=> username-with-limited-availability-text.png} | Bin .../building-and-testing-xamarin-applications.md | 4 ++-- .../cluster-network-configuration.md | 2 +- ...nated-disclosure-of-security-vulnerabilities.md | 4 +--- .../using-the-command-palette-in-codespaces.md | 2 +- .../creating-a-codespace.md | 5 +---- .../forwarding-ports-in-your-codespace.md | 5 ++--- .../getting-started-with-your-dotnet-project.md | 2 +- ...started-with-your-java-project-in-codespaces.md | 2 +- ...arted-with-your-nodejs-project-in-codespaces.md | 2 +- ...arted-with-your-python-project-in-codespaces.md | 4 ++-- .../index.md | 2 +- .../reviewing-your-security-logs-for-codespaces.md | 2 +- .../managing-commits/squashing-commits.md | 4 ++-- ...velopment-environment-to-create-a-github-app.md | 2 +- .../personalizing-your-profile.md | 2 +- .../github-ae-data-protection-agreement.md | 13 ++++++------- content/github/site-policy/dmca-takedown-policy.md | 4 ++-- ...rotection-agreement-non-enterprise-customers.md | 12 ++++++------ .../creating-gists.md | 2 +- ...eviewing-the-audit-log-for-your-organization.md | 2 +- ...permissions-for-adding-outside-collaborators.md | 2 +- content/rest/reference/code-scanning.md | 2 +- ...ollaborator.md => restrict-add-collaborator.md} | 0 25 files changed, 37 insertions(+), 44 deletions(-) rename assets/images/help/codespaces/{codespaces-commad-palette.png => codespaces-command-palette.png} (100%) rename assets/images/help/profile/{username-with-limited-availibilty-text.png => username-with-limited-availability-text.png} (100%) rename data/reusables/gated-features/{restict-add-collaborator.md => restrict-add-collaborator.md} (100%) diff --git a/assets/images/help/codespaces/codespaces-commad-palette.png b/assets/images/help/codespaces/codespaces-command-palette.png similarity index 100% rename from assets/images/help/codespaces/codespaces-commad-palette.png rename to assets/images/help/codespaces/codespaces-command-palette.png diff --git a/assets/images/help/profile/username-with-limited-availibilty-text.png b/assets/images/help/profile/username-with-limited-availability-text.png similarity index 100% rename from assets/images/help/profile/username-with-limited-availibilty-text.png rename to assets/images/help/profile/username-with-limited-availability-text.png diff --git a/content/actions/guides/building-and-testing-xamarin-applications.md b/content/actions/guides/building-and-testing-xamarin-applications.md index 33c7e095905b..573ed0509aa2 100644 --- a/content/actions/guides/building-and-testing-xamarin-applications.md +++ b/content/actions/guides/building-and-testing-xamarin-applications.md @@ -39,7 +39,7 @@ We recommend that you have a basic understanding of Xamarin, .NET Core SDK, YAML - "[Getting started with .NET](https://dotnet.microsoft.com/learn)" - "[Learn Xamarin](https://dotnet.microsoft.com/learn/xamarin)" -## Bulding Xamarin.iOS apps +## Building Xamarin.iOS apps The example below demonstrates how to change the default Xamarin SDK versions and build a Xamarin.iOS application. @@ -79,7 +79,7 @@ jobs: ``` {% endraw %} -## Bulding Xamarin.Android apps +## Building Xamarin.Android apps The example below demonstrates how to change default Xamarin SDK versions and build a Xamarin.Android application. diff --git a/content/admin/enterprise-management/configuring-clustering/cluster-network-configuration.md b/content/admin/enterprise-management/configuring-clustering/cluster-network-configuration.md index fad98e50e619..8be13dfbf074 100644 --- a/content/admin/enterprise-management/configuring-clustering/cluster-network-configuration.md +++ b/content/admin/enterprise-management/configuring-clustering/cluster-network-configuration.md @@ -110,7 +110,7 @@ We strongly recommend enabling PROXY support for both your instance and the load {% data reusables.enterprise_clustering.x-forwarded-for %} -To enable the `X-Fowarded-For` header, use this command: +To enable the `X-Forwarded-For` header, use this command: ```shell $ ghe-config 'loadbalancer.http-forward' 'true' && ghe-cluster-config-apply diff --git a/content/code-security/security-advisories/about-coordinated-disclosure-of-security-vulnerabilities.md b/content/code-security/security-advisories/about-coordinated-disclosure-of-security-vulnerabilities.md index 0b914aecb38c..005c46e6b18e 100644 --- a/content/code-security/security-advisories/about-coordinated-disclosure-of-security-vulnerabilities.md +++ b/content/code-security/security-advisories/about-coordinated-disclosure-of-security-vulnerabilities.md @@ -34,7 +34,7 @@ As a maintainer, it's good practice to clearly indicate how and where you want t Maintainers should disclose vulnerabilities in a timely manner. If there is a security vulnerability in your repository, we recommend you: - Treat the vulnerability as a security issue rather than a simple bug, both in your response and your disclosure. For example, you'll need to explicitly mention that the issue is a security vulnerability in the release notes. -- Acknowlege receipt of the vulnerability report as quickly as possible, even if no immediate resources are available for investigation. This sends the message that you are quick to respond and act, and it sets a positive tone for the rest of the interaction between you and the vulnerability reporter. +- Acknowledge receipt of the vulnerability report as quickly as possible, even if no immediate resources are available for investigation. This sends the message that you are quick to respond and act, and it sets a positive tone for the rest of the interaction between you and the vulnerability reporter. - Involve the vulnerability reporter when you verify the impact and veracity of the report. It's likely the vulnerability reporter has already spent time considering the vulnerability in a variety of scenarios, some of which you may have not considered yourself. - Remediate the issue in a way that you see fit, taking any concerns and advice provided by the vulnerability reporter into careful consideration. Often the vulnerability reporter will have knowledge of certain corner cases and remediation bypasses that are easy to miss without a security research background. - Always acknowledge the vulnerability reporter when you credit the discovery. @@ -65,5 +65,3 @@ The process for reporting and disclosing vulnerabilities for projects on {% data To get started, see "[Creating a security advisory](/github/managing-security-vulnerabilities/creating-a-security-advisory)." - - diff --git a/content/codespaces/codespaces-reference/using-the-command-palette-in-codespaces.md b/content/codespaces/codespaces-reference/using-the-command-palette-in-codespaces.md index 87cc84f7a4cd..18f6006ca0a6 100644 --- a/content/codespaces/codespaces-reference/using-the-command-palette-in-codespaces.md +++ b/content/codespaces/codespaces-reference/using-the-command-palette-in-codespaces.md @@ -31,7 +31,7 @@ You can access the Command Palette in a number of ways. To see all commands related to {% data variables.product.prodname_github_codespaces %} access the Command Palette, then start typing "Codespaces". -![A list of all commands that relate to Codespaces](/assets/images/help/codespaces/codespaces-commad-palette.png) +![A list of all commands that relate to Codespaces](/assets/images/help/codespaces/codespaces-command-palette.png) ### Suspending or stopping a codespace diff --git a/content/codespaces/developing-in-codespaces/creating-a-codespace.md b/content/codespaces/developing-in-codespaces/creating-a-codespace.md index 8b7abccba8f6..43d08810520d 100644 --- a/content/codespaces/developing-in-codespaces/creating-a-codespace.md +++ b/content/codespaces/developing-in-codespaces/creating-a-codespace.md @@ -26,7 +26,7 @@ Codespaces are associated with a specific branch of a repository and the reposit When you create a codespace, a number of steps happen to enable full access to your development environment. - Resources such as a VM and storage for your container are assigned. A new VM is created every time you create or start a codespace to ensure that you always have the latest versions and security patches. -- {% data variables.product.prodname_codespaces %} recieves information about your repository, branch, commits, your public dotfiles repository, and any secrets that you have created. +- {% data variables.product.prodname_codespaces %} receives information about your repository, branch, commits, your public dotfiles repository, and any secrets that you have created. - {% data variables.product.prodname_codespaces %} executes a shallow clone of the repository. - If you have one in your repository, {% data variables.product.prodname_codespaces %} runs the `devcontainer.json` file. For more information, see "[Configuring {% data variables.product.prodname_codespaces %} for your project](/github/developing-online-with-codespaces/configuring-codespaces-for-your-project)." - Your Docker container, `docker-compose`, or other initialization is run. @@ -56,6 +56,3 @@ When you create a codespace, a number of steps happen to enable full access to y 4. To create a codespace using a Standard machine type, click {% octicon "plus" aria-label="The plus icon" %} **New codespace**. ![New codespace button](/assets/images/help/codespaces/new-codespace-button.png) - - - diff --git a/content/codespaces/developing-in-codespaces/forwarding-ports-in-your-codespace.md b/content/codespaces/developing-in-codespaces/forwarding-ports-in-your-codespace.md index 8d8e2c6dec5f..d1f6e584247d 100644 --- a/content/codespaces/developing-in-codespaces/forwarding-ports-in-your-codespace.md +++ b/content/codespaces/developing-in-codespaces/forwarding-ports-in-your-codespace.md @@ -22,7 +22,7 @@ When an application running inside a codespace outputs a port to the console, {% ![Automatic port forwarding](/assets/images/help/codespaces/automatic-port-forwarding.png) -You can also forward a port manually, label forwarded ports, share fowarded ports publicly, and add forwarded ports to the codespace configuration. +You can also forward a port manually, label forwarded ports, share forwarded ports publicly, and add forwarded ports to the codespace configuration. ## Forwarding a port @@ -58,10 +58,9 @@ If you want to share a forwarded port with others, you can make the port public. You can add a forwarded port to the {% data variables.product.prodname_codespaces %} configuration for the repository, so the port will automatically be forwarded for all codespaces created from the repository. After you update the configuration, any previously created codespaces must be rebuilt for the change to apply. For more information, see "[Configuring {% data variables.product.prodname_codespaces %} for your project](/codespaces/setting-up-your-codespace/configuring-codespaces-for-your-project#applying-changes-to-your-configuration)." -You can manually configure fowarded ports in a `.devcontainer.json` file using the `forwardPorts` property, or you can use the "Ports" panel in your codespace. +You can manually configure forwarded ports in a `.devcontainer.json` file using the `forwardPorts` property, or you can use the "Ports" panel in your codespace. {% data reusables.codespaces.navigate-to-ports-tab %} 1. Right click the port you want to add to the codespace configuration, then click **Set Label and Update devcontainer.json**. ![Option to set label and add port to devcontainer.json in the right-click menu](/assets/images/help/codespaces/update-devcontainer-to-add-port-option.png) {% data reusables.codespaces.type-port-label %} - diff --git a/content/codespaces/getting-started-with-codespaces/getting-started-with-your-dotnet-project.md b/content/codespaces/getting-started-with-codespaces/getting-started-with-your-dotnet-project.md index 6d460c2c3e3f..3d6503732267 100644 --- a/content/codespaces/getting-started-with-codespaces/getting-started-with-your-dotnet-project.md +++ b/content/codespaces/getting-started-with-codespaces/getting-started-with-your-dotnet-project.md @@ -166,7 +166,7 @@ You can use the Dockerfile to add additional container layers to specify OS pack ## Step 3: Modify your devcontainer.json file -With your dev container added and a basic understanding of what everything does, you can now make changes to configure it for your environment. In this example, you'll add properties to install extensions and restore your project dependancies when your codespace launches. +With your dev container added and a basic understanding of what everything does, you can now make changes to configure it for your environment. In this example, you'll add properties to install extensions and restore your project dependencies when your codespace launches. 1. In the Explorer, expand the `.devcontainer` folder and select the `devcontainer.json` file from the tree to open it. diff --git a/content/codespaces/getting-started-with-codespaces/getting-started-with-your-java-project-in-codespaces.md b/content/codespaces/getting-started-with-codespaces/getting-started-with-your-java-project-in-codespaces.md index 10b0d28d1ce4..44f895750c28 100644 --- a/content/codespaces/getting-started-with-codespaces/getting-started-with-your-java-project-in-codespaces.md +++ b/content/codespaces/getting-started-with-codespaces/getting-started-with-your-java-project-in-codespaces.md @@ -148,7 +148,7 @@ You can use the Dockerfile to add additional container layers to specify OS pack With your dev container added and a basic understanding of what everything does, you can now make changes to configure it for your environment. In this example, you'll add properties to install extensions and your project dependencies when your codespace launches. -1. In the Explorer, select the `devcontainer.json` file from the tree to open it. You might have to exand the `.devcontainer` folder to see it. +1. In the Explorer, select the `devcontainer.json` file from the tree to open it. You might have to expand the `.devcontainer` folder to see it. !["Codespaces: Rebuild Container" in the command palette](/assets/images/help/codespaces/devcontainers-options.png) diff --git a/content/codespaces/getting-started-with-codespaces/getting-started-with-your-nodejs-project-in-codespaces.md b/content/codespaces/getting-started-with-codespaces/getting-started-with-your-nodejs-project-in-codespaces.md index b6797723d73a..12c2b737f37a 100644 --- a/content/codespaces/getting-started-with-codespaces/getting-started-with-your-nodejs-project-in-codespaces.md +++ b/content/codespaces/getting-started-with-codespaces/getting-started-with-your-nodejs-project-in-codespaces.md @@ -132,7 +132,7 @@ You can use the Dockerfile to add additional container layers to specify OS pack With your dev container added and a basic understanding of what everything does, you can now make changes to configure it for your environment. In this example, you'll add properties to install npm when your codespace launches and make a list of ports inside the container available locally. -1. In the Explorer, select the `devcontainer.json` file from the tree to open it. You might have to exand the `.devcontainer` folder to see it. +1. In the Explorer, select the `devcontainer.json` file from the tree to open it. You might have to expand the `.devcontainer` folder to see it. !["Codespaces: Rebuild Container" in the command palette](/assets/images/help/codespaces/devcontainers-options.png) diff --git a/content/codespaces/getting-started-with-codespaces/getting-started-with-your-python-project-in-codespaces.md b/content/codespaces/getting-started-with-codespaces/getting-started-with-your-python-project-in-codespaces.md index 4c6484ba68d1..6362bcb0d557 100644 --- a/content/codespaces/getting-started-with-codespaces/getting-started-with-your-python-project-in-codespaces.md +++ b/content/codespaces/getting-started-with-codespaces/getting-started-with-your-python-project-in-codespaces.md @@ -46,7 +46,7 @@ To set up your project with a custom container, you will need to use a `devconta {% data reusables.codespaces.command-palette-container %} -2. For this example, click **Python 3**. If you need additional features you can select any container that’s specific to Python or a combination of tools such as Python 3 and PostgresSQL. +2. For this example, click **Python 3**. If you need additional features you can select any container that’s specific to Python or a combination of tools such as Python 3 and PostgreSQL. ![Select Python option from the list](/assets/images/help/codespaces/add-python-prebuilt-container.png) 3. Click the recommended version of Python. ![Python version selection](/assets/images/help/codespaces/add-python-version.png) @@ -155,7 +155,7 @@ You can use the Dockerfile to add additional container layers to specify OS pack ## Step 3: Modify your devcontainer.json file -With your dev container added and a basic understanding of what everything does, you can now make changes to configure it for your environment. In this example, you'll add properties to install extensions and your project dependancies when your codespace launches. +With your dev container added and a basic understanding of what everything does, you can now make changes to configure it for your environment. In this example, you'll add properties to install extensions and your project dependencies when your codespace launches. 1. In the Explorer, expand the `.devcontainer` folder and select the `devcontainer.json` file from the tree to open it. diff --git a/content/codespaces/managing-codespaces-for-your-organization/index.md b/content/codespaces/managing-codespaces-for-your-organization/index.md index 0411e1806101..37002cfcb99d 100644 --- a/content/codespaces/managing-codespaces-for-your-organization/index.md +++ b/content/codespaces/managing-codespaces-for-your-organization/index.md @@ -1,6 +1,6 @@ --- title: Managing Codespaces for your organization -intro: 'You can manange and review how users in your organization can use {% data variables.product.prodname_github_codespaces %}.' +intro: 'You can manage and review how users in your organization can use {% data variables.product.prodname_github_codespaces %}.' versions: free-pro-team: '*' topics: diff --git a/content/codespaces/managing-your-codespaces/reviewing-your-security-logs-for-codespaces.md b/content/codespaces/managing-your-codespaces/reviewing-your-security-logs-for-codespaces.md index d80503da9b9f..2d1a8681dc1b 100644 --- a/content/codespaces/managing-your-codespaces/reviewing-your-security-logs-for-codespaces.md +++ b/content/codespaces/managing-your-codespaces/reviewing-your-security-logs-for-codespaces.md @@ -18,4 +18,4 @@ When you perform an action related to {% data variables.product.prodname_codespa ![security log with Codespaces information](/assets/images/help/settings/codespaces-audit-log.png) -The security log includes details on what action occured and when you performed it. For information about {% data variables.product.prodname_codespaces %} actions, see "[{% data variables.product.prodname_codespaces %} category actions](/github/authenticating-to-github/reviewing-your-security-log#codespaces-category-actions)". +The security log includes details on what action occurred and when you performed it. For information about {% data variables.product.prodname_codespaces %} actions, see "[{% data variables.product.prodname_codespaces %} category actions](/github/authenticating-to-github/reviewing-your-security-log#codespaces-category-actions)". diff --git a/content/desktop/contributing-and-collaborating-using-github-desktop/managing-commits/squashing-commits.md b/content/desktop/contributing-and-collaborating-using-github-desktop/managing-commits/squashing-commits.md index 0f92cbae068b..fcc15917133e 100644 --- a/content/desktop/contributing-and-collaborating-using-github-desktop/managing-commits/squashing-commits.md +++ b/content/desktop/contributing-and-collaborating-using-github-desktop/managing-commits/squashing-commits.md @@ -19,7 +19,7 @@ Squashing allows you to combine multiple commits in your branch's history into a 4. Select the commits to squash and drop them on the commit you want to combine them with. You can select one commit or select multiple commits using or Shift. ![squash drag and drop](/assets/images/help/desktop/squash-drag-and-drop.png) 5. Modify the commit message of your new commit. The commit messages of the selected commits you want to squash are pre-filled into the **Summary** and **Description** fields. -6. Click **Squash Commmits**. +6. Click **Squash Commits**. {% endmac %} @@ -31,7 +31,7 @@ Squashing allows you to combine multiple commits in your branch's history into a 4. Select the commits to squash and drop them on the commit you want to combine them with. You can select one commit or select multiple commits using Ctrl or Shift. ![squash drag and drop](/assets/images/help/desktop/squash-drag-and-drop.png) 5. Modify the commit message of your new commit. The commit messages of the selected commits you want to squash are pre-filled into the **Summary** and **Description** fields. -6. Click **Squash Commmits**. +6. Click **Squash Commits**. {% endwindows %} diff --git a/content/developers/apps/getting-started-with-apps/setting-up-your-development-environment-to-create-a-github-app.md b/content/developers/apps/getting-started-with-apps/setting-up-your-development-environment-to-create-a-github-app.md index 235e02685729..ce2a2feb1030 100644 --- a/content/developers/apps/getting-started-with-apps/setting-up-your-development-environment-to-create-a-github-app.md +++ b/content/developers/apps/getting-started-with-apps/setting-up-your-development-environment-to-create-a-github-app.md @@ -169,7 +169,7 @@ Open up the `template_server.rb` file in your favorite text editor. You'll see c At the top of the file you'll see `set :port 3000`, which sets the port used when starting the web server to match the port you redirected your webhook payloads to in "[Step 1. Start a new Smee channel](#step-1-start-a-new-smee-channel)." -The next code you'll see is the `class GHApp < Sintra::Application` declaration. You'll write all of the code for your GitHub App inside this class. +The next code you'll see is the `class GHApp < Sinatra::Application` declaration. You'll write all of the code for your GitHub App inside this class. Out of the box, the class in the template does the following things: * [Read the environment variables](#read-the-environment-variables) diff --git a/content/github/setting-up-and-managing-your-github-profile/customizing-your-profile/personalizing-your-profile.md b/content/github/setting-up-and-managing-your-github-profile/customizing-your-profile/personalizing-your-profile.md index ce8221c16ab4..dd3a0a8555a5 100644 --- a/content/github/setting-up-and-managing-your-github-profile/customizing-your-profile/personalizing-your-profile.md +++ b/content/github/setting-up-and-managing-your-github-profile/customizing-your-profile/personalizing-your-profile.md @@ -94,7 +94,7 @@ You can set a status to display information about your current availability on { When you set your status, you can also let people know that you have limited availability on {% data variables.product.product_name %}. -![At-mentioned username shows "busy" note next to username](/assets/images/help/profile/username-with-limited-availibilty-text.png) +![At-mentioned username shows "busy" note next to username](/assets/images/help/profile/username-with-limited-availability-text.png) ![Requested reviewer shows "busy" note next to username](/assets/images/help/profile/request-a-review-limited-availability-status.png) diff --git a/content/github/site-policy-deprecated/github-ae-data-protection-agreement.md b/content/github/site-policy-deprecated/github-ae-data-protection-agreement.md index 191e7275f8e1..531ff23c8f1c 100644 --- a/content/github/site-policy-deprecated/github-ae-data-protection-agreement.md +++ b/content/github/site-policy-deprecated/github-ae-data-protection-agreement.md @@ -194,7 +194,7 @@ For the purposes of Article 46 (2) of the General Data Protection Regulation (EU (e) 'the applicable data protection law' means the legislation protecting the fundamental rights and freedoms of individuals and, in particular, their right to privacy with respect to the processing of personal data applicable to a data controller in the Member State in which the data exporter is established; -(f) 'technical and organisational security measures' means those measures aimed at protecting personal data against accidental or unlawful destruction or accidental loss, alteration, unauthorised disclosure or access, in particular where the processing involves the transmission of data over a network, and against all other unlawful forms of processing. +(f) 'technical and organizational security measures' means those measures aimed at protecting personal data against accidental or unlawful destruction or accidental loss, alteration, unauthorized disclosure or access, in particular where the processing involves the transmission of data over a network, and against all other unlawful forms of processing. #### Clause 2: Details of the transfer The details of the transfer and in particular the special categories of personal data where applicable are specified in Appendix 1 below which forms an integral part of the Clauses. @@ -215,9 +215,9 @@ The data exporter agrees and warrants: (b) that it has instructed and throughout the duration of the personal data processing services will instruct the data importer to process the personal data transferred only on the data exporter's behalf and in accordance with the applicable data protection law and the Clauses; -(c) that the data importer will provide sufficient guarantees in respect of the technical and organisational security measures specified in Appendix 2 below; +(c) that the data importer will provide sufficient guarantees in respect of the technical and organizational security measures specified in Appendix 2 below; -(d) that after assessment of the requirements of the applicable data protection law, the security measures are appropriate to protect personal data against accidental or unlawful destruction or accidental loss, alteration, unauthorised disclosure or access, in particular where the processing involves the transmission of data over a network, and against all other unlawful forms of processing, and that these measures ensure a level of security appropriate to the risks presented by the processing and the nature of the data to be protected having regard to the state of the art and the cost of their implementation; +(d) that after assessment of the requirements of the applicable data protection law, the security measures are appropriate to protect personal data against accidental or unlawful destruction or accidental loss, alteration, unauthorized disclosure or access, in particular where the processing involves the transmission of data over a network, and against all other unlawful forms of processing, and that these measures ensure a level of security appropriate to the risks presented by the processing and the nature of the data to be protected having regard to the state of the art and the cost of their implementation; (e) that it will ensure compliance with the security measures; @@ -238,15 +238,15 @@ The data importer agrees and warrants: (b) that it has no reason to believe that the legislation applicable to it prevents it from fulfilling the instructions received from the data exporter and its obligations under the contract and that in the event of a change in this legislation which is likely to have a substantial adverse effect on the warranties and obligations provided by the Clauses, it will promptly notify the change to the data exporter as soon as it is aware, in which case the data exporter is entitled to suspend the transfer of data and/or terminate the contract; -(c) that it has implemented the technical and organisational security measures specified in Appendix 2 before processing the personal data transferred; +(c) that it has implemented the technical and organizational security measures specified in Appendix 2 before processing the personal data transferred; (d) that it will promptly notify the data exporter about: (i) any legally binding request for disclosure of the personal data by a law enforcement authority unless otherwise prohibited, such as a prohibition under criminal law to preserve the confidentiality of a law enforcement investigation, - (ii) any accidental or unauthorised access, and + (ii) any accidental or unauthorized access, and - (iii) any request received directly from the data subjects without responding to that request, unless it has been otherwise authorised to do so; + (iii) any request received directly from the data subjects without responding to that request, unless it has been otherwise authorized to do so; (e) to deal promptly and properly with all inquiries from the data exporter relating to its processing of the personal data subject to the transfer and to abide by the advice of the supervisory authority with regard to the processing of the data transferred; @@ -404,4 +404,3 @@ c. Any third party auditor must disclose to GitHub any findings and recommended d. In the event of a regulatory audit, access will be permitted only during regular business hours, Pacific time. e. To the extent permitted by law, Customer must keep confidential any information gathered through any such audit of GitHub that, by its nature, should be confidential. - diff --git a/content/github/site-policy/dmca-takedown-policy.md b/content/github/site-policy/dmca-takedown-policy.md index b19a3ab1ca37..d213e034a7ab 100644 --- a/content/github/site-policy/dmca-takedown-policy.md +++ b/content/github/site-policy/dmca-takedown-policy.md @@ -31,7 +31,7 @@ The DMCA also prohibits the [circumvention of technical measures](https://www.co ## DMCA Notices In a Nutshell -The DMCA provides two simple, straightforward procedures that all GitHub users should know about: (i) a [takedown-notice](/articles/guide-to-submitting-a-dmca-takedown-notice) procedure for copyright holders to request that content be removed; and (ii) a [counter-notice](/articles/guide-to-submitting-a-dmca-counter-notice) procedure for users to get content reenabled when content is taken down by mistake or misidentification. +The DMCA provides two simple, straightforward procedures that all GitHub users should know about: (i) a [takedown-notice](/articles/guide-to-submitting-a-dmca-takedown-notice) procedure for copyright holders to request that content be removed; and (ii) a [counter-notice](/articles/guide-to-submitting-a-dmca-counter-notice) procedure for users to get content re-enabled when content is taken down by mistake or misidentification. DMCA [takedown notices](/articles/guide-to-submitting-a-dmca-takedown-notice) are used by copyright owners to ask GitHub to take down content they believe to be infringing. If you are a software designer or developer, you create copyrighted content every day. If someone else is using your copyrighted content in an unauthorized manner on GitHub, you can send us a DMCA takedown notice to request that the infringing content be changed or removed. @@ -60,7 +60,7 @@ Here are the basic steps in the process. 7. **User May Send A Counter Notice.** We encourage users who have had content disabled to consult with a lawyer about their options. If a user believes that their content was disabled as a result of a mistake or misidentification, they may send us a [counter notice](/articles/guide-to-submitting-a-dmca-counter-notice). As with the original notice, we will make sure that the counter notice is sufficiently detailed (as explained in the [how-to guide](/articles/guide-to-submitting-a-dmca-counter-notice)). If it is, we will [post it](#d-transparency) to our [public repository](https://github.com/github/dmca) and pass the notice back to the copyright owner by sending them the link. -8. **Copyright Owner May File a Legal Action.** If a copyright owner wishes to keep the content disabled after receiving a counter notice, they will need to initiate a legal action seeking a court order to restrain the user from engaging in infringing activity relating to the content on GitHub. In other words, you might get sued. If the copyright owner does not give GitHub notice within 10-14 days, by sending a copy of a valid legal complaint filed in a court of competent jurisdiction, GitHub will reenable the disabled content. +8. **Copyright Owner May File a Legal Action.** If a copyright owner wishes to keep the content disabled after receiving a counter notice, they will need to initiate a legal action seeking a court order to restrain the user from engaging in infringing activity relating to the content on GitHub. In other words, you might get sued. If the copyright owner does not give GitHub notice within 10-14 days, by sending a copy of a valid legal complaint filed in a court of competent jurisdiction, GitHub will re-enable the disabled content. ## B. What About Forks? (or What's a Fork?) diff --git a/content/github/site-policy/github-data-protection-agreement-non-enterprise-customers.md b/content/github/site-policy/github-data-protection-agreement-non-enterprise-customers.md index 10d8e0df8498..7aae2a1b5836 100644 --- a/content/github/site-policy/github-data-protection-agreement-non-enterprise-customers.md +++ b/content/github/site-policy/github-data-protection-agreement-non-enterprise-customers.md @@ -193,7 +193,7 @@ For the purposes of Article 46(2) of the General Data Protection Regulation (EU (e) 'the applicable data protection law' means the legislation protecting the fundamental rights and freedoms of individuals and, in particular, their right to privacy with respect to the processing of personal data applicable to a data controller in the Member State in which the data exporter is established; -(f) 'technical and organisational security measures' means those measures aimed at protecting personal data against accidental or unlawful destruction or accidental loss, alteration, unauthorised disclosure or access, in particular where the processing involves the transmission of data over a network, and against all other unlawful forms of processing. +(f) 'technical and organizational security measures' means those measures aimed at protecting personal data against accidental or unlawful destruction or accidental loss, alteration, unauthorized disclosure or access, in particular where the processing involves the transmission of data over a network, and against all other unlawful forms of processing. #### Clause 2: Details of the transfer The details of the transfer and in particular the special categories of personal data where applicable are specified in Appendix 1 below which forms an integral part of the Clauses. @@ -214,9 +214,9 @@ The data exporter agrees and warrants: (b) that it has instructed and throughout the duration of the personal data processing services will instruct the data importer to process the personal data transferred only on the data exporter's behalf and in accordance with the applicable data protection law and the Clauses; -(c) that the data importer will provide sufficient guarantees in respect of the technical and organisational security measures specified in Appendix 2 below; +(c) that the data importer will provide sufficient guarantees in respect of the technical and organizational security measures specified in Appendix 2 below; -(d) that after assessment of the requirements of the applicable data protection law, the security measures are appropriate to protect personal data against accidental or unlawful destruction or accidental loss, alteration, unauthorised disclosure or access, in particular where the processing involves the transmission of data over a network, and against all other unlawful forms of processing, and that these measures ensure a level of security appropriate to the risks presented by the processing and the nature of the data to be protected having regard to the state of the art and the cost of their implementation; +(d) that after assessment of the requirements of the applicable data protection law, the security measures are appropriate to protect personal data against accidental or unlawful destruction or accidental loss, alteration, unauthorized disclosure or access, in particular where the processing involves the transmission of data over a network, and against all other unlawful forms of processing, and that these measures ensure a level of security appropriate to the risks presented by the processing and the nature of the data to be protected having regard to the state of the art and the cost of their implementation; (e) that it will ensure compliance with the security measures; @@ -237,15 +237,15 @@ The data importer agrees and warrants: (b) that it has no reason to believe that the legislation applicable to it prevents it from fulfilling the instructions received from the data exporter and its obligations under the contract and that in the event of a change in this legislation which is likely to have a substantial adverse effect on the warranties and obligations provided by the Clauses, it will promptly notify the change to the data exporter as soon as it is aware, in which case the data exporter is entitled to suspend the transfer of data and/or terminate the contract; -(c) that it has implemented the technical and organisational security measures specified in Appendix 2 before processing the personal data transferred; +(c) that it has implemented the technical and organizational security measures specified in Appendix 2 before processing the personal data transferred; (d) that it will promptly notify the data exporter about: (i) any legally binding request for disclosure of the personal data by a law enforcement authority unless otherwise prohibited, such as a prohibition under criminal law to preserve the confidentiality of a law enforcement investigation, -(ii) any accidental or unauthorised access, and +(ii) any accidental or unauthorized access, and -(iii) any request received directly from the data subjects without responding to that request, unless it has been otherwise authorised to do so; +(iii) any request received directly from the data subjects without responding to that request, unless it has been otherwise authorized to do so; (e) to deal promptly and properly with all inquiries from the data exporter relating to its processing of the personal data subject to the transfer and to abide by the advice of the supervisory authority with regard to the processing of the data transferred; diff --git a/content/github/writing-on-github/editing-and-sharing-content-with-gists/creating-gists.md b/content/github/writing-on-github/editing-and-sharing-content-with-gists/creating-gists.md index bbfe49aefe50..0efe03355901 100644 --- a/content/github/writing-on-github/editing-and-sharing-content-with-gists/creating-gists.md +++ b/content/github/writing-on-github/editing-and-sharing-content-with-gists/creating-gists.md @@ -18,7 +18,7 @@ Every gist is a Git repository, which means that it can be forked and cloned. {% Gists can be {% if currentVersion == "github-ae@latest" %}internal{% else %}public{% endif %} or secret. {% if currentVersion == "github-ae@latest" %}Internal{% else %}Public{% endif %} gists show up in {% data variables.gists.discover_url %}, where {% if currentVersion == "github-ae@latest" %}enterprise members{% else %}people{% endif %} can browse new gists as they're created. They're also searchable, so you can use them if you'd like other people to find and see your work. -Secret gists don't show up in {% data variables.gists.discover_url %} and are not searchable. Secret gists aren't private. If you send the URL of a secret gist to {% if currentVersion == "github-ae@latest" %}another enterprise member{% else %}a friend {% endif %}, they'll be able to see it. However, if {% if currentVersion == "github-ae@latest" %}any other enterpise member{% else %}someone you don't know{% endif %} discovers the URL, they'll also be able to see your gist. If you need to keep your code away from prying eyes, you may want to [create a private repository](/articles/creating-a-new-repository) instead. +Secret gists don't show up in {% data variables.gists.discover_url %} and are not searchable. Secret gists aren't private. If you send the URL of a secret gist to {% if currentVersion == "github-ae@latest" %}another enterprise member{% else %}a friend {% endif %}, they'll be able to see it. However, if {% if currentVersion == "github-ae@latest" %}any other enterprise member{% else %}someone you don't know{% endif %} discovers the URL, they'll also be able to see your gist. If you need to keep your code away from prying eyes, you may want to [create a private repository](/articles/creating-a-new-repository) instead. {% data reusables.gist.cannot-convert-public-gists-to-secret %} diff --git a/content/organizations/keeping-your-organization-secure/reviewing-the-audit-log-for-your-organization.md b/content/organizations/keeping-your-organization-secure/reviewing-the-audit-log-for-your-organization.md index 160749de7e4b..eb7cbcf488c2 100644 --- a/content/organizations/keeping-your-organization-secure/reviewing-the-audit-log-for-your-organization.md +++ b/content/organizations/keeping-your-organization-secure/reviewing-the-audit-log-for-your-organization.md @@ -547,7 +547,7 @@ For more information, see "[Managing the publication of {% data variables.produc | `create_actions_secret` |Triggered when a {% data variables.product.prodname_actions %} secret is created for a repository. For more information, see "[Creating encrypted secrets for a repository](/actions/reference/encrypted-secrets#creating-encrypted-secrets-for-a-repository)."{% endif %} | `destroy` | Triggered when [a repository is deleted](/articles/deleting-a-repository).{% if currentVersion == "free-pro-team@latest" %} | `disable` | Triggered when a repository is disabled (e.g., for [insufficient funds](/articles/unlocking-a-locked-account)).{% endif %} -| `enable` | Triggered when a repository is reenabled.{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} +| `enable` | Triggered when a repository is re-enabled.{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} | `remove_actions_secret` | Triggered when a {% data variables.product.prodname_actions %} secret is removed.{% endif %} | `remove_member` | Triggered when a user is [removed from a repository as a collaborator](/articles/removing-a-collaborator-from-a-personal-repository).{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %} | `register_self_hosted_runner` | Triggered when a new self-hosted runner is registered. For more information, see "[Adding a self-hosted runner to a repository](/actions/hosting-your-own-runners/adding-self-hosted-runners#adding-a-self-hosted-runner-to-a-repository)." diff --git a/content/organizations/managing-organization-settings/setting-permissions-for-adding-outside-collaborators.md b/content/organizations/managing-organization-settings/setting-permissions-for-adding-outside-collaborators.md index 208ae660aabe..85c64b915bde 100644 --- a/content/organizations/managing-organization-settings/setting-permissions-for-adding-outside-collaborators.md +++ b/content/organizations/managing-organization-settings/setting-permissions-for-adding-outside-collaborators.md @@ -1,7 +1,7 @@ --- title: Setting permissions for adding outside collaborators intro: 'To protect your organization''s data and the number of paid licenses used in your organization, you can allow only owners to invite outside collaborators to organization repositories.' -product: '{% data reusables.gated-features.restict-add-collaborator %}' +product: '{% data reusables.gated-features.restrict-add-collaborator %}' redirect_from: - /articles/restricting-the-ability-to-add-outside-collaborators-to-organization-repositories/ - /articles/setting-permissions-for-adding-outside-collaborators diff --git a/content/rest/reference/code-scanning.md b/content/rest/reference/code-scanning.md index 59d8c24e2680..e3504cd0f766 100644 --- a/content/rest/reference/code-scanning.md +++ b/content/rest/reference/code-scanning.md @@ -30,7 +30,7 @@ For more information, see "[Media types](/rest/overview/media-types)." #### Response using the custom media type -This example response is from a `GET` request to the `/analyses/{analysis_id}` endpoint, using `application/sarif+json` as the `Accept` header value. The example has had indendation and line breaks added for readability. For more information about this endpoint, see "[Get a {% data variables.product.prodname_code_scanning %} analysis for a repository](#get-a-code-scanning-analysis-for-a-repository)." +This example response is from a `GET` request to the `/analyses/{analysis_id}` endpoint, using `application/sarif+json` as the `Accept` header value. The example has had indentation and line breaks added for readability. For more information about this endpoint, see "[Get a {% data variables.product.prodname_code_scanning %} analysis for a repository](#get-a-code-scanning-analysis-for-a-repository)." ``` { diff --git a/data/reusables/gated-features/restict-add-collaborator.md b/data/reusables/gated-features/restrict-add-collaborator.md similarity index 100% rename from data/reusables/gated-features/restict-add-collaborator.md rename to data/reusables/gated-features/restrict-add-collaborator.md