Merge branch 'main' into patch-1

LICENSE-CODE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2020 GitHub
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -61,9 +61,9 @@ In addition to the README you're reading right now, this repo includes other REA
 
 ## License
 
-The GitHub product documentation in the assets, content, and data folders are licensed under a [CC-BY license](content/LICENSE).
+The GitHub product documentation in the assets, content, and data folders are licensed under a [CC-BY license](LICENSE).
 
-All other code in this repository is licensed under a [MIT license](LICENSE).
+All other code in this repository is licensed under a [MIT license](LICENSE-CODE).
 
 When using the GitHub logos, be sure to follow the [GitHub logo guidelines](https://github.com/logos).
 

content/actions/learn-github-actions/migrating-from-jenkins-to-github-actions.md

@@ -33,15 +33,15 @@ For more information, see "[Core concepts for {% data variables.product.prodname
 
 Jenkins lets you send builds to a single build agent, or you can distribute them across multiple agents. You can also classify these agents according to various attributes, such as operating system types.
 
-Similiarly, {% data variables.product.prodname_actions %} can send jobs to {% data variables.product.prodname_dotcom %}-hosted or self-hosted runners, and you can use labels to classify runners according to various attributes. The following table compares how the distributed build concept is implemented for both Jenkins and {% data variables.product.prodname_actions %}.
+Similarly, {% data variables.product.prodname_actions %} can send jobs to {% data variables.product.prodname_dotcom %}-hosted or self-hosted runners, and you can use labels to classify runners according to various attributes. The following table compares how the distributed build concept is implemented for both Jenkins and {% data variables.product.prodname_actions %}.
 
 | Jenkins       |  {% data variables.product.prodname_actions %}       |
 | ------------- | ------------- |
 | [`agents`](https://wiki.jenkins.io/display/JENKINS/Distributed+builds)        | [`runners`](/actions/learn-github-actions/introduction-to-github-actions#runners)  <br> [`self-hosted runners`](/actions/hosting-your-own-runners/about-self-hosted-runners)|
 
 #### Using sections to organize pipelines
 
-Jenkins splits its Declarative Pipelines into multiple sections. Similiarly, {% data variables.product.prodname_actions %} organizes its workflows into separate sections. The table below compares Jenkins sections with the {% data variables.product.prodname_actions %} workflow.
+Jenkins splits its Declarative Pipelines into multiple sections. Similarly, {% data variables.product.prodname_actions %} organizes its workflows into separate sections. The table below compares Jenkins sections with the {% data variables.product.prodname_actions %} workflow.
 
 |Jenkins Directives | {% data variables.product.prodname_actions %} |
 | ------------- | ------------- |

content/github/creating-cloning-and-archiving-repositories/about-archiving-repositories.md

@@ -20,7 +20,7 @@ versions:
 
 Once a repository is archived, you cannot add or remove collaborators or teams. Contributors with access to the repository can only fork or star your project.
 
-When a repository is archived, its issues, pull requests, code, labels, milestones, projects, wiki, releases, commits, tags, branches, reactions, and comments become read-only. To make changes in an archived repository, you must unarchive the repository first.
+When a repository is archived, its issues, pull requests, code, labels, milestones, projects, wiki, releases, commits, tags, branches, reactions, code scanning alerts, and comments become read-only. To make changes in an archived repository, you must unarchive the repository first.
 
 You can search for archived repositories. For more information, see "[Searching for repositories](/articles/searching-for-repositories/#search-based-on-whether-a-repository-is-archived)." You can also search for issues and pull requests within archived repositories. For more information, see "[Searching issues and pull requests](/articles/searching-issues-and-pull-requests/#search-based-on-whether-a-repository-is-archived)."  
 

package.json

@@ -7,6 +7,7 @@
     "name": "GitHub",
     "url": "https://github.com/github/docs"
   },
+  "license": "(MIT AND CC-BY-4.0)",
   "dependencies": {
     "@babel/core": "^7.8.3",
     "@babel/plugin-transform-runtime": "^7.11.0",

script/new-versioning/update-frontmatter.js

@@ -10,7 +10,7 @@ const dirsToProcess = ['content', 'translations']
 const allFiles = flatten(dirsToProcess.map(dir => {
   return walk(path.join(process.cwd(), dir), { includeBasePath: true, directories: false })
     .filter(file => !file.endsWith('README.md'))
-    .filter(file => !file.endsWith('LICENSE'))
+    .filter(file => !(file.endsWith('LICENSE') || file.endsWith('LICENSE-CODE')))
     // we only want to process frontmatter in content files in translations, so skip data files
     // this is very brittle but works well enough for this script
     // (note data files are updated in script/new-versioning/update-content.js)

script/remove-deprecated-enterprise-version-markup.js

@@ -52,7 +52,7 @@ console.log(`Next oldest version: ${nextOldestVersion}\n`)
 // gather content and data files
 const contentFiles = walk(contentPath, { includeBasePath: true, directories: false })
   .filter(file => file.endsWith('.md'))
-  .filter(file => !(file.endsWith('README.md') || file === 'LICENSE'))
+  .filter(file => !(file.endsWith('README.md') || file === 'LICENSE' || file === 'LICENSE-CODE'))
 
 const dataFiles = walk(dataPath, { includeBasePath: true, directories: false })
   .filter(file => file.includes('data/reusables') || file.includes('data/variables'))