2 files changed, 17 insertions, 4 deletions

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 922147844bd..a0bbafb116f 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,8 @@
+2012-12-17  Eli Zaretskii  <eliz@gnu.org>
+
+        * files.texi (File Attributes, Changing Files): Update to include
+        MS-Windows support for ACLs.
+
 2012-12-16  Romain Francoise  <romain@orebokech.com>
 
         * files.texi (File Attributes): Document ACL support and new
diff --git a/doc/lispref/files.texi b/doc/lispref/files.texi
index 93bee961929..5440388fe70 100644
--- a/doc/lispref/files.texi
+++ b/doc/lispref/files.texi
@@ -1357,13 +1357,14 @@ support, then the return value is @code{(nil nil nil nil)}.
   If Emacs has been compiled with @dfn{ACL} (access control list)
 support, you can use the function @code{file-acl} to retrieve a file's
 ACL entries.  The format is platform-specific; on GNU/Linux and BSD,
-Emacs uses the POSIX ACL interface.  For the function
-@code{set-file-acl}, see @ref{Changing Files}.
+Emacs uses the POSIX ACL interface, while on MS-Windows Emacs emulates
+the POSIX ACL interface with native file security APIs.  For the
+function @code{set-file-acl}, see @ref{Changing Files}.
 
 @defun file-acl filename
 This function returns the ACL entries of the file @var{filename}.
 The return value is a string containing the textual representation of
-the ACL entries, like the following:
+the ACL entries.  On Posix hosts, it looks like this:
 
 @example
 @group
@@ -1375,6 +1376,12 @@ other::r--
 @end group
 @end example
 
+@cindex security descriptor, file
+@cindex SDDL, MS-Windows
+On MS-Windows, the return value is a textual description of the file's
+@dfn{security descriptor} in @acronym{SDDL}, the @dfn{Security
+Descriptor Definition Language}.
+
 If the file does not exist or is inaccessible, or if Emacs was unable to
 determine the ACL entries, then the return value is @code{nil}.  The
 latter can happen for local files if Emacs was not compiled with ACL
@@ -1719,7 +1726,8 @@ SELinux support.
 This function sets the ACL entries of the file @var{filename} to
 @var{acl-string}.  @xref{File Attributes}, for a brief description of
 ACLs.  The @var{acl-string} argument should be a string containing the
-textual representation of the desired ACL entries.
+textual representation of the desired ACL entries in the format
+appropriate for the ACL interface being used.
 @end defun
 
 @node File Names