aboutsummaryrefslogtreecommitdiffhomepage
path: root/examples/cpp
diff options
context:
space:
mode:
authorGravatar Nicolas "Pixel" Noble <pixel@nobis-crew.org>2016-08-16 00:57:57 +0200
committerGravatar Nicolas "Pixel" Noble <pixel@nobis-crew.org>2016-08-16 01:54:33 +0200
commite1ee20bde6c30f0aa5a6f5309d20971ccd0122a7 (patch)
tree5d89668ab96d6d1e3f5274480d9f75a6a76f5be4 /examples/cpp
parent8d46873e8f2e675e7f41d16861b531ffe3e62103 (diff)
parente4947befe26c8f33ab05dace34c2988ac394de59 (diff)
Merge branch 'v1.0.x' of https://github.com/grpc/grpc into manual-upmerge
Diffstat (limited to 'examples/cpp')
-rw-r--r--examples/cpp/cpptutorial.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/cpp/cpptutorial.md b/examples/cpp/cpptutorial.md
index de7e4b2636..ae84aba916 100644
--- a/examples/cpp/cpptutorial.md
+++ b/examples/cpp/cpptutorial.md
@@ -127,7 +127,7 @@ Next we need to generate the gRPC client and server interfaces from our `.proto`
service definition. We do this using the protocol buffer compiler `protoc` with
a special gRPC C++ plugin.
-For simplicity, we've provided a [makefile](route_guide/Makefile) that runs
+For simplicity, we've provided a [Makefile](route_guide/Makefile) that runs
`protoc` for you with the appropriate plugin, input, and output (if you want to
run this yourself, make sure you've installed protoc and followed the gRPC code
[installation instructions](../../INSTALL.md) first):