Index: openacs-4/packages/acs-core-docs/www/xml/developers-guide/permissions.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/developers-guide/permissions.xml,v
diff -u -N -r1.10.2.2 -r1.10.2.3
--- openacs-4/packages/acs-core-docs/www/xml/developers-guide/permissions.xml	5 Jul 2004 19:47:36 -0000	1.10.2.2
+++ openacs-4/packages/acs-core-docs/www/xml/developers-guide/permissions.xml	16 Nov 2004 17:09:36 -0000	1.10.2.3
@@ -385,7 +385,7 @@
   <para>The notes code has been modified since this document was written so it is now out of date.  See <ulink url="http://openacs.org/forums/message-view?message_id=121807">this forum thread</ulink>.</para>
 
 
-<programlisting>% export CVSROOT=:pserver:anonymous@openacs.org:/cvsroot
+<programlisting>% export CVSROOT=:pserver:anonymous@cvs.openacs.org:/cvsroot
 % cvs login # just hit enter when prompted for a password
 % cvs co notes
 </programlisting>
Index: openacs-4/packages/acs-core-docs/www/xml/developers-guide/submissions.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/developers-guide/submissions.xml,v
diff -u -N -r1.3.2.1 -r1.3.2.2
--- openacs-4/packages/acs-core-docs/www/xml/developers-guide/submissions.xml	5 Jul 2004 19:47:36 -0000	1.3.2.1
+++ openacs-4/packages/acs-core-docs/www/xml/developers-guide/submissions.xml	16 Nov 2004 17:09:36 -0000	1.3.2.2
@@ -48,7 +48,7 @@
       <listitem>
         <para>Import it to the openacs.org cvs tree</para>
         <screen>cd openacs-4/packages/myfirstpackage
-cvs -d :pserver:you@openacs.org:/cvsroot import -m "initial upload" openacs-4/contrib/packages/myfirstpackage your_vendor_tag myfirstpackage-1-0-0
+cvs -d :ext:you@cvs.openacs.org:/cvsroot import -m "initial upload" openacs-4/contrib/packages/myfirstpackage your_vendor_tag myfirstpackage-1-0-0
 </screen>
       </listitem>
       <listitem>
Index: openacs-4/packages/acs-core-docs/www/xml/engineering-standards/cvs.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/engineering-standards/cvs.xml,v
diff -u -N -r1.1.2.3 -r1.1.2.4
--- openacs-4/packages/acs-core-docs/www/xml/engineering-standards/cvs.xml	8 Nov 2004 19:59:41 -0000	1.1.2.3
+++ openacs-4/packages/acs-core-docs/www/xml/engineering-standards/cvs.xml	16 Nov 2004 17:09:38 -0000	1.1.2.4
@@ -20,20 +20,20 @@
       <para>
         All OpenACS code is available anonymously.  To get code
       anonymously, use the parameter
-      <computeroutput>-d:pserver:anonymous@openacs.org:/cvsroot</computeroutput> immediately after <computeroutput>cvs</computeroutput> in a cvs command to check out or export code.
+      <computeroutput>-d:pserver:anonymous@cvs.openacs.org:/cvsroot</computeroutput> immediately after <computeroutput>cvs</computeroutput> in a cvs command to check out or export code.
       </para>
       <para>
         If you are an OpenACS developer, you should check out code so
         that you or any other developer can commit it.  To do this, use
         the parameter
-        <computeroutput>-d:ext:openacs.org:/cvsroot</computeroutput>
+        <computeroutput>-d:ext:cvs.openacs.org:/cvsroot</computeroutput>
         immediately after <computeroutput>cvs</computeroutput> in
         checkout commands.  This will create a local checkout directory
-        that uses openacs.org but does not specify the user.  By
+        that uses cvs.openacs.org but does not specify the user.  By
         default, it will use your local account name as the user, so if
         you are logged in as "foobar" it will try to check out and
         commit as if you had specified
-        <computeroutput>:ext:foobar@openacs.org:/cvsroot</computeroutput>.  The advantage of not specifying a user in the checkout command is that other users can work in the directory using their own accounts.
+        <computeroutput>:ext:foobar@cvs.openacs.org:/cvsroot</computeroutput>.  The advantage of not specifying a user in the checkout command is that other users can work in the directory using their own accounts.
       </para>
       
       <para>
