diff --git a/asio/README b/asio/README
index d2ecb3a..59408cc 100644
--- a/asio/README
+++ b/asio/README
@@ -1,4 +1,4 @@
-asio version 1.5.1
-Released Sunday, 20 February 2011.
+asio version 1.5.2
+Released Tuesday, 08 March 2011.
 
 See doc/index.html for API documentation and a tutorial.
diff --git a/asio/asio.manifest b/asio/asio.manifest
index 2e72ae6..8c809c4 100644
--- a/asio/asio.manifest
+++ b/asio/asio.manifest
@@ -127,6 +127,7 @@
 /doc/asio/reference/basic_datagram_socket/basic_datagram_socket/overload2.html
 /doc/asio/reference/basic_datagram_socket/basic_datagram_socket/overload3.html
 /doc/asio/reference/basic_datagram_socket/basic_datagram_socket/overload4.html
+/doc/asio/reference/basic_datagram_socket/basic_datagram_socket/overload5.html
 /doc/asio/reference/basic_datagram_socket/bind/
 /doc/asio/reference/basic_datagram_socket/bind.html
 /doc/asio/reference/basic_datagram_socket/bind/overload1.html
@@ -149,11 +150,19 @@
 /doc/asio/reference/basic_datagram_socket/do_not_route.html
 /doc/asio/reference/basic_datagram_socket/enable_connection_aborted.html
 /doc/asio/reference/basic_datagram_socket/endpoint_type.html
+/doc/asio/reference/basic_datagram_socket/get_implementation/
+/doc/asio/reference/basic_datagram_socket/get_implementation.html
+/doc/asio/reference/basic_datagram_socket/get_implementation/overload1.html
+/doc/asio/reference/basic_datagram_socket/get_implementation/overload2.html
 /doc/asio/reference/basic_datagram_socket/get_io_service.html
 /doc/asio/reference/basic_datagram_socket/get_option/
 /doc/asio/reference/basic_datagram_socket/get_option.html
 /doc/asio/reference/basic_datagram_socket/get_option/overload1.html
 /doc/asio/reference/basic_datagram_socket/get_option/overload2.html
+/doc/asio/reference/basic_datagram_socket/get_service/
+/doc/asio/reference/basic_datagram_socket/get_service.html
+/doc/asio/reference/basic_datagram_socket/get_service/overload1.html
+/doc/asio/reference/basic_datagram_socket/get_service/overload2.html
 /doc/asio/reference/basic_datagram_socket.html
 /doc/asio/reference/basic_datagram_socket/implementation.html
 /doc/asio/reference/basic_datagram_socket/implementation_type.html
@@ -198,6 +207,7 @@
 /doc/asio/reference/basic_datagram_socket/open.html
 /doc/asio/reference/basic_datagram_socket/open/overload1.html
 /doc/asio/reference/basic_datagram_socket/open/overload2.html
+/doc/asio/reference/basic_datagram_socket/operator_eq_.html
 /doc/asio/reference/basic_datagram_socket/protocol_type.html
 /doc/asio/reference/basic_datagram_socket/receive/
 /doc/asio/reference/basic_datagram_socket/receive_buffer_size.html
@@ -265,7 +275,15 @@
 /doc/asio/reference/basic_deadline_timer/expires_from_now/overload1.html
 /doc/asio/reference/basic_deadline_timer/expires_from_now/overload2.html
 /doc/asio/reference/basic_deadline_timer/expires_from_now/overload3.html
+/doc/asio/reference/basic_deadline_timer/get_implementation/
+/doc/asio/reference/basic_deadline_timer/get_implementation.html
+/doc/asio/reference/basic_deadline_timer/get_implementation/overload1.html
+/doc/asio/reference/basic_deadline_timer/get_implementation/overload2.html
 /doc/asio/reference/basic_deadline_timer/get_io_service.html
+/doc/asio/reference/basic_deadline_timer/get_service/
+/doc/asio/reference/basic_deadline_timer/get_service.html
+/doc/asio/reference/basic_deadline_timer/get_service/overload1.html
+/doc/asio/reference/basic_deadline_timer/get_service/overload2.html
 /doc/asio/reference/basic_deadline_timer.html
 /doc/asio/reference/basic_deadline_timer/implementation.html
 /doc/asio/reference/basic_deadline_timer/implementation_type.html
@@ -278,12 +296,24 @@
 /doc/asio/reference/basic_deadline_timer/wait/overload1.html
 /doc/asio/reference/basic_deadline_timer/wait/overload2.html
 /doc/asio/reference/basic_io_object/
+/doc/asio/reference/basic_io_object/basic_io_object/
 /doc/asio/reference/basic_io_object/_basic_io_object.html
 /doc/asio/reference/basic_io_object/basic_io_object.html
+/doc/asio/reference/basic_io_object/basic_io_object/overload1.html
+/doc/asio/reference/basic_io_object/basic_io_object/overload2.html
+/doc/asio/reference/basic_io_object/get_implementation/
+/doc/asio/reference/basic_io_object/get_implementation.html
+/doc/asio/reference/basic_io_object/get_implementation/overload1.html
+/doc/asio/reference/basic_io_object/get_implementation/overload2.html
 /doc/asio/reference/basic_io_object/get_io_service.html
+/doc/asio/reference/basic_io_object/get_service/
+/doc/asio/reference/basic_io_object/get_service.html
+/doc/asio/reference/basic_io_object/get_service/overload1.html
+/doc/asio/reference/basic_io_object/get_service/overload2.html
 /doc/asio/reference/basic_io_object.html
 /doc/asio/reference/basic_io_object/implementation.html
 /doc/asio/reference/basic_io_object/implementation_type.html
+/doc/asio/reference/basic_io_object/operator_eq_.html
 /doc/asio/reference/basic_io_object/service.html
 /doc/asio/reference/basic_io_object/service_type.html
 /doc/asio/reference/basic_raw_socket/
@@ -322,6 +352,7 @@
 /doc/asio/reference/basic_raw_socket/basic_raw_socket/overload2.html
 /doc/asio/reference/basic_raw_socket/basic_raw_socket/overload3.html
 /doc/asio/reference/basic_raw_socket/basic_raw_socket/overload4.html
+/doc/asio/reference/basic_raw_socket/basic_raw_socket/overload5.html
 /doc/asio/reference/basic_raw_socket/bind/
 /doc/asio/reference/basic_raw_socket/bind.html
 /doc/asio/reference/basic_raw_socket/bind/overload1.html
@@ -344,11 +375,19 @@
 /doc/asio/reference/basic_raw_socket/do_not_route.html
 /doc/asio/reference/basic_raw_socket/enable_connection_aborted.html
 /doc/asio/reference/basic_raw_socket/endpoint_type.html
