Thu Jun 26 11:07:10 EDT 2014

raeburn		Thu Jun 26 15:07:10 2014 EDT

  Modified files:              
    /loncom/html/adm/help/tex	Domain_Configuration_Auto_Updates.tex 
                             	Domain_Configuration_Cataloging_Courses.tex 
                             	Domain_Configuration_Contact_Info.tex 
                             	Domain_Configuration_Course_Defaults.tex 
                             	Domain_Configuration_LangTZAuth.tex 
                             	Domain_Configuration_Login_Page.tex 
                             	Domain_Configuration_Quotas.tex 
                             	Domain_Configuration_Request_Courses.tex 
                             	Domain_Configuration_Server_Status.tex 
                             	Domain_Configuration_User_Creation.tex 
                             	Domain_Configuration_User_Modification.tex 
                             	Institutional_Integration_Course_Requests.tex 
                             	Institutional_Integration_User_Categories.tex 
  Log:
  - Update domain coordinator documentation.
  
  
-------------- next part --------------
Index: loncom/html/adm/help/tex/Domain_Configuration_Auto_Updates.tex
diff -u loncom/html/adm/help/tex/Domain_Configuration_Auto_Updates.tex:1.6 loncom/html/adm/help/tex/Domain_Configuration_Auto_Updates.tex:1.7

--- loncom/html/adm/help/tex/Domain_Configuration_Auto_Updates.tex:1.6	Fri Feb 28 19:19:51 2014
+++ loncom/html/adm/help/tex/Domain_Configuration_Auto_Updates.tex	Thu Jun 26 15:07:10 2014
@@ -32,11 +32,13 @@
 In order for Autoupdate to work, the \&allusers\_info() routine in
 localenroll.pm needs to be customized and a conduit established to
 institutional data. In addition, if you wish to differentiate between
-institutional user types in your LON-CAPA domain the \&inst\_usertypes()
-routine in localenroll.pm will need to be customized to correspond
-with the types used at your institution. These types are then used
-to populate the \char`\"{}User population\char`\"{} column in each
-of the \char`\"{}Updatable user information\char`\"{} row(s) in the
+institutional user types in your LON-CAPA domain, you should define
+those in the ``Institutional user types'' section of the 
+``Default authentication/language/timezone/portal/types''
+domain configuration screen.  The types you set should be consistent with the
+types in use at your institution. These types are then used to populate 
+the \char`\"{}User population\char`\"{} column in each of the 
+\char`\"{}Updatable user information\char`\"{} row(s) in the
 Auto-update data table in \char`\"{}Domain Configuration\char`\"{}.
 
 Warnings will be written to the Auto-update log file found in /home/httpd/perl/logs
Index: loncom/html/adm/help/tex/Domain_Configuration_Cataloging_Courses.tex
diff -u loncom/html/adm/help/tex/Domain_Configuration_Cataloging_Courses.tex:1.3 loncom/html/adm/help/tex/Domain_Configuration_Cataloging_Courses.tex:1.4
--- loncom/html/adm/help/tex/Domain_Configuration_Cataloging_Courses.tex:1.3	Wed Feb 26 00:32:14 2014
+++ loncom/html/adm/help/tex/Domain_Configuration_Cataloging_Courses.tex	Thu Jun 26 15:07:10 2014
@@ -1,10 +1,29 @@
 \label{Domain_Configuration_Cataloging_Courses}
-LON-CAPA courses can be both self-cataloging, and also manually cataloged.
+The availability of a course/community catalog, as well as the type of 
+catalog provided are both domain configurations.  A choice of catalog can be set  
+for two contexts: (a) public-facing web page (i.e., unauthenticated users),
+and (b) web page for authenticated users.
 
