From 9c803d05a5cae4c899edb450cf4f7f34b8ddfa24 Mon Sep 17 00:00:00 2001
From: rallytime <nicole@saltstack.com>
Date: Sat, 16 Jul 2016 12:45:55 -0600
Subject: [PATCH] Add output_file option to master config docs

Fixes #34703
---
 conf/master                      |  5 +++++
 doc/ref/configuration/master.rst | 15 +++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/conf/master b/conf/master
index e96d0a63b11..ac99754a32e 100644
--- a/conf/master
+++ b/conf/master
@@ -84,6 +84,11 @@
 # Set the default outputter used by the salt command. The default is "nested".
 #output: nested
 
+# Set the default output file used by the salt command. Default is to output
+# to the CLI and not to a file. Functions the same way as the "--out-file"
+CLI option, only sets this to a single file for all salt commands.
+#output_file: None
+
 # Return minions that timeout when running commands like test.ping
 #show_timeout: True
 
diff --git a/doc/ref/configuration/master.rst b/doc/ref/configuration/master.rst
index 43129a34c2d..d49156ae4a2 100644
--- a/doc/ref/configuration/master.rst
+++ b/doc/ref/configuration/master.rst
@@ -339,6 +339,21 @@ Default: ``nested``
 
 Set the default outputter used by the salt command.
 
+.. conf_master:: output_file
+
+``output_file``
+---------------
+
+Default: None
+
+# Set the default output file used by the salt command. Default is to output
+# to the CLI and not to a file. Functions the same way as the "--out-file"
+CLI option, only sets this to a single file for all salt commands.
+
+.. code-block:: yaml
+
+    output_file: /path/output/file
+
 .. conf_master:: color
 
 ``color``