Skip to content

Commit

Permalink
Merge branch 'release/1.0.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
thespacedoctor committed Sep 26, 2016
2 parents 4bb4523 + 9e95b2a commit 57debaa
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion docs/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ html:
@cat $(INDIR)/tutorial.rst >> $(BLOGRST)
@echo "" >> $(BLOGRST)

pandoc --from=rst --to=markdown_mmd --output=$(BLOGMD) $(BLOGRST)
pandoc -s --columns=3000 --smart --wrap=preserve -f rst -t markdown_mmd+yaml_metadata_block+tex_math_dollars+mmd_link_attributes+raw_html+backtick_code_blocks --output=$(BLOGMD) $(BLOGRST)
pandoc --from=rst --to=markdown_mmd --output=$(READMEMD) $(READMERST)

rm -rf $(BUILDDIR)/html/todo.html
Expand Down
2 changes: 1 addition & 1 deletion docs/source/_api/conf.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
#
# tastic documentation build configuration file, created by
# sphinx-quickstart on Mon Sep 26 09:36:33 2016.
# sphinx-quickstart on Mon Sep 26 10:03:22 2016.
#
# This file is execfile()d with the current directory set to its
# containing dir.
Expand Down
2 changes: 1 addition & 1 deletion docs/source/_api/index.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.. tastic documentation master file, created by
sphinx-quickstart on Mon Sep 26 09:36:33 2016.
sphinx-quickstart on Mon Sep 26 10:03:22 2016.
You can adapt this file completely to your liking, but it should at least
contain the root `toctree` directive.
Expand Down
2 changes: 1 addition & 1 deletion tastic/__version__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = '1.0.2'
__version__ = '1.0.3'

0 comments on commit 57debaa

Please sign in to comment.