[Cmake-commits] CMake branch, next, updated. v2.8.9-485-g47b1fc8

[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  47b1fc8e37a30529ca711f759603438f8cf6938a (commit)
       via  d08be30c6c697fedeb7171ee9bdc27f4e38231f9 (commit)
      from  1d00f3fac5733b37b14d0cef3ebf8ba2e1419883 (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=47b1fc8e37a30529ca711f759603438f8cf6938a
commit 47b1fc8e37a30529ca711f759603438f8cf6938a
Merge: 1d00f3f d08be30
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Sep 11 15:33:05 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Sep 11 15:33:05 2012 -0400

    Merge topic 'file-download-verify' into next
    
    d08be30 file(UPLOAD): Remove non-existent SSL options from docs


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d08be30c6c697fedeb7171ee9bdc27f4e38231f9
commit d08be30c6c697fedeb7171ee9bdc27f4e38231f9
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Sep 11 15:31:30 2012 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Sep 11 15:31:30 2012 -0400

    file(UPLOAD): Remove non-existent SSL options from docs

diff --git a/Source/cmFileCommand.h b/Source/cmFileCommand.h
index 50eae24..413e2f4 100644
--- a/Source/cmFileCommand.h
+++ b/Source/cmFileCommand.h
@@ -87,8 +87,7 @@ public:
       "       [EXPECTED_MD5 sum]\n"
       "       [SSL_VERIFY on|off] [SSL_CAINFO_FILE file])\n"
       "  file(UPLOAD filename url [INACTIVITY_TIMEOUT timeout]\n"
-      "       [TIMEOUT timeout] [STATUS status] [LOG log] [SHOW_PROGRESS]\n"
-      "       [SSL_VERIFY on|off] [SSL_CAINFO_FILE file])\n"
+      "       [TIMEOUT timeout] [STATUS status] [LOG log] [SHOW_PROGRESS])\n"
       "WRITE will write a message into a file called 'filename'. It "
       "overwrites the file if it already exists, and creates the file "
       "if it does not exist.\n"

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

Summary of changes:
 Source/cmFileCommand.h |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake