summaryrefslogtreecommitdiffstats
path: root/Source/CPack
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2013-05-16 18:38:07 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2013-05-16 18:38:07 (GMT)
commit0dc0e7d88505be5ce77dc9762fe30d4218a720a5 (patch)
tree3e6de86ef0c1b5d88b5701ae3a54c3c09c8e1fe9 /Source/CPack
parent07afd4f37582ac0d3485df907120743fc5bd9a24 (diff)
parent7cc2805cd6da07ad4b38f072fea811bb5de4f729 (diff)
downloadCMake-0dc0e7d88505be5ce77dc9762fe30d4218a720a5.zip
CMake-0dc0e7d88505be5ce77dc9762fe30d4218a720a5.tar.gz
CMake-0dc0e7d88505be5ce77dc9762fe30d4218a720a5.tar.bz2
Merge topic 'doc-improvements'
7cc2805 Docs: Clarify wording "flag used" => "flag (to|will) be used" 2378a69 Docs: Clarify that CMAKE_*_(PREFIX|SUFFIX) affect filenames 56ca34d Docs: Update description of CMAKE_(BUILD_TYPE|CONFIGURATION_TYPES) 2bab472 VS10: add detailed comment about MIDL processing e619111 Explain distribution of Win9x binary on all Windows versions. 5ca4336 FindwxWidgets: add DOC strings with usual style f57800d Fix spelling and typos (product names) bf019d7 Fix spelling and typos (non-binary) ddac8d3 Fix spelling and typos (affecting binary data / module messages) 86832ce Fix spelling and typos (affecting users)
Diffstat (limited to 'Source/CPack')
-rw-r--r--Source/CPack/cmCPackDocumentVariables.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/CPack/cmCPackDocumentVariables.cxx b/Source/CPack/cmCPackDocumentVariables.cxx
index 6a841fa..1dfaaf9 100644
--- a/Source/CPack/cmCPackDocumentVariables.cxx
+++ b/Source/CPack/cmCPackDocumentVariables.cxx
@@ -60,7 +60,7 @@ void cmCPackDocumentVariables::DefineVariables(cmake* cm)
"It is usually invoked like this:\n"
" make DESTDIR=/home/john install\n"
"which will install the concerned software using the"
- " installation prefix, e.g. \"/usr/local\" pre-pended with "
+ " installation prefix, e.g. \"/usr/local\" prepended with "
"the DESTDIR value which finally gives \"/home/john/usr/local\"."
" When preparing a package, CPack first installs the items to be "
"packaged in a local (to the build tree) directory by using the "