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

- s/pav/user/

Browse source 
Noticed by:	clsung@
Approved by:	delphij@ (mentor)
This commit is contained in:
Chin-San Huang 2007-03-20 08:49:54 +00:00
parent 6d8c9590e7
commit 0fd0e3853c
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=29849
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -731,11 +731,11 @@ alias scvs cvs -d <replaceable>user</replaceable>@ncvs.FreeBSD.org:/home/ncvs</p
</itemizedlist> </itemizedlist>
<para>You will almost certainly get a conflict because <para>You will almost certainly get a conflict because
of the <literal>$Id: article.sgml,v 1.256 2007-03-01 13:27:33 joel Exp $</literal> (or in FreeBSD's case, of the <literal>$Id: article.sgml,v 1.257 2007-03-20 08:49:54 chinsan Exp $</literal> (or in FreeBSD's case,
<literal>$<!-- stop expansion -->FreeBSD<!-- stop expansion -->$</literal>) <literal>$<!-- stop expansion -->FreeBSD<!-- stop expansion -->$</literal>)
lines, so you will have to edit the file to resolve the conflict 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.256 2007-03-01 13:27:33 joel Exp $</literal> line, (remove the marker lines and the second <literal>$Id: article.sgml,v 1.257 2007-03-20 08:49:54 chinsan Exp $</literal> line,
leaving the original <literal>$Id: article.sgml,v 1.256 2007-03-01 13:27:33 joel Exp $</literal> line intact).</para> leaving the original <literal>$Id: article.sgml,v 1.257 2007-03-20 08:49:54 chinsan Exp $</literal> line intact).</para>
</listitem> </listitem>
<listitem> <listitem>
@ -1039,13 +1039,13 @@ checkout -P</programlisting>
configuration into your <filename>~/.ssh/config</filename>:</para> configuration into your <filename>~/.ssh/config</filename>:</para>
<programlisting>Host ncvs.FreeBSD.org <programlisting>Host ncvs.FreeBSD.org
ControlPath /home/<replaceable>pav</replaceable>/.ssh/cvs.cpath ControlPath /home/<replaceable>user</replaceable>/.ssh/cvs.cpath
Host dcvs.FreeBSD.org Host dcvs.FreeBSD.org
ControlPath /home/<replaceable>pav</replaceable>/.ssh/cvs.cpath ControlPath /home/<replaceable>user</replaceable>/.ssh/cvs.cpath
Host projcvs.FreeBSD.org Host projcvs.FreeBSD.org
ControlPath /home/<replaceable>pav</replaceable>/.ssh/cvs.cpath ControlPath /home/<replaceable>user</replaceable>/.ssh/cvs.cpath
Host pcvs.FreeBSD.org Host pcvs.FreeBSD.org
ControlPath /home/<replaceable>pav</replaceable>/.ssh/cvs.cpath</programlisting> ControlPath /home/<replaceable>user</replaceable>/.ssh/cvs.cpath</programlisting>
<para>Now open the persistent connection to the repoman:</para> <para>Now open the persistent connection to the repoman:</para>