update man pages for 0.9.7

thatch45 · thatch45 · commit 545058551b46 · 2012-02-15T09:54:37.000-07:00
diff --git a/doc/man/salt-call.1 b/doc/man/salt-call.1
@@ -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
 .
@@ -63,7 +63,7 @@ none are specified
 .SH AUTHOR
 Thomas S. Hatch <thatch@gmail.com> and many others, please see the Authors file
 .SH COPYRIGHT
-2011, Thomas S. Hatch
+2012, Thomas S. Hatch
 .\" Generated by docutils manpage writer.
 .\" 
 .
diff --git a/doc/man/salt-cp.1 b/doc/man/salt-cp.1
@@ -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
 .
@@ -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
@@ -93,7 +93,7 @@ default=/etc/salt/master
 .SH AUTHOR
 Thomas S. Hatch <thatch@gmail.com> and many others, please see the Authors file
 .SH COPYRIGHT
-2011, Thomas S. Hatch
+2012, Thomas S. Hatch
 .\" Generated by docutils manpage writer.
 .\" 
 .
diff --git a/doc/man/salt-key.1 b/doc/man/salt-key.1
@@ -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
 .
@@ -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
@@ -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;
@@ -74,7 +84,7 @@ default=/etc/salt/master
 .SH AUTHOR
 Thomas S. Hatch <thatch@gmail.com> and many others, please see the Authors file
 .SH COPYRIGHT
-2011, Thomas S. Hatch
+2012, Thomas S. Hatch
 .\" Generated by docutils manpage writer.
 .\" 
 .
diff --git a/doc/man/salt-master.1 b/doc/man/salt-master.1
@@ -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
 .
@@ -69,7 +69,7 @@ settings see the config file. Default: \fBwarning\fP.
 .SH AUTHOR
 Thomas S. Hatch <thatch@gmail.com> and many others, please see the Authors file
 .SH COPYRIGHT
-2011, Thomas S. Hatch
+2012, Thomas S. Hatch
 .\" Generated by docutils manpage writer.
 .\" 
 .
diff --git a/doc/man/salt-minion.1 b/doc/man/salt-minion.1
@@ -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
 .
@@ -70,7 +70,7 @@ settings see the config file. Default: \fBwarning\fP.
 .SH AUTHOR
 Thomas S. Hatch <thatch@gmail.com> and many others, please see the Authors file
 .SH COPYRIGHT
-2011, Thomas S. Hatch
+2012, Thomas S. Hatch
 .\" Generated by docutils manpage writer.
 .\" 
 .
diff --git a/doc/man/salt-run.1 b/doc/man/salt-run.1
@@ -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
 .
@@ -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
@@ -60,7 +60,7 @@ default=/etc/salt/master
 .SH AUTHOR
 Thomas S. Hatch <thatch@gmail.com> and many others, please see the Authors file
 .SH COPYRIGHT
-2011, Thomas S. Hatch
+2012, Thomas S. Hatch
 .\" Generated by docutils manpage writer.
 .\" 
 .
diff --git a/doc/man/salt-syndic.1 b/doc/man/salt-syndic.1
@@ -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
 .
@@ -64,7 +64,7 @@ The minion configuration file to use, the default is /etc/salt/minion
 .SH AUTHOR
 Thomas S. Hatch <thatch@gmail.com> and many others, please see the Authors file
 .SH COPYRIGHT
-2011, Thomas S. Hatch
+2012, Thomas S. Hatch
 .\" Generated by docutils manpage writer.
 .\" 
 .
diff --git a/doc/man/salt.1 b/doc/man/salt.1
@@ -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
 .
@@ -155,7 +155,7 @@ Print the output from the salt command in json.
 .SH AUTHOR
 Thomas S. Hatch <thatch@gmail.com> and many others, please see the Authors file
 .SH COPYRIGHT
-2011, Thomas S. Hatch
+2012, Thomas S. Hatch
 .\" Generated by docutils manpage writer.
 .\" 
 .
