---------------------
PatchSet 11425 
Date: 2007/05/13 14:58:40
Author: adrian
Branch: HEAD
Tag: (none) 
Log:

* try to show the aliases in the output; they're not yet working
* disable the command aliases as they're deprecated. Henrik suggested
  an "index" versus "table of contents"; ToC show the current options
  and "index" is a sorted version of the config file options
  incl. aliases.

Members: 
	scripts/www/build-cfg-help.pl:1.9->1.10 
	scripts/www/template.html:1.2->1.3 

Index: squid/scripts/www/build-cfg-help.pl
===================================================================
RCS file: /cvsroot/squid/squid/scripts/www/build-cfg-help.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- squid/scripts/www/build-cfg-help.pl	13 May 2007 14:51:55 -0000	1.9
+++ squid/scripts/www/build-cfg-help.pl	13 May 2007 14:58:40 -0000	1.10
@@ -10,7 +10,7 @@
 #
 # Adrian Chadd <adrian@squid-cache.org>
 #
-# $Id: build-cfg-help.pl,v 1.9 2007/05/13 14:51:55 adrian Exp $
+# $Id: build-cfg-help.pl,v 1.10 2007/05/13 14:58:40 adrian Exp $
 
 #
 # The template file is reasonably simple to parse. There's a number of
@@ -90,6 +90,9 @@
 	# add in the local variables
 	$data->{"title"} = $data->{"name"};
 	$data->{"ldoc"} = $data->{"doc"};
+	if (exists $data->{"aliases"}) {
+		$data->{"aliaslist"} = join(", ", $data->{"aliases"});
+	}
 	# XXX can't do this and then HTML escape..
 	# $data->{"ldoc"} =~ s/\n\n/<\/p>\n<p>\n/;
 	# XXX and the end-of-line formatting to turn single \n's into <BR>\n's.
@@ -178,11 +181,12 @@
 foreach (@names) {
 	my ($n) = $_->{"name"};
 	print $fh '    <li><a href="' . uriescape($n) . '.html">' . htmlescape($n) . "</a></li>\n";
-	if (defined $_->{"aliases"}) {
-		foreach (@{$_->{"aliases"}}) {
-			print $fh '    <li><a href="' . uriescape($n) . '.html">' . htmlescape($_) . "</a></li>\n";
-		}
-	}
+	# Uncomment these lines if you'd like the aliases to also be generated
+#	if (defined $_->{"aliases"}) {
+#		foreach (@{$_->{"aliases"}}) {
+#			print $fh '    <li>(deprecated) <a href="' . uriescape($n) . '.html">' . htmlescape($_) . "</a></li>\n";
+#		}
+#	}
 }
 
 print $fh <<EOF
Index: squid/scripts/www/template.html
===================================================================
RCS file: /cvsroot/squid/squid/scripts/www/template.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- squid/scripts/www/template.html	13 May 2007 14:51:55 -0000	1.2
+++ squid/scripts/www/template.html	13 May 2007 14:58:40 -0000	1.3
@@ -13,6 +13,11 @@
 %ldoc%
   </pre>
 
+  <h2>Aliases</h2>
+  <p>
+%aliaslist%
+  </p>
+
   <h2>Default Values</h2>
 
   <p>