From 5f818810e506c51ba49814b7a6c8b3f4fd114366 Mon Sep 17 00:00:00 2001 From: Brandon Philips Date: Wed, 16 Sep 2015 17:42:56 -0700 Subject: [PATCH 1/3] examples: README: fix trailing whitespace --- examples/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/README.md b/examples/README.md index db4e5420..34bfff98 100644 --- a/examples/README.md +++ b/examples/README.md @@ -3,7 +3,7 @@ gRPC in 3 minutes (Go) BACKGROUND ------------- -For this sample, we've already generated the server and client stubs from [helloworld.proto](examples/helloworld/proto/helloworld.proto). +For this sample, we've already generated the server and client stubs from [helloworld.proto](examples/helloworld/proto/helloworld.proto). PREREQUISITES ------------- From 2b1d73a5f7f5f846320d5598e6888c280f4f764a Mon Sep 17 00:00:00 2001 From: Brandon Philips Date: Wed, 16 Sep 2015 17:44:00 -0700 Subject: [PATCH 2/3] examples: README: remove sh tags The markdown renderer for grpc.io doesn't know what to do with the tags with the syntax highlighting tag like: ``` ```sh ``` See http://www.grpc.io/docs/installation/go.html --- examples/README.md | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/examples/README.md b/examples/README.md index 34bfff98..5cb12881 100644 --- a/examples/README.md +++ b/examples/README.md @@ -10,7 +10,8 @@ PREREQUISITES - This requires Go 1.4 - Requires that [GOPATH is set](https://golang.org/doc/code.html#GOPATH) -```sh + +``` $ go help gopath $ # ensure the PATH contains $GOPATH/bin $ export PATH=$PATH:$GOPATH/bin @@ -19,7 +20,7 @@ $ export PATH=$PATH:$GOPATH/bin INSTALL ------- -```sh +``` $ go get -u github.com/grpc/grpc-go/examples/helloworld/greeter_client $ go get -u github.com/grpc/grpc-go/examples/helloworld/greeter_server ``` @@ -28,12 +29,14 @@ TRY IT! ------- - Run the server -```sh + +``` $ greeter_server & ``` - Run the client -```sh + +``` $ greeter_client ``` @@ -45,7 +48,8 @@ OPTIONAL - Rebuilding the generated code - This is will change once proto3 is officially released 2 Install the protoc Go plugin. -```sh + +``` $ go get -a github.com/golang/protobuf/protoc-gen-go $ $ # from this dir; invoke protoc From 0f7040121636977ab9a148e9a992580301007c08 Mon Sep 17 00:00:00 2001 From: Brandon Philips Date: Wed, 16 Sep 2015 17:45:33 -0700 Subject: [PATCH 3/3] examples: README: use the new go package prefix This doesn't work since the package now lives at google.golang.org --- examples/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/README.md b/examples/README.md index 5cb12881..916758b9 100644 --- a/examples/README.md +++ b/examples/README.md @@ -21,8 +21,8 @@ INSTALL ------- ``` -$ go get -u github.com/grpc/grpc-go/examples/helloworld/greeter_client -$ go get -u github.com/grpc/grpc-go/examples/helloworld/greeter_server +$ go get -u google.golang.org/grpc/examples/helloworld/greeter_client +$ go get -u google.golang.org/grpc/examples/helloworld/greeter_server ``` TRY IT!