[LON-CAPA-cvs] cvs: doc(version_2_11_X) /loncapafiles loncapafiles.lpml

[raeburn]

raeburn		Fri Feb  8 17:43:03 2013 EDT

  Modified files:              (Branch: version_2_11_X)
    /doc/loncapafiles	loncapafiles.lpml 
  Log:
  - For 2.11
    - Backport 1.825, 1.826
  
  
Index: doc/loncapafiles/loncapafiles.lpml
diff -u doc/loncapafiles/loncapafiles.lpml:1.797.2.29 doc/loncapafiles/loncapafiles.lpml:1.797.2.30
--- doc/loncapafiles/loncapafiles.lpml:1.797.2.29	Sat Feb  2 19:54:30 2013
+++ doc/loncapafiles/loncapafiles.lpml	Fri Feb  8 17:43:03 2013
@@ -2,7 +2,7 @@
  "http://lpml.sourceforge.net/DTD/lpml.dtd">
 <!-- loncapafiles.lpml -->
 
-<!-- $Id: loncapafiles.lpml,v 1.797.2.29 2013/02/02 19:54:30 raeburn Exp $ -->
+<!-- $Id: loncapafiles.lpml,v 1.797.2.30 2013/02/08 17:43:03 raeburn Exp $ -->
 
 <!--
 
@@ -1094,6 +1094,19 @@
 </description>
 </file>
 <file>
+<source>loncom/loncapa_apache_local.conf</source>
+<target dist='default'>etc/httpd/conf/loncapa_apache_local.conf</target>
+<target dist='sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 suse12.2 debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12'>etc/apache2/startup.pl</target>
+<categoryname>static conf</categoryname>
+<description>
+Documentation file describing how to add domain-specific Apache configuration
+files, e.g., (loncapa_apache_localmsu.conf).
+loncapa_apache_local.conf needs to exist if no domain-specific file has so far
+been created so that Apache 2.4 will start, given that loncapa_apache.conf has:
+Include conf/loncapa_apache_local*.conf
+</description>
+</file>
+<file>
 <source>loncom/startup.pl</source>
 <target dist='default'>etc/httpd/conf/startup.pl</target>
 <target dist='sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 suse12.2 debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12'>etc/apache2/startup.pl</target>
@@ -8371,6 +8384,7 @@
 modify_config_files.pl;
 move_construction_spaces.pl;
 parse_scantron.pl;
+rebuild_db_from_hist.pl;
 seed_accesscount.pl;
 stress.pl;
 testkerberos.pl;