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

Minor cleanups of the committer guide from the textproc/igor output.

Browse source
This commit is contained in:
Benedict Reuschling 2018-08-17 13:57:02 +00:00
parent 4c54795328
commit da4f84da78
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=52146
1 changed files with 25 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1867,10 +1867,10 @@ U stable/9/share/man/man4/netmap.4
four to ten times longer.</para>
<para>One way to limit the time required is to grab a <link
xlink:href="https://download.freebsd.org/ftp/development/subversion/">seed file</link>.
It is large
(~1GB) but will consume less network traffic and take less
time to fetch than svnsync will.</para>
xlink:href="https://download.freebsd.org/ftp/development/subversion/">seed
file</link>. It is large (~1GB) but will consume less
network traffic and take less time to fetch than svnsync
will.</para>
<para>Extract the file and update it:</para>
@ -2393,14 +2393,13 @@ freebsd-mfc-after = 2 weeks</programlisting>
portion of the work was sponsored, or different amounts
of sponsorship were provided to different authors,
please give appropriate credit in parentheses after each
sponsor name. For example,
<literal>Example.com (alice, code refactoring),
Wormulon (bob), Momcorp (cindy)</literal>
shows that Alice was sponsored by Example.com to do code
refactoring, while Wormulon sponsored Bob's work and
Momcorp sponsored Cindy's work. Other authors were
either not sponsored or chose not to list
sponsorship.</entry>
sponsor name. For example, <literal>Example.com (alice,
code refactoring), Wormulon (bob), Momcorp
(cindy)</literal> shows that Alice was sponsored by
Example.com to do code refactoring, while Wormulon
sponsored Bob's work and Momcorp sponsored Cindy's work.
Other authors were either not sponsored or chose not to
list sponsorship.</entry>
</row>
<row>
@ -3511,17 +3510,16 @@ Relnotes: yes</programlisting>
<para>Reasons for modifying upstream software range from
wanting strict control over a tightly coupled dependency
to lack of portability in the canonical
repository's distribution of their code. Regardless of the
reason, effort to minimize the maintenance burden of
fork is helpful to fellow maintainers. Avoid committing
trivial or cosmetic changes to files
since it makes every merge thereafter more
difficult: such patches need to be manually re-verified
every import.</para>
to lack of portability in the canonical repository's
distribution of their code. Regardless of the reason,
effort to minimize the maintenance burden of fork is
helpful to fellow maintainers. Avoid committing trivial
or cosmetic changes to files since it makes every merge
thereafter more difficult: such patches need to be
manually re-verified every import.</para>
<para>If a particular piece of software lacks a maintainer,
you're encouraged to take up owership. If you're unsure
you are encouraged to take up owership. If you are unsure
of the current maintainership email &a.arch; and
ask.</para>
</listitem>
@ -4476,9 +4474,9 @@ MFH: <replaceable>2014Q1 (browser blanket)</replaceable></programlisting>
</itemizedlist>
<important>
<para>Commits that aren't covered by these blanket
approvals always require explicit approval of
either &a.ports-secteam; or &a.portmgr;.</para>
<para>Commits that are not covered by these blanket
approvals always require explicit approval of either
&a.ports-secteam; or &a.portmgr;.</para>
</important>
</answer>
</qandaentry>
@ -4575,9 +4573,9 @@ Do you want to commit? (no = start a shell) [y/n]</screen>
been merged because they were not security related.
Add the different revisions <emphasis>in the order
they were committed</emphasis> on the
<command>mfh</command> command line. The new commit
log message will contain the combined log messages
from all the original commits. These messages
<command>mfh</command> line. The new commit log
message will contain the combined log messages from
all the original commits. These messages
<emphasis>must</emphasis> be edited to show what is
actually being done with the new commit.</para>