[pkgsrc/trunk]: pkgsrc/doc/guide/files We are heading towards 2010, which mak...

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/045231ad8305
branches:  trunk
changeset: 565999:045231ad8305
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sun Oct 11 20:50:48 2009 +0000

description:
We are heading towards 2010, which makes year references like
200x obsolete.

diffstat:

 doc/guide/files/bulk.xml       |  12 ++++++------
 doc/guide/files/ftp-layout.xml |   8 ++++----
 doc/guide/files/getting.xml    |  14 +++++++-------
 3 files changed, 17 insertions(+), 17 deletions(-)

diffs (131 lines):

diff -r c4745d4ad5df -r 045231ad8305 doc/guide/files/bulk.xml
--- a/doc/guide/files/bulk.xml  Sun Oct 11 20:45:45 2009 +0000
+++ b/doc/guide/files/bulk.xml  Sun Oct 11 20:50:48 2009 +0000
@@ -1,4 +1,4 @@
-<!-- $NetBSD: bulk.xml,v 1.6 2009/06/14 15:17:10 joerg Exp $ -->
+<!-- $NetBSD: bulk.xml,v 1.7 2009/10/11 20:50:48 rillig Exp $ -->
 
 <chapter id="bulk">
 <title>Creating binary packages for everything in pkgsrc (bulk
@@ -529,21 +529,21 @@
       set properly in your <filename>mk/bulk/build.conf</filename>
       file, i.e. adjust it to something like one of the following:</para>
 
-      <screen>RSYNC_DST=ftp.NetBSD.org:/pub/NetBSD/packages/packages-200xQy/NetBSD-a.b.c/arch/upload </screen>
+      <screen>RSYNC_DST=ftp.NetBSD.org:/pub/NetBSD/packages/packages-20xxQy/NetBSD-a.b.c/arch/upload </screen>
 
-      <para>Please use appropriate values for "packages-200xQy",
+      <para>Please use appropriate values for "packages-20xxQy",
       "NetBSD-a.b.c" and "arch" here. If your login on ftp.NetBSD.org
       is different from your local login, write your login directly
       into the variable, e.g. my local account is "feyrer", but for my
       login "hubertf", I use:</para>
 
-      <screen>RSYNC_DST=hubertf%ftp.NetBSD.org@localhost:/pub/NetBSD/packages/packages-200xQy/NetBSD-a.b.c/arch/upload</screen>
+      <screen>RSYNC_DST=hubertf%ftp.NetBSD.org@localhost:/pub/NetBSD/packages/packages-20xxQy/NetBSD-a.b.c/arch/upload</screen>
 
       <para>A separate <filename>upload</filename> directory is used
       here to allow "closing" the directory during upload. To do
       so, run the following command on ftp.NetBSD.org next:</para>
 
-      <screen>nbftp% <userinput>mkdir -p -m 750 /pub/NetBSD/packages/packages-200xQy/NetBSD-a.b.c/arch/upload</userinput></screen>
+      <screen>nbftp% <userinput>mkdir -p -m 750 /pub/NetBSD/packages/packages-20xxQy/NetBSD-a.b.c/arch/upload</userinput></screen>
 
       <para>Please note that <filename>/pub/NetBSD/packages</filename> is
       only appropriate for packages for the NetBSD operating
@@ -599,7 +599,7 @@
       to everyone:</para>
 
       <screen>
-nbftp% <userinput>cd /pub/NetBSD/packages/packages-200xQy/NetBSD-a.b.c/arch</userinput>
+nbftp% <userinput>cd /pub/NetBSD/packages/packages-20xxQy/NetBSD-a.b.c/arch</userinput>
 nbftp% <userinput>mv upload/* .</userinput>
 nbftp% <userinput>rmdir upload</userinput>
 nbftp% <userinput>chmod 755 .</userinput>
diff -r c4745d4ad5df -r 045231ad8305 doc/guide/files/ftp-layout.xml
--- a/doc/guide/files/ftp-layout.xml    Sun Oct 11 20:45:45 2009 +0000
+++ b/doc/guide/files/ftp-layout.xml    Sun Oct 11 20:50:48 2009 +0000
@@ -1,4 +1,4 @@
-<!-- $NetBSD: ftp-layout.xml,v 1.12 2009/10/11 20:45:45 rillig Exp $ -->
+<!-- $NetBSD: ftp-layout.xml,v 1.13 2009/10/11 20:50:48 rillig Exp $ -->
 
 <appendix id="ftp-layout">
 <title>Directory layout of the pkgsrc FTP server</title>
@@ -62,7 +62,7 @@
        <literal>4.99.x</literal>.</para></listitem>
 
        <listitem><para><varname>TAG</varname> is either
-       <literal>200<replaceable>x</replaceable>Q<replaceable>y</replaceable></literal>
+       <literal>20<replaceable>xx</replaceable>Q<replaceable>y</replaceable></literal>
        for a stable branch, or <literal>head</literal> for packages
        built from the HEAD branch. The latter should only be used when
        the packages are updated on a regular basis. Otherwise the date
@@ -98,7 +98,7 @@
 </sect1>
 <sect1 id="ftp-source">
 <title><filename>current</filename>,
-<filename>pkgsrc-200<replaceable>x</replaceable>Q<replaceable>y</replaceable></filename>:
+<filename>pkgsrc-20<replaceable>xx</replaceable>Q<replaceable>y</replaceable></filename>:
 source packages</title>
 
        <para>These directories contain the <quote>real</quote> pkgsrc,
@@ -112,7 +112,7 @@
 
        <para>In the directories for the quarterly branches, there is an
        additional file called
-       <filename>pkgsrc-200<replaceable>x</replaceable>Q<replaceable>y</replaceable>.tar.gz</filename>,
+       <filename>pkgsrc-20<replaceable>xx</replaceable>Q<replaceable>y</replaceable>.tar.gz</filename>,
        which contains the state of pkgsrc when it was branched.</para>
 
 </sect1>
diff -r c4745d4ad5df -r 045231ad8305 doc/guide/files/getting.xml
--- a/doc/guide/files/getting.xml       Sun Oct 11 20:45:45 2009 +0000
+++ b/doc/guide/files/getting.xml       Sun Oct 11 20:50:48 2009 +0000
@@ -1,4 +1,4 @@
-<!-- $NetBSD: getting.xml,v 1.24 2009/05/13 10:49:00 wiz Exp $ -->
+<!-- $NetBSD: getting.xml,v 1.25 2009/10/11 20:50:48 rillig Exp $ -->
 
 <chapter id="getting">
 <title>Where to get pkgsrc and how to keep it up-to-date</title>
@@ -47,9 +47,9 @@
        <para>To download a pkgsrc stable tarball, run:</para>
 
 <screen>
-&uprompt; <userinput>ftp ftp://ftp.NetBSD.org/pub/pkgsrc/<replaceable>pkgsrc-200xQy</replaceable>/<replaceable>pkgsrc-200xQy</replaceable>.tar.gz</userinput></screen>
+&uprompt; <userinput>ftp ftp://ftp.NetBSD.org/pub/pkgsrc/<replaceable>pkgsrc-20xxQy</replaceable>/<replaceable>pkgsrc-20xxQy</replaceable>.tar.gz</userinput></screen>
 
-       <para>Where <replaceable>pkgsrc-200xQy</replaceable> is the
+       <para>Where <replaceable>pkgsrc-20xxQy</replaceable> is the
        stable branch to be downloaded, for example, 
        <quote>pkgsrc-2009Q1</quote>.</para>
 <!--
@@ -60,7 +60,7 @@
 -->
        <para>Then, extract it with:</para>
 
-<screen>&uprompt; <userinput>tar -xzf <replaceable>pkgsrc-200xQy</replaceable>.tar.gz -C /usr</userinput></screen>
+<screen>&uprompt; <userinput>tar -xzf <replaceable>pkgsrc-20xxQy</replaceable>.tar.gz -C /usr</userinput></screen>
 
        <para>This will create the directory <filename>pkgsrc/</filename>
        in <filename>/usr/</filename> and all the package source will be 
@@ -130,9 +130,9 @@
 <para>To fetch a specific pkgsrc stable branch from scratch, run:</para>
 
 <screen>&uprompt; <userinput>cd /usr</userinput>
-&uprompt; <userinput>cvs checkout -r <replaceable>pkgsrc-200xQy</replaceable> -P pkgsrc</userinput></screen>
+&uprompt; <userinput>cvs checkout -r <replaceable>pkgsrc-20xxQy</replaceable> -P pkgsrc</userinput></screen>
 
-       <para>Where <replaceable>pkgsrc-200xQy</replaceable> is the stable 
+       <para>Where <replaceable>pkgsrc-20xxQy</replaceable> is the stable 
        branch to be checked out, for example, <quote>pkgsrc-2009Q1</quote></para>
 
        <para>This will create the directory <filename>pkgsrc/</filename> 
@@ -198,7 +198,7 @@
        by adding the option <quote>-A</quote> after the
        <quote>update</quote> keyword. To switch from the current branch
        back to the stable branch, add the
-       <quote>-rpkgsrc-2009Q1</quote> option.</para>
+       <quote>-rpkgsrc-2009Q3</quote> option.</para>
 
 </sect3>
 <sect3 id="uptodate-cvs-changes">