Merge remote-tracking branch 'upstream/master'

keps/sig-cloud-provider/providers/0004-cloud-provider-template.md

@@ -69,7 +69,7 @@ There must be a reasonable amount of user feedback about running Kubernetes for
 
 ### Testgrid Integration
 
-Your cloud provider is reporting conformance test results to TestGrid as per the [Reporting Conformance Test Results to Testgrid KEP](https://github.com/kubernetes/community/blob/master/keps/sig-cloud-provider/0003-testgrid-conformance-e2e.md).
+Your cloud provider is reporting conformance test results to TestGrid as per the [Reporting Conformance Test Results to Testgrid KEP](https://github.com/kubernetes/community/blob/master/keps/sig-cloud-provider/0018-testgrid-conformance-e2e.md).
 
 ### CNCF Certified Kubernetes
 
@@ -77,7 +77,7 @@ Your cloud provider is accepted as part of the [Certified Kubernetes Conformance
 
 ### Documentation
 
-There is documentation on running Kubernetes on your cloud provider as per the [cloud provider documentation KEP](https://github.com/kubernetes/community/blob/master/keps/sig-cloud-provider/0004-cloud-provider-documentation.md).
+There is documentation on running Kubernetes on your cloud provider as per the [cloud provider documentation KEP](https://github.com/kubernetes/community/blob/master/keps/sig-cloud-provider/0019-cloud-provider-documentation.md).
 
 ### Technical Leads are members of the Kubernetes Organization
 

keps/sig-cloud-provider/providers/0020-cloud-provider-alibaba-cloud.md

@@ -74,7 +74,7 @@ As a CNCF Platinum member, Alibaba Cloud is dedicated in providing users with hi
 Usage of aliyun container services can be seen from github issues in the existing alicloud controller manager repo: https://github.com/AliyunContainerService/alicloud-controller-manager/issues
 
 ### Testgrid Integration
- Alibaba cloud provider is reporting conformance test results to TestGrid as per the [Reporting Conformance Test Results to Testgrid KEP](https://github.com/kubernetes/community/blob/master/keps/sig-cloud-provider/0003-testgrid-conformance-e2e.md).
+ Alibaba cloud provider is reporting conformance test results to TestGrid as per the [Reporting Conformance Test Results to Testgrid KEP](https://github.com/kubernetes/community/blob/master/keps/sig-cloud-provider/0018-testgrid-conformance-e2e.md).
  See [report](https://k8s-testgrid.appspot.com/conformance-alibaba-cloud-provider#Alibaba%20Cloud%20Provider,%20v1.10) for more details.
 
 ### CNCF Certified Kubernetes

keps/sig-cluster-lifecycle/0031-20181022-etcdadm.md

@@ -7,11 +7,11 @@ owning-sig: sig-cluster-lifecycle
 #participating-sigs:
 #- sig-apimachinery
 reviewers:
-  - @roberthbailey
+  - "@roberthbailey"
-  - @timothysc
+  - "@timothysc"
 approvers:
-  - @roberthbailey
+  - "@roberthbailey"
-  - @timothysc
+  - "@timothysc"
 editor: TBD
 creation-date: 2018-10-22
 last-updated: 2018-10-22

sig-cluster-lifecycle/charter.md

@@ -34,7 +34,7 @@ The following topics fall under ownership of this SIG:
 - User interface, or user experience, issues other than cluster bootstrapping or management (see [sig-ui](../sig-ui) and  [sig-cli](../sig-cli)).
 - Node related issues (see [sig-node](../sig-node)).
 - Kubernetes control plane issues:
-   - Control plane component related issues (see [sig-apimachinery](../sig-apimachinery)).
+   - Control plane component related issues (see [sig-api-machinery](../sig-api-machinery)).
 
 ## Roles and Organization Management
 

sig-docs/migrated-from-wiki/roadmap-docs.md

@@ -2,7 +2,7 @@
 
 If you'd like to help with documentation, please read the [kubernetes.io site instructions](https://git.k8s.io/kubernetes.github.io/README.md).
 
-If you'd like to contribute an example, please read the [guidelines](https://git.k8s.io/kubernetes/examples/guidelines.md).
+If you'd like to contribute an example, please read the [guidelines](https://git.k8s.io/examples/guidelines.md).
 
 Owners: @kubernetes/docs, @kubernetes/examples