Merge branch 'release'

6 files changed, 32 insertions, 27 deletions

diff --git a/Help/release/3.0.rst b/Help/release/3.0.0.rst
index 45f7635..208e92a 100644
--- a/Help/release/3.0.rst
+++ b/Help/release/3.0.0.rst
@@ -1,5 +1,5 @@
-CMake 3.0 Release Notes
-***********************
+CMake 3.0.0 Release Notes
+*************************
 
 .. only:: html
 
@@ -39,7 +39,7 @@ Documentation Changes
   - :manual:`cmake-toolchains(7)`
   - :manual:`cmake-variables(7)`, replacing ``cmakevars(1)``
 
-* Release notes for CMake 3.0 and above will now be included with
+* Release notes for CMake 3.0.0 and above will now be included with
   the html documentation.
 
 New Features
@@ -216,6 +216,9 @@ Modules
 * A new :module:`FindLua` module has been added to support
   :command:`find_package(Lua)` calls.
 
+* The :module:`FindBoost` module learned a new ``Boost_NAMESPACE``
+  option to change the ``boost`` prefix on library names.
+
 * The :module:`FindBoost` module learned to control search
   for libraies with the ``g`` tag (for MS debug runtime) with
   a new ``Boost_USE_DEBUG_RUNTIME`` option.  It is ``ON`` by
@@ -387,6 +390,11 @@ Deprecated and Removed Features
 Other Changes
 =============
 
+* The version scheme was changed to use only two components for
+  the feature level instead of three.  The third component will
+  now be used for bug-fix releases or the date of development versions.
+  See the :variable:`CMAKE_VERSION` variable documentation for details.
+
 * The default install locations of CMake itself on Windows and
   OS X no longer contain the CMake version number.  This allows
   for easy replacement without re-generating local build trees
diff --git a/Help/release/dev/0-sample-topic.rst b/Help/release/dev/0-sample-topic.rst
deleted file mode 100644
index e4cc01e..0000000
--- a/Help/release/dev/0-sample-topic.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-0-sample-topic
---------------
-
-* This is a sample release note for the change in a topic.
-  Developers should add similar notes for each topic branch
-  making a noteworthy change.  Each document should be named
-  and titled to match the topic name to avoid merge conflicts.
diff --git a/Help/release/dev/Boost_NAMESPACE.rst b/Help/release/dev/Boost_NAMESPACE.rst
deleted file mode 100644
index 434db29..0000000
--- a/Help/release/dev/Boost_NAMESPACE.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-Boost_NAMESPACE
----------------
-
-* The :module:`FindBoost` module learned a new ``Boost_NAMESPACE``
-  option to change the ``boost`` prefix on library names.
diff --git a/Help/release/index.rst b/Help/release/index.rst
index 5c3a771..752c568 100644
--- a/Help/release/index.rst
+++ b/Help/release/index.rst
@@ -5,12 +5,10 @@ CMake Release Notes
   This file should include the adjacent "dev.txt" file
   in development versions but not in release versions.
 
-.. include:: dev.txt
-
 Releases
 ========
 
 .. toctree::
    :maxdepth: 1
 
-   3.0 <3.0>
+   3.0.0 <3.0.0>
diff --git a/Help/variable/CMAKE_TWEAK_VERSION.rst b/Help/variable/CMAKE_TWEAK_VERSION.rst
index a2c8f35..be2e050 100644
--- a/Help/variable/CMAKE_TWEAK_VERSION.rst
+++ b/Help/variable/CMAKE_TWEAK_VERSION.rst
@@ -1,5 +1,11 @@
 CMAKE_TWEAK_VERSION
 -------------------
 
-Fourth version number component of the :variable:`CMAKE_VERSION`
-variable.
+Defined to ``0`` for compatibility with code written for older
+CMake versions that may have defined higher values.
+
+.. note::
+
+  In CMake versions 2.8.2 through 2.8.12, this variable holds
+  the fourth version number component of the
+  :variable:`CMAKE_VERSION` variable.
diff --git a/Help/variable/CMAKE_VERSION.rst b/Help/variable/CMAKE_VERSION.rst
index 6184f08..bbb1d91 100644
--- a/Help/variable/CMAKE_VERSION.rst
+++ b/Help/variable/CMAKE_VERSION.rst
@@ -1,24 +1,23 @@
 CMAKE_VERSION
 -------------
 
-The CMake version string as up to four non-negative integer components
+The CMake version string as three non-negative integer components
 separated by ``.`` and possibly followed by ``-`` and other information.
-The first three components represent the feature level and the fourth
+The first two components represent the feature level and the third
 component represents either a bug-fix level or development date.
 
 Release versions and release candidate versions of CMake use the format::
 
-  <major>.<minor>.<patch>[.<tweak>][-rc<n>]
+  <major>.<minor>.<patch>[-rc<n>]
 
-where the ``<tweak>`` component is less than ``20000000``.  Development
+where the ``<patch>`` component is less than ``20000000``.  Development
 versions of CMake use the format::
 
-  <major>.<minor>.<patch>.<date>[-<id>]
+  <major>.<minor>.<date>[-<id>]
 
 where the ``<date>`` component is of format ``CCYYMMDD`` and ``<id>``
 may contain arbitrary text.  This represents development as of a
-particular date following the ``<major>.<minor>.<patch>`` feature
-release.
+particular date following the ``<major>.<minor>`` feature release.
 
 Individual component values are also available in variables:
 
@@ -35,6 +34,12 @@ strings as floating-point numbers.
 
 .. note::
 
+  CMake versions 2.8.2 through 2.8.12 used three components for the
+  feature level.  Release versions represented the bug-fix level in a
+  fourth component, i.e. ``<major>.<minor>.<patch>[.<tweak>][-rc<n>]``.
+  Development versions represented the development date in the fourth
+  component, i.e. ``<major>.<minor>.<patch>.<date>[-<id>]``.
+
   CMake versions prior to 2.8.2 used three components for the
   feature level and had no bug-fix component.  Release versions
   used an even-valued second component, i.e.