diff --git a/cpp/docs/api/credits.rst b/cpp/docs/api/credits.rst deleted file mode 100644 index c3e4d4e1..00000000 --- a/cpp/docs/api/credits.rst +++ /dev/null @@ -1,7 +0,0 @@ -******* -Credits -******* - -libloot is written by `Ortham`_. The copyright licenses for libloot can be found in in :doc:`../licenses/texts`. - -.. _Ortham: https://github.com/Ortham diff --git a/cpp/docs/licenses/Apache-2.0 b/cpp/docs/api/licenses/Apache-2.0 similarity index 100% rename from cpp/docs/licenses/Apache-2.0 rename to cpp/docs/api/licenses/Apache-2.0 diff --git a/cpp/docs/licenses/BSD-3-Clause b/cpp/docs/api/licenses/BSD-3-Clause similarity index 100% rename from cpp/docs/licenses/BSD-3-Clause rename to cpp/docs/api/licenses/BSD-3-Clause diff --git a/cpp/docs/licenses/GFDL-1.3-no-invariants-or-later b/cpp/docs/api/licenses/GFDL-1.3-no-invariants-or-later similarity index 100% rename from cpp/docs/licenses/GFDL-1.3-no-invariants-or-later rename to cpp/docs/api/licenses/GFDL-1.3-no-invariants-or-later diff --git a/cpp/docs/licenses/GPL-3.0-or-later b/cpp/docs/api/licenses/GPL-3.0-or-later similarity index 100% rename from cpp/docs/licenses/GPL-3.0-or-later rename to cpp/docs/api/licenses/GPL-3.0-or-later diff --git a/cpp/docs/licenses/MIT b/cpp/docs/api/licenses/MIT similarity index 100% rename from cpp/docs/licenses/MIT rename to cpp/docs/api/licenses/MIT diff --git a/cpp/docs/licenses/Unicode-3.0 b/cpp/docs/api/licenses/Unicode-3.0 similarity index 100% rename from cpp/docs/licenses/Unicode-3.0 rename to cpp/docs/api/licenses/Unicode-3.0 diff --git a/cpp/docs/licenses/notices.rst b/cpp/docs/api/licenses/dependency-notices.rst similarity index 100% rename from cpp/docs/licenses/notices.rst rename to cpp/docs/api/licenses/dependency-notices.rst diff --git a/cpp/docs/api/licenses/index.rst b/cpp/docs/api/licenses/index.rst new file mode 100644 index 00000000..2e1636ac --- /dev/null +++ b/cpp/docs/api/licenses/index.rst @@ -0,0 +1,10 @@ +***************** +Copyright Notices +***************** + +.. toctree:: + :maxdepth: 1 + + libloot-notices + dependency-notices + texts diff --git a/cpp/docs/api/licenses/libloot-notices.rst b/cpp/docs/api/licenses/libloot-notices.rst new file mode 100644 index 00000000..f114ed66 --- /dev/null +++ b/cpp/docs/api/licenses/libloot-notices.rst @@ -0,0 +1,16 @@ +libloot Copyright Notices +========================= + +libloot is distributed under the GNU General Public License v3.0. The documentation is distributed under the GNU Free Documentation License v1.3. The full texts of both licenses are included in :doc:`texts`. + +While the GPL license allows anyone to make derivative works of libloot, the LOOT Team encourages those thinking of doing so to first discuss their reasoning for such an endeavour with the Team. It may be that what the derivative work would do differently is already planned for a future version of libloot or would be happily integrated into libloot, thus avoiding any extra effort by others. + +libloot has been specifically designed to prevent it being locked into the LOOT Team's official masterlist repositories. Nevertheless, the LOOT Team appeals to the community to avoid the distribution of unofficial masterlists, as this would only hamper the effort to create one set of stores for load order information. Any issues with a masterlist are best brought to the attention of the LOOT Team so that they may be remedied. + +GNU Free Documentation License Version 1.3 Notice: + + Copyright (C) 2012—2016 WrinklyNinja + + Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or any later version published by the Free Software Foundation; with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. + + A copy of the license is included in :doc:`texts`. diff --git a/cpp/docs/licenses/texts.rst b/cpp/docs/api/licenses/texts.rst similarity index 68% rename from cpp/docs/licenses/texts.rst rename to cpp/docs/api/licenses/texts.rst index 3d51a1bc..5c1943c9 100644 --- a/cpp/docs/licenses/texts.rst +++ b/cpp/docs/api/licenses/texts.rst @@ -1,41 +1,41 @@ -*********************** Copyright License Texts -*********************** +======================= .. contents:: + :local: GNU General Public License 3.0 -============================== +------------------------------ .. include:: GPL-3.0-or-later :literal: GNU Free Documentation License 1.3 -================================== +---------------------------------- .. include:: GFDL-1.3-no-invariants-or-later :literal: Apache License 2.0 -================== +------------------ .. include:: Apache-2.0 :literal: BSD 3-Clause "New" or "Revised" License -======================================= +--------------------------------------- .. include:: Apache-2.0 :literal: MIT License -=========== +----------- .. include:: MIT :literal: Unicode License v3 -================== +------------------ .. include:: Unicode-3.0 :literal: diff --git a/cpp/docs/index.rst b/cpp/docs/index.rst index 1e755f8d..d19d8bb7 100644 --- a/cpp/docs/index.rst +++ b/cpp/docs/index.rst @@ -10,7 +10,7 @@ libloot api/miscellaneous api/sorting api/reference - api/credits + api/licenses/index api/changelog .. toctree:: @@ -22,9 +22,3 @@ libloot metadata/data_structures/index metadata/conditions metadata/changelog - -.. toctree:: - :caption: Copyright Licenses - - licenses/notice.rst - licenses/texts.rst diff --git a/cpp/docs/licenses/notice.rst b/cpp/docs/licenses/notice.rst deleted file mode 100644 index 6861f1cd..00000000 --- a/cpp/docs/licenses/notice.rst +++ /dev/null @@ -1,19 +0,0 @@ -***************** -Copyright Notices -***************** - -LOOT and its API are distributed under the GNU General Public License v3.0. The documentation is distributed under the GNU Free Documentation License v1.3. The full texts of both licenses are included in :doc:`../licenses/texts`. - -While the GPL license allows anyone to make derivative works of LOOT, the LOOT Team encourages those thinking of doing so to first discuss their reasoning for such an endeavour with the Team. It may be that what the derivative work would do differently is already planned for a future version of LOOT or would be happily integrated into LOOT, thus avoiding any extra effort by others. - -LOOT has been specifically designed to prevent it being locked into the LOOT Team's official masterlist repositories. Nevertheless, the LOOT Team appeals to the community to avoid the distribution of unofficial masterlists, as this would only hamper the effort to create one set of stores for load order information. Any issues with a masterlist are best brought to the attention of the LOOT Team so that they may be remedied. - -GNU Free Documentation License Version 1.3 Notice: - - Copyright (C) 2012—2016 WrinklyNinja - - Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or any later version published by the Free Software Foundation; with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. - - A copy of the license is included in :doc:`../licenses/texts`. - -.. include:: notices.rst diff --git a/cpp/scripts/licenses.py b/cpp/scripts/licenses.py index 530db772..3c1b64e5 100644 --- a/cpp/scripts/licenses.py +++ b/cpp/scripts/licenses.py @@ -178,6 +178,6 @@ if __name__ == "__main__": notices_rst += section_rst - notices_rst_path = os.path.join(output_dir, 'notices.rst') + notices_rst_path = os.path.join(output_dir, 'dependency-notices.rst') with open(notices_rst_path, 'w', encoding="utf-8") as outfile: outfile.write(notices_rst)