resolving conflicts

content/en/docs/reference/access-authn-authz/admission-controllers.md

@@ -706,8 +706,8 @@ kind: Namespace
 metadata:
   name: apps-that-need-nodes-exclusively
   annotations:
-    scheduler.alpha.kubernetes.io/defaultTolerations: '{"operator": "Exists", "effect": "NoSchedule", "key": "dedicated-node"}'
-    scheduler.alpha.kubernetes.io/tolerationsWhitelist: '{"operator": "Exists", "effect": "NoSchedule", "key": "dedicated-node"}'
+    scheduler.alpha.kubernetes.io/defaultTolerations: '[{"operator": "Exists", "effect": "NoSchedule", "key": "dedicated-node"}]'
+    scheduler.alpha.kubernetes.io/tolerationsWhitelist: '[{"operator": "Exists", "effect": "NoSchedule", "key": "dedicated-node"}]'
 ```
 
 ### Priority {#priority}
@@ -793,4 +793,4 @@ phase, and therefore is the last admission controller to run.
 in the mutating phase.
 
     For earlier versions, there was no concept of validating versus mutating and the
-admission controllers ran in the exact order specified.
+admission controllers ran in the exact order specified.

content/en/docs/reference/issues-security/security.md

@@ -19,7 +19,7 @@ This page describes Kubernetes security and disclosure information.
 
 Join the [kubernetes-security-announce](https://groups.google.com/forum/#!forum/kubernetes-security-announce) group for emails about security and major API announcements.
 
-You can also subscribe to an RSS feed of the above using [this link](https://groups.google.com/forum/feed/kubernetes-announce/msgs/rss_v2_0.xml?num=50).
+You can also subscribe to an RSS feed of the above using [this link](https://groups.google.com/forum/feed/kubernetes-security-announce/msgs/rss_v2_0.xml?num=50).
 
 ## Report a Vulnerability
 

content/en/docs/reference/kubectl/cheatsheet.md

@@ -166,6 +166,10 @@ kubectl get pv --sort-by=.spec.capacity.storage
 kubectl get pods --selector=app=cassandra -o \
   jsonpath='{.items[*].metadata.labels.version}'
 
+# Retrieve the value of a key with dots, e.g. 'ca.crt'
+kubectl get configmap myconfig \
+  -o jsonpath='{.data.ca\.crt}'
+
 # Get all worker nodes (use a selector to exclude results that have a label
 # named 'node-role.kubernetes.io/master')
 kubectl get node --selector='!node-role.kubernetes.io/master'

content/en/docs/reference/scheduling/config.md

@@ -126,7 +126,7 @@ extension points:
 - `NodeResourcesFit`: Checks if the node has all the resources that the Pod is
   requesting.
   Extension points: `PreFilter`, `Filter`.
-- `NodeResourcesBallancedAllocation`: Favors nodes that would obtain a more
+- `NodeResourcesBalancedAllocation`: Favors nodes that would obtain a more
   balanced resource usage if the Pod is scheduled there.
   Extension points: `Score`.
 - `NodeResourcesLeastAllocated`: Favors nodes that have a low allocation of

content/en/docs/reference/using-api/api-concepts.md

@@ -756,6 +756,11 @@ quorum read to be served.
 | resourceVersionMatch=NotOlderThan[^1] | limit="n", continue unset     | Invalid               | Any                                       | Not older than                         |
 
 [^1]: If the server does not honor the `resourceVersionMatch` parameter, it is treated as if it is unset.
+| paging                          | resourceVersion unset | resourceVersion="0"                            | resourceVersion="{value other than 0}" |
+|---------------------------------|-----------------------|------------------------------------------------|----------------------------------------|
+| limit unset                     | Most Recent           | Any                                            | Not older than                         |
+| limit="n", continue unset       | Most Recent           | Any                                            | Exact                                  |
+| limit="n", continue="\<token\>" | Continue Token, Exact | Invalid, but treated as Continue Token, Exact  | Invalid, HTTP `400 Bad Request`        |
 
 The meaning of the get and list semantics are: