[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: the pkgsrc guide の場所



In message <200608190103.KAA65136@shell.rim.or.jp>
  kano@na.rim.or.jp (OKANO Takayoshi) writes:
> あとは fixes.xml を 1.7 から 1.11 にすれば、
> htdocs にあった時代の最終版に追いつきます (一部のファイルは未訳のまま)。
> 
> 原文はその後、pkgsrc に移動しています。

以下の更新をしました。
  htdocs/Documentation/pkgsrc/binary.xml 1.3 -> pkgsrc/doc/guide/files/binary.xml 1.1
  htdocs/Documentation/pkgsrc/build.xml 1.5 -> pkgsrc/doc/guide/files/build.xml 1.1
  htdocs/Documentation/pkgsrc/components.xml 1.5 -> pkgsrc/doc/guide/files/components.xml 1.1
  htdocs/Documentation/pkgsrc/debug.xml 1.2 -> pkgsrc/doc/guide/files/debug.xml 1.1
  htdocs/Documentation/pkgsrc/examples.xml 1.2 -> pkgsrc/doc/guide/files/examples.xml 1.1
  htdocs/Documentation/pkgsrc/faq.xml 1.4 -> pkgsrc/doc/guide/files/faq.xml 1.1
  htdocs/Documentation/pkgsrc/fixes.xml 1.11 -> pkgsrc/doc/guide/files/fixes.xml 1.1
  htdocs/Documentation/pkgsrc/ftp-layout.xml 1.2 -> pkgsrc/doc/guide/files/ftp-layout.xml 1.1
  htdocs/Documentation/pkgsrc/getting.xml 1.1 -> pkgsrc/doc/guide/files/getting.xml 1.1
  htdocs/Documentation/pkgsrc/introduction.xml 1.2 -> pkgsrc/doc/guide/files/introduction.xml 1.1
  htdocs/Documentation/pkgsrc/logs.xml 1.3 -> pkgsrc/doc/guide/files/logs.xml 1.1
  htdocs/Documentation/pkgsrc/platforms.xml 1.6 -> pkgsrc/doc/guide/files/platforms.xml 1.1
  htdocs/Documentation/pkgsrc/plist.xml 1.3 -> pkgsrc/doc/guide/files/plist.xml 1.1
  htdocs/Documentation/pkgsrc/submit.xml 1.3 -> pkgsrc/doc/guide/files/submit.xml 1.1
  htdocs/Documentation/pkgsrc/using.xml 1.4 -> pkgsrc/doc/guide/files/using.xml 1.1

> http://mail-index.NetBSD.org/www-changes/2004/10/21/0006.html
>> this has moved to pkgsrc/doc/guide now.
> 
> http://mail-index.NetBSD.org/pkgsrc-changes/2004/10/21/0027.html
>> import The pkgsrc guide, the docbook conversion/replacement of
>> Packages.txt; Packages.txt will be going away.
>> 
>> this package contains the source files and a mechanism to install
>> pkgsrc/doc/pkgsrc.{html,txt} which are distributed with pkgsrc. it
>> uses the same docbook infrastructure that is used to build the
>> documentation on www.NetBSD.org.

場所が変わっただけでなく、
platforms.xml で Irix が IRIX になったことなど、
一部の内容が変わっています。

> 訳は htdocs/ja から別の場所に移すことになりますが、
> どこに置くのがヨサゲでしょうか。

特にご意見がなければ、

> htdocs/JP/Documentation/Packages/doc/guide/files

に置きます。

以下、訳と原文それぞれの新旧の差分です。

訳:
--- htdocs/Documentation/pkgsrc/binary.xml	2006-07-19 06:52:44.000000000 +0900
+++ pkgsrc/doc/guide/files/binary.xml	2006-08-22 22:59:57.000000000 +0900
@@ -1,6 +1,6 @@
-<!-- $NetBSD: binary.xml,v 1.3 2004/09/29 13:08:36 hubertf Exp $ -->
+<!-- $NetBSD: binary.xml,v 1.1 2004/10/21 14:27:40 grant Exp $ -->
 <!-- Based on english version: -->
-<!-- NetBSD: binary.xml,v 1.3 2004/09/29 13:08:36 hubertf Exp   -->
+<!-- NetBSD: binary.xml,v 1.1 2004/10/21 14:27:40 grant Exp   -->
 
 <chapter id="binary">
   <title>バイナリーパッケージを作る</title>
--- htdocs/Documentation/pkgsrc/build.xml	2006-08-19 00:19:32.000000000 +0900
+++ pkgsrc/doc/guide/files/build.xml	2006-08-22 22:59:57.000000000 +0900
@@ -1,6 +1,6 @@
-<!-- $NetBSD: build.xml,v 1.5 2004/09/29 23:22:25 hubertf Exp $ -->
+<!-- $NetBSD: build.xml,v 1.1 2004/10/21 14:27:38 grant Exp $ -->
 <!-- Based on english version: -->
-<!-- NetBSD: build.xml,v 1.5 2004/09/29 23:22:25 hubertf Exp   -->
+<!-- NetBSD: build.xml,v 1.1 2004/10/21 14:27:38 grant Exp   -->
 
 <chapter id="build">
   <title>構築の手順</title>
--- htdocs/Documentation/pkgsrc/components.xml	2006-08-19 00:19:32.000000000 +0900
+++ pkgsrc/doc/guide/files/components.xml	2006-08-22 22:59:57.000000000 +0900
@@ -1,6 +1,6 @@
-<!-- $NetBSD: components.xml,v 1.5 2004/09/29 23:22:25 hubertf Exp $ -->
+<!-- $NetBSD: components.xml,v 1.1 2004/10/21 14:27:38 grant Exp $ -->
 <!-- Based on english version: -->
-<!-- NetBSD: components.xml,v 1.5 2004/09/29 23:22:25 hubertf Exp   -->
+<!-- NetBSD: components.xml,v 1.1 2004/10/21 14:27:38 grant Exp   -->
 
 <chapter id="components"> <?dbhtml filename="components.html"?>
   <title>パッケージコンポーネント - ファイル、ディレクトリー、およびコンテンツ</title>
--- htdocs/Documentation/pkgsrc/debug.xml	2006-07-19 06:52:44.000000000 +0900
+++ pkgsrc/doc/guide/files/debug.xml	2006-08-22 22:59:57.000000000 +0900
@@ -1,6 +1,6 @@
-<!-- $NetBSD: debug.xml,v 1.2 2004/09/29 13:08:36 hubertf Exp $ -->
+<!-- $NetBSD: debug.xml,v 1.1 2004/10/21 14:27:38 grant Exp $ -->
 <!-- Based on english version: -->
-<!-- NetBSD: debug.xml,v 1.2 2004/09/29 13:08:36 hubertf Exp   -->
+<!-- NetBSD: debug.xml,v 1.1 2004/10/21 14:27:38 grant Exp   -->
 
 <chapter id="debug">
   <title>デバッグ</title>
--- htdocs/Documentation/pkgsrc/examples.xml	2006-07-19 06:52:44.000000000 +0900
+++ pkgsrc/doc/guide/files/examples.xml	2006-08-22 22:59:57.000000000 +0900
@@ -1,6 +1,6 @@
-<!-- $NetBSD: examples.xml,v 1.2 2004/09/29 13:08:36 hubertf Exp $ -->
+<!-- $NetBSD: examples.xml,v 1.1 2004/10/21 14:27:37 grant Exp $ -->
 <!-- Based on english version: -->
-<!-- NetBSD: examples.xml,v 1.2 2004/09/29 13:08:36 hubertf Exp   -->
+<!-- NetBSD: examples.xml,v 1.1 2004/10/21 14:27:37 grant Exp   -->
 
 <appendix id="examples">
   <title>パッケージの簡単な例: bison</title>
--- htdocs/Documentation/pkgsrc/faq.xml	2006-08-22 04:04:26.000000000 +0900
+++ pkgsrc/doc/guide/files/faq.xml	2006-08-22 23:00:47.000000000 +0900
@@ -1,6 +1,6 @@
-<!-- $NetBSD: faq.xml,v 1.4 2004/10/16 08:04:10 wiz Exp $ -->
+<!-- $NetBSD: faq.xml,v 1.1 2004/10/21 14:27:43 grant Exp $ -->
 <!-- Based on english version: -->
-<!-- NetBSD: faq.xml,v 1.4 2004/10/16 08:04:10 wiz Exp   -->
+<!-- NetBSD: faq.xml,v 1.1 2004/10/21 14:27:43 grant Exp   -->
 
 <chapter id="faq"> <?dbhtml filename="faq.html"?>
   <title>よくある質問</title>
@@ -475,7 +475,7 @@
 
     <screen>
 ===========================================================================
-$NetBSD: faq.xml,v 1.4 2004/10/16 08:04:10 wiz Exp $
+$NetBSD: faq.xml,v 1.1 2004/10/21 14:27:43 grant Exp $
 
 You may wish to have the vulnerabilities file downloaded daily so that
 it remains current.  This may be done by adding an appropriate entry
--- htdocs/Documentation/pkgsrc/fixes.xml	2006-08-22 04:12:19.000000000 +0900
+++ pkgsrc/doc/guide/files/fixes.xml	2006-08-22 22:59:58.000000000 +0900
@@ -1,6 +1,6 @@
-<!-- $NetBSD: fixes.xml,v 1.11 2004/10/16 08:03:04 wiz Exp $ -->
+<!-- $NetBSD: fixes.xml,v 1.1 2004/10/21 14:27:40 grant Exp $ -->
 <!-- Based on english version: -->
-<!-- NetBSD: fixes.xml,v 1.11 2004/10/16 08:03:04 wiz Exp   -->
+<!-- NetBSD: fixes.xml,v 1.1 2004/10/21 14:27:40 grant Exp   -->
 
 <chapter id="fixes"> <?dbhtml filename="fixes.html"?>
   <title>パッケージの修正に関する注意</title>
@@ -387,13 +387,6 @@
 ${INSTALL_DATA_DIR} ${PREFIX}/dir2</programlisting>
       </sect3>
 
-<!--
-      <sect3>
-XXX more portability stuff
-XXX USE_PKGLOCALEDIR
-XXX ???
-      </sect3>
--->
     </sect2>
   </sect1>
   
--- htdocs/Documentation/pkgsrc/ftp-layout.xml	2006-06-27 01:12:25.000000000 +0900
+++ pkgsrc/doc/guide/files/ftp-layout.xml	2006-08-22 22:59:58.000000000 +0900
@@ -1,6 +1,6 @@
-<!-- $NetBSD: ftp-layout.xml,v 1.2 2004/09/29 13:08:36 hubertf Exp $ -->
+<!-- $NetBSD: ftp-layout.xml,v 1.1 2004/10/21 14:27:37 grant Exp $ -->
 <!-- Based on english version: -->
-<!-- NetBSD: ftp-layout.xml,v 1.2 2004/09/29 13:08:36 hubertf Exp   -->
+<!-- NetBSD: ftp-layout.xml,v 1.1 2004/10/21 14:27:37 grant Exp   -->
 
 <appendix id="ftp-layout">
   <title>FTPサーバーのパッケージアーカイブのレイアウト</title>
@@ -94,4 +94,3 @@
   </orderedlist>
 
 </appendix>
-
--- htdocs/Documentation/pkgsrc/getting.xml	2006-08-04 01:16:59.000000000 +0900
+++ pkgsrc/doc/guide/files/getting.xml	2006-08-22 22:59:58.000000000 +0900
@@ -1,6 +1,6 @@
-<!-- $NetBSD: getting.xml,v 1.1 2004/09/29 23:04:30 hubertf Exp $ -->
+<!-- $NetBSD: getting.xml,v 1.1 2004/10/21 14:27:40 grant Exp $ -->
 <!-- Based on english version: -->
-<!-- NetBSD: getting.xml,v 1.1 2004/09/29 23:04:30 hubertf Exp   -->
+<!-- NetBSD: getting.xml,v 1.1 2004/10/21 14:27:40 grant Exp   -->
 
 <chapter id="getting">
   <title>どこからpkgsrcを得るか</title>
@@ -60,4 +60,3 @@
       の作業は、pkgsrcツリーに対する相対位置で実行されます。</para>
   </sect1>
 </chapter>
-
--- htdocs/Documentation/pkgsrc/introduction.xml	2006-07-11 00:29:55.000000000 +0900
+++ pkgsrc/doc/guide/files/introduction.xml	2006-08-22 22:59:58.000000000 +0900
@@ -1,6 +1,6 @@
-<!-- $NetBSD: introduction.xml,v 1.2 2004/09/29 13:08:36 hubertf Exp $ -->
+<!-- $NetBSD: introduction.xml,v 1.1 2004/10/21 14:27:38 grant Exp $ -->
 <!-- Based on english version: -->
-<!-- NetBSD: introduction.xml,v 1.2 2004/09/29 13:08:36 hubertf Exp   -->
+<!-- NetBSD: introduction.xml,v 1.1 2004/10/21 14:27:38 grant Exp   -->
 
 <chapter id="introduction">
   <title>イントロダクション</title>
--- htdocs/Documentation/pkgsrc/logs.xml	2006-08-19 00:19:32.000000000 +0900
+++ pkgsrc/doc/guide/files/logs.xml	2006-08-22 22:59:58.000000000 +0900
@@ -1,6 +1,6 @@
-<!-- $NetBSD: logs.xml,v 1.3 2004/09/29 23:40:31 hubertf Exp $ -->
+<!-- $NetBSD: logs.xml,v 1.1 2004/10/21 14:27:37 grant Exp $ -->
 <!-- Based on english version: -->
-<!-- NetBSD: logs.xml,v 1.3 2004/09/29 23:40:31 hubertf Exp   -->
+<!-- NetBSD: logs.xml,v 1.1 2004/10/21 14:27:37 grant Exp   -->
 
 <appendix id="logs">
   <title>構築のログ</title>
--- htdocs/Documentation/pkgsrc/platforms.xml	2006-08-22 04:04:26.000000000 +0900
+++ pkgsrc/doc/guide/files/platforms.xml	2006-08-22 23:01:32.000000000 +0900
@@ -1,6 +1,6 @@
-<!-- $NetBSD: platforms.xml,v 1.6 2004/10/12 14:15:15 tv Exp $ -->
+<!-- $NetBSD: platforms.xml,v 1.1 2004/10/21 14:27:40 grant Exp $ -->
 <!-- Based on english version: -->
-<!-- NetBSD: platforms.xml,v 1.6 2004/10/12 14:15:15 tv Exp   -->
+<!-- NetBSD: platforms.xml,v 1.1 2004/10/21 14:27:40 grant Exp   -->
 
 <chapter id="platforms">
   <title>&os; 以外のシステムで pkgsrc を使う</title>
@@ -292,8 +292,8 @@
 	  url="http://freeware.sgi.com/">http://freeware.sgi.com/</ulink>
 	から gcc の tar 配布ファイルをダウンロードすることができます。</para>
 
-      <para>Irix 6.5.17 以上が必要です。
-	このバージョンの Irix で if_indextoname(3), if_nametoindex(3)
+      <para>IRIX 6.5.17 以上が必要です。
+	このバージョンの IRIX で if_indextoname(3), if_nametoindex(3)
 	などへの対応がおこなわれたからです。</para>
 
       <para>現在のところ、pkgsrc は一つの ABI にしか対応しません。つまり、
@@ -309,7 +309,7 @@
 
       <para>pkgsrc ツリーの実体を別ホストから NFS を使ってマウントしている場合は、必ず
 	<varname>WRKOBJDIR</varname> をローカルのディレクトリーに設定しておいてください。
-	Irix のリンカーは、ネットワーク経由でマウントされたファイルシステム越しにリンクするときに
+	IRIX のリンカーは、ネットワーク経由でマウントされたファイルシステム越しにリンクするときに
 	問題を起こすことが時々あるからです。</para>
 
       <para>事前準備の過程では、imake(1) などのプログラムにすべて正しいオプションが設定されるはずですが、
--- htdocs/Documentation/pkgsrc/plist.xml	2006-08-15 21:14:58.000000000 +0900
+++ pkgsrc/doc/guide/files/plist.xml	2006-08-22 22:59:58.000000000 +0900
@@ -1,6 +1,6 @@
-<!-- $NetBSD: plist.xml,v 1.3 2004/09/29 23:04:30 hubertf Exp $ -->
+<!-- $NetBSD: plist.xml,v 1.1 2004/10/21 14:27:40 grant Exp $ -->
 <!-- Based on english version: -->
-<!-- NetBSD: plist.xml,v 1.3 2004/09/29 23:04:30 hubertf Exp   -->
+<!-- NetBSD: plist.xml,v 1.1 2004/10/21 14:27:40 grant Exp   -->
 
 <chapter id="plist">
   <title>PLIST 問題</title>
--- htdocs/Documentation/pkgsrc/submit.xml	2006-07-21 21:23:28.000000000 +0900
+++ pkgsrc/doc/guide/files/submit.xml	2006-08-22 22:59:58.000000000 +0900
@@ -1,6 +1,6 @@
-<!-- $NetBSD: submit.xml,v 1.3 2004/09/29 13:08:36 hubertf Exp $ -->
+<!-- $NetBSD: submit.xml,v 1.1 2004/10/21 14:27:40 grant Exp $ -->
 <!-- Based on english version: -->
-<!-- NetBSD: submit.xml,v 1.3 2004/09/29 13:08:36 hubertf Exp   -->
+<!-- NetBSD: submit.xml,v 1.1 2004/10/21 14:27:40 grant Exp   -->
 
 <chapter id="submit"> <?dbhtml filename="submit.html"?>
 <title>提出およびコミット</title>
--- htdocs/Documentation/pkgsrc/using.xml	2006-08-19 00:19:32.000000000 +0900
+++ pkgsrc/doc/guide/files/using.xml	2006-08-22 22:59:58.000000000 +0900
@@ -1,6 +1,6 @@
-<!-- $NetBSD: using.xml,v 1.4 2004/09/29 23:28:26 hubertf Exp $ -->
+<!-- $NetBSD: using.xml,v 1.1 2004/10/21 14:27:37 grant Exp $ -->
 <!-- Based on english version: -->
-<!-- NetBSD: using.xml,v 1.4 2004/09/29 23:28:26 hubertf Exp   -->
+<!-- NetBSD: using.xml,v 1.1 2004/10/21 14:27:37 grant Exp   -->
 
 <chapter id="using"> <?dbhtml filename="using.html"?>
   <title>pkgsrc を使う</title>

原文:
--- htdocs/Documentation/pkgsrc/binary.xml	2006-07-31 03:26:15.000000000 +0900
+++ pkgsrc/doc/guide/files/binary.xml	2006-08-19 00:27:03.000000000 +0900
@@ -1,4 +1,4 @@
-<!-- $NetBSD: binary.xml,v 1.3 2004/09/29 13:08:36 hubertf Exp $ -->
+<!-- $NetBSD: binary.xml,v 1.1 2004/10/21 14:27:40 grant Exp $ -->
 
 <chapter id="binary">
   <title>Creating binary packages</title>
--- htdocs/Documentation/pkgsrc/build.xml	2006-08-16 21:20:56.000000000 +0900
+++ pkgsrc/doc/guide/files/build.xml	2006-08-19 00:27:04.000000000 +0900
@@ -1,4 +1,4 @@
-<!-- $NetBSD: build.xml,v 1.5 2004/09/29 23:22:25 hubertf Exp $ -->
+<!-- $NetBSD: build.xml,v 1.1 2004/10/21 14:27:38 grant Exp $ -->
 
 <chapter id="build">
   <title>The build process</title>
--- htdocs/Documentation/pkgsrc/components.xml	2006-08-16 21:20:56.000000000 +0900
+++ pkgsrc/doc/guide/files/components.xml	2006-08-19 00:27:04.000000000 +0900
@@ -1,4 +1,4 @@
-<!-- $NetBSD: components.xml,v 1.5 2004/09/29 23:22:25 hubertf Exp $ -->
+<!-- $NetBSD: components.xml,v 1.1 2004/10/21 14:27:38 grant Exp $ -->
 
 <chapter id="components"> <?dbhtml filename="components.html"?>
   <title>Package components - files, directories and contents</title>
--- htdocs/Documentation/pkgsrc/debug.xml	2006-07-31 03:26:16.000000000 +0900
+++ pkgsrc/doc/guide/files/debug.xml	2006-08-19 00:27:04.000000000 +0900
@@ -1,4 +1,4 @@
-<!-- $NetBSD: debug.xml,v 1.2 2004/09/29 13:08:36 hubertf Exp $ -->
+<!-- $NetBSD: debug.xml,v 1.1 2004/10/21 14:27:38 grant Exp $ -->
 
 <chapter id="debug">
   <title>Debugging</title>
--- htdocs/Documentation/pkgsrc/examples.xml	2006-07-31 03:26:16.000000000 +0900
+++ pkgsrc/doc/guide/files/examples.xml	2006-08-19 00:27:04.000000000 +0900
@@ -1,4 +1,4 @@
-<!-- $NetBSD: examples.xml,v 1.2 2004/09/29 13:08:36 hubertf Exp $ -->
+<!-- $NetBSD: examples.xml,v 1.1 2004/10/21 14:27:37 grant Exp $ -->
 
 <appendix id="examples">
   <title>A simple example package: bison</title>
--- htdocs/Documentation/pkgsrc/faq.xml	2006-08-19 08:51:23.000000000 +0900
+++ pkgsrc/doc/guide/files/faq.xml	2006-08-19 00:27:04.000000000 +0900
@@ -1,4 +1,4 @@
-<!-- $NetBSD: faq.xml,v 1.4 2004/10/16 08:04:10 wiz Exp $ -->
+<!-- $NetBSD: faq.xml,v 1.1 2004/10/21 14:27:43 grant Exp $ -->
 
 <chapter id="faq"> <?dbhtml filename="faq.html"?>
   <title>Frequently Asked Questions</title>
@@ -25,7 +25,7 @@
     <title>Where's the pkgviews documentation?</title>
 
     <para> Pkgviews is tightly integrated with buildlink. You can find a 
-      pkgviews User's Guide in
+      pkgviews User's guide in
       <filename>pkgsrc/mk/buildlink3/PKGVIEWS_UG</filename>. 
       </para>
 </sect1>
@@ -510,7 +510,7 @@
 
     <screen>
 ===========================================================================
-$NetBSD: faq.xml,v 1.4 2004/10/16 08:04:10 wiz Exp $
+$NetBSD: faq.xml,v 1.1 2004/10/21 14:27:43 grant Exp $
 
 You may wish to have the vulnerabilities file downloaded daily so that
 it remains current.  This may be done by adding an appropriate entry
--- htdocs/Documentation/pkgsrc/fixes.xml	2006-08-19 22:27:07.000000000 +0900
+++ pkgsrc/doc/guide/files/fixes.xml	2006-08-19 00:27:04.000000000 +0900
@@ -1,4 +1,4 @@
-<!-- $NetBSD: fixes.xml,v 1.11 2004/10/16 08:03:04 wiz Exp $ -->
+<!-- $NetBSD: fixes.xml,v 1.1 2004/10/21 14:27:40 grant Exp $ -->
 
 <chapter id="fixes"> <?dbhtml filename="fixes.html"?>
   <title>Notes on fixes for packages</title>
@@ -425,13 +425,6 @@
 ${INSTALL_DATA_DIR} ${PREFIX}/dir2</programlisting>
       </sect3>
 
-<!--
-      <sect3>
-XXX more portability stuff
-XXX USE_PKGLOCALEDIR
-XXX ???
-      </sect3>
--->
     </sect2>
   </sect1>
   
--- htdocs/Documentation/pkgsrc/ftp-layout.xml	2006-07-31 03:26:17.000000000 +0900
+++ pkgsrc/doc/guide/files/ftp-layout.xml	2006-08-19 00:27:04.000000000 +0900
@@ -1,4 +1,4 @@
-<!-- $NetBSD: ftp-layout.xml,v 1.2 2004/09/29 13:08:36 hubertf Exp $ -->
+<!-- $NetBSD: ftp-layout.xml,v 1.1 2004/10/21 14:27:37 grant Exp $ -->
 
 <appendix id="ftp-layout">
   <title>Layout of the FTP server's package archive</title>
@@ -92,4 +92,3 @@
   </orderedlist>
 
 </appendix>
-
--- htdocs/Documentation/pkgsrc/getting.xml	2004-09-30 08:04:30.000000000 +0900
+++ pkgsrc/doc/guide/files/getting.xml	2006-08-19 00:27:04.000000000 +0900
@@ -1,4 +1,4 @@
-<!-- $NetBSD: getting.xml,v 1.1 2004/09/29 23:04:30 hubertf Exp $ -->
+<!-- $NetBSD: getting.xml,v 1.1 2004/10/21 14:27:40 grant Exp $ -->
 
 <chapter id="getting">
   <title>Where to get pkgsrc</title>
@@ -57,4 +57,3 @@
       within the pkgsrc tree.</para>
   </sect1>
 </chapter>
-
--- htdocs/Documentation/pkgsrc/introduction.xml	2006-07-31 03:26:18.000000000 +0900
+++ pkgsrc/doc/guide/files/introduction.xml	2006-08-19 00:27:04.000000000 +0900
@@ -1,4 +1,4 @@
-<!-- $NetBSD: introduction.xml,v 1.2 2004/09/29 13:08:36 hubertf Exp $ -->
+<!-- $NetBSD: introduction.xml,v 1.1 2004/10/21 14:27:38 grant Exp $ -->
 
 <chapter id="introduction">
   <title>Introduction</title>
--- htdocs/Documentation/pkgsrc/logs.xml	2006-08-16 22:27:46.000000000 +0900
+++ pkgsrc/doc/guide/files/logs.xml	2006-08-19 00:27:04.000000000 +0900
@@ -1,4 +1,4 @@
-<!-- $NetBSD: logs.xml,v 1.3 2004/09/29 23:40:31 hubertf Exp $ -->
+<!-- $NetBSD: logs.xml,v 1.1 2004/10/21 14:27:37 grant Exp $ -->
 
 <appendix id="logs">
   <title>Build logs</title>
--- htdocs/Documentation/pkgsrc/platforms.xml	2006-08-18 20:12:52.000000000 +0900
+++ pkgsrc/doc/guide/files/platforms.xml	2006-08-19 00:27:04.000000000 +0900
@@ -1,4 +1,4 @@
-<!-- $NetBSD: platforms.xml,v 1.6 2004/10/12 14:15:15 tv Exp $ -->
+<!-- $NetBSD: platforms.xml,v 1.1 2004/10/21 14:27:40 grant Exp $ -->
 
 <chapter id="platforms">
   <title>Using pkgsrc on systems other than &os;</title>
@@ -289,8 +289,8 @@
 	compiler suite, you can download a gcc tardist file from <ulink
 	  url="http://freeware.sgi.com/">http://freeware.sgi.com/</ulink>.</para>
 
-      <para>Please note that you will need Irix 6.5.17 or higher, as this is the earliest
-	version of Irix providing support for if_indextoname(3), if_nametoindex(3),
+      <para>Please note that you will need IRIX 6.5.17 or higher, as this is the earliest
+	version of IRIX providing support for if_indextoname(3), if_nametoindex(3),
 	etc.</para>
 
       <para>At this point in time, pkgsrc only supports one ABI.  That is, you can not
@@ -306,7 +306,7 @@
 
       <para>If you have the actual pkgsrc tree mounted via NFS from a different host,
 	please make sure to set <varname>WRKOBJDIR</varname> to a local directory,
-	as it appears that Irix linker occasionally runs into issues when trying to
+	as it appears that IRIX linker occasionally runs into issues when trying to
 	link over a network mounted filesystem.</para>
 
       <para>The bootstrapping process should set all the right options for programs such
--- htdocs/Documentation/pkgsrc/plist.xml	2006-07-31 03:27:57.000000000 +0900
+++ pkgsrc/doc/guide/files/plist.xml	2006-08-19 00:27:04.000000000 +0900
@@ -1,4 +1,4 @@
-<!-- $NetBSD: plist.xml,v 1.3 2004/09/29 23:04:30 hubertf Exp $ -->
+<!-- $NetBSD: plist.xml,v 1.1 2004/10/21 14:27:40 grant Exp $ -->
 
 <chapter id="plist">
   <title>PLIST issues</title>
--- htdocs/Documentation/pkgsrc/submit.xml	2006-07-31 03:27:57.000000000 +0900
+++ pkgsrc/doc/guide/files/submit.xml	2006-08-19 00:27:04.000000000 +0900
@@ -1,4 +1,4 @@
-<!-- $NetBSD: submit.xml,v 1.3 2004/09/29 13:08:36 hubertf Exp $ -->
+<!-- $NetBSD: submit.xml,v 1.1 2004/10/21 14:27:40 grant Exp $ -->
 
 <chapter id="submit"> <?dbhtml filename="submit.html"?>
 <title>Submitting and Committing</title>
--- htdocs/Documentation/pkgsrc/using.xml	2006-08-16 21:45:28.000000000 +0900
+++ pkgsrc/doc/guide/files/using.xml	2006-08-19 00:27:40.000000000 +0900
@@ -1,4 +1,4 @@
-<!-- $NetBSD: using.xml,v 1.4 2004/09/29 23:28:26 hubertf Exp $ -->
+<!-- $NetBSD: using.xml,v 1.1 2004/10/21 14:27:37 grant Exp $ -->
 
 <chapter id="using"> <?dbhtml filename="using.html"?>
   <title>Using pkgsrc</title>