Merge branch 'master' of https://github.com/w3c/csswg-drafts

Author: LeaVerou

mediaqueries/Overview.bs

@@ -316,7 +316,7 @@ Media Types</h3>
 	but the definition of <a>media types</a> as mutually exclusive
 	makes it difficult to use them in a reasonable manner;
 	instead, their exclusive aspects are better expressed as <a>media features</a>
-	such as 'grid' or 'scan'.
+	such as '@media/grid' or 'scan'.
 
 	As such, the following <a>media types</a> are defined for use in <a>media queries</a>:
 
@@ -409,7 +409,7 @@ Media Features</h3>
 			(omitting the colon and value)
 			to evaluate the feature in a <a>boolean context</a>.
 			This is a convenient shorthand for features that have a reasonable value representing 0 or “none”.
-			For example, ''(color)'' is true is the 'color' <a>media feature</a> is non-zero.
+			For example, ''(color)'' is true is the '@media/color' <a>media feature</a> is non-zero.
 
 		<li>
 			<a>Media features</a> with “range” type can be written in a <a>range context</a>,
@@ -450,7 +450,7 @@ Media Feature Types: “range” and “discrete”</h4>
 	but the common factor is that there's no intrinsic “order” to them--
 	none of the values are “less than” or “greater than” each other.
 
-	“Range” media features like 'width', on the other hand,
+	“Range” media features like '@media/width', on the other hand,
 	take their values from a range.
 	Any two values can be compared to see which is lesser and which is greater.
 
@@ -507,10 +507,10 @@ Evaluating Media Features in a Boolean Context</h4>
 	</div>
 
 	<div class='example'>
-		Some numeric <a>media features</a>, like 'width',
+		Some numeric <a>media features</a>, like '@media/width',
 		are rarely if ever useful to evaluate in a <a>boolean context</a>,
 		as their values are almost always greater than zero.
-		Others, like 'color', have meaningful zero values:
+		Others, like '@media/color', have meaningful zero values:
 		''(color)'' is identical to ''(color > 0)'',
 		indicating that the device is capable of displaying color at all.
 	</div>
@@ -668,9 +668,9 @@ Using “min-” and “max-” Prefixes On Range Features</h4>
 	<div class='example'>
 		For example,
 		''(min-grid: 1)'' is invalid,
-		because 'grid' is a “discrete” <a>media feature</a>,
+		because '@media/grid' is a “discrete” <a>media feature</a>,
 		and so doesn't accept the prefixes.
