[Cmake-commits] CMake branch, master, updated. v3.10.2-844-g11c4ea7

[Kitware Robot]

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, master has been updated
       via  11c4ea7f110b267d057c432395642f713a52758d (commit)
       via  73bb781df05e46a93e878535996f4753b8e5e06c (commit)
      from  ab1be0891333e1d623c7d561879b2ce26368de83 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=11c4ea7f110b267d057c432395642f713a52758d
commit 11c4ea7f110b267d057c432395642f713a52758d
Merge: ab1be08 73bb781
Author:     Craig Scott <craig.scott at crascit.com>
AuthorDate: Sat Jan 20 22:54:02 2018 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Sat Jan 20 17:54:24 2018 -0500

    Merge topic 'reword-cmake-E-time-help'
    
    73bb781d Help: Reword misleading docs for cmake -E time
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !1677


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=73bb781df05e46a93e878535996f4753b8e5e06c
commit 73bb781df05e46a93e878535996f4753b8e5e06c
Author:     Taylor Braun-Jones <taylor at braun-jones.org>
AuthorDate: Fri Jan 19 15:34:38 2018 -0500
Commit:     Taylor Braun-Jones <taylor at braun-jones.org>
CommitDate: Fri Jan 19 16:07:39 2018 -0500

    Help: Reword misleading docs for cmake -E time

diff --git a/Help/manual/cmake.1.rst b/Help/manual/cmake.1.rst
index ff8c6c7..c2e6435 100644
--- a/Help/manual/cmake.1.rst
+++ b/Help/manual/cmake.1.rst
@@ -337,7 +337,7 @@ Available commands are:
     ``paxr`` (restricted pax, default), and ``zip``.
 
 ``time <command> [<args>...]``
-  Run command and return elapsed time.
+  Run command and display elapsed time.
 
 ``touch <file>``
   Touch a file.
diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx
index f660f43..2c3bda2 100644
--- a/Source/cmcmd.cxx
+++ b/Source/cmcmd.cxx
@@ -103,7 +103,7 @@ void CMakeCommandUsage(const char* program)
     << "  sleep <number>...         - sleep for given number of seconds\n"
     << "  tar [cxt][vf][zjJ] file.tar [file/dir1 file/dir2 ...]\n"
     << "                            - create or extract a tar or zip archive\n"
-    << "  time command [args...]    - run command and return elapsed time\n"
+    << "  time command [args...]    - run command and display elapsed time\n"
     << "  touch file                - touch a file.\n"
     << "  touch_nocreate file       - touch a file but do not create it.\n"
 #if defined(_WIN32) && !defined(__CYGWIN__)

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

Summary of changes:
 Help/manual/cmake.1.rst |    2 +-
 Source/cmcmd.cxx        |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake