Skip to content

Commit 4b9b168

Browse files
authored
Merge pull request #40758 from github/repo-sync
Repo sync
2 parents be1a66f + 6f4d262 commit 4b9b168

File tree

26 files changed

+891
-105
lines changed

26 files changed

+891
-105
lines changed

content/copilot/concepts/billing/billing-for-spark.md renamed to content/billing/concepts/product-billing/github-spark.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
---
2-
title: About billing for GitHub Spark
2+
title: GitHub Spark billing
33
intro: 'Learn how {% data variables.product.prodname_spark %} is billed for users.'
44
versions:
55
feature: spark
66
topics:
77
- Copilot
8-
shortTitle: Billing for Spark
8+
shortTitle: GitHub Spark
99
redirect_from:
1010
- /copilot/concepts/copilot-billing/about-billing-for-github-spark
1111
- /copilot/concepts/copilot-billing/billing-for-spark

content/billing/concepts/product-billing/index.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ children:
1616
- /github-models
1717
- /github-packages
1818
- /git-lfs
19+
- /github-spark
1920
contentType: concepts
2021
---
2122

content/copilot/concepts/billing/index.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ children:
1111
- /individual-plans
1212
- /billing-for-individuals
1313
- /organizations-and-enterprises
14-
- /billing-for-spark
1514
redirect_from:
1615
- /managing-copilot/managing-copilot-as-an-individual-subscriber/billing-and-payments
1716
- /copilot/managing-copilot/understanding-and-managing-copilot-usage

content/copilot/concepts/spark.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ Benefits include:
8787
### Billing
8888

8989
Each natural-language prompt in {% data variables.product.prodname_spark_short %} consumes four premium requests.
90-
See [AUTOTITLE](/copilot/concepts/billing/billing-for-spark).
90+
See [AUTOTITLE](/billing/concepts/product-billing/github-spark).
9191

9292
### Infrastructure
9393

content/enterprise-onboarding/index.md

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,33 @@ featuredLinks:
1313
- '/enterprise-onboarding/github-actions-for-your-enterprise'
1414
- '/enterprise-onboarding/feature-enhancements'
1515
layout: product-landing
16+
journeyTracks:
17+
- id: 'getting_started'
18+
title: 'Getting started with your enterprise'
19+
description: 'Learn how to start a trial of {% data variables.product.prodname_enterprise %}, and about enterprise billing and migrations.'
20+
guides:
21+
- '/enterprise-onboarding/getting-started-with-your-enterprise/setting-up-a-trial-of-github-enterprise'
22+
- '/enterprise-onboarding/getting-started-with-your-enterprise/ending-a-trial-of-github-enterprise'
23+
- '/enterprise-onboarding/getting-started-with-your-enterprise/about-enterprise-billing'
24+
- '/enterprise-onboarding/getting-started-with-your-enterprise/about-migrating-to-github-enterprise-cloud'
25+
- '/enterprise-onboarding/getting-started-with-your-enterprise/securing-your-enterprise-with-managed-users'
26+
- '/enterprise-onboarding/getting-started-with-your-enterprise/securing-enterprise-resources-with-single-sign-on'
27+
- id: 'organizations_and_teams'
28+
title: 'Setting up organizations and teams in your enterprise'
29+
description: 'Learn how to add and manage organizations and teams in your enterprise.'
30+
guides:
31+
- '/enterprise-onboarding/setting-up-organizations-and-teams/setting-up-an-organization'
32+
- '/enterprise-onboarding/setting-up-organizations-and-teams/managing-organization-members'
33+
- '/enterprise-onboarding/setting-up-organizations-and-teams/managing-your-organizations'
34+
- '/enterprise-onboarding/setting-up-organizations-and-teams/creating-teams'
35+
- '/enterprise-onboarding/setting-up-organizations-and-teams/best-practices-for-organizations-in-your-enterprise'
36+
- id: 'support'
37+
title: 'Creating a support model for your enterprise'
38+
description: 'Learn about {% data variables.product.github %} support and how to set up a support model for your enterprise.'
39+
guides:
40+
- '/enterprise-onboarding/support-for-your-enterprise/understanding-support'
41+
- '/enterprise-onboarding/support-for-your-enterprise/using-the-support-portal'
42+
- '/enterprise-onboarding/support-for-your-enterprise/managing-support-entitlements'
1643
versions:
1744
ghec: '*'
1845
topics:

data/ui.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -326,6 +326,11 @@ learning_track_nav:
326326
next_guide: Next
327327
more_guides: More guides →
328328
current_progress: '{i} of {n} in learning path'
329+
journey_track_nav:
330+
prev_article: Previous
331+
next_article: Next
332+
more_articles: More articles →
333+
current_progress: 'Article {i} of {n}'
329334
scroll_button:
330335
scroll_to_top: Scroll to top
331336
popovers:

src/fixtures/fixtures/content/get-started/index.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,19 @@ featuredLinks:
1616
- /get-started/foo/bar
1717
guideCards:
1818
- /get-started/foo/autotitling
19+
journeyTracks:
20+
- id: 'getting_started'
21+
title: 'Getting started'
22+
description: 'Learn the basics of our platform.'
23+
guides:
24+
- '/get-started/start-your-journey/hello-world'
25+
- '/get-started/foo/bar'
26+
- id: 'advanced'
27+
title: 'Advanced topics'
28+
description: 'Dive deeper into advanced features.'
29+
guides:
30+
- '/get-started/foo/autotitling'
31+
- '/get-started/start-your-journey/hello-world'
1932
children:
2033
- /start-your-journey
2134
- /foo

src/fixtures/fixtures/content/index.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ children:
2626
# as if the URL had been `/en/free-pro-team@latest/get-started/anything`.
2727
- search
2828
- get-started
29+
- test-journey
2930
- early-access
3031
- pages
3132
- code-security
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
---
2+
title: Test Journey Landing
3+
intro: 'Test page for journey tracks functionality'
4+
layout: journey-landing
5+
versions:
6+
fpt: '*'
7+
ghes: '*'
8+
ghec: '*'
9+
journeyTracks:
10+
- id: 'getting_started'
11+
title: 'Getting started'
12+
description: 'Learn the basics of our platform.'
13+
guides:
14+
- '/get-started/start-your-journey/hello-world'
15+
- '/get-started/foo/bar'
16+
- id: 'advanced'
17+
title: 'Advanced topics'
18+
description: 'Dive deeper into advanced features.'
19+
guides:
20+
- '/get-started/foo/autotitling'
21+
- '/get-started/start-your-journey/hello-world'
22+
---
23+
24+
This is a test page for journey tracks.

src/fixtures/fixtures/data/ui.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -326,6 +326,11 @@ learning_track_nav:
326326
next_guide: Next
327327
more_guides: More guides →
328328
current_progress: '{i} of {n} in learning path'
329+
journey_track_nav:
330+
prev_article: Previous
331+
next_article: Next
332+
more_articles: More articles →
333+
current_progress: 'Article {i} of {n}'
329334
scroll_button:
330335
scroll_to_top: Scroll to top
331336
popovers:

0 commit comments

Comments
 (0)