From 335b8b8e4266676f18cb0378fee96793973d5bdf Mon Sep 17 00:00:00 2001 From: Chris Reynolds Date: Wed, 27 Nov 2024 14:11:01 -0700 Subject: [PATCH] update the custom upstream intro to add glossary terms I am hypothesizing that glossary terms are added based on the tag. I am further hypothesizing that if we leave the markdown syntax on this page intact, the new glossary terms would not be added correctly, therefore I have converted all the markdown bullets to html list items. I have added "framework" on this page because it makes the most sense to be included on a page about upstreams. --- .../custom-upstream/01-custom-upstream.md | 24 ++++++++----------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/source/content/guides/custom-upstream/01-custom-upstream.md b/source/content/guides/custom-upstream/01-custom-upstream.md index 0713466a7f..16058ae1e2 100644 --- a/source/content/guides/custom-upstream/01-custom-upstream.md +++ b/source/content/guides/custom-upstream/01-custom-upstream.md @@ -126,20 +126,16 @@ Support for Custom Upstreams requires that the externally hosted upstream reposi Here are definitions for commonly used terms: -- **Upstream**: A repository that acts as a parent for another repository, like [Pantheon's WordPress Upstream](https://github.com/pantheon-systems/wordpress). The next two definitions are specific types of Upstreams. - -- **Custom Upstream**: A repository restricted to members of an organization, containing a common codebase for new sites. This type of repository is a child repository to Pantheon's core upstreams ([WordPress](https://github.com/pantheon-systems/wordpress),[Drupal (Latest Version)](https://github.com/pantheon-upstreams/drupal-composer-managed), [Drupal 7](https://github.com/pantheon-systems/drops-7)) and acts as a parent for site level repositories. - -- **Public Upstream**: A repository that is open to all Pantheon users which contains a common codebase for new sites, like [Panopoly](https://github.com/populist/panopoly-drops-7). - -- **Repository**: A collection of files packaged in a single directory under version control. - -- **Remote Repository**: A central version control location, such as a repository residing on GitHub, Bitbucket, or GitLab. - -- **Upstream Updates**: Code changes that are made once in a parent (upstream) repository, then applied "downstream" to child repositories. This is how Pantheon's one-click updates work. - -- **Site Repository**: Child repository where upstream updates are applied and site specific customizations are tracked, similar to your site's codebase on Pantheon. - + ## More Resources