--- doc/loncapafiles/updatequery.piml	2005/05/21 15:35:07	1.38
+++ doc/loncapafiles/updatequery.piml	2005/08/15 17:53:33	1.41
@@ -1,6 +1,6 @@
 <!-- updatequery.piml -->
 
-<!-- $Id: updatequery.piml,v 1.38 2005/05/21 15:35:07 www Exp $ -->
+<!-- $Id: updatequery.piml,v 1.41 2005/08/15 17:53:33 albertel Exp $ -->
 
 <!--
 
@@ -70,10 +70,10 @@ you must contact lon-capa\@lon-capa.org.
 3) DEVELOPMENT - you want to do software (not content!) development with
                  this workstation and eventually link it with the
                  workstations of other LON-CAPA software developers.
-4) PRESERVE the existing hosts.tab and domain.tab
-                (/home/httpd/lonTabs/hosts.tab and
-                 /home/httpd/lonTabs/domain.tab)
-
+4) RUNNING YOUR OWN CLUSTER - this machine is not in the standard LON-CAPA
+                 clusters and won't be in the future and you want the existing
+                 hosts.tab and domain.tab files to be left alone.
+                 (This choice is unlikely what you want to select.)
 END
 # Option number 26 will install rawhide_hosts.tab, but
 # the typical user does not want to be part of an intensive
@@ -237,7 +237,8 @@ END
   my $choice=&lt;&gt;;
   chomp($choice);
   my $bad_domain_flag=0;
-  my @bad_domain_names=('res','raw','userfiles','priv','adm','uploaded');
+  my @bad_domain_names=('res','raw','userfiles','priv','adm','uploaded',
+	'editupload');
   foreach my $bad (@bad_domain_names) {
     $bad_domain_flag=1 if $choice eq $bad;
   }
@@ -591,13 +592,19 @@ my $error='';
 foreach my $v ($perlvar{'lonDefDomain'},$perlvar{'lonHostID'}) {
    if (length($v)>16) { $error.="\nName $v too long"; }		
    if (length($v)<2) { $error.="\nName $v too short"; }
-   if ($v=~/capa/i) { $error.="\nName $v contains 'capa'"; }
-   foreach my $bad ('res','raw','userfiles','priv','adm','uploaded') {
+   if ($v=~/capa/i) {
+	if ($v!~/^oucapa\d+$/ && 
+	    ($v!~/^capa\d+$/ && $perlvar{'lonDefDomain'} eq 'uwsp')) {
+		 $error.="\nName $v contains 'capa'"; 
+	}
+   }
+   foreach my $bad ('res','raw','userfiles','priv','adm','uploaded',
+	'editupload') {
       $error.="\nName $v reserved." if $v eq $bad;
    }
    if ($v=~/\W/) { $error.="\nName $v contains special characters"; }
 }
-if ($domainDescription!~/^[\w\s]+$/) {
+if ($domainDescription!~/^[\(\)\-\w\s]+$/) {
    $error.="\nDomain Description contains special characters";
 } 
 foreach my $v ($perlvar{'lonExpire'},$perlvar{'lonLoadLim'}) {