regen

2 files changed, 23 insertions, 23 deletions

diff --git a/doc/pkgsrc.html b/doc/pkgsrc.html
index 7d6bf5a123b..75f4935c61c 100644
--- a/doc/pkgsrc.html
+++ b/doc/pkgsrc.html
@@ -2900,7 +2900,7 @@ fi
 </li>
 <li class="step">
 <p><code class="filename">/usr/src</code> (system sources,
-	  e.&nbsp;g. for <a href="ftp://ftp.NetBSD.org/pub/pkgsrc/current/pkgsrc/sysutils/aperture/README.html" target="_top"><code class="filename">sysutils/aperture</code></a>):</p>
+          rarely used by packages if at all:</p>
 <pre class="screen"><code class="prompt">#</code> <strong class="userinput"><code>ln -s ../disk1/cvs .</code></strong>
 	  <code class="prompt">#</code> <strong class="userinput"><code>ln -s cvs/src-2.0 src</code></strong></pre>
 </li>
@@ -3438,7 +3438,7 @@ enable this feature by adding the option
 <a class="link" href="#mk.conf"><code class="filename">mk.conf</code></a>.  If, during a fetch step, an incomplete
 distfile is found, pkgsrc will try to resume it.</p>
 <p>You can also
-use a different program than the default <a class="citerefentry" href="http://netbsd.gw.com/cgi-bin/man-cgi?ftp+1+NetBSD-5.0.1+i386"><span class="citerefentry"><span class="refentrytitle">ftp</span>(1)</span></a> by changing the
+use a different program than the platform default program by changing the
 <code class="varname">FETCH_USING</code> 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
@@ -7707,7 +7707,7 @@ TOOLS_PLATFORM.true?=           true                    # shell builtin
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
 <a name="tools.questions"></a>18.4. Questions regarding the tools</h2></div></div></div>
 <div class="qandaset">
-<a name="idm28300100"></a><dl>
+<a name="idm73076160"></a><dl>
 <dt>18.4.1. <a href="#tools.new">How do I add a new tool?</a>
 </dt>
 <dt>18.4.2. <a href="#tools.listall">How do I get a list of all available
@@ -7726,7 +7726,7 @@ TOOLS_PLATFORM.true?=           true                    # shell builtin
 <tbody>
 <tr class="question">
 <td align="left" valign="top">
-<a name="tools.new"></a><a name="idm28299908"></a><p><b>18.4.1.</b></p>
+<a name="tools.new"></a><a name="idm73075776"></a><p><b>18.4.1.</b></p>
 </td>
 <td align="left" valign="top"><p>How do I add a new tool?</p></td>
 </tr>
@@ -7736,7 +7736,7 @@ TOOLS_PLATFORM.true?=           true                    # shell builtin
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="tools.listall"></a><a name="idm28299396"></a><p><b>18.4.2.</b></p>
+<a name="tools.listall"></a><a name="idm73074752"></a><p><b>18.4.2.</b></p>
 </td>
 <td align="left" valign="top"><p>How do I get a list of all available
 	tools?</p></td>
@@ -7747,7 +7747,7 @@ TOOLS_PLATFORM.true?=           true                    # shell builtin
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="tools.used"></a><a name="idm28298884"></a><p><b>18.4.3.</b></p>
+<a name="tools.used"></a><a name="idm73073728"></a><p><b>18.4.3.</b></p>
 </td>
 <td align="left" valign="top"><p>How can I get a list of all the tools that a
 	package is using while being built? I want to know whether it
@@ -9822,7 +9822,7 @@ place.</p></li>
 	and if you still don't have the answer, ask on the
 	<code class="literal">pkgsrc-users</code> mailing list.</p>
 <div class="qandaset">
-<a name="idm30076164"></a><dl>
+<a name="idm74599872"></a><dl>
 <dt>22.1. <a href="#devfaq.makeflags">What is the difference between
 	MAKEFLAGS, .MAKEFLAGS and
 	MAKE_FLAGS?</a>
@@ -9867,7 +9867,7 @@ do?</a>
 <tbody>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.makeflags"></a><a name="idm30075972"></a><p><b>22.1.</b></p>
+<a name="devfaq.makeflags"></a><a name="idm74599488"></a><p><b>22.1.</b></p>
 </td>
 <td align="left" valign="top"><p>What is the difference between
 	<code class="varname">MAKEFLAGS</code>, <code class="varname">.MAKEFLAGS</code> and
