Grammatical changes which translators should be able to ignore.
This commit is contained in:
parent
be816809c0
commit
fad95edc7e
Notes:
svn2git
2020-12-08 03:00:23 +00:00
svn path=/head/; revision=16159
1 changed files with 13 additions and 13 deletions
|
@ -17,7 +17,7 @@
|
|||
|
||||
<article>
|
||||
<articleinfo>
|
||||
<title>Committer Guide</title>
|
||||
<title>Committer's Guide</title>
|
||||
|
||||
<authorgroup>
|
||||
<author>
|
||||
|
@ -400,7 +400,7 @@
|
|||
<screen>&prompt.user; <userinput>cvs status shazam</userinput></screen>
|
||||
|
||||
<para>This displays the status of the
|
||||
<filename>shazam</filename> file or of every file in the
|
||||
file <filename>shazam</filename> or of every file in the
|
||||
<filename>shazam</filename> directory. For every file, the
|
||||
status is given as one of:</para>
|
||||
|
||||
|
@ -446,12 +446,12 @@
|
|||
</listitem>
|
||||
|
||||
<listitem>
|
||||
<para>Once you have checked something out, update it with the
|
||||
<para>Once you have checked something out, you can update it with the
|
||||
<command>update</command> command.</para>
|
||||
|
||||
<screen>&prompt.user; <userinput>cvs update shazam</userinput></screen>
|
||||
|
||||
<para>This updates the <filename>shazam</filename> file or the
|
||||
<para>This updates the file <filename>shazam</filename> or the
|
||||
contents of the <filename>shazam</filename> directory to the
|
||||
latest version along the branch you checked out. If you
|
||||
checked out a <quote>point in time</quote>, does nothing
|
||||
|
@ -490,7 +490,7 @@
|
|||
sticky tags, dates or revisions whereas <option>-r</option>
|
||||
and <option>-D</option> set new ones.</para>
|
||||
|
||||
<para>Theoretically, specifying <literal>HEAD</literal> as
|
||||
<para>Theoretically, specifying <literal>HEAD</literal> as the
|
||||
argument to <option>-r</option> will give you the same result
|
||||
as <option>-A</option>, but that is just theory.</para>
|
||||
|
||||
|
@ -608,11 +608,11 @@
|
|||
</itemizedlist>
|
||||
|
||||
<para>You will almost certainly get a conflict because
|
||||
of the <literal>$Id: article.sgml,v 1.157 2003-03-01 01:36:25 ceri Exp $</literal> (or in FreeBSD's case,
|
||||
of the <literal>$Id: article.sgml,v 1.158 2003-03-01 22:19:04 ceri 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.157 2003-03-01 01:36:25 ceri Exp $</literal> line,
|
||||
leaving the original <literal>$Id: article.sgml,v 1.157 2003-03-01 01:36:25 ceri Exp $</literal> line intact).</para>
|
||||
(remove the marker lines and the second <literal>$Id: article.sgml,v 1.158 2003-03-01 22:19:04 ceri Exp $</literal> line,
|
||||
leaving the original <literal>$Id: article.sgml,v 1.158 2003-03-01 22:19:04 ceri Exp $</literal> line intact).</para>
|
||||
</listitem>
|
||||
|
||||
<listitem>
|
||||
|
@ -1586,8 +1586,8 @@ docs:Documentation Bug:nik:</programlisting>
|
|||
|
||||
<para>In all other aspects of project operation, core is a subset
|
||||
of committers and is bound by the <emphasis>same
|
||||
rules</emphasis>. Just because someone is in core does not mean
|
||||
that they have special dispensation to step outside of any of
|
||||
rules</emphasis>. Just because someone is in core this does not mean
|
||||
that they have special dispensation to step outside any of
|
||||
the lines painted here; core's <quote>special powers</quote>
|
||||
only kick in when it acts as a group, not on an individual
|
||||
basis. As individuals, the core team members are all committers
|
||||
|
@ -1667,8 +1667,8 @@ docs:Documentation Bug:nik:</programlisting>
|
|||
|
||||
<para>The CVS repository is not where changes should be
|
||||
initially submitted for correctness or argued over, that
|
||||
should happen first in the mailing lists and then
|
||||
committed only once something resembling consensus has
|
||||
should happen first in the mailing lists and the commit should
|
||||
only happen once something resembling consensus has
|
||||
been reached. This does not mean that you have to ask
|
||||
permission before correcting every obvious syntax error or
|
||||
manual page misspelling, simply that you should try to
|
||||
|
@ -2162,7 +2162,7 @@ docs:Documentation Bug:nik:</programlisting>
|
|||
|
||||
<answer>
|
||||
<para>First, please read the section about repository
|
||||
copy.</para>
|
||||
copies.</para>
|
||||
|
||||
<para>The easiest way to add a new port is to use the
|
||||
<command>addport</command> script on
|
||||
|
|
Loading…
Reference in a new issue