+/doc/asio/reference/basic_raw_socket/get_implementation/
+/doc/asio/reference/basic_raw_socket/get_implementation.html
+/doc/asio/reference/basic_raw_socket/get_implementation/overload1.html
+/doc/asio/reference/basic_raw_socket/get_implementation/overload2.html
 /doc/asio/reference/basic_raw_socket/get_io_service.html
 /doc/asio/reference/basic_raw_socket/get_option/
 /doc/asio/reference/basic_raw_socket/get_option.html
 /doc/asio/reference/basic_raw_socket/get_option/overload1.html
 /doc/asio/reference/basic_raw_socket/get_option/overload2.html
+/doc/asio/reference/basic_raw_socket/get_service/
+/doc/asio/reference/basic_raw_socket/get_service.html
+/doc/asio/reference/basic_raw_socket/get_service/overload1.html
+/doc/asio/reference/basic_raw_socket/get_service/overload2.html
 /doc/asio/reference/basic_raw_socket.html
 /doc/asio/reference/basic_raw_socket/implementation.html
 /doc/asio/reference/basic_raw_socket/implementation_type.html
@@ -393,6 +432,7 @@
 /doc/asio/reference/basic_raw_socket/open.html
 /doc/asio/reference/basic_raw_socket/open/overload1.html
 /doc/asio/reference/basic_raw_socket/open/overload2.html
+/doc/asio/reference/basic_raw_socket/operator_eq_.html
 /doc/asio/reference/basic_raw_socket/protocol_type.html
 /doc/asio/reference/basic_raw_socket/receive/
 /doc/asio/reference/basic_raw_socket/receive_buffer_size.html
@@ -459,6 +499,7 @@
 /doc/asio/reference/basic_seq_packet_socket/basic_seq_packet_socket/overload2.html
 /doc/asio/reference/basic_seq_packet_socket/basic_seq_packet_socket/overload3.html
 /doc/asio/reference/basic_seq_packet_socket/basic_seq_packet_socket/overload4.html
+/doc/asio/reference/basic_seq_packet_socket/basic_seq_packet_socket/overload5.html
 /doc/asio/reference/basic_seq_packet_socket/bind/
 /doc/asio/reference/basic_seq_packet_socket/bind.html
 /doc/asio/reference/basic_seq_packet_socket/bind/overload1.html
@@ -481,11 +522,19 @@
 /doc/asio/reference/basic_seq_packet_socket/do_not_route.html
 /doc/asio/reference/basic_seq_packet_socket/enable_connection_aborted.html
 /doc/asio/reference/basic_seq_packet_socket/endpoint_type.html
+/doc/asio/reference/basic_seq_packet_socket/get_implementation/
+/doc/asio/reference/basic_seq_packet_socket/get_implementation.html
+/doc/asio/reference/basic_seq_packet_socket/get_implementation/overload1.html
+/doc/asio/reference/basic_seq_packet_socket/get_implementation/overload2.html
 /doc/asio/reference/basic_seq_packet_socket/get_io_service.html
 /doc/asio/reference/basic_seq_packet_socket/get_option/
 /doc/asio/reference/basic_seq_packet_socket/get_option.html
 /doc/asio/reference/basic_seq_packet_socket/get_option/overload1.html
 /doc/asio/reference/basic_seq_packet_socket/get_option/overload2.html
+/doc/asio/reference/basic_seq_packet_socket/get_service/
+/doc/asio/reference/basic_seq_packet_socket/get_service.html
+/doc/asio/reference/basic_seq_packet_socket/get_service/overload1.html
+/doc/asio/reference/basic_seq_packet_socket/get_service/overload2.html
 /doc/asio/reference/basic_seq_packet_socket.html
 /doc/asio/reference/basic_seq_packet_socket/implementation.html
 /doc/asio/reference/basic_seq_packet_socket/implementation_type.html
@@ -530,6 +579,7 @@
 /doc/asio/reference/basic_seq_packet_socket/open.html
 /doc/asio/reference/basic_seq_packet_socket/open/overload1.html
 /doc/asio/reference/basic_seq_packet_socket/open/overload2.html
+/doc/asio/reference/basic_seq_packet_socket/operator_eq_.html
 /doc/asio/reference/basic_seq_packet_socket/protocol_type.html
 /doc/asio/reference/basic_seq_packet_socket/receive/
 /doc/asio/reference/basic_seq_packet_socket/receive_buffer_size.html
@@ -573,6 +623,7 @@
 /doc/asio/reference/basic_serial_port/basic_serial_port/overload2.html
 /doc/asio/reference/basic_serial_port/basic_serial_port/overload3.html
 /doc/asio/reference/basic_serial_port/basic_serial_port/overload4.html
+/doc/asio/reference/basic_serial_port/basic_serial_port/overload5.html
 /doc/asio/reference/basic_serial_port/cancel/
 /doc/asio/reference/basic_serial_port/cancel.html
 /doc/asio/reference/basic_serial_port/cancel/overload1.html
@@ -581,11 +632,19 @@
 /doc/asio/reference/basic_serial_port/close.html
 /doc/asio/reference/basic_serial_port/close/overload1.html
 /doc/asio/reference/basic_serial_port/close/overload2.html
+/doc/asio/reference/basic_serial_port/get_implementation/
+/doc/asio/reference/basic_serial_port/get_implementation.html
+/doc/asio/reference/basic_serial_port/get_implementation/overload1.html
+/doc/asio/reference/basic_serial_port/get_implementation/overload2.html
 /doc/asio/reference/basic_serial_port/get_io_service.html
 /doc/asio/reference/basic_serial_port/get_option/
 /doc/asio/reference/basic_serial_port/get_option.html
 /doc/asio/reference/basic_serial_port/get_option/overload1.html
 /doc/asio/reference/basic_serial_port/get_option/overload2.html
+/doc/asio/reference/basic_serial_port/get_service/
+/doc/asio/reference/basic_serial_port/get_service.html
+/doc/asio/reference/basic_serial_port/get_service/overload1.html
+/doc/asio/reference/basic_serial_port/get_service/overload2.html
 /doc/asio/reference/basic_serial_port.html
 /doc/asio/reference/basic_serial_port/implementation.html
 /doc/asio/reference/basic_serial_port/implementation_type.html
@@ -603,6 +662,7 @@
 /doc/asio/reference/basic_serial_port/open.html
 /doc/asio/reference/basic_serial_port/open/overload1.html
 /doc/asio/reference/basic_serial_port/open/overload2.html
+/doc/asio/reference/basic_serial_port/operator_eq_.html
 /doc/asio/reference/basic_serial_port/read_some/
 /doc/asio/reference/basic_serial_port/read_some.html
 /doc/asio/reference/basic_serial_port/read_some/overload1.html
