html5/spec acknowledgements.html,1.913,1.914 browsers.html,1.903,1.904 dom.html,1.909,1.910 editing.html,1.904,1.905 embedded-content-0.html,1.895,1.896 forms.html,1.902,1.903 history.html,1.899,1.900 iana.html,1.234,1.235 index.html,1.905,1.906 infrastructure.html,1.917,1.918 interactive-elements.html,1.901,1.902 introduction.html,1.906,1.907 named-character-references.html,1.896,1.897 obsolete.html,1.899,1.900 offline.html,1.897,1.898 references.html,1.903,1.904 semantics.html,1.917,1.918 spec.html,1.947,1.948 syntax.html,1.910,1.911 tabular-data.html,1.898,1.899 text-level-semantics.html,1.903,1.904 the-canvas-element.html,1.770,1.771 the-xhtml-syntax.html,1.908,1.909 video.html,1.778,1.779 webappapis.html,1.32,1.33 from Michael Smith via cvs-syncmail on 2010-04-06 (public-html-commits@w3.org from April 2010)

From: Michael Smith via cvs-syncmail <cvsmail@w3.org>
Date: Tue, 06 Apr 2010 00:47:24 +0000
To: public-html-commits@w3.org
Message-Id: <E1Nywwu-00017R-VF@lionel-hutz.w3.org>
Update of /sources/public/html5/spec
In directory hutz:/tmp/cvs-serv4262

Modified Files:
	acknowledgements.html browsers.html dom.html editing.html 
	embedded-content-0.html forms.html history.html iana.html 
	index.html infrastructure.html interactive-elements.html 
	introduction.html named-character-references.html 
	obsolete.html offline.html references.html semantics.html 
	spec.html syntax.html tabular-data.html 
	text-level-semantics.html the-canvas-element.html 
	the-xhtml-syntax.html video.html webappapis.html 
Log Message:
Make 'fetch' algorithm have a mode where it doesn't do redirects. Make 'navigate' algorithm block cross-origin non-safe non-POST redirects. (whatwg r4975)

[updated by splitter]


Index: infrastructure.html
===================================================================
RCS file: /sources/public/html5/spec/infrastructure.html,v
retrieving revision 1.917
retrieving revision 1.918
diff -u -d -r1.917 -r1.918
--- infrastructure.html	6 Apr 2010 00:16:38 -0000	1.917
+++ infrastructure.html	6 Apr 2010 00:47:21 -0000	1.918
@@ -290,7 +290,7 @@
   </head><body onload="fixBrokenLink(); init()"><div class="head" id="head">
    <p><a href="http://www.w3.org/"><img alt="W3C" height="48" src="http://www.w3.org/Icons/w3c_home" width="72"></a></p>
    <h1>HTML5</h1>
-   <h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2><p>This is revision 1.3997.</p>
+   <h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2><p>This is revision 1.3998.</p>
 
 
    </div><div>
@@ -3381,9 +3381,10 @@
 
   <p>When a user agent is to <dfn id="fetch">fetch</dfn> a resource or
   <a href="#url">URL</a>, optionally from an origin <i title="">origin</i>,
-  and optionally with a <i>synchronous flag</i>, the following steps
-  must be run. (When a <em>URL</em> is to be fetched, the URL
-  identifies a resource to be obtained.)</p>
+  and optionally with a <i>synchronous flag</i> and/or a <i>manual
+  redirect flag</i>, the following steps must be run. (When a
+  <em>URL</em> is to be fetched, the URL identifies a resource to be
+  obtained.)</p>
 
   <!-- if invoked with the synchronous flag, make sure to release the
   storage mutex first -->
@@ -3429,6 +3430,8 @@
 
    <li>
 
