summaryrefslogtreecommitdiff
path: root/Doc/library
diff options
context:
space:
mode:
Diffstat (limited to 'Doc/library')
-rw-r--r--Doc/library/asyncio.rst20
-rw-r--r--Doc/library/concurrency.rst1
2 files changed, 21 insertions, 0 deletions
diff --git a/Doc/library/asyncio.rst b/Doc/library/asyncio.rst
new file mode 100644
index 0000000000..0decdc7178
--- /dev/null
+++ b/Doc/library/asyncio.rst
@@ -0,0 +1,20 @@
+:mod:`asyncio` -- Asynchronous I/O, event loop, coroutines and tasks
+====================================================================
+
+.. module:: asyncio
+ :synopsis: Asynchronous I/O, event loop, coroutines and tasks.
+
+.. versionadded:: 3.4
+
+
+Introduction
+------------
+
+This package includes a pluggable event loop, transport and protocol
+abstractions similar to those in Twisted, and a higher-level scheduler
+for coroutines and tasks based on ``yield from`` (:PEP:`380`).
+
+Full documentation is not yet ready; we hope to have it written
+before Python 3.4 leaves beta. Until then, the best reference is
+:PEP:`3156`. For a motivational primer on transports and protocols,
+see :PEP:`3153`.
diff --git a/Doc/library/concurrency.rst b/Doc/library/concurrency.rst
index 2d691073bb..e016694c77 100644
--- a/Doc/library/concurrency.rst
+++ b/Doc/library/concurrency.rst
@@ -22,6 +22,7 @@ multitasking). Here's an overview:
queue.rst
select.rst
selectors.rst
+ asyncio.rst
The following are support modules for some of the above services: