From 4f096201ea4d80bd56b499bcc2e36ef6669630a2 Mon Sep 17 00:00:00 2001
From: ScriptAutomate <derek@icanteven.io>
Date: Thu, 5 Nov 2020 20:35:10 -0600
Subject: [PATCH] Environment to saltenv and documenting color

---
 conf/minion                      |  7 +++++--
 doc/ref/configuration/minion.rst | 10 ++++++++++
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/conf/minion b/conf/minion
index 353f598af70..b87397e8e00 100644
--- a/conf/minion
+++ b/conf/minion
@@ -530,11 +530,14 @@
 # enabled and can be disabled by changing this value to False.
 #clean_dynamic_modules: True
 #
-# Normally, the minion is not isolated to any single environment on the master
+# Renamed from ``environment`` to ``saltenv``. If ``environment`` is used,
+# ``saltenv`` will take its value. If both are used, ``environment`` will be
+# ignored and ``saltenv`` will be used.
+# Normally the minion is not isolated to any single environment on the master
 # when running states, but the environment can be isolated on the minion side
 # by statically setting it. Remember that the recommended way to manage
 # environments is to isolate via the top file.
-#environment: None
+#saltenv: None
 #
 # Isolates the pillar environment on the minion side. This functions the same
 # as the environment setting, but for pillar instead of states.
diff --git a/doc/ref/configuration/minion.rst b/doc/ref/configuration/minion.rst
index af917d7136b..35d9760dbff 100644
--- a/doc/ref/configuration/minion.rst
+++ b/doc/ref/configuration/minion.rst
@@ -103,6 +103,16 @@ The option can also be set to a list of masters, enabling
           - address2
         master_type: failover
 
+.. conf_minion:: color
+
+``color``
+---------
+
+Default: ``True``
+
+By default output is colored. To disable colored output, set the color value to
+``False``.
+
 .. conf_minion:: ipv6
 
 ``ipv6``