-Self-cataloging uses the institutional course code assigned to the
-course when it is first created, or when the course is modified by
-a Domain Coordinator via \char`\"{}Modify a course\char`\"{}. If a
-course has no institutional code it will not appear in the category:
+For each context the options are:
+\begin{itemize}
+\item Standard catalog (the only type available pre-LON-CAPA 2.11), which
+contains both self-cataloging courses, and manually cataloged courses. 
+
+\item Domain-only catalog, which is the same as the standard catalog, 
+except no domain selector is available to switch to display course
+listings in other domains.
+
+\item Code-search form, which provides a web form to search for a 
+course by the unique six character code, which can be set to be
+assigned at course creation.
+
+\item No catalog
+
+In the standard and domain-only catalogs, self-cataloging uses the 
+institutional course code assigned to the course when it is first
+created, or when the course is modified by a Domain Coordinator via
+\char`\"{}Modify a course\char`\"{}. If a course has no institutional 
+code it will not appear in the category:
 Official courses (with institutional codes).
 
 A hierarchy of categories and sub-categories can be defined which
Index: loncom/html/adm/help/tex/Domain_Configuration_Contact_Info.tex
diff -u loncom/html/adm/help/tex/Domain_Configuration_Contact_Info.tex:1.2 loncom/html/adm/help/tex/Domain_Configuration_Contact_Info.tex:1.3
--- loncom/html/adm/help/tex/Domain_Configuration_Contact_Info.tex:1.2	Fri Apr 25 16:02:41 2014
+++ loncom/html/adm/help/tex/Domain_Configuration_Contact_Info.tex	Thu Jun 26 15:07:10 2014
@@ -22,6 +22,16 @@
 submit to request LON-CAPA support. The submission, which contains
 information about the user's browser, besides information provided
 by the user, will be sent as an e-mail.
+\item Module integrity alerts and new LON-CAPA releases - a nightly process
+compares checksums for LON-CAPA modules installed for your current release
+with the expected values for that release retrieved from one of the Academic 
+Consortium servers (if your server is part of the LON-CAPA network).
+An alert is sent if checksums or versions don't match, or if a new LON-CAPA
+version has been announced.
+\item Alerts for users sharing the same student/employee ID - a script is
+run every other night to check for use of the same student/employee ID by
+multiple users in your domain. In LON-CAPA, a username must be unique, 
+and it is also recommended that student/employee IDs are unique.
 \end{itemize}
 Definition of the default Admin e-mail address and the default Support
 e-mail address saved from the {}``Contact Information'' screen supercede
@@ -29,4 +39,10 @@
 of LON-CAPA. Addresses entered the first time ./UPDATE was run on
 the primary library server for the domain (i.e., when LON-CAPA was
 first installed) will continue to apply until the first \char`\"{}Save\char`\"{}
-of the Contact Information settings has occurred in the domain. 
+of the Contact Information settings has occurred in the domain.
+
+Two additional settings allow you to indicate whether error reports should be
+sent to the LON-CAPA developers at Michigan State University (as well as to the 
+recipients selected in your domain), and the same for an e-mail reporting a
+completed upgrade to a new LON-CAPA version. The default is to send both types of 
+e-mail to the developers.
Index: loncom/html/adm/help/tex/Domain_Configuration_Course_Defaults.tex
diff -u loncom/html/adm/help/tex/Domain_Configuration_Course_Defaults.tex:1.1 loncom/html/adm/help/tex/Domain_Configuration_Course_Defaults.tex:1.2
--- loncom/html/adm/help/tex/Domain_Configuration_Course_Defaults.tex:1.1	Fri Jan 14 02:29:15 2011
+++ loncom/html/adm/help/tex/Domain_Configuration_Course_Defaults.tex	Thu Jun 26 15:07:10 2014
@@ -1,6 +1,6 @@
 \label{Domain_Configuration_Course_Defaults}
-Starting with LON-CAPA 2.10, a Domain Coordinator will be able to configure 
-default settings for courses in the domain. Defaults are of two types:
+Starting with LON-CAPA 2.10, a Domain Coordinator can configure default 
+settings for courses in the domain. Defaults are of two types:
 \begin{itemize}
 \item defaults that can be overridden in an individual course by a Domain
 Coordinator, via the ``View or modify a course or community'' interface.
@@ -8,6 +8,13 @@
 Coordinator.
 \end{itemize}
 
