Merge branch 'update-cmi-license' into source

pavoljuhas · pavoljuhas · commit 31d7c0fdf728 · 2019-07-18T17:12:11.000-04:00
* reuse CMI license for mPDF
* diffpy-cmi refer to LICENSE instead of LICENSE.txt
* Update license year to 2019
diff --git a/products/diffpycmi/LICENSE.txt b/products/diffpycmi/LICENSE.txt
@@ -10,7 +10,7 @@ Copyright (c) 2006-2007, Board of Trustees of Michigan State University
 Copyright (c) 2008-2012, The Trustees of Columbia University in the City
     of New York
 
-Copyright (c) 2014-2016, Brookhaven Science Associates, Brookhaven National
+Copyright (c) 2014-2019, Brookhaven Science Associates, Brookhaven National
     Laboratory
 
 
diff --git a/products/diffpycmi/index.rst b/products/diffpycmi/index.rst
@@ -32,7 +32,7 @@ Installation
 ============
 
 Use of this software is subject to the conditions in
-:doc:`LICENSE.txt <license>`.
+software :doc:`LICENSE <license>`.
 
 As of version 2.0 DiffPy-CMI is available for Linux and
 Mac as a collection of packages for Anaconda Python.  As
diff --git a/products/mPDF_LICENSE.txt b/products/mPDF_LICENSE.txt
diff --git a/products/mPDFlicense.rst b/products/mPDFlicense.rst
@@ -2,5 +2,5 @@
 
 .. title:: mPDF License
 
-.. literalinclude:: mPDF_LICENSE.txt
+.. literalinclude:: diffpycmi/LICENSE.txt
    :language: text
