Merge branch 'master' into Redirect-user-and-org-go-gitea#9531

options/license/AAL

@@ -1,8 +1,11 @@
-Attribution Assurance License Copyright (c) 2002 by AUTHOR PROFESSIONAL IDENTIFICATION
-* URL "PROMOTIONAL SLOGAN FOR AUTHOR'S PROFESSIONAL PRACTICE"
+Attribution Assurance License
 
-All Rights Reserved ATTRIBUTION ASSURANCE LICENSE (adapted from the original
-BSD license)
+Copyright (c) 2002 by AUTHOR PROFESSIONAL IDENTIFICATION * URL "PROMOTIONAL
+SLOGAN FOR AUTHOR'S PROFESSIONAL PRACTICE"
+
+All Rights Reserved
+
+ATTRIBUTION ASSURANCE LICENSE (adapted from the original BSD license)
 
 Redistribution and use in source and binary forms, with or without modification,
 are permitted provided that the conditions below are met. These conditions
@@ -20,11 +23,9 @@ program or a program dependent thereon is launched, a prominent display (e.g.,
 splash screen or banner text) of the Author's attribution information, which
 includes:
 
-      (a) Name ("AUTHOR"),
-
-      (b) Professional identification ("PROFESSIONAL IDENTIFICATION"), and
-
-      (c) URL ("URL").
+     (a) Name ("AUTHOR"),
+     (b) Professional identification ("PROFESSIONAL IDENTIFICATION"), and
+     (c) URL ("URL").
 
 3. Neither the name nor any trademark of the Author may be used to endorse
 or promote products derived from this software without specific prior written

options/license/AFL-1.1

@@ -1,10 +1,11 @@
 Academic Free License
+Version 1.1
 
-Version 1.1 The Academic Free License applies to any original work of authorship
-(the "Original Work") whose owner (the "Licensor") has placed the following
-notice immediately following the copyright notice for the Original Work:
+The Academic Free License applies to any original work of authorship (the
+"Original Work") whose owner (the "Licensor") has placed the following notice
+immediately following the copyright notice for the Original Work:
 
-"Licensed under the Academic Free License version 1.1."
+     "Licensed under the Academic Free License version 1.1."
 
 Grant of License. Licensor hereby grants to any person obtaining a copy of
 the Original Work ("You") a world-wide, royalty-free, non-exclusive, perpetual,
@@ -73,7 +74,6 @@ for Patent Action" clause infringes any patent claims that are essential to
 use that software.
 
 This license is Copyright (C) 2002 Lawrence E. Rosen. All rights reserved.
-
 Permission is hereby granted to copy and distribute this license without modification.
 This license may not be modified without the express written permission of
 its copyright owner.

options/license/AFL-1.2

@@ -1,10 +1,12 @@
 Academic Free License
+Version 1.2
 
-Version 1.2 This Academic Free License applies to any original work of authorship
-(the "Original Work") whose owner (the "Licensor") has placed the following
-notice immediately following the copyright notice for the Original Work:
+This Academic Free License applies to any original work of authorship (the
+"Original Work") whose owner (the "Licensor") has placed the
+following notice immediately following the copyright notice for the Original
+Work:
 
-Licensed under the Academic Free License version 1.2
+     Licensed under the Academic Free License version 1.2
 
 Grant of License. Licensor hereby grants to any person obtaining a copy of
 the Original Work ("You") a world-wide, royalty-free, non-exclusive, perpetual,
@@ -13,7 +15,8 @@ distribute and/or sell copies of the Original Work and derivative works thereof,
 and (2) under patent claims owned or controlled by the Licensor that are embodied
 in the Original Work as furnished by the Licensor, to make, use, sell and
 offer for sale the Original Work and derivative works thereof, subject to
-the following conditions.
+the
+following conditions.
 
 Attribution Rights. You must retain, in the Source Code of any Derivative
 Works that You create, all copyright, patent or trademark notices from the
@@ -52,16 +55,16 @@ do not allow the exclusion or limitation of incidental or consequential damages,
 so this exclusion and limitation may not apply to You.
 
 License to Source Code. The term "Source Code" means the preferred form of
-the Original Work for making modifications to it and all available documentation
-describing how to modify the Original Work. Licensor hereby agrees to provide
-a machine-readable copy of the Source Code of the Original Work along with
-each copy of the Original Work that Licensor distributes. Licensor reserves
-the right to satisfy this obligation by placing a machine-readable copy of
-the Source Code in an information repository reasonably calculated to permit
-inexpensive and convenient access by You for as long as Licensor continues
-to distribute the Original Work, and by publishing the address of that information
-repository in a notice immediately following the copyright notice that applies
-to the Original Work.
+the Original Work for making modifications to it and all available
+documentation describing how to modify the Original Work. Licensor hereby
+agrees to provide a machine-readable copy of the Source Code of the Original
+Work along with each copy of the Original Work that Licensor distributes.
+Licensor reserves the right to satisfy this obligation by placing a machine-readable
+copy of the Source Code in an information repository reasonably calculated
+to permit inexpensive and convenient access by You for as long as Licensor
+continues to distribute the Original Work, and by publishing the address of
+that information repository in a notice immediately following the copyright
+notice that applies to the Original Work.
 
 Mutual Termination for Patent Action. This License shall terminate automatically
 and You may no longer exercise any of the rights granted to You by this License
@@ -75,7 +78,6 @@ or conditioned by this License or by law, and Licensor promises not to interfere
 with or be responsible for such uses by You.
 
 This license is Copyright (C) 2002 Lawrence E. Rosen. All rights reserved.
-
 Permission is hereby granted to copy and distribute this license without modification.
 This license may not be modified without the express written permission of
 its copyright owner.

options/license/AFL-2.0

@@ -1,25 +1,22 @@
 The Academic Free License
+v. 2.0
 
-v. 2.0 This Academic Free License (the "License") applies to any original
-work of authorship (the "Original Work") whose owner (the "Licensor") has
-placed the following notice immediately following the copyright notice for
-the Original Work:
+This Academic Free License (the "License") applies to any original work of
+authorship (the "Original Work") whose owner (the "Licensor") has placed the
+following notice immediately following the copyright notice for the Original
+Work:
 
-Licensed under the Academic Free License version 2.0
+     Licensed under the Academic Free License version 2.0
 
 1) Grant of Copyright License. Licensor hereby grants You a world-wide, royalty-free,
 non-exclusive, perpetual, sublicenseable license to do the following:
 
-      a) to reproduce the Original Work in copies;
-
+     a) to reproduce the Original Work in copies;
 b) to prepare derivative works ("Derivative Works") based upon the Original
 Work;
-
 c) to distribute copies of the Original Work and Derivative Works to the public;
-
-      d) to perform the Original Work publicly; and
-
-      e) to display the Original Work publicly.
+     d) to perform the Original Work publicly; and
+     e) to display the Original Work publicly.
 
 2) Grant of Patent License. Licensor hereby grants You a world-wide, royalty-free,
 non-exclusive, perpetual, sublicenseable license, under patent claims owned
@@ -29,7 +26,7 @@ Derivative Works.
 
 3) Grant of Source Code License. The term "Source Code" means the preferred
 form of the Original Work for making modifications to it and all available
-documentation describing how to modify the Original Work. Licensor hereby
+documentation describing how to modify the Original Work.  Licensor hereby
 agrees to provide a machine-readable copy of the Source Code of the Original
 Work along with each copy of the Original Work that Licensor distributes.
 Licensor reserves the right to satisfy this obligation by placing a machine-readable
@@ -42,23 +39,23 @@ notice that applies to the Original Work.
 4) Exclusions From License Grant. Neither the names of Licensor, nor the names
 of any contributors to the Original Work, nor any of their trademarks or service
 marks, may be used to endorse or promote products derived from this Original
-Work without express prior written permission of the Licensor. Nothing in
+Work without express prior written permission of the Licensor.  Nothing in
 this License shall be deemed to grant any rights to trademarks, copyrights,
 patents, trade secrets or any other intellectual property of Licensor except
-as expressly stated herein. No patent license is granted to make, use, sell
+as expressly stated herein.  No patent license is granted to make, use, sell
 or offer to sell embodiments of any patent claims other than the licensed