+    <p>This is the <i>main step</i>.</p>
+
     <p>If the resource is identified by an <a href="#absolute-url">absolute URL</a>,
     and the resource is to be obtained using an idempotent action
     (such as an HTTP GET <a href="#concept-http-equivalent-get" title="concept-http-equivalent-get">or
@@ -3442,13 +3445,9 @@
     <p>Otherwise, at a time convenient to the user and the user agent,
     download (or otherwise obtain) the resource, applying the
     semantics of the relevant specifications (e.g. performing an HTTP
-    GET or POST operation, or reading the file from disk, following
-    redirects, <a href="webappapis.html#concept-js-deref" title="concept-js-deref">dereferencing <span title="javascript protocol"><code title="">javascript:</code>
-    URLs</span></a>, etc).</p>
-
-    <p class="note">The HTTP specification requires that 301, 302, and
-    307 redirects, when applied to methods other than the safe
-    methods, not be followed without user confirmation. <a href="references.html#refsHTTP">[HTTP]</a></p>
+    GET or POST operation, or reading the file from disk, <a href="webappapis.html#concept-js-deref" title="concept-js-deref">dereferencing <span title="javascript
+    protocol"><code title="">javascript:</code> URLs</span></a>,
+    etc).</p>
 
     <p>For the purposes of the <code title="http-referer">Referer</code> (sic) header, use the
     <i>address of the resource from which Request-URIs are
@@ -3485,6 +3484,39 @@
 
    <li>
 
+    <p>If the fetched resource is an HTTP redirect <a href="#concept-http-equivalent-codes" title="concept-http-equivalent-codes">or equivalent</a>,
+    then:</p>
+
+    <dl class="switch"><dt>If the <i>manual redirect flag</i> is set</dt>
+
+     <dd>
+
+      <p>Continue, using the fetched resource (the redirect) as the
+      result of the algorithm.</p>
+
+     </dd>
+
+     <dt>Otherwise</dt>
+
+     <dd>
+
+      <p>First, apply any relevant requirements for redirects (such as
+      showing any appropriate prompts). Then, redo <i>main step</i>,
+      but using the target of the redirect as the resource to fetch,
+      rather than the original resource.</p>
+
+      <p class="note">The HTTP specification requires that 301, 302,
+      and 307 redirects, when applied to methods other than the safe
+      methods, not be followed without user confirmation. That would
+      be an appropriate prompt for the purposes of the requirement in
+      the paragraph above. <a href="references.html#refsHTTP">[HTTP]</a></p>
+
+     </dd>
+
+    </dl></li>
+
+   <li>
+
     <p>If the algorithm was not invoked with the <i>synchronous
     flag</i>: When the resource is available, or if there is an error
     of some description, <a href="webappapis.html#queue-a-task">queue a task</a> that uses the

Index: text-level-semantics.html
===================================================================
RCS file: /sources/public/html5/spec/text-level-semantics.html,v
retrieving revision 1.903
retrieving revision 1.904
diff -u -d -r1.903 -r1.904
--- text-level-semantics.html	6 Apr 2010 00:16:39 -0000	1.903
+++ text-level-semantics.html	6 Apr 2010 00:47:22 -0000	1.904
@@ -290,7 +290,7 @@
   </head><body onload="fixBrokenLink(); init()"><div class="head" id="head">
    <p><a href="http://www.w3.org/"><img alt="W3C" height="48" src="http://www.w3.org/Icons/w3c_home" width="72"></a></p>
    <h1>HTML5</h1>
-   <h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2><p>This is revision 1.3997.</p>
+   <h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2><p>This is revision 1.3998.</p>
 
 
    </div><div>

Index: the-canvas-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-canvas-element.html,v
retrieving revision 1.770
retrieving revision 1.771
diff -u -d -r1.770 -r1.771
--- the-canvas-element.html	6 Apr 2010 00:16:39 -0000	1.770
+++ the-canvas-element.html	6 Apr 2010 00:47:22 -0000	1.771
@@ -290,7 +290,7 @@
   </head><body onload="fixBrokenLink(); init()"><div class="head" id="head">
    <p><a href="http://www.w3.org/"><img alt="W3C" height="48" src="http://www.w3.org/Icons/w3c_home" width="72"></a></p>
    <h1>HTML5</h1>
-   <h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2><p>This is revision 1.3997.</p>
+   <h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2><p>This is revision 1.3998.</p>
 
 
    </div><div>

