Permalink
Browse files

Change the license to Apache 2.0

  • Loading branch information...
1 parent b00771c commit f045d7a611b5c609d44e894b3c1165ce24b67776 @spf13 committed Nov 24, 2015
Showing with 308 additions and 181 deletions.
  1. +194 −67 LICENSE.md
  2. +2 −2 bufferpool/bufpool.go
  3. +2 −2 commands/benchmark.go
  4. +2 −2 commands/check.go
  5. +2 −2 commands/convert.go
  6. +2 −2 commands/hugo.go
  7. +2 −2 commands/import.go
  8. +2 −2 commands/import_test.go
  9. +2 −2 commands/limit_darwin.go
  10. +2 −2 commands/limit_others.go
  11. +2 −2 commands/list.go
  12. +2 −2 commands/list_config.go
  13. +2 −2 commands/new.go
  14. +2 −2 commands/server.go
  15. +2 −2 commands/undraft.go
  16. +2 −2 commands/version.go
  17. +2 −2 create/content.go
  18. +2 −2 helpers/content.go
  19. +2 −2 helpers/general.go
  20. +2 −2 helpers/hugo.go
  21. +2 −2 helpers/path.go
  22. +2 −2 helpers/pygments.go
  23. +2 −2 helpers/url.go
  24. +2 −2 hugofs/fs.go
  25. +2 −2 hugolib/author.go
  26. +2 −2 hugolib/handler_base.go
  27. +2 −2 hugolib/handler_file.go
  28. +2 −2 hugolib/handler_meta.go
  29. +2 −2 hugolib/handler_page.go
  30. +2 −2 hugolib/media.go
  31. +2 −2 hugolib/menu.go
  32. +2 −2 hugolib/node.go
  33. +2 −2 hugolib/page.go
  34. +2 −2 hugolib/pageCache.go
  35. +2 −2 hugolib/pageGroup.go
  36. +2 −2 hugolib/pageSort.go
  37. +2 −2 hugolib/pagesPrevNext.go
  38. +2 −2 hugolib/pagesPrevNext_test.go
  39. +2 −2 hugolib/pagination.go
  40. +2 −2 hugolib/scratch.go
  41. +2 −2 hugolib/shortcode.go
  42. +2 −2 hugolib/shortcodeparser.go
  43. +2 −2 hugolib/site.go
  44. +2 −2 hugolib/taxonomy.go
  45. +2 −2 livereload/connection.go
  46. +2 −2 livereload/hub.go
  47. +2 −2 livereload/livereload.go
  48. +2 −2 main.go
  49. +2 −2 parser/frontmatter.go
  50. +2 −2 source/file.go
  51. +2 −2 source/filesystem.go
  52. +2 −2 source/lazy_file_reader.go
  53. +2 −2 tpl/template.go
  54. +2 −2 tpl/template_embedded.go
  55. +2 −2 tpl/template_funcs.go
  56. +2 −2 tpl/template_resources.go
  57. +2 −2 tpl/template_resources_test.go
  58. +2 −2 watcher/batcher.go
View
@@ -1,67 +1,194 @@
-Simple Public License (SimPL-2.0)
-=================================
-
-Preamble
---------
-
-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.
-
-
-Simple Public License (SimPL) 2.0
-=================================
-
-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.
-
- You get the royalty free right to:
-
-- 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.
-
-If you distribute the software or a Derived Work, you must give back to
-the community by:
-
-- 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.
-
-There are some things that you must shoulder:
-
-- 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);
-
-The SimPL continues perpetually, except that your license rights end
-automatically if:
-
-- 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.
-
-License for the 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").
+Apache License
+==============
+
+_Version 2.0, January 2004_
+_&lt;<http://www.apache.org/licenses/>&gt;_
+
+### Terms and Conditions for use, reproduction, and distribution
+
+#### 1. Definitions
+
+“License” shall mean the terms and conditions for use, reproduction, and
+distribution as defined by Sections 1 through 9 of this document.
+
+“Licensor” shall mean the copyright owner or entity authorized by the copyright
+owner that is granting the License.
+
+“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.
+
+“You” (or “Your”) shall mean an individual or Legal Entity exercising
+permissions granted by this License.
+
+“Source” form shall mean the preferred form for making modifications, including
+but not limited to software source code, documentation source, and configuration
+files.
+
+“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.
+
+“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).
+
+“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.
+
+“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.”
+
+“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.
+
+#### 2. Grant of Copyright 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.
@@ -1,9 +1,9 @@
// Copyright © 2013-14 Steve Francia <spf@spf13.com>.
//
-// 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,
@@ -1,9 +1,9 @@
// Copyright © 2013 Steve Francia <spf@spf13.com>.
//
-// 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,
View
@@ -1,9 +1,9 @@
// Copyright © 2013 Steve Francia <spf@spf13.com>.
//
-// 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,
View
@@ -1,9 +1,9 @@
// Copyright © 2013 Steve Francia <spf@spf13.com>.
//
-// 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,
View
@@ -1,9 +1,9 @@
// Copyright © 2013-2015 Steve Francia <spf@spf13.com>.
//
-// 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,
View
@@ -1,9 +1,9 @@
// Copyright © 2015 Steve Francia <spf@spf13.com>.
//
-// 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,
@@ -1,9 +1,9 @@
// Copyright © 2015 Steve Francia <spf@spf13.com>.
//
-// 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,
@@ -1,10 +1,10 @@
// +build darwin
// Copyright © 2013 Steve Francia <spf@spf13.com>.
//
-// 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,
@@ -1,10 +1,10 @@
// +build !darwin
// Copyright © 2013 Steve Francia <spf@spf13.com>.
//
-// 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,
View
@@ -1,9 +1,9 @@
// Copyright © 2014 Steve Francia <spf@spf13.com>.
//
-// 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,
@@ -1,9 +1,9 @@
// Copyright © 2013-15 Steve Francia <spf@spf13.com>.
//
-// 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,
Oops, something went wrong.

0 comments on commit f045d7a

Please sign in to comment.