From 08c1e93fa36a49f49325a07fe91ff92c964c2b6c Mon Sep 17 00:00:00 2001
From: Chanho Park <chanho61.park@samsung.com>
Date: Thu, 11 Dec 2014 18:55:56 +0900
Subject: Imported Upstream version 1.57.0

---
 doc/html/boost_asio/reference/basic_socket.html | 35 ++++++++++++++-----------
 1 file changed, 20 insertions(+), 15 deletions(-)

(limited to 'doc/html/boost_asio/reference/basic_socket.html')

diff --git a/doc/html/boost_asio/reference/basic_socket.html b/doc/html/boost_asio/reference/basic_socket.html
index be420494a0..27917c15ee 100644
--- a/doc/html/boost_asio/reference/basic_socket.html
+++ b/doc/html/boost_asio/reference/basic_socket.html
@@ -3,7 +3,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>basic_socket</title>
 <link rel="stylesheet" href="../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="../../boost_asio.html" title="Boost.Asio">
 <link rel="up" href="../reference.html" title="Reference">
 <link rel="prev" href="basic_signal_set/service_type.html" title="basic_signal_set::service_type">
@@ -38,7 +38,7 @@
 </pre>
 <h5>
 <a name="boost_asio.reference.basic_socket.h0"></a>
-        <span><a name="boost_asio.reference.basic_socket.types"></a></span><a class="link" href="basic_socket.html#boost_asio.reference.basic_socket.types">Types</a>
+        <span class="phrase"><a name="boost_asio.reference.basic_socket.types"></a></span><a class="link" href="basic_socket.html#boost_asio.reference.basic_socket.types">Types</a>
       </h5>
 <div class="informaltable"><table class="table">
 <colgroup>
@@ -331,7 +331,7 @@
 </table></div>
 <h5>
 <a name="boost_asio.reference.basic_socket.h1"></a>
-        <span><a name="boost_asio.reference.basic_socket.member_functions"></a></span><a class="link" href="basic_socket.html#boost_asio.reference.basic_socket.member_functions">Member
+        <span class="phrase"><a name="boost_asio.reference.basic_socket.member_functions"></a></span><a class="link" href="basic_socket.html#boost_asio.reference.basic_socket.member_functions">Member
         Functions</a>
       </h5>
 <div class="informaltable"><table class="table">
@@ -423,6 +423,10 @@
                 <p>
                   Move-construct a basic_socket from another.
                 </p>
+                <p>
+                  Move-construct a basic_socket from a socket of another protocol
+                  type.
+                </p>
               </td>
 </tr>
 <tr>
@@ -624,6 +628,9 @@
                 <p>
                   Move-assign a basic_socket from another.
                 </p>
+                <p>
+                  Move-assign a basic_socket from a socket of another protocol type.
+                </p>
               </td>
 </tr>
 <tr>
@@ -666,7 +673,7 @@
 </table></div>
 <h5>
 <a name="boost_asio.reference.basic_socket.h2"></a>
-        <span><a name="boost_asio.reference.basic_socket.protected_member_functions"></a></span><a class="link" href="basic_socket.html#boost_asio.reference.basic_socket.protected_member_functions">Protected
+        <span class="phrase"><a name="boost_asio.reference.basic_socket.protected_member_functions"></a></span><a class="link" href="basic_socket.html#boost_asio.reference.basic_socket.protected_member_functions">Protected
         Member Functions</a>
       </h5>
 <div class="informaltable"><table class="table">
@@ -727,7 +734,7 @@
 </table></div>
 <h5>
 <a name="boost_asio.reference.basic_socket.h3"></a>
-        <span><a name="boost_asio.reference.basic_socket.data_members"></a></span><a class="link" href="basic_socket.html#boost_asio.reference.basic_socket.data_members">Data
+        <span class="phrase"><a name="boost_asio.reference.basic_socket.data_members"></a></span><a class="link" href="basic_socket.html#boost_asio.reference.basic_socket.data_members">Data
         Members</a>
       </h5>
 <div class="informaltable"><table class="table">
@@ -812,7 +819,7 @@
 </table></div>
 <h5>
 <a name="boost_asio.reference.basic_socket.h4"></a>
-        <span><a name="boost_asio.reference.basic_socket.protected_data_members"></a></span><a class="link" href="basic_socket.html#boost_asio.reference.basic_socket.protected_data_members">Protected
+        <span class="phrase"><a name="boost_asio.reference.basic_socket.protected_data_members"></a></span><a class="link" href="basic_socket.html#boost_asio.reference.basic_socket.protected_data_members">Protected
         Data Members</a>
       </h5>
 <div class="informaltable"><table class="table">
@@ -868,31 +875,29 @@
       </p>
 <h5>
 <a name="boost_asio.reference.basic_socket.h5"></a>
-        <span><a name="boost_asio.reference.basic_socket.thread_safety"></a></span><a class="link" href="basic_socket.html#boost_asio.reference.basic_socket.thread_safety">Thread
+        <span class="phrase"><a name="boost_asio.reference.basic_socket.thread_safety"></a></span><a class="link" href="basic_socket.html#boost_asio.reference.basic_socket.thread_safety">Thread
         Safety</a>
       </h5>
 <p>
-        <span class="bold"><strong>Distinct</strong></span> <span class="bold"><strong>objects:</strong></span>
-        Safe.
+        <span class="emphasis"><em>Distinct</em></span> <span class="emphasis"><em>objects:</em></span> Safe.
       </p>
 <p>
-        <span class="bold"><strong>Shared</strong></span> <span class="bold"><strong>objects:</strong></span>
-        Unsafe.
+        <span class="emphasis"><em>Shared</em></span> <span class="emphasis"><em>objects:</em></span> Unsafe.
       </p>
 <h5>
 <a name="boost_asio.reference.basic_socket.h6"></a>
-        <span><a name="boost_asio.reference.basic_socket.requirements"></a></span><a class="link" href="basic_socket.html#boost_asio.reference.basic_socket.requirements">Requirements</a>
+        <span class="phrase"><a name="boost_asio.reference.basic_socket.requirements"></a></span><a class="link" href="basic_socket.html#boost_asio.reference.basic_socket.requirements">Requirements</a>
       </h5>
 <p>
-        <span class="bold"><strong>Header: </strong></span><code class="literal">boost/asio/basic_socket.hpp</code>
+        <span class="emphasis"><em>Header: </em></span><code class="literal">boost/asio/basic_socket.hpp</code>
       </p>
 <p>
-        <span class="bold"><strong>Convenience header: </strong></span><code class="literal">boost/asio.hpp</code>
+        <span class="emphasis"><em>Convenience header: </em></span><code class="literal">boost/asio.hpp</code>
       </p>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2003-2012 Christopher M. Kohlhoff<p>
+<td align="right"><div class="copyright-footer">Copyright &#169; 2003-2014 Christopher M. Kohlhoff<p>
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
       </p>
-- 
cgit v1.2.3