===================================================================
RCS file: /cvs/cvsweb/Attic/cvsweb.conf,v
retrieving revision 4.9
retrieving revision 4.12
diff -u -p -r4.9 -r4.12
--- cvsweb/Attic/cvsweb.conf	2019/11/26 10:58:15	4.9
+++ cvsweb/Attic/cvsweb.conf	2019/11/26 11:28:43	4.12
@@ -1,5 +1,5 @@
 # -*- perl -*-
-# $Id: cvsweb.conf,v 4.9 2019/11/26 10:58:15 schwarze Exp $
+# $Id: cvsweb.conf,v 4.12 2019/11/26 11:28:43 schwarze Exp $
 # $doc: cvsweb.conf,v 1.38 2006/01/19 19:53:38 ceri
 # $knu: cvsweb.conf,v 1.97 2005/06/19 09:13:50 scop
 #
@@ -418,13 +418,6 @@ $show_log_in_markup = 1;
 #
 #$tabstop = 4;
 
-# If you wish to display absolute times in your local timezone,
-# then define @mytz and fill in the strings for your standard and
-# daylight time. Note that you must also make sure the system
-# timezone is correctly set.
-#
-#@mytz=("EST", "EDT");
-
 # CVSweb is friendly to caches by sending the HTTP Last-Modified
 # header corresponding to the sent content.  In the case of a
 # checkout, this may require running rcslog on the file solely for the
@@ -441,11 +434,6 @@ $use_moddate = 1;
 #
 #$file_list_len = 200;
 
-# URL to the CVSHistory script.  This should be absolute (but does not need
-# to include the host and port if the script is on the same server as
-# CVSweb).
-#$cvshistory_url = "/cgi-bin/cvshistory.cgi";
-
 # Whether to allow downloading a tarball or a zip of the current directory.
 # While downloading of the entire repository is disallowed, depending on
 # the directory this may take a lot of time and disk space.  For some CVS
@@ -510,23 +498,6 @@ $ENV{CVSREADONLYFS} = 1 unless exists($ENV{CVSREADONLY
 # this should be set to 0 or commented out.
 #
 #$DEBUG = 1;
-
-# Enable this to let CVSweb load extra configuration files from the "conf.d"
-# subdirectory of the directory this file is located in.  This enables site
-# specific configuration without having to modify this "master" configuration
-# file (except for enabling this functionality below :)
-#
-if (0) {
-  my $confdir = catdir(dirname(__FILE__), 'conf.d');
-  if (opendir(CONFD, $confdir)) {
-    my @files = sort(map(catfile($confdir, $_), readdir(CONFD)));
-    close(CONFD);
-    for my $conffile (grep(-f && -r _, @files)) {
-      ($conffile) = ($conffile =~ /(.+\.conf)$/) or next;
-      do "$conffile" or config_error($conffile, $@);
-    }
-  }
-}
 
 1;