Merge remote branch 'mhy/master'

[dak.git] / docs / README.config

diff --git a/docs/README.config b/docs/README.config
index a20cfc9f06d548520d807d8c2b847d5f4275f02d..a6b71206056e6142b457944cd8c60854498196cc 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).
@@ -200,15 +191,10 @@ Mandatory.  List of dinstall options, e.g.:
 
 | Dinstall
 | {
-|    GPGKeyring {
-|       "/org/keyring.debian.org/keyrings/debian-keyring.gpg";
-|       "/org/keyring.debian.org/keyrings/debian-keyring.pgp";
-|    };
 |    SigningKeyring "/org/ftp.debian.org/s3kr1t/dot-gnupg/secring.gpg";
 |    SendmailCommand "/usr/sbin/sendmail -odq -oi -t";
 |    MyEmailAddress "Debian Installer <installer@ftp-master.debian.org>";
 |    MyAdminAddress "ftpmaster@debian.org";
-|    MyHost "debian.org";  // used for generating user@my_host addresses in e.g. manual_reject()
 |    MyDistribution "Debian";
 |    BugServer "bugs.debian.org";
 |    PackagesServer "packages.debian.org";
@@ -218,15 +204,8 @@ 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
-keyrings to be used by dak.
-
 SigningKeyring (optional): this is the private keyring used by 'dak
 generate-releases'.
 
@@ -274,9 +253,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 +313,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 +347,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
 --------