Merge pull request #26551 from rallytime/bp-26539

Back-port #26539 to 2015.5
This commit is contained in:
Justin Findlay 2015-08-21 11:39:22 -06:00
commit bcd462545d

View File

@ -52,7 +52,7 @@ Follow :issue:`11801` for any changes to this behavior.
Dealing with various username forms Dealing with various username forms
=================================== ===================================
Salt does not understand the various forms that Windows usernames can come in, Salt does not understand the various forms that Windows usernames can come in,
e.g. username, mydomain\username, username@mydomain.tld can all refer to the e.g. username, mydomain\\username, username@mydomain.tld can all refer to the
same user. In fact, Salt generally only considers the raw username value, i.e. same user. In fact, Salt generally only considers the raw username value, i.e.
the username without the domain or host information. the username without the domain or host information.
@ -86,4 +86,4 @@ platforms. In general, avoid symlink loops on either platform.
Modifying security properties (ACLs) on files Modifying security properties (ACLs) on files
============================================= =============================================
There is no support in Salt for modifying ACLs, and therefore no support for There is no support in Salt for modifying ACLs, and therefore no support for
changing file permissions, besides modifying the owner/user. changing file permissions, besides modifying the owner/user.