From 69d50a7edb069dc872fbf3d9b2ada258889f8681 Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 15 Jun 2017 10:08:59 -0400 Subject: Help: Fix typo in Cray/PGI/XL compile features docs Reported-by: Rolf Eike Beer --- Help/manual/cmake-compile-features.7.rst | 4 ++-- Help/release/3.9.rst | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Help/manual/cmake-compile-features.7.rst b/Help/manual/cmake-compile-features.7.rst index cfb1b78..6304ac1 100644 --- a/Help/manual/cmake-compile-features.7.rst +++ b/Help/manual/cmake-compile-features.7.rst @@ -347,7 +347,7 @@ versions specified for each: * ``GNU``: GNU compiler versions 3.4 through 5.0. CMake is currently aware of the :prop_tgt:`C++ standards ` and -thier associated meta-features (e.g. ``cxx_std_11``) available from the +their associated meta-features (e.g. ``cxx_std_11``) available from the following :variable:`compiler ids _COMPILER_ID>` as of the versions specified for each: @@ -356,7 +356,7 @@ versions specified for each: * ``XL``: IBM XL version 10.1 through 13.1.5. CMake is currently aware of the :prop_tgt:`C standards ` and -thier associated meta-features (e.g. ``c_std_99``) available from the +their associated meta-features (e.g. ``c_std_99``) available from the following :variable:`compiler ids _COMPILER_ID>` as of the versions specified for each: diff --git a/Help/release/3.9.rst b/Help/release/3.9.rst index 7222196..cd9476d 100644 --- a/Help/release/3.9.rst +++ b/Help/release/3.9.rst @@ -18,7 +18,7 @@ Languages :ref:`Makefile Generators` and the :generator:`Ninja` generator. * CMake is now aware of the :prop_tgt:`C++ standards ` and - :prop_tgt:`C standards ` and thier associated meta-features for + :prop_tgt:`C standards ` and their associated meta-features for the following :variable:`compiler ids _COMPILER_ID>`: ``Cray``, ``PGI``, and ``XL``. -- cgit v0.12 From c4610df03cf29f3f6765c897b47d0f5788cfc1fb Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 15 Jun 2017 10:11:09 -0400 Subject: Help: Document that VS 2017 compile features are recorded They were recorded by commit v3.7.0-rc1~156^2~2 (Features: Record features for VS 15 Preview 4, 2016-09-05). Fixes: #16974 --- Help/manual/cmake-compile-features.7.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Help/manual/cmake-compile-features.7.rst b/Help/manual/cmake-compile-features.7.rst index 6304ac1..0124395 100644 --- a/Help/manual/cmake-compile-features.7.rst +++ b/Help/manual/cmake-compile-features.7.rst @@ -334,7 +334,7 @@ versions specified for each: * ``AppleClang``: Apple Clang for Xcode versions 4.4 though 6.2. * ``Clang``: Clang compiler versions 2.9 through 3.4. * ``GNU``: GNU compiler versions 4.4 through 5.0. -* ``MSVC``: Microsoft Visual Studio versions 2010 through 2015. +* ``MSVC``: Microsoft Visual Studio versions 2010 through 2017. * ``SunPro``: Oracle SolarisStudio versions 12.4 through 12.5. * ``Intel``: Intel compiler versions 12.1 through 17.0. -- cgit v0.12