Remove normative language from proxy configuration and rework references. Fixes #451

This is a general cleanup of the proxy configuration section of the spec.

Author: AutomatedTester

webdriver-spec.html

@@ -450,6 +450,11 @@ <h3>Dependencies</h3>
    <!-- ScrollIntoViewOptions --> <li><dfn><a href=https://drafts.csswg.org/cssom-view/#dictdef-scrollintoviewoptions><code>ScrollIntoViewOptions</code></a></dfn>
   </ul>
 
+ <dt>SOCKS Proxy and related specification:
+ <dd><p>To be <dfn>SOCKS Proxy</dfn> and <dfn>SOCKS authentication</dfn> compliant,
+  it is supposed that the implementation supports the relevant subsets of
+  [[!RFC1928]] and [[!RFC1929]].
+
  <dt>Unicode
  <dd>The following terms are defined in the  standard: [[!Unicode]]
   <ul>
@@ -462,8 +467,10 @@ <h3>Dependencies</h3>
    <!-- Absolute URL --> <li><dfn><a href=https://url.spec.whatwg.org/#syntax-url-absolute>Absolute URL</a></dfn>
    <!-- Absolute URL with fragment --> <li><dfn><a href=https://url.spec.whatwg.org/#syntax-url-absolute-with-fragment>Absolute URL with fragment</a></dfn>
    <!-- Domain --><li><dfn><a href="https://url.spec.whatwg.org/#concept-domain">Domain</a></dfn>
+   <!-- Host --> <li><dfn><a href="https://url.spec.whatwg.org/#concept-host">Host</a></dfn>
    <!-- Path-absolute URL --> <li><dfn><a href=https://url.spec.whatwg.org/#syntax-url-path-absolute>Path-absolute URL</a></dfn>
    <!-- Path --> <li><dfn><a href=https://url.spec.whatwg.org/#concept-url-path>Path</a></dfn>
+   <!-- Port --> <li><dfn><a href="https://url.spec.whatwg.org/#concept-url-port">Port</a></dfn>
    <!-- URL serialiser --> <li><dfn><a href=https://url.spec.whatwg.org/#concept-url-serializer>URL serialiser</a></dfn>
   </ul>
 
@@ -1702,125 +1709,123 @@ <h3>Proxy</h3>
 <th>Key
 <th>Value Type
 <th>Description
+<th>Valid values
 </tr>
 </thead>
 
 <tbody>
 <tr>
-<td>"<code>proxyType</code>"
+<td><dfn>"<code>proxyType</code>"</dfn>
 <td>string
-<td>Indicates the type of proxy configuration. This value <em>SHOULD</em> be one
-of the following: "<code>pac</code>", "<code>noproxy</code>",
+<td>Indicates the type of proxy configuration.
+<td>"<code>pac</code>", "<code>noproxy</code>",
 "<code>autodetect</code>", "<code>system</code>", or "<code>manual</code>".
 </tr>
 
 <tr>
 <td>"<code>proxyAutoconfigUrl</code>"
 <td>string
-<td>Defines the URL for a proxy auto-config file. [URL]
-  This property <em>SHOULD</em> only be set when the "<code>proxyType</code>" is
-  equal to "<code>pac</code>".
+<td>Defines the URL for a proxy auto-config file if <a>"<code>proxyType</code>"</a>
+  is equal to "<code>pac</code>". [URL]
+<td>
 </tr>
 
 <tr>
 <td>"<code>ftpProxy</code>"
 <td>string
-<td>Defines the proxy <em>hostname</em> for FTP traffic. Alternatively, an
-  implementation <em>MAY</em> accept a hostname and port through this property.
-  This property <em>SHOULD</em> only be set when the "<code>proxyType</code>" is
+<td>Defines the proxy <a>host</a> for FTP traffic when the <a>"<code>proxyType</code>"</a> is
   equal to "<code>manual</code>".
+<td>
 </tr>
 
 <tr>
 <td>"<code>ftpProxyPort</code>"
 <td>number
-<td>Defines the proxy <em>port</em> for FTP traffic.
-  This property <em>SHOULD</em> only be set when the "<code>proxyType</code>" is
+<td>Defines the proxy <a>port</a> for FTP traffic when the <a>"<code>proxyType</code>"</a> is
   equal to "<code>manual</code>".
+<td>
 </tr>
 
 <tr>
 <td>"<code>httpProxy</code>"
 <td>string
-<td>Defines the proxy <em>hostname</em> for HTTP traffic. If a hostname and port
-  is passed through this property, set "<code>httpProxy</code>" to the hostname
-  and "<code>httpProxyPort</code>" to the port.
-  <p>This property <em>SHOULD</em> only be set when the "<code>proxyType</code>" is
-  equal to "<code>manual</code>".
+<td>Defines the proxy <a>host</a> for HTTP traffic. If a <a>URL</a>
+  is passed through this property, set "<code>httpProxy</code>" to the <a>host</a>
+  and "<code>httpProxyPort</code>" to the <a>port</a> when the <a>"<code>proxyType</code>"</a>
+   is equal to "<code>manual</code>".
+<td>
 </tr>
 
 <tr>
 <td>"<code>httpProxyPort</code>"
 <td>number
-<td>Defines the proxy <em>port</em> for HTTP traffic. If "<code>httpProxyPort</code>"
-  is defined in "<code>httpProxy</code>" and from this property, return <a>error</a> with <a>error code</a> <a>invalid argument</a>.
-  This property <em>SHOULD</em> only be set when the "<code>proxyType</code>" is
-  equal to "<code>manual</code>".
+<td>Defines the proxy <a>port</a> for HTTP traffic when the "<code>proxyType</code>" is
+equal to "<code>manual</code>". If "<code>httpProxyPort</code>"
+  is defined in "<code>httpProxy</code>" and from this property, return <a>error</a>
+  with <a>error code</a> <a>invalid argument</a>.
+<td>
 </tr>
 
 <tr>
 <td>"<code>sslProxy</code>"
 <td>string
-<td>Defines the proxy <em>hostname</em> for encrypted TLS traffic. If a hostname and port
-  is passed through this property, set "<code>sslProxy</code>" to the hostname
-  and "<code>sslProxyPort</code>" to the port.
-  This property <em>SHOULD</em> only be set when the "<code>proxyType</code>" is
-  equal to "<code>manual</code>".
+<td>Defines the proxy <a>host</a> for encrypted TLS traffic when the "<code>proxyType</code>" is
+equal to "<code>manual</code>". If a <a>URL</a> is passed through this property,
+set "<code>sslProxy</code>" to the <a>host</a> and "<code>sslProxyPort</code>" to the <a>port</a>.
+<td>
 </tr>
 
 <tr>
 <td>"<code>sslProxyPort</code>"
 <td>number
-<td>Defines the proxy <em>port</em> for ssl traffic. If "<code>sslProxyPort</code>"
-  is defined in "<code>sslProxy</code>" and from this property, return <a>error</a> with <a>error code</a> <a>invalid argument</a>.
-  This property <em>SHOULD</em> only be set when the "<code>proxyType</code>" is
-  equal to "<code>manual</code>".
+<td>Defines the proxy <a>port</a> for ssl traffic when the "<code>proxyType</code>" is
+equal to "<code>manual</code>". If "<code>sslProxyPort</code>" is defined in "<code>sslProxy</code>"
+ and from this property, return <a>error</a> with <a>error code</a> <a>invalid argument</a>.
+<td>
 </tr>
 
 <tr>
 <td>"<code>socksProxy</code>"
 <td>string
-<td>Defines the proxy <em>hostname</em> for a SOCKS proxy. [[RFC1928]]
-  Alternatively, an implementation <em>MAY</em> accept a hostname and port
-  through this property.
-  This property <em>SHOULD</em> only be set when the "<code>proxyType</code>" is
-  equal to "<code>manual</code>".
+<td>Defines the proxy <a>host</a> for a <a>SOCKS proxy</a> when the "<code>proxyType</code>" is
+equal to "<code>manual</code>".
+If a <a>URL</a> is passed through this property,
+set "<code>socksProxy</code>" to the <a>host</a> and "<code>socksProxyPort</code>" to the <a>port</a>.
+<td>
 </tr>
 
 <tr>
 <td>"<code>socksProxyPort</code>"
 <td>number
-<td>Defines the proxy <em>port</em> for a SOCKS proxy. [[RFC1928]]
-  This property <em>SHOULD</em> only be set when the "<code>proxyType</code>" is
-  equal to "<code>manual</code>".
+<td>Defines the proxy <a>port</a> for a <a>SOCKS proxy</a> when the "<code>proxyType</code>" is
+equal to "<code>manual</code>".
+If "<code>socksProxyPort</code>" is defined in "<code>socksProxyPort</code>"
+ and from this property, return <a>error</a> with <a>error code</a> <a>invalid argument</a>.
+<td>
 </tr>
 
 <tr>
 <td>"<code>socksVersion</code>"
 <td>number
-<td>Defines the SOCKS proxy version.
-  This property <em>SHOULD</em> only be set when the "<code>proxyType</code>" is
+<td>Defines the <a>SOCKS proxy</a> version when the "<code>proxyType</code>" is
   equal to "<code>manual</code>".
+<td>
 </tr>
 
 <tr>
 <td>"<code>socksUsername</code>"
 <td>string
-<td>
-  Defines the username used when authenticating with a SOCKS proxy. [[RFC1928]]
-  This property <em>SHOULD</em> only be set when the "<code>proxyType</code>" is
+<td>Defines the username used when <a data-lt='socks authentication'>authenticating</a> with a <a>SOCKS proxy</a> when the "<code>proxyType</code>" is
   equal to "<code>manual</code>".
+<td>
 </tr>
 
 <tr>
 <td>"<code>socksPassword</code>"
 <td>string
+<td>Defines the password used when <a data-lt='socks authentication'>authenticating</a> with a <a>SOCKS proxy</a>, when the "<code>proxyType</code>" is
+  equal to "<code>manual</code>", and is not returned with <a>capabilties</a> to the <a>local end</a>.
 <td>
-  Defines the password used when authenticating with a SOCKS proxy. [[RFC1928]]
-  This property <em>SHOULD</em> only be set when the "<code>proxyType</code>" is
-  equal to "<code>manual</code>".
-  This property <em>MUST NOT</em> be set by a <a>remote end</a> when returning
-  <a>capabilities</a> to the <a>local end</a>.
 </tr>
 
 </tbody>