Skip to content

Commit

Permalink
update man pages for 0.9.7
Browse files Browse the repository at this point in the history
  • Loading branch information
thatch45 committed Feb 15, 2012
1 parent f5b19e4 commit 5450585
Show file tree
Hide file tree
Showing 9 changed files with 1,224 additions and 531 deletions.
4 changes: 2 additions & 2 deletions doc/man/salt-call.1
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.TH "SALT-CALL" "1" "January 20, 2012" "0.9.6" "Salt"
.TH "SALT-CALL" "1" "February 15, 2012" "0.9.7" "Salt"
.SH NAME
salt-call \- salt-call Documentation
.
Expand Down Expand Up @@ -63,7 +63,7 @@ none are specified
.SH AUTHOR
Thomas S. Hatch <[email protected]> and many others, please see the Authors file
.SH COPYRIGHT
2011, Thomas S. Hatch
2012, Thomas S. Hatch
.\" Generated by docutils manpage writer.
.\"
.
8 changes: 4 additions & 4 deletions doc/man/salt-cp.1
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.TH "SALT-CP" "1" "January 20, 2012" "0.9.6" "Salt"
.TH "SALT-CP" "1" "February 15, 2012" "0.9.7" "Salt"
.SH NAME
salt-cp \- salt-cp Documentation
.
Expand Down Expand Up @@ -61,13 +61,13 @@ The timeout in seconds to wait for replies from the salt minions.
.INDENT 0.0
.TP
.B \-E, \-\-pcre
The target expression will be interpereted as a pcre regular expression
The target expression will be interpreted as a pcre regular expression
rather than a shell glob.
.UNINDENT
.INDENT 0.0
.TP
.B \-L, \-\-list
The target expression will be interpereted as a comma delimited list,
The target expression will be interpreted as a comma delimited list,
example: server1.foo.bar,server2.foo.bar,example7.quo.qux
.UNINDENT
.INDENT 0.0
Expand All @@ -93,7 +93,7 @@ default=/etc/salt/master
.SH AUTHOR
Thomas S. Hatch <[email protected]> and many others, please see the Authors file
.SH COPYRIGHT
2011, Thomas S. Hatch
2012, Thomas S. Hatch
.\" Generated by docutils manpage writer.
.\"
.
18 changes: 14 additions & 4 deletions doc/man/salt-key.1
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.TH "SALT-KEY" "1" "January 20, 2012" "0.9.6" "Salt"
.TH "SALT-KEY" "1" "February 15, 2012" "0.9.7" "Salt"
.SH NAME
salt-key \- salt-key Documentation
.
Expand Down Expand Up @@ -51,8 +51,8 @@ List the unaccepted minion public keys.
.INDENT 0.0
.TP
.B \-L, \-\-list\-all
List all public keys on this salt master, both accepted and pending
acceptance.
List all public keys on this salt master: accepted, pending,
and rejected.
.UNINDENT
.INDENT 0.0
.TP
Expand All @@ -66,6 +66,16 @@ Accepts all pending public keys.
.UNINDENT
.INDENT 0.0
.TP
.B \-r REJECT, \-\-reject=REJECT
Reject the named minion public key.
.UNINDENT
.INDENT 0.0
.TP
.B \-R, \-\-reject\-all
Rejects all pending public keys.
.UNINDENT
.INDENT 0.0
.TP
.B \-c CONFIG, \-\-config=CONFIG
The master configuration file needs to be read to determine where the salt
keys are stored via the pki_dir configuration value;
Expand All @@ -74,7 +84,7 @@ default=/etc/salt/master
.SH AUTHOR
Thomas S. Hatch <[email protected]> and many others, please see the Authors file
.SH COPYRIGHT
2011, Thomas S. Hatch
2012, Thomas S. Hatch
.\" Generated by docutils manpage writer.
.\"
.
4 changes: 2 additions & 2 deletions doc/man/salt-master.1
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.TH "SALT-MASTER" "1" "January 20, 2012" "0.9.6" "Salt"
.TH "SALT-MASTER" "1" "February 15, 2012" "0.9.7" "Salt"
.SH NAME
salt-master \- salt-master Documentation
.
Expand Down Expand Up @@ -69,7 +69,7 @@ settings see the config file. Default: \fBwarning\fP.
.SH AUTHOR
Thomas S. Hatch <[email protected]> and many others, please see the Authors file
.SH COPYRIGHT
2011, Thomas S. Hatch
2012, Thomas S. Hatch
.\" Generated by docutils manpage writer.
.\"
.
4 changes: 2 additions & 2 deletions doc/man/salt-minion.1
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.TH "SALT-MINION" "1" "January 20, 2012" "0.9.6" "Salt"
.TH "SALT-MINION" "1" "February 15, 2012" "0.9.7" "Salt"
.SH NAME
salt-minion \- salt-minion Documentation
.
Expand Down Expand Up @@ -70,7 +70,7 @@ settings see the config file. Default: \fBwarning\fP.
.SH AUTHOR
Thomas S. Hatch <[email protected]> and many others, please see the Authors file
.SH COPYRIGHT
2011, Thomas S. Hatch
2012, Thomas S. Hatch
.\" Generated by docutils manpage writer.
.\"
.
6 changes: 3 additions & 3 deletions doc/man/salt-run.1
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.TH "SALT-RUN" "1" "January 20, 2012" "0.9.6" "Salt"
.TH "SALT-RUN" "1" "February 15, 2012" "0.9.7" "Salt"
.SH NAME
salt-run \- salt-run Documentation
.
Expand Down Expand Up @@ -41,7 +41,7 @@ salt\-run RUNNER
.fi
.SH DESCRIPTION
.sp
Salt run is the frontend command for executing \fBSalt Runners\fP.
salt\-run is the frontend command for executing \fBSalt Runners\fP.
Salt runners are simple modules used to execute convenience functions on the
master
.SH OPTIONS
Expand All @@ -60,7 +60,7 @@ default=/etc/salt/master
.SH AUTHOR
Thomas S. Hatch <[email protected]> and many others, please see the Authors file
.SH COPYRIGHT
2011, Thomas S. Hatch
2012, Thomas S. Hatch
.\" Generated by docutils manpage writer.
.\"
.
4 changes: 2 additions & 2 deletions doc/man/salt-syndic.1
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.TH "SALT-SYNDIC" "1" "January 20, 2012" "0.9.6" "Salt"
.TH "SALT-SYNDIC" "1" "February 15, 2012" "0.9.7" "Salt"
.SH NAME
salt-syndic \- salt-syndic Documentation
.
Expand Down Expand Up @@ -64,7 +64,7 @@ The minion configuration file to use, the default is /etc/salt/minion
.SH AUTHOR
Thomas S. Hatch <[email protected]> and many others, please see the Authors file
.SH COPYRIGHT
2011, Thomas S. Hatch
2012, Thomas S. Hatch
.\" Generated by docutils manpage writer.
.\"
.
4 changes: 2 additions & 2 deletions doc/man/salt.1
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.TH "SALT" "1" "January 20, 2012" "0.9.6" "Salt"
.TH "SALT" "1" "February 15, 2012" "0.9.7" "Salt"
.SH NAME
salt \- salt
.
Expand Down Expand Up @@ -155,7 +155,7 @@ Print the output from the salt command in json.
.SH AUTHOR
Thomas S. Hatch <[email protected]> and many others, please see the Authors file
.SH COPYRIGHT
2011, Thomas S. Hatch
2012, Thomas S. Hatch
.\" Generated by docutils manpage writer.
.\"
.
Loading

0 comments on commit 5450585

Please sign in to comment.