aboutsummaryrefslogtreecommitdiffstats
path: root/doc/src/guide/book.asciidoc
diff options
context:
space:
mode:
authorLoïc Hoguin <[email protected]>2017-01-02 14:20:15 +0100
committerLoïc Hoguin <[email protected]>2017-01-02 14:46:19 +0100
commit271e31c629be2dff93d68e01c9a8a9c5c34b7e2c (patch)
treeb20ba4f01a174479c1cde0d7abb610dbfa757d05 /doc/src/guide/book.asciidoc
parent5838a0c81a978377084b33fd086de10f9775f425 (diff)
downloadcowboy-271e31c629be2dff93d68e01c9a8a9c5c34b7e2c.tar.gz
cowboy-271e31c629be2dff93d68e01c9a8a9c5c34b7e2c.tar.bz2
cowboy-271e31c629be2dff93d68e01c9a8a9c5c34b7e2c.zip
Various fixes and tweaks to the user guide
Diffstat (limited to 'doc/src/guide/book.asciidoc')
-rw-r--r--doc/src/guide/book.asciidoc36
1 files changed, 24 insertions, 12 deletions
diff --git a/doc/src/guide/book.asciidoc b/doc/src/guide/book.asciidoc
index 9c5f49e..3fdb3b7 100644
--- a/doc/src/guide/book.asciidoc
+++ b/doc/src/guide/book.asciidoc
@@ -21,16 +21,12 @@ include::introduction.asciidoc[Introduction]
include::getting_started.asciidoc[Getting started]
-// NEW! Flow diagram here
-// MERGE include::overview.asciidoc[Request overview]
include::flow_diagram.asciidoc[Flow diagram]
= Configuration
include::listeners.asciidoc[Listeners]
-include::streams.asciidoc[Streams]
-
include::routing.asciidoc[Routing]
include::constraints.asciidoc[Constraints]
@@ -69,19 +65,35 @@ include::resource_design.asciidoc[Designing a resource handler]
include::ws_protocol.asciidoc[The Websocket protocol]
-include::ws_handlers.asciidoc[Handling Websocket connections]
+include::ws_handlers.asciidoc[Websocket handlers]
-= Internals
+= Advanced
-// TODO: shouldn't be needed anymore?
-include::architecture.asciidoc[Architecture]
-
-// TODO: Move into Common scenarios or something; switch to streams
-include::broken_clients.asciidoc[Dealing with broken clients]
+include::streams.asciidoc[Streams]
include::middlewares.asciidoc[Middlewares]
+// @todo Rather have two chapters, custom handlers and custom protocol upgrades
include::sub_protocols.asciidoc[Sub protocols]
-// TODO: they're gone
+//= Additional information
+
+//include::migrating_from_1.0.asciidoc[Migrating from Cowboy 1.0 to 2.0]
+
+// @todo Maybe history? Could take info from architecture also.
+
+= Deprecated chapters
+
+== About the deprecated chapters
+
+The following chapters were relevant in Cowboy 1.0. They have
+not been updated for Cowboy 2.0 yet. The information in these
+chapters may or may not be useful.
+
+include::architecture.asciidoc[Architecture]
+
+include::broken_clients.asciidoc[Dealing with broken clients]
+
include::hooks.asciidoc[Hooks]
+
+include::overview.asciidoc[Overview]