Clean up boostified output.
diff --git a/asio/boostify.pl b/asio/boostify.pl index 7094ef9..03b3649 100755 --- a/asio/boostify.pl +++ b/asio/boostify.pl
@@ -143,6 +143,7 @@ $line =~ s/include\/asio/boost\/asio/g; $line =~ s/\^asio/^boost\/asio/g; $line =~ s/namespaceasio/namespaceboost_1_1asio/g; + $line =~ s/ \(\[\@examples\/diffs.*$//; } # Conditional replacements.
diff --git a/asio/src/doc/asio.qbk b/asio/src/doc/asio.qbk index 3a40ebc..33143a8 100644 --- a/asio/src/doc/asio.qbk +++ b/asio/src/doc/asio.qbk
@@ -21,6 +21,7 @@ [template mdash[] '''— '''] [template indexterm1[term1] '''<indexterm><primary>'''[term1]'''</primary></indexterm>'''] [template indexterm2[term1 term2] '''<indexterm><primary>'''[term1]'''</primary><secondary>'''[term2]'''</secondary></indexterm>'''] +[template ticket[number]'''<ulink url="https://svn.boost.org/trac/boost/ticket/'''[number]'''">'''#[number]'''</ulink>'''] [def __POSIX__ /POSIX/] [def __Windows__ /Windows/] [def __accept__ [@http://www.opengroup.org/onlinepubs/000095399/functions/accept.html `accept()`]]
diff --git a/asio/src/doc/examples.qbk b/asio/src/doc/examples.qbk index 697989a..0ad1a89 100644 --- a/asio/src/doc/examples.qbk +++ b/asio/src/doc/examples.qbk
@@ -14,9 +14,11 @@ * [link asio.examples.cpp11_examples C++11 Examples]: Contains a limited set of the C++03 Asio examples, updated to use only C++11 library and language -facilities. These examples do not make direct use of Boost C++ libraries. To -show the changes between C++03 and C++11, these examples include a diff between -the C++03 and C++11 versions. +facilities. These examples do not make direct use of Boost C++ libraries. +[/boostify: non-boost docs start here] +To show the changes between C++03 and C++11, these examples include a diff +between the C++03 and C++11 versions. +[/boostify: non-boost docs end here] [section:cpp03_examples C++03 Examples] @@ -164,7 +166,6 @@ A single-threaded HTTP server implemented using stackless coroutines. -* [@../src/examples/cpp03/http/server4/coroutine.hpp] * [@../src/examples/cpp03/http/server4/file_handler.cpp] * [@../src/examples/cpp03/http/server4/file_handler.hpp] * [@../src/examples/cpp03/http/server4/header.hpp] @@ -178,8 +179,6 @@ * [@../src/examples/cpp03/http/server4/request_parser.hpp] * [@../src/examples/cpp03/http/server4/server.cpp] * [@../src/examples/cpp03/http/server4/server.hpp] -* [@../src/examples/cpp03/http/server4/unyield.hpp] -* [@../src/examples/cpp03/http/server4/yield.hpp] [heading ICMP] @@ -371,6 +370,14 @@ * [@../src/examples/cpp11/echo/blocking_udp_echo_server.cpp] ([@examples/diffs/echo/blocking_udp_echo_server.cpp.html diff to C++03]) +[heading Futures] + +This example demonstrates how to use std::future in conjunction with +Asio's asynchronous operations. + +* [@../src/examples/cpp11/futures/daytime_client.cpp] + + [heading HTTP Server] This example illustrates the use of asio in a simple single-threaded server
diff --git a/asio/src/doc/overview/posix.qbk b/asio/src/doc/overview/posix.qbk index af004c5..c12d213 100644 --- a/asio/src/doc/overview/posix.qbk +++ b/asio/src/doc/overview/posix.qbk
@@ -95,7 +95,8 @@ [link asio.reference.posix__stream_descriptor posix::stream_descriptor], [link asio.reference.posix__basic_stream_descriptor posix::basic_stream_descriptor], [link asio.reference.posix__stream_descriptor_service posix::stream_descriptor_service], -[link asio.examples.chat Chat example]. +[link asio.examples.cpp03_examples.chat Chat example (C++03)], +[link asio.examples.cpp11_examples.chat Chat example (C++11)]. [heading Notes] @@ -138,7 +139,7 @@ [link asio.reference.io_service.notify_fork io_service::notify_fork()], [link asio.reference.io_service.fork_event io_service::fork_event], [link asio.reference.io_service__service.fork_service io_service::service::fork_service()], -[link asio.examples.fork Fork examples]. +[link asio.examples.cpp03_examples.fork Fork examples]. [endsect]