[master] bf5e38e Update docs: vcl_hit{} return(miss)

[Nils Goroll]

commit bf5e38e60b8dbba055ccdea6a3d90b977302e1fd
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Tue Apr 28 12:12:58 2015 +0200

    Update docs: vcl_hit{} return(miss)
    
    Fixes #1603

diff --git a/doc/graphviz/cache_req_fsm.dot b/doc/graphviz/cache_req_fsm.dot
index 5856984..4f934da 100644
--- a/doc/graphviz/cache_req_fsm.dot
+++ b/doc/graphviz/cache_req_fsm.dot
@@ -120,7 +120,7 @@ digraph cache_req_fsm {
 		]
 		lookup2 [
 			 shape=record
-			 label="{<top>cnt_lookup:|{vcl_hit\{\}|{req.*|obj.*}}|{<deliver>deliver|<fetch>fetch|restart|synth|<pass>pass}}"
+			 label="{<top>cnt_lookup:|{vcl_hit\{\}|{req.*|obj.*}}|{<deliver>deliver|<miss>miss|restart|synth|<pass>pass}}"
 		]
 	}
 	lookup:busy:e -> lookup:top:e [label="(waitinglist)",
@@ -131,9 +131,9 @@ digraph cache_req_fsm {
 	lookup:h:s -> lookup2 [style=bold,color=green]
 
 	lookup2:deliver:s -> deliver:n [style=bold,color=green]
-	lookup2:fetch:s -> miss [style=bold,color=blue]
+	lookup2:miss:s -> miss [style=bold,color=blue]
 	// XXX should not happen
-	// lookup2:fetch:s -> pass [style=bold,color=red,label="(no busy obj)"]
+	// lookup2:miss:s -> pass [style=bold,color=red,label="(no busy obj)"]
 	lookup2:pass:s -> pass [style=bold,color=red]
 
 	/* cnt_miss */
diff --git a/doc/sphinx/users-guide/vcl-built-in-subs.rst b/doc/sphinx/users-guide/vcl-built-in-subs.rst
index 8b00232..a1eba28 100644
--- a/doc/sphinx/users-guide/vcl-built-in-subs.rst
+++ b/doc/sphinx/users-guide/vcl-built-in-subs.rst
@@ -111,7 +111,7 @@ with one of the following keywords:
     Deliver the object. If it is stale, a background fetch to refresh
     it is triggered.
 
-  ``fetch``
+  ``miss``
     Synchronously refresh the object from the backend despite the
     cache hit. Control will eventually pass to :ref:`vcl_miss`.
 
@@ -127,7 +127,9 @@ with one of the following keywords:
     Transition to :ref:`vcl_synth` with ``resp.status`` and
     ``resp.reason`` being preset to the arguments of ``synth()``.
 
-.. XXX: #1603 hit should not go to miss
+  ``fetch`` (deprecated)
+    same as ``miss``. Will get removed in a future version, triggers a
+    VCL_Error log message.
 
 .. _vcl_miss: