X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=docs%2FREADME.config;h=80a1010d0ec9cff5202a663f8ba773cfe77d01e1;hb=0ea570b0ff8bb87f8799053bbd4552d444bbe2f2;hp=1ee64ca037bd31de4a19f6194e021ef7a7d9e7c6;hpb=95e0e4e7ec7bb1fddc39c49db3549aa02f518e2a;p=dak.git

diff --git a/docs/README.config b/docs/README.config
index 1ee64ca0..80a1010d 100644
--- a/docs/README.config
+++ b/docs/README.config
@@ -25,15 +25,28 @@ Mandatory.  List of directory locations, e.g.
 
 | Dir
 | {
-|   RootDir "/org/ftp.debian.org/ftp/";
-|   PoolDir "/org/ftp.debian.org/ftp/pool/";
-|   TemplatesDir "/org/ftp.debian.org/katie/templates/";
+|   Root "/org/ftp.debian.org/ftp/";
+|   Pool "/org/ftp.debian.org/ftp/pool/";
+|   Templates "/org/ftp.debian.org/katie/templates/";
 |   PoolRoot "pool/";
-|   IncomingDir "/org/ftp.debian.org/incoming/";
-|   OverrideDir "/org/ftp.debian.org/scripts/override/";
-|   ListsDir "/org/ftp.debian.org/database/dists/";
-|   LogDir "/org/ftp.debian.org/log/";
+|   Override "/org/ftp.debian.org/scripts/override/";
+|   Lists "/org/ftp.debian.org/database/dists/";
+|   Log "/org/ftp.debian.org/log/";
 |   Morgue "/org/ftp.debian.org/morgue/";
+|   Override "/org/ftp.debian.org/scripts/override/";
+|   AcceptedAutoBuild "/org/incoming.debian.org/buildd/";
+|   UrgencyLog "/org/ftp.debian.org/testing/urgencies/";
+|   Queue
+|   {  
+|     Root "/org/ftp.debian.org/queue/";
+|     Accepted "/org/ftp.debian.org/queue/accepted/";
+|     Byhand "/org/ftp.debian.org/queue/byhand/";
+|     Done "/org/ftp.debian.org/queue/done/";
+|     Holding "/org/ftp.debian.org/queue/holding/";
+|     New "/org/ftp.debian.org/queue/new/";
+|     Reject "/org/ftp.debian.org/queue/reject/";
+|     Unchecked "/org/ftp.debian.org/queue/unchecked/";
+|   };
 | };
 
 ================================================================================
@@ -86,6 +99,43 @@ paths will usually be different.
 
 ================================================================================
 
+SuiteMappings
+-------------
+
+Optional.  List of mappings for the Distribution file in a .changes file, e.g.:
+
+| SuiteMappings
+| {
+|    "map stable proposed-updates";
+|    "map frozen unstable";
+|    "map-unreleased stable unstable";
+|    "map-unreleased proposed-updates unstable";
+|    "ignore testing";
+| };
+
+There are three mapping types:
+
+(1) map <source> <dest>
+
+      Any target suite of '<source>' is unconditionally overriden to
+      '<dest>'.
+
+(2) map-unreleased <source> <dest>
+
+      Any upload targeted for suite '<source>' will be mapped to
+      '<dest>' iff it contains uploads for an architecture that is not
+      part of '<source>'.
+
+(3) ignore <suite>
+
+      Any target suite of '<suite>' is unconditionally removed from
+      the list of target suites.  NB: if the upload had only one
+      target suite this will lead to rejection.
+
+NB: ordering is not guaranteed.
+
+================================================================================
+
 Dinstall
 --------
 
@@ -146,7 +196,26 @@ timestamps are allowed to be inside a deb before being rejected.
 PastCutoffYear specifies the cut-off year which is used when deciding
 whether or not to reject packages based on the file timestamp.
 
-If BXANotify is non-zero/blank a (Debian-specfic) BXA notification is sent.
+BXANotify is a boolean; if true (Debian-specfic) BXA notification is
+sent.
+
+OverrideDisparityCheck is a boolean; if true, jennifer compares an
+uploads section/priority with the overrides and whines at the
+maintainer if they differ.
+
+CloseBugs is a boolean; if true the automated bug closing feature of
+dinstall is activated.
+
+SpecialAcceptedAutoBuild is a boolean; if true it activates support
+for auto-building from accepted.
+
+OverrideMaintainer can be used to globally override the
+__MAINTAINER_TO__ and __MAINTAINER_FROM__ variables in template mails.
+Use with caution.
+
+SkipTime is an integer value which is the number of seconds that a
+file must be older than (via it's last modified timestamp) before
+jennifer will REJECT rather than SKIP the package.
 
 ================================================================================
 
@@ -248,9 +317,9 @@ Mandatory.  List of al valid override types, e.g.
 
 | OverrideType
 | {
-|   deb "";
-|   dsc "";
-|   udeb "";
+|   deb;
+|   dsc;
+|   udeb;
 | };
 
 The type goes into the 'override_type' table in the SQL database.