Merge branch 'master' into split-tests-info

michelle-luna · web-flow · commit 513e86012be2 · 2018-11-08T14:30:55.000-08:00
diff --git a/jekyll/_cci2/creating-orbs.md b/jekyll/_cci2/creating-orbs.md
@@ -70,7 +70,7 @@ Examples of orb version declarations and their meaning:
 
 ### Using Development Versions
 
-While all production orbs must be published securely by organization administrators, development orbs provide non-administrator members of the team with a way to publish orbs. Unlike production orbs, dev orbs are also mutable, so they are ideal for rapid iteration of an idea.
+While all production orbs must be published securely by organization administrators, development orbs provide non-administrator members of the team with a way to publish orbs. Unlike production orbs, development orbs are also mutable, so they are ideal for rapid iteration of an idea.
 
 A development version must be referenced by its complete, fully-qualified name, such as: ```mynamespace/myorb@dev:mybranch.```; whereas production orbs allow wildcard semantic version references. Note that there are no shorthand conveniences for development versions.
 
diff --git a/jekyll/_cci2/notifications.md b/jekyll/_cci2/notifications.md
@@ -8,8 +8,10 @@ published: true
 ---
 
 CircleCI has integrated chat notifications, automated email notifications, and
-web notifications. Notifications are delivered on the success or failure of a
-[workflow]({{ site.baseurl }}/2.0/workflows/). Consider the minimal CircleCI config below:
+web notifications. For Slack and Email, notifications are delivered on the success or failure of a
+[workflow]({{ site.baseurl }}/2.0/workflows/). Otherwise, notifications are
+delivered for each job for all other notification platforms. Consider the minimal CircleCI config below:
+
 
 ```yaml
 version: 2
@@ -28,9 +30,10 @@ jobs:
       - run: <command>
 workflows:
   version: 2
-  build_and_test: # < A notification will be visible for this workflow
+  build_and_test: # < Slack and Email notifications will be delivered for workflows
     jobs:
-      - build
+    # All other notification integrations (HipChat, IRC, etc) will receive notification for each job.
+      - build 
       - test
 ```
 