@@ -641,7 +701,15 @@
 /doc/asio/reference/basic_signal_set/clear.html
 /doc/asio/reference/basic_signal_set/clear/overload1.html
 /doc/asio/reference/basic_signal_set/clear/overload2.html
+/doc/asio/reference/basic_signal_set/get_implementation/
+/doc/asio/reference/basic_signal_set/get_implementation.html
+/doc/asio/reference/basic_signal_set/get_implementation/overload1.html
+/doc/asio/reference/basic_signal_set/get_implementation/overload2.html
 /doc/asio/reference/basic_signal_set/get_io_service.html
+/doc/asio/reference/basic_signal_set/get_service/
+/doc/asio/reference/basic_signal_set/get_service.html
+/doc/asio/reference/basic_signal_set/get_service/overload1.html
+/doc/asio/reference/basic_signal_set/get_service/overload2.html
 /doc/asio/reference/basic_signal_set.html
 /doc/asio/reference/basic_signal_set/implementation.html
 /doc/asio/reference/basic_signal_set/implementation_type.html
@@ -673,6 +741,7 @@
 /doc/asio/reference/basic_socket_acceptor/basic_socket_acceptor/overload2.html
 /doc/asio/reference/basic_socket_acceptor/basic_socket_acceptor/overload3.html
 /doc/asio/reference/basic_socket_acceptor/basic_socket_acceptor/overload4.html
+/doc/asio/reference/basic_socket_acceptor/basic_socket_acceptor/overload5.html
 /doc/asio/reference/basic_socket_acceptor/bind/
 /doc/asio/reference/basic_socket_acceptor/bind.html
 /doc/asio/reference/basic_socket_acceptor/bind/overload1.html
@@ -691,11 +760,19 @@
 /doc/asio/reference/basic_socket_acceptor/do_not_route.html
 /doc/asio/reference/basic_socket_acceptor/enable_connection_aborted.html
 /doc/asio/reference/basic_socket_acceptor/endpoint_type.html
+/doc/asio/reference/basic_socket_acceptor/get_implementation/
+/doc/asio/reference/basic_socket_acceptor/get_implementation.html
+/doc/asio/reference/basic_socket_acceptor/get_implementation/overload1.html
+/doc/asio/reference/basic_socket_acceptor/get_implementation/overload2.html
 /doc/asio/reference/basic_socket_acceptor/get_io_service.html
 /doc/asio/reference/basic_socket_acceptor/get_option/
 /doc/asio/reference/basic_socket_acceptor/get_option.html
 /doc/asio/reference/basic_socket_acceptor/get_option/overload1.html
 /doc/asio/reference/basic_socket_acceptor/get_option/overload2.html
+/doc/asio/reference/basic_socket_acceptor/get_service/
+/doc/asio/reference/basic_socket_acceptor/get_service.html
+/doc/asio/reference/basic_socket_acceptor/get_service/overload1.html
+/doc/asio/reference/basic_socket_acceptor/get_service/overload2.html
 /doc/asio/reference/basic_socket_acceptor.html
 /doc/asio/reference/basic_socket_acceptor/implementation.html
 /doc/asio/reference/basic_socket_acceptor/implementation_type.html
@@ -739,6 +816,7 @@
 /doc/asio/reference/basic_socket_acceptor/open.html
 /doc/asio/reference/basic_socket_acceptor/open/overload1.html
 /doc/asio/reference/basic_socket_acceptor/open/overload2.html
+/doc/asio/reference/basic_socket_acceptor/operator_eq_.html
 /doc/asio/reference/basic_socket_acceptor/protocol_type.html
 /doc/asio/reference/basic_socket_acceptor/receive_buffer_size.html
 /doc/asio/reference/basic_socket_acceptor/receive_low_watermark.html
@@ -772,6 +850,7 @@
 /doc/asio/reference/basic_socket/basic_socket/overload2.html
 /doc/asio/reference/basic_socket/basic_socket/overload3.html
 /doc/asio/reference/basic_socket/basic_socket/overload4.html
+/doc/asio/reference/basic_socket/basic_socket/overload5.html
 /doc/asio/reference/basic_socket/bind/
 /doc/asio/reference/basic_socket/bind.html
 /doc/asio/reference/basic_socket/bind/overload1.html
@@ -794,11 +873,19 @@
 /doc/asio/reference/basic_socket/do_not_route.html
 /doc/asio/reference/basic_socket/enable_connection_aborted.html
 /doc/asio/reference/basic_socket/endpoint_type.html
+/doc/asio/reference/basic_socket/get_implementation/
+/doc/asio/reference/basic_socket/get_implementation.html
+/doc/asio/reference/basic_socket/get_implementation/overload1.html
+/doc/asio/reference/basic_socket/get_implementation/overload2.html
 /doc/asio/reference/basic_socket/get_io_service.html
 /doc/asio/reference/basic_socket/get_option/
 /doc/asio/reference/basic_socket/get_option.html
 /doc/asio/reference/basic_socket/get_option/overload1.html
 /doc/asio/reference/basic_socket/get_option/overload2.html
+/doc/asio/reference/basic_socket/get_service/
+/doc/asio/reference/basic_socket/get_service.html
+/doc/asio/reference/basic_socket/get_service/overload1.html
+/doc/asio/reference/basic_socket/get_service/overload2.html
 /doc/asio/reference/basic_socket.html
 /doc/asio/reference/basic_socket/implementation.html
 /doc/asio/reference/basic_socket/implementation_type.html
@@ -864,6 +951,7 @@
 /doc/asio/reference/basic_socket/open.html
 /doc/asio/reference/basic_socket/open/overload1.html
 /doc/asio/reference/basic_socket/open/overload2.html
+/doc/asio/reference/basic_socket/operator_eq_.html
 /doc/asio/reference/basic_socket/protocol_type.html
 /doc/asio/reference/basic_socket/receive_buffer_size.html
 /doc/asio/reference/basic_socket/receive_low_watermark.html
@@ -934,11 +1022,19 @@
 /doc/asio/reference/basic_socket_streambuf/expires_from_now.html
 /doc/asio/reference/basic_socket_streambuf/expires_from_now/overload1.html
 /doc/asio/reference/basic_socket_streambuf/expires_from_now/overload2.html
+/doc/asio/reference/basic_socket_streambuf/get_implementation/
+/doc/asio/reference/basic_socket_streambuf/get_implementation.html
+/doc/asio/reference/basic_socket_streambuf/get_implementation/overload1.html
+/doc/asio/reference/basic_socket_streambuf/get_implementation/overload2.html
 /doc/asio/reference/basic_socket_streambuf/get_io_service.html
 /doc/asio/reference/basic_socket_streambuf/get_option/
 /doc/asio/reference/basic_socket_streambuf/get_option.html
 /doc/asio/reference/basic_socket_streambuf/get_option/overload1.html
 /doc/asio/reference/basic_socket_streambuf/get_option/overload2.html
