diff options
| -rw-r--r-- | en_US.ISO8859-1/articles/committers-guide/article.sgml | 18 | ||||
| -rw-r--r-- | en_US.ISO8859-1/share/sgml/teams.ent | 2 | ||||
| -rw-r--r-- | it_IT.ISO8859-15/articles/committers-guide/article.sgml | 8 |
3 files changed, 14 insertions, 14 deletions
diff --git a/en_US.ISO8859-1/articles/committers-guide/article.sgml b/en_US.ISO8859-1/articles/committers-guide/article.sgml index b06b616ec2..2554f83ecf 100644 --- a/en_US.ISO8859-1/articles/committers-guide/article.sgml +++ b/en_US.ISO8859-1/articles/committers-guide/article.sgml @@ -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> diff --git a/en_US.ISO8859-1/share/sgml/teams.ent b/en_US.ISO8859-1/share/sgml/teams.ent index 480cb1a28c..cb704705d8 100644 --- a/en_US.ISO8859-1/share/sgml/teams.ent +++ b/en_US.ISO8859-1/share/sgml/teams.ent @@ -19,7 +19,7 @@ <!ENTITY a.core-secretary "Core Team Secretary <email>core-secretary@FreeBSD.org</email>"> -<!ENTITY a.cvs "CVS Repository Meisters <email>cvsadm@FreeBSD.org</email>"> +<!ENTITY a.cvsadm "CVS Repository Meisters <email>cvsadm@FreeBSD.org</email>"> <!ENTITY a.cvsup-master "CVSup Mirror Site Coordinator <email>cvsup-master@FreeBSD.org</email>"> diff --git a/it_IT.ISO8859-15/articles/committers-guide/article.sgml b/it_IT.ISO8859-15/articles/committers-guide/article.sgml index a71c482896..51ec8b6f3e 100644 --- a/it_IT.ISO8859-15/articles/committers-guide/article.sgml +++ b/it_IT.ISO8859-15/articles/committers-guide/article.sgml @@ -85,7 +85,7 @@ </row> <row> - <entry><emphasis>&a.cvs; Principali</emphasis></entry> + <entry><emphasis>&a.cvsadm; Principali</emphasis></entry> <entry>&a.peter; e &a.markm;, così come &a.joe; e &a.marcus; per i <filename>ports/</filename></entry> @@ -252,12 +252,12 @@ <para>Si assume che tu abbia già familiarità con le operazioni di base di CVS.</para> - <para>I &a.cvs; sono i <quote>proprietari</quote> del repository CVS e sono + <para>I &a.cvsadm; sono i <quote>proprietari</quote> del repository CVS e sono responsabili delle sue modifiche dirette allo scopo di ripulire o sistemare dei gravi abusi di CVS da parte di un committer. Nel caso dovessi causare qualche problema al repository, diciamo una errata operazione di <command>cvs import</command> o - <command>cvs tag</command>, invia un messaggio ai &a.cvs; (o chiama uno di + <command>cvs tag</command>, invia un messaggio ai &a.cvsadm; (o chiama uno di loro) ed esponi il problema ad uno di loro. Gli unici che hanno il permesso di manipolare direttamente i bit del repository sono i <quote>repomeister</quote>. Per questo non ci sono shell di login @@ -1070,7 +1070,7 @@ checkout -P</programlisting> Newtoniana di una entità ultradimensionale sensibile. Non è umanamente possibile conoscere ogni dettaglio di CVS, quindi non essere dispiaciuto di chiedere aiuto all'Intelligenza - Artificiale (&a.cvs;).</para> + Artificiale (&a.cvsadm;).</para> </listitem> <listitem> |