Index: openacs-4/packages/acs-core-docs/www/cvs-guidelines.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/cvs-guidelines.adp,v
diff -u -r1.5.2.9 -r1.5.2.10
--- openacs-4/packages/acs-core-docs/www/cvs-guidelines.adp	27 Apr 2022 16:52:19 -0000	1.5.2.9
+++ openacs-4/packages/acs-core-docs/www/cvs-guidelines.adp	19 Oct 2022 09:29:50 -0000	1.5.2.10
@@ -53,10 +53,11 @@
 <div class="titlepage"><div><div><p class="title"></p></div></div></div><p>Administrator Note: These are the steps to grant CVS commit
 rights to a user:</p><div class="orderedlist"><ol class="orderedlist" type="1">
 <li class="listitem">
-<p>Create the user&#39;s account. On cvs.openacs.org:</p><pre class="screen"><span class="action"><span class="action">sudo bash
-/usr/sbin/useradd -c "<span class="replaceable"><span class="replaceable">Real Name</span></span>" -G cvs -p <span class="replaceable"><span class="replaceable">passwd</span></span><span class="replaceable"><span class="replaceable">username</span></span>
-/usr/sbin/usermod -G cvs,<span class="replaceable"><span class="replaceable">username</span></span><span class="replaceable"><span class="replaceable">username</span></span>
-</span></span></pre>
+<p>Create the user&#39;s account. On cvs.openacs.org:</p>
+<pre class="screen"><span class="action"><span class="action">sudo bash
+adduser --add_extra_groups cvs --gecos <span class="replaceable">"Real Name"</span> --shell <span class="replaceable">/bin/bash </span>
+<span class="replaceable">username</span></span>
+</pre>
 </li><li class="listitem">
 <p>Grant cvs access to the user account. On any machine, in a
 temporary directory:</p><pre class="screen"><span class="action"><span class="action">cvs -d :ext:cvs.openacs.org:/cvsroot co CVSROOT
Index: openacs-4/packages/acs-core-docs/www/cvs-guidelines.html
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/cvs-guidelines.html,v
diff -u -r1.14.2.7 -r1.14.2.8
--- openacs-4/packages/acs-core-docs/www/cvs-guidelines.html	15 Sep 2021 16:11:17 -0000	1.14.2.7
+++ openacs-4/packages/acs-core-docs/www/cvs-guidelines.html	19 Oct 2022 09:29:50 -0000	1.14.2.8
@@ -45,8 +45,8 @@
       </p><pre class="screen"><span class="action"><span class="action">cvs -z6
 cvs -q</span></span></pre><p><code class="computeroutput">-z6</code> speeds up cvs access over the network quite a bit by enabling compressed
         connection by default.  <code class="computeroutput">-q</code> suppresses some verbose output from commands.  For example, it makes the output of <code class="computeroutput">cvs up</code> much easier to read.</p><div class="sidebar"><div class="titlepage"><div><div><p class="title"><b></b></p></div></div></div><p>Administrator Note: These are the steps to grant CVS commit rights to a user:</p><div class="orderedlist"><ol class="orderedlist" type="1"><li class="listitem"><p>Create the user's account.  On cvs.openacs.org:</p><pre class="screen"><span class="action"><span class="action">sudo bash
-/usr/sbin/useradd -c "<span class="replaceable"><span class="replaceable">Real Name</span></span>" -G cvs -p <span class="replaceable"><span class="replaceable">passwd</span></span> <span class="replaceable"><span class="replaceable">username</span></span>
-/usr/sbin/usermod -G cvs,<span class="replaceable"><span class="replaceable">username</span></span> <span class="replaceable"><span class="replaceable">username</span></span>
+adduser --add_extra_groups cvs --gecos <span class="replaceable">"Real Name"</span> --shell <span class="replaceable">/bin/bash </span>
+<span class="replaceable">username</span>
           </span></span></pre></li><li class="listitem"><p>Grant cvs access to the user account.  On any machine,
 	  in a temporary directory:
 	  </p><pre class="screen"><span class="action"><span class="action">cvs -d :ext:cvs.openacs.org:/cvsroot co CVSROOT
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 -r1.9.2.1 -r1.9.2.2
--- openacs-4/packages/acs-core-docs/www/xml/engineering-standards/cvs.xml	9 Aug 2019 20:04:23 -0000	1.9.2.1
+++ openacs-4/packages/acs-core-docs/www/xml/engineering-standards/cvs.xml	19 Oct 2022 09:29:50 -0000	1.9.2.2
@@ -73,8 +73,7 @@
         <listitem>
           <para>Create the user&#39;s account.  On cvs.openacs.org:</para>
           <screen><action>sudo bash
-/usr/sbin/useradd -c "<replaceable>Real Name</replaceable>" -G cvs -p <replaceable>passwd</replaceable> <replaceable>username</replaceable>
-/usr/sbin/usermod -G cvs,<replaceable>username</replaceable> <replaceable>username</replaceable>
+adduser --add_extra_groups cvs --gecos "<replaceable>Real Name</replaceable>" --shell <replaceable>/bin/bash </replaceable>  <replaceable>username</replaceable>
           </action></screen>
         </listitem>
         <listitem>