Merge branch 'master' of https://github.com/w3c/webappsec

Author: hillbrad

specs/CSP2/index.html

@@ -2313,8 +2313,8 @@ <h3 id="directive-frame-ancestors"><code>frame-ancestors</code></h3>
     following ABNF grammar:
 
     <pre>
-      <dfn>ancestor-source-list</dfn> = [ <a>ancestor-source</a> *( 1*WSP <a>ancestor-source</a> ) ] / "'none'" / "'self'"
-      <dfn>ancestor-source</dfn>      = <a>scheme-source</a> / <a>host-source</a>
+      <dfn>ancestor-source-list</dfn> = [ <a>ancestor-source</a> *( 1*WSP <a>ancestor-source</a> ) ] / "'none'"
+      <dfn>ancestor-source</dfn>      = <a>scheme-source</a> / <a>host-source</a> / "'self'"
 
       directive-name  = "frame-ancestors"
       directive-value = <a>ancestor-source-list</a>

specs/CSP2/index.src.html

@@ -80,7 +80,7 @@ upgrade/published/WD.html: upgrade/index.src.html
 	bikeshed -f spec --md-status=WD ./upgrade/index.src.html ./upgrade/published/WD.html
 
 upgrade/published/2015-09-CR.html: upgrade/index.src.html
-	bikeshed -f spec --md-status=CR --md-date=2015-09-01 --md-deadline=2015-11-01 ./upgrade/index.src.html ./upgrade/published/2015-09-CR.html
+	bikeshed -f spec --md-status=CR --md-date=2015-09-03 --md-deadline=2015-10-03 ./upgrade/index.src.html ./upgrade/published/2015-09-CR.html
 
 publish:
 	git push origin master master:gh-pages

specs/Makefile

@@ -2415,8 +2415,8 @@ <h3 id="directive-frame-ancestors"><code>frame-ancestors</code></h3>
     following ABNF grammar:
 
     <pre>
-      <dfn>ancestor-source-list</dfn> = [ <a>ancestor-source</a> *( 1*<a>WSP</a> <a>ancestor-source</a> ) ] / "'none'" / "'self'"
-      <dfn>ancestor-source</dfn>      = <a>scheme-source</a> / <a>host-source</a>
+      <dfn>ancestor-source-list</dfn> = [ <a>ancestor-source</a> *( 1*<a>WSP</a> <a>ancestor-source</a> ) ] / "'none'"
+      <dfn>ancestor-source</dfn>      = <a>scheme-source</a> / <a>host-source</a> / "'self'"
 
       directive-name  = "frame-ancestors"
       directive-value = <a>ancestor-source-list</a>