merge upstream master

content/en/docs/tasks/administer-cluster/dns-custom-nameservers.md

@@ -42,9 +42,9 @@ with the flag `--cluster-domain=<default-local-domain>`.
 The DNS server supports forward lookups (A records), port lookups (SRV records), reverse IP address lookups (PTR records),
 and more. For more information see [DNS for Services and Pods] (/docs/concepts/services-networking/dns-pod-service/).
 
-When running a Pod, kubelet prepends the cluster DNS server and searches
-paths to the node's DNS settings.  If the node is able to resolve DNS names
-specific to the larger environment, Pods should also be able to resolve.
+If a Pod's `dnsPolicy` is set to "`default`", it inherits the name resolution
+configuration from the node that the Pod runs on. The Pod's DNS resolution
+should behave the same as the node.
 But see [Known issues](/docs/tasks/administer-cluster/dns-debugging-resolution/#known-issues).
 
 If you don't want this, or if you want a different DNS config for pods, you can

content/en/docs/tasks/administer-cluster/network-policy-provider/weave-network-policy.md

@@ -33,7 +33,7 @@ Verify that the weave works.
 Enter the following command:
 
 ```shell
-kubectl get po -n kube-system -o wide
+kubectl get pods -n kube-system -o wide
 ```
 
 The output is similar to this: