Merge branch 'main' of github.com:github/docs-internal into remove-fpt

sarahs · sarahs · commit ecaec6e78e39 · 2021-01-14T17:12:27.000-05:00
diff --git a/content/actions/reference/context-and-expression-syntax-for-github-actions.md b/content/actions/reference/context-and-expression-syntax-for-github-actions.md
@@ -111,15 +111,14 @@ The `github` context contains information about the workflow run and the event t
 
 The `env` context contains environment variables that have been set in a workflow, job, or step. For more information about setting environment variables in your workflow, see "[Workflow syntax for {% data variables.product.prodname_actions %}](/actions/automating-your-workflow-with-github-actions/workflow-syntax-for-github-actions#env)."
 
-The `env` context syntax allows you to use the value of an environment variable in your workflow file. If you want to use the value of an environment variable inside a runner, use the runner operating system's normal method for reading environment variables.
+The `env` context syntax allows you to use the value of an environment variable in your workflow file. You can use the `env` context in the value of any key in a **step** except for the `id` and `uses` keys. For more information on the step syntax, see "[Workflow syntax for {% data variables.product.prodname_actions %}](/actions/automating-your-workflow-with-github-actions/workflow-syntax-for-github-actions#jobsjob_idsteps)."
 
-You can only use the `env` context in the value of the `with` and `name` keys, or in a step's `if` conditional. For more information on the step syntax, see "[Workflow syntax for {% data variables.product.prodname_actions %}](/actions/automating-your-workflow-with-github-actions/workflow-syntax-for-github-actions#jobsjob_idsteps)."
+If you want to use the value of an environment variable inside a runner, use the runner operating system's normal method for reading environment variables.
 
 | Property name | Type | Description |
 |---------------|------|-------------|
 | `env` | `object` | This context changes for each step in a job. You can access this context from any step in a job. |
-| `env.<env name>` | `string` | The value of a specific environment variable. |
-
+| `env.<env_name>` | `string` | The value of a specific environment variable. |
 
 #### `job` context
 
diff --git a/content/actions/reference/workflow-syntax-for-github-actions.md b/content/actions/reference/workflow-syntax-for-github-actions.md
@@ -187,7 +187,7 @@ For more information about cron syntax, see "[Events that trigger workflows](/ac
 
 ### `env`
 
