From: Martin Zobel-Helas <zobel@debian.org>
Date: Tue, 10 Aug 2010 06:38:39 +0000 (+0200)
Subject: Merge branch 'master' of git+ssh://db.debian.org/git/userdir-ldap-cgi
X-Git-Tag: release-0.3.33~11
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fuserdir-ldap-cgi.git;a=commitdiff_plain;h=2b01c5617d95921bc02d401bd135608d56518c3c;hp=f424698d5812a51d3e8b58cb63b9096e6612cfb8

Merge branch 'master' of git+ssh://db.debian.org/git/userdir-ldap-cgi
---

diff --git a/html/doc-mail.wml b/html/doc-mail.wml
index 8b48dd8..99fcb04 100644
--- a/html/doc-mail.wml
+++ b/html/doc-mail.wml
@@ -124,11 +124,11 @@ DNS and ssh keys, any list specified must be specified in its enterity.  The for
 <b>listtype</b> <b>dns.domain.of.rbl/IP to whitelist</b> where listtype is one of mailRBL,
 mailRHSBL, and mailWhitelist
 
-<li>Debian.net DNS Zone Entry. The only way to get a debian.net address is
-to use the mail gateway. It
-will verify the request and prevent name collisions automatically. Requests
-can take three forms: <tt>'foo in a 1.2.3.4'</tt>, <tt>'foo in cname
-foo.bar.'</tt>, or <tt>'foo in mx 10 foo.bar.'</tt> (note the trailing dot).
+<li>The only way to get a dnsZoneEntry record for a debian.net address is to
+use the mail gateway. It will verify the request and prevent name collisions
+automatically. Requests can take three forms: <tt>'foo in a 1.2.3.4'</tt>,
+<tt>'foo in cname foo.bar.'</tt>, or <tt>'foo in mx 10 foo.bar.'</tt> (note
+the trailing dot).
 Note that you
 cannot combine CNAME with any other record types. The precise form
 is critical and must not be deviated from.