-Currently, the interface supports setting of just one default: the responder count 
-needed before submissions for anonymous surveys (with no identifying information) 
-are viewable by Course personnel.
+Currently, the interface supports setting of three defaults: 
+
+\begin{itemize}
+\item responder count - number of responses needed before submissions made to 
+anonymous surveys (with no identifying information) are viewable by Course personnel.
+\item default course quotas - domain default for quotas (MB) for official, unofficial,
+community, and textbook course types for content uploaded directly to the course.
+\item default course credits - whether credits may be specified for courses (Yes/No),
+ if yes: default values for number of credits for official, unofficial and textbook courses. 
+    
Index: loncom/html/adm/help/tex/Domain_Configuration_LangTZAuth.tex
diff -u loncom/html/adm/help/tex/Domain_Configuration_LangTZAuth.tex:1.8 loncom/html/adm/help/tex/Domain_Configuration_LangTZAuth.tex:1.9
--- loncom/html/adm/help/tex/Domain_Configuration_LangTZAuth.tex:1.8	Fri Jan 14 01:01:15 2011
+++ loncom/html/adm/help/tex/Domain_Configuration_LangTZAuth.tex	Thu Jun 26 15:07:10 2014
@@ -34,5 +34,21 @@
 \item portal/default URL - starting with LON-CAPA 2.10, a default URL can
 be specified.  This URL will be included in e-mail sent to confirm self-enrollment etc.
 and might be for a load-balancer LON-CAPA server, or in the case of a multi-domain server,
-for a specific alias used for the domain.   
+for a specific alias used for the domain.
 \end{itemize}
+
+Domain configurations can also be set for institutional user types via the same screen.
+
+Prior to LON-CAPA 2.11, institutional user types were defined in the \&inst\_usertypes
+subroutine in localenroll.pm, which would be customized for consistency with types 
+defined in institutional data feeds.  Setting of user types via the Domain Configuration
+web GUI supersedes use of localenroll::inst\_usertypes().  Items that can be set are:
+
+\begin{itemize}
+\item Internal ID (e.g., faculty)
+\item Name Displayed (e.g., Faculty/Academic Staff)
+\item Order (Listing order, 1 through N, when the type is to be selected from a list).
+\item Whether status type can also be assigned to a non-institutional user with an e-mail
+ address as username
+\end{itemize}
+
Index: loncom/html/adm/help/tex/Domain_Configuration_Login_Page.tex
diff -u loncom/html/adm/help/tex/Domain_Configuration_Login_Page.tex:1.5 loncom/html/adm/help/tex/Domain_Configuration_Login_Page.tex:1.6
--- loncom/html/adm/help/tex/Domain_Configuration_Login_Page.tex:1.5	Fri May 23 07:50:58 2014
+++ loncom/html/adm/help/tex/Domain_Configuration_Login_Page.tex	Thu Jun 26 15:07:10 2014
@@ -1,6 +1,6 @@
 \label{Domain_Configuration_Login_Page}
 If your domain has more than one server you have the option to configure whether 
-any of the servers will redirect to another server whenever the log-in page is requested.  This can be useful if you maintain a portal or "lonbalancer" server which 
+any of the servers will redirect to another server whenever the log-in page is requested.  This can be useful if you maintain a portal or "Load Balancer" server which 
 forms your institution's gateway to LON-CAPA. You can specify the path to which 
 the user should be redirected, and also whether log-in page requests from specific
 IP addresses should be exempt from the redirection.  The exemption is useful 
@@ -60,7 +60,7 @@
 Where the ``Contact Helpdesk'' web form is in use it can be configured to include a CAPTCHA
 mechanism to discourage robotic form completion.  There are two types of CAPTCHA to choose
 from -- the ``original'' CAPTCHA which uses a self-contained perl module included with the
-LONCAPA prequisites, or ReCAPTCHA, which uses an external web service --
+LONCAPA prerequisites, or ReCAPTCHA, which uses an external web service --
 https://google.com/recaptcha -- and requires you to create an account and generate public
 and private keys which will be entered in the domain configuration form.  If you have more
 than one server in your domain, you should request ``global'' keys, as the same keys will be
Index: loncom/html/adm/help/tex/Domain_Configuration_Quotas.tex
diff -u loncom/html/adm/help/tex/Domain_Configuration_Quotas.tex:1.2 loncom/html/adm/help/tex/Domain_Configuration_Quotas.tex:1.3
--- loncom/html/adm/help/tex/Domain_Configuration_Quotas.tex:1.2	Mon May 23 20:29:28 2011
+++ loncom/html/adm/help/tex/Domain_Configuration_Quotas.tex	Thu Jun 26 15:07:10 2014
@@ -11,15 +11,42 @@
 that will override the corresponding settings determined by the user's 
 affiliation.
 
-If you choose to enable portfolios, default quotas (in Mb) 
+If you choose to enable portfolios, default quotas (in MB) 
 can similarly be set to vary by institutional affiliation.
 If a user is affiliated with more than one group, whichever default
 quota is largest for the different groups is the one which applies.
-Institutional types need to be defined in a customized version of
-\&inst\_usertypes() in the localenroll.pm module installed on the
-primary server in your domain. If no types have been defined, then
-a single default quota will apply for all users from the domain.
+Institutional types are defined in the ``Institutional user types''
+section on the ``Default authentication/language/timezone/portal/types'' 
+screen. If no types have been defined, then a single default quota
+will apply for all users from the domain.
 
 Default portfolio quotas which can be set for users in your domain
 will be overridden by any quota you set for an individual user via:
 the ``Modify User'' utility.
+
+Additional options for authoring spaces can be set for the various user 
+types: (a) whether webDAV is active, and (b) the default quota for Authoring Space.
+These only come into effect for a particular user, when an author and/or one or
+more co-author roles have been assigned to a user to provide access to one or more 
+Authoring Spaces.
+
+WebDAV allows a user to connect to an Authoring Space in the same way as removable
+media, and to use their own laptop/desktop computer's file management tools and
+applications to move, edit and delete files.  In the case of MacOS, the user selects 
+the ``Go'' item in the Finder toolbar and selects ``Connect to Server''.
+The user will then enter a URL for a library server where the authoring space is located:
+e.g., https://s10.lite.msu.edu/webdav/msu/sparty/  where msu is the domain and sparty
+is the username of the Authoring Space.  Note: webDAV usage requires Apache/SSL to be 
+running on the  library server.  The user will be prompted to enter a username
+(this will be the LON-CAPA username, if the user is also the author, or username:domain 
+of the user, if the access is for a co-author), and the user's LON-CAPA password.
+
+The requirement to obsolete published files before moving or deleting them, which applies to
+the regular web browser-based management of Authoring Space, also applies in the webDAV 
+environment. Moving and deleting directories in the webDAV environment is prohibited if
+the directory, or any (nested) subdirectory contains a non-obsolete published resource.
+
+Given the ability to easily delete unpublished content in webDAV (without the ability to 
+reverse the deletion), it is important that authors assigned webDAV access are especially
+careful when working in the webDAV environment. 
+ 
Index: loncom/html/adm/help/tex/Domain_Configuration_Request_Courses.tex
diff -u loncom/html/adm/help/tex/Domain_Configuration_Request_Courses.tex:1.8 loncom/html/adm/help/tex/Domain_Configuration_Request_Courses.tex:1.9
--- loncom/html/adm/help/tex/Domain_Configuration_Request_Courses.tex:1.8	Thu May 26 15:24:38 2011
+++ loncom/html/adm/help/tex/Domain_Configuration_Request_Courses.tex	Thu Jun 26 15:07:10 2014
@@ -1,10 +1,12 @@
 \label{Domain_Configuration_Request_Courses}
 
-A domain configuration can be used to determine which users in the domain may request creation of: (a) official courses, (b) unofficial courses, or (c) communities, within the domain.
+A domain configuration can be used to determine which users in the domain may request creation of: (a) official courses, (b) unofficial courses, (c) communities, or (d) textbook courses within the domain.
 
 The default is for no course or community requests by any domain users.
 
-Communities are similar to courses except the Coordinator may only browse areas of the shared LON-CAPA repository for which he/she has an author or co-author role.
+Communities are similar to courses except the Coordinator may only browse areas of the shared LON-CAPA repository for which he/she has an author or co-author role. Textbook courses use a simplified (1 page) request form, in 
+which the options include cloning of available pre-fabricated textbook courses or template courses, for which
+the requester has cloning rights.
 
 Course/Community requests may be set to be processed automatically, queued for approval by a Domain Coordinator, or (for official courses, for example) validated against institutional instructor of record data.  The ``With validation'' option is only displayed if the crsreq\_checks() subroutine in localenroll.pm has been customized to indicate that a particular course type can be validated if the owner belongs to a specific institutional group (e.g., Faculty). 
 
