[Cmake-commits] CMake branch, next, updated. v2.8.7-3069-gaac2947

[Eric Noulard]

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  aac294719de1ef2e0d9bb2cb9676c54940df1b43 (commit)
       via  b0cb29bb06918d3d6a60d22c0e54b8ca6e6b4f36 (commit)
      from  bc661082500d1b66e06b621ce2c565f3fa1e8361 (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=aac294719de1ef2e0d9bb2cb9676c54940df1b43
commit aac294719de1ef2e0d9bb2cb9676c54940df1b43
Merge: bc66108 b0cb29b
Author:     Eric Noulard <eric.noulard at gmail.com>
AuthorDate: Tue Mar 6 15:25:50 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Mar 6 15:25:50 2012 -0500

    Merge topic 'fixCPackDocTypo' into next
    
    b0cb29b Fix some typos in CPACK_SET_DESTDIR doc


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b0cb29bb06918d3d6a60d22c0e54b8ca6e6b4f36
commit b0cb29bb06918d3d6a60d22c0e54b8ca6e6b4f36
Author:     Eric NOULARD <eric.noulard at gmail.com>
AuthorDate: Tue Mar 6 21:23:11 2012 +0100
Commit:     Eric NOULARD <eric.noulard at gmail.com>
CommitDate: Tue Mar 6 21:23:11 2012 +0100

    Fix some typos in CPACK_SET_DESTDIR doc

diff --git a/Source/CPack/cmCPackDocumentVariables.cxx b/Source/CPack/cmCPackDocumentVariables.cxx
index 23e99f8..d2e3802 100644
--- a/Source/CPack/cmCPackDocumentVariables.cxx
+++ b/Source/CPack/cmCPackDocumentVariables.cxx
@@ -44,14 +44,14 @@ void cmCPackDocumentVariables::DefineVariables(cmake* cm)
            "Boolean toggle to make CPack use DESTDIR mechanism when"
            " packaging.", "DESTDIR means DESTination DIRectory."
            " It is commonly used by makefile "
-           "users in order to install software at non-default location. It a"
-           "basic relocation mechanism. "
+           "users in order to install software at non-default location. It "
+           "is a basic relocation mechanism. "
            "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\" prepended with "
            "the DESTDIR value which finally gives \"/home/john/usr/local\"."
-           " When preparing a package CPack first installs the items to be "
+           " When preparing a package, CPack first installs the items to be "
            "packaged in a local (to the build tree) directory by using the "
            "same DESTDIR mechanism. Nevertheless, if "
            "CPACK_SET_DESTDIR is set then CPack will set DESTDIR before"
@@ -63,7 +63,7 @@ void cmCPackDocumentVariables::DefineVariables(cmake* cm)
            "Manually setting CPACK_SET_DESTDIR may help (or simply be"
            " necessary) if some install rules uses absolute "
            "DESTINATION (see CMake INSTALL command)."
-           "However, starting with"
+           " However, starting with"
            " CPack/CMake 2.8.3 RPM and DEB installers tries to handle DESTDIR"
            " automatically so that it is seldom necessary for the user to set"
            " it.", false,

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

Summary of changes:
 Source/CPack/cmCPackDocumentVariables.cxx |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake