From 23a765b0e629bb44238636b4d32212350abba1bc Mon Sep 17 00:00:00 2001
From: David Nind <david@davidnind.com>
Date: Sun, 3 Dec 2023 19:18:42 +0000
Subject: [PATCH] Bug 34900: (follow-up) List alphabetically and tidy ups

Listed in alphabetical order (except for Koha, which is listed
at the start).

Tidy ups and consistency changes:
- end of each entry: remove full stops
- separator between software and license: use a colon
- headings for software/library name: use sentence case
  unless a noun, abbreviation, or the actual software name
- http and https: use https where site uses it
- URLs: update where required
- license names: use consistent full names with title case

Signed-off-by: David Nind <david@davidnind.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
(cherry picked from commit 4cb2f7f2dbec601ea9e899bc85853c0c29ed2a67)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
(cherry picked from commit 3c24c5afb2d1a0f88a5345ab0a23d2b0e8ee05da)
Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
---
 .../intranet-tmpl/prog/en/modules/about.tt    | 137 +++++++++---------
 1 file changed, 69 insertions(+), 68 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
index bccf5e52a9..188803b533 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
@@ -930,176 +930,177 @@
                     [% WRAPPER tab_panel tabname= "licenses" %]
                         <h2>Koha</h2>
                         <p>
-                            Koha is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. <a rel="license" href="http://www.gnu.org/licenses/gpl-3.0.html">GNU General Public License</a>
-                        </p>
-                        <h2>jQuery and jQueryUI</h2>
-                        <p>
-                            <a href="http://jquery.com/">jQuery</a>, <a href="http://jqueryui.com/">jQueryUI</a>: <a href="http://github.com/jquery/jquery/blob/master/LICENSE.txt">MIT license</a>
+                            This program is free software: you can redistribute it and/or modify it under the terms of the <a rel="license" href="https://www.gnu.org/licenses/gpl-3.0.html">GNU General Public License</a> as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
                         </p>
 
                         <h2>Bootstrap</h2>
                         <p>
-                            <a href="https://getbootstrap.com/">Bootstrap</a>, <a href="http://glyphicons.com">Glyphicons Free</a>: <a href="https://github.com/twbs/bootstrap/blob/master/LICENSE">MIT license</a>
+                            <a href="https://getbootstrap.com/">Bootstrap</a>, <a href="https://glyphicons.com">Glyphicons Free</a>: <a href="https://github.com/twbs/bootstrap/blob/master/LICENSE">MIT License</a>
                         </p>
 
                         <h2>Bootstrap Icons</h2>
                         <p>
-                            <a href="https://icons.getbootstrap.com/">Bootstrap Icons</a>: <a href="https://github.com/twbs/icons/blob/main/LICENSE">MIT license</a>.
+                            <a href="https://icons.getbootstrap.com/">Bootstrap Icons</a>: <a href="https://github.com/twbs/icons/blob/main/LICENSE">MIT License</a>
                         </p>
 
-                        <h2>Famfamfam iconset</h2>
+                        <h2>Bridge Material Type Icon Set</h2>
                         <p>
-                            <a href="http://www.famfamfam.com/lab/icons/silk/">FamFamFam</a>: <a href="http://creativecommons.org/licenses/by/2.5/">Creative Commons Attribution 2.5 License</a>
+                            <a href="http://apps.carleton.edu/campus/library/bridge_icons/">Bridge Material Type Icons Project</a>: <a href="https://creativecommons.org/licenses/by-sa/2.5/">Creative Commons Attribution-ShareAlike 2.5 License</a>
                         </p>
 
-                        <h2>Bridge Material Type Icon Set</h2>
+                        <h2>Chocolat.js</h2>
                         <p>
-                            <a href="http://apps.carleton.edu/campus/library/bridge_icons/">Bridge Material Type Icons Project</a>: <a href="http://creativecommons.org/licenses/by-sa/2.5/">Creative Commons Attribution-ShareAlike 2.5 License</a>
+                            <a href="http://chocolat.insipi.de">Chocolat.js v1.1.0</a>: <a href="https://github.com/nicolas-t/Chocolat/blob/v1.1.0/LICENSE">GNU General Public License v3.0</a>
                         </p>
 
-                        <h2>jQuery Bar Rating Plugin</h2>
+                        <h2>CodeMirror</h2>
                         <p>
