removed outdated note about ftp/web; moved stuff about e-mails below where it's most pertinent; explained optional things in comments

CVS version numbers

english/mirror/submit.wml: 1.54 -> 1.55

1 files changed, 39 insertions, 13 deletions

diff --git a/english/mirror/submit.wml b/english/mirror/submit.wml
index 1d2b3084da0..da6ecbb0a24 100644
--- a/english/mirror/submit.wml
+++ b/english/mirror/submit.wml
@@ -1,7 +1,9 @@
 #use wml::debian::template title="Submit Mirror Information"
 
-<p>If you would like to submit information about a mirror of Debian
-(FTP archive, web), you can do so using the form below.</p>
+<p>If you would like to submit information about a mirror of Debian,
+you can do so using the form below.
+Most information provided will be displayed in the mirror list.
+</p>
 
 <p>There are <a href="#examples">examples</a> at the bottom of the page in
 case you aren't sure how to proceed.</p>
@@ -13,12 +15,6 @@ did not receive them. We apologize for this problem, which was caused by a
 programming error in the processing software. If you submitted during this
 time, please re-submit your mirror again.</p>
 
-<p>Most information provided will be displayed in the mirror list.
-The public mirror maintainer e-mail address will be available to all users.
-If you submit a private address, it will be available only to Debian mirror
-list editors, in order for them to contact you with important news and/or
-bug reports.</p>
-
 <p>Please note that an official mirror must follow the
 <a href="ftpmirror">rules and guidelines laid out in our documentation</a>.</p>
 
@@ -76,11 +72,23 @@ Leave non-relevant fields blank.</p>
 <tablerow "Mirror is updated from"          mirrors_from  30>
 <tablerow "Name of site maintainer"         maint_name    30>
 <tablerow "Public e-mail of site maintainer"              maint_public_email    30>
+<tr><td>&nbsp;</td><td>
+<small>
+The public mirror maintainer e-mail address will be available to all users.
+</small>
+</td></tr>
 <tr><td>Country of site:  <td><select name="country">
 #include "$(ENGLISHDIR)/mirror/countries.data"
 <: country_list() :>
 </select>
 <tablerow "Private e-mail of site maintainer (optional)"  maint_private_email   30>
+<tr><td>&nbsp;</td><td>
+<small>
+If you submit a private address, it will be available only to Debian mirror
+list editors, in order for them to contact you with important news and/or
+bug reports.
+</small>
+</td></tr>
 <tablerow "Location of site (optional)"     location      30>
 <tablerow "Name of site sponsor (optional)" sponsor_name  30>
 <tablerow "URL of site sponsor (optional)"  sponsor_url   30>
@@ -156,23 +164,41 @@ Mirror is updated from: <code>ftp.xy.debian.org</code>
 <div class="centerblock">
 <p>
 Name of site maintainer: <code>John Doe</code><br>
-Email of site maintainer: <code>address.goes@here.example.com</code>
+Public e-mail of site maintainer: <code>address.goes@here.example.com</code>
 </p>
 </div>
 
-<p>(Once again, the maintainer address will not be shown on the public lists,
-but on sites used by mirror list editors.
-Please enter a correct address.)</p>
+<p>This maintainer address will not generally be shown on the public lists,
+but it's necessary to have one so that the mirror list editors and users
+can contact you in case of problems. Please enter a correct address.</p>
 
-<p>The other information would be:</p>
+<p>The only other piece of information necessary is the country.
+For example:</p>
 
 <div class="centerblock">
 <p>
 Country: <code>United States [US]</code><br>
+</p>
+</div>
+
+<p>You could also optionally add:</p>
+
+<div class="centerblock">
+<p>
+Private e-mail of site maintainer (optional): <code>private@address.here</code>
+Location of site (optional): <code>Place, region name</code>
+Name of site sponsor (optional): <code>Site sponsor name</code>
+URL of site sponsor (optional): <code>http://name.of.sponsor.tld/</code>
 Comment: <code>Any notes you feel would help others</code>
 </p>
 </div>
 
+<p>Here you can enter a private e-mail address that will be sent only
+to a select few mirror list editors, in case you'd like to give us a
+more direct address but are weary of publishing it.
+You can also give credit to the site sponsor and give other specific
+information about your site.</p>
+
 <p>The following example would describe the mirror at ftp.uk.debian.org:</p>
 
 <div class="centerblock">