Merge branch 'master' into i18n

This commit is contained in:
Hongxia Zhong 2016-05-06 23:41:58 -07:00
commit f912faec3f

View File

@ -226,9 +226,9 @@ The following example will only route to the `list` and `retrieve` actions, and
), ),
Route( Route(
url=r'^{prefix}/{lookup}$', url=r'^{prefix}/{lookup}$',
mapping={'get': 'retrieve'}, mapping={'get': 'retrieve'},
name='{basename}-detail', name='{basename}-detail',
initkwargs={'suffix': 'Detail'} initkwargs={'suffix': 'Detail'}
), ),
DynamicDetailRoute( DynamicDetailRoute(
url=r'^{prefix}/{lookup}/{methodnamehyphen}$', url=r'^{prefix}/{lookup}/{methodnamehyphen}$',