--- a/discovery-api/Overview.src.html	Thu Jan 17 15:07:19 2013 +0100
+++ b/discovery-api/Overview.src.html	Thu Jan 17 15:08:37 2013 +0100
@@ -1477,31 +1477,31 @@
         </p>
         <p>
           Let <var>dial version</var> be the version number specified in the <a>valid service type</a> token.
-          Let <var>dial search target</var> be the concatentation of the 
+          Let <var>dial search target</var> be the concatentation of the
           <code>urn:dial-multiscreen-org:service:dial:</code> string constant with the <var>dial version</var>
-          (currently, <var>dial version</var> can only be <code>1</code>) 
+          (currently, <var>dial version</var> can only be <code>1</code>)
         </p>
         <p>
           The user agent MUST issue all <a title="search request for DIAL devices">search requests for DIAL
           devices</a> with a HTTP request line equal to <code>M-SEARCH * HTTP/1.1</code>, with a HOST header equal to
           the reserved multicast address and port of <code>239.255.255.250:1900</code>, a MAN header equal to
           <code>ssdp:discover</code>, an ST header equal to <var>dial search target</var>
-          and a user-agent defined MX header equal to a <dfn>maximum UPnP advertisement response wait time</dfn>
+          and a user-agent defined MX header equal to a <dfn>maximum DIAL advertisement response wait time</dfn>
           value between <code>1</code> and <code>5</code> seconds.
         </p>
         <p>
           The user agent MUST listen for any incoming responses to a <a>search request for DIAL devices</a>.
         </p>
         <p>
-          For each <dfn>HTTP Response</dfn> following an initial <a>search request for DIAL devices</a> sent on a
+          For each HTTP Response following an initial <a>search request for DIAL devices</a> sent on a
           <a>standard UPnP address and port</a> the user agent MUST run the following steps:
         </p>
         <ol class="rule">
-          <li>If the <a>HTTP Response</a> is not a HTTP 200 OK response then this response is invalid and the user
+          <li>If the HTTP Response is not a HTTP 200 OK response then this response is invalid and the user
           agent MUST discard this response, abort any remaining steps and return. The user agent MAY issue a new
           <a>search request for DIAL devices</a> as a result of this error occurring.
           </li>
-          <li>If the <a>maximum UPnP advertisement response wait time</a> has been exceeded since the initial <a>search
+          <li>If the <a>maximum DIAL advertisement response wait time</a> has been exceeded since the initial <a>search
           request for DIAL devices</a> was sent then the <a>HTTP Response</a> is invalid and the user agent MUST
           discard this response, abort any remaining steps and return. The user agent MAY stop listening for responses
           from the current <a>search request for DIAL devices</a> as a result of this error occurring. Equally,
@@ -1526,7 +1526,7 @@
           </li>
         </ol>
         <p>
-          The rule for <dfn>obtaining a UPnP Device Description File</dfn> is the process of obtaining the contents of
+          The rule for <dfn>obtaining a DIAL Device Description File</dfn> is the process of obtaining the contents of
           a standard UPnP Device Description [[!UPNP-DEVICEARCH11]] from a URL-based resource. This rule takes three
           arguments - <var>device descriptor URL</var>, <var>device identifier</var> and <var>device expiry</var> - and
           when called the user agent MUST run the following steps: