Merge master into release-1.10

docs/concepts/cluster-administration/device-plugins.md

@@ -139,7 +139,7 @@ For examples of device plugin implementations, see:
     * it requires using [nvidia-docker 2.0](https://github.com/NVIDIA/nvidia-docker) which allows you to run GPU enabled docker containers
 * The [NVIDIA GPU device plugin for COS base OS](https://github.com/GoogleCloudPlatform/container-engine-accelerators/tree/master/cmd/nvidia_gpu).
 * The [RDMA device plugin](https://github.com/hustcat/k8s-rdma-device-plugin)
-
+* The [Solarflare device plugin](https://github.com/vikaschoudhary16/sfc-device-plugin)
 {% endcapture %}
 
 {% include templates/concept.md %}

docs/concepts/cluster-administration/networking.md

@@ -216,7 +216,7 @@ The Nuage platform uses overlays to provide seamless policy-based networking bet
 
 ### OpenVSwitch
 
-[OpenVSwitch](/docs/admin/ovs-networking) is a somewhat more mature but also
+[OpenVSwitch](https://www.openvswitch.org/) is a somewhat more mature but also
 complicated way to build an overlay network.  This is endorsed by several of the
 "Big Shops" for networking.