-claims defined in Section 2. No right is granted to the trademarks of Licensor
-even if such marks are included in the Original Work. Nothing in this License
+claims defined in Section 2.  No right is granted to the trademarks of Licensor
+even if such marks are included in the Original Work.  Nothing in this License
 shall be interpreted to prohibit Licensor from licensing under different terms
 from this License any Original Work that Licensor otherwise would have a right
 to license.
 
-   5) This section intentionally omitted.
+5) This section intentionally omitted.
 
 6) Attribution Rights. You must retain, in the Source Code of any Derivative
 Works that You create, all copyright, patent or trademark notices from the
 Source Code of the Original Work, as well as any notices of licensing and
-any descriptive text identified therein as an "Attribution Notice." You must
+any descriptive text identified therein as an "Attribution Notice."  You must
 cause the Source Code for any Derivative Works that You create to carry a
 prominent Attribution Notice reasonably calculated to inform recipients that
 You have modified the Original Work.
@@ -67,11 +64,11 @@ You have modified the Original Work.
 the copyright in and to the Original Work and the patent rights granted herein
 by Licensor are owned by the Licensor or are sublicensed to You under the
 terms of this License with the permission of the contributor(s) of those copyrights
-and patent rights. Except as expressly stated in the immediately proceeding
+and patent rights.  Except as expressly stated in the immediately proceeding
 sentence, the Original Work is provided under this License on an "AS IS" BASIS
 and WITHOUT WARRANTY, either express or implied, including, without limitation,
 the warranties of NON-INFRINGEMENT, MERCHANTABILITY or FITNESS FOR A PARTICULAR
-PURPOSE. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU.
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU.
 This DISCLAIMER OF WARRANTY constitutes an essential part of this License.
 No license to Original Work is granted hereunder except under this disclaimer.
 
@@ -81,23 +78,23 @@ Licensor be liable to any person for any direct, indirect, special, incidental,
 or consequential damages of any character arising as a result of this License
 or the use of the Original Work including, without limitation, damages for
 loss of goodwill, work stoppage, computer failure or malfunction, or any and
-all other commercial damages or losses. This limitation of liability shall
+all other commercial damages or losses.  This limitation of liability shall
 not apply to liability for death or personal injury resulting from Licensor's
-negligence to the extent applicable law prohibits such limitation. Some jurisdictions
+negligence to the extent applicable law prohibits such limitation.  Some jurisdictions
 do not allow the exclusion or limitation of incidental or consequential damages,
 so this exclusion and limitation may not apply to You.
 
-9) Acceptance and Termination. If You distribute copies of the Original Work
+9) Acceptance and Termination. If You distribute  copies of the Original Work
 or a Derivative Work, You must make a reasonable effort under the circumstances
-to obtain the express assent of recipients to the terms of this License. Nothing
-else but this License (or another written agreement between Licensor and You)
-grants You permission to create Derivative Works based upon the Original Work
-or to exercise any of the rights granted in Section 1 herein, and any attempt
-to do so except under the terms of this License (or another written agreement
-between Licensor and You) is expressly prohibited by U.S. copyright law, the
-equivalent laws of other countries, and by international treaty. Therefore,
-by exercising any of the rights granted to You in Section 1 herein, You indicate
-Your acceptance of this License and all of its terms and conditions.
+to obtain the express assent of recipients to the terms of this License. 
+Nothing else but this License (or another written agreement between Licensor
+and You) grants You permission to create Derivative Works based upon the Original
+Work or to exercise any of the rights granted in Section 1 herein, and any
+attempt to do so except under the terms of this License (or another written
+agreement between Licensor and You) is expressly prohibited by U.S. copyright
+law, the equivalent laws of other countries, and by international treaty.
+Therefore, by exercising any of the rights granted to You in Section 1 herein,
+You indicate Your acceptance of this License and all of its terms and conditions.
 
 10) Termination for Patent Action. This License shall terminate automatically
 and You may no longer exercise any of the rights granted to You by this License
@@ -110,31 +107,31 @@ other software or hardware).
 11) Jurisdiction, Venue and Governing Law. Any action or suit relating to
 this License may be brought only in the courts of a jurisdiction wherein the
 Licensor resides or in which Licensor conducts its primary business, and under
-the laws of that jurisdiction excluding its conflict-of-law provisions. The
+the laws of that jurisdiction excluding its conflict-of-law provisions.  The
 application of the United Nations Convention on Contracts for the International
