Skip to content

Commit

Permalink
Update manpages to reflect 2015.2 rename to 2015.5
Browse files Browse the repository at this point in the history
  • Loading branch information
terminalmage authored and basepi committed May 6, 2015
1 parent cc673b4 commit d6b62f7
Show file tree
Hide file tree
Showing 13 changed files with 713 additions and 399 deletions.
2 changes: 1 addition & 1 deletion doc/man/salt-api.1
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
.TH "SALT-API" "1" "April 21, 2015" "2015.5.0rc2-143-g32ef5ca" "Salt"
.TH "SALT-API" "1" "May 06, 2015" "2015.5.0" "Salt"
.SH NAME
salt-api \- salt-api Command
.
Expand Down
2 changes: 1 addition & 1 deletion doc/man/salt-call.1
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
.TH "SALT-CALL" "1" "April 14, 2015" "2014.7.4-180-gc0d1bdd" "Salt"
.TH "SALT-CALL" "1" "May 06, 2015" "2015.5.0" "Salt"
.SH NAME
salt-call \- salt-call Documentation
.
Expand Down
2 changes: 1 addition & 1 deletion doc/man/salt-cloud.1
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
.TH "SALT-CLOUD" "1" "April 21, 2015" "2015.5.0rc2-143-g32ef5ca" "Salt"
.TH "SALT-CLOUD" "1" "May 06, 2015" "2015.5.0" "Salt"
.SH NAME
salt-cloud \- Salt Cloud Command
.
Expand Down
2 changes: 1 addition & 1 deletion doc/man/salt-cp.1
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
.TH "SALT-CP" "1" "March 09, 2015" "2015.5.0rc1-133-g24fa806" "Salt"
.TH "SALT-CP" "1" "May 06, 2015" "2015.5.0" "Salt"
.SH NAME
salt-cp \- salt-cp Documentation
.
Expand Down
49 changes: 48 additions & 1 deletion doc/man/salt-key.1
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
.TH "SALT-KEY" "1" "March 09, 2015" "2015.5.0rc1-133-g24fa806" "Salt"
.TH "SALT-KEY" "1" "May 06, 2015" "2015.5.0" "Salt"
.SH NAME
salt-key \- salt-key Documentation
.
Expand Down Expand Up @@ -70,6 +70,17 @@ on most systems is \fB/etc/salt\fP\&.
.UNINDENT
.INDENT 0.0
.TP
.B \-u USER, \-\-user=USER
Specify user to run salt\-key
.UNINDENT
.INDENT 0.0
.TP
.B \-\-hard\-crash
Raise any original exception rather than exiting gracefully. Default is
False.
.UNINDENT
.INDENT 0.0
.TP
.B \-q, \-\-quiet
Suppress output
.UNINDENT
Expand All @@ -78,6 +89,13 @@ Suppress output
.B \-y, \-\-yes
Answer \(aqYes\(aq to all questions presented, defaults to False
.UNINDENT
.INDENT 0.0
.TP
.B \-\-rotate\-aes\-key=ROTATE_AES_KEY
Setting this to False prevents the master from refreshing the key session
when keys are deleted or rejected, this lowers the security of the key
deletion/rejection operation. Default is True.
.UNINDENT
.SS Logging Options
.sp
Logging options which override any settings defined on the configuration files.
Expand Down Expand Up @@ -246,6 +264,35 @@ the \(aq\-\-gen\-keys\(aq option, the key size must be 2048 or
higher, otherwise it will be rounded up to 2048. The
default is 2048.
.UNINDENT
.INDENT 0.0
.TP
.B \-\-gen\-signature
Create a signature file of the masters public\-key named
master_pubkey_signature. The signature can be send to a minion in the
masters auth\-reply and enables the minion to verify the masters public\-key
cryptographically. This requires a new signing\-key\- pair which can be
auto\-created with the \-\-auto\-create parameter.
.UNINDENT
.INDENT 0.0
.TP
.B \-\-priv=PRIV
The private\-key file to create a signature with
.UNINDENT
.INDENT 0.0
.TP
.B \-\-signature\-path=SIGNATURE_PATH
The path where the signature file should be written
.UNINDENT
.INDENT 0.0
.TP
.B \-\-pub=PUB
The public\-key file to create a signature for
.UNINDENT
.INDENT 0.0
.TP
.B \-\-auto\-create
Auto\-create a signing key\-pair if it does not yet exist
.UNINDENT
.SH SEE ALSO
.sp
\fIsalt(7)\fP
Expand Down
2 changes: 1 addition & 1 deletion doc/man/salt-master.1
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
.TH "SALT-MASTER" "1" "March 09, 2015" "2015.5.0rc1-133-g24fa806" "Salt"
.TH "SALT-MASTER" "1" "May 06, 2015" "2015.5.0" "Salt"
.SH NAME
salt-master \- salt-master Documentation
.
Expand Down
2 changes: 1 addition & 1 deletion doc/man/salt-minion.1
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
.TH "SALT-MINION" "1" "March 09, 2015" "2015.5.0rc1-133-g24fa806" "Salt"
.TH "SALT-MINION" "1" "May 06, 2015" "2015.5.0" "Salt"
.SH NAME
salt-minion \- salt-minion Documentation
.
Expand Down
8 changes: 7 additions & 1 deletion doc/man/salt-run.1
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
.TH "SALT-RUN" "1" "March 09, 2015" "2015.5.0rc1-133-g24fa806" "Salt"
.TH "SALT-RUN" "1" "May 06, 2015" "2015.5.0" "Salt"
.SH NAME
salt-run \- salt-run Documentation
.
Expand Down Expand Up @@ -80,6 +80,12 @@ query the minions and check on running jobs. Default: 1
.UNINDENT
.INDENT 0.0
.TP
.B \-\-hard\-crash
Raise any original exception rather than exiting gracefully. Default is
False.
.UNINDENT
.INDENT 0.0
.TP
.B \-d, \-\-doc, \-\-documentation
Display documentation for runners, pass a module or a runner to see
documentation on only that module/runner.
Expand Down
2 changes: 1 addition & 1 deletion doc/man/salt-ssh.1
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
.TH "SALT-SSH" "1" "March 09, 2015" "2015.5.0rc1-133-g24fa806" "Salt"
.TH "SALT-SSH" "1" "May 06, 2015" "2015.5.0" "Salt"
.SH NAME
salt-ssh \- salt-ssh Documentation
.
Expand Down
2 changes: 1 addition & 1 deletion doc/man/salt-syndic.1
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
.TH "SALT-SYNDIC" "1" "March 09, 2015" "2015.5.0rc1-133-g24fa806" "Salt"
.TH "SALT-SYNDIC" "1" "May 06, 2015" "2015.5.0" "Salt"
.SH NAME
salt-syndic \- salt-syndic Documentation
.
Expand Down
2 changes: 1 addition & 1 deletion doc/man/salt-unity.1
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
.TH "SALT-UNITY" "1" "March 09, 2015" "2015.5.0rc1-133-g24fa806" "Salt"
.TH "SALT-UNITY" "1" "May 06, 2015" "2015.5.0" "Salt"
.SH NAME
salt-unity \- salt-unity Command
.
Expand Down
8 changes: 4 additions & 4 deletions doc/man/salt.1
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
.TH "SALT" "1" "March 09, 2015" "2015.5.0rc1-133-g24fa806" "Salt"
.TH "SALT" "1" "May 06, 2015" "2015.5.0" "Salt"
.SH NAME
salt \- salt
.
Expand Down Expand Up @@ -98,9 +98,9 @@ New in version 0.17.

.sp
Override the configured \fBstate_output\fP value for minion output. One of
\fBfull\fP, \fBterse\fP, \fBmixed\fP, \fBchanges\fP or \fBfilter\fP\&.
Default: \fBfull\fB\&.

\fBfull\fP, \fBterse\fP, \fBmixed\fP, \fBchanges\fP or \fBfilter\fP\&. Default:
\fBfull\fP\&.
.UNINDENT
.INDENT 0.0
.TP
.B \-\-subset=SUBSET
Expand Down

0 comments on commit d6b62f7

Please sign in to comment.