Merge pull request #2782 from caffodian/master

Should use "ordering" in model Meta, not order_by in Serializer Relations example [documentation]

docs/api-guide/relations.md

@@ -46,7 +46,7 @@ In order to explain the various types of relational fields, we'll use a couple o
 
         class Meta:
             unique_together = ('album', 'order')
-            order_by = 'order'
+            ordering = ['order']
 
         def __unicode__(self):
             return '%d: %s' % (self.order, self.title)