[Cmake-commits] CMake branch, next, updated. v3.7.0-rc2-654-g174057f

[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  174057f9e157e570a83cf7cd55a7e121d0f4c63c (commit)
       via  dfa9c54353b329a73f09314bd119224818a947fa (commit)
      from  4cfeac87fe0170b09b7c6a21a2f2dd0ff420d111 (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=174057f9e157e570a83cf7cd55a7e121d0f4c63c
commit 174057f9e157e570a83cf7cd55a7e121d0f4c63c
Merge: 4cfeac8 dfa9c54
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Oct 21 13:28:20 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Oct 21 13:28:20 2016 -0400

    Merge topic 'doc-cmake-server-typos' into next
    
    dfa9c543 Revert "Help: Fix cmake-server typo and message type consistency"


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dfa9c54353b329a73f09314bd119224818a947fa
commit dfa9c54353b329a73f09314bd119224818a947fa
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Oct 21 13:28:06 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Oct 21 13:28:06 2016 -0400

    Revert "Help: Fix cmake-server typo and message type consistency"
    
    This reverts commit f85bd200f947b6d4c89e9475a6a424b5b2270a16.

diff --git a/Help/manual/cmake-server.7.rst b/Help/manual/cmake-server.7.rst
index fe479d1..afd4e2b 100644
--- a/Help/manual/cmake-server.7.rst
+++ b/Help/manual/cmake-server.7.rst
@@ -403,7 +403,7 @@ CMake will reply like this (after reporting progress for some time)::
 Type "compute"
 ^^^^^^^^^^^^^^
 
-This request will generate build system files in the build directory and
+This requist will generate build system files in the build directory and
 is only available after a project was successfully "configure"d.
 
 Example::
@@ -520,7 +520,7 @@ sourceDirectory of the target.
 Example::
 
   [== CMake Server ==[
-  {"type":"codemodel"}
+  {"type":"project"}
   ]== CMake Server ==]
 
 CMake will reply::
@@ -529,7 +529,7 @@ CMake will reply::
   {
     "cookie":"",
     "type":"reply",
-    "inReplyTo":"codemodel",
+    "inReplyTo":"project",
 
     "projects":
     [
@@ -584,9 +584,9 @@ CMake will reply::
   ]== CMake Server ==]
 
 The output can be tailored to the specific needs via parameter passed when
-requesting "codemodel" information.
+requesting "project" information.
 
-You can have a "depth" key, which accepts "codemodel", "configuration" and
+You can have a "depth" key, which accepts "project", "configuration" and
 "target" as string values. These cause the output to be trimmed at the
 appropriate depth of the output tree.
 

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

Summary of changes:
 Help/manual/cmake-server.7.rst |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake