Merge branch 'docs' of github.com:tomchristie/django-rest-framework into docs

This commit is contained in:
Tom Christie 2017-01-27 10:36:27 +00:00
commit 9cb3c8ec35
3 changed files with 3 additions and 3 deletions

View File

@ -799,7 +799,7 @@ class DocumentationRenderer(BaseRenderer):
format = 'html' format = 'html'
charset = 'utf-8' charset = 'utf-8'
template = 'rest_framework/docs/index.html' template = 'rest_framework/docs/index.html'
code_style = 'default' code_style = 'emacs'
def get_context(self, data): def get_context(self, data):
from pygments.formatters import HtmlFormatter from pygments.formatters import HtmlFormatter

View File

@ -57,7 +57,7 @@
const coreapi = window.coreapi const coreapi = window.coreapi
const codec = new coreapi.codecs.CoreJSONCodec() const codec = new coreapi.codecs.CoreJSONCodec()
const schema = {{ schema }} const schema = '{"_type": "document"}' {{ schema }}
const doc = codec.decode(schema, {preloaded: true}) const doc = codec.decode(schema, {preloaded: true})
const client = new coreapi.Client() const client = new coreapi.Client()

View File

@ -53,7 +53,7 @@ def do_code(parser,token):
class CodeNode(template.Node): class CodeNode(template.Node):
style = 'default' style = 'emacs'
def __init__(self, lang, code): def __init__(self, lang, code):
self.lang = lang self.lang = lang