Merge branch 'restframework2' of…

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

docs/topics/credits.md

@@ -42,6 +42,7 @@ The following people have helped make REST framework great.
 * Alec Perkins - [alecperkins]
 * Michael Barrett - [phobologic]
 * Mathieu Dhondt - [laundromat]
+* Johan Charpentier - [cyberj]
 
 Many thanks to everyone who's contributed to the project.
 
@@ -106,3 +107,4 @@ To contact the author directly:
 [alecperkins]: https://github.com/alecperkins
 [phobologic]: https://github.com/phobologic
 [laundromat]: https://github.com/laundromat
+[cyberj]: https://github.com/cyberj
\ No newline at end of file

mkdocs.py

@@ -6,7 +6,7 @@ import re
 import shutil
 import sys
 
-root_dir = os.path.dirname(__file__)
+root_dir = os.path.abspath(os.path.dirname(__file__))
 docs_dir = os.path.join(root_dir, 'docs')
 html_dir = os.path.join(root_dir, 'html')
 
@@ -60,7 +60,8 @@ for (dirpath, dirnames, filenames) in os.walk(docs_dir):
 
         content = markdown.markdown(text, ['headerid'])
 
-        build_dir = os.path.join(html_dir, dirpath.lstrip(docs_dir))
+        relative_dir = dirpath.replace(docs_dir, '').lstrip(os.path.sep)
+        build_dir = os.path.join(html_dir, relative_dir)
         build_file = os.path.join(build_dir, filename[:-3] + '.html')
 
         if not os.path.exists(build_dir):