sync

diff --git a/README b/README
index e9908a1009fd1dbf84413d45fb951865e8c4b877..d2d335129390e4fffd0c50a27834e08e6f26aa4f 100644 (file)
--- a/README
+++ b/README
@@ -4,13 +4,24 @@ This is unreleased alpha software; use it ENTIRELY at your own risk.
 
 ***** WARNING ****** ***** WARNING ****** ***** WARNING ******
 
-This is the README file for dak version -1.
-
 dak is the collection of programs used to maintain the Debian
 project's archives.  It's not yet in a state where it can be easily
 used by others; if you want something to maintain a small archive and
-apt-ftparchive (from apt-utils) is insufficent, I recommend you
-investigate mini-dinstall or debarchiver.
+apt-ftparchive (from apt-utils) is insufficent, I strongly recommend
+you investigate mini-dinstall or debarchiver.
+
+If you do insist on trying to try using it, please be careful: katie
+sends out lots of emails and if not configured properly will happily
+send them to lots of people who probably didn't want those emails.
+
+Don't use katie.conf, apt.conf, cron.* etc. as starting points for
+your own configuration files, they're the configuration files for
+auric (aka ftp-master.debian.org) and are highly Debian specific.
+Start from scratch and refer to the security.debian.org config files
+(-security) as they're a better example for a private archive.
+
+NB: don't be put off by the names, see doc/README.names for a mapping
+of name -> what the script does.
 
 There are some manpages and READMEs in the doc sub-directory.  The
 TODO file is an incomplete list of things needing to be done.

diff --git a/TODO b/TODO
index c4c52b69cd58b7e45e519c3f3fff52c68a9d9f59..6a0c6c0ce2c8659a497ea0c2f01234de0669ac76 100644 (file)
--- a/TODO
+++ b/TODO
@@ -8,8 +8,8 @@
 
 ================================================================================
 
-approved
---------
+queue/approved
+--------------
 
  o What to do with multi-suite uploads?  Presumably hold in unapproved
    and warn?  Or what?  Can't accept just for unstable or reject just
@@ -27,6 +27,15 @@ approved
 Others
 ------
 
+  o by default hamstring katie's mail sending so that she won't send
+    anything until someone edits a script; she's been used far too
+    much to send spam atm :(
+
+  o $ftpdir/indices isn't created by rose because it's not in katie.conf
+
+  o sanity check depends/recommends/suggests too?  in fact for any
+    empty field?
+
 [minor] kelly's copychanges, copykatie handling sucks, the per-suite
         thing is static for all packages, so work out in advance dummy.