Merge remote-tracking branch 'upstream/master'

# Conflicts: #	rest_framework_docs/__init__.py #	rest_framework_docs/api_docs.py

Author: Marc

docs/changelog.md

@@ -3,6 +3,12 @@ title: "Changelog"
 source_filename: "changelog"
 ---
 
+### Release 0.0.9
+
+ - Support for more types of `ROOT_URLCONF`
+ - Move docs to [MKDocs](http://www.mkdocs.org/)
+
+
 ### Release 0.0.7
 
  - Fix methods in Live API Endpoints (now compatible with Python 2.7)
@@ -18,7 +24,7 @@ source_filename: "changelog"
 
 ### Release 0.0.5
 
- - Support both common types of ROOT_URLCONF
+ - Support both common types of `ROOT_URLCONF`
 
 
 ### Release 0.0.4

docs/settings.md

@@ -12,14 +12,14 @@ To set DRF docs' settings just include the dictionary below in Django's `setting
 
 ### Settings Description
 
-##### HIDDEN
+##### HIDE_DOCS
 You can use hidden to prevent your docs from showing up in different environments (ie. Show in development, hide in production). To do so you can use environment variables.
 
  REST_FRAMEWORK_DOCS = {
-  'HIDE_DOCS': os.environ.get('SHOW_DRFDOCS', False)
+  'HIDE_DOCS': os.environ.get('HIDE_DRFDOCS', False)
  }
 
-Then set the value of the environment variable `SHOW_DRFDOCS` for each environment (ie. Use `.env` files)
+Then set the value of the environment variable `HIDE_DRFDOCS` for each environment (ie. Use `.env` files)
 
 ### List of Settings
 

rest_framework_docs/__init__.py

@@ -1,3 +1,3 @@
-__version__ = '0.0.7'
+__version__ = '0.0.9'
 
 SERIALIZER_FIELDS = {}

rest_framework_docs/api_docs.py

@@ -1,4 +1,5 @@
 from operator import attrgetter
+from importlib import import_module
 
 from django.conf import settings
 from django.core.urlresolvers import RegexURLResolver, RegexURLPattern
@@ -17,7 +18,11 @@ def __init__(self, filter_param=None):
  """
  SERIALIZER_FIELDS.clear()
  self.endpoints = []
- root_urlconf = import_string(settings.ROOT_URLCONF)
+ try:
+ root_urlconf = import_string(settings.ROOT_URLCONF)
+ except ImportError:
+ # Handle a case when there's no dot in ROOT_URLCONF
+ root_urlconf = import_module(settings.ROOT_URLCONF)
  if hasattr(root_urlconf, 'urls'):
  self.get_all_view_names(root_urlconf.urls.urlpatterns, filter_param=filter_param)
  else: