Improve resume section, and use complete path for /etc/mk.conf in two places.

1 files changed, 14 insertions, 12 deletions

diff --git a/doc/guide/files/faq.xml b/doc/guide/files/faq.xml
index b8af8ed374b..9cb1cb7c7da 100644
--- a/doc/guide/files/faq.xml
+++ b/doc/guide/files/faq.xml
@@ -1,4 +1,4 @@
-<!-- $NetBSD: faq.xml,v 1.3 2005/01/11 15:47:00 xtraeme Exp $ -->
+<!-- $NetBSD: faq.xml,v 1.4 2005/01/11 16:05:20 wiz Exp $ -->
 
 <chapter id="faq"> <?dbhtml filename="faq.html"?>
   <title>Frequently Asked Questions</title>
@@ -203,13 +203,18 @@
 </sect1>
 
 <sect1>
-    <title>How to resume transferencies with pkgsrc?</title>
+    <title>How to resume transfers when fetching distfiles?</title>
 
-    <para>By default resuming transferencies in pkgsrc is disabled, but you
-	can enable this feature adding the option 
+    <para>By default resuming transfers in pkgsrc is disabled, but you
+	can enable this feature by adding the option 
 	<varname>PKG_RESUME_TRANSFERS=YES</varname> into 
-	<filename>mk.conf</filename>, if a previous transfer wasn't 
-	completed, it will try to resume it saving your bandwidth.</para>
+	<filename>/etc/mk.conf</filename>. If, during a fetch step, an
+	incomplete distfile is found, pkgsrc will try to resume it.</para>
+    <para>You can also use a different program than the default 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>
     <para>For example, if you want to use <filename>wget</filename> to
 	resume downloads, you'll have to use something like:</para>
 
@@ -222,9 +227,6 @@
 	.endif
     </programlisting>
 
-    <para>Don't forget to set <varname>FETCH_RESUME_ARGS</varname> and
-	<varname>FETCH_OUTPUT_ARGS</varname> if you are not using default
-	values.</para>
 </sect1>
 
 <sect1>
@@ -233,7 +235,7 @@
     <para> If you want to use XFree86 from pkgsrc instead of your
       system's own X11 (<filename>/usr/X11R6</filename>,
       <filename>/usr/openwin</filename>, ...), you will have to 
-      add the following line into <filename>mk.conf</filename>:
+      add the following line into <filename>/etc/mk.conf</filename>:
       </para>
 
     <programlisting>
@@ -248,7 +250,7 @@
     <para> If you want to use X.org from pkgsrc instead of your system's
       own X11 (<filename>/usr/X11R6</filename>,
       <filename>/usr/openwin</filename>, ...) you will have to add the
-      following line into <filename>mk.conf</filename>: </para>
+      following line into <filename>/etc/mk.conf</filename>: </para>
 
     <programlisting>
       X11_TYPE=xorg
@@ -548,7 +550,7 @@ CONF_FILES=   ${EGDIR}/Muttrc ${PKG_SYSCONFDIR}/Muttrc</programlisting>
 
     <screen>
 ===========================================================================
-$NetBSD: faq.xml,v 1.3 2005/01/11 15:47:00 xtraeme Exp $
+$NetBSD: faq.xml,v 1.4 2005/01/11 16:05:20 wiz Exp $
 
 You may wish to have the vulnerabilities file downloaded daily so that
 it remains current.  This may be done by adding an appropriate entry