From ba10892cbe7d3ca03448b352a4d1c8e7e1ddc9bb Mon Sep 17 00:00:00 2001
From: Mark Linimon <linimon@FreeBSD.org>
Date: Mon, 23 Jul 2007 00:49:56 +0000
Subject: [PATCH] Make the section on uploading package sets a little clearer.

---
 .../articles/portbuild/article.sgml           | 26 ++++++++++++-------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/en_US.ISO8859-1/articles/portbuild/article.sgml b/en_US.ISO8859-1/articles/portbuild/article.sgml
index c24c4bc6a3..1a95c9deab 100644
--- a/en_US.ISO8859-1/articles/portbuild/article.sgml
+++ b/en_US.ISO8859-1/articles/portbuild/article.sgml
@@ -809,7 +809,8 @@ umount: Cleanup of /x/tmp/6-exp/chroot/53837/compat/linux/proc failed!
       <command>cdrom.sh</command> before preparing
       the final package set for a release.</para>
 
-    <para>Packages can be copied to the staging area on
+    <para>If you are doing a completely new package set (e.g. for
+      a new release), copy packages to the staging area on
       <hostid>ftp-master</hostid> with something like the following:</para>
 
     <screen>&prompt.root; <userinput>cd /var/portbuild/<replaceable>${arch}</replaceable>/<replaceable>${branch}</replaceable></userinput>
@@ -829,15 +830,7 @@ umount: Cleanup of /x/tmp/6-exp/chroot/53837/compat/linux/proc failed!
 
     <para>For incremental builds, packages should be uploaded
       using <command>rsync</command> so we do not put too much
-      strain on the mirrors:</para>
-
-    <screen>&prompt.root; <userinput>rsync -n -r -v -l -t -p --delete packages/ portmgr@ftp-master:w/ports/<replaceable>${arch}</replaceable>/<replaceable>${branch}</replaceable>/ | tee log</userinput></screen>
-
-    <para>Distfiles can be transferred via
-      <command>rsync</command>:</para>
-
-    <screen>&prompt.root; <userinput>cd /var/portbuild/<replaceable>${arch}</replaceable>/<replaceable>${branch}</replaceable></userinput>
-&prompt.root; <userinput>rsync -r -v -l -p -c -n distfiles/ portmgr@ftp-master:w/ports/distfiles/ | tee log</userinput></screen>
+      strain on the mirrors.</para>
 
     <para><emphasis>ALWAYS</emphasis> use <literal>-n</literal>
       first with <command>rsync</command> and check the output
@@ -845,6 +838,19 @@ umount: Cleanup of /x/tmp/6-exp/chroot/53837/compat/linux/proc failed!
       <command>rsync</command> without the <literal>-n</literal>
       option.
     </para>
+
+    <para>Example command for incremental package upload:</para>
+
+    <screen>&prompt.root; <userinput>rsync -n -r -v -l -t -p --delete packages/ portmgr@ftp-master:w/ports/<replaceable>${arch}</replaceable>/<replaceable>${branch}</replaceable>/ | tee log</userinput></screen>
+
+    <para>Distfiles can also be transferred via
+      <command>rsync</command>:</para>
+
+    <screen>&prompt.root; <userinput>cd /var/portbuild/<replaceable>${arch}</replaceable>/<replaceable>${branch}</replaceable></userinput>
+&prompt.root; <userinput>rsync -n -r -v -l -p -c -n distfiles/ portmgr@ftp-master:w/ports/distfiles/ | tee log</userinput></screen>
+
+    <para>Again, run the command without the <literal>-n</literal>
+      option after you have checked it.</para>
   </sect1>
 
   <sect1 id="expbuilds">