Activating new maintainer contacts page

CVS version numbers

english/devel/index.wml: 1.24 -> 1.25 
english/intro/organization.wml: 1.4 -> 1.5

2 files changed, 13 insertions, 14 deletions

diff --git a/english/devel/index.wml b/english/devel/index.wml
index 86c802969fb..a0d691e5aca 100644
--- a/english/devel/index.wml
+++ b/english/devel/index.wml
@@ -18,7 +18,7 @@ to Debian developers.
       with <A HREF="developers.xearth">xearth</A>. An
       <A HREF="developers.gif">image</A> was made using that data.(this is out
 	of date)
-  <LI><A HREF="maintainer_contacts">Debian contacts</A>
+  <LI><A HREF="../intro/organization">Debian contacts</A>
   <LI><A HREF="ftp://ftp.debian.org/debian/doc/debian-keyring.tar.gz">
        Debian Maintainers PGP Keys</A>.<BR>
        <UL><LI><A HREF="extract_key">Extract a single key</A></UL>
diff --git a/english/intro/organization.wml b/english/intro/organization.wml
index 961286fbb60..879d2a08fe6 100644
--- a/english/intro/organization.wml
+++ b/english/intro/organization.wml
@@ -1,12 +1,11 @@
 <define-tag Intro>
 <P>Occasionally people need to contact someone about a particular aspect of
-Debian.  The following is a list of different jobs and who is responsible for
-each.  Generic addresses should <em>always</em> be used when they exist.
-Members responsible for a given duty are listed for administrative purposes
-only.
+Debian.  The following is a list of different jobs and the email address to
+use to contact the people responsible for those tasks.
 
 <P>This has been maintained rather piecemeal so if anything is missing or
 incorrect please send corrections to
+
 <A HREF="mailto:webmaster@debian.org">webmaster@debian.org</A>.
 </define-tag>
 
@@ -200,15 +199,15 @@ incorrect please send corrections to
 <UL>
 	<job <A HREF="$(HOME)/devel/"><development></A>> 
 	<genericemail debian-devel@lists.debian.org>
-	<P>I havn't decided if these should be on this page or one page down.
-	<UL>
-	   <LI>Apt (Deity) Team --
-    	   &lt;<A HREF="mailto:deity@lists.debian.org">deity@lists.debian.org</A>&gt;
-	    <li>  debian-admintool
-	    <li>  debian-autobuild
-	    <li>  debian-python
-	    <li>debian-i18n
-	</ul>
+#	<P>I havn't decided if these should be on this page or one page down.
+#	<UL>
+#	   <LI>Apt (Deity) Team --
+#    	   &lt;<A HREF="mailto:deity@lists.debian.org">deity@lists.debian.org</A>&gt;
+#	    <li>  debian-admintool
+#	    <li>  debian-autobuild
+#	    <li>  debian-python
+#	    <li>debian-i18n
+#	</ul>
 	<job <ftp>>
 	<genericemail ftpmaster@debian.org>
 	<job <packages>>