Merge branch 'master' into guinaut-using-orbs-fix-1

michelle-luna · web-flow · commit 31328555623d · 2018-11-07T11:16:47.000-08:00
diff --git a/jekyll/_cci2/creating-orbs.md b/jekyll/_cci2/creating-orbs.md
@@ -269,7 +269,7 @@ While not strictly enforced, it is best practice when versioning your production
 * MINOR: when you add functionality in a backwards-compatible manner
 * PATCH: when you make backwards-compatible bug fixes
 
-#### Using Orbs in Orbs and Register-Time Resolution
+#### Using Orbs Within Your Orb and Register-Time Resolution
 
 You may use an ```orbs``` stanza inside an orb. 
 
diff --git a/jekyll/_cci2/orb-intro.md b/jekyll/_cci2/orb-intro.md
@@ -29,7 +29,7 @@ In the above example, two orbs are imported into your config, the [Slack orb](ht
 
 If you find that there are no existing orbs that meet your needs, you may author your own orb to meet your specific environment or configuration requirements by using the [CircleCI CLI]({{ site.baseurl }}/2.0/local-cli/) as shown in the `circleci orb help` output below. Although this is more time-consuming than using the import feature, authoring your own orb enables you to create a world-readable orb for sharing your configuration.
 
-```
+```nohighlight
 $ circleci orb help
 Operate on orbs
 
diff --git a/jekyll/_cci2/using-orbs.md b/jekyll/_cci2/using-orbs.md
@@ -72,7 +72,7 @@ Executors define the environment in which the steps of a job will be run. When y
 
 When you declare an executor in a configuration outside of `jobs`, you can use these declarations for all jobs in the scope of that declaration, enabling you to reuse a single executor definition across multiple jobs.
 
-Each executor definition includes the subset of the children keys of a `job` declaration related to setting the environment for a job to execute. This means it does not include `steps`. The subset can be one or more of the following keys:
+An executor definition has the following keys available (some of which are also available when using the `job` declaration):
 
 * `docker`, `machine`, or `macos`
 * `environment`
