From 95f1f3cc885b304f8f9223a3f4451be099d97403 Mon Sep 17 00:00:00 2001
From: Andreas Tolfsen <ato@mozilla.com>
Date: Thu, 12 Feb 2015 21:33:28 +0100
Subject: [PATCH] navigation: remove last references to conservative page
 loading strategy

---
 05_navigation.html  | 4 ++--
 webdriver-spec.html | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/05_navigation.html b/05_navigation.html
index 4badca30d..8fcdd557b 100644
--- a/05_navigation.html
+++ b/05_navigation.html
@@ -23,7 +23,7 @@ <h3>'eager'</h3>
     <h3>'none'</h3>
     <p>The remote end MUST not do any checks against "<code>document.readyState</code>".</p>
 
-    <p>All WebDriver implementations MUST support the <code>normal</code> and <code>eager</code> modes and SHOULD support the <code>conservative</code> and <code>none</code> modes. If no page loading strategy is chosen, then <code>normal</code> MUST be the default.
+    <p>All WebDriver implementations MUST support the <code>normal</code> and <code>eager</code> modes and SHOULD support the <code>none</code> mode. If no page loading strategy is chosen, then <code>normal</code> MUST be the default.
     In addition, implementors MAY add additional page loading strategies.</p>
   </section>
 
@@ -50,7 +50,7 @@ <h3>get()</h3>
 
         <ul>
           <li>HTTP redirects MUST be automatically followed without responding to the command.</li>
-          <li>When a page contains a META tag with the "http-equiv" attribute set to "refresh", a response MUST be returned if the timeout is greater than 1 second and the other criteria for determining whether a page is loaded are met. When the refresh period is 1 second or less and the page loading strategy is "normal" or "conservative" implementations MUST wait for the refresh to complete before responding.</li>
+          <li>When a page contains a META tag with the "http-equiv" attribute set to "refresh", a response MUST be returned if the timeout is greater than 1 second and the other criteria for determining whether a page is loaded are met. When the refresh period is 1 second or less and the page loading strategy is "normal" implementations MUST wait for the refresh to complete before responding.</li>
           <li>If any modal dialog box, such as those opened by on <code>window.onbeforeunload</code> or <code>window.alert</code>, is opened at any point in the page load, a response MUST be sent.</li>
           <li>If a 401 response is seen by the browser, a response MUST be sent. That is, if BASIC, DIGEST, NTLM or similar authentication is required, the page load is assumed to be complete. This does not include FORM-based authentication.</li>
         </ul>
diff --git a/webdriver-spec.html b/webdriver-spec.html
index 2ee571a53..56c49a1d7 100644
--- a/webdriver-spec.html
+++ b/webdriver-spec.html
@@ -553,7 +553,7 @@ <h3>'eager'</h3>
     <h3>'none'</h3>
     <p>The remote end MUST not do any checks against "<code>document.readyState</code>".</p>
 
-    <p>All WebDriver implementations MUST support the <code>normal</code> and <code>eager</code> modes and SHOULD support the <code>conservative</code> and <code>none</code> modes. If no page loading strategy is chosen, then <code>normal</code> MUST be the default.
+    <p>All WebDriver implementations MUST support the <code>normal</code> and <code>eager</code> modes and SHOULD support the <code>none</code> mode. If no page loading strategy is chosen, then <code>normal</code> MUST be the default.
     In addition, implementors MAY add additional page loading strategies.</p>
   </section>
 
@@ -580,7 +580,7 @@ <h3>get()</h3>
 
         <ul>
           <li>HTTP redirects MUST be automatically followed without responding to the command.</li>
-          <li>When a page contains a META tag with the "http-equiv" attribute set to "refresh", a response MUST be returned if the timeout is greater than 1 second and the other criteria for determining whether a page is loaded are met. When the refresh period is 1 second or less and the page loading strategy is "normal" or "conservative" implementations MUST wait for the refresh to complete before responding.</li>
+          <li>When a page contains a META tag with the "http-equiv" attribute set to "refresh", a response MUST be returned if the timeout is greater than 1 second and the other criteria for determining whether a page is loaded are met. When the refresh period is 1 second or less and the page loading strategy is "normal" implementations MUST wait for the refresh to complete before responding.</li>
           <li>If any modal dialog box, such as those opened by on <code>window.onbeforeunload</code> or <code>window.alert</code>, is opened at any point in the page load, a response MUST be sent.</li>
           <li>If a 401 response is seen by the browser, a response MUST be sent. That is, if BASIC, DIGEST, NTLM or similar authentication is required, the page load is assumed to be complete. This does not include FORM-based authentication.</li>
         </ul>