From 1c0b55c2f909e7dee1085f6b491ecd07ce61ce58 Mon Sep 17 00:00:00 2001
From: Rene Rivera <grafikrobot@gmail.com>
Date: Mon, 23 Oct 2017 09:25:43 -0500
Subject: [PATCH] Some tweak for 1.7 release.

* Bump version to 1.7
* Tweak docs for UWP detection.
* Add 1.7 history items.
---
 doc/history.qbk                                 |  5 +++++
 doc/predef.qbk                                  |  2 +-
 include/boost/predef/platform/windows_runtime.h |  9 ++++-----
 include/boost/predef/platform/windows_uwp.h     | 13 +++++++++----
 include/boost/predef/version.h                  |  2 +-
 5 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/doc/history.qbk b/doc/history.qbk
index 4af13d3..b3e13d9 100644
--- a/doc/history.qbk
+++ b/doc/history.qbk
@@ -7,6 +7,11 @@ http://www.boost.org/LICENSE_1_0.txt)
 
 [section History]
 
+[heading 1.7]
+
+* Fix BOOST_ARCH_PARISK/BOOST_ARCH_PARISC typo.
+* Improved Windows Universal Platform detection. (from James E. King, III)
+
 [heading 1.6]
 
 * Fix Intel C/C++ version 9999 detection to be 12.1.0.
diff --git a/doc/predef.qbk b/doc/predef.qbk
index c5d39c6..4e8b79b 100644
--- a/doc/predef.qbk
+++ b/doc/predef.qbk
@@ -1,6 +1,6 @@
 [article Boost.Predef
     [quickbook 1.7]
-    [version 1.6]
+    [version 1.7]
     [authors [Rivera, Rene]]
     [copyright 2005-2016 Rene Rivera]
     [copyright 2015 Charly Chevalier]
diff --git a/include/boost/predef/platform/windows_runtime.h b/include/boost/predef/platform/windows_runtime.h
index 1282e02..c67afef 100644
--- a/include/boost/predef/platform/windows_runtime.h
+++ b/include/boost/predef/platform/windows_runtime.h
@@ -18,11 +18,10 @@ http://www.boost.org/LICENSE_1_0.txt)
 /*`
 [heading `BOOST_PLAT_WINDOWS_RUNTIME`]
 
-This is deprecated.  Consumers should switch to use:
-
-    `BOOST_PLAT_WINDOWS_PHONE || BOOST_PLAT_WINDOWS_STORE`
-
-to detect a non-desktop UWP target.
+To detect a non-desktop UWP target It is preferable to use the more specific:
+```
+    BOOST_PLAT_WINDOWS_PHONE || BOOST_PLAT_WINDOWS_STORE
+```
 
 [table
     [[__predef_symbol__] [__predef_version__]]
diff --git a/include/boost/predef/platform/windows_uwp.h b/include/boost/predef/platform/windows_uwp.h
index 97e1051..56bbf33 100644
--- a/include/boost/predef/platform/windows_uwp.h
+++ b/include/boost/predef/platform/windows_uwp.h
@@ -22,14 +22,19 @@ a specific family one would define WINAPI_FAMILY, and in a UWP-capable
 environment this may limit the Win32 APIs available to achieve portability.
 
 To detect Windows API availability that is backwards compatible to pre-UWP SDKs, use:
-    `#if !BOOST_PLAT_WINDOWS_UWP || BOOST_PLAT_WINDOWS_DESKTOP`
+```
+    #if !BOOST_PLAT_WINDOWS_UWP || BOOST_PLAT_WINDOWS_DESKTOP
+```
 
 To detect Windows API availability in a specific UWP family, for example SYSTEM:
-    `#if BOOST_PLAT_WINDOWS_SYSTEM`
+```
+    #if BOOST_PLAT_WINDOWS_SYSTEM
+```
 
 UWP development is available on:
-  - Microsoft Windows SDK 8.0 or later
-  - MinGW-w64 version 3.0 or later
+
+* Microsoft Windows SDK 8.0 or later
+* MinGW-w64 version 3.0 or later
 
 [table
     [[__predef_symbol__] [__predef_version__]]
diff --git a/include/boost/predef/version.h b/include/boost/predef/version.h
index e03469f..bcf97ad 100644
--- a/include/boost/predef/version.h
+++ b/include/boost/predef/version.h
@@ -10,6 +10,6 @@ http://www.boost.org/LICENSE_1_0.txt)
 
 #include <boost/predef/version_number.h>
 
-#define BOOST_PREDEF_VERSION BOOST_VERSION_NUMBER(1,6,0)
+#define BOOST_PREDEF_VERSION BOOST_VERSION_NUMBER(1,7,0)
 
 #endif