-A `map` of environment variables that are available to all jobs and steps in the workflow. You can also set environment variables that are only available to a job or step. For more information, see [`jobs.<job_id>.env`](#jobsjob_idenv) and [`jobs.<job_id>.steps[*].env`](#jobsjob_idstepsenv).
+A `map` of environment variables that are available to the steps of all jobs in the workflow. You can also set environment variables that are only available to the steps of a single job or to a single step. For more information, see [`jobs.<job_id>.env`](#jobsjob_idenv) and [`jobs.<job_id>.steps[*].env`](#jobsjob_idstepsenv).
 
 {% data reusables.repositories.actions-env-var-note %}
 
diff --git a/content/github/getting-started-with-github/keyboard-shortcuts.md b/content/github/getting-started-with-github/keyboard-shortcuts.md
@@ -159,6 +159,10 @@ For more keyboard shortcuts, see the [CodeMirror documentation](https://codemirr
 | Keyboard shortcut | Description
 |-----------|------------
 |<kbd>command + space </kbd> or <kbd>control + space</kbd> | In the workflow editor, get suggestions for your workflow file.
+|<kbd>g</kbd> <kbd>f</kbd> | Go to the workflow file
+|<kbd>shift + t</kbd> or <kbd>T</kbd> | Toggle timestamps in logs
+|<kbd>shift + f</kbd> or <kbd>F</kbd> | Toggle fullscreen logs
+|<kbd>esc</kbd> | Exit fullscreen logs
 
 {% endif %}
 
diff --git a/content/github/managing-your-work-on-github/managing-labels.md b/content/github/managing-your-work-on-github/managing-labels.md
@@ -27,7 +27,7 @@ versions:
 
 You can manage your work on {% data variables.product.product_name %} by creating labels to categorize issues and pull requests. You can apply labels in the repository the label was created in. Once a label exists, you can use the label on any issue or pull request within that repository.
 
-Anyone with read access to a repository can view and search the repository’s labels. To create, edit, apply, or delete a label, you must have write access to the repository.
+Anyone with read access to a repository can view and search the repository’s labels. Anyone with triage access to a repository can apply/dismiss existing labels. To create, edit, apply, or delete a label, you must have write access to the repository.
 
 ### About default labels
 
diff --git a/content/github/setting-up-and-managing-organizations-and-teams/repository-permission-levels-for-an-organization.md b/content/github/setting-up-and-managing-organizations-and-teams/repository-permission-levels-for-an-organization.md
@@ -58,7 +58,7 @@ In addition to managing organization-level settings, organization owners have ad
 | View [GitHub Actions workflow runs](/actions/automating-your-workflow-with-github-actions/managing-a-workflow-run) | **X** | **X** | **X** | **X** | **X** |{% endif %}
 | Edit wikis | **X** | **X** | **X** | **X** | **X** |{% if currentVersion == "free-pro-team@latest" %}
 | [Report abusive or spammy content](/articles/reporting-abuse-or-spam) | **X** | **X** | **X** | **X** | **X** |{% endif %}
-| Apply labels | | **X** | **X** | **X** | **X** |
+| Apply/dismiss labels | | **X** | **X** | **X** | **X** |
 | Create, edit, delete labels | | | **X** | **X** | **X** |
 | Close, reopen, and assign all issues and pull requests | | **X** | **X** | **X** | **X** |{% if currentVersion == "free-pro-team@latest" %}
 | [Enable and disable auto-merge on a pull request](/github/administering-a-repository/managing-auto-merge-for-pull-requests-in-your-repository) | | | **X** | **X** | **X** |{% endif %}
diff --git a/content/github/site-policy-deprecated/amendment-to-github-terms-of-service-applicable-to-us-federal-government-users.md b/content/github/site-policy-deprecated/amendment-to-github-terms-of-service-applicable-to-us-federal-government-users.md
@@ -6,6 +6,7 @@ redirect_from:
   - /articles/proposed-amendment-to-github-terms-of-service-applicable-to-u-s-federal-government-users/
   - /articles/amendment-to-github-terms-of-service-applicable-to-u-s-federal-government-users
   - /articles/amendment-to-github-terms-of-service-applicable-to-us-federal-government-users
+  - /github/site-policy/amendment-to-github-terms-of-service-applicable-to-us-federal-government-users
 versions:
   free-pro-team: '*'
 ---
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
@@ -5,6 +5,7 @@ versions:
   free-pro-team: '*'
 redirect_from:
   - /github/site-policy/ghem-data-protection-addendum
+  - /github/site-policy/github-ae-data-protection-agreement
 ---
 
 _These terms apply to Customers who licensed the Products prior to January 4, 2021._
diff --git a/content/github/site-policy-deprecated/github-ae-product-specific-terms.md b/content/github/site-policy-deprecated/github-ae-product-specific-terms.md
@@ -5,6 +5,7 @@ versions:
   free-pro-team: '*'
 redirect_from:
   - /github/site-policy/ghem-supplemental-terms-for-microsoft-volume-licensing
+  - /github/site-policy/github-ae-product-specific-terms
 ---
 
 _These terms apply to Customers who licensed the Products prior to January 4, 2021._
diff --git a/content/github/site-policy-deprecated/github-connect-addendum-to-the-github-enterprise-license-agreement.md b/content/github/site-policy-deprecated/github-connect-addendum-to-the-github-enterprise-license-agreement.md
@@ -4,6 +4,7 @@ hidden: true
 redirect_from:
   - /articles/github-com-connection-addendum-to-the-github-enterprise-license-agreement/
   - /articles/github-connect-addendum-to-the-github-enterprise-license-agreement
+  - /github/site-policy/github-connect-addendum-to-the-github-enterprise-license-agreement
 versions:
   free-pro-team: '*'
 ---
diff --git a/content/github/site-policy-deprecated/github-data-protection-addendum.md b/content/github/site-policy-deprecated/github-data-protection-addendum.md
@@ -1,6 +1,8 @@
 ---
 title: GitHub Data Protection Addendum
 hidden: true
+redirect_from:
+  - /github/site-policy/github-data-protection-addendum
 versions:
   free-pro-team: '*'
 ---
diff --git a/content/github/site-policy-deprecated/github-enterprise-cloud-evaluation-agreement.md b/content/github/site-policy-deprecated/github-enterprise-cloud-evaluation-agreement.md
@@ -3,6 +3,7 @@ title: GitHub Enterprise Cloud Evaluation Agreement
 hidden: true
 redirect_from:
   - /articles/github-enterprise-cloud-evaluation-agreement
+  - /github/site-policy/github-enterprise-cloud-evaluation-agreement
 versions:
   free-pro-team: '*'
 ---
diff --git a/content/github/site-policy-deprecated/github-enterprise-server-license-agreement.md b/content/github/site-policy-deprecated/github-enterprise-server-license-agreement.md
@@ -3,6 +3,7 @@ title: GitHub Enterprise Server License Agreement
 hidden: true
 redirect_from:
   - /articles/github-enterprise-server-license-agreement
+  - /github/site-policy/github-enterprise-server-license-agreement
 versions:
   free-pro-team: '*'
 ---
diff --git a/content/github/site-policy-deprecated/github-enterprise-service-level-agreement.md b/content/github/site-policy-deprecated/github-enterprise-service-level-agreement.md
@@ -5,6 +5,7 @@ redirect_from:
   - /github-enterprise-cloud-addendum/
   - /github-business-cloud-addendum/
   - /articles/github-enterprise-cloud-addendum
+  - /github/site-policy/github-enterprise-service-level-agreement
 versions:
   free-pro-team: '*'
 ---
diff --git a/content/github/site-policy-deprecated/github-enterprise-subscription-agreement.md b/content/github/site-policy-deprecated/github-enterprise-subscription-agreement.md
@@ -4,6 +4,7 @@ hidden: true
 redirect_from:
   - /articles/github-enterprise-agreement/
   - /articles/github-enterprise-subscription-agreement
+  - /github/site-policy/github-enterprise-subscription-agreement
 versions:
   free-pro-team: '*'
 ---
diff --git a/content/github/site-policy-deprecated/github-supplemental-terms-for-microsoft-volume-licensing.md b/content/github/site-policy-deprecated/github-supplemental-terms-for-microsoft-volume-licensing.md
@@ -4,6 +4,7 @@ hidden: true
 redirect_from:
   - /articles/GitHub-Supplemental-Terms-for-Microsoft-Volume-Licensing/
   - /articles/github-supplemental-terms-for-microsoft-volume-licensing
+  - /github/site-policy/github-supplemental-terms-for-microsoft-volume-licensing
 versions:
   free-pro-team: '*'
 ---
diff --git a/content/github/site-policy/index.md b/content/github/site-policy/index.md
@@ -13,17 +13,8 @@ versions:
 {% link_in_list /github-terms-of-service %}
 {% link_in_list /github-corporate-terms-of-service %}
 {% link_in_list /github-privacy-statement %}
-{% link_in_list /github-data-protection-addendum %}
 {% link_in_list /global-privacy-practices %}
-{% link_in_list /github-enterprise-server-license-agreement %}
-{% link_in_list /github-ae-data-protection-agreement %}
-{% link_in_list /github-ae-product-specific-terms %}
-{% link_in_list /github-enterprise-service-level-agreement %}
-{% link_in_list /github-connect-addendum-to-the-github-enterprise-license-agreement %}
-{% link_in_list /github-supplemental-terms-for-microsoft-volume-licensing %}
-{% link_in_list /github-enterprise-subscription-agreement %}
 {% link_in_list /github-insights-and-data-protection-for-your-organization %}
-{% link_in_list /github-enterprise-cloud-evaluation-agreement %}
 {% link_in_list /github-sponsors-additional-terms %}
 {% link_in_list /github-additional-product-terms %}
 {% link_in_list /github-logo-policy %}
@@ -37,7 +28,6 @@ versions:
 {% link_in_list /github-subprocessors-and-cookies %}
 {% link_in_list /github-bug-bounty-program-legal-safe-harbor %}
 {% link_in_list /responsible-disclosure-of-security-vulnerabilities %}
-{% link_in_list /amendment-to-github-terms-of-service-applicable-to-us-federal-government-users %}
 {% link_in_list /guidelines-for-legal-requests-of-user-data %}
 {% link_in_list /github-government-takedown-policy %}
 {% link_in_list /github-acceptable-use-policies %}
diff --git a/content/github/using-git/using-git-rebase-on-the-command-line.md b/content/github/using-git/using-git-rebase-on-the-command-line.md
@@ -124,6 +124,10 @@ As before, Git is showing the commit message for you to edit. You can change the
 Since you've altered Git history, the usual `git push origin` **will not** work. You'll need to modify the command by "force-pushing" your latest changes:
 
 ```shell
+# Don't override changes
+$ git push origin main --force-with-lease
+
+# Override changes
 $ git push origin main --force
 ```
 
diff --git a/contributing/content-style-guide.md b/contributing/content-style-guide.md
@@ -276,7 +276,7 @@ Take care to distinguish between product names and product elements. For more in
 Follow standard American English punctuation rules. For more guidance, see “[Punctuation](https://brand.github.com/content/grammar#punctuation)” in GitHub’s Brand Guide and “[Punctuation](https://docs.microsoft.com/style-guide/punctuation)” in the Microsoft Style Guide.
 
 ## Reusables and variables
-Use reusable strings for individual nouns (e.g. product names) or for complete sentences or paragraphs. Sentence fragments and phrases should not be contained in reusable strings as they can cause problems when content is localized. For more information, see the data directory in the github/docs repository and the “Product names” section of this document.
+Use reusable strings for individual nouns (e.g. product names) or for complete sentences or paragraphs. Sentence fragments and phrases should not be contained in reusable strings as they can cause problems when content is localized. For more information, see the [data directory](../data) in the github/docs repository and the “[Product names](#product-names)” section of this document.
 
 ## Tables
 
diff --git a/crowdin.yml b/crowdin.yml
@@ -4,16 +4,7 @@ files:
     ignore:
       - '/content/README.md'
       - '/content/early-access'
-      - '/content/github/site-policy/github-enterprise-cloud-evaluation-agreement.md'
-      - '/content/github/site-policy/github-enterprise-service-level-agreement.md'
-      - '/content/github/site-policy/github-enterprise-server-license-agreement.md'
-      - '/content/github/site-policy/github-supplemental-terms-for-microsoft-volume-licensing.md'
-      - '/content/github/site-policy/github-ae-product-specific-terms.md'
-      - '/content/github/site-policy/amendment-to-github-terms-of-service-applicable-to-us-federal-government-users.md'
-      - '/content/github/site-policy/github-enterprise-subscription-agreement.md'
-      - '/content/github/site-policy/github-data-protection-addendum.md'
-      - '/content/github/site-policy/github-connect-addendum-to-the-github-enterprise-license-agreement.md'
-      - '/content/github/site-policy/github-ae-data-protection-agreement.md'
+      - '/content/github/site-policy-deprecated'
   - source: /data/**/*.yml
     translation: /translations/%locale%/%original_path%/%original_file_name%
   - source: /data/**/*.md
diff --git a/middleware/contextualizers/graphql.js b/middleware/contextualizers/graphql.js
@@ -9,15 +9,17 @@ const explorerUrl = process.env.NODE_ENV === 'production'
   : 'http://localhost:3000'
 
 module.exports = async (req, res, next) => {
+  const currentVersionObj = allVersions[req.context.currentVersion]
   // ignore requests to non-GraphQL reference paths
-  if (!req.path.includes('/graphql/')) return next()
-  if (!allVersions[req.context.currentVersion]) return next()
-
+  // and to versions that don't exist
+  if (!req.path.includes('/graphql/') || !currentVersionObj) {
+    return next()
+  }
   // Get the relevant name of the GraphQL schema files for the current version
   // For example, free-pro-team@latest corresponds to dotcom,
   // enterprise-server@2.22 corresponds to ghes-2.22,
   // and github-ae@latest corresponds to ghae
-  const graphqlVersion = allVersions[req.context.currentVersion].miscVersionName
+  const graphqlVersion = currentVersionObj.miscVersionName
 
   req.context.graphql = {
     schemaForCurrentVersion: require(`../../lib/graphql/static/schema-${graphqlVersion}`),
diff --git a/middleware/contextualizers/webhooks.js b/middleware/contextualizers/webhooks.js
@@ -5,14 +5,18 @@ const nonEnterpriseDefaultVersion = require('../../lib/non-enterprise-default-ve
 const allVersions = require('../../lib/all-versions')
 
 module.exports = async (req, res, next) => {
-  if (!req.path.includes('webhook')) return next()
+  const currentVersionObj = allVersions[req.context.currentVersion]
+  // ignore requests to non-webhook reference paths
+  // and to versions that don't exist
+  if (!req.path.includes('webhook') || !currentVersionObj) {
+    return next()
+  }
 
   // Get the name of the dir under lib/webhooks/static
   // For example, free-pro-team@latest corresponds to dotcom,
   // enterprise-server@2.22 corresponds to ghes-2.22,
   // and github-ae@latest corresponds to ghae
-  if (!allVersions[req.context.currentVersion]) return next()
-  const webhookPayloadDir = allVersions[req.context.currentVersion].miscVersionName
+  const webhookPayloadDir = currentVersionObj.miscVersionName
 
   const webhookPayloadsForCurrentVersion = webhookPayloads[webhookPayloadDir]
 
diff --git a/package-lock.json b/package-lock.json
diff --git a/tests/content/lint-files.js b/tests/content/lint-files.js
@@ -173,7 +173,7 @@ describe('lint-files', () => {
         content = bodyContent
         isHidden = data.hidden === true
         isEarlyAccess = markdownRelPath.split('/').includes('early-access')
-        isSitePolicy = markdownRelPath.split('/').includes('site-policy')
+        isSitePolicy = markdownRelPath.split('/').includes('site-policy-deprecated')
       })
 
       // We need to support some non-Early Access hidden docs in Site Policy