@@ -18,5 +20,11 @@
 
 The ``default'' settings which apply to a particular user based on domain configuration, may be overridden for that specific user, by a Domain Coordinator in the user's domain. The ``Add/Modify a User'' page for a user includes a section where custom settings can be selected for requests for creation of Courses/Communities in the domain.
 
-Lastly, an individual user may still be able to request courses or communities, even if settings preclude that in the user's home domain.  Domain Coordinators displaying the ``Add/Modify a User'' page for an existing user from a different domain will see a section where custom settings can be selected to allow requests for creation of Courses/Communities in the domain for which Domain Coordination is being carried out.
+An individual user may still be able to request courses or communities, even if settings preclude that in the user's home domain.  Domain Coordinators displaying the ``Add/Modify a User'' page for an existing user from a different domain will see a section where custom settings can be selected to allow requests for creation of Courses/Communities in the domain for which Domain Coordination is being carried out.
+
+Details of pre-fabricated courses: "textbooks" and "templates" for cloning when creating a new "textbook" course can be uploaded (subject, title, image, author, publisher, and LON-CAPA course domain/ID).
+
+Validation of unofficial and textbook courses, and communities can be via a validating server/script
+Form fields to send to the validator can be specified by customizing the \&crsreq\_updates() subroutine in 
+localenroll.pm.
 
Index: loncom/html/adm/help/tex/Domain_Configuration_Server_Status.tex
diff -u loncom/html/adm/help/tex/Domain_Configuration_Server_Status.tex:1.1 loncom/html/adm/help/tex/Domain_Configuration_Server_Status.tex:1.2
--- loncom/html/adm/help/tex/Domain_Configuration_Server_Status.tex:1.1	Fri Jan 14 02:50:58 2011
+++ loncom/html/adm/help/tex/Domain_Configuration_Server_Status.tex	Thu Jun 26 15:07:10 2014
@@ -9,7 +9,7 @@
 
 \begin{itemize}
 
-\item There are six server status pages: 
+\item There are ten server status pages: 
 
 \begin{itemize}
 \item User Status Summary - information about User Sessions which have been hosted on the server since the last nightly clean-up of lonIDs for stale sessions, and where the user has not logged out. Sessions are classified into: Active, Moderately Active and Inactive.
@@ -17,11 +17,16 @@
 connections to other servers in the cluster, and includes excerpts from various logs, as well as machine information.
 \item Apache Status Page - information from the Apache web server about its current status
 \item LON-CAPA Module Versions - a list of currently installed LON-CAPA perl modules, including version information.
+\item LON-CAPA Module Checking - the results of comparison of version number and checksum for installed LON-CAPA modules, with expected values for the LON-CAPA version (from a data file for the specific release number, available form any of the LON-CAPA Academic Consortium servers). 
 \item Domain status - information about the status of LON-CAPA daemons for servers in the domain.
 \item Show user environment - Information about the current user's session environment.
+\item Text Display of Domain Configuration - Information about the domain's configuration (essentially a dump of
+the domain's cnfiguration.db GDBM file).
+\item Six-character Course Codes - a listing of course information and codes, for courses for which a six character code has been assigned.
+\item Course/Community Disk Usage - Quota (MB) allocated for content uploaded directly to each course, usage in MB and percent (with choice of courses to display filtered by standard course picker).
 \end{itemize}
 
-\item There are three pages which can be used to perform server actions:
+\item There are five pages which can be used to perform server actions:
 
 \begin{itemize}
 \item Generate Detailed Report - run the loncron command which checks connection to other servers and creates a new version of the detailed server status report.
