repo sync

Author: Octomerger

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 %}

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 } = 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(fullPath)))
 
     // find the page based on the full path
     const page = findPage(fullPath, ctx.pages, ctx.redirects)