aboutsummaryrefslogtreecommitdiff
path: root/en_US.ISO8859-1/articles/committers-guide
diff options
context:
space:
mode:
authorMathieu Arnold <mat@FreeBSD.org>2017-05-31 12:49:08 +0000
committerMathieu Arnold <mat@FreeBSD.org>2017-05-31 12:49:08 +0000
commit26936acb67d77b8262d7407ef02ecef42e854c7c (patch)
treecd1d10d1682d6119e394b6067c138fc35d886cf9 /en_US.ISO8859-1/articles/committers-guide
parenta1fbcb2956a546b64360954186931a342e54ef78 (diff)
Notes
Diffstat (limited to 'en_US.ISO8859-1/articles/committers-guide')
-rw-r--r--en_US.ISO8859-1/articles/committers-guide/article.xml6
1 files changed, 3 insertions, 3 deletions
diff --git a/en_US.ISO8859-1/articles/committers-guide/article.xml b/en_US.ISO8859-1/articles/committers-guide/article.xml
index d7251c4405..b9e4c4c99f 100644
--- a/en_US.ISO8859-1/articles/committers-guide/article.xml
+++ b/en_US.ISO8859-1/articles/committers-guide/article.xml
@@ -362,7 +362,7 @@ You need a Passphrase to protect your secret key.</screen>
<note>
<para>Unless the Kerberos-authenticated services
- of the &os;.org cluster was used previously,
+ of the &os;.org cluster have been used previously,
<errorname>Client unknown</errorname> will be shown. This
error means that the
<command>ssh kpasswd.freebsd.org</command> method shown above
@@ -1168,7 +1168,7 @@ You need a Passphrase to protect your secret key.</screen>
<screen>&prompt.user; <userinput>svn copy svn+ssh://repo.freebsd.org/base/head svn+ssh://repo.freebsd.org/base/stable/8</userinput></screen>
- <para>This is equivalent to this set of commands
+ <para>This is equivalent to these commands
which take minutes and hours as opposed to seconds,
depending on your network connection:</para>
@@ -1462,7 +1462,7 @@ You need a Passphrase to protect your secret key.</screen>
<para>Because of the mergeinfo propagation issues described
earlier, it is very important to never merge changes
into a sparse working copy. Always use a full
- checkout of the branch being merge into. For instance,
+ checkout of the branch being merged into. For instance,
when merging from HEAD to 7, use a full checkout
of stable/7:</para>