+/doc/asio/reference/basic_socket_streambuf/get_service/
+/doc/asio/reference/basic_socket_streambuf/get_service.html
+/doc/asio/reference/basic_socket_streambuf/get_service/overload1.html
+/doc/asio/reference/basic_socket_streambuf/get_service/overload2.html
 /doc/asio/reference/basic_socket_streambuf.html
 /doc/asio/reference/basic_socket_streambuf/implementation.html
 /doc/asio/reference/basic_socket_streambuf/implementation_type.html
@@ -1056,6 +1152,7 @@
 /doc/asio/reference/basic_stream_socket/basic_stream_socket/overload2.html
 /doc/asio/reference/basic_stream_socket/basic_stream_socket/overload3.html
 /doc/asio/reference/basic_stream_socket/basic_stream_socket/overload4.html
+/doc/asio/reference/basic_stream_socket/basic_stream_socket/overload5.html
 /doc/asio/reference/basic_stream_socket/bind/
 /doc/asio/reference/basic_stream_socket/bind.html
 /doc/asio/reference/basic_stream_socket/bind/overload1.html
@@ -1078,11 +1175,19 @@
 /doc/asio/reference/basic_stream_socket/do_not_route.html
 /doc/asio/reference/basic_stream_socket/enable_connection_aborted.html
 /doc/asio/reference/basic_stream_socket/endpoint_type.html
+/doc/asio/reference/basic_stream_socket/get_implementation/
+/doc/asio/reference/basic_stream_socket/get_implementation.html
+/doc/asio/reference/basic_stream_socket/get_implementation/overload1.html
+/doc/asio/reference/basic_stream_socket/get_implementation/overload2.html
 /doc/asio/reference/basic_stream_socket/get_io_service.html
 /doc/asio/reference/basic_stream_socket/get_option/
 /doc/asio/reference/basic_stream_socket/get_option.html
 /doc/asio/reference/basic_stream_socket/get_option/overload1.html
 /doc/asio/reference/basic_stream_socket/get_option/overload2.html
+/doc/asio/reference/basic_stream_socket/get_service/
+/doc/asio/reference/basic_stream_socket/get_service.html
+/doc/asio/reference/basic_stream_socket/get_service/overload1.html
+/doc/asio/reference/basic_stream_socket/get_service/overload2.html
 /doc/asio/reference/basic_stream_socket.html
 /doc/asio/reference/basic_stream_socket/implementation.html
 /doc/asio/reference/basic_stream_socket/implementation_type.html
@@ -1127,6 +1232,7 @@
 /doc/asio/reference/basic_stream_socket/open.html
 /doc/asio/reference/basic_stream_socket/open/overload1.html
 /doc/asio/reference/basic_stream_socket/open/overload2.html
+/doc/asio/reference/basic_stream_socket/operator_eq_.html
 /doc/asio/reference/basic_stream_socket/protocol_type.html
 /doc/asio/reference/basic_stream_socket/read_some/
 /doc/asio/reference/basic_stream_socket/read_some.html
@@ -1469,6 +1575,8 @@
 /doc/asio/reference/datagram_socket_service/io_control.html
 /doc/asio/reference/datagram_socket_service/is_open.html
 /doc/asio/reference/datagram_socket_service/local_endpoint.html
+/doc/asio/reference/datagram_socket_service/move_assign.html
+/doc/asio/reference/datagram_socket_service/move_construct.html
 /doc/asio/reference/datagram_socket_service/native_handle.html
 /doc/asio/reference/datagram_socket_service/native_handle_type.html
 /doc/asio/reference/datagram_socket_service/native.html
@@ -1490,7 +1598,6 @@
 /doc/asio/reference/datagram_socket_service/send_to.html
 /doc/asio/reference/datagram_socket_service/set_option.html
 /doc/asio/reference/datagram_socket_service/shutdown.html
-/doc/asio/reference/datagram_socket_service/shutdown_service.html
 /doc/asio/reference/deadline_timer.html
 /doc/asio/reference/deadline_timer_service/
 /doc/asio/reference/deadline_timer_service/async_wait.html
@@ -1512,7 +1619,6 @@
 /doc/asio/reference/deadline_timer_service.html
 /doc/asio/reference/deadline_timer_service/id.html
 /doc/asio/reference/deadline_timer_service/implementation_type.html
-/doc/asio/reference/deadline_timer_service/shutdown_service.html
 /doc/asio/reference/deadline_timer_service/time_type.html
 /doc/asio/reference/deadline_timer_service/traits_type.html
 /doc/asio/reference/deadline_timer_service/wait.html
@@ -1579,6 +1685,7 @@
 /doc/asio/reference/io_service/
 /doc/asio/reference/io_service/add_service.html
 /doc/asio/reference/io_service/dispatch.html
+/doc/asio/reference/io_service/fork_event.html
 /doc/asio/reference/io_service/has_service.html
 /doc/asio/reference/io_service.html
 /doc/asio/reference/io_service__id/
@@ -1589,6 +1696,7 @@
 /doc/asio/reference/io_service/io_service.html
 /doc/asio/reference/io_service/io_service/overload1.html
 /doc/asio/reference/io_service/io_service/overload2.html
+/doc/asio/reference/io_service/notify_fork.html
 /doc/asio/reference/io_service/poll/
 /doc/asio/reference/io_service/poll.html
 /doc/asio/reference/io_service/poll_one/
@@ -1813,7 +1921,15 @@
 /doc/asio/reference/ip__basic_resolver_entry/operator_endpoint_type.html
 /doc/asio/reference/ip__basic_resolver_entry/protocol_type.html
 /doc/asio/reference/ip__basic_resolver_entry/service_name.html
+/doc/asio/reference/ip__basic_resolver/get_implementation/
+/doc/asio/reference/ip__basic_resolver/get_implementation.html
+/doc/asio/reference/ip__basic_resolver/get_implementation/overload1.html
+/doc/asio/reference/ip__basic_resolver/get_implementation/overload2.html
 /doc/asio/reference/ip__basic_resolver/get_io_service.html
+/doc/asio/reference/ip__basic_resolver/get_service/
+/doc/asio/reference/ip__basic_resolver/get_service.html
+/doc/asio/reference/ip__basic_resolver/get_service/overload1.html
+/doc/asio/reference/ip__basic_resolver/get_service/overload2.html
 /doc/asio/reference/ip__basic_resolver.html
 /doc/asio/reference/ip__basic_resolver/implementation.html
 /doc/asio/reference/ip__basic_resolver/implementation_type.html
