--- doc/loncapafiles/updatequery.piml	2005/12/10 00:28:14	1.44
+++ doc/loncapafiles/updatequery.piml	2006/01/28 10:35:02	1.46
@@ -1,6 +1,6 @@
 <!-- updatequery.piml -->
 
-<!-- $Id: updatequery.piml,v 1.44 2005/12/10 00:28:14 albertel Exp $ -->
+<!-- $Id: updatequery.piml,v 1.46 2006/01/28 10:35:02 albertel Exp $ -->
 
 <!--
 
@@ -207,18 +207,24 @@ if ($hostname=~/([^\.]*)\.([^\.]*)$/) {
   print(&lt;&lt;END);
 
 **** Domain ****
-[this does NOT need to correspond to internet address domains,
- good examples might be "msu" or "bionet" or "vermontcc",
- bad examples are "physics" (too general)
+[This does NOT need to correspond to internet address domains.
+ Please make this name short AND descriptive of your organization.
+ Domain names are close to impossible to change later!!!
+ Good examples might be "msu" or "bionet" or "vermontcc".
+ Bad examples are "physics" (too general)
    or "michiganstateuniversity" (too long)
    or "msuedu" (internet domain, just make it "msu")
-   or "msuphysics" (only if there is a good reason to limit)
+   or "msuphysics" (only if there is a good reason to limit to department
+                    - we don't know of one)
    or "mydomain" (what is that?)
- Please make this name short AND descriptive of your organization.
- Note that the domain is very hard to change later.
- Double-check with the LON-CAPA group at MSU if this domain is 
- going to be part of the main production cluster, since it needs
- to be unique.]
+ Avoid multiple domains at the same institution, even if it means that you 
+ have to actually work together with your colleagues. You can still run
+ multiple library servers within the same domain.
+ If this domain is eventually going to be part of the main production
+ cluster, you MUST contact the LON-CAPA group at MSU (loncapa@loncapa.org)
+ to have a domain name assigned, and then use it exactly as given. This is
+ also true for test installs that might eventually turn into production setups.
+ Stop now if you didn't do so.]
 END
 
 # get domain name
@@ -310,11 +316,11 @@ if ($lonDefDomain) {
   print(&lt;&lt;END);
 
 **** Machine ID Name ****
-[this does NOT need to correspond to internet address names;
+[This does NOT need to correspond to internet address names;
  this name MUST be unique to the whole LON-CAPA network;
- we recommend that you use a name based off of your institution;
- good examples: "msul1" or "bioneta2";
- bad examples: "loncapabox" or "studentsinside".
+ we recommend that you use a name based off of your institution.
+ Good examples: "msul1" or "bioneta2".
+ Bad examples: "loncapabox" or "studentsinside".
  Note that machine names are very hard to change later.]
 END
 # get machine name
@@ -606,6 +612,8 @@ my %perlvarstatic;
 	     (undef,$domainDescription,$domainTabExtras)=split(/:/,$_,3);
 	     chomp($domainDescription);
 	     chomp($domainTabExtras);
+	     # the remianing field (primary lib server) is handled later
+	     $domainTabExtras = join(':',(split(/:/,$domainTabExtras))[0..5]);
              last;
           }
        }
@@ -618,6 +626,8 @@ my %perlvarstatic;
 	     (undef,$domainDescription,$domainTabExtras)=split(/:/,$_,3);
 	     chomp($domainDescription);
 	     chomp($domainTabExtras);
+	     # the remianing field (primary lib server) is handled later
+	     $domainTabExtras = join(':',(split(/:/,$domainTabExtras))[0-5]);
              last;
           }
        }
@@ -671,7 +681,7 @@ my %perlvarstatic;
     }
    
 # implement editing logic below, interactively
-# update loncapa.conf until 8 is entered
+# update loncapa.conf until 12 is entered
 
 $flag=0;