adicoderanger
diff --git a/‎jekyll/_cci2/hello-world.md
Lines changed: 63 additions & 34 deletions b/‎jekyll/_cci2/hello-world.md
Lines changed: 63 additions & 34 deletions
@@ -7,60 +7,89 @@ categories: [getting-started]
 order: 4
 ---
 
-This document describes how to get started with a basic build of your Linux, Android, or macOS project on CircleCI 2.x after you [sign up]({{ site.baseurl }}/2.0/first-steps/).  
+This document describes how to get started with a basic build of your Linux, Android, Windows, or macOS project on CircleCI 2.x after you [sign up]({{ site.baseurl }}/2.0/first-steps/).  
 
-## Use the Hello-Build Orb
+## Echo Hello World on Linux 
+
+This example adds a job called `build` that spins up a container running a the [pre-built CircleCI Docker image for Node]({{ site.baseurl }}/2.0/circleci-images/#nodejs). Then, it runs a simple `echo` command. To get started, complete the following steps:
 
 1. Create a directory called `.circleci` in the root directory of your local GitHub or Bitbucket code repository. 
 
-2. Add a [`config.yml`]({{ site.baseurl }}/2.0/configuration-reference/) file in the `.circleci` directory with the following lines that import the [`hello-build` orb](https://circleci.com/orbs/registry/orb/circleci/hello-build).
+1. Create a [`config.yml`]({{ site.baseurl }}/2.0/configuration-reference/) file with the following lines: 
 
-```yaml
-version: 2.1
+     ```yaml
+     version: 2
+     jobs:
+    
10000
   build-linux:
+         docker: # use the docker executor type; machine and macos executors are also supported
+           - image: circleci/node:4.8.2 # the primary container, where your job's commands are run
+         steps:
+           - checkout # check out the code in the project directory
+           - run: echo "hello world" # run the `echo` command
+     ```
 
-orbs:
-    hello: circleci/hello-build@0.0.7 # uses the circleci/buildpack-deps Docker image
+1. Commit and push the changes. 
+
+1. Go to the Projects page in the CircleCI app, click the **Add Projects** button, then click
+the **Set Up Project** button next to your project. If you don't see your project, make sure you have selected the associated Org. See the Org Switching section below for tips.
+
+3. Click the **Start Building** button to trigger your first build. 
+
+The Workflows page appears with your `build` job and prints `Hello World` to the console. 
+
+**Note:** If you get a `No Config Found` error, it may be that you used `.yaml` file extension. Be sure to use `.yml` file extension to resolve this error.
+
+CircleCI runs each [job]({{site.baseurl}}/2.0/glossary/#job) in a separate [container]({{site.baseurl}}/2.0/glossary/#container) or VM. That is, each time your job runs, CircleCI spins up a container or VM to run the job in.
+
+Refer to the [Node.js - JavaScript Tutorial]({{site.baseurl}}/2.0/language-javascript/) for a sample project.
+
+## Hello World for Android
+
+Using the basic ideas from the Linux example above, you can add a job that uses the `docker` executor with a pre-built Android image in the same `config.yml` file as follows:
 
-workflows:
-    "Hello Workflow":
-        jobs:
-          - hello/hello-build
 ```
+jobs:
+  build-android:
+    docker:
+      - image: circleci/android:api-25-alpha
+```
+
+See the [Android Language Guide]({{site.baseurl}}/2.0/language-android/) for details and a sample project.
+
+## Hello World for macOS
+
+Using the basics from the Linux and Android examples above, you can add a job that uses the `macos` executor and a supported version of Xcode as follows:
+< 8000 /span>
+```
+jobs: # a basic unit of work in a run
+  build-macos: # runs not using `Workflows` must have a `build` job as entry point
+    macos:  # indicate that we are using the macOS executor
+      xcode: "10.0.0" # indicate our selected version of Xcode
+```      
 
-Commit and push the changes to trigger a build. If this is your first project on
-CircleCI, go to the Projects page, click the **Add Projects** button, then click
-the **Set Up Project** button next to your project. You may also click **Start
-Building** to manually trigger your first build.
+Refer to the [Hello World on MacOS]({{site.baseurl}}/2.0/hello-world-macos) document for more information and a sample project.
 
-## Echo Hello World with a `build` Job
+## Hello World for Windows
 
-Add a job called `build` that uses the Docker executor to spin up a Node container and runs a simple `echo` command:
+Using the basics from the Linux, Android, and macOS examples above, you can add a job that uses the `win/vs2019` executor (Windows Server 2019) by adding the `orb:` key in the same `.circleci/config.yml` file as follows:
 
-1. Add following lines to your `.circleci/config.yml` file. For Docker executors, replace `node:4.8.2` with any [Docker image]({{ site.baseurl }}/2.0/circleci-images/) you want: 
+```
+orbs:
+  win: circleci/windows@1.0.0
 
-```yaml
-version: 2
 jobs:
   build:
-    docker: # use the docker executor type; machine and macos executors are also supported
-      - image: circleci/node:4.8.2 # the primary container, where your job's commands are run
+    executor: win/vs2019
     steps:
-      - checkout # check out the code in the project directory
-      - run: echo "hello world" # run the `echo` command
+      - checkout
+      - run: Write-Host 'Hello, Windows'
 ```
 
-CircleCI runs each [job]({{site.baseurl}}/2.0/glossary/#job) in a separate [container]({{site.baseurl}}/2.0/glossary/#container) or VM. That is, each time your job runs, CircleCI spins up a container or VM to run the job in.
-
-**Note**: For `macos` and `windows` executors, some setup is different. Please refer to our [Hello World on Windows]({{site.baseurl}}/2.0/hello-world-windows) and [Hello World on MacOS]({{site.baseurl}}/2.0/hello-world-macos) documents for more information.
-
-Commit and push the changes to trigger a build. If this is your first project on
-CircleCI, go to the Projects page, click the **Add Projects** button, then click
-the **Set Up Project** button next to your project. You may also click **Start
-Building** to manually trigger your first build.
+**Note**: For Windows builds, some setup and prerequisites are different. Please refer to our [Hello World on Windows]({{site.baseurl}}/2.0/hello-world-windows). 
 
-CircleCI checks out your code, prints "Hello World", and posts a green build to the Job page, adding a green checkmark on your commit in GitHub or Bitbucket.
+### More About Using and Authoring Orbs
 
-**Note:** If you get a `No Config Found` error, it may be that you used `.yaml` file extension. Be sure to use `.yml` file extension to resolve this error.
+Orbs are a great way to simplify your config or re-use config across your projects, by referencing packages of config in the [CircleCI Orbs Registry](https://circleci.com/orbs/registry).
 
 ## Following Projects