Merge pull request #11291 from github/repo-sync

repo sync

Author: Octomerger

lib/redirects/permalinks.js

@@ -5,7 +5,6 @@ import getOldPathsFromPermalink from './get-old-paths-from-permalink.js'
 import { getVersionStringFromPath } from '../path-utils.js'
 import { getNewVersionedPath } from '../old-versions-utils.js'
 import removeFPTFromPath from '../remove-fpt-from-path.js'
-import defaultVersion from '../non-enterprise-default-version.js'
 const supportedVersions = new Set(Object.keys(allVersions))
 
 export default function generateRedirectsForPermalinks(permalinks, redirectFrontmatter, versions) {
@@ -41,16 +40,6 @@ export default function generateRedirectsForPermalinks(permalinks, redirectFront
         redirects[`/en${frontmatterOldPath}`] = permalink.href
       }
 
-      // If an article is only available in a single enterprise version,
-      // urls the don't specify a version should redirect to the only
-      // version the article is applicable to.
-      const enterpriseOnlyArticle = !versions.includes(defaultVersion)
-      if (enterpriseOnlyArticle && versions.length === 1) {
-        const barePath = frontmatterOldPath.replace(permalink.pageVersion, '')
-        redirects[barePath] = permalink.href
-        redirects[`/en${barePath}`] = permalink.href
-      }
-
       // get the old path for the current permalink version
       let versionedFrontmatterOldPath = path.posix.join(
         '/',

lib/redirects/static/redirect-exceptions.txt

@@ -1,5 +1,5 @@
-# These redirects were added to redirect article that used to be versioned
-# for free-pro-team, but are now versioned for enterprise-cloud 
+# These urls went from being free-pro-team, but are now versioned for more than one enterprise version and enterprise-cloud
+# Shipped in pull #20947 on 10/15/21
 
 /enterprise-cloud@latest/admin/overview/about-enterprise-accounts
 - /articles/about-github-business-accounts
@@ -14,7 +14,7 @@
 - /articles/permission-levels-for-a-business-account
 - /articles/roles-for-an-enterprise-account
 - /github/setting-up-and-managing-your-enterprise/roles-in-an-enterprise
-  
+
 /enterprise-cloud@latest/admin/configuration/configuring-your-enterprise/verifying-or-approving-a-domain-for-your-enterprise
 - /admin/configuration/configuring-your-enterprise/verifying-or-approving-a-domain-for-your-enterprise-account
 - /github/setting-up-and-managing-your-enterprise/managing-your-enterprise-account/verifying-or-approving-a-domain-for-your-enterprise-account
@@ -101,4 +101,95 @@
 - github/setting-up-and-managing-your-enterprise/setting-policies-for-organizations-in-your-enterprise-account/enforcing-security-settings-in-your-enterprise-account
 
 /enterprise-cloud@latest/billing/managing-your-license-for-github-enterprise/viewing-license-usage-for-github-enterprise
-- /billing/managing-your-license-for-github-enterprise/viewing-license-usage-for-github-enterprise
+- /billing/managing-your-license-for-github-enterprise/viewing-license-usage-for-github-enterprise
+
+
+# These URLs went from being in free-pro-team to ONLY to being in enterprise-cloud only. 
+# Shipped in pull #20947 on 10/15/21
+
+/enterprise-cloud@latest/admin/authentication/managing-identity-and-access-for-your-enterprise/managing-team-synchronization-for-organizations-in-your-enterprise
+- /github/setting-up-and-managing-your-enterprise/managing-team-synchronization-for-organizations-in-your-enterprise-account
+- /github/setting-up-and-managing-your-enterprise/configuring-identity-and-access-management-for-your-enterprise-account/managing-team-synchronization-for-organizations-in-your-enterprise-account
+
+/enterprise-cloud@latest/admin/authentication/managing-identity-and-access-for-your-enterprise/configuring-saml-single-sign-on-for-your-enterprise-using-okta
+- /github/setting-up-and-managing-your-enterprise/configuring-single-sign-on-for-your-enterprise-account-using-okta
+- /github/setting-up-and-managing-your-enterprise-account/configuring-saml-single-sign-on-for-your-enterprise-account-using-okta
+- /github/setting-up-and-managing-your-enterprise/configuring-saml-single-sign-on-for-your-enterprise-account-using-okta
+- /github/setting-up-and-managing-your-enterprise/configuring-identity-and-access-management-for-your-enterprise-account/configuring-saml-single-sign-on-for-your-enterprise-account-using-okta
+
+/enterprise-cloud@latest/admin/authentication/managing-identity-and-access-for-your-enterprise/switching-your-saml-configuration-from-an-organization-to-an-enterprise-account
+- /github/setting-up-and-managing-your-enterprise/configuring-identity-and-access-management-for-your-enterprise-account/switching-your-saml-configuration-from-an-organization-to-an-enterprise-account
+
+/enterprise-cloud@latest/admin/authentication/managing-your-enterprise-users-with-your-identity-provider
+- /github/setting-up-and-managing-your-enterprise/managing-your-enterprise-users-with-your-identity-provider
+
+/enterprise-cloud@latest/admin/authentication/managing-your-enterprise-users-with-your-identity-provider/about-enterprise-managed-users
+- /early-access/github/articles/get-started-with-managed-users-for-your-enterprise
+- /github/setting-up-and-managing-your-enterprise/managing-your-enterprise-users-with-your-identity-provider/about-enterprise-managed-users
+
+/enterprise-cloud@latest/admin/authentication/managing-your-enterprise-users-with-your-identity-provider/configuring-saml-single-sign-on-for-enterprise-managed-users
+- /github/setting-up-and-managing-your-enterprise/managing-your-enterprise-users-with-your-identity-provider/configuring-saml-single-sign-on-for-enterprise-managed-users
+
+/enterprise-cloud@latest/admin/authentication/managing-your-enterprise-users-with-your-identity-provider/configuring-scim-provisioning-for-enterprise-managed-users
+- /github/setting-up-and-managing-your-enterprise/managing-your-enterprise-users-with-your-identity-provider/configuring-scim-provisioning-for-enterprise-managed-users
+
+/enterprise-cloud@latest/admin/authentication/managing-your-enterprise-users-with-your-identity-provider/configuring-scim-provisioning-for-enterprise-managed-users-with-okta
+- /early-access/github/articles/configuring-provisioning-for-managed-users-with-okta
+- /github/setting-up-and-managing-your-enterprise/managing-your-enterprise-users-with-your-identity-provider/configuring-scim-provisioning-for-enterprise-managed-users-with-okta
+
+/enterprise-cloud@latest/admin/authentication/managing-your-enterprise-users-with-your-identity-provider/managing-team-memberships-with-identity-provider-groups
+- /github/setting-up-and-managing-your-enterprise/managing-your-enterprise-users-with-your-identity-provider/managing-team-memberships-with-identity-provider-groups
+
+/enterprise-cloud@latest/admin/authentication/managing-your-enterprise-users-with-your-identity-provider/auditing-activity-in-your-enterprise
+- /github/setting-up-and-managing-your-enterprise/managing-your-enterprise-users-with-your-identity-provider/auditing-activity-in-your-enterprise
+
+/enterprise-cloud@latest/admin/user-management/managing-users-in-your-enterprise/managing-support-entitlements-for-your-enterprise
+- /github/setting-up-and-managing-your-enterprise/managing-users-in-your-enterprise/managing-support-entitlements-for-your-enterprise
+
+/enterprise-cloud@latest/admin/user-management/managing-users-in-your-enterprise/viewing-and-managing-a-users-saml-access-to-your-enterprise
+- /github/setting-up-and-managing-your-enterprise/viewing-and-managing-a-users-saml-access-to-your-enterprise-account
+- /github/setting-up-and-managing-your-enterprise-account/viewing-and-managing-a-users-saml-access-to-your-enterprise-account
+- /github/setting-up-and-managing-your-enterprise/viewing-and-managing-a-users-saml-access-to-your-enterprise
+- /github/setting-up-and-managing-your-enterprise/managing-users-in-your-enterprise/viewing-and-managing-a-users-saml-access-to-your-enterprise
+
+/enterprise-cloud@latest/admin/user-management/managing-organizations-in-your-enterprise/adding-organizations-to-your-enterprise
+- /github/setting-up-and-managing-your-enterprise/managing-organizations-in-your-enterprise-account/adding-organizations-to-your-enterprise-account
+- /articles/adding-organizations-to-your-enterprise-account
+- /github/setting-up-and-managing-your-enterprise-account/adding-organizations-to-your-enterprise-account
+- /github/setting-up-and-managing-your-enterprise/adding-organizations-to-your-enterprise-account
+
+/enterprise-cloud@latest/admin/user-management/managing-organizations-in-your-enterprise/managing-unowned-organizations-in-your-enterprise
+- /github/setting-up-and-managing-your-enterprise/managing-organizations-in-your-enterprise-account/managing-unowned-organizations-in-your-enterprise-account
+- /github/setting-up-and-managing-your-enterprise-account/managing-unowned-organizations-in-your-enterprise-account
+- /github/setting-up-and-managing-your-enterprise/managing-unowned-organizations-in-your-enterprise-account
+
+/enterprise-cloud@latest/admin/user-management/managing-organizations-in-your-enterprise/viewing-the-audit-logs-for-organizations-in-your-enterprise
+- /github/setting-up-and-managing-your-enterprise/managing-organizations-in-your-enterprise-account/viewing-the-audit-logs-for-organizations-in-your-enterprise-account
+- /articles/viewing-the-audit-logs-for-organizations-in-your-business-account
+- /articles/viewing-the-audit-logs-for-organizations-in-your-enterprise-account
+- /github/setting-up-and-managing-your-enterprise-account/viewing-the-audit-logs-for-organizations-in-your-enterprise-account
+- /github/setting-up-and-managing-your-enterprise/viewing-the-audit-logs-for-organizations-in-your-enterprise-account
+
+/enterprise-cloud@latest/admin/user-management/managing-organizations-in-your-enterprise/streaming-the-audit-logs-for-organizations-in-your-enterprise-account
+- /github/setting-up-and-managing-your-enterprise/managing-organizations-in-your-enterprise-account/streaming-the-audit-logs-for-organizations-in-your-enterprise-account
+
+/enterprise-cloud@latest/admin/policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-dependency-insights-in-your-enterprise
+- /articles/enforcing-a-policy-on-dependency-insights
+- /articles/enforcing-a-policy-on-dependency-insights-in-your-enterprise-account
+- /github/setting-up-and-managing-your-enterprise-account/enforcing-a-policy-on-dependency-insights-in-your-enterprise-account
+- /github/setting-up-and-managing-your-enterprise/enforcing-a-policy-on-dependency-insights-in-your-enterprise-account
+- /github/setting-up-and-managing-your-enterprise/setting-policies-for-organizations-in-your-enterprise-account/enforcing-a-policy-on-dependency-insights-in-your-enterprise-account
+
+/enterprise-cloud@latest/billing/managing-billing-for-your-github-account/connecting-an-azure-subscription-to-your-enterprise
+- /github/setting-up-and-managing-your-enterprise/managing-your-enterprise-account/connecting-an-azure-subscription-to-your-enterprise
+- /github/setting-up-and-managing-billing-and-payments-on-github/connecting-an-azure-subscription-to-your-enterprise
+- /github/setting-up-and-managing-your-enterprise/connecting-an-azure-subscription-to-your-enterprise
+
+/enterprise-cloud@latest/billing/managing-your-license-for-github-enterprise/managing-licenses-for-visual-studio-subscription-with-github-enterprise
+- /github/setting-up-and-managing-your-enterprise/managing-your-enterprise-account/managing-licenses-for-visual-studio-subscription-with-github-enterprise
+- /github/setting-up-and-managing-your-enterprise/managing-licenses-for-the-github-enterprise-and-visual-studio-bundle
+- /github/setting-up-and-managing-your-enterprise-account/managing-licenses-for-the-github-enterprise-and-visual-studio-bundle
+- /github/articles/about-the-github-and-visual-studio-bundle
+- /articles/about-the-github-and-visual-studio-bundle
+- /github/setting-up-and-managing-your-enterprise-account/managing-licenses-for-visual-studio-subscription-with-github-enterprise
+- /github/setting-up-and-managing-your-enterprise/managing-licenses-for-visual-studio-subscription-with-github-enterprise

lib/search/indexes/github-docs-2.22-en-records.json.br

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e2e82731d5c5c2bbf6459817149137444cc0983c20565c216ba4a2907060e478
-size 434512
+oid sha256:dbb4342cc295422328f2187745cf43d8880abedc4eaf652ace5f479fef433301
+size 434696

lib/search/indexes/github-docs-2.22-en.json.br

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a259fa14395bb71cc028b34bf72151ea5b3521fd5c33ec453c26d26e9f5e50f3
-size 1701658
+oid sha256:2f8d8ce9ab094cf85124a944e4240720bd28d91f23f53516e50e4863384d9bb2
+size 1702398

lib/search/indexes/github-docs-3.0-en-records.json.br

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:956f3b3cd1e3e460ed0cb3361a18e892cfc5b5df0c335960efcf7e163488e17f
-size 457020
+oid sha256:1333de9978b1ed632355024a0d9ca2600aaeef9713c87626286c4af460ce2fba
+size 456833

lib/search/indexes/github-docs-3.0-en.json.br

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1011876bd7be49f70393f0aeab8d93cb69f136195e7bea42595daeaa58474ca3
-size 1782942
+oid sha256:fc90c48335755257793d8980d74adfd9719ffd60282a77b9b60cda768fcef649
+size 1782983

lib/search/indexes/github-docs-3.1-en-records.json.br

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b29a35691c5daec13a6ef6b154722c1e94aec907b234b27edb3b5dfbb0a7dd32
-size 467940
+oid sha256:92f223286344a4caab813cec39ee8f8667820dfc7c992253170e070e988b3f11
+size 467601

lib/search/indexes/github-docs-3.1-en.json.br

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7c5defbe288ba9c6e81c8d0f4e9a88f3c7e6837e2e5708109e4d7d6026321ccb
-size 1827138
+oid sha256:4cf31ffda277e0a8e8d1018ca2824d5cf6389938587a165abef724bae2f9968e
+size 1827503

lib/search/indexes/github-docs-3.2-en-records.json.br

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ec59612eed4c2eb1197b8549a633b64f2d06965d97e5ab87594510576f6e39cc
-size 475645
+oid sha256:fd707c5adc629d2bc00a354a57c6c9c1c5d9e704bdc9497f7e60f44d4d4d1915
+size 475702

lib/search/indexes/github-docs-3.2-en.json.br

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b9ece73bb609d72f8d7c8dac5bb29da5dc2f2a13b83e62ca8ef827b8762d6537
-size 1858531
+oid sha256:6277cbaf6fda96d2a205443fa5eb2251e7d07ca95f3bcbf2e6bdeeeb7bc10f1e
+size 1859261