Merge branch 'master' into patch-1

config.toml

@@ -6,7 +6,7 @@ pygmentsCodeFences = true
 [params]
 grpc_release_tag = "v1.22.0"
 grpc_release_tag_no_v = "1.22.0"
-grpc_java_release_tag = "v1.21.0"
+grpc_java_release_tag = "v1.23.0"
 milestones_link = "https://github.com/grpc/grpc/milestones"
 
 # Configuration required for auto-generating the Netlify _redirects file

content/about.md

@@ -150,6 +150,10 @@ Check out what people are saying below:
 <td>Node.js</td><td>Windows/Linux/Mac</td><td> Node v4+</td>
 </tr>
 
+<tr>
+<td>Objective-C</td><td>Mac OS X 10.11+/iOS 7.0+</td><td>Xcode 7.2+</td>
+</tr>
+
 <tr>
 <td>PHP (Beta) </td><td>Linux/Mac</td><td> PHP 5.5+ and PHP 7.0+</td>
 </tr>
@@ -174,6 +178,7 @@ Check out what people are saying below:
 | Go | Windows/Linux/Mac | Go 1.6+ |
 | Java | Windows/Linux/Mac | JDK 8 recommended. Gingerbread+ for Android |
 | Node.js | Windows/Linux/Mac | Node v4+ |
+| Objective-C | Mac OS X 10.11+/iOS 7.0+ | Xcode 7.2+ |
 | PHP * | Linux/Mac | PHP 5.5+ and PHP 7.0+ |
 | Python | Windows/Linux/Mac | Python 2.7 and Python 3.4+ |
 | Ruby | Windows/Linux/Mac | |

content/docs/quickstart/node.md

@@ -123,7 +123,7 @@ function sayHelloAgain(call, callback) {
 
 function main() {
   var server = new grpc.Server();
-  server.addProtoService(hello_proto.Greeter.service,
+  server.addService(hello_proto.Greeter.service,
                          {sayHello: sayHello, sayHelloAgain: sayHelloAgain});
   server.bind('0.0.0.0:50051', grpc.ServerCredentials.createInsecure());
   server.start();

content/docs/tutorials/basic/go.md

@@ -158,6 +158,7 @@ Running this command generates the following file in the `routeguide` directory
 - `route_guide.pb.go`
 
 This contains:
+
 - All the protocol buffer code to populate, serialize, and retrieve our request
   and response message types
 - An interface type (or *stub*) for clients to call with the methods defined in