[Boost-commit] svn:boost r47552 - in branches/release: . libs/asio/doc libs/asio/doc/overview

From: chris_at_[hidden]
Date: 2008-07-18 09:36:20

Author: chris_kohlhoff
Date: 2008-07-18 09:36:19 EDT (Fri, 18 Jul 2008)
New Revision: 47552
URL: http://svn.boost.org/trac/boost/changeset/47552

Log:
Merged revisions 47550 via svnmerge from 
https://svn.boost.org/svn/boost/trunk

........
  r47550 | chris_kohlhoff | 2008-07-18 23:18:56 +1000 (Fri, 18 Jul 2008) | 2 lines
  
  More documentation updates.
........

Added:
   branches/release/libs/asio/doc/overview/async_op1.dot
      - copied unchanged from r47550, /trunk/libs/asio/doc/overview/async_op1.dot
   branches/release/libs/asio/doc/overview/async_op1.png
      - copied unchanged from r47550, /trunk/libs/asio/doc/overview/async_op1.png
   branches/release/libs/asio/doc/overview/async_op2.dot
      - copied unchanged from r47550, /trunk/libs/asio/doc/overview/async_op2.dot
   branches/release/libs/asio/doc/overview/async_op2.png
      - copied unchanged from r47550, /trunk/libs/asio/doc/overview/async_op2.png
   branches/release/libs/asio/doc/overview/basics.qbk
      - copied unchanged from r47550, /trunk/libs/asio/doc/overview/basics.qbk
   branches/release/libs/asio/doc/overview/protocols.qbk
      - copied unchanged from r47550, /trunk/libs/asio/doc/overview/protocols.qbk
   branches/release/libs/asio/doc/overview/sync_op.dot
      - copied unchanged from r47550, /trunk/libs/asio/doc/overview/sync_op.dot
   branches/release/libs/asio/doc/overview/sync_op.png
      - copied unchanged from r47550, /trunk/libs/asio/doc/overview/sync_op.png
Properties modified: 
   branches/release/   (props changed)
Text files modified: 
   branches/release/libs/asio/doc/Jamfile.v2   |     6 ++++++                                  
   branches/release/libs/asio/doc/overview.qbk |    12 ++++++------                            
   2 files changed, 12 insertions(+), 6 deletions(-)

Modified: branches/release/libs/asio/doc/Jamfile.v2
==============================================================================
--- branches/release/libs/asio/doc/Jamfile.v2	(original)
+++ branches/release/libs/asio/doc/Jamfile.v2	2008-07-18 09:36:19 EDT (Fri, 18 Jul 2008)
@@ -25,6 +25,9 @@
 install images
   :
     overview/proactor.png
+    overview/sync_op.png
+    overview/async_op1.png
+    overview/async_op2.png
   :
     <location>html/boost_asio
   ;
@@ -67,6 +70,9 @@
 install asio_doc_images
   :
     overview/proactor.png
+    overview/sync_op.png
+    overview/async_op1.png
+    overview/async_op2.png
   :
     <location>$(BOOST_ROOT)/doc/html/boost_asio
   ;

Modified: branches/release/libs/asio/doc/overview.qbk
==============================================================================
--- branches/release/libs/asio/doc/overview.qbk	(original)
+++ branches/release/libs/asio/doc/overview.qbk	2008-07-18 09:36:19 EDT (Fri, 18 Jul 2008)
@@ -9,6 +9,7 @@
 
 * [link boost_asio.overview.rationale Rationale]
 * [link boost_asio.overview.core Core Concepts and Functionality]
+  * [link boost_asio.overview.core.basics Basic Boost.Asio Anatomy]
   * [link boost_asio.overview.core.async The Proactor Design Pattern: Concurrency Without Threads]
   * [link boost_asio.overview.core.threads Threads and Boost.Asio]
   * [link boost_asio.overview.core.strands Strands: Use Threads Without Explicit Locking]
@@ -18,14 +19,9 @@
   * [link boost_asio.overview.core.line_based Line-Based Operations]
   * [link boost_asio.overview.core.allocation Custom Memory Allocation]
 * [link boost_asio.overview.networking Networking]
+  * [link boost_asio.overview.networking.protocols TCP, UDP and ICMP]
   * [link boost_asio.overview.networking.iostreams Socket Iostreams]
   * [link boost_asio.overview.networking.bsd_sockets The BSD Socket API and Boost.Asio]
-  [/ * IPv4 and IPv6 independence
-  * TCP
-  * UDP
-  * Multicast
-  * Raw sockets
-  * ICMP ]
 * [link boost_asio.overview.timers Timers]
 * [link boost_asio.overview.serial_ports Serial Ports]
 * [link boost_asio.overview.posix POSIX-Specific Functionality]
@@ -41,6 +37,7 @@
 
 [section:core Core Concepts and Functionality]
 
+* [link boost_asio.overview.core.basics Basic Boost.Asio Anatomy]
 * [link boost_asio.overview.core.async The Proactor Design Pattern: Concurrency Without Threads]
 * [link boost_asio.overview.core.threads Threads and Boost.Asio]
 * [link boost_asio.overview.core.strands Strands: Use Threads Without Explicit Locking]
@@ -50,6 +47,7 @@
 * [link boost_asio.overview.core.line_based Line-Based Operations]
 * [link boost_asio.overview.core.allocation Custom Memory Allocation]
 
+[include overview/basics.qbk]
 [include overview/async.qbk]
 [include overview/threads.qbk]
 [include overview/strands.qbk]
@@ -63,9 +61,11 @@
 
 [section:networking Networking]
 
+* [link boost_asio.overview.networking.protocols TCP, UDP and ICMP]
 * [link boost_asio.overview.networking.iostreams Socket Iostreams]
 * [link boost_asio.overview.networking.bsd_sockets The BSD Socket API and Boost.Asio]
 
+[include overview/protocols.qbk]
 [include overview/iostreams.qbk]
 [include overview/bsd_sockets.qbk]