Merge branch 'main' into patch-1

Author: janiceilene

content/README.md

@@ -16,7 +16,7 @@ See the [contributing docs](/CONTRIBUTING.md) for general information about work
   - [`product`](#product)
   - [`layout`](#layout)
   - [`mapTopic`](#maptopic)
-  - [`gettingStartedLinks` and `popularLinks`](#gettingstartedlinks-and-popularlinks)
+  - [`featuredLinks`](#featuredlinks)
   - [`showMiniToc`](#showminitoc)
   - [`miniTocMaxHeadingLevel`](#minitocmaxheadinglevel)
   - [`allowTitleToDifferFromFilename`](#allowtitletodifferfromfilename)
@@ -132,12 +132,22 @@ For a layout named `layouts/article.html`, the value would be `article`.
 - Type: `Boolean`. Default is `false`.
 - Optional.
 
-### `gettingStartedLinks` and `popularLinks`
+### `featuredLinks`
 
-- Purpose: Renders the linked articles' titles and intros under `Getting started` and `Popular articles` headings, respectively. See site homepage for an example.
-- Type: `Array`.
+- Purpose: Renders the linked articles' titles and intros on product landing pages and the homepage.
+- Type: `Object`.
 - Optional.
 
+Example:
+
+```yaml
+featuredLinks:
+  gettingStarted:
+    - /path/to/page
+  guides:
+    - /guides/example
+```
+
 ### `showMiniToc`
 
 - Purpose: Indicates whether an article should show a mini TOC above the rest of the content. See [Autogenerated mini TOCs](#autogenerated-mini-tocs) for more info.

content/actions/index.md

@@ -5,15 +5,16 @@ intro: 'Automate, customize, and execute your software development workflows rig
 introLinks:
   quickstart: /actions/quickstart
   learn: /actions/learn-github-actions
-gettingStartedLinks:
-  - /actions/managing-workflow-runs
-  - /actions/hosting-your-own-runners
-guideLinks:
-  - /actions/guides/setting-up-continuous-integration-using-workflow-templates
-  - /actions/guides/about-packaging-with-github-actions
-popularLinks:
-  - /actions/reference/workflow-syntax-for-github-actions
-  - /actions/reference/events-that-trigger-workflows
+featuredLinks:
+  gettingStarted:
+    - /actions/managing-workflow-runs
+    - /actions/hosting-your-own-runners
+  guide:
+    - /actions/guides/setting-up-continuous-integration-using-workflow-templates
+    - /actions/guides/about-packaging-with-github-actions
+  popular:
+    - /actions/reference/workflow-syntax-for-github-actions
+    - /actions/reference/events-that-trigger-workflows
 redirect_from:
   - /articles/automating-your-workflow-with-github-actions/
   - /articles/customizing-your-project-with-github-actions/
@@ -42,7 +43,7 @@ versions:
       <h3 class="f5 text-normal text-mono underline-dashed color-gray-5">{% data ui.toc.guides %}</h3>
     </div>
     <ul class="list-style-none">
-      {% for link in guideLinks %}
+      {% for link in featuredLinks.guide %}
         <li>{% include featured-link %}</li>
       {% endfor %}
     </ul>
@@ -53,7 +54,7 @@ versions:
       <h3 class="f5 text-normal text-mono underline-dashed color-gray-5">{% data ui.toc.popular_articles %}</h3>
     </div>
     <ul class="list-style-none">
-      {% for link in popularLinks %}
+      {% for link in featuredLinks.popular %}
         <li>{% include featured-link %}</li>
       {% endfor %}
     </ul>
@@ -64,7 +65,7 @@ versions:
       <h3 class="f5 text-normal text-mono underline-dashed color-gray-5">Manage workflows</h3>
     </div>
     <ul class="list-style-none">
-      {% for link in gettingStartedLinks %}
+      {% for link in featuredLinks.gettingStarted %}
         <li>{% include featured-link %}</li>
       {% endfor %}
     </ul>

content/github/collaborating-with-issues-and-pull-requests/syncing-a-fork.md

@@ -12,7 +12,7 @@ Before you can sync your fork with an upstream repository, you must [configure a
 
 {% data reusables.command_line.open_the_multi_os_terminal %}
 2. Change the current working directory to your local project.
-3. Fetch the branches and their respective commits from the upstream repository. Commits to `master` will be stored in a local branch, `upstream/master`.
+3. Fetch the branches and their respective commits from the upstream repository. Commits to `main` will be stored in a local branch, `upstream/main`.
   ```shell
   $ git fetch upstream
   > remote: Counting objects: 75, done.

content/index.md

@@ -1,16 +1,17 @@
 ---
 title: '{% data variables.product.product_name %}{% if currentVersion == "free-pro-team@latest" %}.com{% endif %} Help Documentation'
-gettingStartedLinks:
-  - /github/getting-started-with-github/set-up-git
-  - /github/authenticating-to-github/connecting-to-github-with-ssh
-  - /github/creating-cloning-and-archiving-repositories/creating-a-repository-on-github
-  - /github/writing-on-github/basic-writing-and-formatting-syntax
-popularLinks:
-  - /github/collaborating-with-issues-and-pull-requests/about-pull-requests
-  - /github/authenticating-to-github
-  - /github/importing-your-projects-to-github/adding-an-existing-project-to-github-using-the-command-line
-  - /github/using-git/managing-remote-repositories
-  - /github/working-with-github-pages
+featuredLinks:
+  gettingStarted:
+    - /github/getting-started-with-github/set-up-git
+    - /github/authenticating-to-github/connecting-to-github-with-ssh
+    - /github/creating-cloning-and-archiving-repositories/creating-a-repository-on-github
+    - /github/writing-on-github/basic-writing-and-formatting-syntax
+  popular:
+    - /github/collaborating-with-issues-and-pull-requests/about-pull-requests
+    - /github/authenticating-to-github
+    - /github/importing-your-projects-to-github/adding-an-existing-project-to-github-using-the-command-line
+    - /github/using-git/managing-remote-repositories
+    - /github/working-with-github-pages
 versions: '*'
 ---
 

content/insights/index.md

@@ -2,14 +2,15 @@
 title: GitHub Insights Documentation
 shortTitle: GitHub Insights
 intro: 'Understand and improve your software delivery process through data with {% data variables.product.prodname_insights %}. You can view customized reports based on data from {% data variables.product.prodname_enterprise %}.'
-gettingStartedLinks:
-  - /insights/installing-and-configuring-github-insights/about-github-insights
-  - /insights/installing-and-configuring-github-insights/system-overview-for-github-insights
-  - /insights/installing-and-configuring-github-insights/installing-github-insights
-  - /insights/exploring-your-usage-of-github-enterprise/viewing-key-metrics-and-reports
-popularLinks:
-  - /insights/installing-and-configuring-github-insights/about-data-in-github-insights
-  - /insights/exploring-your-usage-of-github-enterprise/metrics-available-with-github-insights
+featuredLinks:
+  gettingStarted:
+    - /insights/installing-and-configuring-github-insights/about-github-insights
+    - /insights/installing-and-configuring-github-insights/system-overview-for-github-insights
+    - /insights/installing-and-configuring-github-insights/installing-github-insights
+    - /insights/exploring-your-usage-of-github-enterprise/viewing-key-metrics-and-reports
+  popular:
+    - /insights/installing-and-configuring-github-insights/about-data-in-github-insights
+    - /insights/exploring-your-usage-of-github-enterprise/metrics-available-with-github-insights
 redirect_from:
   - /github/installing-and-configuring-github-insights
 versions:

content/packages/index.md

@@ -2,18 +2,19 @@
 title: GitHub Packages Documentation
 shortTitle: GitHub Packages
 intro: 'Learn to safely publish and consume packages, store your packages alongside your code, and share your packages privately with your team or publicly with the open source community. You can also automate your packages with {% data variables.product.prodname_actions %}.'
-gettingStartedLinks:
-  - /packages/publishing-and-managing-packages/about-github-packages
-  - /packages/getting-started-with-github-container-registry/about-github-container-registry
-  - /packages/getting-started-with-github-container-registry
-  - /packages/managing-container-images-with-github-container-registry/pushing-and-pulling-docker-images
-  - /packages/publishing-and-managing-packages/publishing-a-package
-  - /packages/publishing-and-managing-packages/installing-a-package
-popularLinks:
-  - /packages/using-github-packages-with-your-projects-ecosystem/configuring-npm-for-use-with-github-packages
-  - /packages/using-github-packages-with-your-projects-ecosystem/configuring-docker-for-use-with-github-packages
-  - /packages/managing-container-images-with-github-container-registry/pushing-and-pulling-docker-images
-  - /packages/using-github-packages-with-your-projects-ecosystem/using-github-packages-with-github-actions
+featuredLinks:
+  gettingStarted:
+    - /packages/publishing-and-managing-packages/about-github-packages
+    - /packages/getting-started-with-github-container-registry/about-github-container-registry
+    - /packages/getting-started-with-github-container-registry
+    - /packages/managing-container-images-with-github-container-registry/pushing-and-pulling-docker-images
+    - /packages/publishing-and-managing-packages/publishing-a-package
+    - /packages/publishing-and-managing-packages/installing-a-package
+  popular:
+    - /packages/using-github-packages-with-your-projects-ecosystem/configuring-npm-for-use-with-github-packages
+    - /packages/using-github-packages-with-your-projects-ecosystem/configuring-docker-for-use-with-github-packages
+    - /packages/managing-container-images-with-github-container-registry/pushing-and-pulling-docker-images
+    - /packages/using-github-packages-with-your-projects-ecosystem/using-github-packages-with-github-actions
 redirect_from:
   - /github/managing-packages-with-github-packages
   - /categories/managing-packages-with-github-package-registry

includes/article.html

@@ -63,7 +63,7 @@ <h3 id="in-this-article" class="f5 mb-2"><a class="link-gray-dark" href="#in-thi
       </div>
     </div>
     <div id="article-contents" class="article-grid-body">
-      {% if gettingStartedLinks and popularLinks %}
+      {% if featuredLinks.gettingStarted and featuredLinks.popular %}
       {% include featured-links %}
       {% endif %}
       {{ renderedPage }}

includes/featured-links.html

@@ -7,7 +7,7 @@
         <h3 class="f5 text-normal text-mono underline-dashed color-gray-5">{% data ui.toc.getting_started %}</h3>
       </div>
 
-      {% for link in gettingStartedLinks %}
+      {% for link in featuredLinks.gettingStarted %}
         {% include featured-link %}
       {% endfor %}
     </div>
@@ -18,7 +18,7 @@ <h3 class="f5 text-normal text-mono underline-dashed color-gray-5">{% data ui.to
         <h3 class="f5 text-normal text-mono underline-dashed color-gray-5">{% data ui.toc.popular_articles %}</h3>
       </div>
 
-      {% for link in popularLinks %}
+      {% for link in featuredLinks.popular %}
         {% include featured-link %}
       {% endfor %}
     </div>

lib/all-versions.js

@@ -13,15 +13,15 @@ const plans = [
     releases: [latestNonNumberedRelease],
     latestRelease: latestNonNumberedRelease,
     nonEnterpriseDefault: true, // permanent way to refer to this plan if the name changes
-    openApiBaseName: 'dotcom'
+    openApiBaseName: 'api.github.com'
   },
   {
     plan: 'enterprise-server',
     planTitle: 'Enterprise Server',
     releases: enterpriseServerReleases.supported,
     latestRelease: enterpriseServerReleases.latest,
     hasNumberedReleases: true,
-    openApiBaseName: ''
+    openApiBaseName: 'ghes-'
   }
 ]
 

lib/frontmatter.js

@@ -52,15 +52,6 @@ const schema = {
     redirect_from: {
       type: ['array', 'string']
     },
-    gettingStartedLinks: {
-      type: 'array'
-    },
-    popularLinks: {
-      type: 'array'
-    },
-    guideLinks: {
-      type: 'array'
-    },
     allowTitleToDifferFromFilename: {
       type: 'boolean'
     },
@@ -70,6 +61,16 @@ const schema = {
         quickstart: { type: 'string' },
         learn: { type: 'string' }
       }
+    },
+    featuredLinks: {
+      type: 'object',
+      additionalProperties: false,
+      patternProperties: {
+        '^[a-zA-Z-_]+$': {
+          type: 'array',
+          items: { type: 'string' }
+        }
+      }
     }
   }
 }