Index: tabular-data.html
===================================================================
RCS file: /sources/public/html5/spec/tabular-data.html,v
retrieving revision 1.898
retrieving revision 1.899
diff -u -d -r1.898 -r1.899
--- tabular-data.html	6 Apr 2010 00:16:39 -0000	1.898
+++ tabular-data.html	6 Apr 2010 00:47:22 -0000	1.899
@@ -290,7 +290,7 @@
   </head><body onload="fixBrokenLink(); init()"><div class="head" id="head">
    <p><a href="http://www.w3.org/"><img alt="W3C" height="48" src="http://www.w3.org/Icons/w3c_home" width="72"></a></p>
    <h1>HTML5</h1>
-   <h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2><p>This is revision 1.3997.</p>
+   <h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2><p>This is revision 1.3998.</p>
 
 
    </div><div>

Index: embedded-content-0.html
===================================================================
RCS file: /sources/public/html5/spec/embedded-content-0.html,v
retrieving revision 1.895
retrieving revision 1.896
diff -u -d -r1.895 -r1.896
--- embedded-content-0.html	6 Apr 2010 00:16:37 -0000	1.895
+++ embedded-content-0.html	6 Apr 2010 00:47:21 -0000	1.896
@@ -290,7 +290,7 @@
   </head><body onload="fixBrokenLink(); init()"><div class="head" id="head">
    <p><a href="http://www.w3.org/"><img alt="W3C" height="48" src="http://www.w3.org/Icons/w3c_home" width="72"></a></p>
    <h1>HTML5</h1>
-   <h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2><p>This is revision 1.3997.</p>
+   <h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2><p>This is revision 1.3998.</p>
 
 
    </div><div>

Index: dom.html
===================================================================
RCS file: /sources/public/html5/spec/dom.html,v
retrieving revision 1.909
retrieving revision 1.910
diff -u -d -r1.909 -r1.910
--- dom.html	6 Apr 2010 00:16:37 -0000	1.909
+++ dom.html	6 Apr 2010 00:47:11 -0000	1.910
@@ -290,7 +290,7 @@
   </head><body onload="fixBrokenLink(); init()"><div class="head" id="head">
    <p><a href="http://www.w3.org/"><img alt="W3C" height="48" src="http://www.w3.org/Icons/w3c_home" width="72"></a></p>
    <h1>HTML5</h1>
-   <h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2><p>This is revision 1.3997.</p>
+   <h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2><p>This is revision 1.3998.</p>
 
 
    </div><div>

Index: references.html
===================================================================
RCS file: /sources/public/html5/spec/references.html,v
retrieving revision 1.903
retrieving revision 1.904
diff -u -d -r1.903 -r1.904
--- references.html	6 Apr 2010 00:16:38 -0000	1.903
+++ references.html	6 Apr 2010 00:47:21 -0000	1.904
@@ -290,7 +290,7 @@
   </head><body onload="fixBrokenLink(); init()"><div class="head" id="head">
    <p><a href="http://www.w3.org/"><img alt="W3C" height="48" src="http://www.w3.org/Icons/w3c_home" width="72"></a></p>
    <h1>HTML5</h1>
-   <h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2><p>This is revision 1.3997.</p>
+   <h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2><p>This is revision 1.3998.</p>
 
 
    </div><div>

Index: acknowledgements.html
===================================================================
RCS file: /sources/public/html5/spec/acknowledgements.html,v
retrieving revision 1.913
retrieving revision 1.914
diff -u -d -r1.913 -r1.914
--- acknowledgements.html	6 Apr 2010 00:16:37 -0000	1.913
+++ acknowledgements.html	6 Apr 2010 00:47:03 -0000	1.914
@@ -289,7 +289,7 @@
   </head><body onload="fixBrokenLink(); init()"><div class="head" id="head">
    <p><a href="http://www.w3.org/"><img alt="W3C" height="48" src="http://www.w3.org/Icons/w3c_home" width="72"></a></p>
    <h1>HTML5</h1>
-   <h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2><p>This is revision 1.3997.</p>
+   <h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2><p>This is revision 1.3998.</p>
 
 
    </div><div>
@@ -453,6 +453,7 @@
   Dean Edwards,
   Debi Orton,
   Derek Featherstone,
+  Devdatta,
   Dimitri Glazkov,
   Dimitry Golubovsky,
   Divya Manian,

Index: iana.html
===================================================================
RCS file: /sources/public/html5/spec/iana.html,v
retrieving revision 1.234
retrieving revision 1.235
diff -u -d -r1.234 -r1.235
--- iana.html	6 Apr 2010 00:16:38 -0000	1.234
+++ iana.html	6 Apr 2010 00:47:21 -0000	1.235
@@ -290,7 +290,7 @@
   </head><body onload="fixBrokenLink(); init()"><div class="head" id="head">
    <p><a href="http://www.w3.org/"><img alt="W3C" height="48" src="http://www.w3.org/Icons/w3c_home" width="72"></a></p>
    <h1>HTML5</h1>
-   <h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2><p>This is revision 1.3997.</p>
+   <h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2><p>This is revision 1.3998.</p>
 
 
    </div><div>

Index: forms.html
===================================================================
RCS file: /sources/public/html5/spec/forms.html,v
retrieving revision 1.902
retrieving revision 1.903
diff -u -d -r1.902 -r1.903
--- forms.html	6 Apr 2010 00:16:37 -0000	1.902
+++ forms.html	6 Apr 2010 00:47:21 -0000	1.903
@@ -290,7 +290,7 @@
   </head><body onload="fixBrokenLink(); init()"><div class="head" id="head">
    <p><a href="http://www.w3.org/"><img alt="W3C" height="48" src="http://www.w3.org/Icons/w3c_home" width="72"></a></p>
    <h1>HTML5</h1>
-   <h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2><p>This is revision 1.3997.</p>
+   <h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2><p>This is revision 1.3998.</p>
 
 
    </div><div>

Index: interactive-elements.html
===================================================================
RCS file: /sources/public/html5/spec/interactive-elements.html,v
retrieving revision 1.901
retrieving revision 1.902
diff -u -d -r1.901 -r1.902
--- interactive-elements.html	6 Apr 2010 00:16:38 -0000	1.901
+++ interactive-elements.html	6 Apr 2010 00:47:21 -0000	1.902
@@ -290,7 +290,7 @@
   </head><body onload="fixBrokenLink(); init()"><div class="head" id="head">
    <p><a href="http://www.w3.org/"><img alt="W3C" height="48" src="http://www.w3.org/Icons/w3c_home" width="72"></a></p>
    <h1>HTML5</h1>
-   <h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2><p>This is revision 1.3997.</p>
+   <h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2><p>This is revision 1.3998.</p>
 
 
    </div><div>

Index: editing.html
===================================================================
RCS file: /sources/public/html5/spec/editing.html,v
retrieving revision 1.904
retrieving revision 1.905
diff -u -d -r1.904 -r1.905
--- editing.html	6 Apr 2010 00:16:37 -0000	1.904
+++ editing.html	6 Apr 2010 00:47:16 -0000	1.905
@@ -290,7 +290,7 @@
   </head><body onload="fixBrokenLink(); init()"><div class="head" id="head">
    <p><a href="http://www.w3.org/"><img alt="W3C" height="48" src="http://www.w3.org/Icons/w3c_home" width="72"></a></p>
    <h1>HTML5</h1>
-   <h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2><p>This is revision 1.3997.</p>
+   <h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2><p>This is revision 1.3998.</p>
 
 
    </div><div>

Index: video.html
===================================================================
RCS file: /sources/public/html5/spec/video.html,v
retrieving revision 1.778
retrieving revision 1.779
diff -u -d -r1.778 -r1.779
--- video.html	6 Apr 2010 00:16:39 -0000	1.778
+++ video.html	6 Apr 2010 00:47:22 -0000	1.779
@@ -290,7 +290,7 @@
   </head><body onload="fixBrokenLink(); init()"><div class="head" id="head">
    <p><a href="http://www.w3.org/"><img alt="W3C" height="48" src="http://www.w3.org/Icons/w3c_home" width="72"></a></p>
    <h1>HTML5</h1>