-                            <a href="https://antennaio.github.io/jquery-bar-rating/">jQuery Bar Rating</a>: <a href="https://github.com/antennaio/jquery-bar-rating/blob/master/LICENSE.txt">MIT License</a>.
+                            <a href="https://codemirror.net/">CodeMirror v5.40.2</a>: <a href="https://github.com/codemirror/codemirror5/blob/5.40.2/LICENSE">MIT License</a>
                         </p>
 
-                        <h2>jQuery insertAtCaret Plugin</h2>
+                        <h2>C3.js</h2>
                         <p>
-                            jQuery insertAtCaret Plugin v1.0 by the phpMyAdmin devel team is licensed under the <a href="http://www.gnu.org/licenses/gpl.html">GPL License</a>.
+                            <a href="https://c3js.org/">C3.js D3-based reusable chart library v0.4.11</a>: <a href="https://github.com/c3js/c3/blob/0.4.11/LICENSE">MIT Licence</a>
                         </p>
 
-                        <h2>jQuery treetable Plugin</h2>
+                        <h2>D3</h2>
                         <p>
-                            <a href="https://github.com/ludo/jquery-treetable">jQuery treetable Plugin 3.1.0</a>: <a href="https://github.com/ludo/jquery-treetable/blob/3.1.0/GPL-LICENSE.txt">GPL license v2.0</a>, <a href="https://github.com/ludo/jquery-treetable/blob/3.1.0/MIT-LICENSE.txt">MIT License</a>.
+                            <a href="https://d3js.org/">D3 JavaScript library for visualizing data v3.5.17</a>: <a href="https://github.com/d3/d3/blob/v3.5.17/LICENSE">ISC Licence</a>
                         </p>
 
-                        <h2>OpenJS Keyboard Shortcuts Library</h2>
+                        <h2>Day.js</h2>
                         <p>
-                            <a href="http://www.openjs.com/scripts/events/keyboard_shortcuts/">OpenJS keyboard shortcuts library</a>: By Binny V A under the BSD license.
+                            <a href="https://day.js.org/">Day.js v1.11.2</a>: <a href="https://github.com/iamkun/dayjs/blob/v1.11.2/LICENSE">MIT License</a>
                         </p>
 
-                        <h2>jQuery Multiple Select Plugin</h2>
+                        <h2>Enquire.js</h2>
                         <p>
-                            <a href="https://multiple-select.wenzhixin.net.cn/">jQuery Multiple Select plugin</a>: <a href="https://github.com/wenzhixin/multiple-select/blob/develop/LICENSE">MIT license</a>.
+                            <a href="https://wicky.nillia.ms/enquire.js">Enquire.js v2.0.1</a>:  <a href="https://github.com/WickyNilliams/enquire.js/blob/master/LICENSE">MIT License</a>
                         </p>
 
-                        <h2>Javascript Diff Algorithm</h2>
+                        <h2>FamFamFam icons</h2>
                         <p>
-                            <a href="https://johnresig.com/projects/javascript-diff-algorithm/">Javascript Diff Algorithm</a>: <a href="http://opensource.org/licenses/mit-license.php">MIT License</a>.
+                            <a href="https://web.archive.org/web/20221224123234/http://www.famfamfam.com/lab/icons/silk/">FamFamFam Silk icons</a>: <a href="https://creativecommons.org/licenses/by/2.5/">Creative Commons Attribution 2.5 License</a>
                         </p>
 
-                        <h2>jQuery Validation Plugin</h2>
+                        <h2>Font Awesome</h2>
                         <p>
-                            <a href="http://jqueryvalidation.org/">jQuery Validation Plugin</a>: <a href="https://github.com/jquery-validation/jquery-validation/blob/master/LICENSE.md">MIT License</a>.
+                            <a href="https://fontawesome.com/">Font Awesome v6.3.0</a>: <a href="https://github.com/FortAwesome/Font-Awesome/blob/6.3.0/LICENSE.txt">Creative Commons Attribution 4.0 International License, SIL Open Font License Version 1.1, MIT License </a>
                         </p>
 
-                        <h2>TinyMCE WYSIWYG editor</h2>
+                        <h2>Font Face Observer</h2>
                         <p>
