Merge branch 'master' of code.uplex.de:uplex-varnish/libvmod-dispatch into 5.2

README.rst

@@ -6,8 +6,6 @@
 
 .. role:: ref(emphasis)
 
-.. _vmod_dispatch(3):
-
 =============
 vmod_dispatch
 =============
@@ -21,8 +19,27 @@ Varnish Module for dispatching control to VCL labels or subroutines
 SYNOPSIS
 ========
 
-import dispatch [from "path"] ;
+.. parsed-literal::
+
+  import dispatch [from "path"]
+  
+  new xlabel = dispatch.label()
+  
+      VOID xlabel.add(INT n, STRING label)
+   
+      VOID xlabel.go(INT)
+   
+      STRING xlabel.string(INT)
+   
+  new xsub = dispatch.sub()
   
+      VOID xsub.add(INT n, STRING sub)
+   
+      VOID xsub.call(INT n)
+   
+      STRING xsub.string(INT)
+   
+  STRING version()
   
 ::
 
@@ -36,93 +53,66 @@ Varnish Module (VMOD) for dispatching control to VCL labels or subroutines.
 
 ... XXX ...
 
-CONTENTS
-========
-
-* VOID label()
-* VOID sub()
-* STRING version()
+.. _vmod_dispatch.label:
 
-.. _obj_label:
+new xlabel = dispatch.label()
+-----------------------------
 
-label
------
 
-::
 
-	new OBJ = VOID label()
+.. _vmod_dispatch.label.add:
 
-.. _func_label.add:
+VOID xlabel.add(INT n, STRING label)
+------------------------------------
 
-label.add
----------
 
-::
 
-	VOID label.add(INT n, STRING label)
+.. _vmod_dispatch.label.go:
 
-.. _func_label.go:
+VOID xlabel.go(INT)
+-------------------
 
-label.go
---------
 
-::
 
-	VOID label.go(INT)
+.. _vmod_dispatch.label.string:
 
-.. _func_label.string:
+STRING xlabel.string(INT)
+-------------------------
 
-label.string
-------------
 
-::
 
-	STRING label.string(INT)
+.. _vmod_dispatch.sub:
 
-.. _obj_sub:
+new xsub = dispatch.sub()
+-------------------------
 
-sub
----
 
-::
 
-	new OBJ = VOID sub()
+.. _vmod_dispatch.sub.add:
 
-.. _func_sub.add:
+VOID xsub.add(INT n, STRING sub)
+--------------------------------
 
-sub.add
--------
 
-::
 
-	VOID sub.add(INT n, STRING sub)
+.. _vmod_dispatch.sub.call:
 
-.. _func_sub.call:
+VOID xsub.call(INT n)
+---------------------
 
-sub.call
---------
 
-::
 
-	VOID sub.call(INT n)
+.. _vmod_dispatch.sub.string:
 
-.. _func_sub.string:
+STRING xsub.string(INT)
+-----------------------
 
-sub.string
-----------
 
-::
-
-	STRING sub.string(INT)
-
-.. _func_version:
 
-version
--------
+.. _vmod_dispatch.version:
 
-::
-
-	STRING version()
+STRING version()
+----------------
 
 Return the version string for this VMOD.
 

src/vmod_dispatch.vcc

@@ -7,7 +7,7 @@
 # See LICENSE
 #
 
-$Module dispatch 3 Varnish Module for dispatching control to VCL labels or subroutines
+$Module dispatch 3 "Varnish Module for dispatching control to VCL labels or subroutines"
 
 ::