regen

2 files changed, 30 insertions, 26 deletions

diff --git a/doc/pkgsrc.html b/doc/pkgsrc.html
index f5c9dddd724..40d4f754e00 100644
--- a/doc/pkgsrc.html
+++ b/doc/pkgsrc.html
@@ -932,7 +932,7 @@ and dashes.</p>
 	quarterly basis from the current branch and only gets modified
 	for security updates. The names of the stable branches are built
 	from the year and the quarter, for example
-	<code class="literal">2007Q4</code>.</p>
+	<code class="literal">2009Q1</code>.</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, via SUP,
 	or via CVS. All three ways are described here.</p>
@@ -946,14 +946,14 @@ and dashes.</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>.
 	It is autogenerated daily.</p>
-<p>The tar file for the stable branch 2007Q4 is in the
-	directory <code class="filename">pkgsrc-2007Q4</code> and is also called <a class="ulink" href="ftp://ftp.NetBSD.org/pub/pkgsrc/pkgsrc-2007Q4/pkgsrc-2007Q4.tar.gz" target="_top"><code class="filename">pkgsrc-2007Q4.tar.gz</code></a>.</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>
 <pre class="screen">
 <code class="prompt">$</code> <strong class="userinput"><code>ftp ftp://ftp.NetBSD.org/pub/pkgsrc/<em class="replaceable"><code>pkgsrc-200xQy</code></em>/<em class="replaceable"><code>pkgsrc-200xQy</code></em>.tar.gz</code></strong></pre>
 <p>Where <em class="replaceable"><code>pkgsrc-200xQy</code></em> is the
 	stable branch to be downloaded, for example, 
-	&#8220;<span class="quote">pkgsrc-2007Q4</span>&#8221;.</p>
+	&#8220;<span class="quote">pkgsrc-2009Q1</span>&#8221;.</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-200xQy</code></em>.tar.gz -C /usr</code></strong></pre>
 <p>This will create the directory <code class="filename">pkgsrc/</code>
@@ -1015,7 +1015,7 @@ rdiff -u
 <pre class="screen"><code class="prompt">$</code> <strong class="userinput"><code>cd /usr</code></strong>
 <code class="prompt">$</code> <strong class="userinput"><code>cvs checkout -r <em class="replaceable"><code>pkgsrc-200xQy</code></em> -P pkgsrc</code></strong></pre>
 <p>Where <em class="replaceable"><code>pkgsrc-200xQy</code></em> is the stable 
-	branch to be checked out, for example, &#8220;<span class="quote">pkgsrc-2007Q4</span>&#8221;</p>
+	branch to be checked out, for example, &#8220;<span class="quote">pkgsrc-2009Q1</span>&#8221;</p>
 <p>This will create the directory <code class="filename">pkgsrc/</code> 
 	in your <code class="filename">/usr/</code> directory and all the package source 
 	will be stored under <code class="filename">/usr/pkgsrc/</code>.</p>
@@ -1072,7 +1072,7 @@ rdiff -u
 	by adding the option &#8220;<span class="quote">-A</span>&#8221; after the
 	&#8220;<span class="quote">update</span>&#8221; keyword. To switch from the current branch
 	back to the stable branch, add the
-	&#8220;<span class="quote">-rpkgsrc-2007Q4</span>&#8221; option.</p>
+	&#8220;<span class="quote">-rpkgsrc-2009Q1</span>&#8221; option.</p>
 </div>
 <div class="sect3" lang="en">
 <div class="titlepage"><div><div><h4 class="title">
@@ -2558,7 +2558,7 @@ packages:</p>
 by a NetBSD developer on a trusted machine (that is, where you and only
 you have root access).</p></li>
 <li><p>Packages on ftp.NetBSD.org should only be created from
-the stable branches (like 2007Q1), so that users browsing the available
+the stable branches (like 2009Q1), so that users browsing the available
 collections can see at a glance how old the packages
 are.</p></li>
 <li><p>The packages must be built as root, since some packages
@@ -9492,8 +9492,11 @@ PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/Pg/.packlist
 	either with the <a class="citerefentry" href="http://netbsd.gw.com/cgi-bin/man-cgi?send-pr+1+NetBSD-current"><span class="citerefentry"><span class="refentrytitle">send-pr</span>(1)</span></a> command, or if you don't have
 	that, go to the web page
 	<a class="ulink" href="http://www.NetBSD.org/support/send-pr.html" target="_top">http://www.NetBSD.org/support/send-pr.html</a>,
-	which contains some instructions and a link to a form, where you
-	can submit packages.</p>
+	which contains some instructions and a link to a form where you
+	can submit packages.  The
+	<a href="ftp://ftp.NetBSD.org/pub/pkgsrc/current/pkgsrc/sysutils/gtk-send-pr/README.html" target="_top"><code class="filename">sysutils/gtk-send-pr</code></a> package is
+	also available as a substitute for either of the above two tools.
+	</p>
 <p>In the form of the problem report, the category should be
 	&#8220;<span class="quote">pkg</span>&#8221;, the synopsis should include the package name
 	and version number, and the description field should contain a
@@ -9708,7 +9711,7 @@ do?</a>
 <tbody>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.makeflags"></a><a name="id1168230286908"></a><p><b>22.1.</b></p>
+<a name="devfaq.makeflags"></a><a name="id1168230286914"></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
@@ -9724,7 +9727,7 @@ do?</a>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.make"></a><a name="id1168230286941"></a><p><b>22.2.</b></p>
+<a name="devfaq.make"></a><a name="id1168230286947"></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
@@ -9742,7 +9745,7 @@ do?</a>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.cc"></a><a name="id1168230286979"></a><p><b>22.3.</b></p>
+<a name="devfaq.cc"></a><a name="id1168230286984"></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
@@ -9760,7 +9763,7 @@ do?</a>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.bl3flags"></a><a name="id1168230287013"></a><p><b>22.4.</b></p>
+<a name="devfaq.bl3flags"></a><a name="id1168230287019"></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>,
@@ -9773,7 +9776,7 @@ do?</a>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.bl3prefix"></a><a name="id1168230287032"></a><p><b>22.5.</b></p>
+<a name="devfaq.bl3prefix"></a><a name="id1168230287037"></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>
@@ -9789,7 +9792,7 @@ do?</a>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.master_sites"></a><a name="id1168230287058"></a><p><b>22.6.</b></p>
+<a name="devfaq.master_sites"></a><a name="id1168230287063"></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
@@ -9813,7 +9816,7 @@ do?</a>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.mailinglists"></a><a name="id1168230287125"></a><p><b>22.7.</b></p>
+<a name="devfaq.mailinglists"></a><a name="id1168230287198"></a><p><b>22.7.</b></p>
 </td>
 <td align="left" valign="top"><p>Which mailing lists are there for package
 	developers?</p></td>
@@ -9838,7 +9841,7 @@ do?</a>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.documentation"></a><a name="id1168230287225"></a><p><b>22.8.</b></p>
+<a name="devfaq.documentation"></a><a name="id1168230287230"></a><p><b>22.8.</b></p>
 </td>
 <td align="left" valign="top"><p>Where is the pkgsrc
 	documentation?</p></td>
@@ -9886,7 +9889,7 @@ do?</a>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.too-much-time"></a><a name="id1168230287278"></a><p><b>22.9.</b></p>
+<a name="devfaq.too-much-time"></a><a name="id1168230287284"></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 696b2dd5390..a7e1fb9abaf 100644
--- a/doc/pkgsrc.txt
+++ b/doc/pkgsrc.txt
@@ -831,7 +831,7 @@ Before you download any pkgsrc files, you should decide whether you want the
 current branch or the stable branch. The latter is forked on a quarterly basis
 from the current branch and only gets modified for security updates. The names
 of the stable branches are built from the year and the quarter, for example
-2007Q4.
+2009Q1.
 
 The second step is to decide how you want to download pkgsrc. You can get it as
 a tar file, via SUP, or via CVS. All three ways are described here.
@@ -845,15 +845,15 @@ described in detail in Appendix C, Directory layout of the pkgsrc FTP server.
 The tar file for the current branch is in the directory current and is called
 pkgsrc.tar.gz. It is autogenerated daily.
 
-The tar file for the stable branch 2007Q4 is in the directory pkgsrc-2007Q4 and
-is also called pkgsrc-2007Q4.tar.gz.
+The tar file for the stable branch 2009Q1 is in the directory pkgsrc-2009Q1 and
+is also called pkgsrc-2009Q1.tar.gz.
 
 To download a pkgsrc stable tarball, run:
 
 $ ftp ftp://ftp.NetBSD.org/pub/pkgsrc/pkgsrc-200xQy/pkgsrc-200xQy.tar.gz
 
 Where pkgsrc-200xQy is the stable branch to be downloaded, for example,
-"pkgsrc-2007Q4".
+"pkgsrc-2009Q1".
 
 Then, extract it with:
 
@@ -911,7 +911,7 @@ $ cd /usr
 $ cvs checkout -r pkgsrc-200xQy -P pkgsrc
 
 Where pkgsrc-200xQy is the stable branch to be checked out, for example,
-"pkgsrc-2007Q4"
+"pkgsrc-2009Q1"
 
 This will create the directory pkgsrc/ in your /usr/ directory and all the
 package source will be stored under /usr/pkgsrc/.
@@ -962,7 +962,7 @@ When updating pkgsrc, the CVS program keeps track of the branch you selected.
 But if you, for whatever reason, want to switch from the stable branch to the
 current one, you can do it by adding the option "-A" after the "update"
 keyword. To switch from the current branch back to the stable branch, add the
-"-rpkgsrc-2007Q4" option.
+"-rpkgsrc-2009Q1" option.
 
 2.2.2.2. What happens to my changes when updating?
 
@@ -2211,7 +2211,7 @@ following points:
         root access).
 
       o Packages on ftp.NetBSD.org should only be created from the stable
-        branches (like 2007Q1), so that users browsing the available
+        branches (like 2009Q1), so that users browsing the available
         collections can see at a glance how old the packages are.
 
       o The packages must be built as root, since some packages require set-uid
@@ -7951,7 +7951,8 @@ uuencoded gzipped tar(1) archive that contains all files that make up the
 package. Finally, send this package to the pkgsrc bug tracking system, either
 with the send-pr(1) command, or if you don't have that, go to the web page
 http://www.NetBSD.org/support/send-pr.html, which contains some instructions
-and a link to a form, where you can submit packages.
+and a link to a form where you can submit packages. The sysutils/gtk-send-pr
+package is also available as a substitute for either of the above two tools.
 
 In the form of the problem report, the category should be "pkg", the synopsis
 should include the package name and version number, and the description field