Merge branch 'release/0.6.1'

CONTRIBUTORS

@@ -0,0 +1,13 @@
+Contributors:
+
+* Kirill Klenov (https://github.com/klen)
+* Sergii Iavorskyi (https://github.com/yavorskiy)
+* Alexey Sveshnikov (https://github.com/alexey-sveshnikov)
+* dfeinzeig (https://github.com/dfeinzeig)
+* Flávio Caetano (https://github.com/fjcaetano)
+* Pavel Puchkin (https://github.com/neoascetic)
+* Aliaksei Harabchuk (https://github.com/harabchuk)
+* Chris Davis (https://github.com/defbyte)
+* F. Gabriel Gosselin (https://github.com/evidens)
+* Andrew Grigorev (https://github.com/ei-grad)
+* Ashley Wilson (https://github.com/CptLemming)

Changelog

@@ -1,3 +1,7 @@
+2014-06-04  horneds
+
+	* Fix markdown_css template tag (c) Ashley Wilson
+
 2014-05-18  horneds
 
 	* Add MARKDOWN_PROTECT_PREVIEW option

Makefile

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

django_markdown/__init__.py

@@ -1,6 +1,6 @@
 """ Django-Markdown supports markdown in Django. """
 
-__version__ = "0.6.0"
+__version__ = "0.6.1"
 __project__ = "django-markdown"
 __author__ = "Kirill Klenov <horneds@gmail.com>"
 __license__ = "GNU LGPL"

django_markdown/templatetags/django_markdown.py

@@ -84,7 +84,7 @@ def markdown_media_js():
     )
 
 
-@register.inclusion_tag('django_markdown/media_js.html')
+@register.inclusion_tag('django_markdown/media_css.html')
 def markdown_media_css():
     """ Add css requirements to HTML.
 

docs/conf.py

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