Merge branch 'master' of https://github.com/kentonv/capnproto

c++/src/capnp/compiler/capnpc-capnp.c++

@@ -391,7 +391,7 @@ private:
             indent, field.getName(),
             " :group", genAnnotations(field.getAnnotations(), scope), " {",
             field.hasDiscriminantValue()
-                ? kj::strTree(", union tag = ", field.getDiscriminantValue()) : kj::strTree(),
+                ? kj::strTree("  # union tag = ", field.getDiscriminantValue()) : kj::strTree(),
             "\n",
             genStructFields(group, indent.next()),
             indent, "}\n");

c++/src/capnp/rpc.capnp

@@ -42,7 +42,7 @@
 #
 # Cap'n Proto does not distinguish between "clients" and "servers" -- this is up to the application.
 # Either end of any connection can potentially hold capabilities pointing to the other end, and
-# can call methods on those capabilities.  In the doc comments below, we user the words "sender"
+# can call methods on those capabilities.  In the doc comments below, we use the words "sender"
 # and "receiver".  These refer to the sender and receiver of an instance of the struct or field
 # being documented.  Sometimes we refer to a "third-party" which is neither the sender nor the
 # receiver.