merge

Author: dauwhe

.htaccess

@@ -146,6 +146,7 @@ RewriteRule ^css-lists-3/(.*)$ css-lists/$1
 RewriteRule ^css-logical-props-1/(.*)$ css-logical-props/$1
 RewriteRule ^css-multicol-1/(.*)$ css-multicol/$1
 RewriteRule ^css-namespaces-1/(.*)$ css-namespaces/$1
+RewriteRule ^css-namespaces-3/(.*)$ css-namespaces/$1
 RewriteRule ^css-overflow-3/(.*)$ css-overflow/$1
 RewriteRule ^css-page-3/(.*)$ css-page/$1
 RewriteRule ^css-page-template-1/(.*)$ css-page-template/$1

css-font-loading/Overview.bs

@@ -101,10 +101,16 @@ The <code>FontFace</code> Interface</h2>
 			readonly attribute FontFaceLoadStatus status;
 
 			Promise&lt;FontFace> load();
-			readonly attribute Promise&lt;boolean> loaded;
+			readonly attribute Promise&lt;FontFace> loaded;
 		};
 	</pre>
 
+	Issue: Other APIs use other names for .loaded, like .readyState. Can we align?
+
+	Issue: "unloaded" is usually used for things that start loaded and then become not loaded.
+	Can we rename that value?
+	Media stuff uses "none", other APIs use "empty", "idle", "nothing".
+
 	<dl dfn-type=attribute dfn-for=FontFace>
 		<dt><dfn>family</dfn>, <span attribute-info for=family></span>
 		<dt><dfn>style</dfn>, <span attribute-info for=style></span>
@@ -169,7 +175,9 @@ The <code>FontFace</code> Interface</h2>
 
 	All <a interface>FontFace</a> objects also contain
 	internal <dfn attribute for=FontFace>[<!---->[Urls]]</dfn> and <dfn attribute for=FontFace>[<!---->[Data]]</dfn> slots,
-	of which one is not <code>null</code> and the rest are <code>null</code>.
+	of which one is <code>null</code> and the other is not <code>null</code>
+	(the non-null one is set by the constructor,
+		based on which data is passed in).
 
 <!--
  ██████   ███████  ██    ██  ██████  ████████ ████████  ██     ██  ██████  ████████  ███████  ████████