diff --git a/djangorestframework/settings.py b/djangorestframework/settings.py
index e0b6a5d5e..8bb035559 100644
--- a/djangorestframework/settings.py
+++ b/djangorestframework/settings.py
@@ -25,6 +25,7 @@ DEFAULTS = {
     'DEFAULT_RENDERERS': (
         'djangorestframework.renderers.JSONRenderer',
         'djangorestframework.renderers.JSONPRenderer',
+        'djangorestframework.renderers.DocumentingHTMLRenderer',
         'djangorestframework.renderers.DocumentingPlainTextRenderer',
     ),
     'DEFAULT_PARSERS': (
@@ -44,7 +45,9 @@ DEFAULTS = {
     'FORM_METHOD_OVERRIDE': '_method',
     'FORM_CONTENT_OVERRIDE': '_content',
     'FORM_CONTENTTYPE_OVERRIDE': '_content_type',
-    'URL_ACCEPT_OVERRIDE': '_accept'
+    'URL_ACCEPT_OVERRIDE': '_accept',
+
+    'FORMAT_SUFFIX_KWARG': 'format'
 }
 
 
diff --git a/docs/topics/contributing.md b/docs/topics/contributing.md
index cbb41f2a2..8e8b98ac4 100644
--- a/docs/topics/contributing.md
+++ b/docs/topics/contributing.md
@@ -1,9 +1,5 @@
 # Contributing to REST framework
 
-## Accessing settings
-
-**Describe api_settings**
-
 ## Managing compatibility issues
 
 **Describe compat module**