From f045d7a611b5c609d44e894b3c1165ce24b67776 Mon Sep 17 00:00:00 2001 From: Steve Francia Date: Mon, 23 Nov 2015 22:16:36 -0500 Subject: [PATCH] Change the license to Apache 2.0 --- LICENSE.md | 231 +++++++++++++++++++++++++-------- bufferpool/bufpool.go | 4 +- commands/benchmark.go | 4 +- commands/check.go | 4 +- commands/convert.go | 4 +- commands/hugo.go | 4 +- commands/import.go | 4 +- commands/import_test.go | 4 +- commands/limit_darwin.go | 4 +- commands/limit_others.go | 4 +- commands/list.go | 4 +- commands/list_config.go | 4 +- commands/new.go | 4 +- commands/server.go | 4 +- commands/undraft.go | 4 +- commands/version.go | 4 +- create/content.go | 4 +- helpers/content.go | 4 +- helpers/general.go | 4 +- helpers/hugo.go | 4 +- helpers/path.go | 4 +- helpers/pygments.go | 4 +- helpers/url.go | 4 +- hugofs/fs.go | 4 +- hugolib/author.go | 4 +- hugolib/handler_base.go | 4 +- hugolib/handler_file.go | 4 +- hugolib/handler_meta.go | 4 +- hugolib/handler_page.go | 4 +- hugolib/media.go | 4 +- hugolib/menu.go | 4 +- hugolib/node.go | 4 +- hugolib/page.go | 4 +- hugolib/pageCache.go | 4 +- hugolib/pageGroup.go | 4 +- hugolib/pageSort.go | 4 +- hugolib/pagesPrevNext.go | 4 +- hugolib/pagesPrevNext_test.go | 4 +- hugolib/pagination.go | 4 +- hugolib/scratch.go | 4 +- hugolib/shortcode.go | 4 +- hugolib/shortcodeparser.go | 4 +- hugolib/site.go | 4 +- hugolib/taxonomy.go | 4 +- livereload/connection.go | 4 +- livereload/hub.go | 4 +- livereload/livereload.go | 4 +- main.go | 4 +- parser/frontmatter.go | 4 +- source/file.go | 4 +- source/filesystem.go | 4 +- source/lazy_file_reader.go | 4 +- tpl/template.go | 4 +- tpl/template_embedded.go | 4 +- tpl/template_funcs.go | 4 +- tpl/template_resources.go | 4 +- tpl/template_resources_test.go | 4 +- watcher/batcher.go | 4 +- 58 files changed, 293 insertions(+), 166 deletions(-) diff --git a/LICENSE.md b/LICENSE.md index f7c18741d..b62a9b5ff 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,67 +1,194 @@ -Simple Public License (SimPL-2.0) -================================= +Apache License +============== -Preamble --------- +_Version 2.0, January 2004_ +_<>_ -This Simple Public License 2.0 (SimPL-2.0 for short) is a plain language -implementation of GPL 2.0. The words are different, but the goal is the -same - to guarantee for all users the freedom to share and change -software. If anyone wonders about the meaning of the SimPL, they should -interpret it as consistent with GPL 2.0. +### Terms and Conditions for use, reproduction, and distribution +#### 1. Definitions -Simple Public License (SimPL) 2.0 -================================= +“License” shall mean the terms and conditions for use, reproduction, and +distribution as defined by Sections 1 through 9 of this document. -The SimPL applies to the software's source and object code and comes -with any rights that I have in it (other than trademarks). You agree to -the SimPL by copying, distributing, or making a derivative work of the -software. +“Licensor” shall mean the copyright owner or entity authorized by the copyright +owner that is granting the License. - You get the royalty free right to: +“Legal Entity” shall mean the union of the acting entity and all other entities +that control, are controlled by, or are under common control with that entity. +For the purposes of this definition, “control” means **(i)** the power, direct or +indirect, to cause the direction or management of such entity, whether by +contract or otherwise, or **(ii)** ownership of fifty percent (50%) or more of the +outstanding shares, or **(iii)** beneficial ownership of such entity. -- Use the software for any purpose; -- Make derivative works of it (this is called a "Derived Work"); -- Copy and distribute it and any Derived Work. +“You” (or “Your”) shall mean an individual or Legal Entity exercising +permissions granted by this License. -If you distribute the software or a Derived Work, you must give back to -the community by: +“Source” form shall mean the preferred form for making modifications, including +but not limited to software source code, documentation source, and configuration +files. -- Prominently noting the date of any changes you make; -- Leaving other people's copyright notices, warranty disclaimers, and - license terms in place; -- Providing the source code, build scripts, installation scripts, and - interface definitions in a form that is easy to get and best to - modify; -- Licensing it to everyone under SimPL, or substantially similar terms - (such as GPL 2.0), without adding further restrictions to the rights - provided; -- Conspicuously announcing that it is available under that license. +“Object” form shall mean any form resulting from mechanical transformation or +translation of a Source form, including but not limited to compiled object code, +generated documentation, and conversions to other media types. -There are some things that you must shoulder: +“Work” shall mean the work of authorship, whether in Source or Object form, made +available under the License, as indicated by a copyright notice that is included +in or attached to the work (an example is provided in the Appendix below). -- You get NO WARRANTIES. None of any kind; -- If the software damages you in any way, you may only recover direct - damages up to the amount you paid for it (that is zero if you did - not pay anything). You may not recover any other damages, including - those called "consequential damages." (The state or country where - you live may not allow you to limit your liability in this way, so - this may not apply to you); +“Derivative Works” shall mean any work, whether in Source or Object form, that +is based on (or derived from) the Work and for which the editorial revisions, +annotations, elaborations, or other modifications represent, as a whole, an +original work of authorship. For the purposes of this License, Derivative Works +shall not include works that remain separable from, or merely link (or bind by +name) to the interfaces of, the Work and Derivative Works thereof. -The SimPL continues perpetually, except that your license rights end -automatically if: +“Contribution” shall mean any work of authorship, including the original version +of the Work and any modifications or additions to that Work or Derivative Works +thereof, that is intentionally submitted to Licensor for inclusion in the Work +by the copyright owner or by an individual or Legal Entity authorized to submit +on behalf of the copyright owner. For the purposes of this definition, +“submitted” means any form of electronic, verbal, or written communication sent +to the Licensor or its representatives, including but not limited to +communication on electronic mailing lists, source code control systems, and +issue tracking systems that are managed by, or on behalf of, the Licensor for +the purpose of discussing and improving the Work, but excluding communication +that is conspicuously marked or otherwise designated in writing by the copyright +owner as “Not a Contribution.” -- You do not abide by the "give back to the community" terms (your - licensees get to keep their rights if they abide); -- Anyone prevents you from distributing the software under the terms - of the SimPL. +“Contributor” shall mean Licensor and any individual or Legal Entity on behalf +of whom a Contribution has been received by Licensor and subsequently +incorporated within the Work. -License for the License ------------------------ +#### 2. Grant of Copyright License -You may do anything that you want with the SimPL text; it's a license -form to use in any way that you find helpful. To avoid confusion, -however, if you change the terms in any way then you may not call your -license the Simple Public License or the SimPL (but feel free to -acknowledge that your license is "based on the Simple Public License"). +Subject to the terms and conditions of this License, each Contributor hereby +grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, +irrevocable copyright license to reproduce, prepare Derivative Works of, +publicly display, publicly perform, sublicense, and distribute the Work and such +Derivative Works in Source or Object form. + +#### 3. Grant of Patent License + +Subject to the terms and conditions of this License, each Contributor hereby +grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, +irrevocable (except as stated in this section) patent license to make, have +made, use, offer to sell, sell, import, and otherwise transfer the Work, where +such license applies only to those patent claims licensable by such Contributor +that are necessarily infringed by their Contribution(s) alone or by combination +of their Contribution(s) with the Work to which such Contribution(s) was +submitted. If You institute patent litigation against any entity (including a +cross-claim or counterclaim in a lawsuit) alleging that the Work or a +Contribution incorporated within the Work constitutes direct or contributory +patent infringement, then any patent licenses granted to You under this License +for that Work shall terminate as of the date such litigation is filed. + +#### 4. Redistribution + +You may reproduce and distribute copies of the Work or Derivative Works thereof +in any medium, with or without modifications, and in Source or Object form, +provided that You meet the following conditions: + +* **(a)** You must give any other recipients of the Work or Derivative Works a copy of +this License; and +* **(b)** You must cause any modified files to carry prominent notices stating that You +changed the files; and +* **(c)** You must retain, in the Source form of any Derivative Works that You distribute, +all copyright, patent, trademark, and attribution notices from the Source form +of the Work, excluding those notices that do not pertain to any part of the +Derivative Works; and +* **(d)** If the Work includes a “NOTICE” text file as part of its distribution, then any +Derivative Works that You distribute must include a readable copy of the +attribution notices contained within such NOTICE file, excluding those notices +that do not pertain to any part of the Derivative Works, in at least one of the +following places: within a NOTICE text file distributed as part of the +Derivative Works; within the Source form or documentation, if provided along +with the Derivative Works; or, within a display generated by the Derivative +Works, if and wherever such third-party notices normally appear. The contents of +the NOTICE file are for informational purposes only and do not modify the +License. You may add Your own attribution notices within Derivative Works that +You distribute, alongside or as an addendum to the NOTICE text from the Work, +provided that such additional attribution notices cannot be construed as +modifying the License. + +You may add Your own copyright statement to Your modifications and may provide +additional or different license terms and conditions for use, reproduction, or +distribution of Your modifications, or for any such Derivative Works as a whole, +provided Your use, reproduction, and distribution of the Work otherwise complies +with the conditions stated in this License. + +#### 5. Submission of Contributions + +Unless You explicitly state otherwise, any Contribution intentionally submitted +for inclusion in the Work by You to the Licensor shall be under the terms and +conditions of this License, without any additional terms or conditions. +Notwithstanding the above, nothing herein shall supersede or modify the terms of +any separate license agreement you may have executed with Licensor regarding +such Contributions. + +#### 6. Trademarks + +This License does not grant permission to use the trade names, trademarks, +service marks, or product names of the Licensor, except as required for +reasonable and customary use in describing the origin of the Work and +reproducing the content of the NOTICE file. + +#### 7. Disclaimer of Warranty + +Unless required by applicable law or agreed to in writing, Licensor provides the +Work (and each Contributor provides its Contributions) on an “AS IS” BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, +including, without limitation, any warranties or conditions of TITLE, +NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are +solely responsible for determining the appropriateness of using or +redistributing the Work and assume any risks associated with Your exercise of +permissions under this License. + +#### 8. Limitation of Liability + +In no event and under no legal theory, whether in tort (including negligence), +contract, or otherwise, unless required by applicable law (such as deliberate +and grossly negligent acts) or agreed to in writing, shall any Contributor be +liable to You for damages, including any direct, indirect, special, incidental, +or consequential damages of any character arising as a result of this License or +out of the use or inability to use the Work (including but not limited to +damages for loss of goodwill, work stoppage, computer failure or malfunction, or +any and all other commercial damages or losses), even if such Contributor has +been advised of the possibility of such damages. + +#### 9. Accepting Warranty or Additional Liability + +While redistributing the Work or Derivative Works thereof, You may choose to +offer, and charge a fee for, acceptance of support, warranty, indemnity, or +other liability obligations and/or rights consistent with this License. However, +in accepting such obligations, You may act only on Your own behalf and on Your +sole responsibility, not on behalf of any other Contributor, and only if You +agree to indemnify, defend, and hold each Contributor harmless for any liability +incurred by, or claims asserted against, such Contributor by reason of your +accepting any such warranty or additional liability. + +_END OF TERMS AND CONDITIONS_ + +### APPENDIX: How to apply the Apache License to your work + +To apply the Apache License to your work, attach the following boilerplate +notice, with the fields enclosed by brackets `[]` replaced with your own +identifying information. (Don't include the brackets!) The text should be +enclosed in the appropriate comment syntax for the file format. We also +recommend that a file or class name and description of purpose be included on +the same “printed page” as the copyright notice for easier identification within +third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/bufferpool/bufpool.go b/bufferpool/bufpool.go index 5a550e0e7..8b4ac6d0c 100644 --- a/bufferpool/bufpool.go +++ b/bufferpool/bufpool.go @@ -1,9 +1,9 @@ // Copyright © 2013-14 Steve Francia . // -// Licensed under the Simple Public License, Version 2.0 (the "License"); +// Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at -// http://opensource.org/licenses/Simple-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, diff --git a/commands/benchmark.go b/commands/benchmark.go index b76c9e884..a55ed7535 100644 --- a/commands/benchmark.go +++ b/commands/benchmark.go @@ -1,9 +1,9 @@ // Copyright © 2013 Steve Francia . // -// Licensed under the Simple Public License, Version 2.0 (the "License"); +// Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at -// http://opensource.org/licenses/Simple-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, diff --git a/commands/check.go b/commands/check.go index 1bb43298a..0c8b3ba79 100644 --- a/commands/check.go +++ b/commands/check.go @@ -1,9 +1,9 @@ // Copyright © 2013 Steve Francia . // -// Licensed under the Simple Public License, Version 2.0 (the "License"); +// Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at -// http://opensource.org/licenses/Simple-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, diff --git a/commands/convert.go b/commands/convert.go index b9578a81d..9f7076d7b 100644 --- a/commands/convert.go +++ b/commands/convert.go @@ -1,9 +1,9 @@ // Copyright © 2013 Steve Francia . // -// Licensed under the Simple Public License, Version 2.0 (the "License"); +// Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at -// http://opensource.org/licenses/Simple-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, diff --git a/commands/hugo.go b/commands/hugo.go index f9780a1d2..b89f99464 100644 --- a/commands/hugo.go +++ b/commands/hugo.go @@ -1,9 +1,9 @@ // Copyright © 2013-2015 Steve Francia . // -// Licensed under the Simple Public License, Version 2.0 (the "License"); +// Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at -// http://opensource.org/licenses/Simple-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, diff --git a/commands/import.go b/commands/import.go index b610e815d..9b231e55e 100644 --- a/commands/import.go +++ b/commands/import.go @@ -1,9 +1,9 @@ // Copyright © 2015 Steve Francia . // -// Licensed under the Simple Public License, Version 2.0 (the "License"); +// Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at -// http://opensource.org/licenses/Simple-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, diff --git a/commands/import_test.go b/commands/import_test.go index 801d3cff3..f6d8bbb45 100644 --- a/commands/import_test.go +++ b/commands/import_test.go @@ -1,9 +1,9 @@ // Copyright © 2015 Steve Francia . // -// Licensed under the Simple Public License, Version 2.0 (the "License"); +// Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at -// http://opensource.org/licenses/Simple-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, diff --git a/commands/limit_darwin.go b/commands/limit_darwin.go index 62fc0f5bc..274505073 100644 --- a/commands/limit_darwin.go +++ b/commands/limit_darwin.go @@ -1,10 +1,10 @@ // +build darwin // Copyright © 2013 Steve Francia . // -// Licensed under the Simple Public License, Version 2.0 (the "License"); +// Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at -// http://opensource.org/licenses/Simple-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, diff --git a/commands/limit_others.go b/commands/limit_others.go index 752ed95d7..490988cb6 100644 --- a/commands/limit_others.go +++ b/commands/limit_others.go @@ -1,10 +1,10 @@ // +build !darwin // Copyright © 2013 Steve Francia . // -// Licensed under the Simple Public License, Version 2.0 (the "License"); +// Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at -// http://opensource.org/licenses/Simple-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, diff --git a/commands/list.go b/commands/list.go index 64650f40c..2e85a8765 100644 --- a/commands/list.go +++ b/commands/list.go @@ -1,9 +1,9 @@ // Copyright © 2014 Steve Francia . // -// Licensed under the Simple Public License, Version 2.0 (the "License"); +// Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at -// http://opensource.org/licenses/Simple-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, diff --git a/commands/list_config.go b/commands/list_config.go index c8208f124..9520fdbc9 100644 --- a/commands/list_config.go +++ b/commands/list_config.go @@ -1,9 +1,9 @@ // Copyright © 2013-15 Steve Francia . // -// Licensed under the Simple Public License, Version 2.0 (the "License"); +// Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at -// http://opensource.org/licenses/Simple-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, diff --git a/commands/new.go b/commands/new.go index c30bd8602..97323c6b1 100644 --- a/commands/new.go +++ b/commands/new.go @@ -1,9 +1,9 @@ // Copyright © 2014-2015 Steve Francia . // -// Licensed under the Simple Public License, Version 2.0 (the "License"); +// Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at -// http://opensource.org/licenses/Simple-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, diff --git a/commands/server.go b/commands/server.go index 57f96a1bd..8d69304c3 100644 --- a/commands/server.go +++ b/commands/server.go @@ -1,9 +1,9 @@ // Copyright © 2013-14 Steve Francia . // -// Licensed under the Simple Public License, Version 2.0 (the "License"); +// Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at -// http://opensource.org/licenses/Simple-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, diff --git a/commands/undraft.go b/commands/undraft.go index 4cfdfbc11..007729356 100644 --- a/commands/undraft.go +++ b/commands/undraft.go @@ -1,9 +1,9 @@ // Copyright © 2013 Steve Francia . // -// Licensed under the Simple Public License, Version 2.0 (the "License"); +// Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at -// http://opensource.org/licenses/Simple-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, diff --git a/commands/version.go b/commands/version.go index dd6d91cf3..f775f2e33 100644 --- a/commands/version.go +++ b/commands/version.go @@ -1,9 +1,9 @@ // Copyright © 2013 Steve Francia . // -// Licensed under the Simple Public License, Version 2.0 (the "License"); +// Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at -// http://opensource.org/licenses/Simple-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, diff --git a/create/content.go b/create/content.go index acb788c63..4bbff213c 100644 --- a/create/content.go +++ b/create/content.go @@ -1,9 +1,9 @@ // Copyright © 2014 Steve Francia . // -// Licensed under the Simple Public License, Version 2.0 (the "License"); +// Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at -// http://opensource.org/licenses/Simple-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, diff --git a/helpers/content.go b/helpers/content.go index 157fbad5c..51b748117 100644 --- a/helpers/content.go +++ b/helpers/content.go @@ -1,9 +1,9 @@ // Copyright © 2014 Steve Francia . // -// Licensed under the Simple Public License, Version 2.0 (the "License"); +// Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at -// http://opensource.org/licenses/Simple-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, diff --git a/helpers/general.go b/helpers/general.go index eaf4e2d42..d7684b6a3 100644 --- a/helpers/general.go +++ b/helpers/general.go @@ -1,9 +1,9 @@ // Copyright © 2014 Steve Francia . // -// Licensed under the Simple Public License, Version 2.0 (the "License"); +// Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at -// http://opensource.org/licenses/Simple-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, diff --git a/helpers/hugo.go b/helpers/hugo.go index 2e48ff5c9..85bc5b196 100644 --- a/helpers/hugo.go +++ b/helpers/hugo.go @@ -1,9 +1,9 @@ // Copyright © 2015 Steve Francia . // -// Licensed under the Simple Public License, Version 2.0 (the "License"); +// Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at -// http://opensource.org/licenses/Simple-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, diff --git a/helpers/path.go b/helpers/path.go index 7fb116a77..b1e91e70b 100644 --- a/helpers/path.go +++ b/helpers/path.go @@ -1,9 +1,9 @@ // Copyright © 2014 Steve Francia . // -// Licensed under the Simple Public License, Version 2.0 (the "License"); +// Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at -// http://opensource.org/licenses/Simple-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, diff --git a/helpers/pygments.go b/helpers/pygments.go index 7d62fa0e7..68b4acee4 100644 --- a/helpers/pygments.go +++ b/helpers/pygments.go @@ -1,9 +1,9 @@ // Copyright © 2013-14 Steve Francia . // -// Licensed under the Simple Public License, Version 2.0 (the "License"); +// Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at -// http://opensource.org/licenses/Simple-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, diff --git a/helpers/url.go b/helpers/url.go index 93f003be5..586c0015b 100644 --- a/helpers/url.go +++ b/helpers/url.go @@ -1,9 +1,9 @@ // Copyright © 2013-2015 Steve Francia . // -// Licensed under the Simple Public License, Version 2.0 (the "License"); +// Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at -// http://opensource.org/licenses/Simple-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, diff --git a/hugofs/fs.go b/hugofs/fs.go index 26e17ebb1..5ce0a2658 100644 --- a/hugofs/fs.go +++ b/hugofs/fs.go @@ -1,9 +1,9 @@ // Copyright © 2013-14 Steve Francia . // -// Licensed under the Simple Public License, Version 2.0 (the "License"); +// Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at -// http://opensource.org/licenses/Simple-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, diff --git a/hugolib/author.go b/hugolib/author.go index 8cc52bec5..c581bc3ec 100644 --- a/hugolib/author.go +++ b/hugolib/author.go @@ -1,9 +1,9 @@ // Copyright © 2013 Steve Francia . // -// Licensed under the Simple Public License, Version 2.0 (the "License"); +// Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at -// http://opensource.org/licenses/Simple-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, diff --git a/hugolib/handler_base.go b/hugolib/handler_base.go index f74409166..a4fe1af78 100644 --- a/hugolib/handler_base.go +++ b/hugolib/handler_base.go @@ -1,9 +1,9 @@ // Copyright © 2014 Steve Francia . // -// Licensed under the Simple Public License, Version 2.0 (the "License"); +// Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at -// http://opensource.org/licenses/Simple-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, diff --git a/hugolib/handler_file.go b/hugolib/handler_file.go index 0d3a05ecf..33190099e 100644 --- a/hugolib/handler_file.go +++ b/hugolib/handler_file.go @@ -1,9 +1,9 @@ // Copyright © 2014 Steve Francia . // -// Licensed under the Simple Public License, Version 2.0 (the "License"); +// Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at -// http://opensource.org/licenses/Simple-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, diff --git a/hugolib/handler_meta.go b/hugolib/handler_meta.go index 1e0d760c5..ac8671147 100644 --- a/hugolib/handler_meta.go +++ b/hugolib/handler_meta.go @@ -1,9 +1,9 @@ // Copyright © 2014 Steve Francia . // -// Licensed under the Simple Public License, Version 2.0 (the "License"); +// Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at -// http://opensource.org/licenses/Simple-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, diff --git a/hugolib/handler_page.go b/hugolib/handler_page.go index 0f0e3ca60..49edee538 100644 --- a/hugolib/handler_page.go +++ b/hugolib/handler_page.go @@ -1,9 +1,9 @@ // Copyright © 2014 Steve Francia . // -// Licensed under the Simple Public License, Version 2.0 (the "License"); +// Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at -// http://opensource.org/licenses/Simple-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, diff --git a/hugolib/media.go b/hugolib/media.go index 38344ebe3..10ec9ecf1 100644 --- a/hugolib/media.go +++ b/hugolib/media.go @@ -1,9 +1,9 @@ // Copyright © 2013 Steve Francia . // -// Licensed under the Simple Public License, Version 2.0 (the "License"); +// Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at -// http://opensource.org/licenses/Simple-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, diff --git a/hugolib/menu.go b/hugolib/menu.go index d7a72d4ee..f964e72f7 100644 --- a/hugolib/menu.go +++ b/hugolib/menu.go @@ -1,9 +1,9 @@ // Copyright © 2013-14 Steve Francia . // -// Licensed under the Simple Public License, Version 2.0 (the "License"); +// Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at -// http://opensource.org/licenses/Simple-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, diff --git a/hugolib/node.go b/hugolib/node.go index c335b72df..020937b3e 100644 --- a/hugolib/node.go +++ b/hugolib/node.go @@ -1,9 +1,9 @@ // Copyright © 2013-14 Steve Francia . // -// Licensed under the Simple Public License, Version 2.0 (the "License"); +// Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at -// http://opensource.org/licenses/Simple-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, diff --git a/hugolib/page.go b/hugolib/page.go index dc092a464..a77cb01b5 100644 --- a/hugolib/page.go +++ b/hugolib/page.go @@ -1,9 +1,9 @@ // Copyright © 2013 Steve Francia . // -// Licensed under the Simple Public License, Version 2.0 (the "License"); +// Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at -// http://opensource.org/licenses/Simple-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, diff --git a/hugolib/pageCache.go b/hugolib/pageCache.go index c6d63dfab..e8810de2e 100644 --- a/hugolib/pageCache.go +++ b/hugolib/pageCache.go @@ -1,9 +1,9 @@ // Copyright © 2015 Steve Francia . // -// Licensed under the Simple Public License, Version 2.0 (the "License"); +// Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at -// http://opensource.org/licenses/Simple-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, diff --git a/hugolib/pageGroup.go b/hugolib/pageGroup.go index 955e76b65..e01d0cdca 100644 --- a/hugolib/pageGroup.go +++ b/hugolib/pageGroup.go @@ -1,9 +1,9 @@ // Copyright © 2014 Steve Francia . // -// Licensed under the Simple Public License, Version 2.0 (the "License"); +// Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at -// http://opensource.org/licenses/Simple-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, diff --git a/hugolib/pageSort.go b/hugolib/pageSort.go index b536c2339..6f5cb7b6b 100644 --- a/hugolib/pageSort.go +++ b/hugolib/pageSort.go @@ -1,9 +1,9 @@ // Copyright © 2014 Steve Francia . // -// Licensed under the Simple Public License, Version 2.0 (the "License"); +// Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at -// http://opensource.org/licenses/Simple-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, diff --git a/hugolib/pagesPrevNext.go b/hugolib/pagesPrevNext.go index 4ffc11653..b8124eb04 100644 --- a/hugolib/pagesPrevNext.go +++ b/hugolib/pagesPrevNext.go @@ -1,9 +1,9 @@ // Copyright © 2014 Steve Francia . // -// Licensed under the Simple Public License, Version 2.0 (the "License"); +// Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at -// http://opensource.org/licenses/Simple-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, diff --git a/hugolib/pagesPrevNext_test.go b/hugolib/pagesPrevNext_test.go index 4bcfd6e18..2a638fb34 100644 --- a/hugolib/pagesPrevNext_test.go +++ b/hugolib/pagesPrevNext_test.go @@ -1,9 +1,9 @@ // Copyright © 2014 Steve Francia . // -// Licensed under the Simple Public License, Version 2.0 (the "License"); +// Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at -// http://opensource.org/licenses/Simple-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, diff --git a/hugolib/pagination.go b/hugolib/pagination.go index acd406ed1..c02289dbc 100644 --- a/hugolib/pagination.go +++ b/hugolib/pagination.go @@ -1,9 +1,9 @@ // Copyright © 2013-14 Steve Francia . // -// Licensed under the Simple Public License, Version 2.0 (the "License"); +// Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at -// http://opensource.org/licenses/Simple-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, diff --git a/hugolib/scratch.go b/hugolib/scratch.go index 16d1c1440..601af6b78 100644 --- a/hugolib/scratch.go +++ b/hugolib/scratch.go @@ -1,9 +1,9 @@ // Copyright © 2013-14 Steve Francia . // -// Licensed under the Simple Public License, Version 2.0 (the "License"); +// Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at -// http://opensource.org/licenses/Simple-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, diff --git a/hugolib/shortcode.go b/hugolib/shortcode.go index 0b2e9f78e..0e3565b67 100644 --- a/hugolib/shortcode.go +++ b/hugolib/shortcode.go @@ -1,9 +1,9 @@ // Copyright © 2013-14 Steve Francia . // -// Licensed under the Simple Public License, Version 2.0 (the "License"); +// Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at -// http://opensource.org/licenses/Simple-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, diff --git a/hugolib/shortcodeparser.go b/hugolib/shortcodeparser.go index bef8ed84f..fb3c3b0c2 100644 --- a/hugolib/shortcodeparser.go +++ b/hugolib/shortcodeparser.go @@ -1,9 +1,9 @@ // Copyright © 2013-14 Steve Francia . // -// Licensed under the Simple Public License, Version 2.0 (the "License"); +// Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at -// http://opensource.org/licenses/Simple-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, diff --git a/hugolib/site.go b/hugolib/site.go index 2e07091fb..d7c9e4a56 100644 --- a/hugolib/site.go +++ b/hugolib/site.go @@ -1,9 +1,9 @@ // Copyright © 2013-14 Steve Francia . // -// Licensed under the Simple Public License, Version 2.0 (the "License"); +// Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at -// http://opensource.org/licenses/Simple-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, diff --git a/hugolib/taxonomy.go b/hugolib/taxonomy.go index 1fd34cadb..5ca39e710 100644 --- a/hugolib/taxonomy.go +++ b/hugolib/taxonomy.go @@ -1,9 +1,9 @@ // Copyright © 2013 Steve Francia . // -// Licensed under the Simple Public License, Version 2.0 (the "License"); +// Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at -// http://opensource.org/licenses/Simple-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, diff --git a/livereload/connection.go b/livereload/connection.go index c35a403ee..e2824eef4 100644 --- a/livereload/connection.go +++ b/livereload/connection.go @@ -1,9 +1,9 @@ // Copyright © 2014 Steve Francia . // -// Licensed under the Simple Public License, Version 2.0 (the "License"); +// Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at -// http://opensource.org/licenses/Simple-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, diff --git a/livereload/hub.go b/livereload/hub.go index 46afbcbc3..f41bf7b83 100644 --- a/livereload/hub.go +++ b/livereload/hub.go @@ -1,9 +1,9 @@ // Copyright © 2014 Steve Francia . // -// Licensed under the Simple Public License, Version 2.0 (the "License"); +// Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at -// http://opensource.org/licenses/Simple-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, diff --git a/livereload/livereload.go b/livereload/livereload.go index 47a92521d..d976a9002 100644 --- a/livereload/livereload.go +++ b/livereload/livereload.go @@ -1,9 +1,9 @@ // Copyright © 2014 Steve Francia . // -// Licensed under the Simple Public License, Version 2.0 (the "License"); +// Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at -// http://opensource.org/licenses/Simple-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, diff --git a/main.go b/main.go index 499eddb2d..f8debd230 100644 --- a/main.go +++ b/main.go @@ -1,9 +1,9 @@ // Copyright © 2013-14 Steve Francia . // -// Licensed under the Simple Public License, Version 2.0 (the "License"); +// Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at -// http://opensource.org/licenses/Simple-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, diff --git a/parser/frontmatter.go b/parser/frontmatter.go index 50366db70..7afd9bbfb 100644 --- a/parser/frontmatter.go +++ b/parser/frontmatter.go @@ -1,9 +1,9 @@ // Copyright © 2013 Steve Francia . // -// Licensed under the Simple Public License, Version 2.0 (the "License"); +// Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at -// http://opensource.org/licenses/Simple-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, diff --git a/source/file.go b/source/file.go index 53524ced4..51f61311f 100644 --- a/source/file.go +++ b/source/file.go @@ -1,9 +1,9 @@ // Copyright © 2014 Steve Francia . // -// Licensed under the Simple Public License, Version 2.0 (the "License"); +// Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at -// http://opensource.org/licenses/Simple-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, diff --git a/source/filesystem.go b/source/filesystem.go index 05167701b..8d6439dda 100644 --- a/source/filesystem.go +++ b/source/filesystem.go @@ -1,9 +1,9 @@ // Copyright © 2014 Steve Francia . // -// Licensed under the Simple Public License, Version 2.0 (the "License"); +// Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at -// http://opensource.org/licenses/Simple-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, diff --git a/source/lazy_file_reader.go b/source/lazy_file_reader.go index 0da053405..3e24e6b8e 100644 --- a/source/lazy_file_reader.go +++ b/source/lazy_file_reader.go @@ -1,9 +1,9 @@ // Copyright © 2014 Steve Francia . // -// Licensed under the Simple Public License, Version 2.0 (the "License"); +// Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at -// http://opensource.org/licenses/Simple-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, diff --git a/tpl/template.go b/tpl/template.go index 00617ff10..631c6fb22 100644 --- a/tpl/template.go +++ b/tpl/template.go @@ -1,9 +1,9 @@ // Copyright © 2013-14 Steve Francia . // -// Licensed under the Simple Public License, Version 2.0 (the "License"); +// Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at -// http://opensource.org/licenses/Simple-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, diff --git a/tpl/template_embedded.go b/tpl/template_embedded.go index 2a63ba636..c4e8392f7 100644 --- a/tpl/template_embedded.go +++ b/tpl/template_embedded.go @@ -1,9 +1,9 @@ // Copyright © 2013 Steve Francia . // -// Licensed under the Simple Public License, Version 2.0 (the "License"); +// Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at -// http://opensource.org/licenses/Simple-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, diff --git a/tpl/template_funcs.go b/tpl/template_funcs.go index 283bcc829..dee12124c 100644 --- a/tpl/template_funcs.go +++ b/tpl/template_funcs.go @@ -1,9 +1,9 @@ // Copyright © 2013-14 Steve Francia . // -// Licensed under the Simple Public License, Version 2.0 (the "License"); +// Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at -// http://opensource.org/licenses/Simple-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, diff --git a/tpl/template_resources.go b/tpl/template_resources.go index 1fe94af88..2e0e1d171 100644 --- a/tpl/template_resources.go +++ b/tpl/template_resources.go @@ -1,9 +1,9 @@ // Copyright © 2013-14 Steve Francia . // -// Licensed under the Simple Public License, Version 2.0 (the "License"); +// Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at -// http://opensource.org/licenses/Simple-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, diff --git a/tpl/template_resources_test.go b/tpl/template_resources_test.go index 4ae0ee0b4..d01fc28f8 100644 --- a/tpl/template_resources_test.go +++ b/tpl/template_resources_test.go @@ -1,9 +1,9 @@ // Copyright © 2013-14 Steve Francia . // -// Licensed under the Simple Public License, Version 2.0 (the "License"); +// Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at -// http://opensource.org/licenses/Simple-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, diff --git a/watcher/batcher.go b/watcher/batcher.go index e5733d20b..c65d1c429 100644 --- a/watcher/batcher.go +++ b/watcher/batcher.go @@ -1,9 +1,9 @@ // Copyright © 2013-2015 Steve Francia . // -// Licensed under the Simple Public License, Version 2.0 (the "License"); +// Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at -// http://opensource.org/licenses/Simple-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS,