Fix incorrect imports from ember-data

guides/v1.13.0/models/index.md

@@ -195,7 +195,8 @@ example, a `Person` model might have a `firstName` attribute that is a
 string, and a `birthday` attribute that is a date:
 
 ```javascript {data-filename=app/models/person.js}
-import Model, { attr } from "ember-data/model";
+import Model from 'ember-data/model';
+import attr from 'ember-data/attr';
 
 export default Model.extend({
   firstName: attr('string'),
@@ -208,15 +209,17 @@ example, an `order` may have many `line-items`, and a
 `line-item` may belong to a particular `order`.
 
 ```javascript {data-filename=app/models/order.js}
-import Model, { hasMany } from "ember-data/model";
+import Model from 'ember-data/model';
+import { hasMany } from 'ember-data/relationships';
 
 export default Model.extend({
   lineItems: hasMany('line-item')
 });
 ```
 
 ```javascript {data-filename=app/models/line-item.js}
-import Model, { belongsTo } from "ember-data/model";
+import Model from 'ember-data/model';
+import { belongsTo } from 'ember-data/relationships';
 
 export default Model.extend({
   order: belongsTo('order')

guides/v2.16.0/testing/testing-models.md

@@ -12,7 +12,7 @@ new `levelName` when the player reaches level 5.
 
 ```javascript {data-filename=app/models/player.js}
 import Model from 'ember-data/model';
-import { attr } from 'ember-data/model';
+import attr from 'ember-data/attr';
 
 export default Model.extend({
   level: attr('number', { defaultValue: 0 }),
@@ -70,7 +70,7 @@ export default Model.extend({
 
 ```javascript {data-filename=app/models/user.js}
 import Model from 'ember-data/model';
-import { belongsTo } from 'ember-data/model';
+import { belongsTo } from 'ember-data/relationships';
 
 export default Model.extend({
   profile: belongsTo('profile')

guides/v2.17.0/testing/testing-models.md

@@ -12,7 +12,7 @@ new `levelName` when the player reaches level 5.
 
 ```javascript {data-filename=app/models/player.js}
 import Model from 'ember-data/model';
-import { attr } from 'ember-data/model';
+import attr from 'ember-data/attr';
 
 export default Model.extend({
   level: attr('number', { defaultValue: 0 }),
@@ -70,7 +70,7 @@ export default Model.extend({
 
 ```javascript {data-filename=app/models/user.js}
 import Model from 'ember-data/model';
-import { belongsTo } from 'ember-data/model';
+import { belongsTo } from 'ember-data/relationships';
 
 export default Model.extend({
   profile: belongsTo('profile')

guides/v2.18.0/testing/testing-models.md

@@ -12,7 +12,7 @@ new `levelName` when the player reaches level 5.
 
 ```javascript {data-filename="app/models/player.js"}
 import Model from 'ember-data/model';
-import { attr } from 'ember-data/model';
+import attr from 'ember-data/attr';
 
 export default Model.extend({
   level: attr('number', { defaultValue: 0 }),
@@ -71,7 +71,7 @@ export default Model.extend({
 
 ```javascript {data-filename="app/models/user.js"}
 import Model from 'ember-data/model';
-import { belongsTo } from 'ember-data/model';
+import { belongsTo } from 'ember-data/relationships';
 
 export default Model.extend({
   profile: belongsTo('profile')

guides/v3.0.0/testing/testing-models.md

@@ -12,7 +12,7 @@ new `levelName` when the player reaches level 5.
 
 ```javascript {data-filename=app/models/player.js}
 import Model from 'ember-data/model';
-import { attr } from 'ember-data/model';
+import attr from 'ember-data/attr';
 
 export default Model.extend({
   level: attr('number', { defaultValue: 0 }),
@@ -71,7 +71,7 @@ export default Model.extend({
 
 ```javascript {data-filename=app/models/user.js}
 import Model from 'ember-data/model';
-import { belongsTo } from 'ember-data/model';
+import { belongsTo } from 'ember-data/relationships';
 
 export default Model.extend({
   profile: belongsTo('profile')

guides/v3.1.0/testing/testing-models.md

@@ -12,7 +12,7 @@ new `levelName` when the player reaches level 5.
 
 ```javascript {data-filename=app/models/player.js}
 import Model from 'ember-data/model';
-import { attr } from 'ember-data/model';
+import attr from 'ember-data/attr';
 
 export default Model.extend({
   level: attr('number', { defaultValue: 0 }),
@@ -73,7 +73,7 @@ export default Model.extend({
 
 ```javascript {data-filename=app/models/user.js}
 import Model from 'ember-data/model';
-import { belongsTo } from 'ember-data/model';
+import { belongsTo } from 'ember-data/relationships';
 
 export default Model.extend({
   profile: belongsTo('profile')

guides/v3.2.0/testing/testing-models.md

@@ -12,7 +12,7 @@ new `levelName` when the player reaches level 5.
 
 ```javascript {data-filename=app/models/player.js}
 import Model from 'ember-data/model';
-import { attr } from 'ember-data/model';
+import attr from 'ember-data/attr';
 
 export default Model.extend({
   level: attr('number', { defaultValue: 0 }),
@@ -73,7 +73,7 @@ export default Model.extend({
 
 ```javascript {data-filename=app/models/user.js}
 import Model from 'ember-data/model';
-import { belongsTo } from 'ember-data/model';
+import { belongsTo } from 'ember-data/relationships';
 
 export default Model.extend({
   profile: belongsTo('profile')

guides/v3.3.0/testing/testing-models.md

@@ -12,7 +12,7 @@ new `levelName` when the player reaches level 5.
 
 ```javascript {data-filename=app/models/player.js}
 import Model from 'ember-data/model';
-import { attr } from 'ember-data/model';
+import attr from 'ember-data/attr';
 
 export default Model.extend({
   level: attr('number', { defaultValue: 0 }),
@@ -73,7 +73,7 @@ export default Model.extend({
 
 ```javascript {data-filename=app/models/user.js}
 import Model from 'ember-data/model';
-import { belongsTo } from 'ember-data/model';
+import { belongsTo } from 'ember-data/relationships';
 
 export default Model.extend({
   profile: belongsTo('profile')