Merge branch 'master' into release-1.8

docs/admin/authentication.md

@@ -549,7 +549,7 @@ checked.
 Keystone authentication is enabled by passing the `--experimental-keystone-url=<AuthURL>`
 option to the API server during startup. The plugin is implemented in
 `plugin/pkg/auth/authenticator/password/keystone/keystone.go` and currently uses
-basic auth to verify used by username and password.
+basic auth to verify user by username and password.
 
 If you have configured self-signed certificates for the Keystone server,
 you may need to set the `--experimental-keystone-ca-file=SOMEFILE` option when

docs/admin/authorization/rbac.md

@@ -102,7 +102,7 @@ This allows administrators to define a set of common roles for the entire cluste
 then reuse them within multiple namespaces.
 
 For instance, even though the following `RoleBinding` refers to a `ClusterRole`,
-"dave" (the subject) will only be able read secrets in the "development"
+"dave" (the subject) will only be able to read secrets in the "development"
 namespace (the namespace of the `RoleBinding`).
 
 ```yaml
@@ -181,7 +181,7 @@ metadata:
   name: configmap-updater
 rules:
 - apiGroups: [""]
-  resources: ["configmap"]
+  resources: ["configmaps"]
   resourceNames: ["my-configmap"]
   verbs: ["update", "get"]
 ```
@@ -258,7 +258,7 @@ A `RoleBinding` or `ClusterRoleBinding` binds a role to *subjects*.
 Subjects can be groups, users or service accounts.
 
 Users are represented by strings.  These can be plain usernames, like
-"alice", email-style names, like "bob@example.com", or numeric ids
+"alice", email-style names, like "bob@example.com", or numeric IDs
 represented as a string.  It is up to the Kubernetes admin to configure
 the [authentication modules](/docs/admin/authentication/) to produce
 usernames in the desired format.  The RBAC authorization system does

docs/admin/kube-proxy.md

@@ -11,7 +11,7 @@ notitle: true
 
 The Kubernetes network proxy runs on each node. This
 reflects services as defined in the Kubernetes API on each node and can do simple
-TCP,UDP stream forwarding or round robin TCP,UDP forwarding across a set of backends.
+TCP, UDP stream forwarding or round robin TCP, UDP forwarding across a set of backends.
 Service cluster IPs and ports are currently found through Docker-links-compatible
 environment variables specifying ports opened by the service proxy. There is an optional
 addon that provides cluster DNS for these cluster IPs. The user must create a service