-                            <a href="https://www.tiny.cloud/">TinyMCE WYSIWYG editor v5.9.2 </a>: <a href="https://github.com/tinymce/tinymce/blob/5.9.2/LICENSE.TXT">LGPL v2.1</a>.
+                            <a href="https://github.com/bramstein/fontfaceobserver">Font Face Observer JavaScript library v2.0.3</a>: <a href="https://github.com/bramstein/fontfaceobserver/blob/v2.0.3/LICENSE">BSD License</a>
                         </p>
 
-                        <h2>Font Awesome</h2>
+                        <h2>HC Sticky</h2>
                         <p>
-                            <a href="http://fontawesome.com/">Font Awesome v6.3.0</a>: <a href="https://github.com/FortAwesome/Font-Awesome/blob/6.3.0/LICENSE.txt">Various licenses</a>.
+                            <a href="https://somewebmedia.github.io/hc-sticky/">HC Sticky JavaScript library v2.2.3</a>: <a href="https://github.com/somewebmedia/hc-sticky/blob/v2.2.3/LICENSE">MIT License</a>
                         </p>
 
-                        <h2>CodeMirror editing library</h2>
+                        <h2>JavaScript Cookie</h2>
                         <p>
-                            <a href="http://codemirror.net/">CodeMirror editing library v5.40.2</a>: <a href="https://github.com/codemirror/codemirror5/blob/5.40.2/LICENSE">MIT license</a>.
+                            <a href="https://github.com/js-cookie/js-cookie">JavaScript Cookie v3.0.1</a>: <a href="https://github.com/js-cookie/js-cookie/blob/v3.0.1/LICENSE">MIT License</a>
                         </p>
 
-                        <h2>Require.js JS module system</h2>
+                        <h2>JavaScript Diff Algorithm</h2>
                         <p>
-                            <a href="http://requirejs.org/">Require.js JS module system v2.1.8</a>: <a href="https://github.com/requirejs/requirejs/blob/2.1.8/LICENSE">MIT license</a>.
+                            <a href="https://johnresig.com/projects/javascript-diff-algorithm/">Javascript Diff Algorithm</a>: <a href="https://opensource.org/license/mit/">MIT License</a>
                         </p>
 
-                        <h2>OAI xslt stylesheet</h2>
+                        <h2>jQuery and jQuery UI</h2>
                         <p>
-                            <a href="http://dspace.org/">Adapted from the DSpace project</a>: <a href="http://www.dspace.org/license/">BSD License</a>.
+                            <a href="https://jquery.com/">jQuery</a>, <a href="https://jqueryui.com/">jQuery UI</a>: <a href="http://github.com/jquery/jquery/blob/master/LICENSE.txt">MIT License</a>
                         </p>
 
-                        <h2>OpenAPI 2.0 schema</h2>
+                        <h2>jQuery Bar Rating Plugin</h2>
                         <p>
-                            <a href="https://github.com/OAI/OpenAPI-Specification/blob/master/schemas/v2.0/schema.json">The file api/swagger-v2-schema.json</a>: <a href="https://github.com/OAI/OpenAPI-Specification/tree/master/schemas/v2.0">Apache License, Version 2.0</a>, <a href="https://www.openapis.org/about">OpenAPI Initiative (OAI)</a>.
+                            <a href="https://antennaio.github.io/jquery-bar-rating/">jQuery Bar Rating plugin</a>: <a href="https://github.com/antennaio/jquery-bar-rating/blob/master/LICENSE.txt">MIT License</a>
                         </p>
 
-                        <h2>Select2</h2>
+                        <h2>jQuery Emojiarea Plugin</h2>
                         <p>
-                            <a href="http://select2.github.io/select2/">Select2 library</a>: <a href="https://github.com/select2/select2/blob/stable/3.5/LICENSE">Apache License, Version 2.0 or GNU General Public License version 2</a>.
+                            <a href="https://github.com/diy/jquery-emojiarea">Emojiarea plugin for jQuery</a>: <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>
                         </p>
 
-                        <h2>jquery.tablednd.js</h2>
+                        <h2>jQuery insertAtCaret Plugin</h2>
                         <p>
-                           <a href="https://github.com/isocra/TableDnD">TableDnD plug-in for jQuery</a>: <a href="http://opensource.org/licenses/mit-license.php">MIT License</a>.
+                            jQuery insertAtCaret Plugin v1.0 by the phpMyAdmin development team: <a href="https://www.gnu.org/licenses/gpl-3.0.html">GNU General Public License</a>
                         </p>
 
