[Cmake-commits] CMake branch, next, updated. v3.0.1-4812-g7ac9b41

[Nils Gladitz]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  7ac9b41abcc47f02d64b80d2a7f465f3ab8700da (commit)
       via  ff81e009263f07095f9255db558e5f157387f56a (commit)
      from  a4afd728837d220977c22bdf05b768b70e7ae599 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7ac9b41abcc47f02d64b80d2a7f465f3ab8700da
commit 7ac9b41abcc47f02d64b80d2a7f465f3ab8700da
Merge: a4afd72 ff81e00
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Sat Aug 9 09:30:05 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Aug 9 09:30:05 2014 -0400

    Merge topic 'wix-acl' into next
    
    ff81e009 CPackWIX: Documentation fixes


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ff81e009263f07095f9255db558e5f157387f56a
commit ff81e009263f07095f9255db558e5f157387f56a
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Sat Aug 9 15:29:31 2014 +0200
Commit:     Nils Gladitz <nilsgladitz at gmail.com>
CommitDate: Sat Aug 9 15:29:31 2014 +0200

    CPackWIX: Documentation fixes

diff --git a/Help/prop_inst/CPACK_WIX_ACL.rst b/Help/prop_inst/CPACK_WIX_ACL.rst
index edc7571..e7d526a 100644
--- a/Help/prop_inst/CPACK_WIX_ACL.rst
+++ b/Help/prop_inst/CPACK_WIX_ACL.rst
@@ -1,12 +1,13 @@
 CPACK_WIX_ACL
 -------------
 
-Specifies access permissions for installed files.
+Specifies access permissions for files installed by a WiX installer.
 
 The property can contain multiple list entries,
 each of which has to match the following format.
 
 ::
+
   <user>[@<domain>]=<permission>[,<permission>]
 
 ``<user>`` and ``<domain>`` specify the windows user and domain for which the

-----------------------------------------------------------------------

Summary of changes:
 Help/prop_inst/CPACK_WIX_ACL.rst |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake