os/doc
3
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Make name of variable consistent with email address.

Browse source 
Pointed out by:		ru
This commit is contained in:
Josef El-Rayes 2004-09-08 23:25:25 +00:00
parent 95e62d6821
commit 7b1b3f4edf
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=22288
3 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

18
en_US.ISO8859-1/articles/committers-guide/article.sgml
View file

@ -66,7 +66,7 @@
</row>
<row>
<entry><emphasis>Main &a.cvs;</emphasis></entry>
<entry><emphasis>Main &a.cvsadm;</emphasis></entry>
<entry>&a.peter; and &a.markm;, as well as &a.joe; and &a.marcus; for
<filename>ports/</filename></entry>
</row>
@ -211,11 +211,11 @@
<para>It is assumed that you are already familiar with the basic operation
of CVS.</para>
<para>The &a.cvs; are the <quote>owners</quote> of the CVS repository and
<para>The &a.cvsadm; are the <quote>owners</quote> of the CVS repository and
are responsible for direct modification of it for the purposes of
cleanup or fixing some grievous abuse of CVS by a committer.
Should you cause some repository accident, say a bad <command>cvs
import</command> or <command>cvs tag</command> operation, mail the &a.cvs;
import</command> or <command>cvs tag</command> operation, mail the &a.cvsadm;
(or call one of them) and report the problem to one of them. The only
ones able to directly fiddle the repository bits on the repository hosts
are the repomeisters. To enforce this, there are no login shells
@ -720,11 +720,11 @@ alias scvs env CVS_RSH=ssh cvs -d <replaceable>user</replaceable>@ncvs.FreeBSD.o
</itemizedlist>
<para>You will almost certainly get a conflict because
of the <literal>$Id: article.sgml,v 1.209 2004-09-03 20:37:55 ru Exp $</literal> (or in FreeBSD's case,
of the <literal>$Id: article.sgml,v 1.210 2004-09-08 23:25:25 josef Exp $</literal> (or in FreeBSD's case,
<literal>$<!-- stop expansion -->FreeBSD<!-- stop expansion -->$</literal>)
lines, so you will have to edit the file to resolve the conflict
(remove the marker lines and the second <literal>$Id: article.sgml,v 1.209 2004-09-03 20:37:55 ru Exp $</literal> line,
leaving the original <literal>$Id: article.sgml,v 1.209 2004-09-03 20:37:55 ru Exp $</literal> line intact).</para>
(remove the marker lines and the second <literal>$Id: article.sgml,v 1.210 2004-09-08 23:25:25 josef Exp $</literal> line,
leaving the original <literal>$Id: article.sgml,v 1.210 2004-09-08 23:25:25 josef Exp $</literal> line intact).</para>
</listitem>
<listitem>
@ -999,7 +999,7 @@ checkout -P</programlisting>
that it is actually merely the Newtonian manifestation of a
sentient transdimensional entity. It is not humanly possible
to know its every quirk inside out, so do not be afraid to ask
the resident AI (&a.cvs;) for help.</para>
the resident AI (&a.cvsadm;) for help.</para>
</listitem>
<listitem>
@ -2443,7 +2443,7 @@ docs:Documentation Bug:freebsd-doc:</programlisting>
reasons for the repository copy request. Assign it to
<literal>portmgr</literal> and set <varname>state</varname> to
<literal>repocopy</literal>. If &a.portmgr; approves it,
it will be reassigned to <literal>cvs</literal>. &a.cvs; will
it will be reassigned to <literal>cvs</literal>. &a.cvsadm; will
do a repository copy from the old to the new location, and
reassign the PR back to you. Once everything is done, perform the
following:</para>
@ -2664,7 +2664,7 @@ docs:Documentation Bug:freebsd-doc:</programlisting>
old categories, and the <makevar>VALID_CATEGORIES</makevar>
definition in <filename>ports/Mk/bsd.port.mk</filename>.
Assign the PR to the &a.portmgr; (as <literal>portmgr</literal>).
If they approve it, it will be reassigned to &a.cvs; (as
If they approve it, it will be reassigned to &a.cvsadm; (as
<literal>cvs</literal>), who will do a repository copy from
the old to the new locations and reassign the PR back to you.
Once everything is done, perform the following steps:</para>