[master] 85658ab Revert "Fix rendering of varnishd -? in sphinx"

[Dridi Boukelmoune]

commit 85658ab59e1391365fbcf2cb6db5f787e289b4ae
Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
Date:   Mon Mar 13 19:36:36 2017 +0100

    Revert "Fix rendering of varnishd -? in sphinx"
    
    This reverts commit 4c9f9e08295ef86bc79ed389cf9ee85e24258e56. The
    generated HTML and troff code wasn't valid anyway. That would ruffle
    another OCD of mine.

diff --git a/doc/sphinx/Makefile.am b/doc/sphinx/Makefile.am
index a4303be..255ce4e 100644
--- a/doc/sphinx/Makefile.am
+++ b/doc/sphinx/Makefile.am
@@ -46,8 +46,6 @@ all: link_srcdir
 
 html: sphinx_prereq
 	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
-	@sed -i 's/Q.*UESTION_MARK_HACK/?/' \
-	    $(BUILDDIR)/html/reference/varnishd.html
 	@echo
 	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
 
diff --git a/doc/sphinx/reference/varnishd.rst b/doc/sphinx/reference/varnishd.rst
index 7bb27e9..3b34004 100644
--- a/doc/sphinx/reference/varnishd.rst
+++ b/doc/sphinx/reference/varnishd.rst
@@ -85,7 +85,7 @@ For these options, `varnishd` prints information to standard output
 and exits. When a -x option is used, it must be the only option (it
 outputs documentation in reStructuredText, aka RST).
 
--QUESTION_MARK_HACK
+-?
 
   Print the usage message.
 
diff --git a/man/Makefile.am b/man/Makefile.am
index 312d0b3..2b61fbb 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -46,7 +46,6 @@ varnishd.1: \
 	$(top_builddir)/doc/sphinx/reference/varnishd.rst \
 	$(top_builddir)/doc/sphinx/include/params.rst
 	${RST2MAN} $(RST2ANY_FLAGS) $(top_builddir)/doc/sphinx/reference/varnishd.rst $@
-	@sed -i 's/Q.*UESTION_MARK_HACK/?/' $@
 
 varnishncsa.1: \
 	$(top_builddir)/doc/sphinx/reference/varnishncsa.rst \