From d6dee3cad59bad5ee1e5c25a7b8d576ded0c56c2 Mon Sep 17 00:00:00 2001
From: David Reynolds <david@alwaysmovefast.com>
Date: Tue, 30 Sep 2014 19:31:35 -0700
Subject: [PATCH 1/2] Fix typos in README.md

---
 README.md | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 9fa47341313..00f9407beb3 100644
--- a/README.md
+++ b/README.md
@@ -98,7 +98,7 @@ export PATH=$PATH:$GOPATH/bin
 ```
 
 #### Using godep
-Here is a quick summary of `godep`.  `godep` helps manage third party dependencies by copying known versions into Godep/_workspace.  You can use `godep` in three ways:
+Here is a quick summary of `godep`.  `godep` helps manage third party dependencies by copying known versions into Godeps/_workspace.  You can use `godep` in three ways:
 
 1. Use `godep` to call your `go` commands.  For example: `godep go test ./...`
 2. Use `godep` to modify your `$GOPATH` so that other tools know where to find the dependencies.  Specifically: `export GOPATH=$GOPATH:$(godep path)`
@@ -111,13 +111,10 @@ We recommend using options #1 or #2.
 Before committing any changes, please link/copy these hooks into your .git
 directory. This will keep you from accidentally committing non-gofmt'd go code.
 
-**NOTE:** The `../..` part seems odd but is correct, since the newly created
-links will be 2 levels down the tree.
-
 ```
 cd kubernetes
-ln -s ../../hooks/prepare-commit-msg .git/hooks/prepare-commit-msg
-ln -s ../../hooks/commit-msg .git/hooks/commit-msg
+ln -s hooks/prepare-commit-msg .git/hooks/prepare-commit-msg
+ln -s hooks/commit-msg .git/hooks/commit-msg
 ```
 
 ### Unit tests

From 9fece09f261b1a3e8ae5f272e9d14116775e88f2 Mon Sep 17 00:00:00 2001
From: David Reynolds <david@alwaysmovefast.com>
Date: Tue, 30 Sep 2014 19:32:59 -0700
Subject: [PATCH 2/2] Use -addr in start_etcd instead of -bind-addr

---
 hack/util.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hack/util.sh b/hack/util.sh
index 84abb8f5307..7bc6407245d 100644
--- a/hack/util.sh
+++ b/hack/util.sh
@@ -59,8 +59,8 @@ function start_etcd {
 
   # Start etcd
   export ETCD_DIR=$(mktemp -d -t test-etcd.XXXXXX)
-  etcd -name test -data-dir ${ETCD_DIR} -bind-addr ${host}:${port} >/dev/null 2>/dev/null &
+  etcd -name test -data-dir ${ETCD_DIR} -addr ${host}:${port} >/dev/null 2>/dev/null &
   export ETCD_PID=$!
 
   wait_for_url "http://localhost:4001/v2/keys/" "etcd: "
-}
\ No newline at end of file
+}