Merge branch 'copilot-ga-megabranch' into landing-page

Author: mattpollard

content/copilot/overview-of-github-copilot/about-github-copilot-telemetry.md

@@ -7,7 +7,5 @@ versions:
 topics:
   - Copilot
 children:
- - /about-github-copilot-telemetry
  - /about-github-copilot
- - /github-copilot-in-practice
 ---

content/copilot/overview-of-github-copilot/github-copilot-in-practice.md

@@ -11,7 +11,6 @@ children:
   - /github-terms-for-additional-products-and-features
   - /github-community-guidelines
   - /github-community-forum-code-of-conduct
-  - /github-copilot-telemetry-terms
   - /github-sponsors-additional-terms
   - /github-registered-developer-agreement
   - /github-marketplace-terms-of-service

content/copilot/overview-of-github-copilot/index.md

@@ -11,7 +11,7 @@ describe('breadcrumbs', () => {
 
   describe('rendering', () => {
     test('top-level product pages have breadcrumbs', async () => {
-      const $ = await getDOM('/github')
+      const $ = await getDOM('/repositories')
       expect($('[data-testid=breadcrumbs]')).toHaveLength(2)
     })
 
@@ -116,11 +116,11 @@ describe('breadcrumbs', () => {
 
   describe('breadcrumbs object', () => {
     test('works on product index pages', async () => {
-      const breadcrumbs = await getJSON('/en/github?json=breadcrumbs')
+      const breadcrumbs = await getJSON('/en/repositories?json=breadcrumbs')
       const expected = [
         {
-          href: '/en/github',
-          title: 'GitHub',
+          href: '/en/repositories',
+          title: 'Repositories',
         },
       ]
       expect(breadcrumbs).toEqual(expected)

content/site-policy/github-terms/github-copilot-telemetry-terms.md

@@ -8,7 +8,7 @@ describe('footer', () => {
 
   describe('"contact us" link', () => {
     test('leads to support from articles', async () => {
-      const $ = await getDOM(`/en/${nonEnterpriseDefaultVersion}/github`)
+      const $ = await getDOM(`/en/${nonEnterpriseDefaultVersion}/issues`)
       expect($('a#contact-us').attr('href')).toBe('https://support.github.com/contact')
     })
 
@@ -20,7 +20,7 @@ describe('footer', () => {
 
   describe('"contact us" link with nextjs', () => {
     test('leads to support from articles', async () => {
-      const $ = await getDOM(`/en/${nonEnterpriseDefaultVersion}/github?nextjs=`)
+      const $ = await getDOM(`/en/${nonEnterpriseDefaultVersion}/issues?nextjs=`)
       expect($('a#contact-us').attr('href')).toBe('https://support.github.com/contact')
     })
   })

content/site-policy/github-terms/index.md

@@ -6,7 +6,7 @@ import nonEnterpriseDefaultVersion from '../../lib/non-enterprise-default-versio
 describe('mobile-only products nav', () => {
   const cases = [
     // Note the unversioned homepage at `/` does not have a product selected in the mobile dropdown
-    ['/github', 'GitHub'],
+    ['/repositories', 'Repositories'],
     // Enterprise server
     ['/en/enterprise/admin', 'Enterprise administrators'],
     [
@@ -41,8 +41,8 @@ describe('products middleware', () => {
 
   test('adds res.context.currentProduct object', async () => {
     const currentProduct = await getJSON(
-      `/en/${nonEnterpriseDefaultVersion}/github?json=currentProduct`
+      `/en/${nonEnterpriseDefaultVersion}/actions?json=currentProduct`
     )
-    expect(currentProduct).toBe('github')
+    expect(currentProduct).toBe('actions')
   })
 })

tests/rendering/breadcrumbs.js

@@ -34,7 +34,7 @@ describe('sidebar', () => {
     expect($githubPage('[data-testid=sidebar] [data-testid=sidebar-product]').length).toBe(1)
     expect(
       $githubPage('[data-testid=sidebar] [data-testid=sidebar-product] > a').text().trim()
-    ).toBe('GitHub')
+    ).toBe('Get started')
   })
 
   test('includes links to external products like the Atom, Electron, and CodeQL', async () => {

tests/rendering/footer.js

@@ -33,21 +33,19 @@ describe('redirects', () => {
 
   test('dotcom homepage page.buildRedirects()', async () => {
     const page = await Page.init({
-      relativePath: 'github/index.md',
+      relativePath: 'issues/index.md',
       basePath: path.join(__dirname, '../../content'),
       languageCode: 'en',
     })
     const pageRedirects = page.buildRedirects()
-    expect(pageRedirects['/articles']).toBe('/github')
-    expect(pageRedirects['/common-issues-and-questions']).toBe('/github')
-    expect(pageRedirects[`/enterprise-server@${enterpriseServerReleases.latest}/articles`]).toBe(
-      `/enterprise-server@${enterpriseServerReleases.latest}`
-    )
+    expect(pageRedirects['/about-issues']).toBe('/issues')
+    expect(pageRedirects['/creating-an-issue']).toBe('/issues')
     expect(
-      pageRedirects[
-        `/enterprise-server@${enterpriseServerReleases.latest}/common-issues-and-questions`
-      ]
-    ).toBe(`/enterprise-server@${enterpriseServerReleases.latest}`)
+      pageRedirects[`/enterprise-server@${enterpriseServerReleases.latest}/about-issues`]
+    ).toBe(`/enterprise-server@${enterpriseServerReleases.latest}/issues`)
+    expect(
+      pageRedirects[`/enterprise-server@${enterpriseServerReleases.latest}/creating-an-issue`]
+    ).toBe(`/enterprise-server@${enterpriseServerReleases.latest}/issues`)
   })
 
   test('converts single `redirect_from` strings values into arrays', async () => {