r1015 - trunk/varnish-cache/bin/varnishd

[des at projects.linpro.no]

Author: des
Date: 2006-09-16 14:43:11 +0200 (Sat, 16 Sep 2006)
New Revision: 1015

Modified:
   trunk/varnish-cache/bin/varnishd/varnishd.1
   trunk/varnish-cache/bin/varnishd/varnishd.c
Log:
Sort options correctly.

Modified: trunk/varnish-cache/bin/varnishd/varnishd.1
===================================================================
--- trunk/varnish-cache/bin/varnishd/varnishd.1	2006-09-16 12:29:08 UTC (rev 1014)
+++ trunk/varnish-cache/bin/varnishd/varnishd.1	2006-09-16 12:43:11 UTC (rev 1015)
@@ -16,8 +16,8 @@
 .Op Fl h Ar type Ns Op , Ns Ar options
 .Op Fl p Ar param Ns = Ns Ar value
 .Op Fl s Ar type Ns Op , Ns Ar options
+.Op Fl T Ar address Ns Op : Ns Ar port
 .Op Fl t Ar ttl
-.Op Fl T Ar address Ns Op : Ns Ar port
 .Op Fl V
 .Op Fl w Ar min Ns Op , Ns Ar max Ns Op , Ns Ar timeout
 .Sh DESCRIPTION
@@ -78,8 +78,6 @@
 See
 .Sx Storage Types
 for a list of supported storage types.
-.It Fl t Ar ttl
-Specifies a hard minimum time to live for cached documents.
 .It Fl T Ar address Ns Op : Ns Ar port
 Offer a management interface on the specified
 .Ar address
@@ -88,6 +86,8 @@
 See
 .Sx Management Interface
 for a list of management commands.
+.It Fl t Ar ttl
+Specifies a hard minimum time to live for cached documents.
 .It Fl V
 Display the version number and exit.
 .It Fl w Ar min Ns Op , Ns Ar max Ns Op , Ns Ar timeout

Modified: trunk/varnish-cache/bin/varnishd/varnishd.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/varnishd.c	2006-09-16 12:29:08 UTC (rev 1014)
+++ trunk/varnish-cache/bin/varnishd/varnishd.c	2006-09-16 12:43:11 UTC (rev 1015)
@@ -359,7 +359,7 @@
 	MCF_ParamInit(cli);
 	cli_check(cli);
 
-	while ((o = getopt(argc, argv, "a:b:df:h:p:s:t:T:Vw:")) != -1)
+	while ((o = getopt(argc, argv, "a:b:df:h:p:s:T:t:Vw:")) != -1)
 		switch (o) {
 		case 'a':
 			MCF_ParamSet(cli, "listen_address", optarg);