From e7065c5f0cae934d0986422c1bc0643d46ebb53b Mon Sep 17 00:00:00 2001
From: dancer <dancer>
Date: Sun, 30 Oct 2005 15:12:13 +0000
Subject: updates to documentation.

---
 ChangeLog                      |  8 ++++++++
 Documentation/pbuilder-doc.xml | 28 ++++++++++++++++++++++++++--
 debian/TODO                    | 18 +++++++++++-------
 debian/changelog               |  7 ++++---
 4 files changed, 49 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5a4b9c7..7f84bd6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-10-28  Junichi Uekawa  <dancer@debian.org>
+
+	* debian/TODO: update.
+
+	* Documentation/pbuilder-doc.xml: Update documentation on 
+	pbuilder on amd64
+	document TODO file.
+
 2005-10-26  Junichi Uekawa  <dancer@debian.org>
 
 	* debian/TODO: update
diff --git a/Documentation/pbuilder-doc.xml b/Documentation/pbuilder-doc.xml
index 8fa3459..c21f0e3 100644
--- a/Documentation/pbuilder-doc.xml
+++ b/Documentation/pbuilder-doc.xml
@@ -4,7 +4,7 @@
   and the latest version is found in CVS repository. -->
 <book>
   <bookinfo>
-    <date>2005-10-14</date>
+    <date>2005-10-28</date>
     <title>pbuilder User's Manual</title>
     <abbrev>pbuilder-doc</abbrev>
     <subtitle>Usage and operations</subtitle>
@@ -699,7 +699,7 @@ read
   </chapter>
   <chapter id="faq">
     <title>Frequently asked questions </title>
-    <!-- Start of FAQ -->
+    <!-- Start of FAQ/faq -->
     <para>
       Here, known problems and frequently asked questions are
       documented. This portion was initially available in README.Debian
@@ -1019,6 +1019,23 @@ $ sudo pbuilder update --hookdir ~/loginhooks/E10shell
 	This behavior is different when running through --use-pdebuild-internal
       </para>
     </sect1>
+    <sect1 id="amd64i386">
+      <title>amd64 and i386-mode</title>
+      <para>
+	amd64 architectures are capable of running binaries in 
+	i386 mode.
+	It is possible to use pbuilder to run packages, 
+	using <command>linux32</command>
+	and <command>debootstrap <option>--arch</option></command> option.
+	Specifically, a command-line option like the following will work.
+      </para>
+      <para>
+	<screen>
+<command>pbuilder create --distribution sid --debootstrapopts "--arch=i386" --basetgz /var/cache/pbuilder/base-i386.tgz --mirror http://ftp.jp.debian.org/debian</command>
+<command>linux32 pbuilder build --basetgz /var/cache/pbuilder/base-i386.tgz</command>
+	</screen>
+      </para>
+    </sect1>
     <!-- end of FAQ -->
   </chapter>
 
@@ -1087,6 +1104,13 @@ cvs -z3 -d:pserver:anonymous@cvs.alioth.debian.org:/cvsroot/pbuilder co pbuilder
 	For CVS commit messages, a cut-n-paste of 
 	ChangeLog diff should be enough.
       </para>
+      <para>
+	A TODO file is available in debian/TODO.
+	It's mostly not well-maintained, 
+	but hopefully it will be more up-to-date
+	when people start using it.
+	emacs todoo-mode is used in editing the file.
+      </para>
     </sect1>
   </chapter>
 
diff --git a/debian/TODO b/debian/TODO
index 7739189..b3fad7c 100644
--- a/debian/TODO
+++ b/debian/TODO
@@ -1,18 +1,26 @@
 TODO and possible bugs: 
 
+* use arrays for debbuildopts
+   - current --debbuildopts usages will break, how do we support it?
+
 * dpkg does not work in woody chroot under 2.6.11 or later kernels
    - depends-on debian-bug: 322309 dpkg: no action
    - depends-on debian-bug: 329468 debootstrap: fixed in 0.3.2
    - depends-on debian-bug: 332903 cdebootstrap: no action
 
-* save-afer-login seems to save aptcache and make a big base.tgz; do we want that?
+* save-afer-login seems to save aptcache and make a big base.tgz.
+   we don't want it, clean aptcache before save test it is functional.
 
 * select cdebootstrap if debootstrap does not exist and cdebootstrap exists.
 
 * revert back to using --variant=buildd for debootstrap
    - depends-on debian-bug: 314858 debootstrap: fixed in 0.3.2
 
-* Add hooks to install gnupg package and ways to allow new keys to be registered into pbuilder chroots.
+* apt authentication support
+Add hooks to install gnupg package.
+Allow new keys to be registered into pbuilder chroots.
+Document in manual.
+test
 
 * Use pbuilder cache in pdebuild-internal (2353237)
 
@@ -26,9 +34,7 @@ TODO and possible bugs:
 
 * Machine type specification in Build dependency should either have  [!xxx !xxx !xxx ...] or [xxx xxx xxx ...]   [!xxx xxx] formats are not parsed, and should really not exist.
 
-* Creating a "sbuilder" command, which cooperates with sbuild, and use sbuild if possible.
-
-* Please file a bug if you find that pbuilder does not exit with error condition on failure to  build a package.
+* sbuild interface
 
 * Remember to update the TODO file.
 
@@ -54,5 +60,3 @@ TODO and possible bugs:
 * Use alternative to pbuilder-satisfydepends; apt-pkg? read elmo.txt for clues.
 
 $Id$
-
-
diff --git a/debian/changelog b/debian/changelog
index 50cb082..81619c0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
 pbuilder (0.137) UNRELEASED; urgency=low
 
   [Junichi Uekawa]
-  * New development version.
-
- -- Junichi Uekawa <dancer@debian.org>  Thu, 20 Oct 2005 23:39:32 +0900
+  * pbuilder-doc.xml: Document amd64-i386 usage in FAQ.
+  * update TODO file.
+  
+ -- Junichi Uekawa <dancer@debian.org>  Fri, 28 Oct 2005 15:39:21 +0900
 
 pbuilder (0.136) unstable; urgency=low
 
-- 
cgit v1.2.3