@@ -9883,7 +9883,7 @@ do?</a>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.make"></a><a name="idm30073860"></a><p><b>22.2.</b></p>
+<a name="devfaq.make"></a><a name="idm74595392"></a><p><b>22.2.</b></p>
 </td>
 <td align="left" valign="top"><p>What is the difference between
 	<code class="varname">MAKE</code>, <code class="varname">GMAKE</code> and
@@ -9901,7 +9901,7 @@ do?</a>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.cc"></a><a name="idm30071556"></a><p><b>22.3.</b></p>
+<a name="devfaq.cc"></a><a name="idm74591040"></a><p><b>22.3.</b></p>
 </td>
 <td align="left" valign="top"><p>What is the difference between
 	<code class="varname">CC</code>, <code class="varname">PKG_CC</code> and
@@ -9919,7 +9919,7 @@ do?</a>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.bl3flags"></a><a name="idm30069444"></a><p><b>22.4.</b></p>
+<a name="devfaq.bl3flags"></a><a name="idm74586816"></a><p><b>22.4.</b></p>
 </td>
 <td align="left" valign="top"><p>What is the difference between
 	<code class="varname">BUILDLINK_LDFLAGS</code>,
@@ -9932,7 +9932,7 @@ do?</a>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.bl3prefix"></a><a name="idm30068356"></a><p><b>22.5.</b></p>
+<a name="devfaq.bl3prefix"></a><a name="idm74584640"></a><p><b>22.5.</b></p>
 </td>
 <td align="left" valign="top"><p>Why does <span class="command"><strong>make show-var
 	VARNAME=BUILDLINK_PREFIX.<em class="replaceable"><code>foo</code></em></strong></span>
@@ -9948,7 +9948,7 @@ do?</a>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.master_sites"></a><a name="idm30066756"></a><p><b>22.6.</b></p>
+<a name="devfaq.master_sites"></a><a name="idm74581568"></a><p><b>22.6.</b></p>
 </td>
 <td align="left" valign="top"><p>What does
 	<code class="literal">${MASTER_SITE_SOURCEFORGE:=package/}</code> mean? I
@@ -9972,7 +9972,7 @@ do?</a>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.mailinglists"></a><a name="idm30054596"></a><p><b>22.7.</b></p>
+<a name="devfaq.mailinglists"></a><a name="idm74573504"></a><p><b>22.7.</b></p>
 </td>
 <td align="left" valign="top"><p>Which mailing lists are there for package
 	developers?</p></td>
@@ -9997,7 +9997,7 @@ do?</a>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.documentation"></a><a name="idm30052548"></a><p><b>22.8.</b></p>
+<a name="devfaq.documentation"></a><a name="idm74569664"></a><p><b>22.8.</b></p>
 </td>
 <td align="left" valign="top"><p>Where is the pkgsrc
 	documentation?</p></td>
@@ -10045,7 +10045,7 @@ do?</a>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.too-much-time"></a><a name="idm30049284"></a><p><b>22.9.</b></p>
+<a name="devfaq.too-much-time"></a><a name="idm74554944"></a><p><b>22.9.</b></p>
 </td>
 <td align="left" valign="top"><p>I have a little time to kill.  What shall I
 do?</p></td>
diff --git a/doc/pkgsrc.txt b/doc/pkgsrc.txt
index 5624775fa87..794d8adb13b 100644
--- a/doc/pkgsrc.txt
+++ b/doc/pkgsrc.txt
@@ -2474,7 +2474,7 @@ src/etc, be sure the following items are present and properly configured:
 
     # ln -sf /usr/share/zoneinfo/UTC /usr/sandbox/etc/localtime
 
- 6. /usr/src (system sources, e. g. for sysutils/aperture):
+ 6. /usr/src (system sources, rarely used by packages if at all:
 
     # ln -s ../disk1/cvs .
               # ln -s cvs/src-2.0 src
@@ -3000,12 +3000,12 @@ By default, resuming transfers in pkgsrc is disabled, but you can enable this
 feature by adding the option PKG_RESUME_TRANSFERS=YES into mk.conf. If, during
 a fetch step, an incomplete distfile is found, pkgsrc will try to resume it.
 
-You can also use a different program than the default ftp(1) by changing the
-FETCH_USING 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 FETCH_CMD, FETCH_BEFORE_ARGS,
-FETCH_RESUME_ARGS, FETCH_OUTPUT_ARGS, FETCH_AFTER_ARGS.
+You can also use a different program than the platform default program by
+changing the FETCH_USING 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 FETCH_CMD,
+FETCH_BEFORE_ARGS, FETCH_RESUME_ARGS, FETCH_OUTPUT_ARGS, FETCH_AFTER_ARGS.
 
 For example, if you want to use wget to download, you'll have to use something
 like: