Merge branch 'master' into patch-2

Author: michelle-luna

jekyll/_cci2/creating-orbs.md

@@ -54,6 +54,8 @@ Certified orbs are those that CircleCI has built or has reviewed and approved as
 
 **Note:** The Security setting required for publishing or using 3rd-party orbs may only be toggled by organization administrators.
 
+**Note:** Orbs are not currently supported on private installations of CircleCI Server.
+
 ## Semantic Versioning in Orbs
 
 Orbs are published with the standard 3-number semantic versioning system:
@@ -133,7 +135,6 @@ workflows:
 
 In the example above, note that the contents of ```my-orb``` are resolved as an inline orb because the contents of ```my-orb``` are a map; whereas the contents of ```codecov``` are a scalar value, and thus assumed to be an orb URI.
 
-
 ### Example Inline Template
 
 When you want to author an orb, you may wish to use this example template to quickly and easily create a new orb with all of the required components. This example includes each of the three top-level concepts of orbs. While any orb can be equally expressed as an inline orb definition, it will generally be simpler to iterate on an inline orb and use ```circleci config process .circleci/config.yml``` to check whether your orb usage matches your expectation.
@@ -256,7 +257,6 @@ 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 Within Your Orb and Register-Time Resolution
 
 You may use an ```orbs``` stanza inside an orb. 
@@ -267,6 +267,26 @@ For example, orb ```foo/bar``` is published at version ```1.2.3``` with an ```or
 
 If ```biz/baz``` is updated to ```3.0.0```, anyone using ```foo/[email protected]``` will not see the change in ```biz/[email protected]``` until ```foo/bar``` is published at a higher version than `1.2.3`.
 
+**Note:** Orb elements may be composed directly with elements of other orbs. For example, you may have an orb that looks like the example below.
+
+{% raw %}
+```
+orbs:
+  some-orb: some-ns/some-orb@volatile
+executors:
+  my-executor: some-orb/their-executor
+commands:
+  my-command: some-orb/their-command
+jobs:
+  my-job: some-orb/their-job
+  another-job:
+    executor: my-executor
+    steps:
+      - my-command
+          param1: "hello"
+```
+{% endraw %}
+
 ### Deleting Production Orbs
 
 In general, CircleCI prefers to never delete production orbs that were published as world-readable because it harms the reliability of the orb registry as a source of configuration and the trust of all orb users.
@@ -403,7 +423,6 @@ If you are a user of a privately installed CircleCI deployment you will have to
 
 **Note:** CircleCI installed on a private cloud or datacenter does not yet support config processing and orbs; therefore, you will only be able to use `circlecli local execute` (this was previously `circleci build`).
 
-
 ### Validating a Build Config
 
 To ensure that the CircleCI CLI tool has been installed properly, you can use the CLI tool to validate a build config file by running the following command:
@@ -519,4 +538,3 @@ The animation shows snippets to give you an overview of the following steps for
 9. Replacing the inline executor and job definitions in the `.circleci/config.yml` with the reference to the published `ndintenfass/orb-utils@dev:test` orb.
 10. Running `circleci-config-validate .circleci/config.yml` to validate it is well-formed.
 11. Committing the change and checking that the build succeeds when using the imported orb. The processed config appears on the Configuration tab of the CircleCI Jobs page. 
-

jekyll/_cci2/orbs-faq.md

@@ -60,7 +60,6 @@ only certified orbs are permitted in this project.
 
 * Answer: Try making a whitespace change or similar. Your config won't recompile until you've made a change. Config processing happens before the compiled code is passed into the workflows conductor. Because of that, the workflows conductor (where you trigger the rebuild) knows nothing of the original 2.1 config.
 
-
 <!---
 ### Environment Variables Not Being Passed at Runtime
 
@@ -108,7 +107,6 @@ yourusername/circle-autoAdded by GitHub
 ```
 --->
 
-
 ### Logging Outputs
 
 * Question: Is there a standard way to to log output? For example, Jenkins plugins provide console links to show the log output and provides hooks to log those messages. It is possible to log to stdout, but is there a better way to log those log messages.
@@ -117,14 +115,43 @@ yourusername/circle-autoAdded by GitHub
 
 ### Failing Builds
 
-Question: How can I intentionally fail a job that invokes an orb from within an orb?
+* Question: How can I intentionally fail a job that invokes an orb from within an orb?
+
+* Answer: You can always return a non-zero status code from the shell to fail the job. You can also use `run: circleci-agent step halt` as a step to exit the job without failing.
+
+### Private Installation of CircleCI When Using Orbs
 
-Answer: You can always return a non-zero status code from the shell to fail the job. You can also use `run: circleci-agent step halt` as a step to exit the job without failing.
+* Question: Can I use a private installation of CircleCI Server when using working with orbs?
+
+* Answer: No. CircleCI Server does not currently support private installations.
+
+### Using Orb Elements For Other Orbs
+
+* Question: May I use elements from a different orb when creating my own orb?
+
+* Answer: Yes, orbs may be composed directly using elements of other orbs. For example:
+
+{% raw %}
+```
+orbs:
+  some-orb: some-ns/some-orb@volatile
+executors:
+  my-executor: some-orb/their-executor
+commands:
+  my-command: some-orb/their-command
+jobs:
+  my-job: some-orb/their-job
+  another-job:
+    executor: my-executor
+    steps:
+      - my-command
+          param1: "hello"
+```
+{% endraw %}
 
 
 ## See Also
 - Refer to [Orb Introduction]({{site.baseurl}}/2.0/orb-intro/), for a high-level overview.
 - Refer to [Using Orbs]({{site.baseurl}}/2.0/using-orbs/), for more about how to use existing orbs.
 - Refer to [Creating Orbs]({{site.baseurl}}/2.0/creating-orbs/), where you will find step-by-step instructions on how to create your own orb.
 - Refer to [Reusing Config]({{site.baseurl}}/2.0/reusing-config/) for more detailed examples of reusable orbs, commands, parameters, and executors.
-