diff --git a/doc/man/salt.7 b/doc/man/salt.7

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-.TH "SALT-CALL" "1" "January 20, 2012" "0.9.6" "Salt"`
	`1`	`+.TH "SALT-CALL" "1" "February 15, 2012" "0.9.7" "Salt"`
`2`	`2`	`.SH NAME`
`3`	`3`	`salt-call \- salt-call Documentation`
`4`	`4`	`.`
`@@ -63,7 +63,7 @@ none are specified`
`63`	`63`	`.SH AUTHOR`
`64`	`64`	`Thomas S. Hatch <thatch@gmail.com> and many others, please see the Authors file`
`65`	`65`	`.SH COPYRIGHT`
`66`		`-2011, Thomas S. Hatch`
	`66`	`+2012, Thomas S. Hatch`
`67`	`67`	`.\" Generated by docutils manpage writer.`
`68`	`68`	`.\"`
`69`	`69`	`.`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-.TH "SALT-MASTER" "1" "January 20, 2012" "0.9.6" "Salt"`
	`1`	`+.TH "SALT-MASTER" "1" "February 15, 2012" "0.9.7" "Salt"`
`2`	`2`	`.SH NAME`
`3`	`3`	`salt-master \- salt-master Documentation`
`4`	`4`	`.`
`@@ -69,7 +69,7 @@ settings see the config file. Default: \fBwarning\fP.`
`69`	`69`	`.SH AUTHOR`
`70`	`70`	`Thomas S. Hatch <thatch@gmail.com> and many others, please see the Authors file`
`71`	`71`	`.SH COPYRIGHT`
`72`		`-2011, Thomas S. Hatch`
	`72`	`+2012, Thomas S. Hatch`
`73`	`73`	`.\" Generated by docutils manpage writer.`
`74`	`74`	`.\"`
`75`	`75`	`.`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-.TH "SALT-MINION" "1" "January 20, 2012" "0.9.6" "Salt"`
	`1`	`+.TH "SALT-MINION" "1" "February 15, 2012" "0.9.7" "Salt"`
`2`	`2`	`.SH NAME`
`3`	`3`	`salt-minion \- salt-minion Documentation`
`4`	`4`	`.`
`@@ -70,7 +70,7 @@ settings see the config file. Default: \fBwarning\fP.`
`70`	`70`	`.SH AUTHOR`
`71`	`71`	`Thomas S. Hatch <thatch@gmail.com> and many others, please see the Authors file`
`72`	`72`	`.SH COPYRIGHT`
`73`		`-2011, Thomas S. Hatch`
	`73`	`+2012, Thomas S. Hatch`
`74`	`74`	`.\" Generated by docutils manpage writer.`
`75`	`75`	`.\"`
`76`	`76`	`.`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-.TH "SALT-SYNDIC" "1" "January 20, 2012" "0.9.6" "Salt"`
	`1`	`+.TH "SALT-SYNDIC" "1" "February 15, 2012" "0.9.7" "Salt"`
`2`	`2`	`.SH NAME`
`3`	`3`	`salt-syndic \- salt-syndic Documentation`
`4`	`4`	`.`
`@@ -64,7 +64,7 @@ The minion configuration file to use, the default is /etc/salt/minion`
`64`	`64`	`.SH AUTHOR`
`65`	`65`	`Thomas S. Hatch <thatch@gmail.com> and many others, please see the Authors file`
`66`	`66`	`.SH COPYRIGHT`
`67`		`-2011, Thomas S. Hatch`
	`67`	`+2012, Thomas S. Hatch`
`68`	`68`	`.\" Generated by docutils manpage writer.`
`69`	`69`	`.\"`
`70`	`70`	`.`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-.TH "SALT" "1" "January 20, 2012" "0.9.6" "Salt"`
	`1`	`+.TH "SALT" "1" "February 15, 2012" "0.9.7" "Salt"`
`2`	`2`	`.SH NAME`
`3`	`3`	`salt \- salt`
`4`	`4`	`.`
`@@ -155,7 +155,7 @@ Print the output from the salt command in json.`
`155`	`155`	`.SH AUTHOR`
`156`	`156`	`Thomas S. Hatch <thatch@gmail.com> and many others, please see the Authors file`
`157`	`157`	`.SH COPYRIGHT`
`158`		`-2011, Thomas S. Hatch`
	`158`	`+2012, Thomas S. Hatch`
`159`	`159`	`.\" Generated by docutils manpage writer.`
`160`	`160`	`.\"`
`161`	`161`	`.`