encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-11-26 11:33:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Tom Christie 2012-09-27 13:34:48 +01:00
commit 4d906938a9
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/topics/credits.md
View File

@ -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

5
mkdocs.py
View File

@ -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):