Date: Wed, 31 May 2017 12:49:08 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r50305 - head/en_US.ISO8859-1/articles/committers-guide Message-ID: <201705311249.v4VCn8rp023696@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Wed May 31 12:49:08 2017 New Revision: 50305 URL: https://svnweb.freebsd.org/changeset/doc/50305 Log: A few more nits from matthew. Submitted by: matthew Sponsored by: Absolight Modified: head/en_US.ISO8859-1/articles/committers-guide/article.xml Modified: head/en_US.ISO8859-1/articles/committers-guide/article.xml ============================================================================== --- head/en_US.ISO8859-1/articles/committers-guide/article.xml Wed May 31 12:48:57 2017 (r50304) +++ head/en_US.ISO8859-1/articles/committers-guide/article.xml Wed May 31 12:49:08 2017 (r50305) @@ -362,7 +362,7 @@ You need a Passphrase to protect your secret key.</scr <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.</scr <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.</scr <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>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201705311249.v4VCn8rp023696>