Imported Upstream version 1.61.0

Change-Id: I96a1f878d1e6164f01e9aadd5147f38fca448d90
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>

5 files changed, 28 insertions, 54 deletions

diff --git a/more/getting_started/detail/release-variables.rst b/more/getting_started/detail/release-variables.rst
index 8668f24d78..ca9d8beaa4 100644
--- a/more/getting_started/detail/release-variables.rst
+++ b/more/getting_started/detail/release-variables.rst
@@ -5,8 +5,8 @@
 .. This file contains all the definitions that need to be updated
 .. for each new release of Boost.
 
-.. |boost-version-number| replace:: 1.60.0
-.. |boost_ver| replace:: ``boost_1_60_0``
-.. |boost_ver-bold| replace:: **boost_1_60_0**
+.. |boost-version-number| replace:: 1.61.0
+.. |boost_ver| replace:: ``boost_1_61_0``
+.. |boost_ver-bold| replace:: **boost_1_61_0**
 
-.. _sf-download: http://www.boost.org/users/history/version_1_60_0.html
+.. _sf-download: http://www.boost.org/users/history/version_1_61_0.html
diff --git a/more/getting_started/unix-variants.html b/more/getting_started/unix-variants.html
index 3f8dc85045..0d542dfe41 100644
--- a/more/getting_started/unix-variants.html
+++ b/more/getting_started/unix-variants.html
@@ -61,14 +61,14 @@
 <div class="section" id="get-boost">
 <h1><a class="toc-backref" href="#id19">1&nbsp;&nbsp;&nbsp;Get Boost</a></h1>
 <p>The most reliable way to get a copy of Boost is to download a
-distribution from <a class="reference external" href="http://www.boost.org/users/history/version_1_60_0.html">SourceForge</a>:</p>
+distribution from <a class="reference external" href="http://www.boost.org/users/history/version_1_61_0.html">SourceForge</a>:</p>
 <ol class="arabic">
-<li><p class="first">Download <a class="reference external" href="http://www.boost.org/users/history/version_1_60_0.html"><tt class="docutils literal">boost_1_60_0</tt><tt class="docutils literal">.tar.bz2</tt></a>.</p>
+<li><p class="first">Download <a class="reference external" href="http://www.boost.org/users/history/version_1_61_0.html"><tt class="docutils literal">boost_1_61_0</tt><tt class="docutils literal">.tar.bz2</tt></a>.</p>
 </li>
 <li><p class="first">In the directory where you want to put the Boost installation,
 execute</p>
 <pre class="literal-block">
-tar --bzip2 -xf <em>/path/to/</em><tt class="docutils literal">boost_1_60_0</tt>.tar.bz2
+tar --bzip2 -xf <em>/path/to/</em><tt class="docutils literal">boost_1_61_0</tt>.tar.bz2
 </pre>
 </li>
 </ol>
@@ -81,7 +81,7 @@ creators usually choose to break Boost up into several packages,
 reorganize the directory structure of the Boost distribution,
 and/or rename the library binaries.<a class="footnote-reference" href="#packagers" id="id2"><sup>1</sup></a> If you have
 any trouble, we suggest using an official Boost distribution
