[Cmake-commits] CMake branch, next, updated. v3.7.0-rc2-650-g98cc166

[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  98cc166c5565c2a57ff5e41c68d15dbb39e16aea (commit)
       via  f85bd200f947b6d4c89e9475a6a424b5b2270a16 (commit)
      from  1a54dc7196caedf938ef32655d13b05feb87e984 (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=98cc166c5565c2a57ff5e41c68d15dbb39e16aea
commit 98cc166c5565c2a57ff5e41c68d15dbb39e16aea
Merge: 1a54dc7 f85bd20
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Oct 21 10:40:14 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Oct 21 10:40:14 2016 -0400

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


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f85bd200f947b6d4c89e9475a6a424b5b2270a16
commit f85bd200f947b6d4c89e9475a6a424b5b2270a16
Author:     Sylvain Joubert <joubert.sy at gmail.com>
AuthorDate: Fri Oct 21 15:46:12 2016 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Oct 21 10:35:24 2016 -0400

    Help: Fix cmake-server typo and message type consistency

diff --git a/Help/manual/cmake-server.7.rst b/Help/manual/cmake-server.7.rst
index afd4e2b..fe479d1 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 requist will generate build system files in the build directory and
+This request 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":"project"}
+  {"type":"codemodel"}
   ]== CMake Server ==]
 
 CMake will reply::
@@ -529,7 +529,7 @@ CMake will reply::
   {
     "cookie":"",
     "type":"reply",
-    "inReplyTo":"project",
+    "inReplyTo":"codemodel",
 
     "projects":
     [
@@ -584,9 +584,9 @@ CMake will reply::
   ]== CMake Server ==]
 
 The output can be tailored to the specific needs via parameter passed when
-requesting "project" information.
+requesting "codemodel" information.
 
-You can have a "depth" key, which accepts "project", "configuration" and
+You can have a "depth" key, which accepts "codemodel", "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