Fix spelling mistake: conjonction -> conjunction

doc/VitessApi.md

@@ -79,11 +79,11 @@ The following table lists the methods in each group and links to more detail abo
 <tr><td class="api-method-summary-group" colspan="2">v3 API (alpha)</td></tr>
 <tr>
 <td><code><a href="#execute">Execute</a></code></td>
-<td>Execute tries to route the query to the right shard. It depends on the query and bind variables to provide enough information in conjonction with the vindexes to route the query.</td>
+<td>Execute tries to route the query to the right shard. It depends on the query and bind variables to provide enough information in conjunction with the vindexes to route the query.</td>
 </tr>
 <tr>
 <td><code><a href="#streamexecute">StreamExecute</a></code></td>
-<td>StreamExecute executes a streaming query based on shards. It depends on the query and bind variables to provide enough information in conjonction with the vindexes to route the query. Use this method if the query returns a large number of rows.</td>
+<td>StreamExecute executes a streaming query based on shards. It depends on the query and bind variables to provide enough information in conjunction with the vindexes to route the query. Use this method if the query returns a large number of rows.</td>
 </tr>
 </table>
 ##Range-based Sharding
@@ -572,7 +572,7 @@ GetSrvKeyspace returns a SrvKeyspace object (as seen by this vtgate). This metho
 ##v3 API (alpha)
 ### Execute
 
-Execute tries to route the query to the right shard. It depends on the query and bind variables to provide enough information in conjonction with the vindexes to route the query.
+Execute tries to route the query to the right shard. It depends on the query and bind variables to provide enough information in conjunction with the vindexes to route the query.
 
 #### Request
 
@@ -604,7 +604,7 @@ Execute tries to route the query to the right shard. It depends on the query and
 
 ### StreamExecute
 
-StreamExecute executes a streaming query based on shards. It depends on the query and bind variables to provide enough information in conjonction with the vindexes to route the query. Use this method if the query returns a large number of rows.
+StreamExecute executes a streaming query based on shards. It depends on the query and bind variables to provide enough information in conjunction with the vindexes to route the query. Use this method if the query returns a large number of rows.
 
 #### Request
 

proto/vtgateservice.proto

@@ -32,19 +32,19 @@ import "query.proto";
 service Vitess {
   // Execute tries to route the query to the right shard.
   // It depends on the query and bind variables to provide enough
-  // information in conjonction with the vindexes to route the query.
+  // information in conjunction with the vindexes to route the query.
   // API group: v3
   rpc Execute(vtgate.ExecuteRequest) returns (vtgate.ExecuteResponse) {};
 
   // ExecuteBatch tries to route the list of queries on the right shards.
   // It depends on the query and bind variables to provide enough
-  // information in conjonction with the vindexes to route the query.
+  // information in conjunction with the vindexes to route the query.
   // API group: v3
   rpc ExecuteBatch(vtgate.ExecuteBatchRequest) returns (vtgate.ExecuteBatchResponse) {};
 
   // StreamExecute executes a streaming query based on shards.
   // It depends on the query and bind variables to provide enough
-  // information in conjonction with the vindexes to route the query.
+  // information in conjunction with the vindexes to route the query.
   // Use this method if the query returns a large number of rows.
   // API group: v3
   rpc StreamExecute(vtgate.StreamExecuteRequest) returns (stream vtgate.StreamExecuteResponse) {};

py/vtproto/vtgateservice_pb2_grpc.py

@@ -136,7 +136,7 @@ class VitessServicer(object):
   def Execute(self, request, context):
     """Execute tries to route the query to the right shard.
     It depends on the query and bind variables to provide enough
-    information in conjonction with the vindexes to route the query.
+    information in conjunction with the vindexes to route the query.
     API group: v3
     """
     context.set_code(grpc.StatusCode.UNIMPLEMENTED)
@@ -146,7 +146,7 @@ def Execute(self, request, context):
   def ExecuteBatch(self, request, context):
     """ExecuteBatch tries to route the list of queries on the right shards.
     It depends on the query and bind variables to provide enough
-    information in conjonction with the vindexes to route the query.
+    information in conjunction with the vindexes to route the query.
     API group: v3
     """
     context.set_code(grpc.StatusCode.UNIMPLEMENTED)
@@ -156,7 +156,7 @@ def ExecuteBatch(self, request, context):
   def StreamExecute(self, request, context):
     """StreamExecute executes a streaming query based on shards.
     It depends on the query and bind variables to provide enough
-    information in conjonction with the vindexes to route the query.
+    information in conjunction with the vindexes to route the query.
     Use this method if the query returns a large number of rows.
     API group: v3
     """