@@ -1921,7 +2037,6 @@
 /doc/asio/reference/ip__resolver_service/resolve/overload1.html
 /doc/asio/reference/ip__resolver_service/resolve/overload2.html
 /doc/asio/reference/ip__resolver_service/resolver_service.html
-/doc/asio/reference/ip__resolver_service/shutdown_service.html
 /doc/asio/reference/ip__tcp/
 /doc/asio/reference/ip__tcp/acceptor.html
 /doc/asio/reference/ip__tcp/endpoint.html
@@ -2057,6 +2172,7 @@
 /doc/asio/reference/posix__basic_descriptor/basic_descriptor.html
 /doc/asio/reference/posix__basic_descriptor/basic_descriptor/overload1.html
 /doc/asio/reference/posix__basic_descriptor/basic_descriptor/overload2.html
+/doc/asio/reference/posix__basic_descriptor/basic_descriptor/overload3.html
 /doc/asio/reference/posix__basic_descriptor/bytes_readable.html
 /doc/asio/reference/posix__basic_descriptor/cancel/
 /doc/asio/reference/posix__basic_descriptor/cancel.html
@@ -2066,7 +2182,15 @@
 /doc/asio/reference/posix__basic_descriptor/close.html
 /doc/asio/reference/posix__basic_descriptor/close/overload1.html
 /doc/asio/reference/posix__basic_descriptor/close/overload2.html
+/doc/asio/reference/posix__basic_descriptor/get_implementation/
+/doc/asio/reference/posix__basic_descriptor/get_implementation.html
+/doc/asio/reference/posix__basic_descriptor/get_implementation/overload1.html
+/doc/asio/reference/posix__basic_descriptor/get_implementation/overload2.html
 /doc/asio/reference/posix__basic_descriptor/get_io_service.html
+/doc/asio/reference/posix__basic_descriptor/get_service/
+/doc/asio/reference/posix__basic_descriptor/get_service.html
+/doc/asio/reference/posix__basic_descriptor/get_service/overload1.html
+/doc/asio/reference/posix__basic_descriptor/get_service/overload2.html
 /doc/asio/reference/posix__basic_descriptor.html
 /doc/asio/reference/posix__basic_descriptor/implementation.html
 /doc/asio/reference/posix__basic_descriptor/implementation_type.html
@@ -2095,6 +2219,7 @@
 /doc/asio/reference/posix__basic_descriptor/non_blocking/overload1.html
 /doc/asio/reference/posix__basic_descriptor/non_blocking/overload2.html
 /doc/asio/reference/posix__basic_descriptor/non_blocking/overload3.html
+/doc/asio/reference/posix__basic_descriptor/operator_eq_.html
 /doc/asio/reference/posix__basic_descriptor/release.html
 /doc/asio/reference/posix__basic_descriptor/service.html
 /doc/asio/reference/posix__basic_descriptor/service_type.html
@@ -2109,6 +2234,7 @@
 /doc/asio/reference/posix__basic_stream_descriptor/basic_stream_descriptor.html
 /doc/asio/reference/posix__basic_stream_descriptor/basic_stream_descriptor/overload1.html
 /doc/asio/reference/posix__basic_stream_descriptor/basic_stream_descriptor/overload2.html
+/doc/asio/reference/posix__basic_stream_descriptor/basic_stream_descriptor/overload3.html
 /doc/asio/reference/posix__basic_stream_descriptor/bytes_readable.html
 /doc/asio/reference/posix__basic_stream_descriptor/cancel/
 /doc/asio/reference/posix__basic_stream_descriptor/cancel.html
@@ -2118,7 +2244,15 @@
 /doc/asio/reference/posix__basic_stream_descriptor/close.html
 /doc/asio/reference/posix__basic_stream_descriptor/close/overload1.html
 /doc/asio/reference/posix__basic_stream_descriptor/close/overload2.html
+/doc/asio/reference/posix__basic_stream_descriptor/get_implementation/
+/doc/asio/reference/posix__basic_stream_descriptor/get_implementation.html
+/doc/asio/reference/posix__basic_stream_descriptor/get_implementation/overload1.html
+/doc/asio/reference/posix__basic_stream_descriptor/get_implementation/overload2.html
 /doc/asio/reference/posix__basic_stream_descriptor/get_io_service.html
+/doc/asio/reference/posix__basic_stream_descriptor/get_service/
+/doc/asio/reference/posix__basic_stream_descriptor/get_service.html
+/doc/asio/reference/posix__basic_stream_descriptor/get_service/overload1.html
+/doc/asio/reference/posix__basic_stream_descriptor/get_service/overload2.html
 /doc/asio/reference/posix__basic_stream_descriptor.html
 /doc/asio/reference/posix__basic_stream_descriptor/implementation.html
 /doc/asio/reference/posix__basic_stream_descriptor/implementation_type.html
@@ -2147,6 +2281,7 @@
 /doc/asio/reference/posix__basic_stream_descriptor/non_blocking/overload1.html
 /doc/asio/reference/posix__basic_stream_descriptor/non_blocking/overload2.html
 /doc/asio/reference/posix__basic_stream_descriptor/non_blocking/overload3.html
+/doc/asio/reference/posix__basic_stream_descriptor/operator_eq_.html
 /doc/asio/reference/posix__basic_stream_descriptor/read_some/
 /doc/asio/reference/posix__basic_stream_descriptor/read_some.html
 /doc/asio/reference/posix__basic_stream_descriptor/read_some/overload1.html
@@ -2178,6 +2313,8 @@
 /doc/asio/reference/posix__stream_descriptor_service/implementation_type.html
 /doc/asio/reference/posix__stream_descriptor_service/io_control.html
 /doc/asio/reference/posix__stream_descriptor_service/is_open.html
+/doc/asio/reference/posix__stream_descriptor_service/move_assign.html
+/doc/asio/reference/posix__stream_descriptor_service/move_construct.html
 /doc/asio/reference/posix__stream_descriptor_service/native_handle.html
 /doc/asio/reference/posix__stream_descriptor_service/native_handle_type.html
 /doc/asio/reference/posix__stream_descriptor_service/native.html
@@ -2192,7 +2329,6 @@
 /doc/asio/reference/posix__stream_descriptor_service/non_blocking/overload2.html
 /doc/asio/reference/posix__stream_descriptor_service/read_some.html
 /doc/asio/reference/posix__stream_descriptor_service/release.html
-/doc/asio/reference/posix__stream_descriptor_service/shutdown_service.html
 /doc/asio/reference/posix__stream_descriptor_service/stream_descriptor_service.html
 /doc/asio/reference/posix__stream_descriptor_service/write_some.html
 /doc/asio/reference/Protocol.html
