clarified details on what FAQ format is where (pure HTML is no longer at the FTP site); emphasized the use of documentation in the opening paragraph; 'a user mailing list' is vague; updated the link to i18n lists stuff and clarified what it was; added notes on what to do with install system bugs (that is a FAQ, trust me); added -project list as general information addy; clarified ambigous 'mirroring Debian web pages' reference

CVS version numbers

english/contact.wml: 1.16 -> 1.17

1 files changed, 20 insertions, 12 deletions

diff --git a/english/contact.wml b/english/contact.wml
index 3911e8180d3..83be8b73c34 100644
--- a/english/contact.wml
+++ b/english/contact.wml
@@ -7,18 +7,18 @@
 <a href="ftp://ftp.debian.org/debian/">ftp://ftp.debian.org/debian/</a>.
 
 <p>Our FAQ will answer many of your questions.  You can view it at
-<a href="$(HOME)/doc/FAQ/">http://www.debian.org/doc/FAQ/</a>
-or
-<a href="ftp://ftp.debian.org/debian/doc/FAQ/">ftp://ftp.debian.org/debian/doc/FAQ/</a>.
+<a href="$(HOME)/doc/FAQ/">http://www.debian.org/doc/FAQ/</a>.
 You can also get the PostScript, text and packed-up HTML versions from the
-FTP site.
+FTP site at
+<a href="ftp://ftp.debian.org/debian/doc/FAQ/">ftp://ftp.debian.org/debian/doc/FAQ/</a>.
 
 
 <H2>Installing and Using Debian</H2>
 
-<p>We have a very active user mailing list where Debian users and developers
-can answer your questions. Simply
-<a href="$(HOME)/MailingLists/subscribe#debian-user">subscribe to
+<p>If you are certain the documentation on the installation media and on our
+web site doesn't have a solution to your problem, there's a very active user
+mailing list where Debian users and developers can answer your questions.
+Simply <a href="$(HOME)/MailingLists/subscribe#debian-user">subscribe to
 <em>debian-user</em></a> and send your question to
 <a href="mailto:debian-user@lists.debian.org">debian-user@lists.debian.org</a>.
 All questions regarding
@@ -29,12 +29,18 @@ All questions regarding
   <LI>machine administration
   <LI>using Debian
 </UL>
-should be sent to a user mailing list.
+should be sent to <em>debian-user</em> mailing list.
 
 <p>Additionally, there are user mailing lists for speakers of various
-languages. See the
-<a href="$(HOME)/MailingLists/subscribe">mailing list
-subscription page</a> for a list and subscription information.
+languages. See the <a href="MailingLists/subscribe#int">subscription info
+for international mailing lists</a>.
+
+<p>If you think you've found a bug in our installation system, send
+information about it to
+<a href="mailto:debian-boot@lists.debian.org">debian-boot@lists.debian.org</a>
+or <a href="Bugs/Reporting">file a bug report</a> against the <a
+href="http://bugs.debian.org/boot-floppies">boot-floppies</a>
+pseudo-package.
 
 
 <H2>Debian Development</H2>
@@ -71,6 +77,8 @@ department</a>.
 <H2>Commonly Requested Addresses</H2>
 
 <dl>
+<dt>General information about the Debian Project</dt>
+  <dd><a href="mailto:debian-project@lists.debian.org">debian-project@lists.debian.org</a></dd>
 <dt>Mailing List Administrators
   <dd><a href="mailto:listmaster@lists.debian.org">listmaster@lists.debian.org</a>
 <dt>Mailing List Archives
@@ -82,7 +90,7 @@ department</a>.
 <dt>Developers' Database Web Pages
   <dd><a href="mailto:admin@db.debian.org">admin@db.debian.org</a>
 <dt>Mirroring Debian
-  <dd>See the <a href="mirror/">mirroring Debian web pages</a> or contact the
+  <dd>See the pages on <a href="mirror/">mirroring Debian</a> or contact the
   <a href="mailto:mirrors@debian.org">mirror list administrators</a>.
 <dt>Selling Debian CDs
   <dd>See the <a href="distrib/cdinfo">information for CD vendors</a>.