[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3900-g4232d49

[Brad King]

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  4232d498f61fc0389c010bf9d1b3b964c5352985 (commit)
       via  807a564e7a123f139770406d2c4a02d062be28c6 (commit)
      from  142b867796ccbe36960f27469874ab38b12ed9cf (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=4232d498f61fc0389c010bf9d1b3b964c5352985
commit 4232d498f61fc0389c010bf9d1b3b964c5352985
Merge: 142b867 807a564
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Aug 15 13:14:03 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Aug 15 13:14:03 2013 -0400

    Merge topic 'doc-CPack-typo' into next
    
    807a564 CPack: Fix a typo in documentation


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=807a564e7a123f139770406d2c4a02d062be28c6
commit 807a564e7a123f139770406d2c4a02d062be28c6
Author:     Yury G. Kudryashov <urkud.urkud at gmail.com>
AuthorDate: Thu Aug 15 19:13:46 2013 +0300
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Aug 15 13:11:57 2013 -0400

    CPack: Fix a typo in documentation

diff --git a/Source/CPack/cmCPackDocumentVariables.cxx b/Source/CPack/cmCPackDocumentVariables.cxx
index 1dfaaf9..8b16ae9 100644
--- a/Source/CPack/cmCPackDocumentVariables.cxx
+++ b/Source/CPack/cmCPackDocumentVariables.cxx
@@ -28,7 +28,7 @@ void cmCPackDocumentVariables::DefineVariables(cmake* cm)
          " the so-called top level directory. The purpose of"
          " is to include (set to 1 or ON or TRUE) the top level directory"
          " in the package or not (set to 0 or OFF or FALSE).\n"
-         "Each CPack generator as a built-in default value for this"
+         "Each CPack generator has a built-in default value for this"
          " variable. E.g. Archive generators (ZIP, TGZ, ...) includes"
          " the top level whereas RPM or DEB don't. The user may override"
          " the default value by setting this variable.\n"

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

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


hooks/post-receive
-- 
CMake