===================================================================
RCS file: /cvs/cvsweb/Attic/cvsweb.conf,v
retrieving revision 3.1
retrieving revision 3.5
diff -u -p -r3.1 -r3.5
--- cvsweb/Attic/cvsweb.conf	2000/07/19 21:59:47	3.1
+++ cvsweb/Attic/cvsweb.conf	2000/07/28 19:38:26	3.5
@@ -6,7 +6,7 @@
 #     1999      H. Nordstrom <hno@hem.passagen.se>
 #     2000      A. MUSHA     <knu@FreeBSD.org>
 #          based on work by Bill Fenner  <fenner@FreeBSD.org>
-# $Id: cvsweb.conf,v 3.1 2000/07/19 21:59:47 knu Exp $
+# $Id: cvsweb.conf,v 3.5 2000/07/28 19:38:26 knu Exp $
 #
 ###
 
@@ -90,7 +90,7 @@ $prcgi = "http://www.FreeBSD.org/cgi/query-pr.cgi";
       #   u      Unified diff
       #   c      Context diff
       #   s      Side by side
-      "f" => "h",	  
+      "f" => ($is_textbased ? "u" : "h"),
 
       # hidecvsroot: Don't show the CVSROOT directory
       #   1      Hide CVSROOT directory
@@ -99,7 +99,7 @@ $prcgi = "http://www.FreeBSD.org/cgi/query-pr.cgi";
 
       # hidenonreadable: Don't show entries which cannot be read
       #   1      Hide non-readable entries
-      #   0      Show non-readble entries
+      #   0      Show non-readable entries
       "hidenonreadable" => "1",
 );
 
@@ -117,7 +117,7 @@ $logo = '<img src="/icons/apache_pb.gif">';
 $defaulttitle = "CVS Repository";
 
 # The address is shown on the footer
-$address = "<font size=-1>CVSweb by &lt;zeller\@think.de&gt;</font>";
+$address = "<font size=-1>CVSweb by &lt;knu\@FreeBSD.org&gt;</font>";
 
 # Default page background color for the diffs
 # and annotations
@@ -142,7 +142,7 @@ display diffs between arbitrary revisions.
 </p>
 <p>
 This script has been written by Bill Fenner
-&lt;<a href="mailto:fenner\@freebsd.org">fenner\@freebsd.org</a>&gt;
+&lt;<a href="mailto:fenner\@FreeBSD.org">fenner\@FreeBSD.org</a>&gt;
 and improved by Henner Zeller
 &lt;<a href="mailto:zeller\@think.de">zeller\@think.de</a>&gt;,
 Henrik Nordstr&ouml;m
@@ -159,11 +159,11 @@ If you would like to use this CGI script on your own w
 CVS tree, see Zeller's
 <a href="http://linux.fh-heilbronn.de/~zeller/cgi/cvsweb.cgi"
 >CVSweb distribution site</a>. Bill's original script can be found
-<a href="http://www.freebsd.org/~fenner/cvsweb/">here</a>.
+<a href="http://www.FreeBSD.org/~fenner/cvsweb/">here</a>.
 </p>
 <p>
 Please send any suggestions, comments, etc. to
-<a href="mailto:fenner\@freebsd.org">Bill Fenner</a> or, regarding the
+<a href="mailto:fenner\@FreeBSD.org">Bill Fenner</a> or, regarding the
 modifications, to
 <a href="mailto:knu\@FreeBSD.org">Akinori MUSHA</a>,
 <a href="mailto:zeller\@think.de">Henner Zeller</a>,
@@ -260,17 +260,17 @@ $use_descriptions = 0;
 # exceed the width of the browser
 $hr_breakable = 1;
 
-# give out function names in human readable diffs
+# give out function names in diffs
 # this just makes sense if we have C-files, otherwise
 # diff's heuristic doesn't work well ..
 # ( '-p' option to diff)
-$hr_funout = 0;
+$showfunc = 1;
 
 # For each pair of regexps, files that match the first regexp will be diff'ed
 # with an '-F' option with the second regexp.
-%functionlineregexp = (
-		       "\\.(4th|fr)\$" => "\\(^\\| \\|\t\\): ",
-		      );
+%funcline_regexp = (
+		    "\\.(4th|fr)\$" => "\\(^\\| \\|\t\\): ",
+		   );
 
 # ignore whitespaces for human readable diffs
 # (indendation and stuff ..)