aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Christie2014-08-15 12:06:22 +0100
committerTom Christie2014-08-15 12:06:22 +0100
commitef41828866b769fab832cab4e67e1f4514400ddc (patch)
tree77bf9b350dd61742d03a5bea778740996d6601af
parentbd025a1ef346bce5234779987fd141d9a43a4c3d (diff)
downloaddjango-rest-framework-ef41828866b769fab832cab4e67e1f4514400ddc.tar.bz2
Update title - Easy is a sucky word choice
-rw-r--r--index.html2
-rw-r--r--topics/documenting-your-api.html2
2 files changed, 2 insertions, 2 deletions
diff --git a/index.html b/index.html
index 2543b092..e2cea0aa 100644
--- a/index.html
+++ b/index.html
@@ -2,7 +2,7 @@
<html lang="en">
<head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta charset="utf-8">
- <title>Django REST framework - APIs made easy</title>
+ <title>Django REST framework - Web APIs for Django</title>
<link href="http://www.django-rest-framework.org/img/favicon.ico" rel="icon" type="image/x-icon">
<link rel="canonical" href="http://www.django-rest-framework.org"/>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
diff --git a/topics/documenting-your-api.html b/topics/documenting-your-api.html
index 2dbc4a60..0a1c7997 100644
--- a/topics/documenting-your-api.html
+++ b/topics/documenting-your-api.html
@@ -257,7 +257,7 @@ a.fusion-poweredby {
<hr />
<h2 id="the-hypermedia-approach">The hypermedia approach</h2>
<p>To be fully RESTful an API should present its available actions as hypermedia controls in the responses that it sends.</p>
-<p>In this approach, rather than documenting the available API endpoints up front, the description instead concentrates on the <em>media types</em> that are used. The available actions take may be taken on any given URL are not strictly fixed, but are instead made available by the presence of link and form controls in the returned document.</p>
+<p>In this approach, rather than documenting the available API endpoints up front, the description instead concentrates on the <em>media types</em> that are used. The available actions that may be taken on any given URL are not strictly fixed, but are instead made available by the presence of link and form controls in the returned document.</p>
<p>To implement a hypermedia API you'll need to decide on an appropriate media type for the API, and implement a custom renderer and parser for that media type. The <a href="rest-hypermedia-hateoas">REST, Hypermedia &amp; HATEOAS</a> section of the documentation includes pointers to background reading, as well as links to various hypermedia formats.</p>
</div><!--/span-->
</div><!--/row-->