@@ -42,11 +42,11 @@
         environment.  (Typically this is accomplished by putting
         <computeroutput>export CVS_RSH=ssh</computeroutput> into
         <computeroutput>~/.bash_profile</computeroutput>.).  If your local
-        account name does not match your openacs.org account name, create a
+        account name does not match your cvs.openacs.org account name, create a
         file <computeroutput>~/.ssh/config</computeroutput> with an entry
         like:
       </para>
-      <programlisting>Host openacs.org
+      <programlisting>Host cvs.openacs.org
     User joel
 </programlisting>
       <para>
@@ -70,13 +70,13 @@
         <para>Administrator Note: These are the steps to grant CVS commit rights to a user:</para>
       <orderedlist>
         <listitem>
-          <para>Create the user's account.  On openacs.org:</para>
+          <para>Create the user's account.  On cvs.openacs.org:</para>
           <screen><action>sudo bash
 /usr/sbin/useradd -c "<replaceable>Real Name</replaceable>" -G cvs,<replaceable>username</replaceable> -p <replaceable>passwd</replaceable> <replaceable>username</replaceable></action></screen>
         </listitem>
         <listitem>
           <para>Grant cvs access to the user account.  On any machine, in a temporary directory:</para>
-          <screen><action>cvs -d :ext:openacs.org:/cvsroot co CVSROOT
+          <screen><action>cvs -d :ext:cvs.openacs.org:/cvsroot co CVSROOT
 cd CVSROOT
 emacs avail</action></screen>
           <para>Add an avail line of the form:</para>
@@ -88,9 +88,9 @@
       <sidebar>
         <para>Branimir suggests an additional level of abstraction.  If you put</para>
         <programlisting>Host cvs-server
-      HostName openacs.org
+      HostName cvs.openacs.org
       User <replaceable>yournamehere</replaceable></programlisting>
-        <para>into your <computeroutput>~/.ssh/config</computeroutput> file, then you can use <computeroutput>-d :ext:cvs-server:/cvsroot</computeroutput> instead of <computeroutput>-d :ext:openacs.org:/cvsroot</computeroutput>.  You can then change the definition of <computeroutput>cvs-server</computeroutput> by changing one file instead of editing hundreds of <computeroutput>CVSROOT/Repository</computeroutput> files.</para>
+        <para>into your <computeroutput>~/.ssh/config</computeroutput> file, then you can use <computeroutput>-d :ext:cvs-server:/cvsroot</computeroutput> instead of <computeroutput>-d :ext:cvs.openacs.org:/cvsroot</computeroutput>.  You can then change the definition of <computeroutput>cvs-server</computeroutput> by changing one file instead of editing hundreds of <computeroutput>CVSROOT/Repository</computeroutput> files.</para>
       </sidebar>
 
     </sect2>
@@ -102,7 +102,7 @@
       is &releasebranch;.  This ensures that you are working on top
       of a stable OpenACS core, but still allows you to commit feature
       changes to non-core packages.  To check out all packages,</para>
-      <screen><action>cvs -d :ext:openacs.org:/cvsroot co -r &releasebranch; openacs-4</action></screen>
+      <screen><action>cvs -d :ext:cvs.openacs.org:/cvsroot co -r &releasebranch; openacs-4</action></screen>
       <para>If you work in the directories created with this command, all of your
             cvs updates and commits will be confined to the &releasebranch;
             branch.  Your work will be merged back to HEAD for you
@@ -111,15 +111,18 @@
       <para>Because the entire openacs-4 directory is large, you may
       want to use only acs-core plus some specific modules.  To do
       this, check out core first:</para>
-      <screen><action>cvs -d:ext:openacs.org:/cvsroot -r &releasebranch; checkout acs-core</action></screen>
+      <screen><action>cvs -d:ext:cvs.openacs.org:/cvsroot -r &releasebranch; checkout acs-core</action></screen>
       <para>Then add modules as needed:</para>
       <screen><action>cd /var/lib/aolserver/<replaceable>service0</replaceable>/packages
 cvs up -d <replaceable>packagename</replaceable></action></screen>
