@@ -3,3 +3,4 @@

 /*.etcd

 .project

 .vagrant

+*.swp

@@ -1,22 +1,21 @@

-= Contributing to OpenShift v3

+= Contributing to OpenShift 3

 OpenShift Developers <dev@lists.openshift.redhat.com>

 :data-uri:

 :icons:

 :toc2:

 :sectanchors:

-The OpenShift v3 architecture builds upon the flexibility and scalability of https://docker.com/[Docker] and https://github.com/GoogleCloudPlatform/kubernetes[Kubernetes] to deliver a powerful new Platform as a Service system. This article explains how to set up a development environment and get involved with this latest version of OpenShift.

+The OpenShift 3 architecture builds upon the flexibility and scalability of https://docker.com/[Docker] and https://github.com/GoogleCloudPlatform/kubernetes[Kubernetes] to deliver a powerful new Platform as a Service system. This article explains how to set up a development environment and get involved with this latest version of OpenShift.

 == Prerequisites

-You can develop OpenShift v3 anywhere that you can run the following utilites:

+You can develop OpenShift 3 on Windows, Mac, or Linux, but you'll need Docker installed on Linux to actually launch containers.

-* The http://golang.org/[Go] programming language

-* The https://docker.com/[Docker] platform

-* The https://github.com/coreos/etcd[etcd] key-value store system

+* For OpenShift 3 development, install the http://golang.org/[Go] programming language

+* To launch containers, install the https://docker.com/[Docker] platform

 Here's how to get set up:

-1. For Go and Docker, follow the links below to get to installation information for these tools: +

+1. For Go and optionally also Docker, follow the links below to get to installation information for these tools: +

 ** http://golang.org/doc/install[Installing Go]

 ** https://docs.docker.com/installation/#installation[Installing Docker]

 2. Next, create a Go workspace directory: +

@@ -30,24 +29,20 @@ $ mkdir $HOME/go

 export GOPATH=$HOME/go

 export PATH=$PATH:$GOPATH/bin

 ----

-4. Now you can install `etcd` directly from GitHub: +

-+

-$ go get github.com/coreos/etcd

+4. Open up a new terminal or source the changes in your current terminal, and you're ready to code.

 == Development: What's on the Menu?

-Right now you can see what's happening with Origin development in two repositories:

+Right now you can see what's happening with OpenShift development in two repositories:

-1. The Origin repo: https://github.com/openshift/origin[github.com/openshift/origin]

+1. The OpenShift Origin repo: https://github.com/openshift/origin[github.com/openshift/origin]

 2. The OpenShift Kubernetes fork: https://github.com/openshift/kubernetes[github.com/openshift/kubernetes]

 Here's a quick summary of what we're doing there:

-=== The Origin Repo

-The OpenShift team is developing tools that will optimize and extend Kubernetes to function as a next-generation https://www.youtube.com/watch?v=aZ40GobvA1c[Platform-as-a-Service] offering. This repo contains that instrumentation along with some script-based examples of the +openshift+ utility in action. Kubernetes is included as a set of dependencies for this code, meaning that _it is not necessary to download Kubernetes separately if you are only interested in Origin development_.

+=== The OpenShift Origin Repo

+This repo contains the OpenShift 3 https://www.youtube.com/watch?v=aZ40GobvA1c[Platform-as-a-Service], built on Kubernetes, along with some script-based examples of the +openshift+ utility in action. Kubernetes is included in this repo for ease of development, and the version we include is periodically updated. In the future it will be possible to run OpenShift on top of an existing system.

-*Hacking Origin:* +

+*Hacking OpenShift Origin:* +

 To get started, https://help.github.com/articles/fork-a-repo[fork] the https://help.github.com/articles/fork-a-repo[origin repo] and then set up a local copy:

 ----

@@ -57,7 +52,7 @@ $ git remote rename origin upstream

 $ git remote add origin git@github.com:<YOUR_GITHUB_USERNAME>/origin

 ----

-From here, you can follow the https://github.com/openshift/origin/#getting-started[Getting Started section] of the README for a brief tour of Origin v3 functionality, which includes single- and multi-container pod examples.

+From here, you can follow the https://github.com/openshift/origin/#getting-started[Getting Started section] of the README for a brief tour of OpenShift 3 functionality, which includes single- and multi-container pod examples.

 Ready to play with some code? Hop down and read up on our link:#_the_roadmap[roadmap] for ideas on where you can contribute.

@@ -85,7 +80,7 @@ From there, head to the https://github.com/openshift/kubernetes#development[Deve

 When you're ready to get your hands dirty, check out the roadmap info in the next section.

 === The Roadmap

-The OpenShift project roadmap lives https://trello.com/b/nlLwlKoz/openshift-origin-roadmap[on Trello]. Of particular interest to those who want to get involved with the OpenShift v3 architecture are the following topics:

+The OpenShift project roadmap lives https://trello.com/b/nlLwlKoz/openshift-origin-roadmap[on Trello]. Of particular interest to those who want to get involved with the OpenShift 3 architecture are the following topics:

 * https://trello.com/c/uqNIamJi[Orchestration]

 * https://trello.com/c/ja8bbQwy[Networking]