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

Change with no' to without' or similar.

Browse source 
Reviewed by:	jhb
This commit is contained in:
Giorgos Keramidas 2002-05-12 23:15:26 +00:00
parent f4ec5db791
commit dd52cb7d97
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=13055
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -498,18 +498,18 @@
<tbody> <tbody>
<row> <row>
<entry><literal>U</literal></entry> <entry><literal>U</literal></entry>
<entry>The file was updated with no trouble.</entry> <entry>The file was updated without trouble.</entry>
</row> </row>
<row> <row>
<entry><literal>P</literal></entry> <entry><literal>P</literal></entry>
<entry>The file was updated with no trouble (you will only see <entry>The file was updated without trouble (you will only see
this when working against a remote repo).</entry> this when working against a remote repo).</entry>
</row> </row>
<row> <row>
<entry><literal>M</literal></entry> <entry><literal>M</literal></entry>
<entry>The file had been modified, and was merged with no <entry>The file had been modified, and was merged without
conflicts.</entry> conflicts.</entry>
</row> </row>
@ -583,11 +583,11 @@
</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.118 2002-05-12 23:01:09 jedgar Exp $</literal> (or in FreeBSD's case, of the <literal>$Id: article.sgml,v 1.119 2002-05-12 23:15:26 keramida Exp $</literal> (or in FreeBSD's case,
<literal>$<!-- stop expansion -->FreeBSD<!-- stop expansion -->$</literal>) lines, so you will have to edit <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 file to resolve the conflict (remove the marker lines and
the second <literal>$Id: article.sgml,v 1.118 2002-05-12 23:01:09 jedgar Exp $</literal> line, leaving the original the second <literal>$Id: article.sgml,v 1.119 2002-05-12 23:15:26 keramida Exp $</literal> line, leaving the original
<literal>$Id: article.sgml,v 1.118 2002-05-12 23:01:09 jedgar Exp $</literal> line intact).</para> <literal>$Id: article.sgml,v 1.119 2002-05-12 23:15:26 keramida Exp $</literal> line intact).</para>
</listitem> </listitem>
<listitem> <listitem>
@ -635,7 +635,7 @@
with <option>-r</option> or <option>-D</option> as in with <option>-r</option> or <option>-D</option> as in
<command>checkout</command> or <command>update</command>, <command>checkout</command> or <command>update</command>,
or even view the diffs between two arbitrary versions or even view the diffs between two arbitrary versions
(with no regard for what you have locally) by specifying (without regard for what you have locally) by specifying
<emphasis>two</emphasis> versions with <option>-r</option> or <emphasis>two</emphasis> versions with <option>-r</option> or
<option>-D</option>.</para> <option>-D</option>.</para>
</listitem> </listitem>
@ -779,7 +779,7 @@
<para>Also, ALWAYS specify which files to commit explicitly on <para>Also, ALWAYS specify which files to commit explicitly on
the command line, so you do not accidentally commit other files the command line, so you do not accidentally commit other files
than the ones you intended - <command>cvs commit</command> than the ones you intended - <command>cvs commit</command>
with no arguments will commit every modification in your without any arguments will commit every modification in your
current working directory and every subdirectory.</para> current working directory and every subdirectory.</para>
</listitem> </listitem>
</orderedlist> </orderedlist>