asio version 1.18.0 released
diff --git a/asio/README b/asio/README
index 92472f5..82ba8fb 100644
--- a/asio/README
+++ b/asio/README
@@ -1,4 +1,4 @@
-asio version 1.17.0
-Released Friday, 10 July 2020.
+asio version 1.18.0
+Released Saturday, 15 August 2020.
 
 See doc/index.html for API documentation and a tutorial.
diff --git a/asio/asio.manifest b/asio/asio.manifest
index 440b974..45253c8 100644
--- a/asio/asio.manifest
+++ b/asio/asio.manifest
@@ -257,7 +257,6 @@
 /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.html
-/doc/asio/reference/basic_datagram_socket/impl_.html
 /doc/asio/reference/basic_datagram_socket/io_control/
 /doc/asio/reference/basic_datagram_socket/io_control.html
 /doc/asio/reference/basic_datagram_socket/io_control/overload1.html
@@ -493,7 +492,6 @@
 /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.html
-/doc/asio/reference/basic_raw_socket/impl_.html
 /doc/asio/reference/basic_raw_socket/io_control/
 /doc/asio/reference/basic_raw_socket/io_control.html
 /doc/asio/reference/basic_raw_socket/io_control/overload1.html
@@ -651,7 +649,6 @@
 /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.html
-/doc/asio/reference/basic_seq_packet_socket/impl_.html
 /doc/asio/reference/basic_seq_packet_socket/io_control/
 /doc/asio/reference/basic_seq_packet_socket/io_control.html
 /doc/asio/reference/basic_seq_packet_socket/io_control/overload1.html
@@ -1032,7 +1029,6 @@
 /doc/asio/reference/basic_socket/get_option/overload1.html
 /doc/asio/reference/basic_socket/get_option/overload2.html
 /doc/asio/reference/basic_socket.html
-/doc/asio/reference/basic_socket/impl_.html
 /doc/asio/reference/basic_socket/io_control/
 /doc/asio/reference/basic_socket/io_control.html
 /doc/asio/reference/basic_socket/io_control/overload1.html
@@ -1275,7 +1271,6 @@
 /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.html
-/doc/asio/reference/basic_stream_socket/impl_.html
 /doc/asio/reference/basic_stream_socket/io_control/
 /doc/asio/reference/basic_stream_socket/io_control.html
 /doc/asio/reference/basic_stream_socket/io_control/overload1.html
@@ -3319,7 +3314,6 @@
 /doc/asio/reference/posix__basic_descriptor/executor_type.html
 /doc/asio/reference/posix__basic_descriptor/get_executor.html
 /doc/asio/reference/posix__basic_descriptor.html
-/doc/asio/reference/posix__basic_descriptor/impl_.html
 /doc/asio/reference/posix__basic_descriptor/io_control/
 /doc/asio/reference/posix__basic_descriptor/io_control.html
 /doc/asio/reference/posix__basic_descriptor/io_control/overload1.html
@@ -3379,7 +3373,6 @@
 /doc/asio/reference/posix__basic_stream_descriptor/executor_type.html
 /doc/asio/reference/posix__basic_stream_descriptor/get_executor.html
 /doc/asio/reference/posix__basic_stream_descriptor.html
-/doc/asio/reference/posix__basic_stream_descriptor/impl_.html
 /doc/asio/reference/posix__basic_stream_descriptor/io_control/
 /doc/asio/reference/posix__basic_stream_descriptor/io_control.html
 /doc/asio/reference/posix__basic_stream_descriptor/io_control/overload1.html
@@ -3895,11 +3888,13 @@
 /doc/asio/reference/thread_pool__basic_executor_type/basic_executor_type/overload1.html
 /doc/asio/reference/thread_pool__basic_executor_type/basic_executor_type/overload2.html
 /doc/asio/reference/thread_pool__basic_executor_type/bulk_execute.html
+/doc/asio/reference/thread_pool__basic_executor_type/connect.html
 /doc/asio/reference/thread_pool__basic_executor_type/context.html
 /doc/asio/reference/thread_pool__basic_executor_type/defer.html
 /doc/asio/reference/thread_pool__basic_executor_type/dispatch.html
 /doc/asio/reference/thread_pool__basic_executor_type/execute.html
 /doc/asio/reference/thread_pool__basic_executor_type.html
