Merge branch 'master' of https://github.com/v2ray/v2ray-core

proxy/http/server.go

@@ -21,7 +21,7 @@ import (
 	"v2ray.com/core/transport/internet"
 )
 
-// Server is a HTTP proxy server.
+// Server is an HTTP proxy server.
 type Server struct {
 	config *ServerConfig
 	v      *core.Instance

proxy/proxy.go

@@ -41,7 +41,7 @@ type UserManager interface {
 	// AddUser adds a new user.
 	AddUser(context.Context, *protocol.User) error
 
-	// RemoveUser removes an user by email.
+	// RemoveUser removes a user by email.
 	RemoveUser(context.Context, string) error
 }
 

proxy/vmess/account.pb.go

@@ -17,7 +17,7 @@ var _ = math.Inf
 const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
 
 type Account struct {
-	// ID of the account, in the form of an UUID, e.g., "66ad4540-b58c-4ad2-9926-ea63445a9b57".
+	// ID of the account, in the form of a UUID, e.g., "66ad4540-b58c-4ad2-9926-ea63445a9b57".
 	Id string `protobuf:"bytes,1,opt,name=id" json:"id,omitempty"`
 	// Number of alternative IDs. Client and server must share the same number.
 	AlterId uint32 `protobuf:"varint,2,opt,name=alter_id,json=alterId" json:"alter_id,omitempty"`

proxy/vmess/account.proto

@@ -9,7 +9,7 @@ option java_multiple_files = true;
 import "v2ray.com/core/common/protocol/headers.proto";
 
 message Account {
-  // ID of the account, in the form of an UUID, e.g., "66ad4540-b58c-4ad2-9926-ea63445a9b57".
+  // ID of the account, in the form of a UUID, e.g., "66ad4540-b58c-4ad2-9926-ea63445a9b57".
   string id = 1;
   // Number of alternative IDs. Client and server must share the same number.
   uint32 alter_id = 2;