From 6fdf3dc5076fcc294794de7369a7aa9a08551f3a Mon Sep 17 00:00:00 2001
From: Eitan Adler <eadler@FreeBSD.org>
Date: Sat, 30 Jun 2018 08:18:42 +0000
Subject: [PATCH] Committers guide: simplification of the vendor merge section

- Remove comparison to CVS as we no longer use it
- correct location of `--parents`
- always quote and simplify admonition about zsh
---
 .../articles/committers-guide/article.xml            | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/en_US.ISO8859-1/articles/committers-guide/article.xml b/en_US.ISO8859-1/articles/committers-guide/article.xml
index a74f917d56..2692248d88 100644
--- a/en_US.ISO8859-1/articles/committers-guide/article.xml
+++ b/en_US.ISO8859-1/articles/committers-guide/article.xml
@@ -1554,9 +1554,7 @@ U    stable/9/share/man/man4/netmap.4
 	  <sect5>
 	    <title>Preparing the Vendor Sources</title>
 
-	    <para>Unlike in <acronym>CVS</acronym> where only the
-	      needed parts were imported into the vendor tree to avoid
-	      bloating the main tree, Subversion is able to store a
+	    <para>Subversion is able to store a
 	      full distribution in the vendor tree.  So, import
 	      everything, but merge only what is required.</para>
 
@@ -1594,7 +1592,7 @@ U    stable/9/share/man/man4/netmap.4
 &prompt.user; <userinput>tar cf - . | tar xf - -C ../dist</userinput>
 &prompt.user; <userinput>cd <replaceable>../dist</replaceable></userinput>
 &prompt.user; <userinput>comm -23 ../old ../new | xargs svn rm</userinput>
-&prompt.user; <userinput>comm -13 ../old ../new | xargs svn --parents add</userinput></screen>
+&prompt.user; <userinput>comm -13 ../old ../new | xargs svn add --parents</userinput></screen>
 
 	    <para>If any directories were removed, they will have to
 	      be <command>svn rm</command>ed manually.  Nothing will
@@ -1670,7 +1668,7 @@ U    stable/9/share/man/man4/netmap.4
 
 	    <screen>&prompt.user; <userinput>svn checkout svn+ssh://repo.freebsd.org/base/head/contrib/<replaceable>sendmail</replaceable></userinput>
 &prompt.user; <userinput>cd sendmail</userinput>
-&prompt.user; <userinput>svn merge -c r<replaceable>261190</replaceable> ^/vendor/<replaceable>sendmail/dist</replaceable> .</userinput></screen>
+&prompt.user; <userinput>svn merge -c r<replaceable>261190</replaceable> '^/vendor/<replaceable>sendmail/dist</replaceable>' .</userinput></screen>
 
 	    <para><literal>^</literal> is an alias for the
 	      repository path.</para>
@@ -1679,9 +1677,7 @@ U    stable/9/share/man/man4/netmap.4
 	  <note>
 	    <para>If using the <application>Zsh</application> shell,
 	      the <literal>^</literal> must be escaped with
-	      <literal>\</literal>.  This means
-	      <literal>^/head</literal> should be
-	      <literal>\^/head</literal>.</para>
+	      <literal>\</literal> or quoted.</para>
 	  </note>
 
 	  <para>It is necessary to resolve any merge conflicts.</para>