Commit 5f10b706 authored by k8s-merge-robot's avatar k8s-merge-robot

Merge pull request #17766 from hurf/doc_nits

Auto commit by PR queue bot
parents 7cc83b34 8b6ef016
...@@ -13,7 +13,7 @@ kubectl attach \- Attach to a running container. ...@@ -13,7 +13,7 @@ kubectl attach \- Attach to a running container.
.SH DESCRIPTION .SH DESCRIPTION
.PP .PP
Attach to a a process that is already running inside an existing container. Attach to a process that is already running inside an existing container.
.SH OPTIONS .SH OPTIONS
......
...@@ -31,7 +31,7 @@ An autoscaler can automatically increase or decrease number of pods deployed wit ...@@ -31,7 +31,7 @@ An autoscaler can automatically increase or decrease number of pods deployed wit
.PP .PP
\fB\-f\fP, \fB\-\-filename\fP=[] \fB\-f\fP, \fB\-\-filename\fP=[]
Filename, directory, or URL to a file identifying the resource to get from a server. Filename, directory, or URL to a file identifying the resource to autoscale.
.PP .PP
\fB\-\-generator\fP="horizontalpodautoscaler/v1beta1" \fB\-\-generator\fP="horizontalpodautoscaler/v1beta1"
......
...@@ -38,7 +38,7 @@ Attach to a running container. ...@@ -38,7 +38,7 @@ Attach to a running container.
### Synopsis ### Synopsis
Attach to a a process that is already running inside an existing container. Attach to a process that is already running inside an existing container.
``` ```
kubectl attach POD -c CONTAINER kubectl attach POD -c CONTAINER
...@@ -98,7 +98,7 @@ $ kubectl attach 123456-7890 -c ruby-container -i -t ...@@ -98,7 +98,7 @@ $ kubectl attach 123456-7890 -c ruby-container -i -t
* [kubectl](kubectl.md) - kubectl controls the Kubernetes cluster manager * [kubectl](kubectl.md) - kubectl controls the Kubernetes cluster manager
###### Auto generated by spf13/cobra on 24-Nov-2015 ###### Auto generated by spf13/cobra on 25-Nov-2015
<!-- BEGIN MUNGE: GENERATED_ANALYTICS --> <!-- BEGIN MUNGE: GENERATED_ANALYTICS -->
[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/user-guide/kubectl/kubectl_attach.md?pixel)]() [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/user-guide/kubectl/kubectl_attach.md?pixel)]()
......
...@@ -62,7 +62,7 @@ $ kubectl autoscale rc foo --max=5 --cpu-percent=80 ...@@ -62,7 +62,7 @@ $ kubectl autoscale rc foo --max=5 --cpu-percent=80
``` ```
--cpu-percent=-1: The target average CPU utilization (represented as a percent of requested CPU) over all the pods. If it's not specified or negative, the server will apply a default value. --cpu-percent=-1: The target average CPU utilization (represented as a percent of requested CPU) over all the pods. If it's not specified or negative, the server will apply a default value.
--dry-run[=false]: If true, only print the object that would be sent, without creating it. --dry-run[=false]: If true, only print the object that would be sent, without creating it.
-f, --filename=[]: Filename, directory, or URL to a file identifying the resource to get from a server. -f, --filename=[]: Filename, directory, or URL to a file identifying the resource to autoscale.
--generator="horizontalpodautoscaler/v1beta1": The name of the API generator to use. Currently there is only 1 generator. --generator="horizontalpodautoscaler/v1beta1": The name of the API generator to use. Currently there is only 1 generator.
--max=-1: The upper limit for the number of pods that can be set by the autoscaler. Required. --max=-1: The upper limit for the number of pods that can be set by the autoscaler. Required.
--min=-1: The lower limit for the number of pods that can be set by the autoscaler. If it's not specified or negative, the server will apply a default value. --min=-1: The lower limit for the number of pods that can be set by the autoscaler. If it's not specified or negative, the server will apply a default value.
...@@ -108,7 +108,7 @@ $ kubectl autoscale rc foo --max=5 --cpu-percent=80 ...@@ -108,7 +108,7 @@ $ kubectl autoscale rc foo --max=5 --cpu-percent=80
* [kubectl](kubectl.md) - kubectl controls the Kubernetes cluster manager * [kubectl](kubectl.md) - kubectl controls the Kubernetes cluster manager
###### Auto generated by spf13/cobra on 24-Nov-2015 ###### Auto generated by spf13/cobra on 25-Nov-2015
<!-- BEGIN MUNGE: GENERATED_ANALYTICS --> <!-- BEGIN MUNGE: GENERATED_ANALYTICS -->
[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/user-guide/kubectl/kubectl_autoscale.md?pixel)]() [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/user-guide/kubectl/kubectl_autoscale.md?pixel)]()
......
...@@ -57,7 +57,7 @@ func NewCmdAttach(f *cmdutil.Factory, cmdIn io.Reader, cmdOut, cmdErr io.Writer) ...@@ -57,7 +57,7 @@ func NewCmdAttach(f *cmdutil.Factory, cmdIn io.Reader, cmdOut, cmdErr io.Writer)
cmd := &cobra.Command{ cmd := &cobra.Command{
Use: "attach POD -c CONTAINER", Use: "attach POD -c CONTAINER",
Short: "Attach to a running container.", Short: "Attach to a running container.",
Long: "Attach to a a process that is already running inside an existing container.", Long: "Attach to a process that is already running inside an existing container.",
Example: attach_example, Example: attach_example,
Run: func(cmd *cobra.Command, args []string) { Run: func(cmd *cobra.Command, args []string) {
cmdutil.CheckErr(options.Complete(f, cmd, args)) cmdutil.CheckErr(options.Complete(f, cmd, args))
......
...@@ -61,7 +61,7 @@ func NewCmdAutoscale(f *cmdutil.Factory, out io.Writer) *cobra.Command { ...@@ -61,7 +61,7 @@ func NewCmdAutoscale(f *cmdutil.Factory, out io.Writer) *cobra.Command {
cmd.Flags().Int("cpu-percent", -1, fmt.Sprintf("The target average CPU utilization (represented as a percent of requested CPU) over all the pods. If it's not specified or negative, the server will apply a default value.")) cmd.Flags().Int("cpu-percent", -1, fmt.Sprintf("The target average CPU utilization (represented as a percent of requested CPU) over all the pods. If it's not specified or negative, the server will apply a default value."))
cmd.Flags().String("name", "", "The name for the newly created object. If not specified, the name of the input resource will be used.") cmd.Flags().String("name", "", "The name for the newly created object. If not specified, the name of the input resource will be used.")
cmd.Flags().Bool("dry-run", false, "If true, only print the object that would be sent, without creating it.") cmd.Flags().Bool("dry-run", false, "If true, only print the object that would be sent, without creating it.")
usage := "Filename, directory, or URL to a file identifying the resource to get from a server." usage := "Filename, directory, or URL to a file identifying the resource to autoscale."
kubectl.AddJsonFilenameFlag(cmd, &filenames, usage) kubectl.AddJsonFilenameFlag(cmd, &filenames, usage)
cmdutil.AddApplyAnnotationFlags(cmd) cmdutil.AddApplyAnnotationFlags(cmd)
return cmd return cmd
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment