regen

1 files changed, 39 insertions, 23 deletions

diff --git a/doc/pkgsrc.html b/doc/pkgsrc.html
index f5738024805..5268fb22b18 100644
--- a/doc/pkgsrc.html
+++ b/doc/pkgsrc.html
@@ -64,7 +64,7 @@
 <dd><dl>
 <dt><span class="sect1"><a href="#getting-first">2.1. Getting pkgsrc for the first time</a></span></dt>
 <dd><dl>
-<dt><span class="sect2"><a href="#getting-via-tar">2.1.1. As tar file</a></span></dt>
+<dt><span class="sect2"><a href="#getting-via-tar">2.1.1. As tar archive</a></span></dt>
 <dt><span class="sect2"><a href="#getting-via-cvs">2.1.2. Via anonymous CVS</a></span></dt>
 </dl></dd>
 <dt><span class="sect1"><a href="#uptodate">2.2. Keeping pkgsrc up-to-date</a></span></dt>
@@ -799,7 +799,7 @@ minutes!</p>
 <dd><dl>
 <dt><span class="sect1"><a href="#getting-first">2.1. Getting pkgsrc for the first time</a></span></dt>
 <dd><dl>
-<dt><span class="sect2"><a href="#getting-via-tar">2.1.1. As tar file</a></span></dt>
+<dt><span class="sect2"><a href="#getting-via-tar">2.1.1. As tar archive</a></span></dt>
 <dt><span class="sect2"><a href="#getting-via-cvs">2.1.2. Via anonymous CVS</a></span></dt>
 </dl></dd>
 <dt><span class="sect1"><a href="#uptodate">2.2. Keeping pkgsrc up-to-date</a></span></dt>
@@ -923,7 +923,7 @@ builds)</a></span></dt>
 <dl>
 <dt><span class="sect1"><a href="#getting-first">2.1. Getting pkgsrc for the first time</a></span></dt>
 <dd><dl>
-<dt><span class="sect2"><a href="#getting-via-tar">2.1.1. As tar file</a></span></dt>
+<dt><span class="sect2"><a href="#getting-via-tar">2.1.1. As tar archive</a></span></dt>
 <dt><span class="sect2"><a href="#getting-via-cvs">2.1.2. Via anonymous CVS</a></span></dt>
 </dl></dd>
 <dt><span class="sect1"><a href="#uptodate">2.2. Keeping pkgsrc up-to-date</a></span></dt>
@@ -954,16 +954,30 @@ and dashes.</p>
 <p>The second step is to decide <span class="emphasis"><em>how</em></span> you
 	want to download pkgsrc. You can get it as a tar file or via CVS.
 	Both ways are described here.</p>
+<p>Note that tar archive contains CVS working copy.
+	Thus you can switch to using CVS at any later time.</p>
+<p>Note also that quarterly branch is not frozen in stone.
+	It receives critical updates.</p>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="getting-via-tar"></a>2.1.1. As tar file</h3></div></div></div>
+<a name="getting-via-tar"></a>2.1.1. As tar archive</h3></div></div></div>
 <p>The primary download location for all pkgsrc files is
-	<a class="ulink" href="ftp://ftp.NetBSD.org/pub/pkgsrc/" target="_top">ftp://ftp.NetBSD.org/pub/pkgsrc/</a>. There are a
-	number of subdirectories for different purposes, which are
-	described in detail in <a class="xref" href="#ftp-layout" title="Appendix C. Directory layout of the pkgsrc FTP server">Appendix C, <i>Directory layout of the pkgsrc FTP server</i></a>.</p>
-<p>The tar file for the current branch is in the directory
-	<code class="filename">current</code> and is called <a class="ulink" href="ftp://ftp.NetBSD.org/pub/pkgsrc/current/pkgsrc.tar.gz" target="_top"><code class="filename">pkgsrc.tar.gz</code></a>.
+	<a class="ulink" href="http://ftp.NetBSD.org/pub/pkgsrc/" target="_top">http://ftp.NetBSD.org/pub/pkgsrc/</a> or
+	<a class="ulink" href="ftp://ftp.NetBSD.org/pub/pkgsrc/" target="_top">ftp://ftp.NetBSD.org/pub/pkgsrc/</a>
+	(it points to the same location).
+	There are a number of subdirectories for different purposes,
+	which are described in detail in <a class="xref" href="#ftp-layout" title="Appendix C. Directory layout of the pkgsrc FTP server">Appendix C, <i>Directory layout of the pkgsrc FTP server</i></a>.</p>
+<p>The tar archive for the current branch is in the directory
+	<code class="filename">current</code> and is called <a class="ulink" href="http://ftp.NetBSD.org/pub/pkgsrc/current/pkgsrc.tar.gz" target="_top"><code class="filename">pkgsrc.tar.gz</code></a>.
 	It is autogenerated daily.</p>
+<p>To save download time we provide bzip2- and
+	xz-compressed archives which are published at
+	<a class="ulink" href="http://ftp.NetBSD.org/pub/pkgsrc/current/pkgsrc.tar.bz2" target="_top"><code class="filename">pkgsrc.tar.bz2</code></a>
+	and
+	<a class="ulink" href="http://ftp.NetBSD.org/pub/pkgsrc/current/pkgsrc.tar.xz" target="_top"><code class="filename">pkgsrc.tar.xz</code></a>
+	respectively.
+	</p>
+<p>You can fetch the same files using FTP.</p>
 <p>The tar file for the stable branch 2009Q1 is in the
 	directory <code class="filename">pkgsrc-2009Q1</code> and is also called <a class="ulink" href="ftp://ftp.NetBSD.org/pub/pkgsrc/pkgsrc-2009Q1/pkgsrc-2009Q1.tar.gz" target="_top"><code class="filename">pkgsrc-2009Q1.tar.gz</code></a>.</p>
 <p>To download a pkgsrc stable tarball, run:</p>
@@ -972,6 +986,8 @@ and dashes.</p>
 <p>Where <em class="replaceable"><code>pkgsrc-20xxQy</code></em> is the
 	stable branch to be downloaded, for example, 
 	<span class="quote">&#8220;<span class="quote">pkgsrc-2009Q1</span>&#8221;</span>.</p>
+<p>You can use fetch it also using "wget", "curl",
+	or your web browser.</p>
 <p>Then, extract it with:</p>
 <pre class="screen"><code class="prompt">$</code> <strong class="userinput"><code>tar -xzf <em class="replaceable"><code>pkgsrc-20xxQy</code></em>.tar.gz -C /usr</code></strong></pre>
 <p>This will create the directory <code class="filename">pkgsrc/</code>
@@ -7642,7 +7658,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="idm76241488"></a><dl>
+<a name="idm30189572"></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
@@ -7661,7 +7677,7 @@ TOOLS_PLATFORM.true?=           true                    # shell builtin
 <tbody>
 <tr class="question">
 <td align="left" valign="top">
-<a name="tools.new"></a><a name="idm76241104"></a><p><b>18.4.1.</b></p>
+<a name="tools.new"></a><a name="idm30189380"></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>
@@ -7671,7 +7687,7 @@ TOOLS_PLATFORM.true?=           true                    # shell builtin
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="tools.listall"></a><a name="idm76240080"></a><p><b>18.4.2.</b></p>
+<a name="tools.listall"></a><a name="idm30188868"></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>
@@ -7682,7 +7698,7 @@ TOOLS_PLATFORM.true?=           true                    # shell builtin
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="tools.used"></a><a name="idm76239056"></a><p><b>18.4.3.</b></p>
+<a name="tools.used"></a><a name="idm30188356"></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
@@ -9729,7 +9745,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="idm77784272"></a><dl>
+<a name="idm29880324"></a><dl>
 <dt>22.1. <a href="#devfaq.makeflags">What is the difference between
 	MAKEFLAGS, .MAKEFLAGS and
 	MAKE_FLAGS?</a>
@@ -9774,7 +9790,7 @@ do?</a>
 <tbody>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.makeflags"></a><a name="idm77783888"></a><p><b>22.1.</b></p>
+<a name="devfaq.makeflags"></a><a name="idm29880132"></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
@@ -9790,7 +9806,7 @@ do?</a>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.make"></a><a name="idm77779920"></a><p><b>22.2.</b></p>
+<a name="devfaq.make"></a><a name="idm29873860"></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
@@ -9808,7 +9824,7 @@ do?</a>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.cc"></a><a name="idm77775440"></a><p><b>22.3.</b></p>
+<a name="devfaq.cc"></a><a name="idm29871620"></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
@@ -9826,7 +9842,7 @@ do?</a>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.bl3flags"></a><a name="idm77771344"></a><p><b>22.4.</b></p>
+<a name="devfaq.bl3flags"></a><a name="idm29869444"></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>,
@@ -9839,7 +9855,7 @@ do?</a>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.bl3prefix"></a><a name="idm77769040"></a><p><b>22.5.</b></p>
+<a name="devfaq.bl3prefix"></a><a name="idm29868356"></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>
@@ -9855,7 +9871,7 @@ do?</a>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.master_sites"></a><a name="idm77765968"></a><p><b>22.6.</b></p>
+<a name="devfaq.master_sites"></a><a name="idm29866756"></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
@@ -9879,7 +9895,7 @@ do?</a>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.mailinglists"></a><a name="idm77749712"></a><p><b>22.7.</b></p>
+<a name="devfaq.mailinglists"></a><a name="idm29862788"></a><p><b>22.7.</b></p>
 </td>
 <td align="left" valign="top"><p>Which mailing lists are there for package
 	developers?</p></td>
@@ -9904,7 +9920,7 @@ do?</a>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.documentation"></a><a name="idm77746000"></a><p><b>22.8.</b></p>
+<a name="devfaq.documentation"></a><a name="idm29860740"></a><p><b>22.8.</b></p>
 </td>
 <td align="left" valign="top"><p>Where is the pkgsrc
 	documentation?</p></td>
@@ -9952,7 +9968,7 @@ do?</a>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.too-much-time"></a><a name="idm77739472"></a><p><b>22.9.</b></p>
+<a name="devfaq.too-much-time"></a><a name="idm29857476"></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>