+/doc/asio/reference/thread_pool__basic_executor_type/index_type.html
 /doc/asio/reference/thread_pool__basic_executor_type/on_work_finished.html
 /doc/asio/reference/thread_pool__basic_executor_type/on_work_started.html
 /doc/asio/reference/thread_pool__basic_executor_type/operator_eq_/
@@ -3936,6 +3931,7 @@
 /doc/asio/reference/thread_pool__basic_executor_type/running_in_this_thread.html
 /doc/asio/reference/thread_pool__basic_executor_type/schedule.html
 /doc/asio/reference/thread_pool__basic_executor_type/sender_type.html
+/doc/asio/reference/thread_pool__basic_executor_type/shape_type.html
 /doc/asio/reference/thread_pool/destroy.html
 /doc/asio/reference/thread_pool/executor.html
 /doc/asio/reference/thread_pool/executor_type.html
@@ -4075,7 +4071,6 @@
 /doc/asio/reference/windows__basic_overlapped_handle/executor_type.html
 /doc/asio/reference/windows__basic_overlapped_handle/get_executor.html
 /doc/asio/reference/windows__basic_overlapped_handle.html
-/doc/asio/reference/windows__basic_overlapped_handle/impl_.html
 /doc/asio/reference/windows__basic_overlapped_handle/is_open.html
 /doc/asio/reference/windows__basic_overlapped_handle/lowest_layer/
 /doc/asio/reference/windows__basic_overlapped_handle/lowest_layer.html
@@ -4113,7 +4108,6 @@
 /doc/asio/reference/windows__basic_random_access_handle/executor_type.html
 /doc/asio/reference/windows__basic_random_access_handle/get_executor.html
 /doc/asio/reference/windows__basic_random_access_handle.html
-/doc/asio/reference/windows__basic_random_access_handle/impl_.html
 /doc/asio/reference/windows__basic_random_access_handle/is_open.html
 /doc/asio/reference/windows__basic_random_access_handle/lowest_layer/
 /doc/asio/reference/windows__basic_random_access_handle/lowest_layer.html
@@ -4159,7 +4153,6 @@
 /doc/asio/reference/windows__basic_stream_handle/executor_type.html
 /doc/asio/reference/windows__basic_stream_handle/get_executor.html
 /doc/asio/reference/windows__basic_stream_handle.html
-/doc/asio/reference/windows__basic_stream_handle/impl_.html
 /doc/asio/reference/windows__basic_stream_handle/is_open.html
 /doc/asio/reference/windows__basic_stream_handle/lowest_layer/
 /doc/asio/reference/windows__basic_stream_handle/lowest_layer.html
@@ -4233,6 +4226,7 @@
 /doc/asio/reference/write/overload8.html
 /doc/asio/reference/write/overload9.html
 /doc/asio/reference/yield_context.html
+/doc/asio/std_executors.html
 /doc/asio/tutorial/
 /doc/asio/tutorial/boost_bind.html
 /doc/asio/tutorial.html
diff --git a/asio/boost_asio.manifest b/asio/boost_asio.manifest
index 9c6c6e2..291c4cc 100644
--- a/asio/boost_asio.manifest
+++ b/asio/boost_asio.manifest
@@ -1100,7 +1100,6 @@
 /doc/html/boost_asio/reference/basic_datagram_socket/get_option/overload1.html
 /doc/html/boost_asio/reference/basic_datagram_socket/get_option/overload2.html
 /doc/html/boost_asio/reference/basic_datagram_socket.html
-/doc/html/boost_asio/reference/basic_datagram_socket/impl_.html
 /doc/html/boost_asio/reference/basic_datagram_socket/io_control/
 /doc/html/boost_asio/reference/basic_datagram_socket/io_control.html
 /doc/html/boost_asio/reference/basic_datagram_socket/io_control/overload1.html
@@ -1336,7 +1335,6 @@
 /doc/html/boost_asio/reference/basic_raw_socket/get_option/overload1.html
 /doc/html/boost_asio/reference/basic_raw_socket/get_option/overload2.html
 /doc/html/boost_asio/reference/basic_raw_socket.html
