[Cmake-commits] CMake branch, next, updated. v3.1.0-1947-g0be087e

[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  0be087e620e3993145474bb8ee30cb7811d0f83c (commit)
       via  ab8bdd3ba8b14092c30e78a72b599f154d3f850d (commit)
      from  f1c1ed54aa09398e28a04fca7e88b48f15b4283e (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0be087e620e3993145474bb8ee30cb7811d0f83c
commit 0be087e620e3993145474bb8ee30cb7811d0f83c
Merge: f1c1ed5 ab8bdd3
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 15 10:34:23 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jan 15 10:34:23 2015 -0500

    Merge topic 'windows-utf-8' into next
    
    ab8bdd3b Help: Revise wording of Windows UTF-8 support docs/notes


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ab8bdd3ba8b14092c30e78a72b599f154d3f850d
commit ab8bdd3ba8b14092c30e78a72b599f154d3f850d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 15 10:34:13 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jan 15 10:34:13 2015 -0500

    Help: Revise wording of Windows UTF-8 support docs/notes

diff --git a/Help/manual/cmake-language.7.rst b/Help/manual/cmake-language.7.rst
index 1d4b09c..5ec5858 100644
--- a/Help/manual/cmake-language.7.rst
+++ b/Help/manual/cmake-language.7.rst
@@ -67,9 +67,10 @@ as input files are read.
 
 Note that the implementation is 8-bit clean so source files may
 be encoded as UTF-8 on platforms with system APIs supporting this
-encoding.  In addition, CMake 3.2 and above support UTF-8 files on
-Windows while using UTF-16 to call system APIs.  Furthermore, CMake 3.0
-and above allow a leading UTF-8 `Byte-Order Mark`_ in source files.
+encoding.  In addition, CMake 3.2 and above support source files
+encoded in UTF-8 on Windows (using UTF-16 to call system APIs).
+Furthermore, CMake 3.0 and above allow a leading UTF-8
+`Byte-Order Mark`_ in source files.
 
 .. _`Byte-Order Mark`: http://en.wikipedia.org/wiki/Byte_order_mark
 
diff --git a/Help/release/dev/windows-utf-8.rst b/Help/release/dev/windows-utf-8.rst
index 9438cdc..a4e3ff0 100644
--- a/Help/release/dev/windows-utf-8.rst
+++ b/Help/release/dev/windows-utf-8.rst
@@ -1,17 +1,17 @@
 windows-utf-8
--------------------------
+-------------
 
-* The Windows version of CMake has been enhanced to use Unicode.  This
-  allows using characters from multiple languages in CMake.  Because CMake
-  interoperates with many other tools, there may still be some limitations
-  when using certain Unicode characters.
+* On Windows, CMake learned to support Unicode characters.  This allows using
+  characters from multiple (spoken) languages in CMake code and in paths to
+  source files.  Because CMake interoperates with many other tools, there may
+  still be some limitations when using certain Unicode characters.
 
-  The Visual Studio generators have been enhanced to write solution and
-  project files in UTF-8 instead of Windows-1252.  Windows-1252 supported
-  Latin 1 languages such as those found in North and South America and Western
-  Europe.  With UTF-8, additional languages are supported.
+  Files written in the :manual:`cmake-language(7)`, such as ``CMakeLists.txt``
+  or ``*.cmake`` files, are expected to be encoded as UTF-8.  If files are
+  already ASCII, they will be compatible.  If files were in a different
+  encoding, including Latin 1, they will need to be converted.
 
-  Files written in the :manual:`cmake-language(7)`, such as
-  ``CMakeLists.txt`` for ``*.cmake`` files are expected to be UTF-8 encoded.
-  If files are already ASCII, they will be compatible.  If files were in a
-  different encoding, including Latin 1, they will need to be converted.
+  The Visual Studio generators now write solution and project files in UTF-8
+  instead of Windows-1252.  Windows-1252 supported Latin 1 languages such as
+  those found in North and South America and Western Europe.  With UTF-8,
+  additional languages are now supported.

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

Summary of changes:
 Help/manual/cmake-language.7.rst   |    7 ++++---
 Help/release/dev/windows-utf-8.rst |   26 +++++++++++++-------------
 2 files changed, 17 insertions(+), 16 deletions(-)


hooks/post-receive
-- 
CMake