diff --git a/source/content/guides/custom-upstream/01-custom-upstream.md b/source/content/guides/custom-upstream/01-custom-upstream.md index 27c4170f42..50e65e26f9 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 (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