-      <para>... where <replaceable>packagename</replaceable> is the name of the
-            package you want. Visit the <ulink url="http://openacs.org/packages">
-                Package Inventory</ulink>
-            for a list of available packages and their
-            current state.  
+
+      <para>... where <replaceable>packagename</replaceable> is the
+            name of the package you want. Visit the <ulink
+            url="http://openacs.org/packages"> Package
+            Inventory</ulink> and <ulink
+            url="http://openacs.org/projects/openacs/packages/">Package
+            maintainers and status</ulink> for a list of available
+            packages and their current state.
       </para>
     </sect2>
 
@@ -134,9 +137,9 @@
               <computeroutput>-r</computeroutput> tag.</para>
       <para></para>
       <para>To check out HEAD for development, which requires an OpenACS developer account:</para>
-      <screen><action>cvs -d:ext:openacs.org:/cvsroot checkout acs-core</action></screen>
+      <screen><action>cvs -d:ext:cvs.openacs.org:/cvsroot checkout acs-core</action></screen>
       <para>To check out HEAD anonymously:</para>
-      <screen><action>cvs -d:pserver:anonymous@openacs.org:/cvsroot checkout acs-core</action></screen>
+      <screen><action>cvs -d:pserver:anonymous@cvs.openacs.org:/cvsroot checkout acs-core</action></screen>
     </sect2>
 
     <sect2>
@@ -150,10 +153,10 @@
         moved. To get a development checkout of .LRN in the subdirectory
         <literal>dotlrn</literal>:
       </para>
-      <screen><action>cvs -d :pserver:anonymous@openacs.org:/cvsroot checkout -r &releasebranch; acs-core
+      <screen><action>cvs -d :pserver:anonymous@cvs.openacs.org:/cvsroot checkout -r &releasebranch; acs-core
 mv openacs-4 dotlrn
 cd dotlrn/packages
-cvs -d :pserver:anonymous@openacs.org:/cvsroot checkout -r &releasebranch; dotlrn-all
+cvs -d :pserver:anonymous@cvs.openacs.org:/cvsroot checkout -r &releasebranch; dotlrn-all
 mv dotlrn/install.xml ..</action></screen>
     </sect2>
   <sect2 id="working-with-cvs">
@@ -162,7 +165,7 @@
       Once you have a checkout you can use some commands to track
       what has changed since you checked out your copy.  <computeroutput>cvs -n update</computeroutput> does not change any files, but reports which changes have been updated or locally modified, or are not present in CVS.
     </para>
-    <para>To update your files, use <computeroutput>cvs update</computeroutput>.  This will merge changes from the repository with your local files.  It has no effect on the openacs.org repository.</para>
+    <para>To update your files, use <computeroutput>cvs update</computeroutput>.  This will merge changes from the repository with your local files.  It has no effect on the cvs.openacs.org repository.</para>
     </sect2>
   </sect1>
 
@@ -303,7 +306,7 @@
           <para>
             Because this occurs in your personal checkout and not an anonymous
             one, this commit automagically moves back upstream to the Mother
-            Ship repository at openacs.org.  The names of the changed files, and your comments, are sent to a mailing list for OpenACS developers.  A Core Team developer may review or roll back your changes if necessary.
+            Ship repository at cvs.openacs.org.  The names of the changed files, and your comments, are sent to a mailing list for OpenACS developers.  A Core Team developer may review or roll back your changes if necessary.
           </para>
         </listitem>
               <listitem>
@@ -322,16 +325,16 @@
               <para>
                 Check out acs-core on the HEAD branch.  (Weird things happen if you add files to a branch but not to HEAD):</para>
             <screen><action>cd /tmp
-cvs -d:ext:openacs.org:/cvsroot checkout acs-core</action></screen>
+cvs -d:ext:cvs.openacs.org:/cvsroot checkout acs-core</action></screen>
             <para>Copy your package directory from your working directory to this directory.  Make sure not to copy any CVSROOT directories.</para>
             <screen><action>cp /var/lib/aolserver/<replaceable>service0</replaceable>/packagse/<replaceable>newpackage</replaceable> /tmp/openacs-4/packages</action></screen>
