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

Rewrap a paragraph. Translators can safely ignore.

Browse source
This commit is contained in:
Dag-Erling Smørgrav 2004-04-02 19:30:29 +00:00
parent 58b980fce6
commit 9552d3a629
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=20477
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -678,11 +678,11 @@ alias scvs env CVS_RSH=ssh cvs -d <replaceable>user</replaceable>@ncvs.freebsd.o
</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.182 2004-04-02 19:26:47 des Exp $</literal> (or in FreeBSD's case, of the <literal>$Id: article.sgml,v 1.183 2004-04-02 19:30:29 des 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.182 2004-04-02 19:26:47 des Exp $</literal> line, (remove the marker lines and the second <literal>$Id: article.sgml,v 1.183 2004-04-02 19:30:29 des Exp $</literal> line,
leaving the original <literal>$Id: article.sgml,v 1.182 2004-04-02 19:26:47 des Exp $</literal> line intact).</para> leaving the original <literal>$Id: article.sgml,v 1.183 2004-04-02 19:30:29 des Exp $</literal> line intact).</para>
</listitem> </listitem>
<listitem> <listitem>
@ -1072,9 +1072,9 @@ checkout -P</programlisting>
<literal>Approved by:</literal> line in the commit <literal>Approved by:</literal> line in the commit
message.</para> message.</para>
<para>All <filename>src</filename> commits should go to &os.current; first <para>All <filename>src</filename> commits should go to
before being merged to &os.stable;. No major new &os.current; first before being merged to &os.stable;. No major
features or high-risk modifications should be made to the new features or high-risk modifications should be made to the
&os.stable; branch.</para> &os.stable; branch.</para>
</sect1> </sect1>