From a98c05f5fe88e10549518d52d4b251faa39f3800 Mon Sep 17 00:00:00 2001
From: Thomas S Hatch <thatch45@gmail.com>
Date: Fri, 14 Dec 2012 06:39:38 -0700
Subject: [PATCH] update salt-key manpage

---
 doc/ref/cli/salt-key.rst | 36 ++++++++++++++++++++++++++++++++----
 1 file changed, 32 insertions(+), 4 deletions(-)

diff --git a/doc/ref/cli/salt-key.rst b/doc/ref/cli/salt-key.rst
index 7be5e88624..edf1178b44 100644
--- a/doc/ref/cli/salt-key.rst
+++ b/doc/ref/cli/salt-key.rst
@@ -56,11 +56,11 @@ Options
 
     Delete all keys
 
-.. option:: -c CONFIG, --config=CONFIG
+.. option:: -c CONFIG_DIR, --config-dir=CONFIG_dir
 
-    The master configuration file needs to be read to determine where the Salt
-    keys are stored via the pki_dir configuration value;
-    default=/etc/salt/master
+    The location of the Salt configuration directory, this directory contains
+    the configuration files for Salt master and minions. The default location
+    on most systems is /etc/salt.
 
 .. option:: -p PRINT, --print=PRINT
 
@@ -97,3 +97,31 @@ Options
    the '--gen-keys' option, the key size must be 2048 or
    higher, otherwise it will be rounded up to 2048. The
    default is 2048.
+
+.. option:: --out
+
+    Pass in an alternative outputter to display the return of data. This
+    outputter can be any of the available outputters:
+    grains, highstate, json, key, overstatestage, pprint, raw, txt, yaml
+    Some outputters are formatted only for data returned from specific
+    functions, for instance the grains outputter will not work for non grains
+    data.
+    If an outputter is used that does not support the data passed into it, then
+    Salt will fall back on the pprint outputter and display the return data
+    using the python pprint library.
+
+.. option:: --out-indent OUTPUT_INDENT, --output-indent OUTPUT_INDENT
+
+    Print the output indented by the provided value in spaces. Negative values
+    disables indentation. Only applicable in outputters that support indentation.
+
+.. option:: --no-color
+
+    Disable all colored output
+
+See also
+========
+
+:manpage:`salt(7)`
+:manpage:`salt-master(1)`
+:manpage:`salt-minion(1)`