-            <para>Import the package into the OpenACS.org cvs repository:</para>
+            <para>Import the package into the cvs.openacs.org cvs repository:</para>
             <screen><action>cd /tmp/openacs-4/packages/<replaceable>newpackage</replaceable>
 cvs import -m "Initial import of <replaceable>newpackage</replaceable>" openacs-4/packages/newpackage <replaceable>myname</replaceable> <replaceable>0.1d</replaceable></action></screen>
             </listitem>
             <listitem>
               <para>Add the new package to the modules file. (An administrator has to do this step.)  On any machine, in a temporary directory:</para>
-          <screen><action>cvs -d :ext:openacs.org:/cvsroot co CVSROOT
+          <screen><action>cvs -d :ext:cvs.openacs.org:/cvsroot co CVSROOT
 cd CVSROOT
 emacs modules</action></screen>
           <para>Add a line of the form:</para>
@@ -357,7 +360,7 @@
 
   <sect2 id="Commit_Rules">
     <title>
-      Rules for Committing Code to the OpenACS.org repository
+      Rules for Committing Code to the OpenACS repository
     </title>
     <para>
       CVS commit procedures are governed by 
@@ -428,7 +431,7 @@
           <listitem>
             <para>
               Only GPL code and material should be committed to the
-              openacs.org CVS repository
+              OpenACS CVS repository (cvs.openacs.org)
             </para>
           </listitem>
           <listitem>
Index: openacs-4/packages/acs-core-docs/www/xml/install-guide/openacs.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/install-guide/openacs.xml,v
diff -u -N -r1.21.2.2 -r1.21.2.3
--- openacs-4/packages/acs-core-docs/www/xml/install-guide/openacs.xml	15 Nov 2004 12:55:06 -0000	1.21.2.2
+++ openacs-4/packages/acs-core-docs/www/xml/install-guide/openacs.xml	16 Nov 2004 17:09:39 -0000	1.21.2.3
@@ -77,7 +77,7 @@
         overwritten when we do the main CVS checkout to the target
         location.</para>
         <screen>[root root]# <userinput>su - <replaceable>$OPENACS_SERVICE_NAME</replaceable></userinput>
-[$OPENACS_SERVICE_NAME $OPENACS_SERVICE_NAME]$ <userinput>cvs -d :pserver:anonymous@openacs.org:/cvsroot co -d install openacs-4/etc/install</userinput>
+[$OPENACS_SERVICE_NAME $OPENACS_SERVICE_NAME]$ <userinput>cvs -d :pserver:anonymous@cvs.openacs.org:/cvsroot co -d install openacs-4/etc/install</userinput>
 cvs server: Updating install
 U install/README
 U install/TODO
@@ -605,7 +605,7 @@
 
   <sect2 id="install-from-cvs">
     <title>Installation Option 3: Install from CVS</title>
-    <para>If you want to track fresh code developments inbetween releases, or you are an OpenACS core developer, you may want to install from CVS.  This is identical to Option 2 except that you get the files from CVS instead of the tarball: <ulink url="http://openacs.org/4/checkout">CVS Checkout Instructions</ulink>.  So, instead of <computeroutput><userinput>tar xzf /tmp/&tarballpath;.tgz</userinput></computeroutput>, <computeroutput><userinput>cvs -z3 -d :pserver:anonymous@openacs.org:/cvsroot co acs-core</userinput></computeroutput>.</para>
+    <para>If you want to track fresh code developments inbetween releases, or you are an OpenACS core developer, you may want to install from CVS.  This is identical to Option 2 except that you get the files from CVS instead of the tarball: <ulink url="http://openacs.org/4/checkout">CVS Checkout Instructions</ulink>.  So, instead of <computeroutput><userinput>tar xzf /tmp/&tarballpath;.tgz</userinput></computeroutput>, <computeroutput><userinput>cvs -z3 -d :pserver:anonymous@cvs.openacs.org:/cvsroot co acs-core</userinput></computeroutput>.</para>
   </sect2>
   <sect2 id="install-next-steps">
     <title>Next Steps</title>
Index: openacs-4/packages/acs-core-docs/www/xml/install-guide/other-software.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/install-guide/other-software.xml,v
diff -u -N -r1.13.2.7 -r1.13.2.8
--- openacs-4/packages/acs-core-docs/www/xml/install-guide/other-software.xml	15 Nov 2004 13:25:44 -0000	1.13.2.7
+++ openacs-4/packages/acs-core-docs/www/xml/install-guide/other-software.xml	16 Nov 2004 17:09:40 -0000	1.13.2.8
@@ -29,7 +29,7 @@
 tar xzf &tarballpath;.tgz</action></screen>
       <para>If you are installing from a different method and just need the configuration files, you can instead get them from CVS:</para>
 <screen>[root root]# <userinput>cd /tmp</userinput>
