[master] 2911bd168 varnishd: harmonize -a usage help

Nils Goroll nils.goroll at uplex.de
Thu Sep 5 13:03:06 UTC 2024


commit 2911bd168bd1602e8f9a594c395f2ff0cd3f6212
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Thu Sep 5 15:02:12 2024 +0200

    varnishd: harmonize -a usage help

diff --git a/bin/varnishd/mgt/mgt_main.c b/bin/varnishd/mgt/mgt_main.c
index 56cdf6f04..1b8e49f27 100644
--- a/bin/varnishd/mgt/mgt_main.c
+++ b/bin/varnishd/mgt/mgt_main.c
@@ -104,14 +104,18 @@ usage(void)
 
 	printf("\nBasic options:\n");
 
-	printf(FMT, "-a [<name>=]address[:port][,proto]",
-	    "HTTP listen address and port");
-	printf(FMT, "   [,user=<u>][,group=<g>]",
+	printf(FMT, "[-a [name=][listen_address",
+	    "HTTP listen address, protocol, options.");
+	printf(FMT, "     [,PROTO|,option=value,...]]",
 	    "Can be specified multiple times.");
-	printf(FMT, "   [,mode=<m>]", "  default: \":80,HTTP\"");
-	printf(FMT, "", "Proto can be \"PROXY\" or \"HTTP\" (default)");
-	printf(FMT, "", "user, group and mode set permissions for");
-	printf(FMT, "", "  a Unix domain socket.");
+	printf(FMT, "",
+	    "  default: \":80,HTTP\"");
+	printf(FMT, "  options:",
+	    "Proto can be \"PROXY\" or \"HTTP\" (default)");
+	printf(FMT, "    [,user=<u>][,group=<g>]",
+	    "user, group and mode set permissions for");
+	printf(FMT, "    [,mode=<m>]",
+	    "  a Unix domain socket.");
 	printf(FMT, "-b none", "No backend");
 	printf(FMT, "-b [addr[:port]|path]", "Backend address and port");
 	printf(FMT, "", "  or socket file path");
diff --git a/doc/sphinx/reference/varnishd.rst b/doc/sphinx/reference/varnishd.rst
index c9930e77c..1ca94c7a5 100644
--- a/doc/sphinx/reference/varnishd.rst
+++ b/doc/sphinx/reference/varnishd.rst
@@ -21,7 +21,7 @@ SYNOPSIS
 ========
 
 varnishd
-    [-a [name=][listen_address[,PROTO]]
+    [-a [name=][listen_address[,PROTO|,option=value,...]]
     [-b [host[:port]|path]]
     [-C]
     [-d]


More information about the varnish-commit mailing list