Merge with master

1 files changed, 3 insertions, 3 deletions

diff --git a/mkdocs.py b/mkdocs.py
index 5d202d7e..8106e8e2 100755
--- a/mkdocs.py
+++ b/mkdocs.py
@@ -17,14 +17,14 @@ if local:
     suffix = '.html'
     index = 'index.html'
 else:
-    base_url = 'http://tomchristie.github.com/django-rest-framework'
-    suffix = ''
+    base_url = 'http://django-rest-framework.org'
+    suffix = '.html'
     index = ''
 
 
 main_header = '<li class="main"><a href="#{{ anchor }}">{{ title }}</a></li>'
 sub_header = '<li><a href="#{{ anchor }}">{{ title }}</a></li>'
-code_label = r'<a class="github" href="https://github.com/tomchristie/django-rest-framework/blob/restframework2/rest_framework/\1"><span class="label label-info">\1</span></a>'
+code_label = r'<a class="github" href="https://github.com/tomchristie/django-rest-framework/tree/master/rest_framework/\1"><span class="label label-info">\1</span></a>'
 
 page = open(os.path.join(docs_dir, 'template.html'), 'r').read()