-[root tmp]# <userinput>cvs -d :pserver:anonymous@openacs.org:/cvsroot co openacs-4/packages/acs-core-docs/www/files/</userinput>
+[root tmp]# <userinput>cvs -d :pserver:anonymous@cvs.openacs.org:/cvsroot co openacs-4/packages/acs-core-docs/www/files/</userinput>
 cvs checkout: warning: failed to open /root/.cvspass for reading: No such file or directory
 cvs server: Updating openacs-4/packages/acs-core-docs/www/files
 U openacs-4/packages/acs-core-docs/www/files/README.TXT
@@ -38,7 +38,7 @@
 U openacs-4/packages/acs-core-docs/www/files/winnsd.txt
 [root tmp]# <userinput>mv openacs-4 &tarballpath;</userinput>
 <action>cd /tmp
-cvs -d :pserver:anonymous@openacs.org:/cvsroot co openacs-4/packages/acs-core-docs/www/files/
+cvs -d :pserver:anonymous@cvs.openacs.org:/cvsroot co openacs-4/packages/acs-core-docs/www/files/
 mv openacs-4 openacs-5.0.0a4</action></screen>
       </sect1>
       <sect1 id="install-cvs">
Index: openacs-4/packages/acs-core-docs/www/xml/install-guide/upgrade.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/install-guide/upgrade.xml,v
diff -u -N -r1.15.2.2 -r1.15.2.3
--- openacs-4/packages/acs-core-docs/www/xml/install-guide/upgrade.xml	5 Jul 2004 19:47:37 -0000	1.15.2.2
+++ openacs-4/packages/acs-core-docs/www/xml/install-guide/upgrade.xml	16 Nov 2004 17:09:40 -0000	1.15.2.3
@@ -381,9 +381,9 @@
                   </formalpara>
                   <screen>[root root]# <userinput>su - <replaceable>$OPENACS_SERVICE_NAME</replaceable></userinput>
 [$OPENACS_SERVICE_NAME aolserver]$ <userinput>cd /var/lib/aolserver</userinput>
-[$OPENACS_SERVICE_NAME aolserver]$ <userinput>cvs -d :pserver:anonymous@openacs.org:/cvsroot checkout -r <replaceable>openacs-5-1-compat</replaceable> acs-core</userinput>
+[$OPENACS_SERVICE_NAME aolserver]$ <userinput>cvs -d :pserver:anonymous@cvs.openacs.org:/cvsroot checkout -r <replaceable>openacs-5-1-compat</replaceable> acs-core</userinput>
 [$OPENACS_SERVICE_NAME aolserver]$ <userinput>cd openacs-4/packages</userinput>
-[$OPENACS_SERVICE_NAME aolserver]$ <userinput>cvs -d :pserver:anonymous@openacs.org:/cvsroot checkout -r <replaceable>openacs-5-1-compat</replaceable> <replaceable>packagename packagename2...</replaceable></userinput>
+[$OPENACS_SERVICE_NAME aolserver]$ <userinput>cvs -d :pserver:anonymous@cvs.openacs.org:/cvsroot checkout -r <replaceable>openacs-5-1-compat</replaceable> <replaceable>packagename packagename2...</replaceable></userinput>
 [$OPENACS_SERVICE_NAME aolserver]$ <userinput>cd ../..</userinput>
 [$OPENACS_SERVICE_NAME aolserver]$ <userinput>mv openacs-4 <replaceable>openacs-5-1</replaceable></userinput></screen>
                   <para>If this checkout already exists, you can simply update it instead of recreating it.</para>
@@ -446,7 +446,7 @@
         </listitem>
       </itemizedlist>
       <para>
-        <emphasis role="strong">Upgrading files for a site using the OpenACS.org CVS repository</emphasis>
+        <emphasis role="strong">Upgrading files for a site using the OpenACS CVS repository (cvs.openacs.org)</emphasis>
       </para>
       <orderedlist>
         <listitem>