@@ -2222,6 +2358,8 @@
 /doc/asio/reference/raw_socket_service/io_control.html
 /doc/asio/reference/raw_socket_service/is_open.html
 /doc/asio/reference/raw_socket_service/local_endpoint.html
+/doc/asio/reference/raw_socket_service/move_assign.html
+/doc/asio/reference/raw_socket_service/move_construct.html
 /doc/asio/reference/raw_socket_service/native_handle.html
 /doc/asio/reference/raw_socket_service/native_handle_type.html
 /doc/asio/reference/raw_socket_service/native.html
@@ -2244,7 +2382,6 @@
 /doc/asio/reference/raw_socket_service/send_to.html
 /doc/asio/reference/raw_socket_service/set_option.html
 /doc/asio/reference/raw_socket_service/shutdown.html
-/doc/asio/reference/raw_socket_service/shutdown_service.html
 /doc/asio/reference/read/
 /doc/asio/reference/read_at/
 /doc/asio/reference/read_at.html
@@ -2301,6 +2438,8 @@
 /doc/asio/reference/seq_packet_socket_service/io_control.html
 /doc/asio/reference/seq_packet_socket_service/is_open.html
 /doc/asio/reference/seq_packet_socket_service/local_endpoint.html
+/doc/asio/reference/seq_packet_socket_service/move_assign.html
+/doc/asio/reference/seq_packet_socket_service/move_construct.html
 /doc/asio/reference/seq_packet_socket_service/native_handle.html
 /doc/asio/reference/seq_packet_socket_service/native_handle_type.html
 /doc/asio/reference/seq_packet_socket_service/native.html
@@ -2321,7 +2460,6 @@
 /doc/asio/reference/seq_packet_socket_service/seq_packet_socket_service.html
 /doc/asio/reference/seq_packet_socket_service/set_option.html
 /doc/asio/reference/seq_packet_socket_service/shutdown.html
-/doc/asio/reference/seq_packet_socket_service/shutdown_service.html
 /doc/asio/reference/serial_port_base/
 /doc/asio/reference/serial_port_base__baud_rate/
 /doc/asio/reference/serial_port_base__baud_rate/baud_rate.html
@@ -2374,6 +2512,8 @@
 /doc/asio/reference/serial_port_service/id.html
 /doc/asio/reference/serial_port_service/implementation_type.html
 /doc/asio/reference/serial_port_service/is_open.html
+/doc/asio/reference/serial_port_service/move_assign.html
+/doc/asio/reference/serial_port_service/move_construct.html
 /doc/asio/reference/serial_port_service/native_handle.html
 /doc/asio/reference/serial_port_service/native_handle_type.html
 /doc/asio/reference/serial_port_service/native.html
@@ -2383,7 +2523,6 @@
 /doc/asio/reference/serial_port_service/send_break.html
 /doc/asio/reference/serial_port_service/serial_port_service.html
 /doc/asio/reference/serial_port_service/set_option.html
-/doc/asio/reference/serial_port_service/shutdown_service.html
 /doc/asio/reference/serial_port_service/write_some.html
 /doc/asio/reference/service_already_exists/
 /doc/asio/reference/service_already_exists.html
@@ -2406,7 +2545,6 @@
 /doc/asio/reference/signal_set_service/id.html
 /doc/asio/reference/signal_set_service/implementation_type.html
 /doc/asio/reference/signal_set_service/remove.html
-/doc/asio/reference/signal_set_service/shutdown_service.html
 /doc/asio/reference/signal_set_service/signal_set_service.html
 /doc/asio/reference/socket_acceptor_service/
 /doc/asio/reference/socket_acceptor_service/accept.html
@@ -2428,6 +2566,8 @@
 /doc/asio/reference/socket_acceptor_service/is_open.html
 /doc/asio/reference/socket_acceptor_service/listen.html
 /doc/asio/reference/socket_acceptor_service/local_endpoint.html
+/doc/asio/reference/socket_acceptor_service/move_assign.html
+/doc/asio/reference/socket_acceptor_service/move_construct.html
 /doc/asio/reference/socket_acceptor_service/native_handle.html
 /doc/asio/reference/socket_acceptor_service/native_handle_type.html
 /doc/asio/reference/socket_acceptor_service/native.html
@@ -2443,7 +2583,6 @@
 /doc/asio/reference/socket_acceptor_service/open.html
 /doc/asio/reference/socket_acceptor_service/protocol_type.html
 /doc/asio/reference/socket_acceptor_service/set_option.html
-/doc/asio/reference/socket_acceptor_service/shutdown_service.html
 /doc/asio/reference/socket_acceptor_service/socket_acceptor_service.html
 /doc/asio/reference/socket_base/
 /doc/asio/reference/socket_base/broadcast.html
@@ -2562,7 +2701,6 @@
 /doc/asio/reference/ssl__context_service/set_options.html
 /doc/asio/reference/ssl__context_service/set_password_callback.html
 /doc/asio/reference/ssl__context_service/set_verify_mode.html
-/doc/asio/reference/ssl__context_service/shutdown_service.html
 /doc/asio/reference/ssl__context_service/use_certificate_chain_file.html
 /doc/asio/reference/ssl__context_service/use_certificate_file.html
 /doc/asio/reference/ssl__context_service/use_private_key_file.html
@@ -2622,7 +2760,6 @@
 /doc/asio/reference/ssl__stream_service/peek.html
 /doc/asio/reference/ssl__stream_service/read_some.html
 /doc/asio/reference/ssl__stream_service/shutdown.html
-/doc/asio/reference/ssl__stream_service/shutdown_service.html
 /doc/asio/reference/ssl__stream_service/stream_service.html
 /doc/asio/reference/ssl__stream/service_type.html
 /doc/asio/reference/ssl__stream_service/write_some.html
@@ -2663,6 +2800,8 @@
 /doc/asio/reference/stream_socket_service/io_control.html
 /doc/asio/reference/stream_socket_service/is_open.html
 /doc/asio/reference/stream_socket_service/local_endpoint.html
+/doc/asio/reference/stream_socket_service/move_assign.html
+/doc/asio/reference/stream_socket_service/move_construct.html
 /doc/asio/reference/stream_socket_service/native_handle.html
 /doc/asio/reference/stream_socket_service/native_handle_type.html
 /doc/asio/reference/stream_socket_service/native.html
@@ -2682,7 +2821,6 @@
 /doc/asio/reference/stream_socket_service/send.html
 /doc/asio/reference/stream_socket_service/set_option.html
 /doc/asio/reference/stream_socket_service/shutdown.html