-/doc/html/boost_asio/reference/basic_raw_socket/impl_.html
 /doc/html/boost_asio/reference/basic_raw_socket/io_control/
 /doc/html/boost_asio/reference/basic_raw_socket/io_control.html
 /doc/html/boost_asio/reference/basic_raw_socket/io_control/overload1.html
@@ -1494,7 +1492,6 @@
 /doc/html/boost_asio/reference/basic_seq_packet_socket/get_option/overload1.html
 /doc/html/boost_asio/reference/basic_seq_packet_socket/get_option/overload2.html
 /doc/html/boost_asio/reference/basic_seq_packet_socket.html
-/doc/html/boost_asio/reference/basic_seq_packet_socket/impl_.html
 /doc/html/boost_asio/reference/basic_seq_packet_socket/io_control/
 /doc/html/boost_asio/reference/basic_seq_packet_socket/io_control.html
 /doc/html/boost_asio/reference/basic_seq_packet_socket/io_control/overload1.html
@@ -1875,7 +1872,6 @@
 /doc/html/boost_asio/reference/basic_socket/get_option/overload1.html
 /doc/html/boost_asio/reference/basic_socket/get_option/overload2.html
 /doc/html/boost_asio/reference/basic_socket.html
-/doc/html/boost_asio/reference/basic_socket/impl_.html
 /doc/html/boost_asio/reference/basic_socket/io_control/
 /doc/html/boost_asio/reference/basic_socket/io_control.html
 /doc/html/boost_asio/reference/basic_socket/io_control/overload1.html
@@ -2118,7 +2114,6 @@
 /doc/html/boost_asio/reference/basic_stream_socket/get_option/overload1.html
 /doc/html/boost_asio/reference/basic_stream_socket/get_option/overload2.html
 /doc/html/boost_asio/reference/basic_stream_socket.html
-/doc/html/boost_asio/reference/basic_stream_socket/impl_.html
 /doc/html/boost_asio/reference/basic_stream_socket/io_control/
 /doc/html/boost_asio/reference/basic_stream_socket/io_control.html
 /doc/html/boost_asio/reference/basic_stream_socket/io_control/overload1.html
@@ -4153,7 +4148,6 @@
 /doc/html/boost_asio/reference/posix__basic_descriptor/executor_type.html
 /doc/html/boost_asio/reference/posix__basic_descriptor/get_executor.html
 /doc/html/boost_asio/reference/posix__basic_descriptor.html
-/doc/html/boost_asio/reference/posix__basic_descriptor/impl_.html
 /doc/html/boost_asio/reference/posix__basic_descriptor/io_control/
 /doc/html/boost_asio/reference/posix__basic_descriptor/io_control.html
 /doc/html/boost_asio/reference/posix__basic_descriptor/io_control/overload1.html
@@ -4213,7 +4207,6 @@
 /doc/html/boost_asio/reference/posix__basic_stream_descriptor/executor_type.html
 /doc/html/boost_asio/reference/posix__basic_stream_descriptor/get_executor.html
 /doc/html/boost_asio/reference/posix__basic_stream_descriptor.html
-/doc/html/boost_asio/reference/posix__basic_stream_descriptor/impl_.html
 /doc/html/boost_asio/reference/posix__basic_stream_descriptor/io_control/
 /doc/html/boost_asio/reference/posix__basic_stream_descriptor/io_control.html
 /doc/html/boost_asio/reference/posix__basic_stream_descriptor/io_control/overload1.html
@@ -4714,11 +4707,13 @@
 /doc/html/boost_asio/reference/thread_pool__basic_executor_type/basic_executor_type/overload1.html
 /doc/html/boost_asio/reference/thread_pool__basic_executor_type/basic_executor_type/overload2.html
 /doc/html/boost_asio/reference/thread_pool__basic_executor_type/bulk_execute.html
+/doc/html/boost_asio/reference/thread_pool__basic_executor_type/connect.html
 /doc/html/boost_asio/reference/thread_pool__basic_executor_type/context.html
 /doc/html/boost_asio/reference/thread_pool__basic_executor_type/defer.html
 /doc/html/boost_asio/reference/thread_pool__basic_executor_type/dispatch.html
 /doc/html/boost_asio/reference/thread_pool__basic_executor_type/execute.html
 /doc/html/boost_asio/reference/thread_pool__basic_executor_type.html
