From d2805aa2abfd2c84e7948c98a45e2f3f85e255b8 Mon Sep 17 00:00:00 2001 From: Chris Reynolds Date: Wed, 27 Nov 2024 14:52:40 -0700 Subject: [PATCH 1/5] use headings and p tags --- .../custom-upstream/01-custom-upstream.md | 40 +++++++++++++++---- 1 file changed, 32 insertions(+), 8 deletions(-) diff --git a/source/content/guides/custom-upstream/01-custom-upstream.md b/source/content/guides/custom-upstream/01-custom-upstream.md index 27c4170f42..f5d47de75a 100644 --- a/source/content/guides/custom-upstream/01-custom-upstream.md +++ b/source/content/guides/custom-upstream/01-custom-upstream.md @@ -126,14 +126,38 @@ Support for Custom Upstreams requires that the externally hosted upstream reposi Here are definitions for commonly used terms: -- **Upstream**: An upstream is a repository that acts as a parent for another repository, like [Pantheon's WordPress Upstream](https://github.com/pantheon-systems/wordpress). -- **Custom Upstream**: A custom upstream is 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 public upstream is 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**: Arepository is a collection of files packaged in a single directory under version control. -- **Remote Repository**: A remote repository is the central version control location, such as a repository residing on GitHub, Bitbucket, or GitLab. -- **Upstream Updates**: Upstream Updates are 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**: A site repository is a child repository where upstream updates are applied and site specific customizations are tracked, similar to your site's codebase on Pantheon. -- **Framework**: The upstream framework determines the server configuration for a given CMS. It includes things like Nginx configuration, the relevant CLI tool to install (Drush or WP-CLI), etc. This setting is _not visible_ to users and once a framework has been set for a site (based on how the upstream was configured), it cannot be changed without [changing the upstream](/guides/custom-upstream/switch-custom-upstream) itself. +### Upstream + +

An upstream is a repository that acts as a parent for another repository, like Pantheon's WordPress Upstream.

+ +### Custom Upstream + +

A custom upstream is 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, Drupal (Latest Version), Drupal 7) and acts as a parent for site level repositories.

+ +### Public Upstream + +

A public upstream is a repository that is open to all Pantheon users which contains a common codebase for new sites, like Panopoly.

+ +### Repository + +

Arepository is a collection of files packaged in a single directory under version control.

+ + +### Remote Repository + +

A remote repository is the central version control location, such as a repository residing on GitHub, Bitbucket, or GitLab.

+ +### Upstream Updates + +

Upstream Updates are 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 + +

A site repository is a child repository where upstream updates are applied and site specific customizations are tracked, similar to your site's codebase on Pantheon.

+ +### Framework + +

The upstream framework determines the server configuration for a given CMS. It includes things like Nginx configuration, the relevant CLI tool to install (Drush or WP-CLI), etc. This setting is _not visible_ to users and once a framework has been set for a site (based on how the upstream was configured), it cannot be changed without changing the upstream itself.

## More Resources From 087cfa9ecefa429f62aa15f4316b14d1abd12b38 Mon Sep 17 00:00:00 2001 From: Chris Reynolds Date: Wed, 27 Nov 2024 14:59:56 -0700 Subject: [PATCH 2/5] use upstream framework as the term instead --- source/content/guides/custom-upstream/01-custom-upstream.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/content/guides/custom-upstream/01-custom-upstream.md b/source/content/guides/custom-upstream/01-custom-upstream.md index f5d47de75a..eefc48d14a 100644 --- a/source/content/guides/custom-upstream/01-custom-upstream.md +++ b/source/content/guides/custom-upstream/01-custom-upstream.md @@ -157,7 +157,7 @@ Here are definitions for commonly used terms: ### Framework -

The upstream framework determines the server configuration for a given CMS. It includes things like Nginx configuration, the relevant CLI tool to install (Drush or WP-CLI), etc. This setting is _not visible_ to users and once a framework has been set for a site (based on how the upstream was configured), it cannot be changed without changing the upstream itself.

+

The upstream framework determines the server configuration for a given CMS. It includes things like Nginx configuration, the relevant CLI tool to install (Drush or WP-CLI), etc. This setting is _not visible_ to users and once a framework has been set for a site (based on how the upstream was configured), it cannot be changed without changing the upstream itself.

