Merge branch 'main' into mc-dependabot-advisory-db

Author: mchammer01

content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/why-wasnt-my-application-for-a-student-developer-pack-approved.md

@@ -19,7 +19,9 @@ versions:
 
 ### Unclear academic affiliation documents
 
-If the image you uploaded doesn't clearly identify your current academic status, we require further proof of your academic status. {% data reusables.education.upload-proof-reapply %}
+If the dates or schedule mentioned in your uploaded image do not match our eligibility criteria, we require further proof of your academic status.
+
+If the image you uploaded doesn't clearly identify your current academic status or if the uploaded image is blurry, we require further proof of your academic status. {% data reusables.education.upload-proof-reapply %}
 
 {% data reusables.education.pdf-support %}
 
@@ -58,6 +60,7 @@ For more information, see:
 
 You're ineligible for a {% data variables.product.prodname_student_pack %} if:
 - You're enrolled in an informal learning program that is not part of the [{% data variables.product.prodname_dotcom %} Campus Program](https://education.github.com/schools) and not enrolled in a degree or diploma granting course of study.
+- You're pursuing a degree which will be terminated in the current academic session.
 - You're under 13 years old.
 
 Your instructor may still apply for a {% data variables.product.prodname_education %} discount for classroom use. If you're a student at a coding school or bootcamp, you will become eligible for a {% data variables.product.prodname_student_pack %} if your school joins the [{% data variables.product.prodname_dotcom %} Campus Program](https://education.github.com/schools).

data/reusables/dependabot/supported-package-managers.md

@@ -15,21 +15,21 @@ Elm | `elm` | v0.18, v0.19 | **✓** | |
 git submodule | `gitsubmodule` | N/A (no version) | **✓** | |
 GitHub Actions | `github-actions` |  N/A (no version) | **✓** | |
 Go modules | `gomod` | v1 | **✓** | **✓** |
-Gradle | `gradle` | see (A) below | **✓** | |
-Maven | `maven` | see (B) below | **✓** | |
+Gradle | `gradle` | N/A (no version)<sup>[1]</sup> | **✓** | |
+Maven | `maven` | N/A (no version)<sup>[2]</sup> | **✓** | |
 npm | `npm` | v6, v7 | **✓** | |
-NuGet | `nuget` | <= 4.8.</br>see (C) below | **✓** | |
+NuGet | `nuget` | <= 4.8<sup>[3]</sup> | **✓** | |
 pip | `pip` | v20 | | |
 pipenv | `pip` | <= 2018.11.26 | | |
 pip-compile | `pip` | 5.5.0 | | |
 poetry | `pip` | v1 | | |
 Terraform | `terraform` | <= 0.11 | **✓** | |
 yarn | `npm` | v1 | **✓** | |
 
-(A) {% data variables.product.prodname_dependabot %} doesn't run Gradle but supports updates to the following files: `build.gradle` and `build.gradle.kts` (for Kotlin projects).
+[1] {% data variables.product.prodname_dependabot %} doesn't run Gradle but supports updates to the following files: `build.gradle` and `build.gradle.kts` (for Kotlin projects).
 
-(B) {% data variables.product.prodname_dependabot %} doesn't run Maven but supports updates to `pom.xml` files.
+[2] {% data variables.product.prodname_dependabot %} doesn't run Maven but supports updates to `pom.xml` files.
 
-(C) {% data variables.product.prodname_dependabot %} doesn't run the NuGet CLI but does support most features up until version 4.8.
+[3] {% data variables.product.prodname_dependabot %} doesn't run the NuGet CLI but does support most features up until version 4.8.
 
 For package managers such as `pipenv` and `poetry`, you need to use the `pip` YAML value. For example, if you use `poetry` to manage your Python dependencies and want {% data variables.product.prodname_dependabot %} to monitor your dependency manifest file for new versions, use `package-ecosystem: "pip"` in your *dependabot.yml* file.

data/reusables/webhooks/label_short_desc.md

@@ -1 +1 @@
-Activity related to an issue. {% data reusables.webhooks.action_type_desc %} For more information, see the "[labels](/rest/reference/issues#labels)" REST API.
+Activity related to a label. {% data reusables.webhooks.action_type_desc %} For more information, see the "[labels](/rest/reference/issues#labels)" REST API.

script/rest/update-files.js

@@ -59,7 +59,7 @@ async function getDereferencedFiles () {
 
   console.log(`\n🏃‍♀️🏃🏃‍♀️Running \`bin/openapi bundle\` in branch '${githubBranch}' of your github/github checkout to generate the dereferenced OpenAPI schema files.\n`)
   try {
-    execSync(`${path.join(githubRepoDir, 'bin/openapi')} bundle ${tempDocsDir}`, { stdio: 'inherit' })
+    execSync(`${path.join(githubRepoDir, 'bin/openapi')} bundle -o ${tempDocsDir}`, { stdio: 'inherit' })
   } catch (error) {
     console.error(error)
     console.log('🛑 Whoops! It looks like the `bin/openapi bundle` command failed to run in your `github/github` repository checkout. To troubleshoot, ensure that your OpenAPI schema YAML is formatted correctly. A CI test runs on your `github/github` PR that flags malformed YAML. You can check the PR diff view for comments left by the openapi CI test to find and fix any formatting errors.')