--- loncom/configuration/Configuration.pm	2002/05/16 00:00:16	1.4
+++ loncom/configuration/Configuration.pm	2002/05/17 14:03:04	1.6
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Configuration file reader
 #
-# $Id: Configuration.pm,v 1.4 2002/05/16 00:00:16 harris41 Exp $
+# $Id: Configuration.pm,v 1.6 2002/05/17 14:03:04 matthew Exp $
 #
 #
 # Copyright Michigan State University Board of Trustees
@@ -33,7 +33,7 @@
 
 package LONCAPA::Configuration;
 
-$VERSION = sprintf("%d.%02d", q$Revision: 1.4 $ =~ /(\d+)\.(\d+)/);
+$VERSION = sprintf("%d.%02d", q$Revision: 1.6 $ =~ /(\d+)\.(\d+)/);
 
 use strict;
 
@@ -43,7 +43,7 @@ my $confdir='/etc/httpd/conf/';
 sub read_conf {
     my (@conf_files)=@_;
     my %perlvar;
-    foreach my $filename (@conf_files) {
+    foreach my $filename (@conf_files,'loncapa_apache.conf') {
 	open(CONFIG,'<'.$confdir.$filename) or die("Can't read $confdir$filename");
 	while (my $configline=<CONFIG>) {
 	    if ($configline =~ /^[^\#]*PerlSetVar/) {
@@ -71,14 +71,7 @@ B<LONCAPA::Configuration> - configuratio
  use lib '/home/httpd/lib/perl/';
  use LONCAPA::Configuration;
 
- LONCAPA::Configuration::read_conf('access.conf','loncapa.conf');
-
-In the future, standard invocation of the command will be:
-
- LONCAPA::Configuration::read_conf('loncapa.conf');
-
-F<access.conf> is slowly becoming deprecated.  (We are currently
-trying to support backwards compatibility.)
+ LONCAPA::Configuration::read_conf('loncapa_apache.conf','loncapa.conf');
 
 =head1 DESCRIPTION