diff --git a/source/content/guides/custom-upstream/01-custom-upstream.md b/source/content/guides/custom-upstream/01-custom-upstream.md index 0713466a7f..00565213e4 100644 --- a/source/content/guides/custom-upstream/01-custom-upstream.md +++ b/source/content/guides/custom-upstream/01-custom-upstream.md @@ -126,20 +126,38 @@ 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. +### Upstream -- **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. +

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

-- **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). +### Custom Upstream -- **Repository**: A collection of files packaged in a single directory under version control. +

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.

-- **Remote Repository**: A central version control location, such as a repository residing on GitHub, Bitbucket, or GitLab. +### Public Upstream -- **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. +

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

-- **Site Repository**: Child repository where upstream updates are applied and site specific customizations are tracked, similar to your site's codebase on Pantheon. +### 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 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 visible to users via Terminus and in the Site Settings. Once a framework has been set, it cannot be changed at the site level through the UI or Terminus. If you need to change your upstream's framework, you would need to contact Support.

## More Resources