--------------------- PatchSet 11508 Date: 2007/06/25 23:30:59 Author: hno Branch: SQUID_2_6 Tag: (none) Log: MFC: Clean up HTML escapes in the configuration manual Merged changes: 2007/06/25 09:58:28 hno +5 -2 Clean up HTML escapes in the configuration manual Members: scripts/www/build-cfg-help.pl:1.17.2.1->1.17.2.2 Index: squid/scripts/www/build-cfg-help.pl =================================================================== RCS file: /cvsroot/squid/squid/scripts/www/build-cfg-help.pl,v retrieving revision 1.17.2.1 retrieving revision 1.17.2.2 diff -u -r1.17.2.1 -r1.17.2.2 --- squid/scripts/www/build-cfg-help.pl 3 Jun 2007 00:18:03 -0000 1.17.2.1 +++ squid/scripts/www/build-cfg-help.pl 25 Jun 2007 23:30:59 -0000 1.17.2.2 @@ -10,7 +10,7 @@ # # Adrian Chadd # -# $Id: build-cfg-help.pl,v 1.17.2.1 2007/06/03 00:18:03 hno Exp $ +# $Id: build-cfg-help.pl,v 1.17.2.2 2007/06/25 23:30:59 hno Exp $ # # The template file is reasonably simple to parse. There's a number of @@ -106,7 +106,10 @@ { my ($line) = @_; return "" if !defined $line; - $line =~ s/([^\w\s])/sprintf ("&#%d;", ord ($1))/ge; + $line =~ s/&/\&/g; + $line =~ s//\>/g; + $line =~ s/[^\x{20}-\x{7e}\s]/sprintf ("&#%d;", ord ($1))/ge; return $line; }