@@ -102,10 +102,9 @@ Follow these steps to ensure that virtual box interfaces are unmanaged:

 	$ ip link list | grep vboxnet  -A 1 | grep link/ether | awk '{print "mac:" $2}' |  paste -sd ";" -

 == Development: What's on the Menu?

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

+Right now you can see what's happening with OpenShift development at:

-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]

+https://github.com/openshift/origin[github.com/openshift/origin]

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

@@ -125,28 +124,9 @@ From here, you can follow the https://github.com/openshift/origin/#getting-start

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

-=== The OpenShift Kubernetes Fork

-The OpenShift team is using this fork of the https://github.com/GoogleCloudPlatform/kubernetes[Kubernetes] project for two primary purposes:

-

-* As a staging area for pull requests to the upstream project

-* As a build area for Kubernetes that includes OpenShift-specific features that the upstream community does not want to add to the main project

-

 *If you are interested in contributing to Kubernetes directly:* +

 https://github.com/GoogleCloudPlatform/kubernetes#community-discussion-and-support[Join the Kubernetes community] and check out the https://github.com/GoogleCloudPlatform/kubernetes/blob/master/CONTRIBUTING.md[contributing guide].

-*If you are more interested in the OpenShift-specific use of Kubernetes:* +

-First, https://help.github.com/articles/fork-a-repo[fork our fork] of Kubernetes and make a local copy for yourself:

-

-$ go get github.com/openshift/kubernetes

-$ cd $GOPATH/src/github.com/openshift/kubernetes

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

-

-From there, head to the https://github.com/openshift/kubernetes#development[Development section] of the README for general information on tinkering with Kubernetes.

-

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

-

 === Troubleshooting

 If you run into difficulties running OpenShift, start by reading through the https://github.com/openshift/origin/blob/master/docs/debugging-openshift.md[troubleshooting guide].

@@ -174,14 +174,6 @@ $ go get github.com/openshift/origin

 $ go get github.com/GoogleCloudPlatform/kubernetes

 ```

-You will also need [openshift/kubernetes](https://github.com/openshift/kubernetes) as a remote of 

-[GoogleCloudPlatform/kubernetes](https://github.com/GoogleCloudPlatform/kubernetes):

-

-```

-$ cd $GOPATH/src/github.com/GoogleCloudPlatform/kubernetes

-$ git remote add openshift git@github.com:openshift/kubernetes.git

-```

-

 Check out the version of Kubernetes you want to rebase as a branch or tag named `stable_proposed` in

 [GoogleCloudPlatform/kubernetes](https://github.com/GoogleCloudPlatform/kubernetes). For example,

 if you are going to rebase the latest `master` of Kubernetes:

@@ -175,10 +175,6 @@ FAQ

     iterate through the next few months, you'll see this repository focus more on integration and

     plugins, with more and more features becoming part of Kubernetes.

-    OpenShift tracks the Kubernetes upstream at

-    [github.com/openshift/kubernetes](https://github.com/openshift/kubernetes).  See the wiki in

-    that project for more on how we manage the process of integrating prototyped features.

-

 2. What about [geard](https://github.com/openshift/geard)?

     Geard started as a prototype vehicle for the next generation of the OpenShift node - as an

@@ -17,12 +17,6 @@ echo "Hit ENTER to continue or CTRL+C to cancel"

 read

 pushd $GOPATH/src/github.com/GoogleCloudPlatform/kubernetes > /dev/null

-if [[ $(git remote -v | grep -c 'openshift/kubernetes.git') -eq 0 ]]; then

-  echo "You must have the OpenShift kubernetes repo set as a remote in $(pwd)"

-  echo

-  echo "  $ git remote add openshift git@github.com:openshift/kubernetes.git"

-  echo

-fi

 echo "Fetching latest ..."

 git fetch

 git fetch --tags