Skip to content

Commit 13dea12

Browse files
Merge branch 'master' into new-emberData/finding-records
2 parents 1ccbdb0 + 9cb7419 commit 13dea12

File tree

224 files changed

+25028
-32
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

224 files changed

+25028
-32
lines changed

.remarkrc.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ exports.plugins = [
2626
],
2727
'remark-preset-lint-consistent',
2828
'remark-preset-lint-recommended',
29+
'remark-lint-heading-increment',
2930
['remark-lint-list-item-indent', 'space'],
3031
['remark-lint-list-item-bullet-indent', false],
3132
['remark-lint-code-block-style', false],

CONTRIBUTING.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,7 @@ The guides are spellchecked and linted for markdown consistency. You can test yo
150150
Markdown issues that will generate errors include:
151151
- Lists and text must be left justified, otherwise the linter will generate indentation errors
152152
- Missing URL reference definitions
153+
- Heading levels should increment by exactly one level at a time (e.g., h1 → h2 → h3) and should not skip levels (e.g., h1 → h3 is not allowed)
153154

154155
Most other markdown errors should be self explanatory.
155156

guides/release/components/template-lifecycle-dom-and-modifiers.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -523,7 +523,7 @@ export default class SidebarComponent extends Component {
523523
}
524524
```
525525

526-
#### Modifiers and `...attributes`
526+
### Modifiers and `...attributes`
527527

528528
Modifiers can also be applied to components, and when they are, they are also
529529
passed forward and applied to an element with `...attributes`:

guides/release/typescript/getting-started.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ Additionally:
5959

6060
## Convert an Existing App to TypeScript
6161

62-
To convert an existing app to TypeScript, you'll need to make the changes described above manually (for now). To facilitate this, we've included a guide [here][converting].
62+
To convert an existing app to TypeScript, you'll need to make the changes described above manually (for now). To facilitate this, we've included a [converting guide][converting].
6363

6464
<!-- Internal links -->
6565

guides/v3.28.0/components/template-lifecycle-dom-and-modifiers.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -517,7 +517,7 @@ export default class SidebarComponent extends Component {
517517
}
518518
```
519519

520-
#### Modifiers and `...attributes`
520+
### Modifiers and `...attributes`
521521

522522
Modifiers can also be applied to components, and when they are, they are also
523523
passed forward and applied to an element with `...attributes`:

guides/v4.0.0/components/template-lifecycle-dom-and-modifiers.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -517,7 +517,7 @@ export default class SidebarComponent extends Component {
517517
}
518518
```
519519

520-
#### Modifiers and `...attributes`
520+
### Modifiers and `...attributes`
521521

522522
Modifiers can also be applied to components, and when they are, they are also
523523
passed forward and applied to an element with `...attributes`:

guides/v4.1.0/components/template-lifecycle-dom-and-modifiers.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -517,7 +517,7 @@ export default class SidebarComponent extends Component {
517517
}
518518
```
519519

520-
#### Modifiers and `...attributes`
520+
### Modifiers and `...attributes`
521521

522522
Modifiers can also be applied to components, and when they are, they are also
523523
passed forward and applied to an element with `...attributes`:

guides/v4.10.0/components/template-lifecycle-dom-and-modifiers.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -517,7 +517,7 @@ export default class SidebarComponent extends Component {
517517
}
518518
```
519519

520-
#### Modifiers and `...attributes`
520+
### Modifiers and `...attributes`
521521

522522
Modifiers can also be applied to components, and when they are, they are also
523523
passed forward and applied to an element with `...attributes`:

guides/v4.11.0/components/template-lifecycle-dom-and-modifiers.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -517,7 +517,7 @@ export default class SidebarComponent extends Component {
517517
}
518518
```
519519

520-
#### Modifiers and `...attributes`
520+
### Modifiers and `...attributes`
521521

522522
Modifiers can also be applied to components, and when they are, they are also
523523
passed forward and applied to an element with `...attributes`:

guides/v4.12.0/components/template-lifecycle-dom-and-modifiers.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -517,7 +517,7 @@ export default class SidebarComponent extends Component {
517517
}
518518
```
519519

520-
#### Modifiers and `...attributes`
520+
### Modifiers and `...attributes`
521521

522522
Modifiers can also be applied to components, and when they are, they are also
523523
passed forward and applied to an element with `...attributes`:

0 commit comments

Comments
 (0)