+/doc/html/boost_asio/reference/thread_pool__basic_executor_type/index_type.html
 /doc/html/boost_asio/reference/thread_pool__basic_executor_type/on_work_finished.html
 /doc/html/boost_asio/reference/thread_pool__basic_executor_type/on_work_started.html
 /doc/html/boost_asio/reference/thread_pool__basic_executor_type/operator_eq_/
@@ -4755,6 +4750,7 @@
 /doc/html/boost_asio/reference/thread_pool__basic_executor_type/running_in_this_thread.html
 /doc/html/boost_asio/reference/thread_pool__basic_executor_type/schedule.html
 /doc/html/boost_asio/reference/thread_pool__basic_executor_type/sender_type.html
+/doc/html/boost_asio/reference/thread_pool__basic_executor_type/shape_type.html
 /doc/html/boost_asio/reference/thread_pool/destroy.html
 /doc/html/boost_asio/reference/thread_pool/executor.html
 /doc/html/boost_asio/reference/thread_pool/executor_type.html
@@ -4892,7 +4888,6 @@
 /doc/html/boost_asio/reference/windows__basic_overlapped_handle/executor_type.html
 /doc/html/boost_asio/reference/windows__basic_overlapped_handle/get_executor.html
 /doc/html/boost_asio/reference/windows__basic_overlapped_handle.html
-/doc/html/boost_asio/reference/windows__basic_overlapped_handle/impl_.html
 /doc/html/boost_asio/reference/windows__basic_overlapped_handle/is_open.html
 /doc/html/boost_asio/reference/windows__basic_overlapped_handle/lowest_layer/
 /doc/html/boost_asio/reference/windows__basic_overlapped_handle/lowest_layer.html
@@ -4930,7 +4925,6 @@
 /doc/html/boost_asio/reference/windows__basic_random_access_handle/executor_type.html
 /doc/html/boost_asio/reference/windows__basic_random_access_handle/get_executor.html
 /doc/html/boost_asio/reference/windows__basic_random_access_handle.html
-/doc/html/boost_asio/reference/windows__basic_random_access_handle/impl_.html
 /doc/html/boost_asio/reference/windows__basic_random_access_handle/is_open.html
 /doc/html/boost_asio/reference/windows__basic_random_access_handle/lowest_layer/
 /doc/html/boost_asio/reference/windows__basic_random_access_handle/lowest_layer.html
@@ -4976,7 +4970,6 @@
 /doc/html/boost_asio/reference/windows__basic_stream_handle/executor_type.html
 /doc/html/boost_asio/reference/windows__basic_stream_handle/get_executor.html
 /doc/html/boost_asio/reference/windows__basic_stream_handle.html
-/doc/html/boost_asio/reference/windows__basic_stream_handle/impl_.html
 /doc/html/boost_asio/reference/windows__basic_stream_handle/is_open.html
 /doc/html/boost_asio/reference/windows__basic_stream_handle/lowest_layer/
 /doc/html/boost_asio/reference/windows__basic_stream_handle/lowest_layer.html
@@ -5050,6 +5043,7 @@
 /doc/html/boost_asio/reference/write/overload8.html
 /doc/html/boost_asio/reference/write/overload9.html
 /doc/html/boost_asio/reference/yield_context.html
+/doc/html/boost_asio/std_executors.html
 /doc/html/boost_asio/sync_op.png
 /doc/html/boost_asio/tutorial/
 /doc/html/boost_asio/tutorial.html
@@ -5097,160 +5091,6 @@
 /libs/asio/doc/doxy2qbk.pl
 /libs/asio/doc/examples.qbk
 /libs/asio/doc/history.qbk
