Skip to content

Commit b273dd2

Browse files
mattmakaimattmakai
committed
merging api page changes
2 parents 40e5f24 + 3ae97f0 commit b273dd2

File tree

4 files changed

+15
-3
lines changed

4 files changed

+15
-3
lines changed

‎all.html‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3184,7 +3184,11 @@ <h2>API creation frameworks</h2>
31843184
<p><a href="http://www.django-rest-framework.org/">Django REST framework</a> and
31853185
<a href="https://django-tastypie.readthedocs.org/en/latest/">Tastypie</a> are
31863186
the two most widely used API frameworks to use with Django. The edge
3187-
currently goes to Django REST framework based on rough community sentiment.</p>
3187+
currently goes to Django REST framework based on rough community sentiment.
3188+
Django REST framework recently hit the
3189+
<a href="http://www.django-rest-framework.org/topics/3.0-announcement/">3.0 release mark</a>
3190+
after Tom Christie ran a
3191+
<a href="https://www.kickstarter.com/projects/tomchristie/django-rest-framework-3">successful Kickstarter campaign</a>.</p>
31883192
</li>
31893193
<li>
31903194
<p><a href="http://flask-restful.readthedocs.org/en/latest/">Flask-RESTful</a> and

‎api-creation.html‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,11 @@ <h2>API creation frameworks</h2>
4747
<p><a href="http://www.django-rest-framework.org/">Django REST framework</a> and
4848
<a href="https://django-tastypie.readthedocs.org/en/latest/">Tastypie</a> are
4949
the two most widely used API frameworks to use with Django. The edge
50-
currently goes to Django REST framework based on rough community sentiment.</p>
50+
currently goes to Django REST framework based on rough community sentiment.
51+
Django REST framework recently hit the
52+
<a href="http://www.django-rest-framework.org/topics/3.0-announcement/">3.0 release mark</a>
53+
after Tom Christie ran a
54+
<a href="https://www.kickstarter.com/projects/tomchristie/django-rest-framework-3">successful Kickstarter campaign</a>.</p>
5155
</li>
5256
<li>
5357
<p><a href="http://flask-restful.readthedocs.org/en/latest/">Flask-RESTful</a> and

‎feeds/all.atom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<feed xmlns="http://www.w3.org/2005/Atom"><title>Matt Makai</title><link href="http://www.fullstackpython.com/" rel="alternate"></link><link href="http://www.fullstackpython.com/feeds/all.atom.xml" rel="self"></link><id>http://www.fullstackpython.com/</id><updated>2014-12-05T12:13:08Z</updated></feed>
2+
<feed xmlns="http://www.w3.org/2005/Atom"><title>Matt Makai</title><link href="http://www.fullstackpython.com/" rel="alternate"></link><link href="http://www.fullstackpython.com/feeds/all.atom.xml" rel="self"></link><id>http://www.fullstackpython.com/</id><updated>2014-12-05T12:13:40Z</updated></feed>

‎source/content/pages/08-apis/0803-api-creation.markdown‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@ applications through machine-to-machine communication.
2626
[Tastypie](https://django-tastypie.readthedocs.org/en/latest/) are
2727
the two most widely used API frameworks to use with Django. The edge
2828
currently goes to Django REST framework based on rough community sentiment.
29+
Django REST framework recently hit the
30+
[3.0 release mark](http://www.django-rest-framework.org/topics/3.0-announcement/)
31+
after Tom Christie ran a
32+
[successful Kickstarter campaign](https://www.kickstarter.com/projects/tomchristie/django-rest-framework-3).
2933

3034
* [Flask-RESTful](http://flask-restful.readthedocs.org/en/latest/) and
3135
[Flask API](http://flask.pocoo.org/docs/api/) are popular libraries for

0 commit comments

Comments
 (0)