-/doc/asio/reference/stream_socket_service/shutdown_service.html
 /doc/asio/reference/stream_socket_service/stream_socket_service.html
 /doc/asio/reference/SyncRandomAccessReadDevice.html
 /doc/asio/reference/SyncRandomAccessWriteDevice.html
@@ -2731,6 +2869,7 @@
 /doc/asio/reference/windows__basic_handle/basic_handle.html
 /doc/asio/reference/windows__basic_handle/basic_handle/overload1.html
 /doc/asio/reference/windows__basic_handle/basic_handle/overload2.html
+/doc/asio/reference/windows__basic_handle/basic_handle/overload3.html
 /doc/asio/reference/windows__basic_handle/cancel/
 /doc/asio/reference/windows__basic_handle/cancel.html
 /doc/asio/reference/windows__basic_handle/cancel/overload1.html
@@ -2739,7 +2878,15 @@
 /doc/asio/reference/windows__basic_handle/close.html
 /doc/asio/reference/windows__basic_handle/close/overload1.html
 /doc/asio/reference/windows__basic_handle/close/overload2.html
+/doc/asio/reference/windows__basic_handle/get_implementation/
+/doc/asio/reference/windows__basic_handle/get_implementation.html
+/doc/asio/reference/windows__basic_handle/get_implementation/overload1.html
+/doc/asio/reference/windows__basic_handle/get_implementation/overload2.html
 /doc/asio/reference/windows__basic_handle/get_io_service.html
+/doc/asio/reference/windows__basic_handle/get_service/
+/doc/asio/reference/windows__basic_handle/get_service.html
+/doc/asio/reference/windows__basic_handle/get_service/overload1.html
+/doc/asio/reference/windows__basic_handle/get_service/overload2.html
 /doc/asio/reference/windows__basic_handle.html
 /doc/asio/reference/windows__basic_handle/implementation.html
 /doc/asio/reference/windows__basic_handle/implementation_type.html
@@ -2753,6 +2900,7 @@
 /doc/asio/reference/windows__basic_handle/native_handle_type.html
 /doc/asio/reference/windows__basic_handle/native.html
 /doc/asio/reference/windows__basic_handle/native_type.html
+/doc/asio/reference/windows__basic_handle/operator_eq_.html
 /doc/asio/reference/windows__basic_handle/service.html
 /doc/asio/reference/windows__basic_handle/service_type.html
 /doc/asio/reference/windows__basic_random_access_handle/
@@ -2766,6 +2914,7 @@
 /doc/asio/reference/windows__basic_random_access_handle/basic_random_access_handle.html
 /doc/asio/reference/windows__basic_random_access_handle/basic_random_access_handle/overload1.html
 /doc/asio/reference/windows__basic_random_access_handle/basic_random_access_handle/overload2.html
+/doc/asio/reference/windows__basic_random_access_handle/basic_random_access_handle/overload3.html
 /doc/asio/reference/windows__basic_random_access_handle/cancel/
 /doc/asio/reference/windows__basic_random_access_handle/cancel.html
 /doc/asio/reference/windows__basic_random_access_handle/cancel/overload1.html
@@ -2774,7 +2923,15 @@
 /doc/asio/reference/windows__basic_random_access_handle/close.html
 /doc/asio/reference/windows__basic_random_access_handle/close/overload1.html
 /doc/asio/reference/windows__basic_random_access_handle/close/overload2.html
+/doc/asio/reference/windows__basic_random_access_handle/get_implementation/
+/doc/asio/reference/windows__basic_random_access_handle/get_implementation.html
+/doc/asio/reference/windows__basic_random_access_handle/get_implementation/overload1.html
+/doc/asio/reference/windows__basic_random_access_handle/get_implementation/overload2.html
 /doc/asio/reference/windows__basic_random_access_handle/get_io_service.html
+/doc/asio/reference/windows__basic_random_access_handle/get_service/
+/doc/asio/reference/windows__basic_random_access_handle/get_service.html
+/doc/asio/reference/windows__basic_random_access_handle/get_service/overload1.html
+/doc/asio/reference/windows__basic_random_access_handle/get_service/overload2.html
 /doc/asio/reference/windows__basic_random_access_handle.html
 /doc/asio/reference/windows__basic_random_access_handle/implementation.html
 /doc/asio/reference/windows__basic_random_access_handle/implementation_type.html
@@ -2788,6 +2945,7 @@
 /doc/asio/reference/windows__basic_random_access_handle/native_handle_type.html
 /doc/asio/reference/windows__basic_random_access_handle/native.html
 /doc/asio/reference/windows__basic_random_access_handle/native_type.html
+/doc/asio/reference/windows__basic_random_access_handle/operator_eq_.html
 /doc/asio/reference/windows__basic_random_access_handle/read_some_at/
 /doc/asio/reference/windows__basic_random_access_handle/read_some_at.html
 /doc/asio/reference/windows__basic_random_access_handle/read_some_at/overload1.html
@@ -2809,6 +2967,7 @@
 /doc/asio/reference/windows__basic_stream_handle/basic_stream_handle.html
 /doc/asio/reference/windows__basic_stream_handle/basic_stream_handle/overload1.html
 /doc/asio/reference/windows__basic_stream_handle/basic_stream_handle/overload2.html
+/doc/asio/reference/windows__basic_stream_handle/basic_stream_handle/overload3.html
 /doc/asio/reference/windows__basic_stream_handle/cancel/
 /doc/asio/reference/windows__basic_stream_handle/cancel.html
 /doc/asio/reference/windows__basic_stream_handle/cancel/overload1.html
@@ -2817,7 +2976,15 @@
 /doc/asio/reference/windows__basic_stream_handle/close.html
 /doc/asio/reference/windows__basic_stream_handle/close/overload1.html
 /doc/asio/reference/windows__basic_stream_handle/close/overload2.html
+/doc/asio/reference/windows__basic_stream_handle/get_implementation/
+/doc/asio/reference/windows__basic_stream_handle/get_implementation.html
+/doc/asio/reference/windows__basic_stream_handle/get_implementation/overload1.html
+/doc/asio/reference/windows__basic_stream_handle/get_implementation/overload2.html
 /doc/asio/reference/windows__basic_stream_handle/get_io_service.html
+/doc/asio/reference/windows__basic_stream_handle/get_service/
+/doc/asio/reference/windows__basic_stream_handle/get_service.html
+/doc/asio/reference/windows__basic_stream_handle/get_service/overload1.html
+/doc/asio/reference/windows__basic_stream_handle/get_service/overload2.html
 /doc/asio/reference/windows__basic_stream_handle.html
 /doc/asio/reference/windows__basic_stream_handle/implementation.html
 /doc/asio/reference/windows__basic_stream_handle/implementation_type.html
