Skip to content

Commit 933c855

Browse files
committed
Merge pull request kubernetes#12354 from mjibson/replace-cascade-fix
Fix flag docs for replace cascade
2 parents a0330fe + 2c0f32e commit 933c855

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

docs/man/man1/kubectl-replace.1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Please refer to the models in
2828
.SH OPTIONS
2929
.PP
3030
\fB\-\-cascade\fP=false
31-
Only relevant during a force replace. If true, cascade the deletion of the resources managed by this resource (e.g. Pods created by a ReplicationController). Default true.
31+
Only relevant during a force replace. If true, cascade the deletion of the resources managed by this resource (e.g. Pods created by a ReplicationController).
3232

3333
.PP
3434
\fB\-f\fP, \fB\-\-filename\fP=[]

docs/user-guide/kubectl/kubectl_replace.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ kubectl replace --force -f ./pod.json
6969
### Options
7070

7171
```
72-
--cascade[=false]: Only relevant during a force replace. If true, cascade the deletion of the resources managed by this resource (e.g. Pods created by a ReplicationController). Default true.
72+
--cascade[=false]: Only relevant during a force replace. If true, cascade the deletion of the resources managed by this resource (e.g. Pods created by a ReplicationController).
7373
-f, --filename=[]: Filename, directory, or URL to file to use to replace the resource.
7474
--force[=false]: Delete and re-create the specified resource
7575
--grace-period=-1: Only relevant during a force replace. Period of time in seconds given to the old resource to terminate gracefully. Ignored if negative.
@@ -111,7 +111,7 @@ kubectl replace --force -f ./pod.json
111111

112112
* [kubectl](kubectl.md) - kubectl controls the Kubernetes cluster manager
113113

114-
###### Auto generated by spf13/cobra at 2015-08-09 17:46:44.43991637 +0000 UTC
114+
###### Auto generated by spf13/cobra at 2015-08-10 16:02:35.925298963 +0000 UTC
115115

116116
<!-- BEGIN MUNGE: GENERATED_ANALYTICS -->
117117
[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/user-guide/kubectl/kubectl_replace.md?pixel)]()

pkg/kubectl/cmd/replace.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ func NewCmdReplace(f *cmdutil.Factory, out io.Writer) *cobra.Command {
7070
kubectl.AddJsonFilenameFlag(cmd, usage)
7171
cmd.MarkFlagRequired("filename")
7272
cmd.Flags().Bool("force", false, "Delete and re-create the specified resource")
73-
cmd.Flags().Bool("cascade", false, "Only relevant during a force replace. If true, cascade the deletion of the resources managed by this resource (e.g. Pods created by a ReplicationController). Default true.")
73+
cmd.Flags().Bool("cascade", false, "Only relevant during a force replace. If true, cascade the deletion of the resources managed by this resource (e.g. Pods created by a ReplicationController).")
7474
cmd.Flags().Int("grace-period", -1, "Only relevant during a force replace. Period of time in seconds given to the old resource to terminate gracefully. Ignored if negative.")
7575
cmd.Flags().Duration("timeout", 0, "Only relevant during a force replace. The length of time to wait before giving up on a delete of the old resource, zero means determine a timeout from the size of the object")
7676
cmdutil.AddOutputFlagsForMutation(cmd)

0 commit comments

Comments
 (0)