--- loncom/configuration/Configuration.pm	2002/05/03 23:57:19	1.1
+++ 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.1 2002/05/03 23:57:19 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.1 $ =~ /(\d+)\.(\d+)/);
+$VERSION = sprintf("%d.%02d", q$Revision: 1.6 $ =~ /(\d+)\.(\d+)/);
 
 use strict;
 
@@ -43,8 +43,8 @@ my $confdir='/etc/httpd/conf/';
 sub read_conf {
     my (@conf_files)=@_;
     my %perlvar;
-    foreach my $filename (@conf_files) {
-	open(CONFIG,'<'.$confdir.$filename) or die("Can't read access.conf");
+    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/) {
 		my ($unused,$varname,$varvalue)=split(/\s+/,$configline);
@@ -71,21 +71,15 @@ 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
 
-Many different parts of the LON-CAPA software need to read in the machine-specific
-configuration information.  These included scripts controlling the TCP/IP layer
-(e.g. F<lonc> and F<lond>), testing scripts (e.g. test_weblayer.pl and sqltest.pl),
-and utility scripts (e.g. clusterstatus.pl and metadata_keywords.pl).
+Many different parts of the LON-CAPA software need to read in the
+machine-specific configuration information.  These included scripts
+controlling the TCP/IP layer (e.g. F<lonc> and F<lond>), testing scripts
+(e.g. test_weblayer.pl and sqltest.pl), and utility scripts
+(e.g. clusterstatus.pl and metadata_keywords.pl).
 
 The following methods are available:
 
@@ -104,7 +98,7 @@ have been initialized from the configura
 in the arguments.
 
 If multiple file names define the same hash key, then priority is
-given toward the last file name processed.
+given toward the B<last> file name processed.
 
 =back