Merge pull request #217 from kdere/master

fixed up doc index
chianti-atomic · Oct 22, 2018 · 6b87c69 · 6b87c69
2 parents 130e7f3 + bd82a92
commit 6b87c69
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/docs/0-notes.txt b/docs/0-notes.txt
@@ -12,3 +12,6 @@ sphinx-apidoc  -o source/api ../ChiantiPy
 
 then need to exit stuff in api ChiantiPy.base.rst to include the methods
 
+sphinxdoc.css - line 20 14px -> 16px
+
+
diff --git a/docs/source/changelog.rst b/docs/source/changelog.rst
@@ -7,7 +7,13 @@ changes from 0.7.1 to 0.8.0
 
 ChiantiPy is now only compliant with Python 3.  Development is currently with Python 3.6
 
-The use of the PyQt4 and WxWidgets packages have been dropped
+The use of the PyQt4 and WxWidgets packages have been dropped and PyQt5 is now used
+
+The documentation is now available on github.io_ and ReadTheDocs_
+
+.. _github.io:  https://chianti-atomic.github.io/
+
+.. _ReadTheDocs:  https://chiantipy.readthedocs.io/en/latest/?badge=latest
 
 changes from 0.7.0 to 0.7.1
 ===========================

diff --git a/docs/source/index.rst b/docs/source/index.rst
@@ -17,9 +17,8 @@ ChiantiPy v0.8.0 is released under a new license, the OSI approved ISC license.
 CHIANTI is developed and maintained by scientists at George Mason University (USA), the University of Michigan (USA), and the University of Cambridge (UK). The first version of CHIANTI was released in 1997 and version 8.0 in 2016.
 
 .. toctree::
-   :maxdepth: 3
+   :maxdepth: 2
 
-.. include:: ../README.rst
    getting_started
    quick_start
    tutorial

diff --git a/setup.py b/setup.py
@@ -19,7 +19,7 @@
     'Environment :: Console',
     'Intended Audience :: Science/Research',
     'Intended Audience :: End Users/Desktop',
-    'License :: OSI Approved :: ISC ',
+    'License :: OSI Approved :: ISC License (ISCL)',
     'Operating System :: POSIX :: Linux',
     'Programming Language :: Python :: 3',
     'Topic :: Scientific/Engineering :: Astronomy',