@@ -29,6 +34,8 @@
 Document Root with a temporary page announcing unavailability of LON-CAPA service on that particular server. It is strongly recommended that access to the corresponding ``Online - restore Log-in'' page is set to allow access from your IP address so that you can visit that page to re-enable the standard index.html page (e.g., when maintenance is complete) if you use the Offline page to replace it.  
 \item Online: restore Log-in page - replace the temporary index.html page with the standard index.html (which redirects to /adm/roles -- which will display the log-in page unless the
 requestor's browser has an unexpired LON-CAPA session cookie).
+\item Toggle debug messages - set which users will have access to a link on the user preferences page to enable/disable display of debug output on screen when rendering a LON-CAPA resource. Note: Domain Coordinators automatically receive the toggle debug link, regardless of settings on the server status page.
+\item Cause server to ping another server - cause the server to attempt to initiate a connection to another LON-CAPA server in the cluster.
 \end{itemize}
 
 \item There are two pages which can be used to display Metadata keyword information for searches in the domain.
Index: loncom/html/adm/help/tex/Domain_Configuration_User_Creation.tex
diff -u loncom/html/adm/help/tex/Domain_Configuration_User_Creation.tex:1.1 loncom/html/adm/help/tex/Domain_Configuration_User_Creation.tex:1.2
--- loncom/html/adm/help/tex/Domain_Configuration_User_Creation.tex:1.1	Wed Jul 23 02:41:55 2008
+++ loncom/html/adm/help/tex/Domain_Configuration_User_Creation.tex	Thu Jun 26 15:07:10 2014
@@ -20,34 +20,25 @@
 
 \begin{itemize}
 \item Activate/deactivate operation of format rule(s) for usernames 
-\item Activate/deactivate opration of format rule(s) for student/employee
+\item Activate/deactivate operation of format rule(s) for student/employee
 IDs 
-\item Activate/deactivate operation of format rule(s) which prohibit self-created
-accounts using certain types of e-mail address as the username.
 \item Control which types of username (official or non-official) may be
 used when creating new users in course or author context 
-\item Control which types of user may create their own accounts in LON-CAPA 
 \item Control which types of authentication may be used when assigning authentication
 to new users in author, course or domain context
 \end{itemize}
+
 The format rules themselves are defined by customizing the following
 routines in localenroll.pm: 
 
 \begin{itemize}
 \item usernames: \&username\_rules() and \&username\_check()
 \item IDs: \&id\_rules() and \&id\_check()
-\item self-created accounts: \&selfcreate\_rules() and \&selfcreate\_check()
 \end{itemize}
-The first two of these - username and ID check, when enforced, require
-that if a username and/or ID of the activated formats is to be used
+When enforced the user name and ID rules require that if a username 
+and/or ID which matches the format for an active rule is to be used
 in LON-CAPA, they must exist in the institutional directory. If they
 exist, the corresponding user information (first name, middle name,
 last name, e-mail address) will be used when creating the new user
 account. If they do not exist, account creation will not occur.
 
-The third one operates in the opposite manner - if a user attempts
-to self-create an account employing a username with an e-mail address
-in a format which matches the rule, the action does not proceed, and
-the user is directed to create an account with the corresponding institutional
-log-in. In this case account creation can only occur once the user
-has authenticated using that login. 
Index: loncom/html/adm/help/tex/Domain_Configuration_User_Modification.tex
diff -u loncom/html/adm/help/tex/Domain_Configuration_User_Modification.tex:1.1 loncom/html/adm/help/tex/Domain_Configuration_User_Modification.tex:1.2
--- loncom/html/adm/help/tex/Domain_Configuration_User_Modification.tex:1.1	Wed Jul 23 02:41:55 2008
+++ loncom/html/adm/help/tex/Domain_Configuration_User_Modification.tex	Thu Jun 26 15:07:10 2014
@@ -1,6 +1,6 @@
 \label{Domain_Configuration_User_Modification}
 Configuring settings which apply to modification of existing user
-information (names, e-mail address, student/employee ID) forms a part
+information (names, e-mail address, student/employee ID) form a part
 of LON-CAPA identity management. Authors and Course Coordinators both
 have access to \char`\"{}Manage Users\char`\"{} which permits them
 to assign roles to users appropriate to the context. In addition to
@@ -8,12 +8,3 @@
 may be conferred in this context depending on the target user's role(s).
 The types of user information which are modifiable in the different
 contexts is also configurable.
-
-If you have chosen to permit users to self-create their accounts,
-you can also set which fields in their user records they may set,
-in cases where the corresponding fields retrieved from the institutional
-directory are blank. Users may receive different settings depending
-on their institutional status(es). Institutional status types available
-are the ones defined for the domain in a customized version of the
-\&inst\_usertypes() routine in the localenroll.pm module installed
-on the primary server in your domain.
Index: loncom/html/adm/help/tex/Institutional_Integration_Course_Requests.tex
diff -u loncom/html/adm/help/tex/Institutional_Integration_Course_Requests.tex:1.5 loncom/html/adm/help/tex/Institutional_Integration_Course_Requests.tex:1.6
--- loncom/html/adm/help/tex/Institutional_Integration_Course_Requests.tex:1.5	Thu May 26 21:58:34 2011
+++ loncom/html/adm/help/tex/Institutional_Integration_Course_Requests.tex	Thu Jun 26 15:07:10 2014
@@ -113,8 +113,9 @@
 \$validations\{'official'\}\{'Faculty'\} = 1;
 \end{quote}
 
-The institutional types are those defined in inst\_usertypes(), and described
-in the \ref{Domain_Configuration_Auto_Enrollment} Auto-Enrollment help page.
+The institutional types are those defined for the domain in the domain configuration
+screen for ``Default authentication/language/timezone/portal/types'' (see the 
+\ref{Domain_Configuration_LangTZAuth} Defaults help page).
 \end{enumerate}
 
 A value of 'ok' should be returned if no errors occurred.
Index: loncom/html/adm/help/tex/Institutional_Integration_User_Categories.tex
diff -u loncom/html/adm/help/tex/Institutional_Integration_User_Categories.tex:1.1 loncom/html/adm/help/tex/Institutional_Integration_User_Categories.tex:1.2
--- loncom/html/adm/help/tex/Institutional_Integration_User_Categories.tex:1.1	Tue Jul 29 18:01:22 2008
+++ loncom/html/adm/help/tex/Institutional_Integration_User_Categories.tex	Thu Jun 26 15:07:10 2014
@@ -4,18 +4,38 @@
 with institutional directory information. User type (or affiliation)
 can determine such things as (a) default portfolio quota, (b) the
 types of user information which may be updated in different contexts,
-(c) whether a user can self-enroll in a course. The possible institutional
-types in a domain are defined by \emph{inst\_usertypes()}. Examples
-of institutional types might be: Faculty, Adjunct, Staff, Student
-etc. In addition to any types defined in \emph{inst\_usertypes()}, a type
+(c) whether a user can self-enroll in a course. 
+
+Prior to LON-CAPA 2.11.0 the possible institutional types in a domain
+were defined by \emph{inst\_usertypes()}. Examples of institutional
+types might be: Faculty, Adjunct, Staff, Student etc.
+In addition to any types defined in \emph{inst\_usertypes()}, a type
 {}``other'' will also be available for assignment to users who do
 not fall in any of the recognized categories of user. In the absence
 of any defined user categories, the type {}``other'' applies to
 all users from a domain.
 
+Starting with LON-CAPA 2.11.0 use of the inst\_usertypes()
+subroutine is deprecated. The domain configuration web GUI
+accessible to Domain Coordinators is now used to
+manage institutional types.  If you have previously
+customized the inst\_usertypes() routine, then values set there 
+will be used when displaying the "Institutional user types"
+section in the domain config screen for:
+"Default authentication/language/timezone/portal/types".
+
+Once a Domain Coordinator has visited that screen and saved the 
+settings, configuration thereafter will be via the web GUI of
+values stored in the domain's configuration.db file on
+the primary library server in the domain, and values in
+inst\_usertypes() will no longer be consulted. However, if you have
+created other custom routines in localenroll.pm which call 
+inst\_usertypes() internally, you will likely want to continue to
+maintain it. 
+
 \textbf{\large inst\_usertypes}{\large \par}
 
-The routine accepts three arguments:
+The routine accepted three arguments:
 
 \begin{enumerate}
 \item \$dom - domain
