Merge pull request #43853 from YuPengZTE/devCertfile

Automatic merge from submit-queue (batch tested with PRs 42360, 43109, 43737, 43853) Fix typo Signed-off-by: yupengzte <yu.peng36@zte.com.cn> **What this PR does / why we need it**: **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes # **Special notes for your reviewer**: **Release note**: ```release-note ```

Merge pull request #43853 from YuPengZTE/devCertfile
cf7a4f8f · Kubernetes Submit Queue · GitHub · dbca1f75 · bb656f97 · cf7a4f8f
Commit cf7a4f8f authored Mar 31, 2017 by Kubernetes Submit Queue Committed by GitHub Mar 31, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

kubectl_stop.md docs/user-guide/kubectl/kubectl_stop.md +1 -1

overrides.go staging/src/k8s.io/client-go/tools/clientcmd/overrides.go +1 -1

No files found.
--- a/docs/user-guide/kubectl/kubectl_stop.md
+++ b/docs/user-guide/kubectl/kubectl_stop.md
@@ -50,7 +50,7 @@ $ kubectl stop -f path/to/resources
 ```
      --alsologtostderr[=false]: log to standard error as well as files
      --api-version="": The API version to use when talking to the server
-      --certificate-authority="": Path to a cert. file for the certificate authority.
+      --certificate-authority="": Path to a cert file for the certificate authority.
      --client-certificate="": Path to a client certificate file for TLS.
      --client-key="": Path to a client key file for TLS.
      --cluster="": The name of the kubeconfig cluster to use

--- a/staging/src/k8s.io/client-go/tools/clientcmd/overrides.go
+++ b/staging/src/k8s.io/client-go/tools/clientcmd/overrides.go
@@ -163,7 +163,7 @@ func RecommendedClusterOverrideFlags(prefix string) ClusterOverrideFlags {
 	return ClusterOverrideFlags{
 		APIServer:             FlagInfo{prefix + FlagAPIServer, "", "", "The address and port of the Kubernetes API server"},
 		APIVersion:            FlagInfo{prefix + FlagAPIVersion, "", "", "DEPRECATED: The API version to use when talking to the server"},
-		CertificateAuthority:  FlagInfo{prefix + FlagCAFile, "", "", "Path to a cert. file for the certificate authority"},
+		CertificateAuthority:  FlagInfo{prefix + FlagCAFile, "", "", "Path to a cert file for the certificate authority"},
 		InsecureSkipTLSVerify: FlagInfo{prefix + FlagInsecure, "", "false", "If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure"},
 	}
 }