Merge pull request #1124 from peastman/license

Improved placement of license information in manuals

docs-source/developerguide/developer.rst

@@ -66,7 +66,7 @@ information related to a particular simulation, and define methods for
 performing calculations.
 
 Note that, whereas a Force is logically “part of” a System, a ForceImpl is
-logically “part of” a Context.  (See :numref:`Figure,API Relationships`\ .)  If you create many Contexts
+logically “part of” a Context.  (See :autonumref:`Figure,API Relationships`\ .)  If you create many Contexts
 for simulating the same System, there is still only one System and only one copy
 of each Force in it.  But there will be separate ForceImpls for each Context,
 and those ForceImpls store information related to their particular Contexts.

docs-source/developerguide/index.rst

@@ -2,34 +2,9 @@
 OpenMM Developer Guide
 ######################
 
-Portions copyright (c) 2011-2014 Stanford University and the Authors
-Contributors: Peter Eastman
+.. only:: latex
 
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this document (the "Document"), to deal in the Document without restriction,
-including without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Document, and to permit
-persons to whom the Document is furnished to do so, subject to the following
-conditions:
-
-This copyright and permission notice shall be included in all copies or
-substantial portions of the Document.
-
-THE DOCUMENT IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS,
-CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE DOCUMENT OR THE USE OR OTHER DEALINGS IN THE
-DOCUMENT.
-
-Acknowledgments
-
-OpenMM software and all related activities, such as this manual, are funded by
-the Simbios National Center for Biomedical Computing through the National
-Institutes of Health Roadmap for Medical Research, Grant U54 GM072970.
-Information on the National Centers can be found at
-http://nihroadmap.nih.gov/bioinformatics.
+   .. include:: license.rst
 
 .. toctree::
    :maxdepth: 3
@@ -37,3 +12,6 @@ http://nihroadmap.nih.gov/bioinformatics.
    
    developer
 
+.. only:: html
+
+   .. include:: license.rst

docs-source/developerguide/license.rst

+Portions copyright (c) 2011-2015 Stanford University and the Authors
+
+Contributors: Peter Eastman
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this document (the "Document"), to deal in the Document without restriction,
+including without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Document, and to permit
+persons to whom the Document is furnished to do so, subject to the following
+conditions:
+
+This copyright and permission notice shall be included in all copies or
+substantial portions of the Document.
+
+THE DOCUMENT IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS,
+CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE DOCUMENT OR THE USE OR OTHER DEALINGS IN THE
+DOCUMENT.
+
+Acknowledgments
+
+OpenMM software and all related activities, such as this manual, are funded by
+the Simbios National Center for Biomedical Computing through the National
+Institutes of Health Roadmap for Medical Research, Grant U54 GM072970.
+Information on the National Centers can be found at
+http://nihroadmap.nih.gov/bioinformatics.

docs-source/usersguide/index.rst

@@ -4,31 +4,9 @@
 OpenMM Users Manual and Theory Guide
 ####################################
 
+.. only:: latex
 
-Portions copyright (c) 2008-2014 Stanford University and the Authors
-
-Contributors:  Kyle Beauchamp, Christopher Bruns, John Chodera, Peter Eastman, Mark
-Friedrichs, Joy P. Ku, Tom Markland, Vijay Pande, Randy Radmer, Michael Sherman,
-Jason Swails, Lee-Ping Wang
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this document (the "Document"), to deal in the Document without restriction,
-including without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Document, and to permit
-persons to whom the Document is furnished to do so, subject to the following
-conditions:
-
-This copyright and permission notice shall be included in all copies or
-substantial portions of the Document.
-
-THE DOCUMENT IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS,
-CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE DOCUMENT OR THE USE OR OTHER DEALINGS IN THE
-DOCUMENT.
-
+   .. include:: license.rst
 
 .. toctree::
    :numbered:
@@ -40,3 +18,6 @@ DOCUMENT.
    theory
    zbibliography
 
+.. only:: html
+
+   .. include:: license.rst

docs-source/usersguide/license.rst

+Portions copyright (c) 2008-2015 Stanford University and the Authors
+
+Contributors:  Kyle Beauchamp, Christopher Bruns, John Chodera, Peter Eastman, Mark
+Friedrichs, Joy P. Ku, Tom Markland, Vijay Pande, Randy Radmer, Michael Sherman,
+Jason Swails, Lee-Ping Wang
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this document (the "Document"), to deal in the Document without restriction,
+including without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Document, and to permit
+persons to whom the Document is furnished to do so, subject to the following
+conditions:
+
+This copyright and permission notice shall be included in all copies or
+substantial portions of the Document.
+
+THE DOCUMENT IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS,
+CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE DOCUMENT OR THE USE OR OTHER DEALINGS IN THE
+DOCUMENT.