[4.1] 89c13d3 Add -stop doc, and be more detailed

PÃ¥l Hermunn Johansen hermunn at varnish-software.com
Thu Jun 15 15:59:10 CEST 2017


commit 89c13d39ac595220f58b89b8791e473391bf1965
Author: Guillaume Quintard <guillaume at varnish-software.com>
Date:   Mon Jun 6 11:24:09 2016 +0200

    Add -stop doc, and be more detailed

diff --git a/bin/varnishtest/vtc_varnish.c b/bin/varnishtest/vtc_varnish.c
index 10542ce..1774b78 100644
--- a/bin/varnishtest/vtc_varnish.c
+++ b/bin/varnishtest/vtc_varnish.c
@@ -924,6 +924,10 @@ varnish_expect(const struct varnish *v, char * const *av)
  *         varnish vNAME [-arg STRING] [-vcl STRING] [-vcl+backend STRING]
  *	                 [-errvcl STRING STRING] [-jail STRING] [-proto PROXY]
  *
+ * The first ``varnish vNAME`` invocation will start the varnishd master
+ * process in the background, waiting for the ``-start`` switch to actually
+ * start the child.
+ *
  * With:
  *
  * vNAME
@@ -956,8 +960,10 @@ varnish_expect(const struct varnish *v, char * const *av)
  *         varnish vNAME [-start] [-wait] [-wait-running] [-wait-stopped]
  *
  * \-start
- *         Start Varnish in the background, immediately processing the rest of
- *         the file.
+ *         Start the child process.
+ *
+ * \-stop
+ *         Stop the child process.
  *
  * \-wait
  *         Wait for that instance to terminate.



More information about the varnish-commit mailing list