Skip to content

Commit

Permalink
Fix docs
Browse files Browse the repository at this point in the history
  • Loading branch information
klen committed May 18, 2014
1 parent cc1e420 commit 1787b29
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
5 changes: 3 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,9 @@ upload: docs
.PHONY: docs
# target: docs - Compile and upload docs
docs:
python setup.py build_sphinx --source-dir=docs/ --build-dir=docs/_build --all-files
python setup.py upload_sphinx --upload-dir=docs/_build/html
@pip install sphinx sphinx-pypi-upload
@python setup.py build_sphinx --source-dir=docs/ --build-dir=docs/_build --all-files
@python setup.py upload_sphinx --upload-dir=docs/_build/html

.PHONY: t
# target: t - Runs tests
Expand Down
8 changes: 4 additions & 4 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))

from django_markdown import VERSION, AUTHOR
from django_markdown import __version__, __author__

# If extensions (or modules to document with autodoc) are in another directory,
# add these directories to sys.path here. If the directory is relative to the
Expand Down Expand Up @@ -45,16 +45,16 @@

# General information about the project.
project = u'django-markdown'
copyright = AUTHOR
copyright = __author__

# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
# built documents.
#
# The short X.Y version.
VERSION = VERSION
VERSION = __version__
# The full version, including alpha/beta/rc tags.
release = VERSION
release = __version__

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down

0 comments on commit 1787b29

Please sign in to comment.