Merge branch 'master' into bug3044

README.md

@@ -128,7 +128,8 @@ We also released a Debian package and Windows installer on our [releases page](h
 ## Quickstart
 
 Here's a brief demo of Minikube usage.
-If you want to change the VM driver add the appropriate `--vm-driver=xxx` flag to `minikube start`. Minikube supports
+- If you want to change the container runtime, network details, consult notes from your container runtime provider.
+- If you want to change the VM driver add the appropriate `--vm-driver=xxx` flag to `minikube start`. Minikube supports
 the following drivers:
 
 * virtualbox
@@ -138,7 +139,7 @@ the following drivers:
 * [hyperkit](https://github.com/kubernetes/minikube/blob/master/docs/drivers.md#hyperkit-driver)
 * [xhyve](https://github.com/kubernetes/minikube/blob/master/docs/drivers.md#xhyve-driver)
 * [hyperv](https://github.com/kubernetes/minikube/blob/master/docs/drivers.md#hyperV-driver)
-* none (**Linux-only**) - this driver can be used to run the Kubernetes cluster components on the host instead of in a VM. This can be useful for CI workloads which do not support nested virtualization.
+* none (**Linux + docker daemon as container runtime only**) - this driver can be used to run the Kubernetes cluster components on the host instead of in a VM. This can be useful for CI workloads which do not support nested virtualization.
 
 ```shell
 $ minikube start

cmd/minikube/cmd/completion.go

@@ -106,8 +106,7 @@ func GenerateBashCompletion(w io.Writer, cmd *cobra.Command) error {
 }
 
 func GenerateZshCompletion(out io.Writer, cmd *cobra.Command) error {
-	zsh_initialization := `
-#compdef minikube
+	zsh_initialization := `#compdef minikube
 
 __minikube_bash_source() {
 	alias shopt=':'

docs/contributors/adding_driver.md

@@ -10,7 +10,7 @@ create a new docker machine driver.
 First of all, before started, you need to understand your driver in terms of:
 
 - Which operating system is your driver running on?
-- Is your driver builtin the minikube binary or triggerred through RPC?
+- Is your driver builtin the minikube binary or triggered through RPC?
 - How to translate minikube config to driver config?
 - If builtin, how to instantiate the driver instance?
 

pkg/minikube/registry/registry.go

@@ -60,7 +60,7 @@ type DriverDef struct {
 	Name string
 
 	// BuiltIn indicates if the driver is builtin minikube binary, or the driver is
-	// triggerred through RPC.
+	// triggered through RPC.
 	Builtin bool
 
 	// ConfigCreator generate a raw driver object by minikube's machine config.

pkg/util/downloader.go

@@ -81,7 +81,7 @@ func (f DefaultDownloader) CacheMinikubeISOFromURL(isoURL string) error {
 }
 
 func (f DefaultDownloader) ShouldCacheMinikubeISO(isoURL string) bool {
-	// store the miniube-iso inside the .minikube dir
+	// store the minikube-iso inside the .minikube dir
 
 	urlObj, err := url.Parse(isoURL)
 	if err != nil {

pkg/util/kubeconfig/config.go

@@ -220,7 +220,7 @@ func decode(data []byte) (*api.Config, error) {
 	return config.(*api.Config), nil
 }
 
-// GetKubeConfigStatus verifys the ip stored in kubeconfig.
+// GetKubeConfigStatus verifies the ip stored in kubeconfig.
 func GetKubeConfigStatus(ip net.IP, filename string, machineName string) (bool, error) {
 	if ip == nil {
 		return false, fmt.Errorf("Error, empty ip passed")