aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--en_US.ISO8859-1/articles/committers-guide/article.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/en_US.ISO8859-1/articles/committers-guide/article.xml b/en_US.ISO8859-1/articles/committers-guide/article.xml
index d1b4d5ce3a..d184d56638 100644
--- a/en_US.ISO8859-1/articles/committers-guide/article.xml
+++ b/en_US.ISO8859-1/articles/committers-guide/article.xml
@@ -4465,7 +4465,7 @@ Relnotes: yes</programlisting>
</qandadiv>
<qandadiv xml:id="ports-qa-quarterly">
- <title>Quarterly branches</title>
+ <title>Quarterly Branches</title>
<qandaentry xml:id="ports-qa-misc-request-mfh">
<question>
@@ -4585,7 +4585,7 @@ Do you want to commit? (no = start a shell) [y/n]</screen>
<para>The mfh script can also take an optional first
argument, the branch where the merge is being done.
It does, however, select the latest branch, so
- specifying the branch is discourraged.</para>
+ specifying the branch is discouraged.</para>
<screen>&prompt.user; <userinput>/usr/ports/Tools/scripts/mfh 2016Q1 r407208 r407713</userinput></screen>
</note>