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

Remove almost all instances of "try and <verb>" from the docs.

Browse source 
There is one remaining place in the fdp-primer, but that needs
a bit more work.

Inspired by:	docs/36462 (Gary W. Swearingen <swear@blarg.net>)
Reviewed by:	ceri, trhodes
This commit is contained in:
Giorgos Keramidas 2002-04-07 23:52:37 +00:00
parent 4b70a8662d
commit 67a1702cec
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=12715
13 changed files with 32 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -585,11 +585,11 @@
</itemizedlist>
<para>You will almost certainly get a conflict because
of the <literal>$Id: article.sgml,v 1.106 2002-03-27 12:40:02 murray Exp $</literal> (or in FreeBSD's case,
of the <literal>$Id: article.sgml,v 1.107 2002-04-07 23:52:25 keramida 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.106 2002-03-27 12:40:02 murray Exp $</literal> line, leaving the original
<literal>$Id: article.sgml,v 1.106 2002-03-27 12:40:02 murray Exp $</literal> line intact).</para>
the second <literal>$Id: article.sgml,v 1.107 2002-04-07 23:52:25 keramida Exp $</literal> line, leaving the original
<literal>$Id: article.sgml,v 1.107 2002-04-07 23:52:25 keramida Exp $</literal> line intact).</para>
</listitem>
<listitem>
@ -1683,7 +1683,7 @@ docs:Documentation Bug:nik:</programlisting>
course) but CVS makes it unnecessary to have an ongoing
dispute raging when it is far easier to simply reverse the
disputed change, get everyone calmed down again and then
try and figure out how best to proceed. If the change
try to figure out what is the best way to proceed. If the change
turns out to be the best thing after all, it can be easily
brought back. If it turns out not to be, then the users
did not have to live with the bogus change in the tree
@ -1740,7 +1740,7 @@ docs:Documentation Bug:nik:</programlisting>
to continue to attract new members. There will be
occasions when, despite everyone's very best attempts at
self-control, tempers are lost and angry words are
exchanged, and the best we can do is try and minimize the
exchanged. The best thing that can be done in such cases is to minimize the
effects of this until everyone has cooled back down. That
means that you should not air your angry words in public
and you should not forward private correspondence to