diff options
| author | Tom Christie | 2013-10-21 09:30:17 +0100 | 
|---|---|---|
| committer | Tom Christie | 2013-10-21 09:30:17 +0100 | 
| commit | c37bd40d2869892a08722b479a8c56f87332f6fd (patch) | |
| tree | eb0278d41bf9dc0b9617ae94b417f7b50bb7c77f /docs/api-guide/relations.md | |
| parent | 70b0798118c8c02903421bca03e0406fe65d737f (diff) | |
| parent | 2bea76471007f571db0463df2b2de18e9929b12f (diff) | |
| download | django-rest-framework-c37bd40d2869892a08722b479a8c56f87332f6fd.tar.bz2 | |
Merge branch 'master' of https://github.com/tomchristie/django-rest-framework
Diffstat (limited to 'docs/api-guide/relations.md')
| -rw-r--r-- | docs/api-guide/relations.md | 14 | 
1 files changed, 7 insertions, 7 deletions
diff --git a/docs/api-guide/relations.md b/docs/api-guide/relations.md index 5ec4b22f..b9d96b5e 100644 --- a/docs/api-guide/relations.md +++ b/docs/api-guide/relations.md @@ -54,7 +54,7 @@ Would serialize to the following representation.      {          'album_name': 'Things We Lost In The Fire', -        'artist': 'Low' +        'artist': 'Low',          'tracks': [              '1: Sunflower',              '2: Whitetail', @@ -86,7 +86,7 @@ Would serialize to a representation like this:      {          'album_name': 'The Roots', -        'artist': 'Undun' +        'artist': 'Undun',          'tracks': [              89,              90, @@ -121,7 +121,7 @@ Would serialize to a representation like this:      {          'album_name': 'Graceland', -        'artist': 'Paul Simon' +        'artist': 'Paul Simon',          'tracks': [              'http://www.example.com/api/tracks/45/',              'http://www.example.com/api/tracks/46/', @@ -159,7 +159,7 @@ Would serialize to a representation like this:      {          'album_name': 'Dear John', -        'artist': 'Loney Dear' +        'artist': 'Loney Dear',          'tracks': [              'Airport Surroundings',              'Everything Turns to You', @@ -194,7 +194,7 @@ Would serialize to a representation like this:      {          'album_name': 'The Eraser', -        'artist': 'Thom Yorke' +        'artist': 'Thom Yorke',          'track_listing': 'http://www.example.com/api/track_list/12/',      } @@ -234,7 +234,7 @@ Would serialize to a nested representation like this:      {          'album_name': 'The Grey Album', -        'artist': 'Danger Mouse' +        'artist': 'Danger Mouse',          'tracks': [              {'order': 1, 'title': 'Public Service Announcement'},              {'order': 2, 'title': 'What More Can I Say'}, @@ -271,7 +271,7 @@ This custom field would then serialize to the following representation.      {          'album_name': 'Sometimes I Wish We Were an Eagle', -        'artist': 'Bill Callahan' +        'artist': 'Bill Callahan',          'tracks': [              'Track 1: Jim Cain (04:39)',              'Track 2: Eid Ma Clack Shaw (04:19)',  | 
