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

Standardise some spelling. Translators can probably ignore this.

Browse source
This commit is contained in:
Ceri Davies 2004-04-20 18:35:00 +00:00
parent 7dd7465706
commit 34faed2813
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=20760
1 changed files with 5 additions and 5 deletions

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

@ -218,7 +218,7 @@
the possibility of placing each on a separate machine in the future, the possibility of placing each on a separate machine in the future,
there is a separate hostname for each that committers should use. there is a separate hostname for each that committers should use.
Additionally, each repository is stored in a separate directory. The Additionally, each repository is stored in a separate directory. The
following table summarises the situation.</para> following table summarizes the situation.</para>
<table frame="none" id="cvs-repositories-and-hosts"> <table frame="none" id="cvs-repositories-and-hosts">
<title>&os; CVS Repositories, Hosts and Directories</title> <title>&os; CVS Repositories, Hosts and Directories</title>
@ -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.188 2004-04-09 06:13:10 imp Exp $</literal> (or in FreeBSD's case, of the <literal>$Id: article.sgml,v 1.189 2004-04-20 18:35:00 ceri 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.188 2004-04-09 06:13:10 imp Exp $</literal> line, (remove the marker lines and the second <literal>$Id: article.sgml,v 1.189 2004-04-20 18:35:00 ceri Exp $</literal> line,
leaving the original <literal>$Id: article.sgml,v 1.188 2004-04-09 06:13:10 imp Exp $</literal> line intact).</para> leaving the original <literal>$Id: article.sgml,v 1.189 2004-04-20 18:35:00 ceri Exp $</literal> line intact).</para>
</listitem> </listitem>
<listitem> <listitem>
@ -1121,7 +1121,7 @@ SUCH DAMAGE.</programlisting>
<para>The &os; project strongly discourages the so called <para>The &os; project strongly discourages the so called
advertising clause in new code. Due to the large number of advertising clause in new code. Due to the large number of
contributers to the &os; project, complying with this clause for contributors to the &os; project, complying with this clause for
many commercial vendors has become difficult. If you have code many commercial vendors has become difficult. If you have code
in the tree with the advertising clause, please consider in the tree with the advertising clause, please consider
removing it. In fact, please consider using the above license removing it. In fact, please consider using the above license