X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=web%2Findex.html;h=9f0adcaed700cfc316e513d7662da3aec6a90512;hb=74763843f7e21f31e09550ec0c7d07ba88e26040;hp=7e3ca97c8310c824ea3fc3d73b6400a9c370fb0d;hpb=0fbf46fb7da5309d9fca4761178c1375cb8916ee;p=dak.git

diff --git a/web/index.html b/web/index.html
index 7e3ca97c..9f0adcae 100644
--- a/web/index.html
+++ b/web/index.html
@@ -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>
 
@@ -65,22 +66,44 @@
 		<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">
@@ -89,22 +112,6 @@
  
             <p>The source is managed in git and is available
             from: <a href="http://ftp-master.debian.org/git/">http://ftp-master.debian.org/git/</a></p>
-
-		    <p>The old bzr tree is obsolete and no longer available. All
-		  information in it is now in git</p>
-		  
-            <p>The old CVS tree is obsolete but still available for historical purposes.
-            It's at <strong>:pserver:anonymous@cvs.debian.org:/cvs/dak</strong>;
-            the module is 'dak' and the login password is blank.
-            The old CVS repository can be <a href="http://cvs.debian.org/?cvsroot=dak">browsed</a>
-            courtesy of viewcvs.</p>
-
-            <p>You can also install the <a href="http://packages.debian.org/unstable/devel/dak">dak Package</a>
-            if you want to look at it and maybe run your own copy.</p>
-
-            <p>The <strong>really</strong> old dinstall scripts are still available
-            from <strong>:pserver:anonymous@cvs.debian.org:/cvs/ftp-maint</strong>;
-            the modules are 'dinstall' and 'masterfiles'.</p>
         </div>
 
 		<div id="new"> 
@@ -156,7 +163,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>
 
@@ -193,7 +200,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 />