Merge branch 'master' of ssh://git.varnish-cache.org/git/varnish-cache

bin/varnishncsa/varnishncsa.c

@@ -55,7 +55,7 @@
  *	%q		Query string
  *	%H		Protocol version
  *
- * TODO:	- Log in any format one wants
+ * TODO:	- Make it possible to grab any request header
  *		- Maybe rotate/compress log
  */
 

doc/sphinx/Makefile.am

@@ -126,6 +126,7 @@ EXTRA_DIST = \
 	reference/varnish-cli.rst \
 	reference/vcl.rst \
 	reference/vmod.rst \
+	reference/vmod_std.rst \
 	tutorial/advanced_backend_servers.rst \
 	tutorial/advanced_topics.rst \
 	tutorial/backend_servers.rst \

lib/libvmod_std/Makefile.am

@@ -2,6 +2,8 @@
 
 INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include
 
+dist_man_MANS = vmod_std.3
+
 vmoddir = $(pkglibdir)/vmods
 vmod_LTLIBRARIES = libvmod_std.la
 
@@ -20,3 +22,13 @@ vcc_if.c vcc_if.h: $(top_srcdir)/lib/libvmod_std/vmod.py $(top_srcdir)/lib/libvm
 EXTRA_DIST = vmod.py vmod.vcc
 
 CLEANFILES = $(builddir)/vcc_if.c $(builddir)/vcc_if.h
+
+vmod_std.3: $(top_srcdir)/doc/sphinx/reference/vmod_std.rst
+if HAVE_RST2MAN
+	${RST2MAN} $? $@
+else
+	@echo "========================================"
+	@echo "You need rst2man installed to make dist"
+	@echo "========================================"
+	@false
+endif