Permalink
Browse files

Clarify the actions salt will take when run as non-root

Ref #10433

Also fix a dangling preposition
  • Loading branch information...
1 parent ef26e5e commit cd9480c2611842ec5197af25e9ee36978db9be3e @basepi basepi committed Feb 14, 2014
Showing with 4 additions and 3 deletions.
  1. +4 −3 conf/master
View
@@ -20,9 +20,10 @@
# The tcp port used by the publisher
#publish_port: 4505
-# The user to run the salt-master as. Salt will update all permissions to
-# allow the specified user to run the master. If the modified files cause
-# conflicts set verify_env to False.
+# The user under which the salt master will run. Salt will update all
+# permissions to allow the specified user to run the master. The exception is
+# the job cache, which must be deleted if this user is changed. If the
+# modified files cause conflicts set verify_env to False.
#user: root
# Max open files

0 comments on commit cd9480c

Please sign in to comment.