-   <h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2><p>This is revision 1.3997.</p>
+   <h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2><p>This is revision 1.3998.</p>
 
 
    </div><div>

Index: browsers.html
===================================================================
RCS file: /sources/public/html5/spec/browsers.html,v
retrieving revision 1.903
retrieving revision 1.904
diff -u -d -r1.903 -r1.904
--- browsers.html	6 Apr 2010 00:16:37 -0000	1.903
+++ browsers.html	6 Apr 2010 00:47:04 -0000	1.904
@@ -290,7 +290,7 @@
   </head><body onload="fixBrokenLink(); init()"><div class="head" id="head">
    <p><a href="http://www.w3.org/"><img alt="W3C" height="48" src="http://www.w3.org/Icons/w3c_home" width="72"></a></p>
    <h1>HTML5</h1>
-   <h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2><p>This is revision 1.3997.</p>
+   <h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2><p>This is revision 1.3998.</p>
 
 
    </div><div>

Index: the-xhtml-syntax.html
===================================================================
RCS file: /sources/public/html5/spec/the-xhtml-syntax.html,v
retrieving revision 1.908
retrieving revision 1.909
diff -u -d -r1.908 -r1.909
--- the-xhtml-syntax.html	6 Apr 2010 00:16:39 -0000	1.908
+++ the-xhtml-syntax.html	6 Apr 2010 00:47:22 -0000	1.909
@@ -290,7 +290,7 @@
   </head><body onload="fixBrokenLink(); init()"><div class="head" id="head">
    <p><a href="http://www.w3.org/"><img alt="W3C" height="48" src="http://www.w3.org/Icons/w3c_home" width="72"></a></p>
    <h1>HTML5</h1>
-   <h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2><p>This is revision 1.3997.</p>
+   <h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2><p>This is revision 1.3998.</p>
 
 
    </div><div>

Index: offline.html
===================================================================
RCS file: /sources/public/html5/spec/offline.html,v
retrieving revision 1.897
retrieving revision 1.898
diff -u -d -r1.897 -r1.898
--- offline.html	6 Apr 2010 00:16:38 -0000	1.897
+++ offline.html	6 Apr 2010 00:47:21 -0000	1.898
@@ -290,7 +290,7 @@
   </head><body onload="fixBrokenLink(); init()"><div class="head" id="head">
    <p><a href="http://www.w3.org/"><img alt="W3C" height="48" src="http://www.w3.org/Icons/w3c_home" width="72"></a></p>
    <h1>HTML5</h1>
-   <h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2><p>This is revision 1.3997.</p>
+   <h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2><p>This is revision 1.3998.</p>
 
 
    </div><div>

Index: obsolete.html
===================================================================
RCS file: /sources/public/html5/spec/obsolete.html,v
retrieving revision 1.899
retrieving revision 1.900
diff -u -d -r1.899 -r1.900
--- obsolete.html	6 Apr 2010 00:16:38 -0000	1.899
+++ obsolete.html	6 Apr 2010 00:47:21 -0000	1.900
@@ -290,7 +290,7 @@
   </head><body onload="fixBrokenLink(); init()"><div class="head" id="head">
    <p><a href="http://www.w3.org/"><img alt="W3C" height="48" src="http://www.w3.org/Icons/w3c_home" width="72"></a></p>
    <h1>HTML5</h1>
-   <h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2><p>This is revision 1.3997.</p>
+   <h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2><p>This is revision 1.3998.</p>
 
 
    </div><div>

Index: named-character-references.html
===================================================================
RCS file: /sources/public/html5/spec/named-character-references.html,v
retrieving revision 1.896
retrieving revision 1.897
diff -u -d -r1.896 -r1.897
--- named-character-references.html	6 Apr 2010 00:16:38 -0000	1.896
+++ named-character-references.html	6 Apr 2010 00:47:21 -0000	1.897
@@ -290,7 +290,7 @@
   </head><body onload="fixBrokenLink(); init()"><div class="head" id="head">
    <p><a href="http://www.w3.org/"><img alt="W3C" height="48" src="http://www.w3.org/Icons/w3c_home" width="72"></a></p>
    <h1>HTML5</h1>
