Reorganize top-level doc navigation.

diff --git a/docs/coroutine.rst b/docs/coroutine.rst
new file mode 100644 (file)
index 0000000..8412f73
--- /dev/null
+++ b/docs/coroutine.rst
@@ -0,0 +1,8 @@
+Coroutines and concurrency
+==========================
+
+.. toctree::
+
+   gen
+   concurrent
+   process

diff --git a/docs/http.rst b/docs/http.rst
new file mode 100644 (file)
index 0000000..d15d2a4
--- /dev/null
+++ b/docs/http.rst
@@ -0,0 +1,9 @@
+HTTP servers and clients
+========================
+
+.. toctree::
+
+   httpserver
+   httpclient
+   httputil
+   http1connection

diff --git a/docs/index.rst b/docs/index.rst
index 0fb87aaf5864e00cf0b92f1a14050b408b903447..375e24cdcb52008a0d393523f1a8d52e9b22ba64 100644 (file)
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -132,7 +132,9 @@ This documentation is also available in `PDF and Epub formats
 
    guide
    webframework
+   http
    networking
+   coroutine
    integration
    utilities
    releases

diff --git a/docs/integration.rst b/docs/integration.rst
index cceeb6fbf2510b1d8d7ecb324b03e82da3d4b77b..8ecfae383cefd659e1a089855225783913bb0783 100644 (file)
--- a/docs/integration.rst
+++ b/docs/integration.rst
@@ -4,8 +4,7 @@ Integration with other services
 .. toctree::
 
    auth
+   wsgi
    asyncio
    caresresolver
    twisted
-   websocket
-   wsgi

diff --git a/docs/networking.rst b/docs/networking.rst
index 660f3f09c201a631723036a3350b9305ca04fea6..6922fd8060dc8c55ad0db82f50dc671a753dcb3c 100644 (file)
--- a/docs/networking.rst
+++ b/docs/networking.rst
@@ -3,11 +3,8 @@ Asynchronous networking
 
 .. toctree::
 
-   gen
    ioloop
    iostream
-   http1connection
-   httpclient
    netutil
    tcpclient
    tcpserver

diff --git a/docs/utilities.rst b/docs/utilities.rst
index a1eefe7247c7721f93a2874bfa6f26674c3ab96f..1263944cc942f093b1a076ada933b05c1c2b2a58 100644 (file)
--- a/docs/utilities.rst
+++ b/docs/utilities.rst
@@ -4,11 +4,8 @@ Utilities
 .. toctree::
 
    autoreload
-   concurrent
-   httputil
    log
    options
-   process
    stack_context
    testing
    util

diff --git a/docs/webframework.rst b/docs/webframework.rst
index cf0935361b6a7bc58dd5df27828072f5aac2c92b..ab3ff1cf23dd63ce36dda9fd8ade36b58e88a2d2 100644 (file)
--- a/docs/webframework.rst
+++ b/docs/webframework.rst
@@ -1,11 +1,10 @@
-Core web framework
-==================
+Web framework
+=============
 
 .. toctree::
-   :maxdepth: 2
 
    web
-   httpserver
    template
    escape
    locale
+   websocket