Merge remote branch 'ftpmaster/master'

[dak.git] / docs / README.config

diff --git a/docs/README.config b/docs/README.config
index c0e831f3df23a4f5fc09135c39c3998e27b58a7c..ee0dc0d642b83641e8b107b7d5cd5e054add7dd4 100644 (file)
--- a/docs/README.config
+++ b/docs/README.config
@@ -39,7 +39,6 @@ Mandatory.  List of directory locations, e.g.
 |   Lists "/org/ftp.debian.org/database/dists/";
 |   Log "/org/ftp.debian.org/log/";
 |   Morgue "/org/ftp.debian.org/morgue/";
-|   MorgueReject "reject";
 |   QueueBuild "/org/incoming.debian.org/buildd/";
 |   UrgencyLog "/org/ftp.debian.org/testing/urgencies/";
 |   Queue
@@ -79,14 +78,6 @@ Morgue (required): Removed files are moved there.  The morgue has various
 sub-directories, including (optionally) those defined by
 Clean-Queues::MorgueSubDir and Clean-Suites::MorgueSubDir.
 
-MorgueReject (required): if dak cannot move a rejected package to
-Dir::Queue::Reject, it will try to move it to the Dir::MorgueReject
-directory located under Dir::Morgue.
-
-QueueBuild (optional): This variable is only relevant if any suites
-are to be auto built, i.e. if Dinstall::QueueBuildSuites has any
-values.
-
 UrgencyLog (optional): If this directory is specified, 'dak
 process-accepted' will store the urgency value of each upload.  This
 is mainly used for britney (the testing script).
@@ -218,10 +209,6 @@ Mandatory.  List of dinstall options, e.g.:
 |    FutureTimeTravelGrace 28800; // 8 hours
 |    PastCutoffYear "1984";
 |    BXANotify "false";
-|    QueueBuildSuites
-|    {
-|      unstable;
-|    };
 | };
 
 GPGKeyring (required): filenames of the PGP and GnuPG
@@ -243,8 +230,8 @@ dak and others.  It should indicate the name of the distribution.
 BugServer (required): is used by 'dak process-unchecked' and 'dak rm'
 when closing bugs.
 
-PackagesServer (requried): used by 'dak rm' when carbon-copying a bug
-close mail to a package maintainer.
+PackagesServer (required): used by 'dak rm' and 'dak override' when
+carbon-copying a bug close mail to a package maintainer.
 
 TrackingServer (optional): used by 'dak process-unchecked' and 'dak
 rm' to send messages for the maintainer also to an alias for people
@@ -274,9 +261,6 @@ at the maintainer if they differ.
 CloseBugs (optional): a boolean (default: no); if true the automated bug
 closing feature of dinstall is activated.
 
-QueueBuildSuites (optional): a list of suites which should be auto
-build.
-
 QueueBuild is a boolean; if true it activates support
 for auto-building from accepted.
 
@@ -337,25 +321,6 @@ The description is currently unused.
 
 ================================================================================
 
-Component
----------
-
-Mandatory.  List of all components, e.g.
-
-| Component
-| {
-|   main
-|   {
-|      Description "Main";
-|      MeetsDFSG "true";
-|   };
-| };
-
-All three values go into the SQL database's 'component' table.
-MeetsDFSG is currently unused.
-
-================================================================================
-
 Section
 -------
 
@@ -390,22 +355,6 @@ go into the SQL database's 'priority' table.
 
 ================================================================================
 
-OverrideType
-------------
-
-Mandatory.  List of al valid override types, e.g.
-
-| OverrideType
-| {
-|   deb;
-|   dsc;
-|   udeb;
-| };
-
-The type goes into the 'override_type' table in the SQL database.
-
-================================================================================
-
 Location
 --------