rename grpc to gRPC

README.md

@@ -8,7 +8,7 @@ An industrial-grade RPC framework used throughout [Baidu](http://ir.baidu.com/ph
 
 You can use it to:
 * Build a server that can talk in multiple protocols (**on same port**), or access all sorts of services
-  * restful http/https, [h2](https://http2.github.io/http2-spec)/[grpc](https://grpc.io). using http/h2 in brpc is much more friendly than [libcurl](https://curl.haxx.se/libcurl/). Access protobuf-based protocols with HTTP/h2+json, probably from another language.
+  * restful http/https, [h2](https://http2.github.io/http2-spec)/[gRPC](https://grpc.io). using http/h2 in brpc is much more friendly than [libcurl](https://curl.haxx.se/libcurl/). Access protobuf-based protocols with HTTP/h2+json, probably from another language.
   * [redis](docs/en/redis_client.md) and [memcached](docs/en/memcache_client.md), thread-safe, more friendly and performant than the official clients.
   * [rtmp](https://github.com/brpc/brpc/blob/master/src/brpc/rtmp.h)/[flv](https://en.wikipedia.org/wiki/Flash_Video)/[hls](https://en.wikipedia.org/wiki/HTTP_Live_Streaming), for building [streaming services](https://github.com/brpc/media-server).
   * hadoop_rpc (may be opensourced)
@@ -39,7 +39,7 @@ You can use it to:
     * [Error code](docs/en/error_code.md)
     * [Combo channels](docs/en/combo_channel.md)
     * [Access http/h2](docs/en/http_client.md)
-    * [Access grpc](docs/en/http_derivatives.md#h2grpc)
+    * [Access gRPC](docs/en/http_derivatives.md#h2grpc)
     * [Access thrift](docs/en/thrift.md#client-accesses-thrift-server) 
     * [Access UB](docs/cn/ub_client.md)
     * [Streaming RPC](docs/en/streaming_rpc.md)
@@ -50,7 +50,7 @@ You can use it to:
   * Server
     * [Basics](docs/en/server.md)
     * [Serve http/h2](docs/en/http_service.md)
-    * [Serve grpc](docs/en/http_derivatives.md#h2grpc)
+    * [Serve gRPC](docs/en/http_derivatives.md#h2grpc)
     * [Serve thrift](docs/en/thrift.md#server-processes-thrift-requests)
     * [Serve Nshead](docs/cn/nshead_service.md)
     * [Debug server issues](docs/cn/server_debugging.md)

README_cn.md

@@ -9,7 +9,7 @@
 你可以使用它：
 
 * 搭建能在**一个端口**支持多协议的服务, 或访问各种服务
-  * restful http/https, [h2](https://http2.github.io/http2-spec)/[grpc](https://grpc.io)。使用brpc的http实现比[libcurl](https://curl.haxx.se/libcurl/)方便多了。从其他语言通过HTTP/h2+json访问基于protobuf的协议.
+  * restful http/https, [h2](https://http2.github.io/http2-spec)/[gRPC](https://grpc.io)。使用brpc的http实现比[libcurl](https://curl.haxx.se/libcurl/)方便多了。从其他语言通过HTTP/h2+json访问基于protobuf的协议.
   * [redis](docs/cn/redis_client.md)和[memcached](docs/cn/memcache_client.md), 线程安全，比官方client更方便。
   * [rtmp](https://github.com/brpc/brpc/blob/master/src/brpc/rtmp.h)/[flv](https://en.wikipedia.org/wiki/Flash_Video)/[hls](https://en.wikipedia.org/wiki/HTTP_Live_Streaming), 可用于搭建[流媒体服务](https://github.com/brpc/media-server).
   * hadoop_rpc(可能开源)
@@ -40,7 +40,7 @@
     * [错误码](docs/cn/error_code.md)
     * [组合channels](docs/cn/combo_channel.md)
     * [访问http/h2](docs/cn/http_client.md)
-    * [访问grpc](docs/cn/http_derivatives.md#h2:grpc)
+    * [访问gRPC](docs/cn/http_derivatives.md#h2grpc)
     * [访问thrift](docs/cn/thrift.md#client端访问thrift-server)
     * [访问UB](docs/cn/ub_client.md)
     * [Streaming RPC](docs/cn/streaming_rpc.md)
@@ -51,7 +51,7 @@
   * Server
     * [基础功能](docs/cn/server.md)
     * [搭建http/h2服务](docs/cn/http_service.md)
-    * [搭建grpc服务](docs/cn/http_derivatives.md#h2:grpc)
+    * [搭建gRPC服务](docs/cn/http_derivatives.md#h2grpc)
     * [搭建thrift服务](docs/cn/thrift.md#server端处理thrift请求)
     * [搭建Nshead服务](docs/cn/nshead_service.md)
     * [高效率排查server卡顿](docs/cn/server_debugging.md)

docs/cn/client.md

@@ -583,7 +583,7 @@ Channel的默认协议是baidu_std，可通过设置ChannelOptions.protocol换
 - PROTOCOL_H2 或 ”h2", http/2.0协议，默认是单连接。
   - 访问普通h2服务的方法见[访问http/h2服务](http_client.md)。
   - 通过h2:json或h2:proto访问pb服务的方法见[基于http/h2的协议](http_derivatives.md)
-- "h2:grpc", [grpc](https://grpc.io)的协议，也是h2的衍生协议，默认为单连接，具体见[基于http/h2的协议](http_derivatives.md)。
+- "h2:grpc", [gRPC](https://grpc.io)的协议，也是h2的衍生协议，默认为单连接，具体见[基于http/h2的协议](http_derivatives.md)。
 - PROTOCOL_THRIFT 或 "thrift"，[apache thrift](https://thrift.apache.org)的协议，默认为连接池, 具体方法见[访问thrift](thrift.md)。
 - PROTOCOL_MEMCACHE 或 "memcache"，memcached的二进制协议，默认为单连接。具体方法见[访问memcached](memcache_client.md)。
 - PROTOCOL_REDIS 或 "redis"，redis 1.2后的协议(也是hiredis支持的协议)，默认为单连接。具体方法见[访问Redis](redis_client.md)。

docs/cn/http_derivatives.md

@@ -22,16 +22,16 @@ http/2默认是这个行为，所以"h2"和"h2:proto"等价。
 
 # h2:grpc
 
-[grpc](https://github.com/grpc)的默认协议，具体格式可阅读[gRPC over HTTP2](https://github.com/grpc/grpc/blob/master/doc/PROTOCOL-HTTP2.md)
+[gRPC](https://github.com/grpc)的默认协议，具体格式可阅读[gRPC over HTTP2](https://github.com/grpc/grpc/blob/master/doc/PROTOCOL-HTTP2.md)
 
-使用brpc的客户端把ChannelOptions.protocol设置为"h2:grpc"一般就能连通grpc。
+使用brpc的客户端把ChannelOptions.protocol设置为"h2:grpc"一般就能连通gRPC。
 
-使用brpc的服务端一般无需修改代码即可自动被grpc客户端访问。
+使用brpc的服务端一般无需修改代码即可自动被gRPC客户端访问。
 
-grpc默认序列化是pb二进制格式，所以"h2:grpc"和"h2:grpc+proto"等价。
+gRPC默认序列化是pb二进制格式，所以"h2:grpc"和"h2:grpc+proto"等价。
 
-TODO: grpc其他配置
+TODO: gRPC其他配置
 
 # h2:grpc+json
 
-这个协议相比h2:grpc就是用json序列化结果代替pb序列化结果。grpc未必直接支持这个格式，如grpc-go可参考[这里](https://github.com/johanbrandhorst/grpc-json-example/blob/master/codec/json.go)注册对应的codec后才会支持。
+这个协议相比h2:grpc就是用json序列化结果代替pb序列化结果。gRPC未必直接支持这个格式，如grpc-go可参考[这里](https://github.com/johanbrandhorst/grpc-json-example/blob/master/codec/json.go)注册对应的codec后才会支持。

docs/cn/overview.md

@@ -42,11 +42,12 @@ RPC不是万能的抽象，否则我们也不需要TCP/IP这一层了。但是
 你可以使用它：
 
 * 搭建能在**一个端口**支持多协议的服务, 或访问各种服务
-  * restful http/https, h2/h2c (与[grpc](https://github.com/grpc/grpc)兼容, 即将开源). 使用brpc的http实现比[libcurl](https://curl.haxx.se/libcurl/)方便多了。
+  * restful http/https, [h2](https://http2.github.io/http2-spec)/[gRPC](https://grpc.io)。使用brpc的http实现比[libcurl](https://curl.haxx.se/libcurl/)方便多了。从其他语言通过HTTP/h2+json访问基于protobuf的协议.
   * [redis](redis_client.md)和[memcached](memcache_client.md), 线程安全，比官方client更方便。
   * [rtmp](https://github.com/brpc/brpc/blob/master/src/brpc/rtmp.h)/[flv](https://en.wikipedia.org/wiki/Flash_Video)/[hls](https://en.wikipedia.org/wiki/HTTP_Live_Streaming), 可用于搭建[流媒体服务](https://github.com/brpc/media-server).
   * hadoop_rpc(可能开源)
   * 支持[rdma](https://en.wikipedia.org/wiki/Remote_direct_memory_access)(即将开源)
+  * 支持[thrift](thrift.md) , 线程安全，比官方client更方便
   * 各种百度内使用的协议: [baidu_std](baidu_std.md), [streaming_rpc](streaming_rpc.md), hulu_pbrpc, [sofa_pbrpc](https://github.com/baidu/sofa-pbrpc), nova_pbrpc, public_pbrpc, ubrpc和使用nshead的各种协议.
   * 从其他语言通过HTTP+json访问基于protobuf的协议.
   * 基于工业级的[RAFT算法](https://raft.github.io)实现搭建[高可用](https://en.wikipedia.org/wiki/High_availability)分布式系统，已在[braft](https://github.com/brpc/braft)开源。

docs/cn/server.md

@@ -297,7 +297,7 @@ server端会自动尝试其支持的协议，无需用户指定。`cntl->protoco
 
 - http/1.0和http/1.1协议，显示为”http“，默认启用。
 
-- http/2和grpc协议，显示为"h2c"(未加密)或"h2"(加密)，默认启用。
+- http/2和gRPC协议，显示为"h2c"(未加密)或"h2"(加密)，默认启用。
 
 - RTMP协议，显示为"rtmp", 默认启用。
 

docs/en/client.md

@@ -592,7 +592,7 @@ The default protocol used by Channel is baidu_std, which is changeable by settin
 - PROTOCOL_H2 or ”h2", which is http/2.0, using single connection by default.
   - Methods for accessing ordinary h2 services are listed in [Access http/h2](http_client.md).
   - Methods for accessing pb services by using h2:json or h2:proto are listed in [Protocols based on http/h2](http_derivatives.md)
-- "h2:grpc", which is the protocol of [grpc](https://grpc.io) and based on h2, using single connection by default, check out [Protocols based on http/h2](http_derivatives.md) for details.
+- "h2:grpc", which is the protocol of [gRPC](https://grpc.io) and based on h2, using single connection by default, check out [Protocols based on http/h2](http_derivatives.md) for details.
 - PROTOCOL_THRIFT or "thrift", which is the protocol of [apache thrift](https://thrift.apache.org), using pooled connection by default, check out [access thrift](thrift.md) for details.
 - PROTOCOL_MEMCACHE or "memcache", which is binary protocol of memcached, using **single connection** by default. Check out [access memcached](memcache_client.md) for details.
 - PROTOCOL_REDIS or "redis", which is protocol of redis 1.2+ (the one supported by hiredis), using **single connection** by default. Check out [Access Redis](redis_client.md) for details.

docs/en/http_derivatives.md

@@ -22,16 +22,16 @@ http/2 behaves in this way by default, so "h2" and "h2:proto" are just same.
 
 # h2:grpc
 
-Default protocol of [grpc](https://github.com/grpc). The detailed format is described in [gRPC over HTTP2](https://github.com/grpc/grpc/blob/master/doc/PROTOCOL-HTTP2.md).
+Default protocol of [gRPC](https://github.com/grpc). The detailed format is described in [gRPC over HTTP2](https://github.com/grpc/grpc/blob/master/doc/PROTOCOL-HTTP2.md).
 
-Clients using brpc should be able to talk with grpc after changing ChannelOptions.protocol to "h2:grpc".
+Clients using brpc should be able to talk with gRPC after changing ChannelOptions.protocol to "h2:grpc".
 
-Servers using brpc should be accessible by grpc clients automatically without changing the code.
+Servers using brpc should be accessible by gRPC clients automatically without changing the code.
 
-grpc serializes message into pb wire format by default, so "h2:grpc" and "h2:grpc+proto" are just same.
+gRPC serializes message into pb wire format by default, so "h2:grpc" and "h2:grpc+proto" are just same.
 
-TODO: Other configurations for grpc 
+TODO: Other configurations for gRPC 
 
 # h2:grpc+json
 
-Comparing to h2:grpc, this protocol serializes messages into json instead of pb, which may not be supported by grpc directly. For example, grpc-go may reference [here](https://github.com/johanbrandhorst/grpc-json-example/blob/master/codec/json.go) to register the corresponding codec and turn on the support.
+Comparing to h2:grpc, this protocol serializes messages into json instead of pb, which may not be supported by gRPC directly. For example, grpc-go may reference [here](https://github.com/johanbrandhorst/grpc-json-example/blob/master/codec/json.go) to register the corresponding codec and turn on the support.

docs/en/overview.md

@@ -38,11 +38,12 @@ An industrial-grade RPC framework used throughout [Baidu](http://ir.baidu.com/ph
 
 You can use it to:
 * Build a server that can talk in multiple protocols (**on same port**), or access all sorts of services
-  * restful http/https, h2/h2c (compatible with [grpc](https://github.com/grpc/grpc), will be opensourced). using http in brpc is much more friendly than [libcurl](https://curl.haxx.se/libcurl/).
+  * restful http/https, [h2](https://http2.github.io/http2-spec)/[gRPC](https://grpc.io). using http/h2 in brpc is much more friendly than [libcurl](https://curl.haxx.se/libcurl/). Access protobuf-based protocols with HTTP/h2+json, probably from another language.
   * [redis](redis_client.md) and [memcached](memcache_client.md), thread-safe, more friendly and performant than the official clients
   * [rtmp](https://github.com/brpc/brpc/blob/master/src/brpc/rtmp.h)/[flv](https://en.wikipedia.org/wiki/Flash_Video)/[hls](https://en.wikipedia.org/wiki/HTTP_Live_Streaming), for building [streaming services](https://github.com/brpc/media-server).
   * hadoop_rpc (may be opensourced)
   * [rdma](https://en.wikipedia.org/wiki/Remote_direct_memory_access) support (will be opensourced)
+  * [thrift](thrift.md) support,  thread-safe, more friendly and performant than the official clients.
   * all sorts of protocols used in Baidu: [baidu_std](../cn/baidu_std.md), [streaming_rpc](streaming_rpc.md), hulu_pbrpc, [sofa_pbrpc](https://github.com/baidu/sofa-pbrpc), nova_pbrpc, public_pbrpc, ubrpc, and nshead-based ones.
   * Access protobuf-based protocols with HTTP+json, probably from another language.
   * Build [HA](https://en.wikipedia.org/wiki/High_availability) distributed services using an industrial-grade implementation of [RAFT consensus algorithm](https://raft.github.io) which is opensourced at [braft](https://github.com/brpc/braft)

docs/en/server.md

@@ -300,7 +300,7 @@ Server detects supported protocols automatically, without assignment from users.
 
 - http/1.0 and http/1.1, shown as "http", enabled by default.
 
-- http/2 and grpc, shown as "h2c"(unencrypted) or "h2"(encrypted), enabled by default.
+- http/2 and gRPC, shown as "h2c"(unencrypted) or "h2"(encrypted), enabled by default.
 
 - Protocol of RTMP, shown as "rtmp", enabled by default.