-from <a class="reference external" href="http://www.boost.org/users/history/version_1_60_0.html">SourceForge</a>.</p>
+from <a class="reference external" href="http://www.boost.org/users/history/version_1_61_0.html">SourceForge</a>.</p>
 </div>
 <!-- Copyright David Abrahams 2006. Distributed under the Boost -->
 <!-- Software License, Version 1.0. (See accompanying -->
@@ -91,7 +91,7 @@ from <a class="reference external" href="http://www.boost.org/users/history/vers
 <h1><a class="toc-backref" href="#id20">2&nbsp;&nbsp;&nbsp;The Boost Distribution</a></h1>
 <p>This is a sketch of the resulting directory structure:</p>
 <pre class="literal-block">
-<strong>boost_1_60_0</strong><strong>/</strong> .................<em>The “boost root directory”</em>
+<strong>boost_1_61_0</strong><strong>/</strong> .................<em>The “boost root directory”</em>
    <strong>index.htm</strong> .........<em>A copy of www.boost.org starts here</em>
    <strong>boost</strong><strong>/</strong> .........................<em>All Boost Header files</em>
    <tt class="docutils literal"> </tt>
@@ -136,7 +136,7 @@ anything you can use in these directories.</p>
 </div>
 <p>It's important to note the following:</p>
 <ol class="arabic" id="boost-root-directory">
-<li><p class="first">The path to the <strong>boost root directory</strong> (often <tt class="docutils literal">/usr/local/</tt><tt class="docutils literal">boost_1_60_0</tt>) is
+<li><p class="first">The path to the <strong>boost root directory</strong> (often <tt class="docutils literal">/usr/local/</tt><tt class="docutils literal">boost_1_61_0</tt>) is
 sometimes referred to as <tt class="docutils literal">$BOOST_ROOT</tt> in documentation and
 mailing lists .</p>
 </li>
@@ -245,7 +245,7 @@ int main()
 <p>Now, in the directory where you saved <tt class="docutils literal">example.cpp</tt>, issue the
 following command:</p>
 <pre class="literal-block">
-c++ -I <em>path/to/</em><tt class="docutils literal">boost_1_60_0</tt> example.cpp -o example
+c++ -I <em>path/to/</em><tt class="docutils literal">boost_1_61_0</tt> example.cpp -o example
 </pre>
 <p>To test the result, type:</p>
 <pre class="literal-block">
@@ -276,7 +276,7 @@ you'll need to acquire library binaries.</p>
 <p>Issue the following commands in the shell (don't type <tt class="docutils literal">$</tt>; that
 represents the shell's prompt):</p>
 <pre class="literal-block">
-<strong>$</strong> cd <em>path/to/</em><tt class="docutils literal">boost_1_60_0</tt>
+<strong>$</strong> cd <em>path/to/</em><tt class="docutils literal">boost_1_61_0</tt>
 <strong>$</strong> ./bootstrap.sh --help
 </pre>
 <p>Select your configuration options and invoke <tt class="docutils literal">./bootstrap.sh</tt> again
@@ -306,11 +306,6 @@ need to use <a class="reference external" href="../../tools/build/index.html">Bo
 <p>You'll also
 use this method if you need a nonstandard build variant (see the
 <a class="reference external" href="../../tools/build/index.html">Boost.Build documentation</a> for more details).</p>
-<div class="admonition-boost-cmake admonition">
-<p class="first admonition-title">Boost.CMake</p>
-<p class="last">There is also an experimental CMake build for boost, supported and distributed
-separately.  See the <a class="reference external" href="https://svn.boost.org/trac/boost/wiki/CMake">Boost.CMake</a> wiki page for more information.</p>
-</div>
 <!-- Copyright David Abrahams 2006. Distributed under the Boost -->
 <!-- Software License, Version 1.0. (See accompanying -->
 <!-- file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -->
@@ -430,7 +425,7 @@ b2 <strong>--build-dir=</strong><a class="reference internal" href="#id10"><em>b
 please see the <a class="reference external" href="http://www.boost.org/build/doc/html/bbv2/overview/invocation.html">Boost.Build documentation</a>.</p>
 <p>For example, your session might look like this:</p>
 <pre class="literal-block">
-$ cd ~/<tt class="docutils literal">boost_1_60_0</tt>
+$ cd ~/<tt class="docutils literal">boost_1_61_0</tt>
 $ b2 <strong>--build-dir=</strong>/tmp/build-boost <strong>toolset=</strong>gcc stage
 </pre>
 <p>That will build static and shared non-debug multi-threaded variants of the libraries. To build all variants, pass the additional option, “<tt class="docutils literal"><span class="pre">--build-type=complete</span></tt>”.</p>
@@ -546,14 +541,14 @@ project.</li>
 <ol class="upperalpha">
 <li><p class="first">You can specify the full path to each library:</p>
 <pre class="literal-block">
-$ c++ -I <em>path/to/</em><tt class="docutils literal">boost_1_60_0</tt> example.cpp -o example <strong>\</strong>
+$ c++ -I <em>path/to/</em><tt class="docutils literal">boost_1_61_0</tt> example.cpp -o example <strong>\</strong>
    <strong>~/boost/stage/lib/libboost_regex-gcc34-mt-d-1_36.a</strong>
 </pre>
 </li>
 <li><p class="first">You can separately specify a directory to search (with <tt class="docutils literal"><span class="pre">-L</span></tt><em>directory</em>) and a library name to search for (with <tt class="docutils literal"><span class="pre">-l</span></tt><em>library</em>,<a class="footnote-reference" href="#lowercase-l" id="id14"><sup>2</sup></a> dropping the filename's leading <tt class="docutils literal">lib</tt> and trailing
 suffix (<tt class="docutils literal">.a</tt> in this case):</p>
 <pre class="literal-block">
-$ c++ -I <em>path/to/</em><tt class="docutils literal">boost_1_60_0</tt> example.cpp -o example <strong>\</strong>
+$ c++ -I <em>path/to/</em><tt class="docutils literal">boost_1_61_0</tt> example.cpp -o example <strong>\</strong>
    <strong>-L~/boost/stage/lib/ -lboost_regex-gcc34-mt-d-1_36</strong>
 </pre>
 <p>As you can see, this method is just as terse as method A for one
diff --git a/more/getting_started/unix-variants.rst b/more/getting_started/unix-variants.rst
index 40f6f228d4..6cc7bc9735 100644
--- a/more/getting_started/unix-variants.rst
+++ b/more/getting_started/unix-variants.rst
@@ -135,14 +135,6 @@ You'll also
 use this method if you need a nonstandard build variant (see the
 `Boost.Build documentation`_ for more details).
 
-.. Admonition:: Boost.CMake
-
-  There is also an experimental CMake build for boost, supported and distributed
-  separately.  See the `Boost.CMake`_ wiki page for more information.
-
-  .. _`Boost.CMake`:
-       https://svn.boost.org/trac/boost/wiki/CMake
-
 .. include:: detail/build-from-source-head.rst
 
 For example, your session might look like this:
diff --git a/more/getting_started/windows.html b/more/getting_started/windows.html
index 1c2a495f28..f110e85c74 100644
--- a/more/getting_started/windows.html
+++ b/more/getting_started/windows.html
@@ -61,7 +61,7 @@ not supported—they may or may not work.</p>
 <div class="section" id="get-boost">
 <h1><a class="toc-backref" href="#id27">1&nbsp;&nbsp;&nbsp;Get Boost</a></h1>
 <p>The most reliable way to get a copy of Boost is to
-download <a class="reference external" href="http://www.boost.org/users/history/version_1_60_0.html"><tt class="docutils literal">boost_1_60_0</tt><tt class="docutils literal">.7z</tt></a> or <a class="reference external" href="http://www.boost.org/users/history/version_1_60_0.html"><tt class="docutils literal">boost_1_60_0</tt><tt class="docutils literal">.zip</tt></a> and unpack it to install a complete Boost
+download <a class="reference external" href="http://www.boost.org/users/history/version_1_61_0.html"><tt class="docutils literal">boost_1_61_0</tt><tt class="docutils literal">.7z</tt></a> or <a class="reference external" href="http://www.boost.org/users/history/version_1_61_0.html"><tt class="docutils literal">boost_1_61_0</tt><tt class="docutils literal">.zip</tt></a> and unpack it to install a complete Boost
 distribution.<a class="footnote-reference" href="#zip" id="id2"><sup>1</sup></a></p>
 <!-- Copyright David Abrahams 2006. Distributed under the Boost -->
 <!-- Software License, Version 1.0. (See accompanying -->
@@ -71,7 +71,7 @@ distribution.<a class="footnote-reference" href="#zip" id="id2"><sup>1</sup></a>
 <h1><a class="toc-backref" href="#id28">2&nbsp;&nbsp;&nbsp;The Boost Distribution</a></h1>
 <p>This is a sketch of the resulting directory structure:</p>
 <pre class="literal-block">
-<strong>boost_1_60_0</strong><strong>\</strong> .................<em>The “boost root directory”</em>
+<strong>boost_1_61_0</strong><strong>\</strong> .................<em>The “boost root directory”</em>
    <strong>index.htm</strong> .........<em>A copy of www.boost.org starts here</em>
    <strong>boost</strong><strong>\</strong> .........................<em>All Boost Header files</em>
    <strong>lib</strong><strong>\</strong> .....................<em>precompiled library binaries</em>
@@ -116,7 +116,7 @@ anything you can use in these directories.</p>
 </div>
 <p>It's important to note the following:</p>
 <ol class="arabic" id="boost-root-directory">
-<li><p class="first">The path to the <strong>boost root directory</strong> (often <tt class="docutils literal"><span class="pre">C:\Program</span> Files\boost\</tt><tt class="docutils literal">boost_1_60_0</tt>) is
+<li><p class="first">The path to the <strong>boost root directory</strong> (often <tt class="docutils literal"><span class="pre">C:\Program</span> Files\boost\</tt><tt class="docutils literal">boost_1_61_0</tt>) is
 sometimes referred to as <tt class="docutils literal">$BOOST_ROOT</tt> in documentation and
 mailing lists .</p>
 </li>
@@ -255,7 +255,7 @@ cd <em>path</em>\<em>to</em>\<em>some</em>\<em>directory</em>
 </pre>
 <p>followed by Return.  For example,</p>
 <pre class="literal-block">
-cd <tt class="docutils literal"><span class="pre">C:\Program</span> Files\boost\</tt><tt class="docutils literal">boost_1_60_0</tt>
+cd <tt class="docutils literal"><span class="pre">C:\Program</span> Files\boost\</tt><tt class="docutils literal">boost_1_61_0</tt>
 </pre>
 <p class="last">Long commands can be continued across several lines by typing a
 caret (<tt class="docutils literal">^</tt>) at the end of all but the last line.  Some examples
@@ -280,7 +280,7 @@ select <em>Properties</em> from the resulting pop-up menu</p>
 <li><p class="first">In <em>Configuration Properties</em> &gt; <em>C/C++</em> &gt; <em>General</em> &gt; <em>Additional Include
 Directories</em>, enter the path to the Boost root directory, for example</p>
 <blockquote>
-<p><tt class="docutils literal"><span class="pre">C:\Program</span> Files\boost\</tt><tt class="docutils literal">boost_1_60_0</tt></p>
+<p><tt class="docutils literal"><span class="pre">C:\Program</span> Files\boost\</tt><tt class="docutils literal">boost_1_61_0</tt></p>
 </blockquote>
 </li>
 <li><p class="first">In <em>Configuration Properties</em> &gt; <em>C/C++</em> &gt; <em>Precompiled Headers</em>, change
@@ -318,7 +318,7 @@ Visual Studio compiler.  In that window, set the <a class="reference internal" h
 directory</a> to a suitable location for creating some temporary
 files and type the following command followed by the Return key:</p>
 <pre class="literal-block">
-cl /EHsc /I <em>path\to\</em><tt class="docutils literal">boost_1_60_0</tt> <em>path</em>\<em>to</em>\example.cpp
+cl /EHsc /I <em>path\to\</em><tt class="docutils literal">boost_1_61_0</tt> <em>path</em>\<em>to</em>\example.cpp
 </pre>
 <p>To test the result, type:</p>
 <pre class="literal-block">
@@ -365,11 +365,6 @@ of allowed options.</p>
 <p>If you're using an earlier version of Visual C++, or a compiler
 from another vendor, you'll need to use <a class="reference external" href="../../tools/build/index.html">Boost.Build</a> to create your
 own binaries.</p>
-<div class="admonition-boost-cmake admonition">
-<p class="first admonition-title">Boost.CMake</p>
-<p class="last">There is also an experimental CMake build for boost, supported and distributed
-separately.  See the <a class="reference external" href="https://svn.boost.org/trac/boost/wiki/CMake">Boost.CMake</a> wiki page for more information.</p>
-</div>
 <!-- Copyright David Abrahams 2006. Distributed under the Boost -->
 <!-- Software License, Version 1.0. (See accompanying -->
 <!-- file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -->
@@ -492,8 +487,8 @@ b2 <strong>--build-dir=</strong><a class="reference internal" href="#id12"><em>b
 please see the <a class="reference external" href="http://www.boost.org/build/doc/html/bbv2/overview/invocation.html">Boost.Build documentation</a>.</p>
 <p>For example, your session might look like this:<a class="footnote-reference" href="#continuation" id="id14"><sup>3</sup></a></p>
 <pre class="literal-block">
-C:\WINDOWS&gt; cd <tt class="docutils literal"><span class="pre">C:\Program</span> Files\boost\</tt><tt class="docutils literal">boost_1_60_0</tt>
-<tt class="docutils literal"><span class="pre">C:\Program</span> Files\boost\</tt><tt class="docutils literal">boost_1_60_0</tt>&gt; b2 <strong>^</strong>
+C:\WINDOWS&gt; cd <tt class="docutils literal"><span class="pre">C:\Program</span> Files\boost\</tt><tt class="docutils literal">boost_1_61_0</tt>
+<tt class="docutils literal"><span class="pre">C:\Program</span> Files\boost\</tt><tt class="docutils literal">boost_1_61_0</tt>&gt; b2 <strong>^</strong>
 More? <strong>--build-dir=</strong>&quot;C:\Documents and Settings\dave\build-boost&quot; <strong>^</strong>
 More? <strong>--build-type=complete</strong> <strong>msvc</strong> stage
 </pre>
@@ -632,7 +627,7 @@ earlier:</p>
 select <em>Properties</em> from the resulting pop-up menu</li>
 <li>In <em>Configuration Properties</em> &gt; <em>Linker</em> &gt; <em>Additional Library
 Directories</em>, enter the path to the Boost binaries,
-e.g. <tt class="docutils literal"><span class="pre">C:\Program</span> Files\boost\</tt><tt class="docutils literal">boost_1_60_0</tt><tt class="docutils literal">\lib\</tt>.</li>
+e.g. <tt class="docutils literal"><span class="pre">C:\Program</span> Files\boost\</tt><tt class="docutils literal">boost_1_61_0</tt><tt class="docutils literal">\lib\</tt>.</li>
 <li>From the <em>Build</em> menu, select <em>Build Solution</em>.</li>
 </ol>
 <p><a class="reference internal" href="#test-your-program"><em>skip to the next step</em></a></p>
@@ -642,10 +637,10 @@ e.g. <tt class="docutils literal"><span class="pre">C:\Program</span> Files\boos
 <p>For example, we can compile and link the above program from the
 Visual C++ command-line by simply adding the <strong>bold</strong> text below to
 the command line we used earlier, assuming your Boost binaries are
-in <tt class="docutils literal"><span class="pre">C:\Program</span> Files\boost\</tt><tt class="docutils literal">boost_1_60_0</tt><tt class="docutils literal">\lib</tt>:</p>
+in <tt class="docutils literal"><span class="pre">C:\Program</span> Files\boost\</tt><tt class="docutils literal">boost_1_61_0</tt><tt class="docutils literal">\lib</tt>:</p>
 <pre class="literal-block">
-cl /EHsc /I <em>path\to\</em><tt class="docutils literal">boost_1_60_0</tt> example.cpp   <strong>^</strong>
-     <strong>/link /LIBPATH:</strong><strong>C:\Program Files\boost\</strong><strong>boost_1_60_0</strong><strong>\lib</strong>
+cl /EHsc /I <em>path\to\</em><tt class="docutils literal">boost_1_61_0</tt> example.cpp   <strong>^</strong>
+     <strong>/link /LIBPATH:</strong><strong>C:\Program Files\boost\</strong><strong>boost_1_61_0</strong><strong>\lib</strong>
 </pre>
 </div>
 <div class="section" id="library-naming">
@@ -801,7 +796,7 @@ mailing list</a>.</p>
 <colgroup><col class="label" /><col /></colgroup>
 <tbody valign="top">
 <tr><td class="label"><a class="fn-backref" href="#id2">[1]</a></td><td>We recommend
-downloading <a class="reference external" href="http://www.boost.org/users/history/version_1_60_0.html"><tt class="docutils literal">boost_1_60_0</tt><tt class="docutils literal">.7z</tt></a> and using <a class="reference external" href="http://www.7-zip.org">7-Zip</a> to decompress
+downloading <a class="reference external" href="http://www.boost.org/users/history/version_1_61_0.html"><tt class="docutils literal">boost_1_61_0</tt><tt class="docutils literal">.7z</tt></a> and using <a class="reference external" href="http://www.7-zip.org">7-Zip</a> to decompress
 it.  We no longer recommend .zip files for Boost because they are twice
 as large as the equivalent .7z files.  We don't recommend using Windows'
 built-in decompression as it can be painfully slow for large archives.</td></tr>
diff --git a/more/getting_started/windows.rst b/more/getting_started/windows.rst
index 261ff0f09b..d1f4494643 100644
--- a/more/getting_started/windows.rst
+++ b/more/getting_started/windows.rst
@@ -192,14 +192,6 @@ If you're using an earlier version of Visual C++, or a compiler
 from another vendor, you'll need to use Boost.Build_ to create your
 own binaries.
 
-.. Admonition:: Boost.CMake
-
-  There is also an experimental CMake build for boost, supported and distributed
-  separately.  See the `Boost.CMake`_ wiki page for more information.
-
-  .. _`Boost.CMake`:
-       https://svn.boost.org/trac/boost/wiki/CMake
-
 .. include:: detail/build-from-source-head.rst
 
 For example, your session might look like this: [#continuation]_