[master] 5679cc7 Summarize changes in varnishd command-line options in Upgrading to 5.1

[Geoff Simmons]

commit 5679cc705b818452808f43dd883a33041cb6a104
Author: Geoff Simmons <geoff at uplex.de>
Date:   Fri Mar 10 18:19:29 2017 +0100

    Summarize changes in varnishd command-line options in Upgrading to 5.1

diff --git a/doc/sphinx/reference/varnishd.rst b/doc/sphinx/reference/varnishd.rst
index cf62b8d..ada8875 100644
--- a/doc/sphinx/reference/varnishd.rst
+++ b/doc/sphinx/reference/varnishd.rst
@@ -204,7 +204,7 @@ Advanced, development and debugging options
 
   Print VCL code compiled to C language and exit. Specify the VCL file
   to compile with the -f option. Either -f or -b must be used with -C,
-  and -C cannot be used with -F.
+  and -C cannot be used with -F or -d.
 
 -V
 
diff --git a/doc/sphinx/whats-new/changes-5.1.rst b/doc/sphinx/whats-new/changes-5.1.rst
index efdddb8..6092091 100644
--- a/doc/sphinx/whats-new/changes-5.1.rst
+++ b/doc/sphinx/whats-new/changes-5.1.rst
@@ -25,6 +25,7 @@ years we have been around now.
 Guys, "Thanks" doesn't even start to cover it and we wish you all
 the best for the future!
 
+.. _whatsnew_clifile:
 
 Startup CLI command file
 ~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/doc/sphinx/whats-new/upgrading-5.1.rst b/doc/sphinx/whats-new/upgrading-5.1.rst
index a7180fa..f4ea684 100644
--- a/doc/sphinx/whats-new/upgrading-5.1.rst
+++ b/doc/sphinx/whats-new/upgrading-5.1.rst
@@ -7,6 +7,38 @@ Upgrading to Varnish 5.1
 varnishd command-line options
 =============================
 
+If you have to change anything at all for version 5.1, then most
+likely the command-line options for `varnishd` in your start scripts,
+because we have tightened restrictions on which options may be used
+together. This has served mainly to clarify the use of options for
+testing purposes, for example using ``varnishd -C`` to check a VCL
+source for syntactic correctness. We have also added some new options.
+
+The details are given in :ref:`varnishd(1)`, but here's a summary:
+
+* Added ``-I clifile`` to run CLI commands at startup, before the
+  worker process starts. See :ref:`whatsnew_clifile`.
+
+* More than one ``-f`` option is now permitted, to pre-load VCL
+  instances at startup. The last of these becomes the "boot" instance
+  that is is active at startup.
+
+* Either ``-b`` or one or more ``-f`` options must be specified, but
+  not both, and they cannot both be left out, unless ``-d`` is used to
+  start `varnishd` in debugging mode. If the empty string is specified
+  as the sole ``-f`` option, then `varnishd` starts without starting
+  the worker process, and the management process will accept CLI
+  commands.
+
+* Added ``-?`` to print the usage message, which is only printed for
+  this option.
+
+* Added the ``-x`` option to print certain kinds of documentation and
+  exit. When ``-x`` is used, it must be the only option.
+
+* Only one of ``-F`` or ``-d`` may be used, and neither of these can
+  be used with ``-C``.
+
 * Added the ``workuser`` parameter to the ``-j`` option.
 
 varnishd parameters