X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=web%2Findex.html;h=1b684159c7cd2a2ea6595cb7dc4b9d8e686a811e;hb=9dd35112e98631a7e367d2dd6cc3b05ba1a4ea3a;hp=db540dcb7b20e1ff109c0a625650526426b2143d;hpb=3148198fab7186b34d4b0d4c2eed088d46e43271;p=dak.git

diff --git a/web/index.html b/web/index.html
index db540dcb..1b684159 100644
--- a/web/index.html
+++ b/web/index.html
@@ -35,7 +35,7 @@
         <div id="leftcol">
 		  <ul>
 			<li><a href="#intro">Introduction</a></li>
-			<li><a href="#archivekey">Archive Signing Key</a></li>
+			<li><a href="/keys.html">Archive Signing Key</a></li>
 			<li><a href="#ftpteam">FTP Team</a></li>
 			<li><a href="#dak">dak</a></li>
 			<li><a href="#new">NEW</a></li>
@@ -46,6 +46,7 @@
 			<li><a href="#rejections">Rejections</a></li>
 <!--			<li><a href="#dependencies">Unmet Dependencies</a></li>-->
 			<li><a href="#archivecriteria">Archive Criteria</a></li>
+			<li><a href="#talks">Talks</a></li>
 		  </ul>
 		</div>
 
@@ -58,33 +59,51 @@
         <div id="archivekey">
             <h1>Archive signing key</h1>
 
-            <p>The release files are signed by an automatic archive signing key. The
-            2007/etch key can be <a href="archive-key-4.0.asc">downloaded here</a></p>
-
-            <p>The release files are signed by an automatic archive signing key. The
-            new key, to be used after the 4.0 key expires *or* right
-		  after Lenny r1 came out, can be  <a href="archive-key-5.0.asc">downloaded here</a></p>
-		</div>
+            <p>Information on the archive signing keys is available <a
+            href="/keys.html">here</a></p>
+            </div>
 
 		<div id="ftpteam">
             <h1>The ftpmaster team</h1>
 
-            <p>The members of ftpmaster currently are divided into two groups, FTP Master and FTP Assistants.</p>
+	    <p>The members of ftpmaster currently are divided into three groups, FTP Master,FTP Assistants and FTP Trainee.</p>
             <p>Members of FTP Master are:</p>
             <ul>
-                <li>Ryan Murray</li>
                 <li>Joerg Jaspert</li>
+                <li>Mark Hymers</li>
             </ul>
             <p>The FTP Assistants are:</p>
             <ul>
-                <li>Mark Hymers</li>
-                <li>Kalle Kivimaa</li>
 				<li>Frank Lichtenheld</li>
 				<li>Mike O'Connor</li>
+				<li>Alexander Reichle-Schmehl</li>
+				<li>Chris Lamb</li>
+				<li>Barry deFreese</li>
+				<li>Torsten Werner</li>
             </ul>
             
             <p>This information (and more like it) is available from
             <a href="http://www.debian.org/intro/organization">Debian's Organizational Structure</a>.</p>
+
+	    <p>The FTP Master role, unix group <tt>debadmin</tt>, is responsible for:</p>
+	    <ul>
+		    <li>Keep the archive running</li>
+		    <li>Keep the archive legal</li>
+		    <li>Support the teams that depend on it (Release, Security, soon backports/volatile)</li>
+		    <li>Keep the archive uptodate with the requirements of the project</li>
+	    </ul>
+
+	    <p>The FTP Assistent role, unix group <tt>ftpteam</tt>, created in 2005,
+	    allows the addition of people to the FTP Team without having to hand out
+	    full FTP Master rights. It allows</p>
+	    <ul>
+		    <li>to process NEW,</li>
+		    <li>to handle overrides,</li>
+		    <li>to remove packages.</li>
+	    </ul>
+
+	    <p>The FTP Trainee role, group <tt>ftptrainee</tt>, was created in 2008 to allow easy training and testing of future team members.</p>
+            <p>Trainees can look at NEW and do the usual package checks, but they can not actually accept or reject a package. Instead they leave a note, which an Assistant or Master reads and acts on.</p>
         </div>
 
         <div id="dak">
@@ -160,7 +179,7 @@
 
         <div id="testing">
             <h1>Testing</h1>
-            <p>Lenny is testing, sid is unstable. For more details please look
+            <p>Squeeze is testing, sid is unstable. For more details please look
             at the <a href="http://www.debian.org/devel/testing">testing</a> pages.</p>
         </div>
 
@@ -197,7 +216,13 @@
             <a href="/archive-criteria.html">Criteria</a> for inclusion in the archive
             of new architectures.
         </div>
+        <div id="talks">
+            <h1>Talks</h1>
+
+            <a href="ftpmaster.pdf">DebConf 2009</a>, Cáceres, Spain.
         </div>
+
+		</div>
         </div>
         </div>
     <hr />