jenkins-bot has submitted this change and it was merged. Change subject: Clarify that Parsoid is GPLv2+ ......................................................................
Clarify that Parsoid is GPLv2+ The AUTHORS.txt list has also been updated for the latest merged revision. Change-Id: Ie1710959bd2aa12b12d4f34fcd469e1bc6ec322f --- M AUTHORS.txt R COPYING.txt M README.md M package.json 4 files changed, 47 insertions(+), 16 deletions(-) Approvals: Subramanya Sastry: Looks good to me, approved GWicke: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/AUTHORS.txt b/AUTHORS.txt index 34ce393..dcc8a8e 100644 --- a/AUTHORS.txt +++ b/AUTHORS.txt @@ -1,5 +1,5 @@ Full list of authors, by number of lines in revision -0f8c6223801408375e8b9de3d9f0fb565a78e9f4 Sep 25 2013: +284957fab45bf62208f1d4283439bfa6ad9edbf1 Apr 14 2015: [ Authors from older revisions may not show up in newer revisions -- so continue to add names to @@ -8,26 +8,38 @@ Gabriel Wicke <[email protected]> Subramanya Sastry <[email protected]> Mark Holmquist <[email protected]> -C. Scott Ananian <[email protected]> -Robert Smith <[email protected]> -Adam Wight <[email protected]> -Marc Ordinas i Llopis <[email protected]> Arlo Breault <[email protected]> -Catrope <[email protected]> -Brion Vibber <[email protected]> -plancalculus <[email protected]> -Jeff Evans <[email protected]> -Siebrand Mazeland <[email protected]> -Aaron Schulz <[email protected]> -Antoine Musso <[email protected]> +C. Scott Ananian <[email protected]> +Marc Ordinas i Llopis <[email protected]> +Be <[email protected]> +Maria Pacana <[email protected]> +Robert Smith <[email protected]> Luke Welling <[email protected]> -Neil Kandalgaonkar <[email protected]> +ecotg <[email protected]> +Hardik Juneja <[email protected]> +Adam Wight <[email protected]> +Ricordisamoa <[email protected]> +Brion Vibber <[email protected]> Antoine Musso <[email protected]> -Trevor Parscal <[email protected]> -Timo Tijhof <[email protected]> +Siebrand Mazeland <[email protected]> Inez Korczyński <[email protected]> -Molly White <[email protected]> +Neil Kandalgaonkar <[email protected]> +Jeff Evans <[email protected]> +Brandon Istenes <[email protected]> +plancalculus <[email protected]> +vichak <[email protected]> +Sebastian Wong <[email protected]> Audrey Tang (au) <[email protected]> +Faidon Liambotis <[email protected]> +Molly White <[email protected]> +Kunal Mehta <[email protected]> +Trevor Parscal <[email protected]> +Catrope <[email protected]> +Timo Tijhof <[email protected]> +S Page <[email protected]> +MarkTraceur <[email protected]> +Erik Bernhardson <[email protected]> +Aaron Schulz <[email protected]> Reedy <[email protected]> MZMcBride <[email protected]> Ori Livneh <[email protected]> diff --git a/COPYING b/COPYING.txt similarity index 100% rename from COPYING rename to COPYING.txt diff --git a/README.md b/README.md index 51bfa7c..18bdb28 100644 --- a/README.md +++ b/README.md @@ -36,3 +36,21 @@ ``` More details are available at https://www.mediawiki.org/wiki/Parsoid/Setup + +== License == +Copyright (c) 2011-2015 Wikimedia Foundation and others; see +`AUTHORS.txt`. + +This program 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 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along +with this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. diff --git a/package.json b/package.json index 4ab5af2..24ed622 100644 --- a/package.json +++ b/package.json @@ -2,6 +2,7 @@ "name": "parsoid", "description": "Mediawiki parser for the VisualEditor.", "version": "0.2.0-git", + "license": "GPL-2.0+", "dependencies": { "alea": "~0.0.9", "async": "~0.9.0", -- To view, visit https://gerrit.wikimedia.org/r/204082 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie1710959bd2aa12b12d4f34fcd469e1bc6ec322f Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/services/parsoid Gerrit-Branch: master Gerrit-Owner: Cscott <[email protected]> Gerrit-Reviewer: Arlolra <[email protected]> Gerrit-Reviewer: Cscott <[email protected]> Gerrit-Reviewer: GWicke <[email protected]> Gerrit-Reviewer: Subramanya Sastry <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
