diff --git a/docs/ember/README.md b/docs/ember/README.md index 3ff8661d9..39122cd43 100644 --- a/docs/ember/README.md +++ b/docs/ember/README.md @@ -6,10 +6,9 @@ We do _not_ cover general usage of Ember; instead, we assume that as background ## Outline -* [Controllers](./controllers.md) -* [Services](./services.md) -* [Overview: Ember](./overview.md) -* [Testing](./testing.md) * [Components](./components.md) -* [Helpers](./helpers.md) +* [Services](./services.md) * [Routes](./routes.md) +* [Controllers](./controllers.md) +* [Helpers](./helpers.md) +* [Testing](./testing.md) diff --git a/docs/legacy/ember-object.md b/docs/legacy/ember-object.md index ecbb82720..00a39ce6a 100644 --- a/docs/legacy/ember-object.md +++ b/docs/legacy/ember-object.md @@ -28,7 +28,7 @@ The [Ember Atlas](https://emberatlas.com) includes guides for migrating [from cl ### Failure modes -You often need to define `this` in actions hashes, computd properties, etc. That in turn often leads to problems with self-referential `this`: TypeScript simply cannot figure out how to stop recursing through the definitions of the type. +You often need to define `this` in actions hashes, computed properties, etc. That in turn often leads to problems with self-referential `this`: TypeScript simply cannot figure out how to stop recursing through the definitions of the type. Additionally, even when you get past the endlessly-recursive type definition problems, when enough mixins are resolved TypeScript will occasionally just give up because it cannot resolve the property or method you're interested in across the many shared base classes.