-Sale of Goods is expressly excluded. Any use of the Original Work outside
+Sale of Goods is expressly excluded.  Any use of the Original Work outside
 the scope of this License or after its termination shall be subject to the
 requirements and penalties of the U.S. Copyright Act, 17 U.S.C. ¤ 101 et seq.,
-the equivalent laws of other countries, and international treaty. This section
+the equivalent laws of other countries, and international treaty.  This section
 shall survive the termination of this License.
 
 12) Attorneys Fees. In any action to enforce the terms of this License or
 seeking damages relating thereto, the prevailing party shall be entitled to
 recover its costs and expenses, including, without limitation, reasonable
 attorneys' fees and costs incurred in connection with such action, including
-any appeal of such action. This section shall survive the termination of this
-License.
+any appeal of such action.  This section shall survive the termination of
+this License.
 
 13) Miscellaneous. This License represents the complete agreement concerning
-the subject matter hereof. If any provision of this License is held to be
+the subject matter hereof.  If any provision of this License is held to be
 unenforceable, such provision shall be reformed only to the extent necessary
 to make it enforceable.
 
 14) Definition of "You" in This License. "You" throughout this License, whether
 in upper or lower case, means an individual or a legal entity exercising rights
-under, and complying with all of the terms of, this License. For legal entities,
+under, and complying with all of the terms of, this License.  For legal entities,
 "You" includes any entity that controls, is controlled by, or is under common
-control with you. For purposes of this definition, "control" means (i) the
+control with you.  For 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.
@@ -143,8 +140,7 @@ or more of the outstanding shares, or (iii) beneficial ownership of such entity.
 restricted or conditioned by this License or by law, and Licensor promises
 not to interfere with or be responsible for such uses by You.
 
-This license is Copyright (C) 2003 Lawrence E. Rosen. All rights reserved.
-
+This license is Copyright (C) 2003 Lawrence E. Rosen.  All rights reserved.
 Permission is hereby granted to copy and distribute this license without modification.
 This license may not be modified without the express written permission of
 its copyright owner.

options/license/AFL-2.1

@@ -1,25 +1,22 @@
 The Academic Free License
+v.2.1
 
-v.2.1 This Academic Free License (the "License") applies to any original work
-of authorship (the "Original Work") whose owner (the "Licensor") has placed
-the following notice immediately following the copyright notice for the Original
+This Academic Free License (the "License") applies to any original work of
+authorship (the "Original Work") whose owner (the "Licensor") has placed the
+following notice immediately following the copyright notice for the Original
 Work:
 
-Licensed under the Academic Free License version 2.1
+     Licensed under the Academic Free License version 2.1
 
 1) Grant of Copyright License. Licensor hereby grants You a world-wide, royalty-free,
 non-exclusive, perpetual, sublicenseable license to do the following:
 
-      a) to reproduce the Original Work in copies;
-
+     a) to reproduce the Original Work in copies;
 b) to prepare derivative works ("Derivative Works") based upon the Original
 Work;
-
 c) to distribute copies of the Original Work and Derivative Works to the public;
-
-      d) to perform the Original Work publicly; and
-
-      e) to display the Original Work publicly.
+     d) to perform the Original Work publicly; and
+     e) to display the Original Work publicly.
 
 2) Grant of Patent License. Licensor hereby grants You a world-wide, royalty-free,
 non-exclusive, perpetual, sublicenseable license, under patent claims owned
@@ -53,7 +50,7 @@ shall be interpreted to prohibit Licensor from licensing under different terms
 from this License any Original Work that Licensor otherwise would have a right
 to license.
 
-   5) This section intentionally omitted.
+5) This section intentionally omitted.
 
 6) Attribution Rights. You must retain, in the Source Code of any Derivative
 Works that You create, all copyright, patent or trademark notices from the
@@ -144,7 +141,6 @@ restricted or conditioned by this License or by law, and Licensor promises
 not to interfere with or be responsible for such uses by You.
 
 This license is Copyright (C) 2003-2004 Lawrence E. Rosen. All rights reserved.
-
 Permission is hereby granted to copy and distribute this license without modification.
 This license may not be modified without the express written permission of
 its copyright owner.