Merge branch 'develop' of git://github.com/saltstack/salt

This commit is contained in:
Clint Savage 2012-08-02 22:02:31 -06:00
commit ccbf5ef6b6
2 changed files with 4 additions and 4 deletions

View File

@ -81,8 +81,8 @@ Delete the named minion key for command execution.
.UNINDENT .UNINDENT
.INDENT 0.0 .INDENT 0.0
.TP .TP
.B \-D DELETE_ALL, \-\-delete\-all=DELETE_ALL .B \-D \-\-delete\-all
Deleta all keys Delete all minion keys
.UNINDENT .UNINDENT
.INDENT 0.0 .INDENT 0.0
.TP .TP

View File

@ -51,9 +51,9 @@ Options
Delete the named minion key for command execution. Delete the named minion key for command execution.
.. option:: -D DELETE_ALL, --delete-all=DELETE_ALL .. option:: -D, --delete-all
Deleta all keys Delete all keys
.. option:: -c CONFIG, --config=CONFIG .. option:: -c CONFIG, --config=CONFIG