Browse files

Merge branch 'master' of github.com:eldarion/brabeion

  • Loading branch information...
2 parents 36c03cb + 6d72160 commit 586a70bab1da94e1e8201ad91eb434cdf83b7eec @alex alex committed Jun 4, 2010
Showing with 14 additions and 2 deletions.
  1. +2 −1 .gitignore
  2. 0 docs/_build/.empty
  3. 0 docs/_static/.empty
  4. +1 −1 docs/conf.py
  5. +3 −0 requirements/development.txt
  6. +8 −0 setup.cfg
View
3 .gitignore
@@ -1,2 +1,3 @@
*.py[co]
-_build
+docs/_build/*
+docs/_static/*
View
0 docs/_build/.empty
No changes.
View
0 docs/_static/.empty
No changes.
View
2 docs/conf.py
@@ -50,7 +50,7 @@
# The short X.Y version.
version = '0.1'
# The full version, including alpha/beta/rc tags.
-release = '0.1'
+release = '0.1.dev11'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
View
3 requirements/development.txt
@@ -0,0 +1,3 @@
+Django==1.2.1
+Sphinx==1.0b1
+-e hg+http://bitbucket.org/brosner/sphinx-pypi-upload#egg=sphinx-pypi-upload
View
8 setup.cfg
@@ -0,0 +1,8 @@
+[build_sphinx]
+source-dir = docs/
+build-dir = docs/_build
+all_files = 1
+
+[upload_sphinx]
+upload-dir = docs/_build/html
+docs-dir = docs/

0 comments on commit 586a70b

Please sign in to comment.