diff options
| author | Marko Tibold | 2011-12-30 01:37:32 +0100 |
|---|---|---|
| committer | Marko Tibold | 2011-12-30 01:37:32 +0100 |
| commit | 1b28339e5b733a0422c2bcd06b39e289bc98f69b (patch) | |
| tree | 9e766f4f9d9ec596bc0e2702e1bb291b90aa3a93 /docs/howto | |
| parent | 91cee26ad89c04a70f33ae334150dd127f900474 (diff) | |
| parent | a0c4dca9462c738aac3c712607997b9bd1f7b2c8 (diff) | |
| download | django-rest-framework-1b28339e5b733a0422c2bcd06b39e289bc98f69b.tar.bz2 | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'docs/howto')
| -rw-r--r-- | docs/howto/mixin.rst | 4 | ||||
| -rw-r--r-- | docs/howto/usingcurl.rst | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/docs/howto/mixin.rst b/docs/howto/mixin.rst index 68a73690..d8b1c4f0 100644 --- a/docs/howto/mixin.rst +++ b/docs/howto/mixin.rst @@ -9,11 +9,11 @@ a browseable Web API, and much of the other goodness that Django REST framework A live sandbox instance of this API is available for testing: - * http://api.django-rest-framework.org/mixin/ + * http://rest.ep.io/mixin/ You can browse the API using a web browser, or from the command line:: - curl -X GET http://api.django-rest-framework.org/mixin/ + curl -X GET http://rest.ep.io/mixin/ URL configuration diff --git a/docs/howto/usingcurl.rst b/docs/howto/usingcurl.rst index 2ad2c764..eeb8da06 100644 --- a/docs/howto/usingcurl.rst +++ b/docs/howto/usingcurl.rst @@ -27,4 +27,4 @@ There are a few things that can be helpful to remember when using CURL with djan #. You can use basic authentication to send the username and password:: - curl -X GET -H 'Accept: application/json' -u <user>:<password> http://example.com/my-api/
\ No newline at end of file + curl -X GET -H 'Accept: application/json' -u <user>:<password> http://example.com/my-api/ |