From a0e3c44c99a61a6dc878308bdf0890fbb10c41e4 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Sat, 18 May 2013 13:40:20 +0200
Subject: Added @craigds, @pyriku, @brianz - Yay for sprints!

---
 docs/topics/credits.md | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'docs/topics')

diff --git a/docs/topics/credits.md b/docs/topics/credits.md
index 8151b4d3..5998b4ca 100644
--- a/docs/topics/credits.md
+++ b/docs/topics/credits.md
@@ -124,6 +124,9 @@ The following people have helped make REST framework great.
 * Marlon Bailey - [avinash240]
 * James Summerfield - [jsummerfield]
 * Andy Freeland - [rouge8]
+* Craig de Stigter - [craigds]
+* Pablo Recio - [pyriku]
+* Brian Zambrano - [brianz]
 
 Many thanks to everyone who's contributed to the project.
 
@@ -284,3 +287,6 @@ You can also contact [@_tomchristie][twitter] directly on twitter.
 [avinash240]: https://github.com/avinash240
 [jsummerfield]: https://github.com/jsummerfield
 [rouge8]: https://github.com/rouge8
+[craigds]: https://github.com/craigds
+[pyriku]: https://github.com/pyriku
+[brianz]: https://github.com/brianz
-- 
cgit v1.2.3


From 72bc5a35569e75468442287e74656e4b18adc163 Mon Sep 17 00:00:00 2001
From: Mark McArdle
Date: Sat, 18 May 2013 13:19:13 +0100
Subject: documentation for
 https://github.com/tomchristie/django-rest-framework/issues/775

---
 docs/topics/browsable-api.md | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'docs/topics')

diff --git a/docs/topics/browsable-api.md b/docs/topics/browsable-api.md
index 8ee01824..65f76abc 100644
--- a/docs/topics/browsable-api.md
+++ b/docs/topics/browsable-api.md
@@ -35,6 +35,17 @@ A suitable replacement theme can be generated using Bootstrap's [Customize Tool]
 
 You can also change the navbar variant, which by default is `navbar-inverse`, using the `bootstrap_navbar_variant` block. The empty `{% block bootstrap_navbar_variant %}{% endblock %}` will use the original Bootstrap navbar style.
 
+Full Example
+
+    {% extends "rest_framework/base.html" %}
+
+    {% block bootstrap_theme %}
+        <link rel="stylesheet" href="/path/to/yourtheme/bootstrap.min.css' type="text/css">
+    {% endblock %}
+
+    {% block bootstrap_navbar_variant %}{% endblock %}
+
+
 For more specific CSS tweaks, use the `style` block instead.
 
 
-- 
cgit v1.2.3


From 275bfa2320eeffcfd307daaf7c85faaa0f55a8ee Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Sat, 18 May 2013 14:03:08 +0100
Subject: Added @grimborg and @ryankask. Go Team. :)

---
 docs/topics/credits.md | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'docs/topics')

diff --git a/docs/topics/credits.md b/docs/topics/credits.md
index 8151b4d3..62f113c2 100644
--- a/docs/topics/credits.md
+++ b/docs/topics/credits.md
@@ -124,6 +124,8 @@ The following people have helped make REST framework great.
 * Marlon Bailey - [avinash240]
 * James Summerfield - [jsummerfield]
 * Andy Freeland - [rouge8]
+* Òscar Vilaplana - [grimborg]
+* Ryan Kaskel - [ryankask]
 
 Many thanks to everyone who's contributed to the project.
 
@@ -284,3 +286,5 @@ You can also contact [@_tomchristie][twitter] directly on twitter.
 [avinash240]: https://github.com/avinash240
 [jsummerfield]: https://github.com/jsummerfield
 [rouge8]: https://github.com/rouge8
+[grimborg]: https://github.com/grimborg
+[ryankask]: https://github.com/ryankask
-- 
cgit v1.2.3


From 3ba43b960ecacda1121670440a38c2883815bad2 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Sat, 18 May 2013 16:19:05 +0200
Subject: Added @andymckay for refactoring #860

---
 docs/topics/credits.md | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'docs/topics')

diff --git a/docs/topics/credits.md b/docs/topics/credits.md
index bba78ba8..d805c0c1 100644
--- a/docs/topics/credits.md
+++ b/docs/topics/credits.md
@@ -129,6 +129,7 @@ The following people have helped make REST framework great.
 * Brian Zambrano - [brianz]
 * Òscar Vilaplana - [grimborg]
 * Ryan Kaskel - [ryankask]
+* Andy McKay - [andymckay]
 
 Many thanks to everyone who's contributed to the project.
 
@@ -294,3 +295,4 @@ You can also contact [@_tomchristie][twitter] directly on twitter.
 [brianz]: https://github.com/brianz
 [grimborg]: https://github.com/grimborg
 [ryankask]: https://github.com/ryankask
+[andymckay]: https://github.com/andymckay
-- 
cgit v1.2.3