-   <h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2><p>This is revision 1.3997.</p>
+   <h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2><p>This is revision 1.3998.</p>
 
 
    </div><div>

Index: history.html
===================================================================
RCS file: /sources/public/html5/spec/history.html,v
retrieving revision 1.899
retrieving revision 1.900
diff -u -d -r1.899 -r1.900
--- history.html	6 Apr 2010 00:16:37 -0000	1.899
+++ history.html	6 Apr 2010 00:47:21 -0000	1.900
@@ -290,7 +290,7 @@
   </head><body onload="fixBrokenLink(); init()"><div class="head" id="head">
    <p><a href="http://www.w3.org/"><img alt="W3C" height="48" src="http://www.w3.org/Icons/w3c_home" width="72"></a></p>
    <h1>HTML5</h1>
-   <h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2><p>This is revision 1.3997.</p>
+   <h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2><p>This is revision 1.3998.</p>
 
 
    </div><div>
@@ -1108,9 +1108,9 @@
     application cache at all; the submission will be made to the
     network.</p>
 
-    <p>Otherwise, <a href="infrastructure.html#fetch">fetch</a> the new resource, if it has not
-    already been obtained<!-- it's obtained by <object>, for instance
-    -->.</p>
+    <p>Otherwise, unless it has already been obtained<!-- it's
+    obtained by <object>, for instance -->, <a href="infrastructure.html#fetch">fetch</a> the new
+    resource, with the <i>manual redirect flag</i> set.</p>
 
     <p>If the resource is being fetched using a method other than one
     <a href="infrastructure.html#concept-http-equivalent-get" title="concept-http-equivalent-get">equivalent to</a>
@@ -1135,16 +1135,29 @@
 
    <li>
 
-    <p>At this point the user agents must return to whatever algorithm
-    invoked the navigation steps and must continue these steps
-    asynchronously.</p>
+    <p>At this point, unless this step has already been reached once
+    before in the execution of this instance of the algorithm, the
+    user agents must return to whatever algorithm invoked the
+    navigation steps and must continue these steps asynchronously.</p>
 
    </li>
 
    <li>
 
-    <p>If fetching the resource results in a redirect, return to <a href="#navigate-fragid-step">the step labeled "fragment
-    identifiers"</a> with the new resource.</p>
+    <p>If fetching the resource results in a redirect, and either the
+    <a href="infrastructure.html#url">URL</a> of the target of the redirect has the <a href="browsers.html#same-origin">same
+    origin</a> as the original resource, or the resource is being
+    obtained using the POST method or a safe method (in HTTP terms),
+    return to <a href="#navigate-fragid-step">the step labeled
+    "fragment identifiers"</a> with the new resource.</p>
+
+    <p>Otherwise, if fetching the resource results in a redirect but
+    the <a href="infrastructure.html#url">URL</a> of the target of the redirect does not have
+    the <a href="browsers.html#same-origin">same origin</a> as the original resource and the
+    resource is being obtained using a method that is neither the POST
+    method nor a safe method (in HTTP terms), then abort these
+    steps. The user agent may indicate to the user that the navigation
+    has been aborted for security reasons.</p>
 
    </li>
 

Index: semantics.html
===================================================================
RCS file: /sources/public/html5/spec/semantics.html,v
retrieving revision 1.917
retrieving revision 1.918
diff -u -d -r1.917 -r1.918
--- semantics.html	6 Apr 2010 00:16:38 -0000	1.917
+++ semantics.html	6 Apr 2010 00:47:21 -0000	1.918
@@ -290,7 +290,7 @@
   </head><body onload="fixBrokenLink(); init()"><div class="head" id="head">
    <p><a href="http://www.w3.org/"><img alt="W3C" height="48" src="http://www.w3.org/Icons/w3c_home" width="72"></a></p>
    <h1>HTML5</h1>
-   <h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2><p>This is revision 1.3997.</p>
+   <h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2><p>This is revision 1.3998.</p>
 
 
    </div><div>

