Skip to content

Commit

Permalink
The license for User's Guide is CC BY 4.0 (#7411)
Browse files Browse the repository at this point in the history
  • Loading branch information
sjoelund committed May 7, 2021
1 parent e8349eb commit 83ff1a1
Show file tree
Hide file tree
Showing 6 changed files with 174 additions and 28 deletions.
Binary file added doc/UsersGuide/source/_static/cc-by-80x15.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions doc/UsersGuide/source/_templates/layout.html
@@ -0,0 +1,7 @@
{% extends '!layout.html' %}

{% block footer %}
<div class="footer">
{% if show_copyright %}&copy; {{ copyright }}.{% endif %}
</div>
{% endblock %}
4 changes: 3 additions & 1 deletion doc/UsersGuide/source/conf.py
Expand Up @@ -72,9 +72,11 @@

# General information about the project.
project = 'OpenModelica User\'s Guide'
copyright = ' %d, Open Source Modelica Consortium' % (date.today().year)
copyright = '''1998-%d Open Source Modelica Consortium <a rel="license" href="http://creativecommons.org/licenses/by/4.0/"><img alt="Creative Commons License" style="border-width:0" src="_static/cc-by-80x15.png" /></a> <br> This work is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 International License</a>''' % (date.today().year)
author = 'Open Source Modelica Consortium'

today_fmt = '%Y'

# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
# built documents.
Expand Down
36 changes: 9 additions & 27 deletions doc/UsersGuide/source/copyright.inc
@@ -1,33 +1,15 @@
Open Source Modelica Consortium
| Copyright © 1998-|today| Open Source Modelica Consortium (OSMC)
| c/o Linköpings universitet, Department of Computer and Information Science
| SE-58183 Linköping, Sweden

Copyright © 1998-\ *CurrentYear*, Open Source Modelica Consortium
(OSMC), c/o Linköpings universitet, Department of Computer and
Information Science, SE-58183 Linköping, Sweden
.. image :: media/cc-by.*
:alt: Creative Commons License
:target: http://creativecommons.org/licenses/by/4.0/

All rights reserved.
This work is licensed under a `Creative Commons Attribution 4.0 International License <http://creativecommons.org/licenses/by/4.0/>`__.

THIS PROGRAM IS PROVIDED UNDER THE TERMS OF GPL VERSION 3 LICENSE OR
THIS OSMC PUBLIC LICENSE (OSMC-PL). ANY USE, REPRODUCTION OR
DISTRIBUTION OF THIS PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THE
OSMC PUBLIC LICENSE OR THE GPL VERSION 3, ACCORDING TO RECIPIENTS
CHOICE.

The OpenModelica software and the OSMC (Open Source Modelica Consortium)
Public License (OSMC-PL) are obtained from OSMC, either from the above
address, from the URLs: https://www.openmodelica.org or
http://www.ida.liu.se/projects/OpenModelica, and in the OpenModelica
distribution. GNU version 3 is obtained from:
http://www.gnu.org/copyleft/gpl.html.

This program is distributed WITHOUT ANY WARRANTY; without even the
implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE,
EXCEPT AS EXPRESSLY SET FORTH IN THE BY RECIPIENT SELECTED SUBSIDIARY
LICENSE CONDITIONS OF OSMC-PL.

See the full OSMC Public License conditions for more details.

| This document is part of OpenModelica: https://www.openmodelica.org
| Contact: OpenModelica@ida.liu.se
This document is part of OpenModelica: https://www.openmodelica.org
Contact: OpenModelica@ida.liu.se

Modelica\ :sup:`®` is a registered trademark of the Modelica
Association, https://www.Modelica.org
Expand Down
Binary file added doc/UsersGuide/source/media/cc-by.pdf
Binary file not shown.
155 changes: 155 additions & 0 deletions doc/UsersGuide/source/media/cc-by.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 83ff1a1

Please sign in to comment.