-                        <h2>Leaflet</h2>
+                        <h2>jQuery Multiple Select Plugin</h2>
                         <p>
-                            <a href="http://leafletjs.com">Leaflet JavaScript library v1.0.3</a>: <a href="https://github.com/Leaflet/Leaflet/blob/v1.0.3/LICENSE">BSD License</a>.
+                            <a href="https://multiple-select.wenzhixin.net.cn/">jQuery Multiple Select plugin</a>: <a href="https://github.com/wenzhixin/multiple-select/blob/develop/LICENSE">MIT License</a>
                         </p>
 
-                        <h2>jquery.emojiarea.js</h2>
+                        <h2>jQuery TableDnD Plugin</h2>
                         <p>
-                            <a href="https://github.com/diy/jquery-emojiarea">Emojiarea plug-in for jQuery</a>: <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, v2.0</a>.
+                           <a href="https://github.com/isocra/TableDnD">Table drag and drop JQuery plugin</a>: <a href="https://github.com/isocra/TableDnD/blob/master/MIT-LICENSE.txt">MIT License</a>
                         </p>
 
-                        <h2>JSZip</h2>
+                        <h2>jQuery Treetable Plugin</h2>
                         <p>
-                            <a href="https://stuk.github.io/jszip/">JSZip JavaScript library</a>: <a href="https://github.com/Stuk/jszip/blob/v3.1.3/LICENSE.markdown">MIT, GNU public license v3.0</a>.
+                            <a href="https://github.com/ludo/jquery-treetable">jQuery treetable Plugin 3.1.0</a>: <a href="https://github.com/ludo/jquery-treetable/blob/3.1.0/GPL-LICENSE.txt"> GNU General Public License v2.0</a>, <a href="https://github.com/ludo/jquery-treetable/blob/3.1.0/MIT-LICENSE.txt">MIT License</a>
                         </p>
 
-                        <h2>D3.js</h2>
+                        <h2>jQuery Validation Plugin</h2>
                         <p>
-                            <a href="https://d3js.org/">D3 JavaScript library v3.5.17</a>, <a href="https://github.com/d3/d3/blob/v3.5.17/LICENSE">ISC Licence</a>.
+                            <a href="https://jqueryvalidation.org/">jQuery Validation Plugin</a>: <a href="https://github.com/jquery-validation/jquery-validation/blob/master/LICENSE.md">MIT License</a>
                         </p>
 
-                        <h2>C3.js</h2>
+                        <h2>JSZip</h2>
                         <p>
-                            <a href="http://c3js.org/">C3.js v0.4.11 JavaScript library</a>: <a href="https://github.com/c3js/c3/blob/0.4.11/LICENSE">MIT licence</a>
+                            <a href="https://stuk.github.io/jszip/">JSZip JavaScript library</a>: <a href="https://github.com/Stuk/jszip/blob/v3.1.3/LICENSE.markdown">MIT License, GNU General Public License v3.0</a>
                         </p>
 
-                        <h2>Font Face Observer</h2>
+                        <h2>kjua</h2>
+                        <p>
+                            <a href="https://larsjung.de/kjua/">kjua JavaScript library v0.6.0</a>: <a href="https://github.com/lrsjng/kjua/blob/master/README.md">MIT License</a>
+                        </p>
+
+                        <h2>Leaflet</h2>
                         <p>
-                            <a href="https://github.com/bramstein/fontfaceobserver">Font Face Observer JavaScript library v2.0.3</a>: <a href="https://github.com/bramstein/fontfaceobserver/blob/v2.0.3/README.md">BSD License</a>.
+                            <a href="https://leafletjs.com/">Leaflet JavaScript library v1.0.3</a>: <a href="https://github.com/Leaflet/Leaflet/blob/v1.0.3/LICENSE">BSD License</a>
                         </p>
 
                         <h2>Noto fonts</h2>
                         <p>
-                            <a href="https://github.com/googlei18n/noto-fonts">Noto</a>: <a href="https://github.com/notofonts/noto-fonts/blob/main/LICENSE">SIL Open Font License (OFL) v1.1</a>.
+                            <a href="https://github.com/googlei18n/noto-fonts">Noto</a>: <a href="https://github.com/notofonts/noto-fonts/blob/main/LICENSE">SIL Open Font License Version 1.1</a>
                         </p>
 
