From 6868382072d4f6a796efd88eff085f3e5e43755f Mon Sep 17 00:00:00 2001 From: Jeff Lowdermilk Date: Tue, 10 Nov 2015 11:55:20 -0800 Subject: [PATCH] Reword misleading help text for kubectl patch --- docs/man/man1/kubectl-patch.1 | 2 +- docs/user-guide/kubectl/kubectl.md | 4 ++-- docs/user-guide/kubectl/kubectl_patch.md | 4 ++-- pkg/kubectl/cmd/patch.go | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/man/man1/kubectl-patch.1 b/docs/man/man1/kubectl-patch.1 index d1c465336ac..babe7f1abed 100644 --- a/docs/man/man1/kubectl-patch.1 +++ b/docs/man/man1/kubectl-patch.1 @@ -3,7 +3,7 @@ .SH NAME .PP -kubectl patch \- Update field(s) of a resource by stdin. +kubectl patch \- Update field(s) of a resource using strategic merge patch. .SH SYNOPSIS diff --git a/docs/user-guide/kubectl/kubectl.md b/docs/user-guide/kubectl/kubectl.md index e58285a3605..3446e68e0ae 100644 --- a/docs/user-guide/kubectl/kubectl.md +++ b/docs/user-guide/kubectl/kubectl.md @@ -95,7 +95,7 @@ kubectl * [kubectl label](kubectl_label.md) - Update the labels on a resource * [kubectl logs](kubectl_logs.md) - Print the logs for a container in a pod. * [kubectl namespace](kubectl_namespace.md) - SUPERSEDED: Set and view the current Kubernetes namespace -* [kubectl patch](kubectl_patch.md) - Update field(s) of a resource by stdin. +* [kubectl patch](kubectl_patch.md) - Update field(s) of a resource using strategic merge patch. * [kubectl port-forward](kubectl_port-forward.md) - Forward one or more local ports to a pod. * [kubectl proxy](kubectl_proxy.md) - Run a proxy to the Kubernetes API server * [kubectl replace](kubectl_replace.md) - Replace a resource by filename or stdin. @@ -105,7 +105,7 @@ kubectl * [kubectl stop](kubectl_stop.md) - Deprecated: Gracefully shut down a resource by name or filename. * [kubectl version](kubectl_version.md) - Print the client and server version information. -###### Auto generated by spf13/cobra on 21-Oct-2015 +###### Auto generated by spf13/cobra on 10-Nov-2015 [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/user-guide/kubectl/kubectl.md?pixel)]() diff --git a/docs/user-guide/kubectl/kubectl_patch.md b/docs/user-guide/kubectl/kubectl_patch.md index 5da9456f577..c5063861874 100644 --- a/docs/user-guide/kubectl/kubectl_patch.md +++ b/docs/user-guide/kubectl/kubectl_patch.md @@ -33,7 +33,7 @@ Documentation for other releases can be found at ## kubectl patch -Update field(s) of a resource by stdin. +Update field(s) of a resource using strategic merge patch. ### Synopsis @@ -102,7 +102,7 @@ kubectl patch pod valid-pod -p '{"spec":{"containers":[{"name":"kubernetes-serve * [kubectl](kubectl.md) - kubectl controls the Kubernetes cluster manager -###### Auto generated by spf13/cobra at 2015-09-22 12:53:42.290134655 +0000 UTC +###### Auto generated by spf13/cobra on 10-Nov-2015 [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/user-guide/kubectl/kubectl_patch.md?pixel)]() diff --git a/pkg/kubectl/cmd/patch.go b/pkg/kubectl/cmd/patch.go index 42cc34e606f..0b805339768 100644 --- a/pkg/kubectl/cmd/patch.go +++ b/pkg/kubectl/cmd/patch.go @@ -57,7 +57,7 @@ func NewCmdPatch(f *cmdutil.Factory, out io.Writer) *cobra.Command { cmd := &cobra.Command{ Use: "patch (-f FILENAME | TYPE NAME) -p PATCH", - Short: "Update field(s) of a resource by stdin.", + Short: "Update field(s) of a resource using strategic merge patch.", Long: patch_long, Example: patch_example, Run: func(cmd *cobra.Command, args []string) {