Index: index.html
===================================================================
RCS file: /sources/public/html5/spec/index.html,v
retrieving revision 1.905
retrieving revision 1.906
diff -u -d -r1.905 -r1.906
--- index.html	6 Apr 2010 00:16:38 -0000	1.905
+++ index.html	6 Apr 2010 00:47:21 -0000	1.906
@@ -290,7 +290,7 @@
   </head><body onload="fixBrokenLink(); init()"><div class="head" id="head">
    <p><a href="http://www.w3.org/"><img alt="W3C" height="48" src="http://www.w3.org/Icons/w3c_home" width="72"></a></p>
    <h1>HTML5</h1>
-   <h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2><p>This is revision 1.3997.</p>
+   <h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2><p>This is revision 1.3998.</p>
 
 
    </div><div>

Index: spec.html
===================================================================
RCS file: /sources/public/html5/spec/spec.html,v
retrieving revision 1.947
retrieving revision 1.948
diff -u -d -r1.947 -r1.948
--- spec.html	6 Apr 2010 00:16:38 -0000	1.947
+++ spec.html	6 Apr 2010 00:47:21 -0000	1.948
@@ -307,7 +307,7 @@
    </dl><p>This specification is available in the following formats: 
     <a href="Overview.html">single page HTML</a>,
     <a href="spec.html">multipage HTML</a>.
-This is revision 1.3997.
+This is revision 1.3998.
    </p> 
    <p class="copyright"><a href="http://www.w3.org/Consortium/Legal/ipr-notice#Copyright">Copyright</a>
    &#169; 2010 <a href="http://www.w3.org/"><abbr title="World Wide

Index: introduction.html
===================================================================
RCS file: /sources/public/html5/spec/introduction.html,v
retrieving revision 1.906
retrieving revision 1.907
diff -u -d -r1.906 -r1.907
--- introduction.html	6 Apr 2010 00:16:38 -0000	1.906
+++ introduction.html	6 Apr 2010 00:47:21 -0000	1.907
@@ -289,7 +289,7 @@
   </head><body onload="fixBrokenLink(); init()"><div class="head" id="head">
    <p><a href="http://www.w3.org/"><img alt="W3C" height="48" src="http://www.w3.org/Icons/w3c_home" width="72"></a></p>
    <h1>HTML5</h1>
-   <h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2><p>This is revision 1.3997.</p>
+   <h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2><p>This is revision 1.3998.</p>
 
 
    </div><div>

Index: syntax.html
===================================================================
RCS file: /sources/public/html5/spec/syntax.html,v
retrieving revision 1.910
retrieving revision 1.911
diff -u -d -r1.910 -r1.911
--- syntax.html	6 Apr 2010 00:16:38 -0000	1.910
+++ syntax.html	6 Apr 2010 00:47:22 -0000	1.911
@@ -290,7 +290,7 @@
   </head><body onload="fixBrokenLink(); init()"><div class="head" id="head">
    <p><a href="http://www.w3.org/"><img alt="W3C" height="48" src="http://www.w3.org/Icons/w3c_home" width="72"></a></p>
    <h1>HTML5</h1>
-   <h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2><p>This is revision 1.3997.</p>
+   <h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2><p>This is revision 1.3998.</p>
 
 
    </div><div>

Index: webappapis.html
===================================================================
RCS file: /sources/public/html5/spec/webappapis.html,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- webappapis.html	6 Apr 2010 00:16:39 -0000	1.32
+++ webappapis.html	6 Apr 2010 00:47:22 -0000	1.33
@@ -290,7 +290,7 @@
   </head><body onload="fixBrokenLink(); init()"><div class="head" id="head">
    <p><a href="http://www.w3.org/"><img alt="W3C" height="48" src="http://www.w3.org/Icons/w3c_home" width="72"></a></p>
    <h1>HTML5</h1>
-   <h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2><p>This is revision 1.3997.</p>
+   <h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2><p>This is revision 1.3998.</p>
 
 
    </div><div>
Received on Tuesday, 6 April 2010 00:47:27 UTC