From 470e96e75c6f46f69d18b56d4834ed23c3f1604a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= <sebastien.loriot@cgal.org>
Date: Fri, 11 Sep 2015 10:42:57 +0200
Subject: [PATCH] document msvc2015 support

---
 Documentation/doc/Documentation/Installation.txt | 2 +-
 Installation/changes.html                        | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Documentation/doc/Documentation/Installation.txt b/Documentation/doc/Documentation/Installation.txt
index f97e1a58731..e19523dd3ca 100644
--- a/Documentation/doc/Documentation/Installation.txt
+++ b/Documentation/doc/Documentation/Installation.txt
@@ -159,7 +159,7 @@ In order to build the \cgal libraries, you need a \cpp compiler.
 |\sc{Gnu} `g++` 4.1 or later\cgalFootnote{<A HREF="http://gcc.gnu.org/">`http://gcc.gnu.org/`</A>} | Linux / MacOS X |
 |          | \sc{MS} Windows 95/98/2000/XP/NT4 | 
 | \sc{Intel} `C++` 15.0\cgalFootnote{<A HREF="http://software.intel.com/en-us/intel-compilers/">`http://software.intel.com/en-us/intel-compilers/`</A>} | Linux  |
-|\sc{MS} Visual `C++` 10.0, 11.0, 12.0 (\sc{Visual Studio} 2010, 2012, and 2013)\cgalFootnote{<A HREF="http://msdn.microsoft.com/en-us/vstudio/">`http://msdn.microsoft.com/en-us/vstudio/`</A>} | \sc{MS} Windows 95/98/2000/XP/NT4/Vista/7/8 |
+|\sc{MS} Visual `C++` 10.0, 11.0, 12.0, 14.0 (\sc{Visual Studio} 2010, 2012, 2013, and 2015)\cgalFootnote{<A HREF="http://msdn.microsoft.com/en-us/vstudio/">`http://msdn.microsoft.com/en-us/vstudio/`</A>} | \sc{MS} Windows 95/98/2000/XP/NT4/Vista/7/8 |
 | `Clang` \cgalFootnote{<A HREF="http://clang.llvm.org/">`http://clang.llvm.org/`</A>} compiler version 3.5 and 3.6.2 | Linux / MacOS X |
 | Apple `Clang` compiler version 6.0 and 4.2 | MacOS X |
 
diff --git a/Installation/changes.html b/Installation/changes.html
index 4186a62a0df..87243a6714b 100644
--- a/Installation/changes.html
+++ b/Installation/changes.html
@@ -135,7 +135,10 @@ and <code>src/</code> directories).
     <li>The code of the 3D demos now use modern OpenGL, with shaders,
     instead of the fixed pipeline API of OpenGL-1.</li>
     <li>Initial support of the Microsoft Windows Visual C++ compiler 2015
-    (VC14).</li>
+    (VC14). However, since this compiler is not officially supported by
+    Intel TBB 4.4 and QT 5.5 (the latest versions available at the time of this
+    release), the parallelism features of CGAL and Qt5 demos will not work.
+    </li>
   </ul>
 
   <h3>General</h3>