Update for FETCH_USING changes.

2 files changed, 14 insertions, 10 deletions

diff --git a/doc/guide/files/build.xml b/doc/guide/files/build.xml
index d143a64f908..e07a7036f89 100644
--- a/doc/guide/files/build.xml
+++ b/doc/guide/files/build.xml
@@ -1,4 +1,4 @@
-<!-- $NetBSD: build.xml,v 1.56 2008/09/09 00:59:51 obache Exp $ -->
+<!-- $NetBSD: build.xml,v 1.57 2009/02/10 19:24:37 joerg Exp $ -->
 
 <chapter id="build">
   <title>The build process</title>
@@ -382,6 +382,10 @@ ${FETCH_CMD} ${FETCH_BEFORE_ARGS} ${site}${file} ${FETCH_AFTER_ARGS}
       <varname>MASTER_SORT_AWK</varname> or
       <varname>MASTER_SORT_REGEX</varname>.</para>
 
+      <para> The specific command and arguments used depend on the
+      <varname>FETCH_USING</varname> parameter. The example above is
+      for <literal>FETCH_USING=custom</literal>.
+
       <para>The distfiles mirror run by the NetBSD Foundation uses the
       <emphasis>mirror-distfiles</emphasis> target to mirror the
       distfiles, if they are freely distributable.  Packages setting
diff --git a/doc/guide/files/faq.xml b/doc/guide/files/faq.xml
index e1f45d64387..6f412f57050 100644
--- a/doc/guide/files/faq.xml
+++ b/doc/guide/files/faq.xml
@@ -1,4 +1,4 @@
-<!-- $NetBSD: faq.xml,v 1.41 2009/01/28 23:31:39 abs Exp $ -->
+<!-- $NetBSD: faq.xml,v 1.42 2009/02/10 19:24:37 joerg Exp $ -->
 
 <chapter id="faq"> <?dbhtml filename="faq.html"?>
 <title>Frequently Asked Questions</title>
@@ -275,20 +275,20 @@ distfile is found, pkgsrc will try to resume it.</para>
 
 <para>You can also
 use a different program than the default &man.ftp.1; by changing the
-<varname>FETCH_CMD</varname> variable.  Don't forget to set
-<varname>FETCH_RESUME_ARGS</varname> and
-<varname>FETCH_OUTPUT_ARGS</varname> if you are not using default
-values.</para>
+<varname>FETCH_USING</varname> variable.  You can specify the program by
+using of ftp, fetch, wget or curl.  Alternatively, fetching can be disabled
+by using the value manual.  A value of custom disables the system defaults
+and dependency tracking for the fetch program.  In that case you have to
+provide <varname>FETCH_CMD</varname>, <varname>FETCH_BEFORE_ARGS</varname>,
+<varname>FETCH_RESUME_ARGS</varname>, <varname>FETCH_OUTPUT_ARGS</varname>
+<varname>FETCH_AFTER_ARGS<v/varname>.</para>
 
 <para>For example, if you want to use
 <filename>wget</filename> to resume downloads, you'll have to use something
 like:</para>
 
 <programlisting>
-FETCH_CMD=             wget
-FETCH_BEFORE_ARGS=     --passive-ftp
-FETCH_RESUME_ARGS=     -c
-FETCH_OUTPUT_ARGS=     -O -nc
+FETCH_USING=	wget
 </programlisting>
 
 </sect1>