Sync with the real. Apply patch provided by kano@.

4 files changed, 18 insertions, 18 deletions

diff --git a/doc/guide/files/binary.xml b/doc/guide/files/binary.xml
index 7789137489f..ca14d0acec2 100644
--- a/doc/guide/files/binary.xml
+++ b/doc/guide/files/binary.xml
@@ -1,4 +1,4 @@
-<!-- $NetBSD: binary.xml,v 1.28 2006/10/13 21:21:11 wiz Exp $ -->
+<!-- $NetBSD: binary.xml,v 1.29 2006/11/23 11:42:54 yyamano Exp $ -->
 
 <chapter id="binary">
   <title>Creating binary packages</title>
@@ -493,21 +493,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/pkgsrc-200xQy/NetBSD-a.b.c/arch/upload </screen>
+      <screen>RSYNC_DST=ftp.NetBSD.org:/pub/NetBSD/packages/packages-200xQy/NetBSD-a.b.c/arch/upload </screen>
 
-      <para>Please use appropriate values for "pkgsrc-200xQy",
+      <para>Please use appropriate values for "packages-200xQy",
       "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:/pub/NetBSD/packages/pkgsrc-200xQy/NetBSD-a.b.c/arch/upload</screen>
+      <screen>RSYNC_DST=hubertf@ftp.NetBSD.org:/pub/NetBSD/packages/packages-200xQy/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/pkgsrc-200xQy/NetBSD-a.b.c/arch/upload</userinput></screen>
+      <screen>nbftp% <userinput>mkdir -p -m 750 /pub/NetBSD/packages/packages-200xQy/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
@@ -563,7 +563,7 @@ chroot-&rprompt; <userinput>exit</userinput>
       to everyone:</para>
 
       <screen>
-nbftp% <userinput>cd /pub/NetBSD/packages/pkgsrc-200xQy/NetBSD-a.b.c/arch</userinput>
+nbftp% <userinput>cd /pub/NetBSD/packages/packages-200xQy/NetBSD-a.b.c/arch</userinput>
 nbftp% <userinput>mv upload/* .</userinput>
 nbftp% <userinput>rmdir upload</userinput>
 nbftp% <userinput>chmod 755 .</userinput>
diff --git a/doc/guide/files/files.xml b/doc/guide/files/files.xml
index 2b2a1bef6ea..7315ba88b56 100644
--- a/doc/guide/files/files.xml
+++ b/doc/guide/files/files.xml
@@ -1,4 +1,4 @@
-<!-- $NetBSD: files.xml,v 1.3 2006/10/02 17:56:27 wiz Exp $ -->
+<!-- $NetBSD: files.xml,v 1.4 2006/11/23 11:44:47 yyamano Exp $ -->
 
 <chapter id="files">
 <title>Directory layout of the installed files</title>
@@ -20,7 +20,7 @@ are:</para>
     LOCALBASE=              /usr/pkg
     PKG_SYSCONFBASE=        /usr/pkg/etc
     VARBASE=                /var
-    PKGDBDIR=               /var/db/pkg
+    PKG_DBDIR=              /var/db/pkg
 </programlisting>
 
 <para>In unprivileged mode (when pkgsrc has been installed as any other
@@ -30,7 +30,7 @@ user), the default locations are:</para>
     LOCALBASE=              ${HOME}/pkg
     PKG_SYSCONFBASE=        ${HOME}/pkg/etc
     VARBASE=                ${HOME}/pkg/var
-    PKGDBDIR=               ${HOME}/pkg/var/db/pkg
+    PKG_DBDIR=              ${HOME}/pkg/var/db/pkg
 </programlisting>
 
 <para>What these four directories are for, and what they look like is
diff --git a/doc/guide/files/ftp-layout.xml b/doc/guide/files/ftp-layout.xml
index 6c2789807cd..73fda9c7acb 100644
--- a/doc/guide/files/ftp-layout.xml
+++ b/doc/guide/files/ftp-layout.xml
@@ -1,4 +1,4 @@
-<!-- $NetBSD: ftp-layout.xml,v 1.6 2006/09/18 12:16:25 rillig Exp $ -->
+<!-- $NetBSD: ftp-layout.xml,v 1.7 2006/11/23 11:42:54 yyamano Exp $ -->
 
 <appendix id="ftp-layout">
 <title>Directory layout of the pkgsrc FTP server</title>
@@ -70,7 +70,7 @@
 </sect1>
 <sect1 id="ftp-source">
 <title><filename>current</filename>,
-<filename>200<replaceable>x</replaceable>Q<replaceable>y</replaceable></filename>:
+<filename>pkgsrc-200<replaceable>x</replaceable>Q<replaceable>y</replaceable></filename>:
 source packages</title>
 
 	<para>These directories contain the <quote>real</quote> pkgsrc,
diff --git a/doc/guide/files/getting.xml b/doc/guide/files/getting.xml
index fe59d5e8425..d36b782843b 100644
--- a/doc/guide/files/getting.xml
+++ b/doc/guide/files/getting.xml
@@ -1,4 +1,4 @@
-<!-- $NetBSD: getting.xml,v 1.14 2006/10/21 11:57:11 rillig Exp $ -->
+<!-- $NetBSD: getting.xml,v 1.15 2006/11/23 11:42:54 yyamano Exp $ -->
 
 <chapter id="getting">
 <title>Where to get pkgsrc and how to keep it up-to-date</title>
@@ -21,7 +21,7 @@ and dashes.</para>
 	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
-	<literal>2006Q1</literal>.</para>
+	<literal>2006Q3</literal>.</para>
 
 	<para>The second step is to decide <emphasis>how</emphasis> you
 	want to download pkgsrc. You can get it as a tar file, via SUP,
@@ -40,9 +40,9 @@ and dashes.</para>
 	url="ftp://ftp.NetBSD.org/pub/pkgsrc/current/pkgsrc.tar.gz"><filename>pkgsrc.tar.gz</filename></ulink>.
 	It is autogenerated daily.</para>
 
-	<para>The tar file for the stable branch 2006Q1 is in the
-	directory <filename>2006Q1</filename> and is also called <ulink
-	url="ftp://ftp.NetBSD.org/pub/pkgsrc/2006Q1/pkgsrc.tar.gz"><filename>pkgsrc.tar.gz</filename></ulink>.</para>
+	<para>The tar file for the stable branch 2006Q3 is in the
+	directory <filename>pkgsrc-2006Q3</filename> and is also called <ulink
+	url="ftp://ftp.NetBSD.org/pub/pkgsrc/pkgsrc-2006Q3/pkgsrc-2006Q3.tar.gz"><filename>pkgsrc-2006Q3.tar.gz</filename></ulink>.</para>
 
 	<para>After downloading the tar file, change to the directory
 	where you want to have pkgsrc. This is usually
@@ -94,7 +94,7 @@ and dashes.</para>
 	<filename>/usr</filename>. In that directory you run the
 	checkout command, which is <command>cvs -q checkout -P
 	pkgsrc</command> for the current branch and <command>cvs -q
-	checkout -rpkgsrc-2006Q1 -P pkgsrc</command> for the stable
+	checkout -rpkgsrc-2006Q3 -P pkgsrc</command> for the stable
 	branch. This command will create a directory called
 	<filename>pkgsrc</filename> with all the pkgsrc files in
 	it.</para>
@@ -151,7 +151,7 @@ and dashes.</para>
 	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-2006Q1</quote> option.</para>
+	<quote>-rpkgsrc-2006Q3</quote> option.</para>
 
 </sect3>
 <sect3 id="uptodate-cvs-changes">