aboutsummaryrefslogtreecommitdiff
path: root/en_US.ISO8859-1/articles/committers-guide
diff options
context:
space:
mode:
authorWarren Block <wblock@FreeBSD.org>2018-02-11 19:52:22 +0000
committerWarren Block <wblock@FreeBSD.org>2018-02-11 19:52:22 +0000
commita026f7aa7e76dc48b25012ec53ca42980c625768 (patch)
tree53a9bf5cfa5b090e8efb00f4c07d510595e61ce2 /en_US.ISO8859-1/articles/committers-guide
parent29a6e3564caed0a148859ec61e38881dacf2d3bb (diff)
Notes
Diffstat (limited to 'en_US.ISO8859-1/articles/committers-guide')
-rw-r--r--en_US.ISO8859-1/articles/committers-guide/Makefile3
-rw-r--r--en_US.ISO8859-1/articles/committers-guide/article.xml14
2 files changed, 10 insertions, 7 deletions
diff --git a/en_US.ISO8859-1/articles/committers-guide/Makefile b/en_US.ISO8859-1/articles/committers-guide/Makefile
index fe23c3e38e..93c9165523 100644
--- a/en_US.ISO8859-1/articles/committers-guide/Makefile
+++ b/en_US.ISO8859-1/articles/committers-guide/Makefile
@@ -16,6 +16,9 @@ SRCS= article.xml
IMAGES_LIB= callouts/1.png
IMAGES_LIB+= callouts/2.png
IMAGES_LIB+= callouts/3.png
+IMAGES_LIB+= callouts/4.png
+IMAGES_LIB+= callouts/5.png
+IMAGES_LIB+= callouts/6.png
URL_RELPREFIX?= ../../../..
DOC_PREFIX?= ${.CURDIR}/../../..
diff --git a/en_US.ISO8859-1/articles/committers-guide/article.xml b/en_US.ISO8859-1/articles/committers-guide/article.xml
index 09429f75d4..951c325fe3 100644
--- a/en_US.ISO8859-1/articles/committers-guide/article.xml
+++ b/en_US.ISO8859-1/articles/committers-guide/article.xml
@@ -459,7 +459,7 @@ You need a Passphrase to protect your secret key.</screen>
</listitem>
<listitem>
- <para>Committers can aquire an additional bit by the usual
+ <para>Committers can acquire an additional bit by the usual
process of finding a mentor who will propose them to core,
doceng, or portmgr, as appropriate. When approved, they
will be added to 'access' and the normal mentoring period
@@ -2121,9 +2121,9 @@ U stable/9/share/man/man4/netmap.4
while and is finally committed back to the original branch.
During development code migration in one direction (from
head to the branch only). No code is committed back to head
- until the end. Once the branch is commited back at the end,
+ until the end. After the branch is committed back at the end,
it is dead (although a new branch with the same name can be
- created after the dead one was deleted).</para>
+ created after the dead one is deleted).</para>
<para>As per <link
xlink:href="https://people.FreeBSD.org/~peter/svn_notes.txt">https://people.FreeBSD.org/~peter/svn_notes.txt</link>,
@@ -2677,7 +2677,7 @@ freebsd-mfc-after = 2 weeks</programlisting>
<title>Commit Log for a Commit Bringing in Code from
OpenBSD</title>
- <para>Commiting some code based on work done in the
+ <para>Committing some code based on work done in the
OpenBSD project.</para>
<programlisting>...
@@ -4993,21 +4993,21 @@ Do you want to commit? (no = start a shell) [y/n]</screen>
&a.portmgr; is very protective of
<filename>ports/Mk/bsd.port*.mk</filename> so do not
commit changes to those files unless you want to face
- their wra(i)th.</para>
+ their wrath.</para>
</answer>
</qandaentry>
<qandaentry xml:id="ports-qa-misc-updated-distfile">
<question>
<para>What is the proper procedure for updating the
- checksum for a port's distfile when the file changes
+ checksum for a port distfile when the file changes
without a version change?</para>
</question>
<answer>
<para>When the checksum for a distribution file is updated
due to the author updating the file without changing the
- port's revision, the commit message includes a
+ port revision, the commit message includes a
summary of the relevant diffs between the original and
new distfile to ensure that the distfile has not been
corrupted or maliciously altered. If the current