Council-licensing - Revision history

Kshawkin: /* Not Software */ also added boilerplate to each page generated by OpenCMS

2018-04-21T18:49:44Z

‎Not Software: also added boilerplate to each page generated by OpenCMS

Kshawkin: /* Not Software */ noted update to http://www.tei-c.org/About/website.xml as well

2018-04-18T02:37:52Z

‎Not Software: noted update to http://www.tei-c.org/About/website.xml as well

Kshawkin: /* Not Software */ clarified material on TEI-C website other than Guidelines

2012-05-04T02:51:15Z

‎Not Software: clarified material on TEI-C website other than Guidelines

Piotr Banski: /* Not Software */ + TEI-ISO stuff, which people may be asking about separately (I did)

2012-04-16T14:43:27Z

‎Not Software: + TEI-ISO stuff, which people may be asking about separately (I did)

James at 21:53, 6 November 2011

2011-11-06T21:53:09Z

James at 21:06, 6 November 2011

2011-11-06T21:06:49Z

Kshawkin: /* Software */ added row for Exemplars; noted which Sebastian did on 2011-11-05

2011-11-06T20:54:28Z

‎Software: added row for Exemplars; noted which Sebastian did on 2011-11-05

Kshawkin: added column: To be updated? By whom? Status?

2011-11-06T20:52:14Z

added column: To be updated? By whom? Status?

James: Updating with decision

2011-11-06T17:06:08Z

Updating with decision

Stuartyeates: /* Not Software */

2011-09-29T18:50:07Z

‎Not Software