@@ -2831,6 +2998,7 @@
 /doc/asio/reference/windows__basic_stream_handle/native_handle_type.html
 /doc/asio/reference/windows__basic_stream_handle/native.html
 /doc/asio/reference/windows__basic_stream_handle/native_type.html
+/doc/asio/reference/windows__basic_stream_handle/operator_eq_.html
 /doc/asio/reference/windows__basic_stream_handle/read_some/
 /doc/asio/reference/windows__basic_stream_handle/read_some.html
 /doc/asio/reference/windows__basic_stream_handle/read_some/overload1.html
@@ -2872,13 +3040,14 @@
 /doc/asio/reference/windows__random_access_handle_service/id.html
 /doc/asio/reference/windows__random_access_handle_service/implementation_type.html
 /doc/asio/reference/windows__random_access_handle_service/is_open.html
+/doc/asio/reference/windows__random_access_handle_service/move_assign.html
+/doc/asio/reference/windows__random_access_handle_service/move_construct.html
 /doc/asio/reference/windows__random_access_handle_service/native_handle.html
 /doc/asio/reference/windows__random_access_handle_service/native_handle_type.html
 /doc/asio/reference/windows__random_access_handle_service/native.html
 /doc/asio/reference/windows__random_access_handle_service/native_type.html
 /doc/asio/reference/windows__random_access_handle_service/random_access_handle_service.html
 /doc/asio/reference/windows__random_access_handle_service/read_some_at.html
-/doc/asio/reference/windows__random_access_handle_service/shutdown_service.html
 /doc/asio/reference/windows__random_access_handle_service/write_some_at.html
 /doc/asio/reference/windows__stream_handle.html
 /doc/asio/reference/windows__stream_handle_service/
@@ -2894,12 +3063,13 @@
 /doc/asio/reference/windows__stream_handle_service/id.html
 /doc/asio/reference/windows__stream_handle_service/implementation_type.html
 /doc/asio/reference/windows__stream_handle_service/is_open.html
+/doc/asio/reference/windows__stream_handle_service/move_assign.html
+/doc/asio/reference/windows__stream_handle_service/move_construct.html
 /doc/asio/reference/windows__stream_handle_service/native_handle.html
 /doc/asio/reference/windows__stream_handle_service/native_handle_type.html
 /doc/asio/reference/windows__stream_handle_service/native.html
 /doc/asio/reference/windows__stream_handle_service/native_type.html
 /doc/asio/reference/windows__stream_handle_service/read_some.html
-/doc/asio/reference/windows__stream_handle_service/shutdown_service.html
 /doc/asio/reference/windows__stream_handle_service/stream_handle_service.html
 /doc/asio/reference/windows__stream_handle_service/write_some.html
 /doc/asio/reference/write/
@@ -3349,6 +3519,9 @@
 /src/examples/echo/blocking_tcp_echo_server.cpp
 /src/examples/echo/blocking_udp_echo_client.cpp
 /src/examples/echo/blocking_udp_echo_server.cpp
+/src/examples/fork/
+/src/examples/fork/daemon.cpp
+/src/examples/fork/process_per_connection.cpp
 /src/examples/http/
 /src/examples/http/client/
 /src/examples/http/client/async_client.cpp
@@ -3523,7 +3696,9 @@
 /src/tests/performance/server.cpp
 /src/tests/unit/
 /src/tests/unit/archetypes/
+/src/tests/unit/archetypes/gettable_socket_option.hpp
 /src/tests/unit/archetypes/io_control_command.hpp
+/src/tests/unit/archetypes/settable_socket_option.hpp
 /src/tests/unit/basic_datagram_socket.cpp
 /src/tests/unit/basic_deadline_timer.cpp
 /src/tests/unit/basic_raw_socket.cpp
diff --git a/asio/boost_asio.manifest b/asio/boost_asio.manifest
index a213dd0..e4b7aaa 100644
--- a/asio/boost_asio.manifest
+++ b/asio/boost_asio.manifest
@@ -364,6 +364,9 @@
 /doc/html/boost_asio/example/echo/blocking_tcp_echo_server.cpp
 /doc/html/boost_asio/example/echo/blocking_udp_echo_client.cpp
 /doc/html/boost_asio/example/echo/blocking_udp_echo_server.cpp
+/doc/html/boost_asio/example/fork/
+/doc/html/boost_asio/example/fork/daemon.cpp
+/doc/html/boost_asio/example/fork/process_per_connection.cpp
 /doc/html/boost_asio/example/http/
 /doc/html/boost_asio/example/http/client/
 /doc/html/boost_asio/example/http/client/async_client.cpp
@@ -3541,6 +3544,11 @@
 /libs/asio/example/echo/blocking_udp_echo_server.cpp
 /libs/asio/example/echo/Jamfile
 /libs/asio/example/echo/Jamfile.v2
+/libs/asio/example/fork/
+/libs/asio/example/fork/daemon.cpp
+/libs/asio/example/fork/Jamfile
+/libs/asio/example/fork/Jamfile.v2
+/libs/asio/example/fork/process_per_connection.cpp
 /libs/asio/example/http/
 /libs/asio/example/http/client/
 /libs/asio/example/http/client/async_client.cpp
@@ -3746,7 +3754,9 @@
 /libs/asio/index.html
 /libs/asio/test/
 /libs/asio/test/archetypes/
+/libs/asio/test/archetypes/gettable_socket_option.hpp
 /libs/asio/test/archetypes/io_control_command.hpp
+/libs/asio/test/archetypes/settable_socket_option.hpp
 /libs/asio/test/basic_datagram_socket.cpp
 /libs/asio/test/basic_deadline_timer.cpp
 /libs/asio/test/basic_raw_socket.cpp
diff --git a/asio/configure.ac b/asio/configure.ac
index 3ae99af..78aa798 100644
--- a/asio/configure.ac
+++ b/asio/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(asio, [1.5.1])
+AC_INIT(asio, [1.5.2])
 AC_CONFIG_SRCDIR(include/asio.hpp)
 AM_MAINTAINER_MODE
 AM_INIT_AUTOMAKE([tar-ustar])
diff --git a/asio/include/asio/version.hpp b/asio/include/asio/version.hpp
index 7756dcc..34a265d 100644
--- a/asio/include/asio/version.hpp
+++ b/asio/include/asio/version.hpp
@@ -18,6 +18,6 @@
 // ASIO_VERSION % 100 is the sub-minor version
 // ASIO_VERSION / 100 % 1000 is the minor version
 // ASIO_VERSION / 100000 is the major version
-#define ASIO_VERSION 100501 // 1.5.1
+#define ASIO_VERSION 100502 // 1.5.2
 
 #endif // ASIO_VERSION_HPP