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

Fix nits.

Browse source 
Drop suggestion that the MFC time may be left off.

Reported by:	gavin
This commit is contained in:
Eitan Adler 2013-11-13 02:25:30 +00:00
parent 31b3bf1cb5
commit 1556f96ba4
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=43179
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
en_US.ISO8859-1/articles/committers-guide/article.xml
View file

@ -2209,7 +2209,7 @@ ControlPersist yes</screen>
<row> <row>
<entry><literal>Submitted by:</literal></entry> <entry><literal>Submitted by:</literal></entry>
<entry><para>The name and e-mail address of the person <entry><para>The name and e-mail address of the person
that submitted the fix; for committers, just the that submitted the fix; for developers, just the
username on the &os; cluster.</para> username on the &os; cluster.</para>
<para>If the submitter is the maintainer of the port <para>If the submitter is the maintainer of the port
to which you are commiting include "(maintainer)" to which you are commiting include "(maintainer)"
@ -2223,7 +2223,7 @@ ControlPersist yes</screen>
<row> <row>
<entry><literal>Reviewed by:</literal></entry> <entry><literal>Reviewed by:</literal></entry>
<entry>The name and e-mail address of the person or <entry>The name and e-mail address of the person or
people that reviewed the change; for committers, people that reviewed the change; for developers,
just the username on the &os; cluster. If a just the username on the &os; cluster. If a
patch was submitted to a mailing list for review, patch was submitted to a mailing list for review,
and the review was favorable, then just include and the review was favorable, then just include
@ -2233,7 +2233,7 @@ ControlPersist yes</screen>
<row> <row>
<entry><literal>Approved by:</literal></entry> <entry><literal>Approved by:</literal></entry>
<entry><para>The name and e-mail address of the person or <entry><para>The name and e-mail address of the person or
people that approved the change; for committers, people that approved the change; for developers,
just the username on the &os; cluster. It is just the username on the &os; cluster. It is
customary to get prior approval for a commit if it customary to get prior approval for a commit if it
is to an area of the tree to which you do not is to an area of the tree to which you do not
@ -2275,7 +2275,7 @@ ControlPersist yes</screen>
<entry>If the change is related to a security <entry>If the change is related to a security
vulnerability or security exposure, include one or vulnerability or security exposure, include one or
more references or a description of the more references or a description of the
issue. If possible, include a VuXML URL or a CVE id.</entry> issue. If possible, include a VuXML URL or a CVE ID.</entry>
</row> </row>
</tbody> </tbody>
</tgroup> </tgroup>
@ -2354,12 +2354,11 @@ MFC after: <replaceable>2 weeks</replaceable></programlisting>
<replaceable>weeks</replaceable> option may be <replaceable>weeks</replaceable> option may be
<literal>day</literal>, <literal>days</literal>, <literal>day</literal>, <literal>days</literal>,
<literal>week</literal>, <literal>weeks</literal>, <literal>week</literal>, <literal>weeks</literal>,
<literal>month</literal>, <literal>months</literal>, or <literal>month</literal>,
may be left off (in which case, days will be <literal>months</literal>.</para>
assumed).</para>
</example> </example>
<para>In some cases you may need to combine some of <para>In many cases you may need to combine some of
these.</para> these.</para>
<para>Consider the situation where a user has submitted a PR <para>Consider the situation where a user has submitted a PR