-		(Even though the 'grid' <a>media feature</a> appears to be numeric,
+		(Even though the '@media/grid' <a>media feature</a> appears to be numeric,
 		as it accepts the values ''0'' and ''1''.)
 	</div>
 
@@ -943,12 +943,12 @@ Error Handling</h3>
 	</div>
 
 	<div class="example">
-		The media query ''(color:20example)'' specifies an unknown value for the 'color' media feature
+		The media query ''(color:20example)'' specifies an unknown value for the '@media/color' media feature
 		and is therefore turned into ''not all''.
 	</div>
 
 	<div class="example">
-		This media query is turned into ''not all'' because negative lengths are not allowed for the 'width' media feature:
+		This media query is turned into ''not all'' because negative lengths are not allowed for the '@media/width' media feature:
 
 		<pre>@media (min-width: -100px) { … }</pre>
 	</div>
@@ -982,7 +982,7 @@ Error Handling</h3>
 Viewport/Page Dimensions Media Features</h2>
 
 <h3 id="width">
-Width: the 'width' feature</h3>
+Width: the '@media/width' feature</h3>
 
 	<pre class='descdef mq'>
 	Name: width
@@ -1026,7 +1026,7 @@ Width: the 'width' feature</h3>
 
 
 <h3 id="height">
-Height: the 'height' feature</h3>
+Height: the '@media/height' feature</h3>
 
 	<pre class='descdef mq'>
 	Name: height
@@ -1035,7 +1035,7 @@ Height: the 'height' feature</h3>
 	Type: range
 	</pre>
 
-	The 'height' media feature describes the height of the targeted display area of the output device.
+	The '@media/height' media feature describes the height of the targeted display area of the output device.
 	For continuous media, this is the height of the viewport including the size of a rendered scroll bar (if any).
 	For paged media, this is the height of the page box.
 
@@ -1053,8 +1053,8 @@ Aspect-Ratio: the 'aspect-ratio' feature</h3>
 	Type: range
 	</pre>
 
-	The 'aspect-ratio' media feature is defined as the ratio of the value of the 'width' media feature
-	to the value of the 'height' media feature.
+	The 'aspect-ratio' media feature is defined as the ratio of the value of the '@media/width' media feature
+	to the value of the '@media/height' media feature.
 
 	The <dfn type>&lt;ratio></dfn> value type is a positive (not zero or negative)
 	<<integer>> followed by optional whitespace, followed by a solidus ('/'),
@@ -1076,8 +1076,8 @@ Orientation: the 'orientation' feature</h3>
 	<dl dfn-type=value dfn-for="@media/orientation">
 		<dt><dfn>portrait</dfn>
 		<dd>The 'orientation' media feature is ''portrait''
-		when the value of the 'height' media feature is greater than or equal to
-		the value of the 'width' media feature.
+		when the value of the '@media/height' media feature is greater than or equal to
+		the value of the '@media/width' media feature.
 		<dt><dfn>landscape</dfn>
 		<dd>Otherwise 'orientation' is ''landscape''.
 	</dl>
@@ -1207,7 +1207,7 @@ Display Type: the 'scan' feature</h3>
 	</div>
 
 <h3 id="grid">
-Detecting Console Displays: the 'grid' feature</h3>
+Detecting Console Displays: the '@media/grid' feature</h3>
 
 	<pre class='descdef mq'>
 	Name: grid
@@ -1216,7 +1216,7 @@ Detecting Console Displays: the 'grid' feature</h3>
 	Type: discrete
 	</pre>
 
-	The 'grid' media feature is used to query whether the output device is grid or bitmap.
+	The '@media/grid' media feature is used to query whether the output device is grid or bitmap.
 	If the output device is grid-based
 	(e.g., a “tty” terminal, or a phone display with only one fixed font),
 	the value will be 1.
@@ -1265,7 +1265,7 @@ Display Update Frequency: the 'update' feature</h3>
 		<dd>
 			The layout may change dynamically according to the usual rules of CSS,
 			but the output device is not able to render or display changes quickly enough
-			for them to be percieved as a smooth animation.
+			for them to be perceived as a smooth animation.
 			Example: E-ink screens or severely under-powered devices.
 
 		<dt><dfn>fast</dfn>
@@ -1374,7 +1374,7 @@ Color Media Features</h2>
 
 
 <h3 id="color">
-Color Depth: the 'color' feature</h3>
+Color Depth: the '@media/color' feature</h3>
 
 	<pre class='descdef mq'>
 	Name: color
@@ -1383,7 +1383,7 @@ Color Depth: the 'color' feature</h3>
 	Type: range
 	</pre>
 
-	The 'color' media feature describes the number of bits per color component of the output device.
+	The '@media/color' media feature describes the number of bits per color component of the output device.
 	If the device is not a color device, the value is zero.
 
 	Negative <<integer>>s are invalid.
@@ -1801,7 +1801,7 @@ All Available Interaction Capabilities: the 'any-pointer' and 'any-hover' featur
 	In the case of 'any-pointer', more than one of the values can match,
 	if different pointing devices have different characteristics.
 
-	'any-pointer' and 'any-hover' must only match ''none'' if <em>all</em> of the pointing devices would match ''none'' for the corresponding query,
+	'any-pointer' and 'any-hover' must only match ''any-pointer/none'' if <em>all</em> of the pointing devices would match ''pointer/none'' for the corresponding query,
 	or there are no pointing devices at all.
 
 	<div class="note">
@@ -2096,7 +2096,7 @@ Appendix A: Deprecated Media Features</h2>
 	as specified.
 
 	<p class="note">To query for the size of the viewport (or the page box
-	on page media), the 'width', 'height' and 'aspect-ratio' <a>media features</a>
+	on page media), the '@media/width', '@media/height' and 'aspect-ratio' <a>media features</a>
 	should be used, rather than 'device-width', 'device-height' and
 	'device-aspect-ratio', which refer to the physical size of the the device
 	regardless of how much space is available for the document being laid out. The