(merge)

--HG--
extra : rebase_source : 11a2d839130d102bb950baf9be21fb635faa67ad

Author: bert-github

css-template/Overview.src.html

@@ -631,7 +631,7 @@ <h3>Summary and use cases</h3>
 
 <pre>span:nth-child(n+4)::after {content: " "}</pre>
 
-<p class=issue>This space handling not very intuitive. One might
+<p class=issue>This space handling is not very intuitive. One might
 expect there to be a way to say “select everything from this element
 onward” or maybe a pseudo-element selector for the text between
 elements. Or a new property to specify different ways to handle the
@@ -1215,7 +1215,7 @@ <h3 id=grid-shorthand >The 'grid' shorthand property</h3>
 
 <pre>
 grid-columns: * 10em;
-grid-template: "abc" "abd";
+grid-template: "a b c" "a b d";
 grid-rows: auto 4em;
 </pre>
 
@@ -2784,13 +2784,13 @@ <h3 id=vertical-alignment>Vertical alignment of the contents of
 <pre>
 &lt;BODY>
 &lt;P>...&lt;/P>
-&lt;FIGURE>...&lt;/P>
+&lt;FIGURE>...&lt;/FIGURE>
 &lt;P>...&lt;/P>
-&lt;FIGURE>...&lt;/P>
+&lt;FIGURE>...&lt;/FIGURE>
 &lt;P>...&lt;/P>
-&lt;FIGURE>...&lt;/P>
+&lt;FIGURE>...&lt;/FIGURE>
 &lt;P>...&lt;/P>
-&lt;FIGURE>...&lt;/P>
+&lt;FIGURE>...&lt;/FIGURE>
 &lt;/BODY>
 </pre>
 
@@ -3389,13 +3389,13 @@ <h2 id=chains>Chaining slots: the 'chains' property</h2>
 added at the bottom.
 
 <pre>
-div { grid:    "@@..ff...." / 3.6em
-               ".aa..gg..." / 3.6em
-               "..bb..hh.." / 3.6em
-               "...cc..ii." / 3.6em
-               "....dd..jj" / 3.6em
-               ".........." / 0.6em
-               "eeee..kkkk" / auto;
+div { grid:    "@ @ . . f f . . . ."  3.6em
+               ". a a . . g g . . ."  3.6em
+               ". . b b . . h h . ."  3.6em
+               ". . . c c . . i i ."  3.6em
+               ". . . . d d . . j j"  3.6em
+               ". . . . . . . . . ."  0.6em
+               "e e e e . . k k k k"  auto;
    chains: @ a b c d e, f g h i j k}
 #first { position: @ }
 #second { position: f }