Merge branch 'master' into patch-2

Author: jiangying000

css-content-3/Overview.bs

@@ -114,10 +114,12 @@ Inserting and replacing content with the 'content' property</h2>
 	<dl dfn-for="content" dfn-type=value>
 		<dt><dfn>normal</dfn>
 		<dd>
-			For an element, this computes to ''content/contents''.
+			For an element or page margin box, this computes to ''content/contents''.
 
 			For ''::before'' and ''::after'', this computes to ''content/none''.
 
+			For ''::marker'', this computes to itself (''content/normal'').
+
 		<dt><dfn>none</dfn>
 		<dd>
 			On elements, this inhibits the children of the element from being rendered as children of this element,

css-display-3/Overview.bs

@@ -1165,6 +1165,12 @@ Appendix A: Glossary</h2>
 			Note: some [=formatting contexts=] inhibit floating,
 			so that an element with ''float: left'' is not necessarily <a>out-of-flow</a>.
 
+		<dt><dfn lt="absolutely positioned | absolutely positioned element | absolutely positioned box">absolutely posititioned</dfn>
+		<dd>
+			A box is <a>absolutely positioned</a>
+			if its 'position' property is either ''absolute'' or ''fixed''.
+			Absolutely positioned boxes are also <a>out-of-flow</a>.
+
 		<dt><dfn>document order</dfn>
 		<dd>
 			The order in which boxes or content occurs in the document
@@ -1361,6 +1367,22 @@ Acknowledgments</h2>
 <h2 class=no-num id="changes">
 Changes</h2>
 
+	Changes since the <a href="https://www.w3.org/TR/2018/CR-css-display-3-20180828/">28 August 2018 Candidate Recommendation</a>
+	include:
+
+	<ul>
+		<li id="change-parent">
+			Defined <a>parent box</a>.
+		<li id="change-abspos">
+			Added definition of <a>absolutely positioned</a> to the glossary;
+			<a href="https://www.w3.org/TR/CSS2/visuren.html#absolutely-positioned">copied from CSS2</a> for easier referencing.
+		<li id="change-bidi-fragment">
+			Added cross-references to various forms of fragmentation in [[#intro]].
+	</ul>
+
+<h3 id="changes-wd">
+Changes Prior to Candidate Recommendation Status</h3>
+
 	A <a href="https://drafts.csswg.org/css-display-3/issues-wd-2017">Disposition of Comments</a> is available.
 
 	Changes since the <a href="https://www.w3.org/TR/2018/WD-css-display-3-20180420/">20 April 2018 Working Draft</a> include:

css-easing-1/Overview.bs

@@ -7,6 +7,7 @@ Level: 1
 Group: csswg
 ED: https://drafts.csswg.org/css-easing/
 TR: https://www.w3.org/TR/css-easing-1/
+Previous version: https://www.w3.org/TR/2018/WD-css-easing-1-20181009/
 Previous version: https://www.w3.org/TR/2018/WD-css-timing-1-20180926/
 Previous version: https://www.w3.org/TR/2017/WD-css-timing-1-20170221/
 Editor: Brian Birtles, Mozilla https://www.mozilla.org/, bbirtles@mozilla.com, w3cid 43194
@@ -442,17 +443,13 @@ Changes since last publication {#changes}
 ==============================
 
 The following changes have been made since the <a
-  href="https://www.w3.org/TR/2017/WD-css-timing-1-20170221/">21 February
-2017 Working Draft</a>:
+  href="https://www.w3.org/TR/2018/WD-css-easing-1-20181009/">9 October
+2018 Working Draft</a>:
 
 *   Reworded specification to refer to &ldquo;easing functions&rdquo;
     rather than &ldquo;timing functions&rdquo;
     and use more general language that does not assume these functions are only
     applied to animations.
-*   Removed `frames()` easing function.
-*   Added ''steps()/jump-start'', ''steps()/jump-end'',
-    ''steps()/jump-none'', and ''steps()/jump-both'' keywords to
-    ''steps()'' easing function.
 
 Acknowledgements {#acknowledgements}
 ================