## More Resources From 5ca8c6925daff4c6da41e924fde7cdba86b13033 Mon Sep 17 00:00:00 2001 From: Chris Reynolds Date: Wed, 27 Nov 2024 15:06:13 -0700 Subject: [PATCH 3/5] rename upstream framework to site framework more in line with what exists in the dashboard --- source/content/guides/custom-upstream/01-custom-upstream.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/content/guides/custom-upstream/01-custom-upstream.md b/source/content/guides/custom-upstream/01-custom-upstream.md index eefc48d14a..84e21c96f7 100644 --- a/source/content/guides/custom-upstream/01-custom-upstream.md +++ b/source/content/guides/custom-upstream/01-custom-upstream.md @@ -157,7 +157,7 @@ Here are definitions for commonly used terms: ### Framework -

The upstream framework determines the server configuration for a given CMS. It includes things like Nginx configuration, the relevant CLI tool to install (Drush or WP-CLI), etc. This setting is _not visible_ to users and once a framework has been set for a site (based on how the upstream was configured), it cannot be changed without changing the upstream itself.

+

The site framework determines the server configuration for a given CMS. It includes things like Nginx configuration, the relevant CLI tool to install (Drush or WP-CLI), etc. This setting is _not visible_ to users and once a framework has been set for a site (based on how the upstream was configured), it cannot be changed without changing the upstream itself.

## More Resources From 02b811c7e4bd037eb0a14e05c26c0a1d43098abe Mon Sep 17 00:00:00 2001 From: Chris Reynolds Date: Wed, 27 Nov 2024 15:12:39 -0700 Subject: [PATCH 4/5] site framework doesn't create the glossary page go back to upstream framework but describe as "site framework" in parenthetical --- source/content/guides/custom-upstream/01-custom-upstream.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/content/guides/custom-upstream/01-custom-upstream.md b/source/content/guides/custom-upstream/01-custom-upstream.md index 84e21c96f7..c811bebb73 100644 --- a/source/content/guides/custom-upstream/01-custom-upstream.md +++ b/source/content/guides/custom-upstream/01-custom-upstream.md @@ -157,7 +157,7 @@ Here are definitions for commonly used terms: ### Framework -

The site framework determines the server configuration for a given CMS. It includes things like Nginx configuration, the relevant CLI tool to install (Drush or WP-CLI), etc. This setting is _not visible_ to users and once a framework has been set for a site (based on how the upstream was configured), it cannot be changed without changing the upstream itself.

+

The upstream framework (or site framework) determines the server configuration for a given CMS. It includes things like Nginx configuration, the relevant CLI tool to install (Drush or WP-CLI), etc. This setting is _not visible_ to users and once a framework has been set for a site (based on how the upstream was configured), it cannot be changed without changing the upstream itself.

## More Resources From 342d955ce2e0d1dc5d0ce8c4479a2810782c9577 Mon Sep 17 00:00:00 2001 From: Chris Reynolds Date: Wed, 27 Nov 2024 15:19:48 -0700 Subject: [PATCH 5/5] use em tags for emphasis --- source/content/guides/custom-upstream/01-custom-upstream.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/content/guides/custom-upstream/01-custom-upstream.md b/source/content/guides/custom-upstream/01-custom-upstream.md index c811bebb73..50e65e26f9 100644 --- a/source/content/guides/custom-upstream/01-custom-upstream.md +++ b/source/content/guides/custom-upstream/01-custom-upstream.md @@ -157,7 +157,7 @@ Here are definitions for commonly used terms: ### Framework -

The upstream framework (or site framework) determines the server configuration for a given CMS. It includes things like Nginx configuration, the relevant CLI tool to install (Drush or WP-CLI), etc. This setting is _not visible_ to users and once a framework has been set for a site (based on how the upstream was configured), it cannot be changed without changing the upstream itself.

+

The upstream framework (or site framework) determines the server configuration for a given CMS. It includes things like Nginx configuration, the relevant CLI tool to install (Drush or WP-CLI), etc. This setting is not visible to users and once a framework has been set for a site (based on how the upstream was configured), it cannot be changed without changing the upstream itself.

## More Resources