From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from localhost (mandoc.bsd.lv [local])
	by mandoc.bsd.lv (OpenSMTPD) with ESMTPA id 8bb912ac
	for <source@mandoc.bsd.lv>;
	Sun, 10 Nov 2019 09:05:48 -0500 (EST)
Date: Sun, 10 Nov 2019 09:05:48 -0500 (EST)
X-Mailinglist: mandoc-source
Reply-To: source@mandoc.bsd.lv
MIME-Version: 1.0
From: schwarze@mandoc.bsd.lv
To: source@mandoc.bsd.lv
Subject: cvsweb: delete remnants of side by side diff mode and adjust $mime_types 
X-Mailer: activitymail 1.26, http://search.cpan.org/dist/activitymail/
Content-Type: text/plain; charset=utf-8
Message-ID: <8d076eb20ce9118a@mandoc.bsd.lv>

Log Message:
-----------
delete remnants of side by side diff mode
and adjust $mime_types to work chrooted;
from Mattieu Baptiste on ports@ 2012-06-15 11:54:34

Modified Files:
--------------
    cvsweb:
        cvsweb.conf

Revision Data
-------------
Index: cvsweb.conf
===================================================================
RCS file: /home/cvs/mandoc/cvsweb/cvsweb.conf,v
retrieving revision 4.2
retrieving revision 4.3
diff -Lcvsweb.conf -Lcvsweb.conf -u -p -r4.2 -r4.3
--- cvsweb.conf
+++ cvsweb.conf
@@ -139,10 +139,8 @@ $mancgi =
     #   h      Human readable
     #   u      Unified diff
     #   c      Context diff
-    #   s      Side by side
     #   uc     Unified diff, enscript colored (falls back to "u" w/o enscript)
     #   cc     Context diff, enscript colored (falls back to "c" w/o enscript)
-    #   sc     Side by side, enscript colored (falls back to "s" w/o enscript)
     "f" => "u",
 
     # hidecvsroot: Don't show the CVSROOT directory.  Note that this is
@@ -287,15 +285,6 @@ $hr_breakable = 1;
 #
 $showfunc = 1;
 
-# For each pair of regexps, files that match the first regexp will be diff'ed
-# with an -F option using the second regexp (unified and context only).
-# See the -F option in the diff(1) man page.
-#
-%funcline_regexp = (
-    qr/\.(?:4th|fr)$/o => "\\(^\\|[ \t]\\): ",
-    qr/\.rb$/o         => "^[\t ]*\\(class\\|module\\|def\\) ",
-);
-
 # Ignore whitespace in human readable diffs? ('-w' option to diff)
 #
 $hr_ignwhite = 0;
@@ -362,7 +351,7 @@ $inputTextSize = 12;
 # The traditional mime.types file, eg. the one from Apache is fine.
 # See above where this gets used.
 #
-$mime_types = '/usr/local/etc/apache/mime.types';
+$mime_types = '/conf/mime.types';
 
 # Charset appended to the Content-Type HTTP header for text/* MIME types.
 # Note that the web server may default to some charset which may take effect
--
 To unsubscribe send an email to source+unsubscribe@mandoc.bsd.lv