@@ -1,6 +1,6 @@

-/output

+/_output

 /third_party

 /*.etcd

-.project

-.vagrant

+/.project

+/.vagrant

 *.swp

@@ -8,7 +8,8 @@

 #   run: Run All-in-one server

 #   clean: Clean up.

-OUT_DIR = output

+OUT_DIR = _output

+OUT_PKG_DIR = Godeps/_workspace/pkg

 export GOFLAGS

@@ -57,6 +58,6 @@ run: build

 # Example:

 #   make clean

 clean:

-	rm -rf $(OUT_DIR)

+	rm -rf $(OUT_DIR) $(OUT_PKG_DIR)

 .PHONY: clean

@@ -22,12 +22,12 @@ From there, you can:

 2.  Start an OpenShift all-in-one server (includes everything you need to try OpenShift)

-        $ output/go/bin/openshift start

+        $ _output/go/bin/openshift start

 3.  In another terminal window, switch to the directory and start an app:

         $ cd $GOPATH/src/github.com/openshift/origin

-        $ output/go/bin/openshift kube create pods -c examples/hello-openshift/hello-pod.json

+        $ _output/go/bin/openshift kube create pods -c examples/hello-openshift/hello-pod.json

 Once that's done, open a browser on your machine and open [http://localhost:6061](http://localhost:6061); you should see a 'Welcome to OpenShift' message.

@@ -39,7 +39,8 @@ This example is simply running the ['openshift/hello-openshift' Docker image](ht

 * At the Kubernetes level, we [map that bound port in the container](https://github.com/openshift/origin/blob/master/examples/hello-openshift/hello-pod.json#L13) [to port 6061 on the host](https://github.com/openshift/origin/blob/master/examples/hello-openshift/hello-pod.json#L14) so that we can access it via the host browser.

 ### Other Examples

-For an example app that includes a databse and an admin front-end, try the [multiple container pod](https://github.com/openshift/origin/blob/master/examples/test-pod-multi.json). Also, coming soon: [Vagrant](http://www.vagrantup.com) environments supporting OpenShift - see [Kubernetes README.md](https://github.com/GoogleCloudPlatform/kubernetes/blob/master/README.md) for now.

+For an example app that includes a databse and an admin front-end, try the [multiple container pod](https://github.com/openshift/origin/blob/master/examples/test-pod-multi.json). 

+

 Getting Started With Vagrant

 ----------------------------

@@ -54,7 +54,7 @@ else

   OS_REPO_ROOT=$(readlink -f "${OS_REPO_ROOT}")

 fi

-OS_TARGET="${OS_REPO_ROOT}/output/go"

+OS_TARGET="${OS_REPO_ROOT}/_output/go"

 mkdir -p "${OS_TARGET}"

 OS_GO_PACKAGE=github.com/openshift/origin

@@ -63,7 +63,7 @@ OS_GO_PACKAGE_DIR="${OS_TARGET}/src/${OS_GO_PACKAGE}"

 OS_GO_PACKAGE_BASEDIR=$(dirname "${OS_GO_PACKAGE_DIR}")

 mkdir -p "${OS_GO_PACKAGE_BASEDIR}"

-# Create symlink under output/go/src.

+# Create symlink under _output/go/src.

 ln -snf "${OS_REPO_ROOT}" "${OS_GO_PACKAGE_DIR}"

 GOPATH="${OS_TARGET}:${OS_REPO_ROOT}/Godeps/_workspace"

@@ -22,7 +22,7 @@ ETCD_PORT=${ETCD_PORT:-4001}

 API_PORT=${API_PORT:-8080}

 API_HOST=${API_HOST:-127.0.0.1}

 KUBELET_PORT=${KUBELET_PORT:-10250}

-GO_OUT=$(dirname $0)/../output/go/bin

+GO_OUT=$(dirname $0)/../_output/go/bin

 # Check openshift version

 out=$(${GO_OUT}/openshift version)

@@ -14,7 +14,7 @@ find_test_dirs() {

         -o -wholename './target' \

         -o -wholename '*/third_party/*' \

         -o -wholename '*/Godeps/*' \

-        -o -wholename '*/output/*' \

+        -o -wholename '*/_output/*' \

       \) -prune \

     \) -name '*_test.go' -print0 | xargs -0n1 dirname | sort -u | xargs -n1 printf "${OS_GO_PACKAGE}/%s\n"

 }

@@ -26,7 +26,7 @@ fi

 REPO_ROOT="$(cd "$(dirname "$0")/../" && pwd -P)"

-files="$(find ${REPO_ROOT} -type f | grep "[.]go$" | grep -v "third_party/\|release/\|output/\|target/\|Godeps/")"

+files="$(find ${REPO_ROOT} -type f | grep "[.]go$" | grep -v "third_party/\|release/\|_output/\|target/\|Godeps/")"

 bad=$(gofmt -s -l ${files})

 if [[ -n "${bad}" ]]; then

   echo "$bad"