summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2013-10-17 12:57:41 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2013-10-17 12:57:41 (GMT)
commitfa8fc51aec1ca6454bb0a65a95d8792680283724 (patch)
tree270bfca07b4fa4a997bc95d2982e28c2c9e4636b /Modules
parentbffe96056d41bebf8b1d7a85364c08b11f8e3d1f (diff)
parent42b4f6cbcf561f3e0f85a727c37e352924f78faa (diff)
downloadCMake-fa8fc51aec1ca6454bb0a65a95d8792680283724.zip
CMake-fa8fc51aec1ca6454bb0a65a95d8792680283724.tar.gz
CMake-fa8fc51aec1ca6454bb0a65a95d8792680283724.tar.bz2
Merge topic 'wix-documentation-escapes'
42b4f6c CPackWiX: prevent attribute references in docs from being interpreted
Diffstat (limited to 'Modules')
-rw-r--r--Modules/CPackWIX.cmake4
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/CPackWIX.cmake b/Modules/CPackWIX.cmake
index 7c7d924..f4fcf6a 100644
--- a/Modules/CPackWIX.cmake
+++ b/Modules/CPackWIX.cmake
@@ -12,7 +12,7 @@
#
# .. variable:: CPACK_WIX_UPGRADE_GUID
#
-# Upgrade GUID (Product/@UpgradeCode)
+# Upgrade GUID (``Product/@UpgradeCode``)
#
# Will be automatically generated unless explicitly provided.
#
@@ -33,7 +33,7 @@
#
# .. variable:: CPACK_WIX_PRODUCT_GUID
#
-# Product GUID (Product/@Id)
+# Product GUID (``Product/@Id``)
#
# Will be automatically generated unless explicitly provided.
#