diff --git a/asio/src/doc/asio_dox.txt b/asio/src/doc/asio_dox.txt
index c634455f..dae9eadd 100644
--- a/asio/src/doc/asio_dox.txt
+++ b/asio/src/doc/asio_dox.txt
@@ -26,7 +26,7 @@ documentation for more information on how to use boost::bind.
*/
/**
-\mainpage
+\mainpage asio Reference
@@ -39,23 +39,39 @@ documentation for more information on how to use boost::bind.
\li asio::ipv4
\li asio::socket_option
-Core Classes
+Classes
\li asio::demuxer
\li asio::dgram_socket
+\li asio::ipv4::address
+\li asio::ipv4::tcp
+\li asio::ipv4::udp
\li asio::locking_dispatcher
\li asio::socket_acceptor
\li asio::socket_connector
-\li asio::stream_socket
-\li asio::timer
-
-Support Classes
-
-\li asio::ipv4::address
\li asio::socket_error
+\li asio::stream_socket
\li asio::thread
+\li asio::timer
\li asio::timer_base
+Class Templates
+
+\li asio::basic_demuxer
+\li asio::basic_dgram_socket
+\li asio::basic_locking_dispatcher
+\li asio::basic_socket_acceptor
+\li asio::basic_socket_connector
+\li asio::basic_stream_socket
+\li asio::basic_timer
+\li asio::buffered_recv_stream
+\li asio::buffered_send_stream
+\li asio::buffered_stream
+\li asio::service_factory
+
+
+
+
Free Functions
\li asio::recv
\li asio::recv_n
@@ -70,26 +86,6 @@ documentation for more information on how to use boost::bind.
\li asio::async_send_n
\li asio::async_send_at_least_n
- |
-
-
-Core Templates
-
-\li asio::basic_demuxer
-\li asio::basic_dgram_socket
-\li asio::basic_locking_dispatcher
-\li asio::basic_socket_acceptor
-\li asio::basic_socket_connector
-\li asio::basic_stream_socket
-\li asio::basic_timer
-\li asio::service_factory
-
-Stream Decorator Templates
-
-\li asio::buffered_recv_stream
-\li asio::buffered_send_stream
-\li asio::buffered_stream
-
Type Traits
\li asio::is_recv_buffered
@@ -110,5 +106,4 @@ documentation for more information on how to use boost::bind.
|
-
*/
diff --git a/asio/src/doc/asio_footer.htm b/asio/src/doc/asio_footer.htm
index f9c1555b..7339403e 100644
--- a/asio/src/doc/asio_footer.htm
+++ b/asio/src/doc/asio_footer.htm
@@ -5,10 +5,10 @@
$projectname $projectnumber
- Main Page |
+ Reference |
+ Tutorials |
Class Index |
- Member Index |
- Tutorial Index
+ Member Index
|
diff --git a/asio/src/doc/asio_header.htm b/asio/src/doc/asio_header.htm
index 4c1a3e98..8beb5d65 100644
--- a/asio/src/doc/asio_header.htm
+++ b/asio/src/doc/asio_header.htm
@@ -11,10 +11,10 @@
$projectname $projectnumber
- Main Page |
+ Reference |
+ Tutorials |
Class Index |
- Member Index |
- Tutorial Index
+ Member Index
|
diff --git a/asio/src/examples/tutorial/daytime_dox.txt b/asio/src/examples/tutorial/daytime_dox.txt
index 68d7619c..e882aa8b 100644
--- a/asio/src/examples/tutorial/daytime_dox.txt
+++ b/asio/src/examples/tutorial/daytime_dox.txt
@@ -1,9 +1,9 @@
/**
\page tutdaytime1 Tutorial Daytime.1 - A synchronous TCP daytime client
-See the \ref tutdaytime1src \n
-Return to the \ref tutindex \n
-Go on to \ref tutdaytime2
+See the \ref tutdaytime1src "full source listing" \n
+Return to the \ref tutindex "tutorial index" \n
+Next: \ref tutdaytime2
*/
@@ -16,10 +16,10 @@ Return to \ref tutdaytime1
/**
\page tutdaytime2 Tutorial Daytime.2 - A synchronous TCP daytime server
-See the \ref tutdaytime2src \n
-Return to the \ref tutindex \n
-Go back to \ref tutdaytime1 \n
-Go on to \ref tutdaytime3
+See the \ref tutdaytime2src "full source listing" \n
+Return to the \ref tutindex "tutorial index" \n
+Previous: \ref tutdaytime1 \n
+Next: \ref tutdaytime3
*/
@@ -57,10 +57,10 @@ be removed:
asio::async_send_n(*socket, send_buf, send_length,
boost::bind(handle_send, socket, send_buf)); @endcode
-See the \ref tutdaytime3src \n
-Return to the \ref tutindex \n
-Go back to \ref tutdaytime2 \n
-Go on to \ref tutdaytime4
+See the \ref tutdaytime3src "full source listing" \n
+Return to the \ref tutindex "tutorial index" \n
+Previous: \ref tutdaytime2 \n
+Next: \ref tutdaytime4
*/
@@ -73,10 +73,10 @@ Return to \ref tutdaytime3
/**
\page tutdaytime4 Tutorial Daytime.4 - A synchronous UDP daytime client
-See the \ref tutdaytime4src \n
-Return to the \ref tutindex \n
-Go back to \ref tutdaytime3 \n
-Go on to \ref tutdaytime5
+See the \ref tutdaytime4src "full source listing" \n
+Return to the \ref tutindex "tutorial index" \n
+Previous: \ref tutdaytime3 \n
+Next: \ref tutdaytime5
*/
@@ -89,10 +89,10 @@ Return to \ref tutdaytime4
/**
\page tutdaytime5 Tutorial Daytime.5 - A synchronous UDP daytime server
-See the \ref tutdaytime5src \n
-Return to the \ref tutindex \n
-Go back to \ref tutdaytime4 \n
-Go on to \ref tutdaytime6
+See the \ref tutdaytime5src "full source listing" \n
+Return to the \ref tutindex "tutorial index" \n
+Previous: \ref tutdaytime4 \n
+Next: \ref tutdaytime6
*/
@@ -131,10 +131,10 @@ socket->async_sendto(send_buf, send_length, *remote_address,
The handle_recvfrom() functions's bytes_recvd parameter can
be similarly removed.
-See the \ref tutdaytime6src \n
-Return to the \ref tutindex \n
-Go back to \ref tutdaytime5 \n
-Go on to \ref tutdaytime7
+See the \ref tutdaytime6src "full source listing" \n
+Return to the \ref tutindex "tutorial index" \n
+Previous: \ref tutdaytime5 \n
+Next: \ref tutdaytime7
*/
@@ -147,9 +147,9 @@ Return to \ref tutdaytime6
/**
\page tutdaytime7 Tutorial Daytime.7 - A combined TCP/UDP asynchronous server
-See the \ref tutdaytime7src \n
-Return to the \ref tutindex \n
-Go back to \ref tutdaytime6
+See the \ref tutdaytime7src "full source listing" \n
+Return to the \ref tutindex "tutorial index" \n
+Previous: \ref tutdaytime6
*/
diff --git a/asio/src/examples/tutorial/index_dox.txt b/asio/src/examples/tutorial/index_dox.txt
index c6392ae0..9563ab3c 100644
--- a/asio/src/examples/tutorial/index_dox.txt
+++ b/asio/src/examples/tutorial/index_dox.txt
@@ -1,5 +1,5 @@
/**
-\page tutindex Tutorial Index
+\page tutindex asio Tutorials
\section tuttimer Basic Skills
diff --git a/asio/src/examples/tutorial/timer_dox.txt b/asio/src/examples/tutorial/timer_dox.txt
index f35fce53..6020ad52 100644
--- a/asio/src/examples/tutorial/timer_dox.txt
+++ b/asio/src/examples/tutorial/timer_dox.txt
@@ -43,9 +43,9 @@ message to show when the timer has expired.
\until }
-See the \ref tuttimer1src \n
-Return to the \ref tutindex \n
-Go on to \ref tuttimer2
+See the \ref tuttimer1src "full source listing" \n
+Return to the \ref tutindex "tutorial index" \n
+Next: \ref tuttimer2
*/
@@ -101,10 +101,10 @@ consequently asio::demuxer::run() would have returned immediately.
\skip run
\until }
-See the \ref tuttimer2src \n
-Return to the \ref tutindex \n
-Go back to \ref tuttimer1 \n
-Go on to \ref tuttimer3
+See the \ref tuttimer2src "full source listing" \n
+Return to the \ref tutindex "tutorial index" \n
+Previous: \ref tuttimer1 \n
+Next: \ref tuttimer3
*/
@@ -184,10 +184,10 @@ value.
\until }
-See the \ref tuttimer3src \n
-Return to the \ref tutindex \n
-Go back to \ref tuttimer2 \n
-Go on to \ref tuttimer4
+See the \ref tuttimer3src "full source listing" \n
+Return to the \ref tutindex "tutorial index" \n
+Previous: \ref tuttimer2 \n
+Next: \ref tuttimer4
*/
@@ -247,9 +247,9 @@ normal.
\until }
-See the \ref tuttimer4src \n
-Return to the \ref tutindex \n
-Go back to \ref tuttimer3 \n
+See the \ref tuttimer4src "full source listing" \n
+Return to the \ref tutindex "tutorial index" \n
+Previous: \ref tuttimer3 \n
*/