Merge pull request circleci#3414 from rosieyohannan/fix/containers

expand VCS

Author: michelle-luna

jekyll/_cci2/containers.md

@@ -5,22 +5,25 @@ categories: [how-to]
 description: How to leverage CircleCI containers
 ---
 
-This document describes the basics of containers and how to leverage the containers in your plan to speed up your job and workflow runs. 
+This document describes the basics of containers and how to leverage the containers in your plan to speed up your job and workflow runs.
 
 ## Overview
 
-Every change committed to your VCS system triggers CircleCI to checkout your code and run your job workflow inside of a fresh, on-demand, and isolated container with access to the following depending on your plan: 
+Every change committed to your version control system triggers CircleCI to checkout your code and run your job workflow inside a fresh, on-demand, isolated container with access to the following, depending on your plan:
 
 - **Concurrency** - Utilizing multiple containers to run multiple builds at the same time. To take advantage of concurrency, configure your development workflow using the [Orchestrating Workflows document]({{ site.baseurl }}/2.0/workflows/)
 and run your jobs in parallel as shown in the [Sample 2.0 Config Files document]({{ site.baseurl }}/2.0/sample-config/#sample-configuration-with-parallel-jobs).
 
-- **Parallelism** - Splitting tests across multiple containers, allowing you to dramatically speed up your test suite. Update your `.circleci/config.yml` file to run your tests in parallel as documented in the [Configuring CircleCI]({{ site.baseurl }}/2.0/configuration-reference/#parallelism) document. Learn how to update your config file to parallelize and split tests to decrease your build time by reading the [Running Tests in Parallel]({{ site.baseurl }}/2.0/parallelism-faster-jobs/) documentation.
+- **Parallelism** - Splitting tests across multiple containers, allowing you to dramatically speed up your test suite. Update your `.circleci/config.yml` file to run your tests in parallel as described in the [Configuring CircleCI]({{ site.baseurl }}/2.0/configuration-reference/#parallelism) document. Learn how to update your config file to parallelize and split tests to decrease your build time by reading the [Running Tests in Parallel]({{ site.baseurl }}/2.0/parallelism-faster-jobs/) documentation.
 
 ## Getting Started
 
-Linux plans start with the ability to run one workflow without parallelism at no charge. Open source projects include three additional free containers to run jobs in parallel. Purchasing a Linux plan enables you to use additional containers when you need them. Choose a paid or free plan during the signup process and change your plan in the CircleCI app Settings page later to meet changing business requirements. Most CircleCI customers use two to three containers per full-time developer. Increase the number of containers at any level of parallelism and concurrency as your team or the complexity of your workflow grows.
+Linux plans start with the ability to run one workflow, without parallelism, at no charge. Purchasing a Linux plan enables you to use additional containers when you need them. Choose a paid or free plan during the signup process and change your plan in the CircleCI app Settings page later to meet changing business requirements.
 
-## Upgrading
+Most CircleCI customers use two to three containers per full-time developer. Increase the number of containers to any level of parallelism and concurrency as your team or the complexity of your workflow grows.
+
+Open source projects include three additional free containers to run jobs in parallel.
 
-Refer to the [FAQ about upgrading]({{ site.baseurl }}/2.0/faq/#how-do-i-upgrade-my-plan-with-more-containers-to-prevent-queuing) for step-by-step instructions about upgrading your plan.
+## Upgrading
 
+Refer to the [FAQ about upgrading]({{ site.baseurl }}/2.0/faq/#how-do-i-upgrade-my-plan-with-more-containers-to-prevent-queuing) for step-by-step instructions to upgrade your plan.

jekyll/_cci2/ssh-access-jobs.md

@@ -13,35 +13,27 @@ This document describes how to access a build container using SSH on CircleCI 2.
 {:toc}
 
 ## Overview
-Often the best way to troubleshoot problems is to SSH into a job and inspect
-things like log files, running processes, and directory paths. CircleCI 2.0 gives you the option to access all jobs via SSH.
+Often the best way to troubleshoot problems is to SSH into a job and inspect things like log files, running processes, and directory paths. CircleCI 2.0 gives you the option to access all jobs via SSH. Read our [blog post](https://circleci.com/blog/debugging-ci-cd-pipelines-with-ssh-access/) on debugging CI/CD pipelines with SSH.
 
 When you log in with SSH, you are running an interactive login shell. You are also likely to be running the command on top of the directory where the command failed the first time, so you are not starting a clean run. In contrast, CircleCI uses a non-interactive shell for running commands by default. Hence, steps run in interactive mode may succeed, while failing in non-interactive mode.
 
 ## Steps
 
 1. Ensure that you have added an SSH key to your [GitHub](https://help.github.com/articles/adding-a-new-ssh-key-to-your-github-account/) or [Bitbucket](https://confluence.atlassian.com/bitbucket/set-up-an-ssh-key-728138079.html) account.
 
-2. To start a job with SSH enabled, select the 'Rerun job with SSH' option from
-the 'Rerun Workflow' dropdown menu.
+2. To start a job with SSH enabled, select the 'Rerun job with SSH' option from the 'Rerun Workflow' dropdown menu.
 
 3. To see the connection details, expand the 'Enable SSH' section in the job output where you will see the SSH command needed to connect:
-![SSH connection details](https://circleci-discourse.s3.amazonaws.com/optimized/2X/5/57f50e26ec245d0373c4265ec4375641553bdbdb_1_690x295.png)	
+![SSH connection details](https://circleci-discourse.s3.amazonaws.com/optimized/2X/5/57f50e26ec245d0373c4265ec4375641553bdbdb_1_690x295.png)
 ![SSH connection details](https://circleci-discourse.s3.amazonaws.com/optimized/2X/5/514e8aec3e8017dac8e8d401d22432026b473161_1_690x281.png)
 
      The details are displayed again in the 'Wait for SSH' section at the end of the job.
 
-4. SSH to the running job (using the same SSH key
-that you use for GitHub or Bitbucket) to perform whatever troubleshooting
-you need to.
+4. SSH to the running job (using the same SSH key that you use for GitHub or Bitbucket) to perform whatever troubleshooting you need to.
 
-The build VM will remain available for an SSH connection for **10 minutes after the build
-finishes running** and then automatically shut down. (Or you can cancel it.) After you SSH
-into the build, the connection will remain open for **two hours**.
+The build VM will remain available for an SSH connection for **10 minutes after the build finishes running** and then automatically shut down. (Or you can cancel it.) After you SSH into the build, the connection will remain open for **two hours**.
 
-**Note**: If your job has parallel steps, CircleCI launches more than one VM
-to perform them. Thus, you'll see more than one 'Enable SSH' and
-'Wait for SSH' section in the build output.
+**Note**: If your job has parallel steps, CircleCI launches more than one VM to perform them. Thus, you'll see more than one 'Enable SSH' and 'Wait for SSH' section in the build output.
 
 ## Debugging: "Permission denied (publickey)"
 
@@ -51,11 +43,11 @@ these things:
 ### Ensure Authentication With GitHub/Bitbucket
 {:.no_toc}
 
-A single command can be used to test that your keys are set up as expected. For 
+A single command can be used to test that your keys are set up as expected. For
 GitHub run:
 
 ```
-$ ssh [email protected]
+ssh [email protected]
 ```
 
 or for Bitbucket run:
@@ -67,13 +59,13 @@ ssh -Tv [email protected]
 and you should see:
 
 ```
-Hi :username! You've successfully authenticated...
+$ Hi :username! You've successfully authenticated...
 ```
 
 for GitHub or for Bitbucket:
 
 ```
-logged in as :username.
+$ logged in as :username.
 ```
 
 If you _don't_ see output like that, you need to start by