Merge remote-tracking branch 'origin/master'

# Conflicts: # README.rst # docs/build/html/_modules/idesolver/idesolver.html # docs/build/html/_modules/index.html # docs/build/html/_sources/index.rst.txt # docs/build/html/_static/searchtools.js # docs/build/html/api.html # docs/build/html/changelog.html # docs/build/html/faq.html # docs/build/html/genindex.html # docs/build/html/index.html # docs/build/html/manual.html # docs/build/html/py-modindex.html # docs/build/html/quickstart.html # docs/build/html/search.html # docs/build/html/searchindex.js
JoshKarpel · Jun 14, 2018 · 132b254 · 132b254
2 parents c72c493 + 7403315
commit 132b254
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 0 deletions.
diff --git a/docs/source/_static/figs/quickstart_error.png b/docs/source/_static/figs/quickstart_error.png
diff --git a/docs/source/index.rst b/docs/source/index.rst
@@ -14,6 +14,7 @@ Integro-differential equations appear in many contexts, particularly when trying
 The IDESolver is an iterative solver, which means it generates successive approximations to the exact solution, using each approximation to generate the next (hopefully better) one.
 The algorithm is based on a scheme devised by `Gelmi and Jorquera <https://doi.org/10.1016/j.cpc.2013.09.008>`_.
 
+If you use IDESolver in your work, please consider `citing it <https://doi.org/10.21105/joss.00542>`_.
 
 :doc:`quickstart`
    A brief tutorial in using IDESolver.