Merge branch 'release/1.0.2'

thespacedoctor · Sep 26, 2016 · 6456f6c · 6456f6c
2 parents d7d2a9c + b81822d
commit 6456f6c
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -1,8 +1,7 @@
 tastic
 ======
 
-*Scripts and Command-Line tools for working with taskpaper documents on
-macOS and iOS*.
+*A python package for working with taskpaper documents*.
 
 Usage
 =====

diff --git a/README.rst b/README.rst
@@ -1,7 +1,7 @@
 tastic 
 =========================
 
-*Scripts and Command-Line tools for working with taskpaper documents on macOS and iOS*.
+*A python package for working with taskpaper documents*.
 
 Usage
 ======

diff --git a/docs/source/_api/conf.py b/docs/source/_api/conf.py
@@ -1,7 +1,11 @@
 # -*- coding: utf-8 -*-
 #
 # tastic documentation build configuration file, created by
+<<<<<<< Updated upstream
 # sphinx-quickstart on Mon Sep 26 09:11:47 2016.
+=======
+# sphinx-quickstart on Mon Sep 26 09:27:42 2016.
+>>>>>>> Stashed changes
 #
 # This file is execfile()d with the current directory set to its
 # containing dir.

diff --git a/docs/source/_api/index.rst b/docs/source/_api/index.rst
@@ -1,5 +1,9 @@
 .. tastic documentation master file, created by
+<<<<<<< Updated upstream
    sphinx-quickstart on Mon Sep 26 09:11:47 2016.
+=======
+   sphinx-quickstart on Mon Sep 26 09:27:42 2016.
+>>>>>>> Stashed changes
    You can adapt this file completely to your liking, but it should at least
    contain the root `toctree` directive.
 

diff --git a/docs/source/_includes/description.rst b/docs/source/_includes/description.rst
@@ -1,4 +1,4 @@
 tastic 
 =========================
 
-*Scripts and Command-Line tools for working with taskpaper documents on macOS and iOS*.
+*A python package for working with taskpaper documents*.
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -263,7 +263,7 @@ def __getattr__(cls, name):
 #  dir menu entry, description, category)
 texinfo_documents = [
     ('index', 'tastic', u'tastic Documentation',
-     u'Dave Young', 'tastic', 'Scripts and Command-Line tools for working with taskpaper documents on macOS and iOS',
+     u'Dave Young', 'tastic', 'A python package for working with taskpaper documents',
      'Miscellaneous'),
 ]
 

diff --git a/setup.py b/setup.py
@@ -28,7 +28,7 @@ def readme():
 
 setup(name="tastic",
       version=__version__,
-      description="Scripts and Command-Line tools for working with taskpaper documents on macOS and iOS",
+      description="A python package for working with taskpaper documents",
       long_description=readme(),
       classifiers=[
           'Development Status :: 4 - Beta',

diff --git a/tastic/__version__.py b/tastic/__version__.py
@@ -1 +1 @@
-__version__ = '1.0.1'
+__version__ = '1.0.2'