8000 update man pages for 0.9.7 · linuxadmin/salt@5450585 · GitHub
[go: up one dir, main page]
Skip to content

Commit 5450585

Browse files
thatch45thatch45
committed
update man pages for 0.9.7
1 parent f5b19e4 commit 5450585

File tree

9 files changed

+1224
-531
lines changed

9 files changed

+1224
-531
lines changed

‎doc/man/salt-call.1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff 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"
22
.SH NAME
33
salt-call \- salt-call Documentation
44
.
@@ -63,7 +63,7 @@ none are specified
6363
.SH AUTHOR
6464
Thomas S. Hatch <thatch@gmail.com> and many others, please see the Authors file
6565
.SH COPYRIGHT
66-
2011, Thomas S. Hatch
66+
2012, Thomas S. Hatch
6767
.\" Generated by docutils manpage writer.
6868
.\"
6969
.

‎doc/man/salt-cp.1

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.TH "SALT-CP" "1" "January 20, 2012" "0.9.6" "Salt"
1+
.TH "SALT-CP" "1" "February 15, 2012" "0.9.7" "Salt"
22
.SH NAME
33
salt-cp \- salt-cp Documentation
44
.
@@ -61,13 +61,13 @@ The timeout in seconds to wait for replies from the salt minions.
6161
.INDENT 0.0
6262
.TP
6363
.B \-E, \-\-pcre
64-
The target expression will be interpereted as a pcre regular expression
64+
The target expression will be interpreted as a pcre regular expression
6565
rather than a shell glob.
6666
.UNINDENT
6767
.INDENT 0.0
6868
.TP
6969
.B \-L, \-\-list
70-
The target expression will be interpereted as a comma delimited list,
70+
The target expression will be interpreted as a comma delimited list,
7171
example: server1.foo.bar,server2.foo.bar,example7.quo.qux
7272
.UNINDENT
7373
.INDENT 0.0
@@ -93,7 +93,7 @@ default=/etc/salt/master
9393
.SH AUTHOR
9494
Thomas S. Hatch <thatch@gmail.com> and many others, please see the Authors file
9595
.SH COPYRIGHT
96-
2011, Thomas S. Hatch
96+
2012, Thomas S. Hatch
9797
.\" Generated by docutils manpage writer.
9898
.\"
9999
.

‎doc/man/salt-key.1

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.TH "SALT-KEY" "1" "January 20, 2012" "0.9.6" "Salt"
1+
.TH "SALT-KEY" "1" "February 15, 2012" "0.9.7" "Salt"
22
.SH NAME
33
salt-key \- salt-key Documentation
44
.
@@ -51,8 +51,8 @@ List the unaccepted minion public keys.
5151
.INDENT 0.0
5252
.TP
5353
.B \-L, \-\-list\-all
54-
List all public keys on this salt master, both accepted and pending
55-
acceptance.
54+
List all public keys on this salt master: accepted, pending,
55+
and rejected.
5656
.UNINDENT
5757
.INDENT 0.0
5858
.TP
@@ -66,6 +66,16 @@ Accepts all pending public keys.
6666
.UNINDENT
6767
.INDENT 0.0
6868
.TP
69+
.B \-r REJECT, \-\-reject=REJECT
70+
Reject the named minion public key.
71+
.UNINDENT
72+
.INDENT 0.0
73+
.TP
74+
.B \-R, \-\-reject\-all
75+
Rejects all pending public keys.
76+
.UNINDENT
77+
.INDENT 0.0
78+
.TP
6979
.B \-c CONFIG, \-\-config=CONFIG
7080
The master configuration file needs to be read to determine where the salt
7181
keys are stored via the pki_dir configuration value;
@@ -74,7 +84,7 @@ default=/etc/salt/master
7484
.SH AUTHOR
7585
Thomas S. Hatch <thatch@gmail.com> and many others, please see the Authors file
7686
.SH COPYRIGHT
77-
2011, Thomas S. Hatch
87+
2012, Thomas S. Hatch
7888
.\" Generated by docutils manpage writer.
7989
.\"
8090
.

‎doc/man/salt-master.1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff 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"
22
.SH NAME
33
salt-master \- salt-master Documentation
44
.
@@ -69,7 +69,7 @@ settings see the config file. Default: \fBwarning\fP.
6969
.SH AUTHOR
7070
Thomas S. Hatch <thatch@gmail.com> and many others, please see the Authors file
7171
.SH COPYRIGHT
72-
2011, Thomas S. Hatch
72+
2012, Thomas S. Hatch
7373
.\" Generated by docutils manpage writer.
7474
.\"
7575
.

‎doc/man/salt-minion.1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff 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"
22
.SH NAME
33
salt-minion \- salt-minion Documentation
44
.
@@ -70,7 +70,7 @@ settings see the config file. Default: \fBwarning\fP.
7070
.SH AUTHOR
7171
Thomas S. Hatch <thatch@gmail.com> and many others, please see the Authors file
7272
.SH COPYRIGHT
73-
2011, Thomas S. Hatch
73+
2012, Thomas S. Hatch
7474
.\" Generated by docutils manpage writer.
7575
.\"
7676
.

‎doc/man/salt-run.1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.TH "SALT-RUN" "1" "January 20, 2012" "0.9.6" "Salt"
1+
.TH "SALT-RUN" "1" "February 15, 2012" "0.9.7" "Salt"
22
.SH NAME
33
salt-run \- salt-run Documentation
44
.
@@ -41,7 +41,7 @@ salt\-run RUNNER
4141
.fi
4242
.SH DESCRIPTION
4343
.sp
44-
Salt run is the frontend command for executing \fBSalt Runners\fP.
44+
salt\-run is the frontend command for executing \fBSalt Runners\fP.
4545
Salt runners are simple modules used to execute convenience functions on the
4646
master
4747
.SH OPTIONS
@@ -60,7 +60,7 @@ default=/etc/salt/master
6060
.SH AUTHOR
6161
Thomas S. Hatch <thatch@gmail.com> and many others, please see the Authors file
6262
.SH COPYRIGHT
63-
2011, Thomas S. Hatch
63+
2012, Thomas S. Hatch
6464
.\" Generated by docutils manpage writer.
6565
.\"
6666
.

‎doc/man/salt-syndic.1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff 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"
22
.SH NAME
33
salt-syndic \- salt-syndic Documentation
44
.
@@ -64,7 +64,7 @@ The minion configuration file to use, the default is /etc/salt/minion
6464
.SH AUTHOR
6565
Thomas S. Hatch <thatch@gmail.com> and many others, please see the Authors file
6666
.SH COPYRIGHT
67-
2011, Thomas S. Hatch
67+
2012, Thomas S. Hatch
6868
.\" Generated by docutils manpage writer.
6969
.\"
7070
.

‎doc/man/salt.1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff 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"
22
.SH NAME
33
salt \- salt
44
.
@@ -155,7 +155,7 @@ Print the output from the salt command in json.
155155
.SH AUTHOR
156156
Thomas S. Hatch <thatch@gmail.com> and many others, please see the Authors file
157157
.SH COPYRIGHT
158-
2011, Thomas S. Hatch
158+
2012, Thomas S. Hatch
159159
.\" Generated by docutils manpage writer.
160160
.\"
161161
.

0 commit comments

Comments
 (0)
0