Merge branch 'main' into make-developer-redirects-static

Author: sarahs

content/actions/reference/workflow-syntax-for-github-actions.md

@@ -299,6 +299,7 @@ Available {% data variables.product.prodname_dotcom %}-hosted runner types are:
 {% data reusables.github-actions.supported-github-runners %}
 
 {% data reusables.github-actions.ubuntu-runner-preview %}
+{% data reusables.github-actions.macos-runner-preview %}
 
 ##### Example
 

content/admin/overview/about-github-ae.md

@@ -0,0 +1,46 @@
+---
+title: About GitHub AE
+intro: '{% data variables.product.prodname_ghe_managed %} is the most secure and compliant way to use {% data variables.product.prodname_dotcom %}.'
+versions:
+  github-ae: '*'
+---
+
+### About {% data variables.product.prodname_ghe_managed %}
+
+{% data reusables.github-ae.github-ae-enables-you %}
+
+{% data variables.product.prodname_ghe_managed %} offers one developer platform from idea to production. You can increase developer velocity, automate entire workflows, secure your code, and collaborate in developers’ favorite tool. 
+
+{% data variables.product.prodname_ghe_managed %} provides your organization with all the power of [{% data variables.product.prodname_enterprise %}](https://github.com/enterprise). With {% data variables.product.prodname_ghe_managed %}, you can also meet security and compliance goals with a suite of features and certifications that put you in control. 
+
+### A highly available and planet-scale cloud
+
+{% data variables.product.prodname_ghe_managed %} is a fully managed service, hosted in a high availability architecture. {% data variables.product.prodname_ghe_managed %} is hosted globally in a cloud that can scale to support your full development lifecycle without limits. {% data variables.product.prodname_dotcom %} fully manages backups, failover, and disaster recovery, so you never need to worry about your service or data. 
+
+### Data residency
+
+All of your data is stored within the geographic region of your choosing. You can comply with GDPR and global data protection standards by keeping all of your data within your chosen region.
+
+### Encryption on your terms 
+
+All customer data is encrypted at rest, and you can provide your own encryption key to encrypt your data under your encryption policies. You control your key and access to all of your data. For more information, see "[Configuring data encryption for your enterprise](/admin/configuration/configuring-data-encryption-for-your-enterprise)."
+
+### Isolated accounts
+
+All developer accounts are fully isolated in {% data variables.product.prodname_ghe_managed %}. You can fully control the accounts through your identity provider, with SAML single sign on as mandatory. SCIM enables you to ensure that employees only have access to the resources they should, as defined in your central identity management system. For more information, see "[Managing identity and access for your enterprise](/admin/authentication/managing-identity-and-access-for-your-enterprise)."
+
+### Restricted network access
+
+Secure access to your enterprise on {% data variables.product.prodname_ghe_managed %} with restricted network access, so that your data can only be accessed from within your network. For more information, see "[Restricting network traffic to your enterprise](/admin/configuration/restricting-network-traffic-to-your-enterprise)."
+
+### Commercial and government environments
+
+{% data variables.product.prodname_ghe_managed %} is available in the Azure Government cloud, the trusted cloud for US government agencies and their partners. {% data variables.product.prodname_ghe_managed %} is also available in the commercial cloud, so you can choose the hosting environment that is right for your organization.
+
+### Premium Plus support 
+
+Premium Plus support is available for all {% data variables.product.prodname_ghe_managed %} customers, to ensure you have the fastest and most personal support experience. A dedicated Account Manager will work with you to help you get the most out of {% data variables.product.prodname_dotcom %}. Our support team will resolve issues any time of day, in the shortest possible time. 
+
+### About billing for {% data variables.product.prodname_ghe_managed %}
+
+{% data reusables.github-ae.about-billing %} For more information, see "[Managing billing for your enterprise](/admin/overview/managing-billing-for-your-enterprise)."

content/admin/overview/index.md

@@ -12,6 +12,7 @@ For more information, or to purchase {% data variables.product.prodname_enterpri
 
 ### Table of Contents
 
+{% link_in_list /about-github-ae %}
 {% link_in_list /about-enterprise-accounts %}
 {% link_in_list /managing-your-github-enterprise-license %}
 {% link_in_list /managing-billing-for-your-enterprise %}

content/github/setting-up-and-managing-organizations-and-teams/reviewing-the-audit-log-for-your-organization.md

@@ -127,7 +127,7 @@ To ensure a secure IP and maintain compliance for your organization, you can use
 {% data reusables.audit_log.audit-log-api-info %}
 
 {% if currentVersion == "free-pro-team@latest" %}
-Note that you can't retrieve Git events using the GraphQL API.
+Note that you can't retrieve Git events using the GraphQL API. To retrieve Git events, use the REST API instead. For more information, see "[`git` category actions](#git-category-actions)." 
 {% endif %}
 
 The GraphQL response can include data for up to 90 to 120 days.

content/github/setting-up-and-managing-your-github-profile/managing-your-profile-readme.md

@@ -54,6 +54,8 @@ GitHub will display your profile README on your profile page if all of the follo
   The generated README file is pre-populated with a template to give you some inspiration for your profile README.
   ![README file with pre-populated template](/assets/images/help/repository/personal-repository-readme-template.png)
 
+For a summary of all the available emojis and their codes, see "[Emoji cheat sheet](http://www.emoji-cheat-sheet.com/)."
+
 ### Removing a profile README
 
 The profile README is removed from your {% data variables.product.prodname_dotcom %} profile if any of the following apply:

content/github/site-policy/github-subprocessors-and-cookies.md

@@ -10,7 +10,7 @@ versions:
   free-pro-team: '*'
 ---
 
-Effective date: **January 6, 2021**
+Effective date: **January 21, 2021**
 
 GitHub provides a great deal of transparency regarding how we use your data, how we collect your data, and with whom we share your data. To that end, we provide this page, which details [our subprocessors](#github-subprocessors), and how we use [cookies](#cookies-on-github).
 
@@ -34,10 +34,9 @@ When we share your information with third party subprocessors, such as our vendo
 | Monday.com | Team collaboration and project management platform | United States | Israel |
 | Nexmo | SMS notification provider | United States | United States |
 | Salesforce.com | Customer relations management | United States | United States |
-| Sendgrid | Transactional mail services provider | United States | United States |
 | Sentry.io | Application monitoring provider | United States | United States |
 | Stripe | Payment provider | United States | United States |
-| Twilio | SMS notification provider | United States | United States |
+| Twilio & Twilio Sendgrid | SMS notification provider & transactional mail service provider | United States | United States |
 | Zendesk | Customer support ticketing system | United States | United States |
 | Zuora | Corporate billing system | United States | United States |
 
@@ -47,7 +46,7 @@ When we bring on a new subprocessor who handles our Users' Personal Information,
 
 GitHub uses cookies to provide and secure our websites, as well as to analyze the usage of our websites, in order to offer you a great user experience. Please take a look at our [Privacy Statement](/github/site-policy/github-privacy-statement#our-use-of-cookies-and-tracking) if you’d like more information about cookies, and on how and why we use them. 
 
-Since the number and names of cookies may change,the table below may be updated from time to time.
+Since the number and names of cookies may change, the table below may be updated from time to time.
 
 | Service Provider | Cookie Name | Description | Expiration* |
 |:---|:---|:---|:---|

content/rest/reference/permissions-required-for-github-apps.md

@@ -107,7 +107,7 @@ _Search_
 - [`GET /search/topics`](/rest/reference/search#search-topics)
 - [`GET /search/users`](/rest/reference/search#search-users)
 
-{% if currentVersion == "free-pro-team@latest" %}
+{% if currentVersion == "free-pro-team@latest"  or currentVersion ver_gt "enterprise-server@2.21" %}
 ### Permission on "actions"
 
 - [`GET /repos/:owner/:repo/actions/artifacts`](/rest/reference/actions#list-artifacts-for-a-repository) (:read)
@@ -202,6 +202,9 @@ _Branches_
 - [`POST /repos/:owner/:repo/branches/:branch/protection/restrictions/users`](/rest/reference/repos#add-user-access-restrictions) (:write)
 - [`PUT /repos/:owner/:repo/branches/:branch/protection/restrictions/users`](/rest/reference/repos#set-user-access-restrictions) (:write)
 - [`DELETE /repos/:owner/:repo/branches/:branch/protection/restrictions/users`](/rest/reference/repos#remove-user-access-restrictions) (:write)
+{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@3.0" or currentVersion == "github-ae@latest" %}
+- [`POST /repos/:owner/:repo/branches/:branch/rename`](/rest/reference/repos#rename-a-branch) (:write)
+{% endif %}
 
 _Collaborators_
 - [`PUT /repos/:owner/:repo/collaborators/:username`](/rest/reference/repos#add-a-repository-collaborator) (:write)
@@ -347,6 +350,9 @@ _Branches_
 - [`POST /repos/:owner/:repo/branches/:branch/protection/restrictions/apps`](/rest/reference/repos#add-app-access-restrictions) (:write)
 - [`PUT /repos/:owner/:repo/branches/:branch/protection/restrictions/apps`](/rest/reference/repos#set-app-access-restrictions) (:write)
 - [`DELETE /repos/:owner/:repo/branches/:branch/protection/restrictions/apps`](/rest/reference/repos#remove-user-access-restrictions) (:write)
+{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@3.0" or currentVersion == "github-ae@latest" %}
+- [`POST /repos/:owner/:repo/branches/:branch/rename`](/rest/reference/repos#rename-a-branch) (:write)
+{% endif %}
 
 _Commit comments_
 - [`PATCH /repos/:owner/:repo/comments/:comment_id`](/rest/reference/repos#update-a-commit-comment) (:write)

data/reusables/github-actions/macos-runner-preview.md

@@ -1,5 +1,5 @@
 {% note %}
 
-**Note:** The macOS 11.0 virtual environment is currently provided as a preview only. The `macos-latest` YAML workflow label still uses the macOS 10.15 virtual environment.
+**Note:** The macOS 11.0 virtual environment is currently provided as a private preview only. Any users or organizations that are already using this runner can continue using it, but we're not accepting any further users or organizations at this time. The `macos-latest` YAML workflow label still uses the macOS 10.15 virtual environment.
 
 {% endnote %}

lib/liquid-tags/link.js

@@ -4,8 +4,9 @@ const Liquid = require('liquid')
 const liquid = new Liquid.Engine()
 const LiquidTag = require('./liquid-tag')
 const findPage = require('../find-page')
+const { getPathWithoutLanguage, getPathWithoutVersion } = require('../path-utils')
 const getApplicableVersions = require('../get-applicable-versions')
-const { getPathWithLanguage } = require('../path-utils')
+const removeFPTFromPath = require('../remove-fpt-from-path')
 
 // This class supports a set of link tags. Each tag expects one parameter, a language-agnostic href:
 //
@@ -72,8 +73,8 @@ module.exports = class Link extends LiquidTag {
       fullPath = path.join(dirName, href)
     }
 
-    // add language code
-    fullPath = getPathWithLanguage(fullPath, ctx.currentLanguage)
+    // add language code and version
+    fullPath = removeFPTFromPath(path.posix.join('/', ctx.currentLanguage, ctx.currentVersion, getPathWithoutLanguage(getPathWithoutVersion(fullPath))))
 
     // find the page based on the full path
     const page = findPage(fullPath, ctx.pages, ctx.redirects)

lib/path-utils.js

@@ -22,7 +22,12 @@ function getPathWithoutLanguage (href) {
 
 // Remove the version segment from the path
 function getPathWithoutVersion (href) {
-  return href.replace(`/${getVersionStringFromPath(href)}`, '')
+  const versionFromPath = getVersionStringFromPath(href)
+
+  // If the derived version is not found in the list of all versions, just return the HREF
+  return allVersions[versionFromPath]
+    ? href.replace(`/${getVersionStringFromPath(href)}`, '')
+    : href
 }
 
 // Return the version segment in a path