Merge remote branch 'ftpmaster/master'

[dak.git] / docs / README.config

diff --git a/docs/README.config b/docs/README.config
index 52588bdc80ad2651416e79f1bca8e4df625a0b7a..a20cfc9f06d548520d807d8c2b847d5f4275f02d 100644 (file)
--- a/docs/README.config
+++ b/docs/README.config
@@ -200,8 +200,10 @@ Mandatory.  List of dinstall options, e.g.:
 
 | Dinstall
 | {
 
 | Dinstall
 | {

-|    PGPKeyring "/org/keyring.debian.org/keyrings/debian-keyring.pgp";
-|    GPGKeyring "/org/keyring.debian.org/keyrings/debian-keyring.gpg";
+|    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>";
 |    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>";


@@ -213,7 +215,6 @@ Mandatory.  List of dinstall options, e.g.:
 |    TrackingServer "packages.qa.debian.org";
 |    LockFile "/org/ftp.debian.org/dak/lock";
 |    Bcc "archive@ftp-master.debian.org";
 |    TrackingServer "packages.qa.debian.org";
 |    LockFile "/org/ftp.debian.org/dak/lock";
 |    Bcc "archive@ftp-master.debian.org";

-|    GroupOverrideFilename "override.group-maint";

 |    FutureTimeTravelGrace 28800; // 8 hours
 |    PastCutoffYear "1984";
 |    BXANotify "false";
 |    FutureTimeTravelGrace 28800; // 8 hours
 |    PastCutoffYear "1984";
 |    BXANotify "false";


@@ -223,8 +224,8 @@ Mandatory.  List of dinstall options, e.g.:
 |    };
 | };
 
 |    };
 | };
 

-PGPKeyring and GPGKeyring (required): filenames of the PGP and GnuPG
-keyrings to be used by dak respectively.
+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'.
 
 SigningKeyring (optional): this is the private keyring used by 'dak
 generate-releases'.


@@ -242,8 +243,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.
 
 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
 
 TrackingServer (optional): used by 'dak process-unchecked' and 'dak
 rm' to send messages for the maintainer also to an alias for people


@@ -255,10 +256,6 @@ when in action mode (i.e. not using -n/--no-action).
 All sent mail is blind carbon copied to the email address in Bcc if it's
 not blank.
 
 All sent mail is blind carbon copied to the email address in Bcc if it's
 not blank.
 

-GroupOverrideFilename (optional): this is the override file which contains
-the list of email addresses which, if part of the Maintainer field, cause
-uploads to always be treated as maintainer uploads.
-

 FutureTimeTravelGrace (required): specifies how many seconds into the
 future timestamps are allowed to be inside a deb before being rejected.
 
 FutureTimeTravelGrace (required): specifies how many seconds into the
 future timestamps are allowed to be inside a deb before being rejected.