-                        <h2>HC Sticky</h2>
+                        <h2>OAI XSLT stylesheet</h2>
                         <p>
-                            <a href="http://somewebmedia.com/hc-sticky/">HC Sticky JavaScript Library v2.2.3</a>: <a href="https://github.com/somewebmedia/hc-sticky/blob/v2.2.3/LICENSE">MIT license</a>.
+                           Adapted from the <a href="https://dspace.lyrasis.org/">DSpace project</a>: <a href="https://dspace.lyrasis.org/license/">BSD License</a>
                         </p>
 
-                        <h2>kjua</h2>
+                        <h2>OpenAPI 2.0 schema</h2>
                         <p>
-                            <a href="https://larsjung.de/kjua/">kjua JavaScript library v0.6.0</a>: <a href="https://github.com/lrsjng/kjua/blob/master/README.md">MIT license</a>.
+                            <a href="https://github.com/OAI/OpenAPI-Specification/blob/master/schemas/v2.0/schema.json">JSON Schema for Swagger 2.0 API</a>: <a href="https://github.com/OAI/OpenAPI-Specification/tree/master/schemas/v2.0">Apache License, Version 2.0</a>, <a href="https://www.openapis.org/about">OpenAPI Initiative (OAI)</a>
                         </p>
 
-                        <h2>Verovio</h2>
+                        <h2>OpenJS Keyboard Shortcuts Library</h2>
                         <p>
-                            <a href="https://www.verovio.org/index.xhtml">Verovio</a>: <a href="https://github.com/rism-digital/verovio/blob/develop/COPYING">GNU public license v3.0</a>, <a href="https://github.com/rism-digital/verovio/blob/develop/COPYING.LESSER">LGPL v3.0</a>.
+                            <a href="http://www.openjs.com/scripts/events/keyboard_shortcuts/">OpenJS keyboard shortcuts library</a>: BSD License
                         </p>
 
-                        <h2>JavaScript Cookie</h2>
+                        <h2>RequireJS</h2>
                         <p>
-                            <a href="https://github.com/js-cookie/js-cookie">JavaScript Cookie v3.0.1</a>: <a href="https://github.com/js-cookie/js-cookie/blob/v3.0.1/LICENSE">MIT license</a>.
+                            <a href="https://requirejs.org/">RequireJS JavaScript file and module loader v2.1.8</a>: <a href="https://github.com/requirejs/requirejs/blob/2.1.8/LICENSE">BSD License or MIT License</a>
                         </p>
 
-                        <h2>Day.js</h2>
+                        <h2>Select2</h2>
                         <p>
-                            <a href="https://day.js.org/">Day.js v1.11.2</a>: <a href="https://github.com/iamkun/dayjs/blob/v1.11.2/LICENSE">MIT license</a>.
+                            <a href="https://select2.github.io/select2/">Select2 library</a>: <a href="https://github.com/select2/select2/blob/stable/3.5/LICENSE">Apache License, Version 2.0 or GNU General Public License v2.0</a>
                         </p>
 
-                        <h2>Chocolat.js</h2>
+                        <h2>TinyMCE WYSIWYG Editor</h2>
                         <p>
-                            <a href="http://chocolat.insipi.de">Chocolat.js v1.1.0</a>: <a href="https://github.com/nicolas-t/Chocolat/blob/v1.1.0/LICENSE">GNU public license v3.0</a>.
+                            <a href="https://www.tiny.cloud/">TinyMCE WYSIWYG editor v5.9.2</a>: <a href="https://github.com/tinymce/tinymce/blob/5.9.2/LICENSE.TXT">GNU Lesser General Public License v2.1</a>
                         </p>
 
-                        <h2>Enquire.js</h2>
+                        <h2>Verovio</h2>
                         <p>
-                            <a href="https://wicky.nillia.ms/enquire.js">Enquire.js v2.0.1</a>:  <a href="https://github.com/WickyNilliams/enquire.js/blob/master/LICENSE">MIT license</a>.
+                            <a href="https://www.verovio.org/">Verovio</a>: <a href="https://github.com/rism-digital/verovio/blob/develop/COPYING">GNU General Public License v3.0</a>, <a href="https://github.com/rism-digital/verovio/blob/develop/COPYING.LESSER">GNU Lesser General Public License v3.0</a>
                         </p>
 
                     [% END # /WRAPPER tab_item licenses %]
-- 
2.39.5