-/libs/asio/doc/html/
-/libs/asio/doc/html/boost_asio/
-/libs/asio/doc/html/boost_asio/example/
-/libs/asio/doc/html/boost_asio/example/cpp03/
-/libs/asio/doc/html/boost_asio/example/cpp03/allocation/
-/libs/asio/doc/html/boost_asio/example/cpp03/buffers/
-/libs/asio/doc/html/boost_asio/example/cpp03/chat/
-/libs/asio/doc/html/boost_asio/example/cpp03/echo/
-/libs/asio/doc/html/boost_asio/example/cpp03/fork/
-/libs/asio/doc/html/boost_asio/example/cpp03/http/
-/libs/asio/doc/html/boost_asio/example/cpp03/http/client/
-/libs/asio/doc/html/boost_asio/example/cpp03/http/server/
-/libs/asio/doc/html/boost_asio/example/cpp03/http/server2/
-/libs/asio/doc/html/boost_asio/example/cpp03/http/server3/
-/libs/asio/doc/html/boost_asio/example/cpp03/http/server4/
-/libs/asio/doc/html/boost_asio/example/cpp03/icmp/
-/libs/asio/doc/html/boost_asio/example/cpp03/invocation/
-/libs/asio/doc/html/boost_asio/example/cpp03/iostreams/
-/libs/asio/doc/html/boost_asio/example/cpp03/local/
-/libs/asio/doc/html/boost_asio/example/cpp03/multicast/
-/libs/asio/doc/html/boost_asio/example/cpp03/nonblocking/
-/libs/asio/doc/html/boost_asio/example/cpp03/porthopper/
-/libs/asio/doc/html/boost_asio/example/cpp03/serialization/
-/libs/asio/doc/html/boost_asio/example/cpp03/services/
-/libs/asio/doc/html/boost_asio/example/cpp03/socks4/
-/libs/asio/doc/html/boost_asio/example/cpp03/spawn/
-/libs/asio/doc/html/boost_asio/example/cpp03/ssl/
-/libs/asio/doc/html/boost_asio/example/cpp03/timeouts/
-/libs/asio/doc/html/boost_asio/example/cpp03/timers/
-/libs/asio/doc/html/boost_asio/example/cpp03/windows/
-/libs/asio/doc/html/boost_asio/example/cpp11/
-/libs/asio/doc/html/boost_asio/example/cpp11/allocation/
-/libs/asio/doc/html/boost_asio/example/cpp11/buffers/
-/libs/asio/doc/html/boost_asio/example/cpp11/chat/
-/libs/asio/doc/html/boost_asio/example/cpp11/echo/
-/libs/asio/doc/html/boost_asio/example/cpp11/executors/
-/libs/asio/doc/html/boost_asio/example/cpp11/fork/
-/libs/asio/doc/html/boost_asio/example/cpp11/futures/
-/libs/asio/doc/html/boost_asio/example/cpp11/handler_tracking/
-/libs/asio/doc/html/boost_asio/example/cpp11/http/
-/libs/asio/doc/html/boost_asio/example/cpp11/http/server/
-/libs/asio/doc/html/boost_asio/example/cpp11/invocation/
-/libs/asio/doc/html/boost_asio/example/cpp11/local/
-/libs/asio/doc/html/boost_asio/example/cpp11/multicast/
-/libs/asio/doc/html/boost_asio/example/cpp11/nonblocking/
-/libs/asio/doc/html/boost_asio/example/cpp11/operations/
-/libs/asio/doc/html/boost_asio/example/cpp11/socks4/
-/libs/asio/doc/html/boost_asio/example/cpp11/spawn/
-/libs/asio/doc/html/boost_asio/example/cpp11/ssl/
-/libs/asio/doc/html/boost_asio/example/cpp11/timeouts/
-/libs/asio/doc/html/boost_asio/example/cpp11/timers/
-/libs/asio/doc/html/boost_asio/example/cpp14/
-/libs/asio/doc/html/boost_asio/example/cpp14/operations/
-/libs/asio/doc/html/boost_asio/example/cpp17/
-/libs/asio/doc/html/boost_asio/example/cpp17/coroutines_ts/
-/libs/asio/doc/html/boost_asio/examples/
-/libs/asio/doc/html/boost_asio/examples/cpp03_examples.html
-/libs/asio/doc/html/boost_asio/examples/cpp11_examples.html
-/libs/asio/doc/html/boost_asio/examples/cpp14_examples.html
-/libs/asio/doc/html/boost_asio/examples/cpp17_examples.html
-/libs/asio/doc/html/boost_asio/examples.html
-/libs/asio/doc/html/boost_asio/history.html
-/libs/asio/doc/html/boost_asio/index.html
-/libs/asio/doc/html/boost_asio/net_ts.html
-/libs/asio/doc/html/boost_asio/overview/
-/libs/asio/doc/html/boost_asio/overview/core/
-/libs/asio/doc/html/boost_asio/overview/core/allocation.html
-/libs/asio/doc/html/boost_asio/overview/core/async.html
-/libs/asio/doc/html/boost_asio/overview/core/basics.html
-/libs/asio/doc/html/boost_asio/overview/core/buffers.html
-/libs/asio/doc/html/boost_asio/overview/core/concurrency_hint.html
-/libs/asio/doc/html/boost_asio/overview/core/coroutine.html
-/libs/asio/doc/html/boost_asio/overview/core/coroutines_ts.html
-/libs/asio/doc/html/boost_asio/overview/core/handler_tracking.html
-/libs/asio/doc/html/boost_asio/overview/core.html
-/libs/asio/doc/html/boost_asio/overview/core/line_based.html
-/libs/asio/doc/html/boost_asio/overview/core/reactor.html
-/libs/asio/doc/html/boost_asio/overview/core/spawn.html
-/libs/asio/doc/html/boost_asio/overview/core/strands.html
-/libs/asio/doc/html/boost_asio/overview/core/streams.html
-/libs/asio/doc/html/boost_asio/overview/core/threads.html
-/libs/asio/doc/html/boost_asio/overview/cpp2011/
-/libs/asio/doc/html/boost_asio/overview/cpp2011/array.html
-/libs/asio/doc/html/boost_asio/overview/cpp2011/atomic.html
-/libs/asio/doc/html/boost_asio/overview/cpp2011/chrono.html
-/libs/asio/doc/html/boost_asio/overview/cpp2011/futures.html
-/libs/asio/doc/html/boost_asio/overview/cpp2011.html
-/libs/asio/doc/html/boost_asio/overview/cpp2011/move_handlers.html
-/libs/asio/doc/html/boost_asio/overview/cpp2011/move_objects.html
-/libs/asio/doc/html/boost_asio/overview/cpp2011/shared_ptr.html
-/libs/asio/doc/html/boost_asio/overview/cpp2011/variadic.html
-/libs/asio/doc/html/boost_asio/overview.html
-/libs/asio/doc/html/boost_asio/overview/implementation.html
-/libs/asio/doc/html/boost_asio/overview/networking/
-/libs/asio/doc/html/boost_asio/overview/networking/bsd_sockets.html
-/libs/asio/doc/html/boost_asio/overview/networking.html
-/libs/asio/doc/html/boost_asio/overview/networking/iostreams.html
-/libs/asio/doc/html/boost_asio/overview/networking/other_protocols.html
-/libs/asio/doc/html/boost_asio/overview/networking/protocols.html
-/libs/asio/doc/html/boost_asio/overview/posix/
-/libs/asio/doc/html/boost_asio/overview/posix/fork.html
-/libs/asio/doc/html/boost_asio/overview/posix.html
-/libs/asio/doc/html/boost_asio/overview/posix/local.html
-/libs/asio/doc/html/boost_asio/overview/posix/stream_descriptor.html
-/libs/asio/doc/html/boost_asio/overview/rationale.html
-/libs/asio/doc/html/boost_asio/overview/serial_ports.html
-/libs/asio/doc/html/boost_asio/overview/signals.html
-/libs/asio/doc/html/boost_asio/overview/ssl.html
-/libs/asio/doc/html/boost_asio/overview/timers.html
-/libs/asio/doc/html/boost_asio/overview/windows/
-/libs/asio/doc/html/boost_asio/overview/windows.html
-/libs/asio/doc/html/boost_asio/overview/windows/object_handle.html
-/libs/asio/doc/html/boost_asio/overview/windows/random_access_handle.html
-/libs/asio/doc/html/boost_asio/overview/windows/stream_handle.html
-/libs/asio/doc/html/boost_asio/tutorial/
-/libs/asio/doc/html/boost_asio/tutorial.html
-/libs/asio/doc/html/boost_asio/tutorial/tutdaytime1/
-/libs/asio/doc/html/boost_asio/tutorial/tutdaytime1.html
-/libs/asio/doc/html/boost_asio/tutorial/tutdaytime1/src.html
-/libs/asio/doc/html/boost_asio/tutorial/tutdaytime2/
-/libs/asio/doc/html/boost_asio/tutorial/tutdaytime2.html
-/libs/asio/doc/html/boost_asio/tutorial/tutdaytime2/src.html
-/libs/asio/doc/html/boost_asio/tutorial/tutdaytime3/
-/libs/asio/doc/html/boost_asio/tutorial/tutdaytime3.html
-/libs/asio/doc/html/boost_asio/tutorial/tutdaytime3/src.html
-/libs/asio/doc/html/boost_asio/tutorial/tutdaytime4/
-/libs/asio/doc/html/boost_asio/tutorial/tutdaytime4.html
-/libs/asio/doc/html/boost_asio/tutorial/tutdaytime4/src.html
-/libs/asio/doc/html/boost_asio/tutorial/tutdaytime5/
-/libs/asio/doc/html/boost_asio/tutorial/tutdaytime5.html
-/libs/asio/doc/html/boost_asio/tutorial/tutdaytime5/src.html
-/libs/asio/doc/html/boost_asio/tutorial/tutdaytime6/
-/libs/asio/doc/html/boost_asio/tutorial/tutdaytime6.html
-/libs/asio/doc/html/boost_asio/tutorial/tutdaytime6/src.html
-/libs/asio/doc/html/boost_asio/tutorial/tutdaytime7/
-/libs/asio/doc/html/boost_asio/tutorial/tutdaytime7.html
-/libs/asio/doc/html/boost_asio/tutorial/tutdaytime7/src.html
-/libs/asio/doc/html/boost_asio/tutorial/tuttimer1/
-/libs/asio/doc/html/boost_asio/tutorial/tuttimer1.html
-/libs/asio/doc/html/boost_asio/tutorial/tuttimer1/src.html
-/libs/asio/doc/html/boost_asio/tutorial/tuttimer2/
-/libs/asio/doc/html/boost_asio/tutorial/tuttimer2.html
-/libs/asio/doc/html/boost_asio/tutorial/tuttimer2/src.html
-/libs/asio/doc/html/boost_asio/tutorial/tuttimer3/
-/libs/asio/doc/html/boost_asio/tutorial/tuttimer3.html
-/libs/asio/doc/html/boost_asio/tutorial/tuttimer3/src.html
-/libs/asio/doc/html/boost_asio/tutorial/tuttimer4/
-/libs/asio/doc/html/boost_asio/tutorial/tuttimer4.html
-/libs/asio/doc/html/boost_asio/tutorial/tuttimer4/src.html
-/libs/asio/doc/html/boost_asio/tutorial/tuttimer5/
-/libs/asio/doc/html/boost_asio/tutorial/tuttimer5.html
-/libs/asio/doc/html/boost_asio/tutorial/tuttimer5/src.html
-/libs/asio/doc/html/boost_asio/using.html
-/libs/asio/doc/html/index.html
 /libs/asio/doc/index.xml
 /libs/asio/doc/Jamfile.v2
 /libs/asio/doc/net_ts.qbk
@@ -5355,6 +5195,7 @@
 /libs/asio/doc/requirements/WaitTraits.qbk
 /libs/asio/doc/requirements/WriteHandler.qbk
 /libs/asio/doc/std_exception_dox.txt
+/libs/asio/doc/std_executors.qbk
 /libs/asio/doc/tutorial.dox
 /libs/asio/doc/tutorial.qbk
 /libs/asio/doc/tutorial.xsl
diff --git a/asio/configure.ac b/asio/configure.ac
index fd1954c..3de14ee 100644
--- a/asio/configure.ac
+++ b/asio/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(asio, [1.17.0])
+AC_INIT(asio, [1.18.0])
 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 d396288..b15fa57 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 101700 // 1.17.0
+#define ASIO_VERSION 101800 // 1.18.0
 
 #endif // ASIO_VERSION_HPP