[css-display] Fix errors in glossary appendix, clean up some links.

Author: fantasai

css-display/Overview.bs

@@ -185,24 +185,24 @@ Inner Display Layout Models: the ''flow'', ''flow-root'', ''table'', ''grid'', a
 
 			If its <a>outer display type</a> is ''inline'' or ''run-in'',
 			and it is participating in a
-			<a href="http://www.w3.org/TR/CSS21/visuren.html#inline-formatting">block</a>
-			or <a href="http://www.w3.org/TR/CSS21/visuren.html#inline-formatting">inline</a>
+			<a lt="block formatting context">block</a>
+			or <a lt="inline formatting context">inline</a>
 			formatting context,
-			then it generates an <a href="http://www.w3.org/TR/CSS21/visuren.html#inline-box">inline box</a>.
+			then it generates an <a>inline box</a>.
 
 			Otherwise it generates a <a>block container</a> box.
 
 			Depending on the value of other properties (such as 'position', 'float', or 'overflow')
 			and whether it is itself participating in a block or inline <a>formatting context</a>,
-			it either establishes a new <a href="http://www.w3.org/TR/CSS21/visuren.html#block-formatting">block formatting context</a> for its contents
+			it either establishes a new <a>block formatting context</a> for its contents
 			or integrates its contents into its parent <a>formatting context</a>.
 			See <a href="http://www.w3.org/TR/CSS21/visuren.html">CSS2.1 Chapter 9</a>. [[!CSS21]]
 
 		<dt><dfn>flow-root</dfn>
 		<dd>
 			The element generates a <a>block container</a> box,
 			and lays out its contents using <a>flow layout</a>.
-			It always establishes a new <a href="http://www.w3.org/TR/CSS21/visuren.html#block-formatting">block formatting context</a> for its contents. [[!CSS21]]
+			It always establishes a new <a>block formatting context</a> for its contents. [[!CSS21]]
 
 		<dt><dfn>table</dfn>
 		<dd>
@@ -559,7 +559,7 @@ Run-In Layout</h2>
 	Note: This run-in model is slightly different from the one proposed in earlier revisions of [[!CSS21]].
 
 <h2 id='glossary'>
-Appendix B: Glossary</h2>
+Appendix A: Glossary</h2>
 
 	The following terms are defined here for convenience:
 
@@ -576,22 +576,24 @@ Appendix B: Glossary</h2>
 
 		<dt><dfn lt="inline|inline box">inline</dfn>
 		<dd>
-			A non-replaced <a>inline-level</a> box whose 'display' is ''flow''.
+			A non-replaced <a>inline-level</a> box whose <a>inner display type</a> is ''flow''.
 			The contents of an inline box participate in the same inline formatting context as the inline box itself.
 
 		<dt><dfn lt="atomic inline|atomic inline box">atomic inline</dfn>
 		<dd>
 			An inline-level box that is replaced or that establishes a new formatting context.
-			(An inline-level box whose 'display' is not ''flow'' establishes a new formatting context of the specified type.)
+			(An inline-level box whose <a>inner display type</a> is not ''flow''
+			establishes a new formatting context of the specified <a>inner display type</a>.)
 
 		<dt><dfn lt="block container|block container box">block container</dfn>
 		<dd>
-			A box whose contents participate in a block formatting context,
-			i.e. one whose computed 'display' value is ''block''.
+			A box whose contents participate in a <a>block formatting context</a>.
+			A block container does not necessarily establish a <em>new</em> <a>block formatting context</a>
+			if its parent formatting context is also a <a>block formatting context</a>.
 
 		<dt><dfn>block box</dfn>
 		<dd>
-			A <a>block-level box</a> that is a <a>block container</a>.
+			A <a>block-level box</a> that is also a <a>block container</a>.
 
 		<dt><dfn>block</dfn>
 		<dd>
@@ -625,8 +627,10 @@ Appendix B: Glossary</h2>
 			Issue: wordsmith this.
 
 		<dt><dfn>block formatting context</dfn>
+		<dt><dfn>inline formatting context</dfn>
 		<dd>
-			Block and inline formatting contexts are defined in CSS 2.1 Section 9.4.
+			Block and inline formatting contexts are defined in
+			<a href="http://www.w3.org/TR/CSS21/visuren.html#normal-flow">CSS 2.1 Section 9.4</a>.
 	</dl>
 
 	See [[!CSS21]] <a href="http://www.w3.org/TR/CSS21/visuren.html">Chapter 9</a> for a fuller definition of these terms.