Skip to content

Commit 904acca

Browse files
committed
[css-grid] Change heading from 'Error Handling' to 'Conflict Handling'.
1 parent e588160 commit 904acca

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

css-grid/Overview.bs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2195,7 +2195,7 @@ Line-based Placement: the 'grid-row-start', 'grid-column-start', 'grid-row-end',
21952195
</div>
21962196

21972197
<h4 id='grid-placement-errors'>
2198-
Grid Placement Error Handling</h4>
2198+
Grid Placement Conflict Handling</h4>
21992199

22002200
If 'grid-row-end'/'grid-column-end' specifies a line at or before that specified by 'grid-row-start'/'grid-column-start',
22012201
it instead contributes nothing.

css-grid/Overview.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ <h2 class="no-num no-toc no-ref heading settled heading" id=contents><span class
214214
<li><a href=#common-uses-auto-sizing><span class=secno>8.1.5</span> Auto Sizing Subgrids</a></ul>
215215
<li><a href=#line-placement><span class=secno>8.2</span> Line-based Placement: the <span class=property data-link-type=propdesc title=grid-row-start>grid-row-start</span>, <span class=property data-link-type=propdesc title=grid-column-start>grid-column-start</span>, <span class=property data-link-type=propdesc title=grid-row-end>grid-row-end</span>, and <span class=property data-link-type=propdesc title=grid-column-end>grid-column-end</span> properties</a>
216216
<ul class=toc>
217-
<li><a href=#grid-placement-errors><span class=secno>8.2.1</span> Grid Placement Error Handling</a></ul>
217+
<li><a href=#grid-placement-errors><span class=secno>8.2.1</span> Grid Placement Conflict Handling</a></ul>
218218
<li><a href=#placement-shorthands><span class=secno>8.3</span> Placement Shorthands: the <span class=property data-link-type=propdesc title=grid-column>grid-column</span>, <span class=property data-link-type=propdesc title=grid-row>grid-row</span>, and <span class=property data-link-type=propdesc title=grid-area>grid-area</span> properties</a>
219219
<li><a href=#abspos-items><span class=secno>8.4</span> Absolutely-positioned Grid Items</a></ul>
220220
<li><a href=#alignment><span class=secno>9</span> Alignment</a>
@@ -2267,7 +2267,7 @@ <h3 class="heading settled heading" data-level=8.2 id=line-placement><span class
22672267
</div>
22682268

22692269
<h4 class="heading settled heading" data-level=8.2.1 id=grid-placement-errors><span class=secno>8.2.1 </span><span class=content>
2270-
Grid Placement Error Handling</span><a class=self-link href=#grid-placement-errors></a></h4>
2270+
Grid Placement Conflict Handling</span><a class=self-link href=#grid-placement-errors></a></h4>
22712271

22722272
<p>If <a class=property data-link-type=propdesc href=#propdef-grid-row-end title=grid-row-end>grid-row-end</a>/<a class=property data-link-type=propdesc href=#propdef-grid-column-end title=grid-column-end>grid-column-end</a> specifies a line at or before that specified by <a class=property data-link-type=propdesc href=#propdef-grid-row-start title=grid-row-start>grid-row-start</a>/<a class=property data-link-type=propdesc href=#propdef-grid-column-start title=grid-column-start>grid-column-start</a>,
22732273
it instead contributes nothing.</p>

0 commit comments

Comments
 (0)