@@ Line 82: / Line 82: @@
 | Varies by page, but many unlicensed
 | [http://creativecommons.org/licenses/by/3.0/ CC+BY 3.0] and [http://www.opensource.org/licenses/bsd-license.php BSD 2-Clause]
-| [[User:James | James]] will update http://www.tei-c.org/Guidelines/access.xml#body.1_div.2 to reflect new dual-license.  This now says "most materials", so if any page has other terms, those would take precedence. Update by [[User:Kshawkin|Kshawkin]] 04:37, 18 April 2018 (CEST): also revised http://www.tei-c.org/About/website.xml .
+| [[User:James | James]] will update http://www.tei-c.org/Guidelines/access.xml#body.1_div.2 to reflect new dual-license.  This now says "most materials", so if any page has other terms, those would take precedence. Update by [[User:Kshawkin|Kshawkin]] 04:37, 18 April 2018 (CEST): also revised http://www.tei-c.org/About/website.xml . Another update by [[User:Kshawkin|Kshawkin]] 20:49, 21 April 2018 (CEST): also added boilerplate text to bottom of each page generated by OpenCMS.
 |-
 | TEI CSS

@@ Line 82: / Line 82: @@
 | Varies by page, but many unlicensed
 | [http://creativecommons.org/licenses/by/3.0/ CC+BY 3.0] and [http://www.opensource.org/licenses/bsd-license.php BSD 2-Clause]
-| [[User:James | James]] will update http://www.tei-c.org/Guidelines/access.xml#body.1_div.2 to reflect new dual-license.  This now says "most materials", so if any page has other terms, those would take precedence.
+| [[User:James | James]] will update http://www.tei-c.org/Guidelines/access.xml#body.1_div.2 to reflect new dual-license.  This now says "most materials", so if any page has other terms, those would take precedence. Update by [[User:Kshawkin|Kshawkin]] 04:37, 18 April 2018 (CEST): also revised http://www.tei-c.org/About/website.xml .
 |-
 | TEI CSS

@@ Line 80: / Line 80: @@
 |-
 | TEI-C Website <br/>(other than Guidelines)
-| Unlicensed
+| Varies by page, but many unlicensed
 | [http://creativecommons.org/licenses/by/3.0/ CC+BY 3.0] and [http://www.opensource.org/licenses/bsd-license.php BSD 2-Clause]
-| [[User:James | James]] will update http://www.tei-c.org/Guidelines/access.xml#body.1_div.2 to reflect new dual-license
+| [[User:James | James]] will update http://www.tei-c.org/Guidelines/access.xml#body.1_div.2 to reflect new dual-license.  This now says "most materials", so if any page has other terms, those would take precedence.
 |-
 | TEI CSS

@@ Line 87: / Line 87: @@
 | none
 | [http://creativecommons.org/licenses/by/3.0/ CC+BY 3.0] and [http://www.opensource.org/licenses/BSD-2-Clause BSD 2-Clause]
+|
 |}

@@ Line 1: / Line 1: @@
 [[Category:Council]]
-[[Council]] is looking at regularising/standardising the licences it uses for various bits of output of the TEI-C. Eventually it recommended to the [[Board]] that it dual license everything with BSD 2-Clause and Creative Commons Attribution. Users can choose which license is most appropriate in their situation/use of materials, and use that. In both cases it is Attribution of materials used that is asked.
+[[Council]] is looking at regularising/standardising the licences it uses for various bits of output of the TEI-C. Eventually it recommended to the [[Board]] that it dual license everything with [http://www.opensource.org/licenses/BSD-2-Clause BSD 2-Clause] and [http://creativecommons.org/licenses/by/3.0/ Creative Commons Attribution CC+BY 3.0]. Users can choose which license is most appropriate in their situation/use of materials, and use that. In both cases it is Attribution of materials used that is asked.
 == Software ==
@@ Line 77: / Line 77: @@
 |[http://www.gnu.org/licenses/fdl-1.2.html GNU FDL 1.2]
 |[http://creativecommons.org/licenses/by/3.0/ CC+BY 3.0] and [http://www.opensource.org/licenses/bsd-license.php BSD 2-Clause]
+|[[User:James | James]] will update LocalSettings.php to point to http://www.tei-c.org/Guidelines/access.xml#body.1_div.2 which will be changed to reflect new dual-license.
 |-
 | TEI-C Website <br/>(other than Guidelines)
 | Unlicensed
 | [http://creativecommons.org/licenses/by/3.0/ CC+BY 3.0] and [http://www.opensource.org/licenses/bsd-license.php BSD 2-Clause]
+| [[User:James | James]] will update http://www.tei-c.org/Guidelines/access.xml#body.1_div.2 to reflect new dual-license
 |-
 | TEI CSS
 | none
-| [http://creativecommons.org/licenses/by/3.0/ CC+BY 3.0] and [http://www.opensource.org/licenses/bsd-license.php BSD 2-Clause]
+| [http://creativecommons.org/licenses/by/3.0/ CC+BY 3.0] and [http://www.opensource.org/licenses/BSD-2-Clause BSD 2-Clause]
+|
 |}

@@ Line 21: / Line 21: @@
 |-
 |Exemplars
+| misc
+|[http://creativecommons.org/licenses/by/3.0/ CC+BY 3.0] and [http://www.opensource.org/licenses/bsd-license.php BSD 2-Clause]
 |dual CC / BSD.  Sebastian Rahtz.  Done on 2011-11-05. Let him know if any are missing the new licenses.
 |-

@@ Line 8: / Line 8: @@
 |'''Previous Licence'''
 |'''Proposed Licence'''
 |-
 |Stylesheets
 |[http://www.gnu.org/licenses/lgpl-2.1.html GNU LGPL 2.1]
 |[http://creativecommons.org/licenses/by/3.0/ CC+BY 3.0] and [http://www.opensource.org/licenses/bsd-license.php BSD 2-Clause]
 |-
 |Roma
 | GPL
 | [http://creativecommons.org/licenses/by/3.0/ CC+BY 3.0] and [http://www.opensource.org/licenses/bsd-license.php BSD 2-Clause]
 |-
 | TEIOO
 | [http://www.gnu.org/licenses/lgpl-2.1.html GNU LGPL 2.1] <br/>(though LICENSE file has [http://www.gnu.org/licenses/gpl-2.0.html GNU GPL 2.0])
 | [http://creativecommons.org/licenses/by/3.0/ CC+BY 3.0] and [http://www.opensource.org/licenses/bsd-license.php BSD 2-Clause]
 |-
 | Vesta
 | GPL
 | [http://creativecommons.org/licenses/by/3.0/ CC+BY 3.0] and [http://www.opensource.org/licenses/bsd-license.php BSD 2-Clause]
 |-
 | PassiveTeX (SR/Oxford) <br/>(Should probably be removed from TEI-C repository?)
 | 'Free' in LICENSE but 'COPYING' file has [http://www.gnu.org/licenses/gpl-2.0.html GNU GPL 2.0]
 |  ??
 |}
@@ Line 37: / Line 43: @@
 |'''Previous Licence'''
 |'''Proposed Licence'''
 |-
 |Guidelines (ODD source)
 |[http://www.gnu.org/licenses/gpl-2.0.html GNU GPL 2.0]
 |[http://creativecommons.org/licenses/by/3.0/ CC+BY 3.0] and [http://www.opensource.org/licenses/bsd-license.php BSD 2-Clause]
 |-
 |Guidelines (official HTML release)
 |[http://www.gnu.org/licenses/gpl-2.0.html GNU GPL 2.0]
 |[http://creativecommons.org/licenses/by/3.0/ CC+BY 3.0] and [http://www.opensource.org/licenses/bsd-license.php BSD 2-Clause]
 |-
 |Sample ODDs
 | 'free' <br/>(mostly but some GPL exceptions <br/>like teilite and tei_enrich, <br/> and tei_tite is unlicensed)
 | [http://creativecommons.org/licenses/by/3.0/ CC+BY 3.0] and [http://www.opensource.org/licenses/bsd-license.php BSD 2-Clause]
 |-
 |Pre-generated Schemas
 | 'free' (mostly)
 | [http://creativecommons.org/licenses/by/3.0/ CC+BY 3.0] and [http://www.opensource.org/licenses/bsd-license.php BSD 2-Clause]
 |-
 |Roma-generated Schemas
 | Content of &lt;availability&gt;
 | Content of &lt;availability&gt;
 |-
 |Wiki
 |[http://www.gnu.org/licenses/fdl-1.2.html GNU FDL 1.2]
 |[http://creativecommons.org/licenses/by/3.0/ CC+BY 3.0] and [http://www.opensource.org/licenses/bsd-license.php BSD 2-Clause]
 |-
 | TEI-C Website <br/>(other than Guidelines)
 | Unlicensed
 | [http://creativecommons.org/licenses/by/3.0/ CC+BY 3.0] and [http://www.opensource.org/licenses/bsd-license.php BSD 2-Clause]
 |-
 | TEI CSS
 | none
 | [http://creativecommons.org/licenses/by/3.0/ CC+BY 3.0] and [http://www.opensource.org/licenses/bsd-license.php BSD 2-Clause]
 |}