diff --git a/doc/src/guide/rest_get_head.png b/doc/src/guide/rest_get_head.png
index efee892a..211ab603 100644
Binary files a/doc/src/guide/rest_get_head.png and b/doc/src/guide/rest_get_head.png differ
diff --git a/doc/src/guide/rest_get_head.svg b/doc/src/guide/rest_get_head.svg
index c78e9399..92030cf3 100644
--- a/doc/src/guide/rest_get_head.svg
+++ b/doc/src/guide/rest_get_head.svg
@@ -15,7 +15,7 @@
height="1052.3622047"
id="svg2"
version="1.1"
- inkscape:version="0.48.4 r9939"
+ inkscape:version="0.92.1 r"
sodipodi:docname="rest_get_head.svg"
inkscape:export-filename="/home/essen/Dropbox/Public/drawing.png"
inkscape:export-xdpi="90"
@@ -65,15 +65,15 @@
inkscape:pageopacity="1"
inkscape:pageshadow="2"
inkscape:zoom="1.4142136"
- inkscape:cx="122.28875"
- inkscape:cy="777.29526"
+ inkscape:cx="353.51266"
+ inkscape:cy="522.73683"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
- inkscape:window-width="2560"
- inkscape:window-height="1402"
+ inkscape:window-width="1920"
+ inkscape:window-height="1043"
inkscape:window-x="0"
- inkscape:window-y="38"
+ inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:snap-global="true"
showguides="true">
@@ -93,7 +93,7 @@
image/svg+xml
-
+
@@ -514,135 +514,135 @@
inkscape:export-ydpi="89.926643" />
some text
+ y="114.39204"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">some text
some text
+ y="53.112247"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">some text
last_modified
+ y="379.78381"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">last_modified
ProvideResource
+ y="546.59912"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">ProvideCallback
some text
+ y="236.95154"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">some text
conneg
+ id="tspan17171"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">conneg
multiple_choices
+ y="627.34662"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">multiple_choices
resource_exists
+ y="134.49161"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">resource_exists
generate_etag
+ y="296.80188"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">generate_etag
expires
+ y="462.5274"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">expires
true
+ y="175.92931"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">true
false
+ y="670.38055"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">false
@@ -707,18 +707,18 @@
false
+ y="176.39024"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">false
@@ -758,19 +758,19 @@
inkscape:export-ydpi="89.926643" />
middlewares
+ y="-354.17184"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">middlewares
true
+ y="711.18011"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">true
true
+ y="257.43518"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">true
cond
+ id="tspan17171-6"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">cond
300 multiple choices
+ y="792.61121"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">300 multiple choices
200 OK
+ y="711.50043"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">200 OK
has if-match?
+ y="216.51541"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">has if-match?
false
+ y="299.27689"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">false
previously_existed
+ y="379.78381"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">previously_existed
404 not found
+ y="463.83755"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">404 not found
false
+ y="422.69736"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">false
@@ -1198,18 +1198,18 @@
inkscape:export-ydpi="89.926643" />
moved_permanently
+ y="544.82568"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">moved_permanently
412 precondition failed
+ y="297.7261"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">412 precondition failed
true
+ y="463.37662"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">true
true*
+ y="587.59863"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">true*
false
+ y="628.87946"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">false
301 moved permanently
+ y="627.32867"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">301 moved permanently
@@ -1403,46 +1403,46 @@
inkscape:export-ydpi="89.926643" />
moved_temporarily
+ y="709.62695"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">moved_temporarily
true*
+ y="752.64056"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">true*
false
+ y="794.16199"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">false
307 moved temporarily
+ y="792.61121"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">307 moved temporarily
410 gone
+ y="874.99164"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">410 gone
diff --git a/doc/src/guide/rest_put_post_patch.png b/doc/src/guide/rest_put_post_patch.png
index 4afca9e9..176650e9 100644
Binary files a/doc/src/guide/rest_put_post_patch.png and b/doc/src/guide/rest_put_post_patch.png differ
diff --git a/doc/src/guide/rest_put_post_patch.svg b/doc/src/guide/rest_put_post_patch.svg
index 263cc942..06d55052 100644
--- a/doc/src/guide/rest_put_post_patch.svg
+++ b/doc/src/guide/rest_put_post_patch.svg
@@ -15,7 +15,7 @@
height="1052.3622"
id="svg2"
version="1.1"
- inkscape:version="0.48.4 r9939"
+ inkscape:version="0.92.1 r"
sodipodi:docname="rest_put_post_patch.svg"
inkscape:export-filename="/home/essen/Dropbox/Public/drawing.png"
inkscape:export-xdpi="90"
@@ -64,16 +64,16 @@
borderopacity="1.0"
inkscape:pageopacity="1"
inkscape:pageshadow="2"
- inkscape:zoom="2"
- inkscape:cx="299.56028"
- inkscape:cy="-395.99137"
+ inkscape:zoom="0.70710678"
+ inkscape:cx="201.51415"
+ inkscape:cy="-214.71801"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
- inkscape:window-width="2560"
- inkscape:window-height="1402"
+ inkscape:window-width="1920"
+ inkscape:window-height="1043"
inkscape:window-x="0"
- inkscape:window-y="38"
+ inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:snap-global="true"
showguides="true">
@@ -255,65 +255,65 @@
inkscape:export-ydpi="89.926643" />
some text
+ y="114.39204"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">some text
some text
+ y="53.112247"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">some text
some text
+ y="236.95154"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">some text
conneg
+ id="tspan17171"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">conneg
resource_exists
+ y="134.49161"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">resource_exists
true
+ y="175.92931"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">true
@@ -364,18 +364,18 @@
false
+ y="176.39024"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">false
@@ -415,19 +415,19 @@
inkscape:export-ydpi="89.926643" />
middlewares
+ y="-354.17184"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">middlewares
true
+ y="255.81152"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">true
cond
+ id="tspan17171-6"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">cond
has if-match?
+ y="216.51535"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">has if-match?
false
+ y="296.02957"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">false
method is POST/PATCH?
+ y="374.91498"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">method is POST/PATCH?
true
+ y="414.84009"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">true
method is POST?
+ y="852.62952"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">method is POST?
412 precondition failed
+ y="294.47879"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">412 precondition failed
@@ -993,18 +993,18 @@
inkscape:export-ydpi="89.926643" />
previously_existed
+ y="453.2847"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">previously_existed
404 not found
+ y="614.22986"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">404 not found
false
+ y="433.29703"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">false
@@ -1129,32 +1129,32 @@
true*
+ y="574.2605"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">true*
false
+ y="610.86951"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">false
301 moved permanently
+ y="612.67908"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">301 moved permanently
@@ -1250,46 +1250,46 @@
inkscape:export-ydpi="89.926643" />
moved_temporarily
+ y="691.82751"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">moved_temporarily
true*
+ y="733.21747"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">true*
false
+ y="769.89801"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">false
307 moved temporarily
+ y="771.56445"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">307 moved temporarily
400 bad request
+ y="1242.303"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">400 bad request
true
+ y="891.92566"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">true
allow_missing_post
+ y="532.79895"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">allow_missing_post
method is POST?
+ y="455.37643"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">method is POST?
allow_missing_post
+ y="930.3703"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">allow_missing_post
method is PUT?
+ y="852.62952"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">method is PUT?
@@ -1602,32 +1602,32 @@
inkscape:export-ydpi="89.926643" />
is_conflict
+ y="930.3703"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">is_conflict
true
+ y="971.55994"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">true
409 conflict
+ y="1011.8981"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">409 conflict
content_types_accepted
+ y="1164.0962"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">content_types_accepted
AcceptResource
+ y="1242.2975"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">AcceptCallback
new resource?
+ y="1323.8022"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">new resource?
new resource?
+ y="1323.8022"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">new resource?
201 created
+ y="1403.5779"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">201 created
303 see other
+ y="1483.2128"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">303 see other
@@ -2019,18 +2019,18 @@
inkscape:export-ydpi="89.926643" />
has resp location?
+ y="1401.7865"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">has resp location?
has resp body?
+ y="1561.2965"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">has resp body?
multiple_choices
+ y="1561.0739"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">multiple_choices
false
+ y="1602.6646"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">false
300 multiple choices
+ y="1720.566"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">300 multiple choices
200 OK
+ y="1642.3412"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">200 OK
204 no content
+ y="1642.3412"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">204 no content
true
+ y="891.92566"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">true
@@ -2327,18 +2327,18 @@
true
+ y="494.3544"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">true
moved_permanently
+ y="532.79895"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">moved_permanently
410 gone
+ y="1010.2067"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">410 gone
false
+ y="494.97446"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">false
true
+ y="494.51349"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">true
false
+ y="574.40112"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">false
false
+ y="828.86047"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">false
false
+ y="972.02087"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">false
false
+ y="1217.7582"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">false
@@ -2501,18 +2501,18 @@
true
+ y="1283.5576"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">true
true, URI*
+ id="tspan5794"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">true, URI*
true
+ y="1363.2994"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">true
false
+ y="1403.5779"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">false
true
+ y="1642.0209"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">true
true
+ y="1538.8624"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">true
false
+ y="1602.2036"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">false
true
+ y="1363.1792"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">true
false
+ y="1443.395"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">false
true
+ y="1379.0562"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">true
false
+ y="1482.6313"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">false
false
+ y="891.92566"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">false
false
+ y="971.55994"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">false
true
+ y="972.02087"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">true
false
+ y="375.54388"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">false
true
+ y="574.40112"
+ style="font-size:16px;line-height:1.25;font-family:sans-serif">true
diff --git a/doc/src/manual/cowboy_rest.asciidoc b/doc/src/manual/cowboy_rest.asciidoc
index 73adb237..2fabdce1 100644
--- a/doc/src/manual/cowboy_rest.asciidoc
+++ b/doc/src/manual/cowboy_rest.asciidoc
@@ -73,8 +73,6 @@ normal::
=== AcceptCallback
-// @todo The flowcharts should rename AcceptResource into AcceptCallback.
-
[source,erlang]
----
AcceptCallback(Req, State) -> {Result, Req, State}