diff --git a/options/license/AAL b/options/license/AAL
index 781ca0e7a3..11b1fdc329 100644
--- a/options/license/AAL
+++ b/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
diff --git a/options/license/AFL-1.1 b/options/license/AFL-1.1
index a505d889c3..19e4b6f9ac 100644
--- a/options/license/AFL-1.1
+++ b/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.
diff --git a/options/license/AFL-1.2 b/options/license/AFL-1.2
index 565cdf8bae..97386ce018 100644
--- a/options/license/AFL-1.2
+++ b/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.
diff --git a/options/license/AFL-2.0 b/options/license/AFL-2.0
index d89114e805..fd1d72808c 100644
--- a/options/license/AFL-2.0
+++ b/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.
diff --git a/options/license/AFL-2.1 b/options/license/AFL-2.1
index 9b07df0582..82f559583a 100644
--- a/options/license/AFL-2.1
+++ b/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.
diff --git a/options/license/AFL-3.0 b/options/license/AFL-3.0
index bd6fc3102c..a71bd47b44 100644
--- a/options/license/AFL-3.0
+++ b/options/license/AFL-3.0
@@ -1,9 +1,11 @@
-Academic Free License ("AFL") v. 3.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 licensing notice adjacent to the
-copyright notice for the Original Work:
+Academic Free License (“AFL”) v. 3.0
 
-Licensed under the Academic Free License version 3.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 licensing notice adjacent to the copyright notice for the Original
+Work:
+
+     Licensed under the Academic Free License version 3.0
 
 1) Grant of Copyright License. Licensor grants You a worldwide, royalty-free,
 non-exclusive, sublicensable license, for the duration of the copyright, to
@@ -11,19 +13,15 @@ do the following:
 
 a) to reproduce the Original Work in copies, either alone or as part of a
 collective work;
-
 b) to translate, adapt, alter, transform, modify, or arrange the Original
 Work, thereby creating derivative works ("Derivative Works") based upon the
 Original Work;
-
 c) to distribute or communicate copies of the Original Work and Derivative
 Works to the public, under any license of your choice that does not contradict
-the terms and conditions, including Licensor's reserved rights and remedies,
+the terms and conditions, including Licensor’s reserved rights and remedies,
 in this Academic Free License;
-
-      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 grants You a worldwide, royalty-free,
 non-exclusive, sublicensable license, under patent claims owned or controlled
@@ -45,7 +43,7 @@ continues to distribute the Original Work.
 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 permission of the Licensor. Except as expressly
-stated herein, nothing in this License grants any license to Licensor's trademarks,
+stated herein, nothing in this License grants any license to Licensor’s trademarks,
 copyrights, patents, trade secrets or any other intellectual property. No
 patent license is granted to make, use, sell, offer for sale, have made, or
 import embodiments of any patent claims other than the licensed claims defined
@@ -104,7 +102,7 @@ to undertake the activities listed in Section 1, including your right to create
 Derivative Works based upon the Original Work, and doing so without honoring
 these terms and conditions is prohibited by copyright law and international
 treaty. Nothing in this License is intended to affect copyright exceptions
-and limitations (including "fair use" or "fair dealing"). This License shall
+and limitations (including “fair use” or “fair dealing”). This License shall
 terminate immediately and You may no longer exercise any of the rights granted
 to You by this License upon your failure to honor the conditions in Section
 1(c).
@@ -127,7 +125,7 @@ the scope of this License or after its termination shall be subject to the
 requirements and penalties of copyright or patent law in the appropriate jurisdiction.
 This section shall survive the termination of this License.
 
-12) Attorneys' Fees. In any action to enforce the terms of this License or
+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
diff --git a/options/license/AGPL-1.0-only b/options/license/AGPL-1.0-only
index d0cc319ad3..138e8b8e6e 100644
--- a/options/license/AGPL-1.0-only
+++ b/options/license/AGPL-1.0-only
@@ -1,10 +1,6 @@
 AFFERO GENERAL PUBLIC LICENSE
-
-Version 1, March 2002
-
-Copyright © 2002 Affero Inc.
-
-510 Third Street - Suite 225, San Francisco, CA 94107, USA
+Version 1, March 2002 Copyright © 2002 Affero Inc. 510 Third Street - Suite
+225, San Francisco, CA 94107, USA
 
 This license is a modified version of the GNU General Public License copyright
 (C) 1989, 1991 Free Software Foundation, Inc. made with their permission.
@@ -94,12 +90,10 @@ of these conditions:
 
 a) You must cause the modified files to carry prominent notices stating that
 you changed the files and the date of any change.
-
 b) You must cause any work that you distribute or publish, that in whole or
 in part contains or is derived from the Program or any part thereof, to be
 licensed as a whole at no charge to all third parties under the terms of this
 License.
-
 c) If the modified program normally reads commands interactively when run,
 you must cause it, when started running for such interactive use in the most
 ordinary way, to print or display an announcement including an appropriate
@@ -109,7 +103,6 @@ these conditions, and telling the user how to view a copy of this License.
 (Exception: if the Program itself is interactive but does not normally print
 such an announcement, your work based on the Program is not required to print
 an announcement.)
-
 d) If the Program as you received it is intended to interact with users through
 a computer network and if, in the version you received, any user interacting
 with the Program was given the opportunity to request transmission to that
@@ -142,17 +135,14 @@ License.
 3. You may copy and distribute the Program (or a work based on it, under Section
 2) in object code or executable form under the terms of Sections 1 and 2 above
 provided that you also do one of the following:
-
 a) Accompany it with the complete corresponding machine-readable source code,
 which must be distributed under the terms of Sections 1 and 2 above on a medium
 customarily used for software interchange; or,
-
 b) Accompany it with a written offer, valid for at least three years, to give
 any third party, for a charge no more than your cost of physically performing
 source distribution, a complete machine-readable copy of the corresponding
 source code, to be distributed under the terms of Sections 1 and 2 above on
 a medium customarily used for software interchange; or,
-
 c) Accompany it with the information you received as to the offer to distribute
 corresponding source code. (This alternative is allowed only for noncommercial
 distribution and only if you received the program in object code or executable
@@ -256,7 +246,7 @@ we sometimes make exceptions for this. Our decision will be guided by the
 two goals of preserving the free status of all derivatives of our free software
 and of promoting the sharing and reuse of software generally.
 
-   NO WARRANTY
+NO WARRANTY
 
 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR
 THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE
diff --git a/options/license/AGPL-1.0-or-later b/options/license/AGPL-1.0-or-later
index d0cc319ad3..138e8b8e6e 100644
--- a/options/license/AGPL-1.0-or-later
+++ b/options/license/AGPL-1.0-or-later
@@ -1,10 +1,6 @@
 AFFERO GENERAL PUBLIC LICENSE
-
-Version 1, March 2002
-
-Copyright © 2002 Affero Inc.
-
-510 Third Street - Suite 225, San Francisco, CA 94107, USA
+Version 1, March 2002 Copyright © 2002 Affero Inc. 510 Third Street - Suite
+225, San Francisco, CA 94107, USA
 
 This license is a modified version of the GNU General Public License copyright
 (C) 1989, 1991 Free Software Foundation, Inc. made with their permission.
@@ -94,12 +90,10 @@ of these conditions:
 
 a) You must cause the modified files to carry prominent notices stating that
 you changed the files and the date of any change.
-
 b) You must cause any work that you distribute or publish, that in whole or
 in part contains or is derived from the Program or any part thereof, to be
 licensed as a whole at no charge to all third parties under the terms of this
 License.
-
 c) If the modified program normally reads commands interactively when run,
 you must cause it, when started running for such interactive use in the most
 ordinary way, to print or display an announcement including an appropriate
@@ -109,7 +103,6 @@ these conditions, and telling the user how to view a copy of this License.
 (Exception: if the Program itself is interactive but does not normally print
 such an announcement, your work based on the Program is not required to print
 an announcement.)
-
 d) If the Program as you received it is intended to interact with users through
 a computer network and if, in the version you received, any user interacting
 with the Program was given the opportunity to request transmission to that
@@ -142,17 +135,14 @@ License.
 3. You may copy and distribute the Program (or a work based on it, under Section
 2) in object code or executable form under the terms of Sections 1 and 2 above
 provided that you also do one of the following:
-
 a) Accompany it with the complete corresponding machine-readable source code,
 which must be distributed under the terms of Sections 1 and 2 above on a medium
 customarily used for software interchange; or,
-
 b) Accompany it with a written offer, valid for at least three years, to give
 any third party, for a charge no more than your cost of physically performing
 source distribution, a complete machine-readable copy of the corresponding
 source code, to be distributed under the terms of Sections 1 and 2 above on
 a medium customarily used for software interchange; or,
-
 c) Accompany it with the information you received as to the offer to distribute
 corresponding source code. (This alternative is allowed only for noncommercial
 distribution and only if you received the program in object code or executable
@@ -256,7 +246,7 @@ we sometimes make exceptions for this. Our decision will be guided by the
 two goals of preserving the free status of all derivatives of our free software
 and of promoting the sharing and reuse of software generally.
 
-   NO WARRANTY
+NO WARRANTY
 
 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR
 THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE
diff --git a/options/license/AGPL-3.0-only b/options/license/AGPL-3.0-only
index e37e32e4e8..3e275d868f 100644
--- a/options/license/AGPL-3.0-only
+++ b/options/license/AGPL-3.0-only
@@ -1,25 +1,24 @@
 GNU AFFERO GENERAL PUBLIC LICENSE
-
 Version 3, 19 November 2007
 
-Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
 
 Everyone is permitted to copy and distribute verbatim copies of this license
 document, but changing it is not allowed.
 
-Preamble
+                            Preamble
 
 The GNU Affero General Public License is a free, copyleft license for software
 and other kinds of works, specifically designed to ensure cooperation with
 the community in the case of network server software.
 
 The licenses for most software and other practical works are designed to take
-away your freedom to share and change the works. By contrast, our General
+away your freedom to share and change the works.  By contrast, our General
 Public Licenses are intended to guarantee your freedom to share and change
 all versions of a program--to make sure it remains free software for all its
 users.
 
-When we speak of free software, we are referring to freedom, not price. Our
+When we speak of free software, we are referring to freedom, not price.  Our
 General Public Licenses are designed to make sure that you have the freedom
 to distribute copies of free software (and charge for them if you wish), that
 you receive source code or can get it if you want it, that you can change
@@ -32,8 +31,8 @@ which gives you legal permission to copy, distribute and/or modify the software.
 
 A secondary benefit of defending all users' freedom is that improvements made
 in alternate versions of the program, if they receive widespread use, become
-available for other developers to incorporate. Many developers of free software
-are heartened and encouraged by the resulting cooperation. However, in the
+available for other developers to incorporate.  Many developers of free software
+are heartened and encouraged by the resulting cooperation.  However, in the
 case of software used on network servers, this result may fail to come about.
 The GNU General Public License permits making a modified version and letting
 the public access it on a server without ever releasing its source code to
@@ -42,34 +41,34 @@ the public.
 The GNU Affero General Public License is designed specifically to ensure that,
 in such cases, the modified source code becomes available to the community.
 It requires the operator of a network server to provide the source code of
-the modified version running there to the users of that server. Therefore,
+the modified version running there to the users of that server.  Therefore,
 public use of a modified version, on a publicly accessible server, gives the
 public access to the source code of the modified version.
 
 An older license, called the Affero General Public License and published by
-Affero, was designed to accomplish similar goals. This is a different license,
+Affero, was designed to accomplish similar goals.  This is a different license,
 not a version of the Affero GPL, but Affero has released a new version of
 the Affero GPL which permits relicensing under this license.
 
 The precise terms and conditions for copying, distribution and modification
 follow.
 
-TERMS AND CONDITIONS
+                       TERMS AND CONDITIONS
 
-   0. Definitions.
+0. Definitions.
 
-   "This License" refers to version 3 of the GNU Affero General Public License.
+"This License" refers to version 3 of the GNU Affero General Public License.
 
 "Copyright" also means copyright-like laws that apply to other kinds of works,
 such as semiconductor masks.
 
 "The Program" refers to any copyrightable work licensed under this License.
-Each licensee is addressed as "you". "Licensees" and "recipients" may be individuals
-or organizations.
+Each licensee is addressed as "you".  "Licensees" and "recipients" may be
+individuals or organizations.
 
 To "modify" a work means to copy from or adapt all or part of the work in
 a fashion requiring copyright permission, other than the making of an exact
-copy. The resulting work is called a "modified version" of the earlier work
+copy.  The resulting work is called a "modified version" of the earlier work
 or a work "based on" the earlier work.
 
 A "covered work" means either the unmodified Program or a work based on the
@@ -83,7 +82,7 @@ making available to the public, and in some countries other activities as
 well.
 
 To "convey" a work means any kind of propagation that enables other parties
-to make or receive copies. Mere interaction with a user through a computer
+to make or receive copies.  Mere interaction with a user through a computer
 network, with no transfer of a copy, is not conveying.
 
 An interactive user interface displays "Appropriate Legal Notices" to the
@@ -91,13 +90,13 @@ extent that it includes a convenient and prominently visible feature that
 (1) displays an appropriate copyright notice, and (2) tells the user that
 there is no warranty for the work (except to the extent that warranties are
 provided), that licensees may convey the work under this License, and how
-to view a copy of this License. If the interface presents a list of user commands
-or options, such as a menu, a prominent item in the list meets this criterion.
-
-   1. Source Code.
+to view a copy of this License.  If the interface presents a list of user
+commands or options, such as a menu, a prominent item in the list meets this
+criterion.
 
+1. Source Code.
 The "source code" for a work means the preferred form of the work for making
-modifications to it. "Object code" means any non-source form of a work.
+modifications to it.  "Object code" means any non-source form of a work.
 
 A "Standard Interface" means an interface that either is an official standard
 defined by a recognized standards body, or, in the case of interfaces specified
@@ -109,9 +108,9 @@ the work as a whole, that (a) is included in the normal form of packaging
 a Major Component, but which is not part of that Major Component, and (b)
 serves only to enable use of the work with that Major Component, or to implement
 a Standard Interface for which an implementation is available to the public
-in source code form. A "Major Component", in this context, means a major essential
-component (kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to produce
+in source code form.  A "Major Component", in this context, means a major
+essential component (kernel, window system, and so on) of the specific operating
+system (if any) on which the executable work runs, or a compiler used to produce
 the work, or an object code interpreter used to run it.
 
 The "Corresponding Source" for a work in object code form means all the source
@@ -119,44 +118,41 @@ code needed to generate, install, and (for an executable work) run the object
 code and to modify the work, including scripts to control those activities.
 However, it does not include the work's System Libraries, or general-purpose
 tools or generally available free programs which are used unmodified in performing
-those activities but which are not part of the work. For example, Corresponding
+those activities but which are not part of the work.  For example, Corresponding
 Source includes interface definition files associated with source files for
 the work, and the source code for shared libraries and dynamically linked
 subprograms that the work is specifically designed to require, such as by
 intimate data communication or control flow between those
-
-   subprograms and other parts of the work.
+subprograms and other parts of the work.
 
 The Corresponding Source need not include anything that users can regenerate
 automatically from other parts of the Corresponding Source.
 
-   The Corresponding Source for a work in source code form is that same work.
-
-   2. Basic Permissions.
+The Corresponding Source for a work in source code form is that same work.
 
+2. Basic Permissions.
 All rights granted under this License are granted for the term of copyright
 on the Program, and are irrevocable provided the stated conditions are met.
 This License explicitly affirms your unlimited permission to run the unmodified
-Program. The output from running a covered work is covered by this License
-only if the output, given its content, constitutes a covered work. This License
+Program.  The output from running a covered work is covered by this License
+only if the output, given its content, constitutes a covered work.  This License
 acknowledges your rights of fair use or other equivalent, as provided by copyright
 law.
 
 You may make, run and propagate covered works that you do not convey, without
-conditions so long as your license otherwise remains in force. You may convey
+conditions so long as your license otherwise remains in force.  You may convey
 covered works to others for the sole purpose of having them make modifications
 exclusively for you, or provide you with facilities for running those works,
 provided that you comply with the terms of this License in conveying all material
-for which you do not control copyright. Those thus making or running the covered
-works for you must do so exclusively on your behalf, under your direction
+for which you do not control copyright.  Those thus making or running the
+covered works for you must do so exclusively on your behalf, under your direction
 and control, on terms that prohibit them from making any copies of your copyrighted
 material outside their relationship with you.
 
 Conveying under any other circumstances is permitted solely under the conditions
-stated below. Sublicensing is not allowed; section 10 makes it unnecessary.
-
-   3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+stated below.  Sublicensing is not allowed; section 10 makes it unnecessary.
 
+3. Protecting Users' Legal Rights From Anti-Circumvention Law.
 No covered work shall be deemed part of an effective technological measure
 under any applicable law fulfilling obligations under article 11 of the WIPO
 copyright treaty adopted on 20 December 1996, or similar laws prohibiting
@@ -169,8 +165,7 @@ you disclaim any intention to limit operation or modification of the work
 as a means of enforcing, against the work's users, your or third parties'
 legal rights to forbid circumvention of technological measures.
 
-   4. Conveying Verbatim Copies.
-
+4. Conveying Verbatim Copies.
 You may convey verbatim copies of the Program's source code as you receive
 it, in any medium, provided that you conspicuously and appropriately publish
 on each copy an appropriate copyright notice; keep intact all notices stating
@@ -181,8 +176,7 @@ and give all recipients a copy of this License along with the Program.
 You may charge any price or no price for each copy that you convey, and you
 may offer support or warranty protection for a fee.
 
-   5. Conveying Modified Source Versions.
-
+5. Conveying Modified Source Versions.
 You may convey a work based on the Program, or the modifications to produce
 it from the Program, in the form of source code under the terms of section
 4, provided that you also meet all of these conditions:
@@ -191,13 +185,13 @@ a) The work must carry prominent notices stating that you modified it, and
 giving a relevant date.
 
 b) The work must carry prominent notices stating that it is released under
-this License and any conditions added under section 7. This requirement modifies
+this License and any conditions added under section 7.  This requirement modifies
 the requirement in section 4 to "keep intact all notices".
 
 c) You must license the entire work, as a whole, under this License to anyone
-who comes into possession of a copy. This License will therefore apply, along
+who comes into possession of a copy.  This License will therefore apply, along
 with any applicable section 7 additional terms, to the whole of the work,
-and all its parts, regardless of how they are packaged. This License gives
+and all its parts, regardless of how they are packaged.  This License gives
 no permission to license the work in any other way, but it does not invalidate
 such permission if you have separately received it.
 
@@ -210,12 +204,11 @@ which are not by their nature extensions of the covered work, and which are
 not combined with it such as to form a larger program, in or on a volume of
 a storage or distribution medium, is called an "aggregate" if the compilation
 and its resulting copyright are not used to limit the access or legal rights
-of the compilation's users beyond what the individual works permit. Inclusion
+of the compilation's users beyond what the individual works permit.  Inclusion
 of a covered work in an aggregate does not cause this License to apply to
 the other parts of the aggregate.
 
-   6. Conveying Non-Source Forms.
-
+6. Conveying Non-Source Forms.
 You may convey a covered work in object code form under the terms of sections
 4 and 5, provided that you also convey the machine-readable Corresponding
 Source under the terms of this License, in one of these ways:
@@ -235,18 +228,18 @@ of physically performing this conveying of source, or (2) access to copy the
 Corresponding Source from a network server at no charge.
 
 c) Convey individual copies of the object code with a copy of the written
-offer to provide the Corresponding Source. This alternative is allowed only
+offer to provide the Corresponding Source.  This alternative is allowed only
 occasionally and noncommercially, and only if you received the object code
 with such an offer, in accord with subsection 6b.
 
 d) Convey the object code by offering access from a designated place (gratis
 or for a charge), and offer equivalent access to the Corresponding Source
-in the same way through the same place at no further charge. You need not
+in the same way through the same place at no further charge.  You need not
 require recipients to copy the Corresponding Source along with the object
-code. If the place to copy the object code is a network server, the Corresponding
+code.  If the place to copy the object code is a network server, the Corresponding
 Source may be on a different server (operated by you or a third party) that
 supports equivalent copying facilities, provided you maintain clear directions
-next to the object code saying where to find the Corresponding Source. Regardless
+next to the object code saying where to find the Corresponding Source.  Regardless
 of what server hosts the Corresponding Source, you remain obligated to ensure
 that it is available for as long as needed to satisfy these requirements.
 
@@ -262,18 +255,18 @@ A "User Product" is either (1) a "consumer product", which means any tangible
 personal property which is normally used for personal, family, or household
 purposes, or (2) anything designed or sold for incorporation into a dwelling.
 In determining whether a product is a consumer product, doubtful cases shall
-be resolved in favor of coverage. For a particular product received by a particular
-user, "normally used" refers to a typical or common use of that class of product,
-regardless of the status of the particular user or of the way in which the
-particular user actually uses, or expects or is expected to use, the product.
-A product is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent the
-only significant mode of use of the product.
+be resolved in favor of coverage.  For a particular product received by a
+particular user, "normally used" refers to a typical or common use of that
+class of product, regardless of the status of the particular user or of the
+way in which the particular user actually uses, or expects or is expected
+to use, the product.  A product is a consumer product regardless of whether
+the product has substantial commercial, industrial or non-consumer uses, unless
+such uses represent the only significant mode of use of the product.
 
 "Installation Information" for a User Product means any methods, procedures,
 authorization keys, or other information required to install and execute modified
 versions of a covered work in that User Product from a modified version of
-its Corresponding Source. The information must suffice to ensure that the
+its Corresponding Source.  The information must suffice to ensure that the
 continued functioning of the modified object code is in no case prevented
 or interfered with solely because modification has been made.
 
@@ -282,7 +275,7 @@ for use in, a User Product, and the conveying occurs as part of a transaction
 in which the right of possession and use of the User Product is transferred
 to the recipient in perpetuity or for a fixed term (regardless of how the
 transaction is characterized), the Corresponding Source conveyed under this
-section must be accompanied by the Installation Information. But this requirement
+section must be accompanied by the Installation Information.  But this requirement
 does not apply if neither you nor any third party retains the ability to install
 modified object code on the User Product (for example, the work has been installed
 in ROM).
@@ -290,7 +283,7 @@ in ROM).
 The requirement to provide Installation Information does not include a requirement
 to continue to provide support service, warranty, or updates for a work that
 has been modified or installed by the recipient, or for the User Product in
-which it has been modified or installed. Access to a network may be denied
+which it has been modified or installed.  Access to a network may be denied
 when the modification itself materially and adversely affects the operation
 of the network or violates the rules and protocols for communication across
 the network.
@@ -300,20 +293,19 @@ with this section must be in a format that is publicly documented (and with
 an implementation available to the public in source code form), and must require
 no special password or key for unpacking, reading or copying.
 
-   7. Additional Terms.
-
+7. Additional Terms.
 "Additional permissions" are terms that supplement the terms of this License
 by making exceptions from one or more of its conditions. Additional permissions
 that are applicable to the entire Program shall be treated as though they
 were included in this License, to the extent that they are valid under applicable
-law. If additional permissions apply only to part of the Program, that part
+law.  If additional permissions apply only to part of the Program, that part
 may be used separately under those permissions, but the entire Program remains
 governed by this License without regard to the additional permissions.
 
 When you convey a copy of a covered work, you may at your option remove any
-additional permissions from that copy, or from any part of it. (Additional
+additional permissions from that copy, or from any part of it.  (Additional
 permissions may be written to require their own removal in certain cases when
-you modify the work.) You may place additional permissions on material, added
+you modify the work.)  You may place additional permissions on material, added
 by you to a covered work, for which you have or can give appropriate copyright
 permission.
 
@@ -344,7 +336,7 @@ assumptions of liability to the recipient, for any liability that these contract
 assumptions directly impose on those licensors and authors.
 
 All other non-permissive additional terms are considered "further restrictions"
-within the meaning of section 10. If the Program as you received it, or any
+within the meaning of section 10.  If the Program as you received it, or any
 part of it, contains a notice stating that it is governed by this License
 along with a term that is a further restriction, you may remove that term.
 If a license document contains a further restriction but permits relicensing
@@ -360,10 +352,10 @@ Additional terms, permissive or non-permissive, may be stated in the form
 of a separately written license, or stated as exceptions; the above requirements
 apply either way.
 
-   8. Termination.
+8. Termination.
 
 You may not propagate or modify a covered work except as expressly provided
-under this License. Any attempt otherwise to propagate or modify it is void,
+under this License.  Any attempt otherwise to propagate or modify it is void,
 and will automatically terminate your rights under this License (including
 any patent licenses granted under the third paragraph of section 11).
 
@@ -384,26 +376,26 @@ of parties who have received copies or rights from you under this License.
 If your rights have been terminated and not permanently reinstated, you do
 not qualify to receive new licenses for the same material under section 10.
 
-   9. Acceptance Not Required for Having Copies.
+9. Acceptance Not Required for Having Copies.
 
 You are not required to accept this License in order to receive or run a copy
-of the Program. Ancillary propagation of a covered work occurring solely as
-a consequence of using peer-to-peer transmission to receive a copy likewise
-does not require acceptance. However, nothing other than this License grants
-you permission to propagate or modify any covered work. These actions infringe
-copyright if you do not accept this License. Therefore, by modifying or propagating
+of the Program.  Ancillary propagation of a covered work occurring solely
+as a consequence of using peer-to-peer transmission to receive a copy likewise
+does not require acceptance.  However, nothing other than this License grants
+you permission to propagate or modify any covered work.  These actions infringe
+copyright if you do not accept this License.  Therefore, by modifying or propagating
 a covered work, you indicate your acceptance of this License to do so.
 
-   10. Automatic Licensing of Downstream Recipients.
+10. Automatic Licensing of Downstream Recipients.
 
 Each time you convey a covered work, the recipient automatically receives
 a license from the original licensors, to run, modify and propagate that work,
-subject to this License. You are not responsible for enforcing compliance
+subject to this License.  You are not responsible for enforcing compliance
 by third parties with this License.
 
 An "entity transaction" is a transaction transferring control of an organization,
 or substantially all assets of one, or subdividing an organization, or merging
-organizations. If propagation of a covered work results from an entity transaction,
+organizations.  If propagation of a covered work results from an entity transaction,
 each party to that transaction who receives a copy of the work also receives
 whatever licenses to the work the party's predecessor in interest had or could
 give under the previous paragraph, plus a right to possession of the Corresponding
@@ -411,17 +403,17 @@ Source of the work from the predecessor in interest, if the predecessor has
 it or can get it with reasonable efforts.
 
 You may not impose any further restrictions on the exercise of the rights
-granted or affirmed under this License. For example, you may not impose a
+granted or affirmed under this License.  For example, you may not impose a
 license fee, royalty, or other charge for exercise of rights granted under
 this License, and you may not initiate litigation (including a cross-claim
 or counterclaim in a lawsuit) alleging that any patent claim is infringed
 by making, using, selling, offering for sale, or importing the Program or
 any portion of it.
 
-   11. Patents.
+11. Patents.
 
 A "contributor" is a copyright holder who authorizes use under this License
-of the Program or a work on which the Program is based. The work thus licensed
+of the Program or a work on which the Program is based.  The work thus licensed
 is called the contributor's "contributor version".
 
 A contributor's "essential patent claims" are all patent claims owned or controlled
@@ -429,7 +421,7 @@ by the contributor, whether already acquired or hereafter acquired, that would
 be infringed by some manner, permitted by this License, of making, using,
 or selling its contributor version, but do not include claims that would be
 infringed only as a consequence of further modification of the contributor
-version. For purposes of this definition, "control" includes the right to
+version.  For purposes of this definition, "control" includes the right to
 grant patent sublicenses in a manner consistent with the requirements of this
 License.
 
@@ -440,7 +432,7 @@ of its contributor version.
 
 In the following three paragraphs, a "patent license" is any express agreement
 or commitment, however denominated, not to enforce a patent (such as an express
-permission to practice a patent or covenant not to s ue for patent infringement).
+permission to practice a patent or covenant not to sue for patent infringement).
 To "grant" such a patent license to a party means to make such an agreement
 or commitment not to enforce a patent against the party.
 
@@ -452,8 +444,7 @@ cause the Corresponding Source to be so available, or (2) arrange to deprive
 yourself of the benefit of the patent license for this particular work, or
 (3) arrange, in a manner consistent with the requirements of this License,
 to extend the patent
-
-license to downstream recipients. "Knowingly relying" means you have actual
+license to downstream recipients.  "Knowingly relying" means you have actual
 knowledge that, but for the patent license, your conveying the covered work
 in a country, or your recipient's use of the covered work in a country, would
 infringe one or more identifiable patents in that country that you have reason
@@ -484,27 +475,26 @@ Nothing in this License shall be construed as excluding or limiting any implied
 license or other defenses to infringement that may otherwise be available
 to you under applicable patent law.
 
-   12. No Surrender of Others' Freedom.
+12. No Surrender of Others' Freedom.
 
 If conditions are imposed on you (whether by court order, agreement or otherwise)
 that contradict the conditions of this License, they do not excuse you from
-the conditions of this License. If you cannot convey a covered work so as
+the conditions of this License.  If you cannot convey a covered work so as
 to satisfy simultaneously your obligations under this License and any other
 pertinent obligations, then as a consequence you may
-
-not convey it at all. For example, if you agree to terms that obligate you
+not convey it at all.  For example, if you agree to terms that obligate you
 to collect a royalty for further conveying from those to whom you convey the
 Program, the only way you could satisfy both those terms and this License
 would be to refrain entirely from conveying the Program.
 
-   13. Remote Network Interaction; Use with the GNU General Public License.
+13. Remote Network Interaction; Use with the GNU General Public License.
 
 Notwithstanding any other provision of this License, if you modify the Program,
 your modified version must prominently offer all users interacting with it
 remotely through a computer network (if your version supports such interaction)
 an opportunity to receive the Corresponding Source of your version by providing
 access to the Corresponding Source from a network server at no charge, through
-some standard or customary means of facilitating copying of software. This
+some standard or customary means of facilitating copying of software.  This
 Corresponding Source shall include the Corresponding Source for any work covered
 by version 3 of the GNU General Public License that is incorporated pursuant
 to the following paragraph.
@@ -512,22 +502,22 @@ to the following paragraph.
 Notwithstanding any other provision of this License, you have permission to
 link or combine any covered work with a work licensed under version 3 of the
 GNU General Public License into a single combined work, and to convey the
-resulting work. The terms of this License will continue to apply to the part
+resulting work.  The terms of this License will continue to apply to the part
 which is the covered work, but the work with which it is combined will remain
 governed by version 3 of the GNU General Public License.
 
-   14. Revised Versions of this License.
+14. Revised Versions of this License.
 
 The Free Software Foundation may publish revised and/or new versions of the
-GNU Affero General Public License from time to time. Such new versions will
+GNU Affero General Public License from time to time.  Such new versions will
 be similar in spirit to the present version, but may differ in detail to address
 new problems or concerns.
 
-Each version is given a distinguishing version number. If the Program specifies
+Each version is given a distinguishing version number.  If the Program specifies
 that a certain numbered version of the GNU Affero General Public License "or
 any later version" applies to it, you have the option of following the terms
 and conditions either of that numbered version or of any later version published
-by the Free Software Foundation. If the Program does not specify a version
+by the Free Software Foundation.  If the Program does not specify a version
 number of the GNU Affero General Public License, you may choose any version
 ever published by the Free Software Foundation.
 
@@ -536,22 +526,22 @@ the GNU Affero General Public License can be used, that proxy's public statement
 of acceptance of a version permanently authorizes you to choose that version
 for the Program.
 
-Later license versions may give you additional or different permissions. However,
-no additional obligations are imposed on any author or copyright holder as
-a result of your choosing to follow a later version.
+Later license versions may give you additional or different permissions. 
+However, no additional obligations are imposed on any author or copyright
+holder as a result of your choosing to follow a later version.
 
-   15. Disclaimer of Warranty.
+15. Disclaimer of Warranty.
 
 THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE
-LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
 OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER
 EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM
-PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR
-CORRECTION.
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK
+AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR
+OR CORRECTION.
 
-   16. Limitation of Liability.
+16. Limitation of Liability.
 
 IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL
 ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS THE PROGRAM
@@ -562,29 +552,29 @@ INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE
 PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER
 PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
 
-   17. Interpretation of Sections 15 and 16.
+17. Interpretation of Sections 15 and 16.
 
 If the disclaimer of warranty and limitation of liability provided above cannot
 be given local legal effect according to their terms, reviewing courts shall
 apply local law that most closely approximates an absolute waiver of all civil
 liability in connection with the Program, unless a warranty or assumption
-of liability accompanies a copy of the Program in return for a fee. END OF
-TERMS AND CONDITIONS
+of liability accompanies a copy of the Program in return for a fee.
 
-How to Apply These Terms to Your New Programs
+END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
 
 If you develop a new program, and you want it to be of the greatest possible
 use to the public, the best way to achieve this is to make it free software
 which everyone can redistribute and change under these terms.
 
-To do so, attach the following notices to the program. It is safest to attach
+To do so, attach the following notices to the program.  It is safest to attach
 them to the start of each source file to most effectively state the exclusion
 of warranty; and each file should have at least the "copyright" line and a
 pointer to where the full notice is found.
 
-<one line to give the program's name and a brief idea of what it does.>
-
-Copyright (C) <year> <name of author>
+     <one line to give the program's name and a brief idea of what it does.>
+     Copyright (C) <year>  <name of author>
 
 This program is free software: you can redistribute it and/or modify it under
 the terms of the GNU Affero General Public License as published by the Free
@@ -593,21 +583,21 @@ any later version.
 
 This program is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
+FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more
 details.
 
 You should have received a copy of the GNU Affero General Public License along
-with this program. If not, see <https://www.gnu.org/licenses/>.
+with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 Also add information on how to contact you by electronic and paper mail.
 
 If your software can interact with users remotely through a computer network,
 you should also make sure that it provides a way for users to get its source.
 For example, if your program is a web application, its interface could display
-a "Source" link that leads users to an archive of the code. There are many
+a "Source" link that leads users to an archive of the code.  There are many
 ways you could offer source, and different solutions will be better for different
 programs; see section 13 for the specific requirements.
 
 You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary. For
-more information on this, and how to apply and follow the GNU AGPL, see <https://www.gnu.org/licenses/>.
+more information on this, and how to apply and follow the GNU AGPL, see <http://www.gnu.org/licenses/>.
diff --git a/options/license/AGPL-3.0-or-later b/options/license/AGPL-3.0-or-later
index e37e32e4e8..3e275d868f 100644
--- a/options/license/AGPL-3.0-or-later
+++ b/options/license/AGPL-3.0-or-later
@@ -1,25 +1,24 @@
 GNU AFFERO GENERAL PUBLIC LICENSE
-
 Version 3, 19 November 2007
 
-Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
 
 Everyone is permitted to copy and distribute verbatim copies of this license
 document, but changing it is not allowed.
 
-Preamble
+                            Preamble
 
 The GNU Affero General Public License is a free, copyleft license for software
 and other kinds of works, specifically designed to ensure cooperation with
 the community in the case of network server software.
 
 The licenses for most software and other practical works are designed to take
-away your freedom to share and change the works. By contrast, our General
+away your freedom to share and change the works.  By contrast, our General
 Public Licenses are intended to guarantee your freedom to share and change
 all versions of a program--to make sure it remains free software for all its
 users.
 
-When we speak of free software, we are referring to freedom, not price. Our
+When we speak of free software, we are referring to freedom, not price.  Our
 General Public Licenses are designed to make sure that you have the freedom
 to distribute copies of free software (and charge for them if you wish), that
 you receive source code or can get it if you want it, that you can change
@@ -32,8 +31,8 @@ which gives you legal permission to copy, distribute and/or modify the software.
 
 A secondary benefit of defending all users' freedom is that improvements made
 in alternate versions of the program, if they receive widespread use, become
-available for other developers to incorporate. Many developers of free software
-are heartened and encouraged by the resulting cooperation. However, in the
+available for other developers to incorporate.  Many developers of free software
+are heartened and encouraged by the resulting cooperation.  However, in the
 case of software used on network servers, this result may fail to come about.
 The GNU General Public License permits making a modified version and letting
 the public access it on a server without ever releasing its source code to
@@ -42,34 +41,34 @@ the public.
 The GNU Affero General Public License is designed specifically to ensure that,
 in such cases, the modified source code becomes available to the community.
 It requires the operator of a network server to provide the source code of
-the modified version running there to the users of that server. Therefore,
+the modified version running there to the users of that server.  Therefore,
 public use of a modified version, on a publicly accessible server, gives the
 public access to the source code of the modified version.
 
 An older license, called the Affero General Public License and published by
-Affero, was designed to accomplish similar goals. This is a different license,
+Affero, was designed to accomplish similar goals.  This is a different license,
 not a version of the Affero GPL, but Affero has released a new version of
 the Affero GPL which permits relicensing under this license.
 
 The precise terms and conditions for copying, distribution and modification
 follow.
 
-TERMS AND CONDITIONS
+                       TERMS AND CONDITIONS
 
-   0. Definitions.
+0. Definitions.
 
-   "This License" refers to version 3 of the GNU Affero General Public License.
+"This License" refers to version 3 of the GNU Affero General Public License.
 
 "Copyright" also means copyright-like laws that apply to other kinds of works,
 such as semiconductor masks.
 
 "The Program" refers to any copyrightable work licensed under this License.
-Each licensee is addressed as "you". "Licensees" and "recipients" may be individuals
-or organizations.
+Each licensee is addressed as "you".  "Licensees" and "recipients" may be
+individuals or organizations.
 
 To "modify" a work means to copy from or adapt all or part of the work in
 a fashion requiring copyright permission, other than the making of an exact
-copy. The resulting work is called a "modified version" of the earlier work
+copy.  The resulting work is called a "modified version" of the earlier work
 or a work "based on" the earlier work.
 
 A "covered work" means either the unmodified Program or a work based on the
@@ -83,7 +82,7 @@ making available to the public, and in some countries other activities as
 well.
 
 To "convey" a work means any kind of propagation that enables other parties
-to make or receive copies. Mere interaction with a user through a computer
+to make or receive copies.  Mere interaction with a user through a computer
 network, with no transfer of a copy, is not conveying.
 
 An interactive user interface displays "Appropriate Legal Notices" to the
@@ -91,13 +90,13 @@ extent that it includes a convenient and prominently visible feature that
 (1) displays an appropriate copyright notice, and (2) tells the user that
 there is no warranty for the work (except to the extent that warranties are
 provided), that licensees may convey the work under this License, and how
-to view a copy of this License. If the interface presents a list of user commands
-or options, such as a menu, a prominent item in the list meets this criterion.
-
-   1. Source Code.
+to view a copy of this License.  If the interface presents a list of user
+commands or options, such as a menu, a prominent item in the list meets this
+criterion.
 
+1. Source Code.
 The "source code" for a work means the preferred form of the work for making
-modifications to it. "Object code" means any non-source form of a work.
+modifications to it.  "Object code" means any non-source form of a work.
 
 A "Standard Interface" means an interface that either is an official standard
 defined by a recognized standards body, or, in the case of interfaces specified
@@ -109,9 +108,9 @@ the work as a whole, that (a) is included in the normal form of packaging
 a Major Component, but which is not part of that Major Component, and (b)
 serves only to enable use of the work with that Major Component, or to implement
 a Standard Interface for which an implementation is available to the public
-in source code form. A "Major Component", in this context, means a major essential
-component (kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to produce
+in source code form.  A "Major Component", in this context, means a major
+essential component (kernel, window system, and so on) of the specific operating
+system (if any) on which the executable work runs, or a compiler used to produce
 the work, or an object code interpreter used to run it.
 
 The "Corresponding Source" for a work in object code form means all the source
@@ -119,44 +118,41 @@ code needed to generate, install, and (for an executable work) run the object
 code and to modify the work, including scripts to control those activities.
 However, it does not include the work's System Libraries, or general-purpose
 tools or generally available free programs which are used unmodified in performing
-those activities but which are not part of the work. For example, Corresponding
+those activities but which are not part of the work.  For example, Corresponding
 Source includes interface definition files associated with source files for
 the work, and the source code for shared libraries and dynamically linked
 subprograms that the work is specifically designed to require, such as by
 intimate data communication or control flow between those
-
-   subprograms and other parts of the work.
+subprograms and other parts of the work.
 
 The Corresponding Source need not include anything that users can regenerate
 automatically from other parts of the Corresponding Source.
 
-   The Corresponding Source for a work in source code form is that same work.
-
-   2. Basic Permissions.
+The Corresponding Source for a work in source code form is that same work.
 
+2. Basic Permissions.
 All rights granted under this License are granted for the term of copyright
 on the Program, and are irrevocable provided the stated conditions are met.
 This License explicitly affirms your unlimited permission to run the unmodified
-Program. The output from running a covered work is covered by this License
-only if the output, given its content, constitutes a covered work. This License
+Program.  The output from running a covered work is covered by this License
+only if the output, given its content, constitutes a covered work.  This License
 acknowledges your rights of fair use or other equivalent, as provided by copyright
 law.
 
 You may make, run and propagate covered works that you do not convey, without
-conditions so long as your license otherwise remains in force. You may convey
+conditions so long as your license otherwise remains in force.  You may convey
 covered works to others for the sole purpose of having them make modifications
 exclusively for you, or provide you with facilities for running those works,
 provided that you comply with the terms of this License in conveying all material
-for which you do not control copyright. Those thus making or running the covered
-works for you must do so exclusively on your behalf, under your direction
+for which you do not control copyright.  Those thus making or running the
+covered works for you must do so exclusively on your behalf, under your direction
 and control, on terms that prohibit them from making any copies of your copyrighted
 material outside their relationship with you.
 
 Conveying under any other circumstances is permitted solely under the conditions
-stated below. Sublicensing is not allowed; section 10 makes it unnecessary.
-
-   3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+stated below.  Sublicensing is not allowed; section 10 makes it unnecessary.
 
+3. Protecting Users' Legal Rights From Anti-Circumvention Law.
 No covered work shall be deemed part of an effective technological measure
 under any applicable law fulfilling obligations under article 11 of the WIPO
 copyright treaty adopted on 20 December 1996, or similar laws prohibiting
@@ -169,8 +165,7 @@ you disclaim any intention to limit operation or modification of the work
 as a means of enforcing, against the work's users, your or third parties'
 legal rights to forbid circumvention of technological measures.
 
-   4. Conveying Verbatim Copies.
-
+4. Conveying Verbatim Copies.
 You may convey verbatim copies of the Program's source code as you receive
 it, in any medium, provided that you conspicuously and appropriately publish
 on each copy an appropriate copyright notice; keep intact all notices stating
@@ -181,8 +176,7 @@ and give all recipients a copy of this License along with the Program.
 You may charge any price or no price for each copy that you convey, and you
 may offer support or warranty protection for a fee.
 
-   5. Conveying Modified Source Versions.
-
+5. Conveying Modified Source Versions.
 You may convey a work based on the Program, or the modifications to produce
 it from the Program, in the form of source code under the terms of section
 4, provided that you also meet all of these conditions:
@@ -191,13 +185,13 @@ a) The work must carry prominent notices stating that you modified it, and
 giving a relevant date.
 
 b) The work must carry prominent notices stating that it is released under
-this License and any conditions added under section 7. This requirement modifies
+this License and any conditions added under section 7.  This requirement modifies
 the requirement in section 4 to "keep intact all notices".
 
 c) You must license the entire work, as a whole, under this License to anyone
-who comes into possession of a copy. This License will therefore apply, along
+who comes into possession of a copy.  This License will therefore apply, along
 with any applicable section 7 additional terms, to the whole of the work,
-and all its parts, regardless of how they are packaged. This License gives
+and all its parts, regardless of how they are packaged.  This License gives
 no permission to license the work in any other way, but it does not invalidate
 such permission if you have separately received it.
 
@@ -210,12 +204,11 @@ which are not by their nature extensions of the covered work, and which are
 not combined with it such as to form a larger program, in or on a volume of
 a storage or distribution medium, is called an "aggregate" if the compilation
 and its resulting copyright are not used to limit the access or legal rights
-of the compilation's users beyond what the individual works permit. Inclusion
+of the compilation's users beyond what the individual works permit.  Inclusion
 of a covered work in an aggregate does not cause this License to apply to
 the other parts of the aggregate.
 
-   6. Conveying Non-Source Forms.
-
+6. Conveying Non-Source Forms.
 You may convey a covered work in object code form under the terms of sections
 4 and 5, provided that you also convey the machine-readable Corresponding
 Source under the terms of this License, in one of these ways:
@@ -235,18 +228,18 @@ of physically performing this conveying of source, or (2) access to copy the
 Corresponding Source from a network server at no charge.
 
 c) Convey individual copies of the object code with a copy of the written
-offer to provide the Corresponding Source. This alternative is allowed only
+offer to provide the Corresponding Source.  This alternative is allowed only
 occasionally and noncommercially, and only if you received the object code
 with such an offer, in accord with subsection 6b.
 
 d) Convey the object code by offering access from a designated place (gratis
 or for a charge), and offer equivalent access to the Corresponding Source
-in the same way through the same place at no further charge. You need not
+in the same way through the same place at no further charge.  You need not
 require recipients to copy the Corresponding Source along with the object
-code. If the place to copy the object code is a network server, the Corresponding
+code.  If the place to copy the object code is a network server, the Corresponding
 Source may be on a different server (operated by you or a third party) that
 supports equivalent copying facilities, provided you maintain clear directions
-next to the object code saying where to find the Corresponding Source. Regardless
+next to the object code saying where to find the Corresponding Source.  Regardless
 of what server hosts the Corresponding Source, you remain obligated to ensure
 that it is available for as long as needed to satisfy these requirements.
 
@@ -262,18 +255,18 @@ A "User Product" is either (1) a "consumer product", which means any tangible
 personal property which is normally used for personal, family, or household
 purposes, or (2) anything designed or sold for incorporation into a dwelling.
 In determining whether a product is a consumer product, doubtful cases shall
-be resolved in favor of coverage. For a particular product received by a particular
-user, "normally used" refers to a typical or common use of that class of product,
-regardless of the status of the particular user or of the way in which the
-particular user actually uses, or expects or is expected to use, the product.
-A product is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent the
-only significant mode of use of the product.
+be resolved in favor of coverage.  For a particular product received by a
+particular user, "normally used" refers to a typical or common use of that
+class of product, regardless of the status of the particular user or of the
+way in which the particular user actually uses, or expects or is expected
+to use, the product.  A product is a consumer product regardless of whether
+the product has substantial commercial, industrial or non-consumer uses, unless
+such uses represent the only significant mode of use of the product.
 
 "Installation Information" for a User Product means any methods, procedures,
 authorization keys, or other information required to install and execute modified
 versions of a covered work in that User Product from a modified version of
-its Corresponding Source. The information must suffice to ensure that the
+its Corresponding Source.  The information must suffice to ensure that the
 continued functioning of the modified object code is in no case prevented
 or interfered with solely because modification has been made.
 
@@ -282,7 +275,7 @@ for use in, a User Product, and the conveying occurs as part of a transaction
 in which the right of possession and use of the User Product is transferred
 to the recipient in perpetuity or for a fixed term (regardless of how the
 transaction is characterized), the Corresponding Source conveyed under this
-section must be accompanied by the Installation Information. But this requirement
+section must be accompanied by the Installation Information.  But this requirement
 does not apply if neither you nor any third party retains the ability to install
 modified object code on the User Product (for example, the work has been installed
 in ROM).
@@ -290,7 +283,7 @@ in ROM).
 The requirement to provide Installation Information does not include a requirement
 to continue to provide support service, warranty, or updates for a work that
 has been modified or installed by the recipient, or for the User Product in
-which it has been modified or installed. Access to a network may be denied
+which it has been modified or installed.  Access to a network may be denied
 when the modification itself materially and adversely affects the operation
 of the network or violates the rules and protocols for communication across
 the network.
@@ -300,20 +293,19 @@ with this section must be in a format that is publicly documented (and with
 an implementation available to the public in source code form), and must require
 no special password or key for unpacking, reading or copying.
 
-   7. Additional Terms.
-
+7. Additional Terms.
 "Additional permissions" are terms that supplement the terms of this License
 by making exceptions from one or more of its conditions. Additional permissions
 that are applicable to the entire Program shall be treated as though they
 were included in this License, to the extent that they are valid under applicable
-law. If additional permissions apply only to part of the Program, that part
+law.  If additional permissions apply only to part of the Program, that part
 may be used separately under those permissions, but the entire Program remains
 governed by this License without regard to the additional permissions.
 
 When you convey a copy of a covered work, you may at your option remove any
-additional permissions from that copy, or from any part of it. (Additional
+additional permissions from that copy, or from any part of it.  (Additional
 permissions may be written to require their own removal in certain cases when
-you modify the work.) You may place additional permissions on material, added
+you modify the work.)  You may place additional permissions on material, added
 by you to a covered work, for which you have or can give appropriate copyright
 permission.
 
@@ -344,7 +336,7 @@ assumptions of liability to the recipient, for any liability that these contract
 assumptions directly impose on those licensors and authors.
 
 All other non-permissive additional terms are considered "further restrictions"
-within the meaning of section 10. If the Program as you received it, or any
+within the meaning of section 10.  If the Program as you received it, or any
 part of it, contains a notice stating that it is governed by this License
 along with a term that is a further restriction, you may remove that term.
 If a license document contains a further restriction but permits relicensing
@@ -360,10 +352,10 @@ Additional terms, permissive or non-permissive, may be stated in the form
 of a separately written license, or stated as exceptions; the above requirements
 apply either way.
 
-   8. Termination.
+8. Termination.
 
 You may not propagate or modify a covered work except as expressly provided
-under this License. Any attempt otherwise to propagate or modify it is void,
+under this License.  Any attempt otherwise to propagate or modify it is void,
 and will automatically terminate your rights under this License (including
 any patent licenses granted under the third paragraph of section 11).
 
@@ -384,26 +376,26 @@ of parties who have received copies or rights from you under this License.
 If your rights have been terminated and not permanently reinstated, you do
 not qualify to receive new licenses for the same material under section 10.
 
-   9. Acceptance Not Required for Having Copies.
+9. Acceptance Not Required for Having Copies.
 
 You are not required to accept this License in order to receive or run a copy
-of the Program. Ancillary propagation of a covered work occurring solely as
-a consequence of using peer-to-peer transmission to receive a copy likewise
-does not require acceptance. However, nothing other than this License grants
-you permission to propagate or modify any covered work. These actions infringe
-copyright if you do not accept this License. Therefore, by modifying or propagating
+of the Program.  Ancillary propagation of a covered work occurring solely
+as a consequence of using peer-to-peer transmission to receive a copy likewise
+does not require acceptance.  However, nothing other than this License grants
+you permission to propagate or modify any covered work.  These actions infringe
+copyright if you do not accept this License.  Therefore, by modifying or propagating
 a covered work, you indicate your acceptance of this License to do so.
 
-   10. Automatic Licensing of Downstream Recipients.
+10. Automatic Licensing of Downstream Recipients.
 
 Each time you convey a covered work, the recipient automatically receives
 a license from the original licensors, to run, modify and propagate that work,
-subject to this License. You are not responsible for enforcing compliance
+subject to this License.  You are not responsible for enforcing compliance
 by third parties with this License.
 
 An "entity transaction" is a transaction transferring control of an organization,
 or substantially all assets of one, or subdividing an organization, or merging
-organizations. If propagation of a covered work results from an entity transaction,
+organizations.  If propagation of a covered work results from an entity transaction,
 each party to that transaction who receives a copy of the work also receives
 whatever licenses to the work the party's predecessor in interest had or could
 give under the previous paragraph, plus a right to possession of the Corresponding
@@ -411,17 +403,17 @@ Source of the work from the predecessor in interest, if the predecessor has
 it or can get it with reasonable efforts.
 
 You may not impose any further restrictions on the exercise of the rights
-granted or affirmed under this License. For example, you may not impose a
+granted or affirmed under this License.  For example, you may not impose a
 license fee, royalty, or other charge for exercise of rights granted under
 this License, and you may not initiate litigation (including a cross-claim
 or counterclaim in a lawsuit) alleging that any patent claim is infringed
 by making, using, selling, offering for sale, or importing the Program or
 any portion of it.
 
-   11. Patents.
+11. Patents.
 
 A "contributor" is a copyright holder who authorizes use under this License
-of the Program or a work on which the Program is based. The work thus licensed
+of the Program or a work on which the Program is based.  The work thus licensed
 is called the contributor's "contributor version".
 
 A contributor's "essential patent claims" are all patent claims owned or controlled
@@ -429,7 +421,7 @@ by the contributor, whether already acquired or hereafter acquired, that would
 be infringed by some manner, permitted by this License, of making, using,
 or selling its contributor version, but do not include claims that would be
 infringed only as a consequence of further modification of the contributor
-version. For purposes of this definition, "control" includes the right to
+version.  For purposes of this definition, "control" includes the right to
 grant patent sublicenses in a manner consistent with the requirements of this
 License.
 
@@ -440,7 +432,7 @@ of its contributor version.
 
 In the following three paragraphs, a "patent license" is any express agreement
 or commitment, however denominated, not to enforce a patent (such as an express
-permission to practice a patent or covenant not to s ue for patent infringement).
+permission to practice a patent or covenant not to sue for patent infringement).
 To "grant" such a patent license to a party means to make such an agreement
 or commitment not to enforce a patent against the party.
 
@@ -452,8 +444,7 @@ cause the Corresponding Source to be so available, or (2) arrange to deprive
 yourself of the benefit of the patent license for this particular work, or
 (3) arrange, in a manner consistent with the requirements of this License,
 to extend the patent
-
-license to downstream recipients. "Knowingly relying" means you have actual
+license to downstream recipients.  "Knowingly relying" means you have actual
 knowledge that, but for the patent license, your conveying the covered work
 in a country, or your recipient's use of the covered work in a country, would
 infringe one or more identifiable patents in that country that you have reason
@@ -484,27 +475,26 @@ Nothing in this License shall be construed as excluding or limiting any implied
 license or other defenses to infringement that may otherwise be available
 to you under applicable patent law.
 
-   12. No Surrender of Others' Freedom.
+12. No Surrender of Others' Freedom.
 
 If conditions are imposed on you (whether by court order, agreement or otherwise)
 that contradict the conditions of this License, they do not excuse you from
-the conditions of this License. If you cannot convey a covered work so as
+the conditions of this License.  If you cannot convey a covered work so as
 to satisfy simultaneously your obligations under this License and any other
 pertinent obligations, then as a consequence you may
-
-not convey it at all. For example, if you agree to terms that obligate you
+not convey it at all.  For example, if you agree to terms that obligate you
 to collect a royalty for further conveying from those to whom you convey the
 Program, the only way you could satisfy both those terms and this License
 would be to refrain entirely from conveying the Program.
 
-   13. Remote Network Interaction; Use with the GNU General Public License.
+13. Remote Network Interaction; Use with the GNU General Public License.
 
 Notwithstanding any other provision of this License, if you modify the Program,
 your modified version must prominently offer all users interacting with it
 remotely through a computer network (if your version supports such interaction)
 an opportunity to receive the Corresponding Source of your version by providing
 access to the Corresponding Source from a network server at no charge, through
-some standard or customary means of facilitating copying of software. This
+some standard or customary means of facilitating copying of software.  This
 Corresponding Source shall include the Corresponding Source for any work covered
 by version 3 of the GNU General Public License that is incorporated pursuant
 to the following paragraph.
@@ -512,22 +502,22 @@ to the following paragraph.
 Notwithstanding any other provision of this License, you have permission to
 link or combine any covered work with a work licensed under version 3 of the
 GNU General Public License into a single combined work, and to convey the
-resulting work. The terms of this License will continue to apply to the part
+resulting work.  The terms of this License will continue to apply to the part
 which is the covered work, but the work with which it is combined will remain
 governed by version 3 of the GNU General Public License.
 
-   14. Revised Versions of this License.
+14. Revised Versions of this License.
 
 The Free Software Foundation may publish revised and/or new versions of the
-GNU Affero General Public License from time to time. Such new versions will
+GNU Affero General Public License from time to time.  Such new versions will
 be similar in spirit to the present version, but may differ in detail to address
 new problems or concerns.
 
-Each version is given a distinguishing version number. If the Program specifies
+Each version is given a distinguishing version number.  If the Program specifies
 that a certain numbered version of the GNU Affero General Public License "or
 any later version" applies to it, you have the option of following the terms
 and conditions either of that numbered version or of any later version published
-by the Free Software Foundation. If the Program does not specify a version
+by the Free Software Foundation.  If the Program does not specify a version
 number of the GNU Affero General Public License, you may choose any version
 ever published by the Free Software Foundation.
 
@@ -536,22 +526,22 @@ the GNU Affero General Public License can be used, that proxy's public statement
 of acceptance of a version permanently authorizes you to choose that version
 for the Program.
 
-Later license versions may give you additional or different permissions. However,
-no additional obligations are imposed on any author or copyright holder as
-a result of your choosing to follow a later version.
+Later license versions may give you additional or different permissions. 
+However, no additional obligations are imposed on any author or copyright
+holder as a result of your choosing to follow a later version.
 
-   15. Disclaimer of Warranty.
+15. Disclaimer of Warranty.
 
 THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE
-LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
 OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER
 EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM
-PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR
-CORRECTION.
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK
+AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR
+OR CORRECTION.
 
-   16. Limitation of Liability.
+16. Limitation of Liability.
 
 IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL
 ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS THE PROGRAM
@@ -562,29 +552,29 @@ INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE
 PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER
 PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
 
-   17. Interpretation of Sections 15 and 16.
+17. Interpretation of Sections 15 and 16.
 
 If the disclaimer of warranty and limitation of liability provided above cannot
 be given local legal effect according to their terms, reviewing courts shall
 apply local law that most closely approximates an absolute waiver of all civil
 liability in connection with the Program, unless a warranty or assumption
-of liability accompanies a copy of the Program in return for a fee. END OF
-TERMS AND CONDITIONS
+of liability accompanies a copy of the Program in return for a fee.
 
-How to Apply These Terms to Your New Programs
+END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
 
 If you develop a new program, and you want it to be of the greatest possible
 use to the public, the best way to achieve this is to make it free software
 which everyone can redistribute and change under these terms.
 
-To do so, attach the following notices to the program. It is safest to attach
+To do so, attach the following notices to the program.  It is safest to attach
 them to the start of each source file to most effectively state the exclusion
 of warranty; and each file should have at least the "copyright" line and a
 pointer to where the full notice is found.
 
-<one line to give the program's name and a brief idea of what it does.>
-
-Copyright (C) <year> <name of author>
+     <one line to give the program's name and a brief idea of what it does.>
+     Copyright (C) <year>  <name of author>
 
 This program is free software: you can redistribute it and/or modify it under
 the terms of the GNU Affero General Public License as published by the Free
@@ -593,21 +583,21 @@ any later version.
 
 This program is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
+FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more
 details.
 
 You should have received a copy of the GNU Affero General Public License along
-with this program. If not, see <https://www.gnu.org/licenses/>.
+with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 Also add information on how to contact you by electronic and paper mail.
 
 If your software can interact with users remotely through a computer network,
 you should also make sure that it provides a way for users to get its source.
 For example, if your program is a web application, its interface could display
-a "Source" link that leads users to an archive of the code. There are many
+a "Source" link that leads users to an archive of the code.  There are many
 ways you could offer source, and different solutions will be better for different
 programs; see section 13 for the specific requirements.
 
 You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary. For
-more information on this, and how to apply and follow the GNU AGPL, see <https://www.gnu.org/licenses/>.
+more information on this, and how to apply and follow the GNU AGPL, see <http://www.gnu.org/licenses/>.
diff --git a/options/license/AMDPLPA b/options/license/AMDPLPA
index 48e58609fa..cba8d093eb 100644
--- a/options/license/AMDPLPA
+++ b/options/license/AMDPLPA
@@ -1,5 +1,4 @@
 Copyright (c) 2006, 2007 Advanced Micro Devices, Inc.
-
 All rights reserved.
 
 Redistribution and use in any form of this material and any product thereof
diff --git a/options/license/ANTLR-PD-fallback b/options/license/ANTLR-PD-fallback
new file mode 100644
index 0000000000..37e810432d
--- /dev/null
+++ b/options/license/ANTLR-PD-fallback
@@ -0,0 +1,21 @@
+ANTLR 2 License
+
+We reserve no legal rights to the ANTLR--it is fully in the public domain.
+An individual or company may do whatever they wish with source code distributed
+with ANTLR or the code generated by ANTLR, including the incorporation of
+ANTLR, or its output, into commerical software.
+
+We encourage users to develop software with ANTLR. However, we do ask that
+credit is given to us for developing ANTLR. By "credit", we mean that if you
+use ANTLR or incorporate any source code into one of your programs (commercial
+product, research project, or otherwise) that you acknowledge this fact somewhere
+in the documentation, research report, etc... If you like ANTLR and have developed
+a nice tool with the output, please mention that you developed it using ANTLR.
+In addition, we ask that the headers remain intact in our source code. As
+long as these guidelines are kept, we expect to continue enhancing this system
+and expect to make other tools available as they are completed.
+
+In countries where the Public Domain status of the work may not be valid,
+the author grants a copyright licence to the general public to deal in the
+work without restriction and permission to sublicence derivates under the
+terms of any (OSI approved) Open Source licence.
diff --git a/options/license/APL-1.0 b/options/license/APL-1.0
index 3b40002561..4fe4111fec 100644
--- a/options/license/APL-1.0
+++ b/options/license/APL-1.0
@@ -1,5 +1,4 @@
 ADAPTIVE PUBLIC LICENSE
-
 Version 1.0
 
 THE LICENSED WORK IS PROVIDED UNDER THE TERMS OF THIS ADAPTIVE PUBLIC LICENSE
@@ -21,13 +20,12 @@ of law and jurisdiction see Part 3 of Exhibit A; (b) for the selected definition
 of Third Party see Part 4 of Exhibit A; and (c) for selected patent licensing
 terms (if any) see Section 2.2 below and Part 6 of Exhibit A.
 
-   1. DEFINITIONS.
+1. DEFINITIONS.
 
-      1.1. "CONTRIBUTION" means:
+1.1. "CONTRIBUTION" means:
 
 (a) In the case of the Initial Contributor, the Initial Work distributed under
 this License by the Initial Contributor; and
-
 (b) In the case of each Subsequent Contributor, the Subsequent Work originating
 from and distributed by such Subsequent Contributor.
 
@@ -70,7 +68,7 @@ thereof with code not governed by this License.
 1.11. "LICENSED WORK" means the Initial Work and/or any Subsequent Work, in
 each case including portions thereof.
 
-      1.12. "LICENSE NOTICE" has the meaning assigned in Part 5 of Exhibit A.
+1.12. "LICENSE NOTICE" has the meaning assigned in Part 5 of Exhibit A.
 
 1.13. "MODIFICATION" or "MODIFICATIONS" means any change to and/or addition
 to the Licensed Work.
@@ -94,12 +92,9 @@ Work to at least one Third Party.
 1.18. "SUBSEQUENT WORK" means a work that has resulted or arises from changes
 to and/or additions to:
 
-         (a) the Initial Work;
-
-         (b) any other Subsequent Work; or
-
+     (a) the Initial Work;
+     (b) any other Subsequent Work; or
 (c) to any combination of the Initial Work and any such other Subsequent Work;
-
 where such changes and/or additions originate from a Subsequent Contributor.
 A Subsequent Work will "originate" from a Subsequent Contributor if the Subsequent
 Work was a result of efforts by such Subsequent Contributor (or anyone acting
@@ -111,11 +106,11 @@ capture within its meaning any Independent Module.
 1.19. "SUPPLEMENT FILE" means a file distributed with the Licensed Work having
 a file name "suppfile.txt".
 
-      1.20. "THIRD PARTY" has the meaning assigned in Part 4 of Exhibit A.
+1.20. "THIRD PARTY" has the meaning assigned in Part 4 of Exhibit A.
 
-   2. LICENSE.
+2. LICENSE.
 
-      2.1. COPYRIGHT LICENSE FROM INITIAL AND SUBSEQUENT CONTRIBUTORS.
+2.1. COPYRIGHT LICENSE FROM INITIAL AND SUBSEQUENT CONTRIBUTORS.
 
 (a) Subject to the terms of this License, the Initial Contributor hereby grants
 each Recipient a world-wide, royalty-free, non-exclusive copyright license
@@ -123,10 +118,8 @@ to:
 
 (i) reproduce, prepare derivative works of, publicly display, publicly perform,
 distribute and sublicense the Initial Work; and
-
 (ii) reproduce, publicly display, publicly perform, distribute, and sublicense
 any derivative works (if any) prepared by Recipient;
-
 in Source Code and Executable form, either with other Modifications, on an
 unmodified basis, or as part of a Larger Work.
 
@@ -137,14 +130,12 @@ license to:
 (i) reproduce, prepare derivative works of, publicly display, publicly perform,
 distribute and sublicense the Subsequent Work of such Subsequent Contributor;
 and
-
 (ii) reproduce, publicly display, publicly perform, distribute, and sublicense
 any derivative works (if any) prepared by Recipient;
-
 in Source Code and Executable form, either with other Modifications, on an
 unmodified basis, or as part of a Larger Work.
 
-      2.2. PATENT LICENSE FROM INITIAL AND SUBSEQUENT CONTRIBUTORS.
+2.2. PATENT LICENSE FROM INITIAL AND SUBSEQUENT CONTRIBUTORS.
 
 (a) This License does not include or grant any patent license whatsoever from
 the Initial Contributor, Subsequent Contributor, or any Distributor unless,
@@ -154,7 +145,6 @@ to Part 6 of Exhibit A the patent terms in paragraphs A, B, C, D and E from
 Part 6 of Exhibit A. If this is not done then the Initial Work and any other
 Subsequent Work is made available under the License without any patent license
 (the "PATENTS-EXCLUDED LICENSE").
-
 (b) However, the Initial Contributor may subsequently distribute or make available
 (as the case may be) future copies of: (1) the Initial Work; or (2) any Licensed
 Work distributed by the Initial Contributor which includes the Initial Work
@@ -164,7 +154,6 @@ LICENSE") by selecting pursuant to Part 6 of Exhibit A the patent terms in
 paragraphs A, B, C, D and E from Part 6 of Exhibit A, when the Initial Contributor
 distributes or makes available (as the case may be) such future copies under
 this License.
-
 (c) If any Recipient receives or obtains one or more copies of the Initial
 Work or any other portion of the Licensed Work under the Patents-Included
 License, then all licensing of such copies under this License shall include
@@ -177,7 +166,6 @@ license with respect to such copies received under the Patents-Excluded License
 and availability and distribution of such copies, including Modifications
 made by such Recipient to such copies, shall be under a copy of the License
 without any patent license.
-
 (d) Where a Recipient uses in combination or combines any copy of the Licensed
 Work (or portion thereof) licensed under a copy of the License having a Patents-Excluded
 License with any copy of the Licensed Work (or portion thereof) licensed under
@@ -188,8 +176,7 @@ to only the terms of the License having the Patents-Included License which
 shall include the terms in paragraphs A, B, C, D and E from Part 6 of Exhibit
 A.
 
-      2.3. ACKNOWLEDGEMENT AND DISCLAIMER.
-
+2.3. ACKNOWLEDGEMENT AND DISCLAIMER.
 Recipient understands and agrees that although Initial Contributor and each
 Subsequent Contributor grants the licenses to its Contributions set forth
 herein, no representation, warranty, guarantee or assurance is provided by
@@ -205,16 +192,15 @@ limiting the foregoing disclaimers, if a third party patent license is required
 to allow Recipient to distribute the Licensed Work, it is Recipient's responsibility
 to acquire that license before distributing the Licensed Work.
 
-      2.4. RESERVATION.
-
+2.4. RESERVATION.
 Nothing in this License shall be deemed to grant any rights to trademarks,
 copyrights, patents, trade secrets or any other intellectual property of Initial
 Contributor, Subsequent Contributor, or Distributor except as expressly stated
 herein.
 
-   3. DISTRIBUTION OBLIGATIONS.
+3. DISTRIBUTION OBLIGATIONS.
 
-      3.1. DISTRIBUTION GENERALLY.
+3.1. DISTRIBUTION GENERALLY.
 
 (a) A Subsequent Contributor shall make that Subsequent Contributor's Subsequent
 Work(s) available to the public via an Electronic Distribution Mechanism for
@@ -222,7 +208,6 @@ a period of at least twelve (12) months. The aforesaid twelve (12) month period
 shall begin within a reasonable time after the creation of the Subsequent
 Work and no later than sixty (60) days after first distribution of that Subsequent
 Contributor's Subsequent Work.
-
 (b) All Distributors must distribute the Licensed Work in accordance with
 the terms of the License, and must include a copy of this License (including
 without limitation Exhibit A and the accompanying Supplement File) with each
@@ -233,8 +218,7 @@ the beginning of all Source Code files, and viewable to a user in any executable
 such that the License Notice is reasonably brought to the attention of any
 party using the Licensed Work.
 
-      3.2. EXECUTABLE DISTRIBUTIONS OF THE LICENSED WORK.
-
+3.2. EXECUTABLE DISTRIBUTIONS OF THE LICENSED WORK.
 A Distributor may choose to distribute the Licensed Work, or any portion thereof,
 in Executable form (an "EXECUTABLE DISTRIBUTION") to any third party, under
 the terms of Section 2 of this License, provided the Executable Distribution
@@ -245,7 +229,6 @@ at least ONE of the following conditions is fulfilled:
 the Licensed Work making up the Executable Distribution, and the Source Code
 must be distributed on the same media as the Executable Distribution or using
 an Electronic Distribution Mechanism; or
-
 (b) The Executable Distribution must be accompanied with a written offer,
 valid for at least thirty six (36) months, to give any third party under the
 terms of this License, for a charge no more than the cost of physically performing
@@ -262,8 +245,7 @@ Work or portion thereof distributed to any third party in Executable form,
 whether such distribution is made alone, in combination with a Larger Work
 or Independent Modules, or in some other combination.
 
-      3.3. SOURCE CODE DISTRIBUTIONS.
-
+3.3. SOURCE CODE DISTRIBUTIONS.
 When a Distributor makes the Licensed Work, or any portion thereof, available
 to any Person in Source Code form, it must be made available under this License
 and a copy of this License must be included with each copy of the Source Code,
@@ -273,8 +255,7 @@ distribution of the Licensed Work in any Source Code form. A Distributor may
 charge a fee for the physical act of transferring a copy, which charge shall
 be no more than the cost of physically performing source distribution.
 
-      3.4. REQUIRED NOTICES IN SOURCE CODE.
-
+3.4. REQUIRED NOTICES IN SOURCE CODE.
 Each Subsequent Contributor must ensure that the notice set out in Part 5
 of Exhibit A is included in each file of the Source Code for each Subsequent
 Work originating from that particular Subsequent Contributor, if such notice
@@ -284,8 +265,7 @@ Contributor must include such notice in a location (such as a relevant directory
 in which the file is stored) where a user would be likely to look for such
 a notice.
 
-      3.5. NO DISTRIBUTION REQUIREMENTS FOR INTERNALLY USED MODIFICATIONS.
-
+3.5. NO DISTRIBUTION REQUIREMENTS FOR INTERNALLY USED MODIFICATIONS.
 Notwithstanding Sections 3.2, 3.3 and 3.4, Recipient may, internally within
 its own corporation or organization use the Licensed Work, including the Initial
 Work and Subsequent Works, and make Modifications for internal use within
@@ -303,15 +283,13 @@ Subsequent Contributor, and shall from the first such instance become part
 of the Licensed Work that must thereafter be distributed and made available
 to third parties in accordance with the terms of Sections 3.1 to 3.4 inclusive.
 
-      3.6. INDEPENDENT MODULES.
-
+3.6. INDEPENDENT MODULES.
 This License shall not apply to Independent Modules of any Initial Contributor,
 Subsequent Contributor, Distributor or any Recipient, and such Independent
 Modules may be licensed or made available under one or more separate license
 agreements.
 
-      3.7. LARGER WORKS.
-
+3.7. LARGER WORKS.
 Any Distributor or Recipient may create or contribute to a Larger Work by
 combining any of the Licensed Work with other code not governed by the terms
 of this License, and may distribute the Larger Work as one or more products.
@@ -319,7 +297,7 @@ However, in any such case, Distributor or Recipient (as the case may be) must
 make sure that the requirements of this License are fulfilled for the Licensed
 Work portion of the Larger Work.
 
-      3.8. DESCRIPTION OF DISTRIBUTED MODIFICATIONS.
+3.8. DESCRIPTION OF DISTRIBUTED MODIFICATIONS.
 
 (a) Each Subsequent Contributor (including the Initial Contributor where the
 Initial Contributor also qualifies as a Subsequent Contributor) must cause
@@ -330,14 +308,12 @@ the creation or contribution to that Subsequent Work. If no Supplement File
 exists or no requirements are set out in Part 1 of the Supplement File, then
 there are no requirements for Subsequent Contributors to document changes
 that they make resulting in Subsequent Works.
-
 (b) The Initial Contributor may at any time introduce requirements or add
 to or change earlier requirements (in each case, the "EARLIER DESCRIPTION
 REQUIREMENTS") for documenting changes resulting in Subsequent Works by revising
 Part 1 of each copy of the Supplement File distributed by the Initial Contributor
 with future copies of the Licensed Work so that Part 1 then contains new requirements
 (the "NEW DESCRIPTION REQUIREMENTS") for documenting such changes.
-
 (c) Any Recipient receiving at any time any copy of an Initial Work or any
 Subsequent Work under a copy of this License (in each case, an "Earlier LICENSED
 COPY") having the Earlier Description Requirements may choose, with respect
@@ -347,7 +323,6 @@ to comply with the New Description Requirements, that Recipient will, when
 thereafter distributing any copies of any such Earlier Licensed Copy, include
 a Supplement File having a section entitled Part 1 that contains a copy of
 the New Description Requirements.
-
 (d) For greater certainty, the intent of Part 1 of the Supplement File is
 to provide a mechanism (if any) by which Subsequent Contributors must document
 changes that they make to the Licensed Work resulting in Subsequent Works.
@@ -360,7 +335,6 @@ to comply with Part 1 of the Supplement File, but cannot be penalised with
 damages. Part 1 of any Supplement File is only binding on each Recipient of
 any Licensed Work to the extent Part 1 sets out the requirements for documenting
 changes to the Initial Work or any Subsequent Work.
-
 (e) An example of a set of requirements for documenting changes and contributions
 made by Subsequent Contributor is set out in Part 7 of Exhibit A of this License.
 Part 7 is a sample only and is not binding on Recipients, unless (subject
@@ -368,13 +342,12 @@ to the earlier paragraphs of this Section 3.8) those are the requirements
 that the Initial Contributor includes in Part 1 of the Supplement File with
 the copies of the Initial Work distributed under this License.
 
-      3.9. USE OF DISTRIBUTOR NAME.
-
+3.9. USE OF DISTRIBUTOR NAME.
 The name of a Distributor may not be used by any other Distributor to endorse
 or promote the Licensed Work or products derived from the Licensed Work, without
 prior written permission.
 
-      3.10. LIMITED RECOGNITION OF INITIAL CONTRIBUTOR.
+3.10. LIMITED RECOGNITION OF INITIAL CONTRIBUTOR.
 
 (a) As a modest attribution to the Initial Contributor, in the hope that its
 promotional value may help justify the time, money and effort invested in
@@ -393,18 +366,15 @@ than the following Attribution Information: (a) a copyright notice including
 the name of the Initial Contributor; (b) a word or one phrase (not exceeding
 10 words); (c) one digital image or graphic provided with the Initial Work;
 and (d) a URL (collectively, the "ATTRIBUTION LIMITS").
-
 (b) If no Supplement File exists, or no Attribution Information is set out
 in Part 2 of the Supplement File, then there are no requirements for Recipients
 to display any Attribution Information of the Initial Contributor.
-
 (c) Each Recipient acknowledges that all trademarks, service marks and/or
 trade names contained within Part 2 of the Supplement File distributed with
 the Licensed Work are the exclusive property of the Initial Contributor and
 may only be used with the permission of the Initial Contributor, or under
 circumstances otherwise permitted by law, or as expressly set out in this
 License.
-
 3.11. For greater certainty, any description or attribution provisions contained
 within a Supplement File may only be used to specify the nature of the description
 or attribution requirements, as the case may be. Any provision in a Supplement
@@ -412,10 +382,9 @@ File that otherwise purports to modify, vary, nullify or amend any right,
 obligation or representation contained herein shall be deemed void to that
 extent, and shall be of no force or effect.
 
-   4. COMMERCIAL USE AND INDEMNITY.
-
-      4.1. COMMERCIAL SERVICES.
+4. COMMERCIAL USE AND INDEMNITY.
 
+4.1. COMMERCIAL SERVICES.
 A Recipient ("COMMERCIAL RECIPIENT") may choose to offer, and to charge a
 fee for, warranty, support, indemnity or liability obligations (collectively,
 "SERVICES") to one or more other Recipients or Distributors. However, such
@@ -433,8 +402,7 @@ royalty-free (subject to the right to charge a fee of no more than the cost
 of physically performing Source Code or Executable distribution (as the case
 may be)).
 
-      4.2. INDEMNITY.
-
+4.2. INDEMNITY.
 Commercial distributors of software may accept certain responsibilities with
 respect to end users, business partners and the like. While this License is
 intended to facilitate the commercial use of the Licensed Work, the Distributor
@@ -456,15 +424,13 @@ allow the Commercial Distributor to control, and co-operate with the Commercial
 Distributor in, the defense and any related settlement negotiations. The Indemnified
 Party may participate in any such claim at its own expense.
 
-   5. VERSIONS OF THE LICENSE.
-
-      5.1. NEW VERSIONS.
+5. VERSIONS OF THE LICENSE.
 
+5.1. NEW VERSIONS.
 The Initial Contributor may publish revised and/or new versions of the License
 from time to time. Each version will be given a distinguishing version number.
 
-      5.2. EFFECT OF NEW VERSIONS.
-
+5.2. EFFECT OF NEW VERSIONS.
 Once the Licensed Work or any portion thereof has been published by Initial
 Contributor under a particular version of the License, Recipient may choose
 to continue to use it under the terms of that version. However, if a Recipient
@@ -477,10 +443,9 @@ by the Recipient in connection with the Licensed Work. No one other than the
 Initial Contributor has the right to modify the terms applicable to the Licensed
 Work
 
-   6. DISCLAIMER OF WARRANTY.
-
-      6.1. GENERAL DISCLAIMER.
+6. DISCLAIMER OF WARRANTY.
 
+6.1. GENERAL DISCLAIMER.
 EXCEPT AS EXPRESSLY SET FORTH IN THIS LICENSE, THE LICENSED WORK IS PROVIDED
 UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT ANY REPRESENTATION, WARRANTY,
 GUARANTEE, ASSURANCE OR CONDITION OF ANY KIND, EITHER EXPRESSED OR IMPLIED,
@@ -493,8 +458,7 @@ SERVICING, REPAIR OR CORRECTION. THIS CLAUSE CONSTITUTES AN ESSENTIAL PART
 OF THIS LICENSE. NO USE OF ANY LICENSED WORK IS AUTHORIZED HEREUNDER EXCEPT
 UNDER THIS LICENSE INCLUDING WITHOUT LIMITATION THIS DISCLAIMER.
 
-      6.2. RESPONSIBILITY OF RECIPIENTS.
-
+6.2. RESPONSIBILITY OF RECIPIENTS.
 Each Recipient is solely responsible for determining the appropriateness of
 using and distributing the Licensed Work and assumes all risks associated
 with its exercise of rights under this License, including but not limited
@@ -502,7 +466,7 @@ to the risks and costs of program errors, compliance with applicable laws,
 damage to or loss of data, programs or equipment, and unavailability or interruption
 of operations.
 
-   7. TERMINATION.
+7. TERMINATION.
 
 7.1. This License shall continue until terminated in accordance with the express
 terms herein.
@@ -537,7 +501,7 @@ Recipient, Sections 4.1, 4.2, 6.1, 6.2, 7.4, 7.5, 8.1, and 8.2, together with
 all provisions of this License necessary for the interpretation and enforcement
 of same, shall expressly survive such termination.
 
-   8. LIMITATION OF LIABILITY.
+8. LIMITATION OF LIABILITY.
 
 8.1. IN NO EVENT SHALL ANY OF INITIAL CONTRIBUTOR, ITS SUBSIDIARIES, OR AFFILIATES,
 OR ANY OF ITS OR THEIR RESPECTIVE OFFICERS, DIRECTORS, EMPLOYEES, AND/OR AGENTS
@@ -570,7 +534,7 @@ OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY
 FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE
 EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION.
 
-   9. GOVERNING LAW AND LEGAL ACTION.
+9. GOVERNING LAW AND LEGAL ACTION.
 
 9.1. This License shall be governed by and construed in accordance with the
 laws of the Governing Jurisdiction assigned in Part 3 of Exhibit A, without
@@ -596,7 +560,7 @@ prevailing party shall be entitled to recover all costs and expenses including
 the fees of its attorneys in such action or proceeding in such amount as the
 court may adjudge reasonable.
 
-   10. MISCELLANEOUS.
+10. MISCELLANEOUS.
 
 10.1. The obligations imposed by this License are for the benefit of the Initial
 Contributor and any Recipient, and each Recipient acknowledges and agrees
@@ -633,45 +597,37 @@ this License, is not limiting whether or not non-limiting language (such as
 used with reference thereto.
 
 10.8. The parties hereto acknowledge they have expressly required that this
-License and notices relating thereto be drafted in the English language. //***THE
-LICENSE TERMS END HERE (OTHER THAN AS SET OUT IN EXHIBIT A).***//
+License and notices relating thereto be drafted in the English language.
+
+//***THE LICENSE TERMS END HERE (OTHER THAN AS SET OUT IN EXHIBIT A).***//
 
 EXHIBIT A (to the Adaptive Public License)
 
-   PART 1: INITIAL CONTRIBUTOR AND DESIGNATED WEB SITE
+PART 1: INITIAL CONTRIBUTOR AND DESIGNATED WEB SITE
 
-   The Initial Contributor is:
+The Initial Contributor is:
+____________________________________________________
+ 
+[Enter full name of Initial Contributor]
 
-   ________________________________________________
+Address of Initial Contributor:
+________________________________________________
+ 
+________________________________________________
+ 
+________________________________________________
+ 
+[Enter address above]
 
-   [Enter full name of Initial Contributor]
-
-   
-
-   Address of Initial Contributor:
-
-   ________________________________________________
-
-   ________________________________________________
-
-   ________________________________________________
-
-   [Enter address above]
-
-   
-
-   The Designated Web Site is:
-
-   ________________________________________________
-
-   [Enter URL for Designated Web Site of Initial Contributor]
-
-   
+The Designated Web Site is:
+__________________________________________________
+ 
+[Enter URL for Designated Web Site of Initial Contributor]
 
 NOTE: The Initial Contributor is to complete this Part 1, along with Parts
 2, 3, and 5, and, if applicable, Parts 4 and 6.
 
-   PART 2: INITIAL WORK
+PART 2: INITIAL WORK
 
 The Initial Work comprises the computer program(s) distributed by the Initial
 Contributor having the following title(s): _______________________________________________.
@@ -679,12 +635,12 @@ Contributor having the following title(s): _____________________________________
 The date on which the Initial Work was first available under this License:
 _________________
 
-   PART 3: GOVERNING JURISDICTION
+PART 3: GOVERNING JURISDICTION
 
 For the purposes of this License, the Governing Jurisdiction is _________________________________________________.
-[Initial Contributor to Enter Governing Jurisdiction here]
+
[Initial Contributor to Enter Governing Jurisdiction here]
 
-   PART 4: THIRD PARTIES
+PART 4: THIRD PARTIES
 
 For the purposes of this License, "Third Party" has the definition set forth
 below in the ONE paragraph selected by the Initial Contributor from paragraphs
@@ -692,52 +648,43 @@ A, B, C, D and E when the Initial Work is distributed or otherwise made availabl
 by the Initial Contributor. To select one of the following paragraphs, the
 Initial Contributor must place an "X" or "x" in the selection box alongside
 the one respective paragraph selected.
-
-   SELECTION
-
-   BOX PARAGRAPH
-
-      
-
-      [ ] A. "THIRD PARTY" means any third party.
-
-      
-
-[ ] B. "THIRD PARTY" means any third party except for any of the following:
+SELECTION
+ 
+BOX   PARAGRAPH
+[  ]  A. "THIRD PARTY" means any third party.
+ 
+ 
+[  ]  B. "THIRD PARTY" means any third party except for any of the following:
 (a) a wholly owned subsidiary of the Subsequent Contributor in question; (b)
 a legal entity (the "PARENT") that wholly owns the Subsequent Contributor
 in question; or (c) a wholly owned subsidiary of the wholly owned subsidiary
 in (a) or of the Parent in (b).
-
-      
-
-[ ] C. "THIRD PARTY" means any third party except for any of the following:
+ 
+ 
+[  ]  C. "THIRD PARTY" means any third party except for any of the following:
 (a) any Person directly or indirectly owning a majority of the voting interest
 in the Subsequent Contributor or (b) any Person in which the Subsequent Contributor
 directly or indirectly owns a majority voting interest.
-
-      
-
-[ ] D. "THIRD PARTY" means any third party except for any Person directly
+ 
+ 
+[  ]  D. "THIRD PARTY" means any third party except for any Person directly
 or indirectly controlled by the Subsequent Contributor. For purposes of this
 definition, "control" shall mean the power to direct or cause the direction
 of, the management and policies of such Person whether through the ownership
 of voting interests, by contract, or otherwise.
-
-      
-
-[ ] E. "THIRD PARTY" means any third party except for any Person directly
+ 
+ 
+[  ]  E. "THIRD PARTY" means any third party except for any Person directly
 or indirectly controlling, controlled by, or under common control with the
 Subsequent Contributor. For purposes of this definition, "control" shall mean
 the power to direct or cause the direction of, the management and policies
 of such Person whether through the ownership of voting interests, by contract,
 or otherwise.
-
 The default definition of "THIRD PARTY" is the definition set forth in paragraph
 A, if NONE OR MORE THAN ONE of paragraphs A, B, C, D or E in this Part 4 are
 selected by the Initial Contributor.
 
-   PART 5: NOTICE
+PART 5: NOTICE
 
 THE LICENSED WORK IS PROVIDED UNDER THE TERMS OF THE ADAPTIVE PUBLIC LICENSE
 ("LICENSE") AS FIRST COMPLETED BY: ______________________ [Insert the name
@@ -755,22 +702,16 @@ Software distributed under the License is distributed on an "AS IS" basis,
 WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
 the specific language governing rights and limitations under the License.
 
-   PART 6: PATENT LICENSING TERMS
+PART 6: PATENT LICENSING TERMS
 
 For the purposes of this License, paragraphs A, B, C, D and E of this Part
 6 of Exhibit A are only incorporated and form part of the terms of the License
 if the Initial Contributor places an "X" or "x" in the selection box alongside
 the YES answer to the question immediately below.
 
-   Is this a Patents-Included License pursuant to Section 2.2 of the License?
-
-      
-
-      YES [ ]
-
-      
-
-      NO [ ]
+Is this a Patents-Included License pursuant to Section 2.2 of the License?
+YES   [      ]
+NO    [      ]
 
 By default, if YES is not selected by the Initial Contributor, the answer
 is NO.
@@ -803,15 +744,11 @@ exporting, transfer or disposal of any such Modifications made by that Subsequen
 Contributor alone and/or in combination with its Subsequent Work (or portions
 of such combination) to make, use, sell, offer for sale, have made, import,
 export, transfer and otherwise dispose of:
-
 (1) Modifications made by that Subsequent Contributor (or portions thereof);
 and
-
 (2) the combination of Modifications made by that Subsequent Contributor with
 its Subsequent Work (or portions of such combination);
-
-         (collectively and in each case, the "SUBSEQUENT CONTRIBUTOR VERSION").
-
+(collectively and in each case, the "SUBSEQUENT CONTRIBUTOR VERSION").
 Notwithstanding the foregoing, no patent license is granted under this Paragraph
 C by such Subsequent Contributor: (1) for any code that such Subsequent Contributor
 deletes from the Subsequent Contributor Version (or any portion thereof) distributed
@@ -852,12 +789,11 @@ by Recipient upon License termination. License termination is only effective
 with respect to patents and/or copyrights for which proper notice has been
 given.
 
-   PART 7: SAMPLE REQUIREMENTS FOR THE DESCRIPTION OF DISTRIBUTED MODIFICATIONS
+PART 7: SAMPLE REQUIREMENTS FOR THE DESCRIPTION OF DISTRIBUTED MODIFICATIONS
 
 Each Subsequent Contributor (including the Initial Contributor where the Initial
 Contributor qualifies as a Subsequent Contributor) is invited (but not required)
 to cause each Subsequent Work created or contributed to by that Subsequent
 Contributor to contain a file documenting the changes such Subsequent Contributor
-made to create that Subsequent Work and the date of any change.
-
-//***EXHIBIT A ENDS HERE.***//
+made to create that Subsequent Work and the date of any change. //***EXHIBIT
+A ENDS HERE.***//
diff --git a/options/license/APSL-1.0 b/options/license/APSL-1.0
index ee17bc90c6..4b6f22d7a8 100644
--- a/options/license/APSL-1.0
+++ b/options/license/APSL-1.0
@@ -1,9 +1,10 @@
 APPLE PUBLIC SOURCE LICENSE
+Version 1.0 - March 16, 1999
 
-Version 1.0 - March 16, 1999 Please read this License carefully before downloading
-this software. By downloading and using this software, you are agreeing to
-be bound by the terms of this License. If you do not or cannot agree to the
-terms of this License, please do not download or use the software.
+Please read this License carefully before downloading this software. By downloading
+and using this software, you are agreeing to be bound by the terms of this
+License. If you do not or cannot agree to the terms of this License, please
+do not download or use the software.
 
 1. General; Definitions. This License applies to any program or other work
 which Apple Computer, Inc. ("Apple") publicly announces as subject to this
@@ -87,7 +88,7 @@ Code you used, prominently include a file carrying such information with the
 Modifications, and duplicate the notice in Exhibit A in each file of the Source
 Code of all such Modifications.
 
-      2.2 You may Deploy Covered Code, provided that You must in each instance:
+     2.2 You may Deploy Covered Code, provided that You must in each instance:
 
 (a) satisfy all the conditions of Section 2.1 with respect to the Source Code
 of the Covered Code;
@@ -175,7 +176,7 @@ aircraft navigation, communication systems, or air traffic control machines
 in which case the failure of the Original Code could lead to death, personal
 injury, or severe physical or environmental damage.
 
-   9. Liability.
+9. Liability.
 
 9.1 Infringement. If any of the Original Code becomes the subject ofa claim
 of infringement ("Affected Original Code"), Apple may, at its sole discretion
@@ -200,7 +201,6 @@ or trade names "Apple", "Apple Computer", "Mac OS X", "Mac OS X Server" or
 any other trademarks or trade names belonging to Apple (collectively "Apple
 Marks") and no Apple Marks may be used to endorse or promote products derived
 from the Original Code
-
 other than as permitted by and in strict compliance at all times with Apple's
 third party trademark usage guidelines which are posted at http://www.apple.com/legal/guidelinesfor3rdparties.html.
 
@@ -213,7 +213,7 @@ in this License or may choose not to license them at all. Apple's development,
 use, reproduction, modification, sublicensing and distribution of Covered
 Code will not be subject to this License.
 
-   12. Termination.
+12. Termination.
 
 12.1 Termination. This License and the rights granted hereunder will terminate:
 
@@ -232,7 +232,6 @@ any further use, reproduction, modification and distribution of the Covered
 Code, or Affected Original Code in the case of termination under Section 9.1,
 and to destroy all copies of the Covered Code or Affected Original Code (in
 the case of
-
 termination under Section 9.1) that are in your possession or control. All
 sublicenses to the Covered Code which have been properly granted prior to
 termination shall survive any termination of this License. Provisions which,
@@ -243,7 +242,7 @@ or damages of any sort solely as a result of terminating this License in accorda
 with its terms, and termination of this License will be without prejudice
 to any other right or remedy of either party.
 
-   13. Miscellaneous.
+13. Miscellaneous.
 
 13.1 Export Law Assurances. You may not use or otherwise export or re-export
 the Original Code except as authorized by United States law and the laws of
@@ -260,7 +259,6 @@ in FAR 2.101. Government software and technical data rights in the Covered
 Code include only those rights customarily provided to the public as defined
 in this License. This customary commercial license in technical data and software
 is provided in
-
 accordance with FAR 12.211 (Technical Data) and 12.212 (Computer Software)
 and, for Department of Defense purchases, DFAR 252.227-7015 (Technical Data
 -- Commercial Items) and 227.7202-3 (Rights in Commercial Computer Software
@@ -310,6 +308,7 @@ Where You are located in the province of Quebec, Canada, the following clause
 applies: The parties hereby confirm that they have requested that this License
 and all related documents be drafted in English. Les parties ont exige que
 le present contrat et tous les documents connexes soient rediges en anglais.
+
 EXHIBIT A.
 
 "Portions Copyright (c) 1999 Apple Computer, Inc. All Rights Reserved. This
diff --git a/options/license/APSL-1.1 b/options/license/APSL-1.1
index d065abe07b..5f6c5312b4 100644
--- a/options/license/APSL-1.1
+++ b/options/license/APSL-1.1
@@ -1,18 +1,17 @@
 APPLE PUBLIC SOURCE LICENSE
+Version 1.1 - April 19,1999
 
-Version 1.1 - April 19, 1999 Please read this License carefully before downloading
-this software.
-
+Please read this License carefully before downloading this software.
 By downloading and using this software, you are agreeing to be bound by the
-terms of this License. If you do not or cannot agree to the terms of this
+terms of this License.  If you do not or cannot agree to the terms of this
 License, please do not download or use the software.
 
-1. General; Definitions. This License applies to any program or other work
+1. General; Definitions.  This License applies to any program or other work
 which Apple Computer, Inc. ("Apple") publicly announces as subject to this
 Apple Public Source License and which contains a notice placed by Apple identifying
 such program or work as "Original Code" and stating that it is subject to
 the terms of this Apple Public Source License version 1.1 (or subsequent version
-thereof), as it may be revised from time to time by Apple ("License"). As
+thereof), as it may be revised from time to time by Apple ("License").  As
 used in this License:
 
 1.1 "Affected Original Code" means only those specific portions of Original
@@ -41,11 +40,11 @@ or distribution of Covered Code by You to any third party in any form or manner.
 with code not governed by the terms of this License.
 
 1.6 "Modifications" mean any addition to, deletion from, and/or change to,
-the substance and/or structure of Covered Code. When code is released as a
-series of files, a Modification is: (a) any addition to or deletion from the
-contents of a file containing Covered Code; and/or (b) any new file or other
-representation of computer program statements that contains any part of Covered
-Code.
+the substance and/or structure of Covered Code.  When code is released as
+a series of files, a Modification is: (a) any addition to or deletion from
+the contents of a file containing Covered Code; and/or (b) any new file or
+other representation of computer program statements that contains any part
+of Covered Code.
 
 1.7 "Original Code" means (a) the Source Code of a program or other work as
 originally made available by Apple under this License, including the Source
@@ -60,14 +59,14 @@ contains, plus any associated interface definition files, scripts used to
 control compilation and installation of an executable (object code).
 
 1.9 "You" or "Your" means an individual or a legal entity exercising rights
-under this License. For legal entities, "You" or "Your" includes any entity
+under this License.  For legal entities, "You" or "Your" includes any entity
 which controls, is controlled by, or is under common control with, You, where
 "control" means (a) the power, direct or indirect, to cause the direction
 or management of such entity, whether by contract or otherwise, or (b) ownership
 of fifty percent (50%) or more of the outstanding shares or beneficial ownership
 of such entity.
 
-2. Permitted Uses; Conditions & Restrictions. Subject to the terms and conditions
+2. Permitted Uses; Conditions & Restrictions.  Subject to the terms and conditions
 of this License, Apple hereby grants You, effective on the date You accept
 this License and download the Original Code, a world-wide, royalty-free, non-
 exclusive license, to the extent of Apple's Applicable Patent Rights and copyrights
@@ -93,7 +92,7 @@ Code you used, prominently include a file carrying such information with the
 Modifications, and duplicate the notice in Exhibit A in each file of the Source
 Code of all such Modifications.
 
-      2.2 You may Deploy Covered Code, provided that You must in each instance:
+     2.2 You may Deploy Covered Code, provided that You must in each instance:
 
 (a) satisfy all the conditions of Section 2.1 with respect to the Source Code
 of the Covered Code;
@@ -116,8 +115,8 @@ a prominent notice, in the code itself as well as in related documentation,
 stating that Source Code of the Covered Code is available under the terms
 of this License with information on how and where to obtain such Source Code.
 
-3. Your Grants. In consideration of, and as a condition to, the licenses granted
-to You under this License:
+3. Your Grants.  In consideration of, and as a condition to, the licenses
+granted to You under this License:
 
 (a) You hereby grant to Apple and all third parties a non-exclusive, royalty-free
 license, under Your Applicable Patent Rights and other intellectual property
@@ -132,17 +131,17 @@ to use, reproduce, execute, compile, display, perform, modify or have modified
 (for Apple and/or its subsidiaries), sublicense and distribute Your Modifications,
 in any form, through multiple tiers of distribution.
 
-4. Larger Works. You may create a Larger Work by combining Covered Code with
+4. Larger Works.  You may create a Larger Work by combining Covered Code with
 other code not governed by the terms of this License and distribute the Larger
-Work as a single product. In each such instance, You must make sure the requirements
+Work as a single product.  In each such instance, You must make sure the requirements
 of this License are fulfilled for the Covered Code or any portion thereof.
 
-5. Limitations on Patent License. Except as expressly stated in Section 2,
-no other patent rights, express or implied, are granted by Apple herein. Modifications
-and/or Larger Works may require additional patent licenses from Apple which
-Apple may grant in its sole discretion.
+5. Limitations on Patent License.  Except as expressly stated in Section 2,
+no other patent rights, express or implied, are granted by Apple herein. 
+Modifications and/or Larger Works may require additional patent licenses from
+Apple which Apple may grant in its sole discretion.
 
-6. Additional Terms. You may choose to offer, and to charge a fee for, warranty,
+6. Additional Terms.  You may choose to offer, and to charge a fee for, warranty,
 support, indemnity or liability obligations and/or other rights consistent
 with the scope of the license granted herein ("Additional Terms") to one or
 more recipients of Covered Code. However, You may do so only on Your own behalf
@@ -152,39 +151,40 @@ alone, and You hereby agree to indemnify, defend and hold Apple harmless for
 any liability incurred by or claims asserted against Apple by reason of any
 such Additional Terms.
 
-7. Versions of the License. Apple may publish revised and/or new versions
-of this License from time to time. Each version will be given a distinguishing
-version number. Once Original Code has been published under a particular version
-of this License, You may continue to use it under the terms of that version.
-You may also choose to use such Original Code under the terms of any subsequent
-version of this License published by Apple. No one other than Apple has the
-right to modify the terms applicable to Covered Code created under this License.
+7. Versions of the License.  Apple may publish revised and/or new versions
+of this License from time to time.  Each version will be given a distinguishing
+version number.  Once Original Code has been published under a particular
+version of this License, You may continue to use it under the terms of that
+version. You may also choose to use such Original Code under the terms of
+any subsequent version of this License published by Apple.  No one other than
+Apple has the right to modify the terms applicable to Covered Code created
+under this License.
 
-8. NO WARRANTY OR SUPPORT. The Original Code may contain in whole or in part
-pre-release, untested, or not fully tested works. The Original Code may contain
+8. NO WARRANTY OR SUPPORT.  The Original Code may contain in whole or in part
+pre-release, untested, or not fully tested works.  The Original Code may contain
 errors that could cause failures or loss of data, and may be incomplete or
-contain inaccuracies. You expressly acknowledge and agree that use of the
-Original Code, or any portion thereof, is at Your sole and entire risk. THE
+contain inaccuracies.  You expressly acknowledge and agree that use of the
+Original Code, or any portion thereof, is at Your sole and entire risk.  THE
 ORIGINAL CODE IS PROVIDED "AS IS" AND WITHOUT WARRANTY, UPGRADES OR SUPPORT
 OF ANY KIND AND APPLE AND APPLE'S LICENSOR(S) (FOR THE PURPOSES OF SECTIONS
 8 AND 9, APPLE AND APPLE'S LICENSOR(S) ARE COLLECTIVELY REFERRED TO AS "APPLE")
 EXPRESSLY DISCLAIM ALL WARRANTIES AND/OR CONDITIONS, EXPRESS OR IMPLIED, INCLUDING,
 BUT NOT LIMITED TO, THE IMPLIED WARRANTIES AND/OR CONDITIONS OF MERCHANTABILITY
 OR SATISFACTORY QUALITY AND FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF THIRD PARTY RIGHTS. APPLE DOES NOT WARRANT THAT THE FUNCTIONS CONTAINED
+OF THIRD PARTY RIGHTS.  APPLE DOES NOT WARRANT THAT THE FUNCTIONS CONTAINED
 IN THE ORIGINAL CODE WILL MEET YOUR REQUIREMENTS, OR THAT THE OPERATION OF
 THE ORIGINAL CODE WILL BE UNINTERRUPTED OR ERROR- FREE, OR THAT DEFECTS IN
-THE ORIGINAL CODE WILL BE CORRECTED. NO ORAL OR WRITTEN INFORMATION OR ADVICE
+THE ORIGINAL CODE WILL BE CORRECTED.  NO ORAL OR WRITTEN INFORMATION OR ADVICE
 GIVEN BY APPLE OR AN APPLE AUTHORIZED REPRESENTATIVE SHALL CREATE A WARRANTY
-OR IN ANY WAY INCREASE THE SCOPE OF THIS WARRANTY. You acknowledge that the
+OR IN ANY WAY INCREASE THE SCOPE OF THIS WARRANTY.  You acknowledge that the
 Original Code is not intended for use in the operation of nuclear facilities,
 aircraft navigation, communication systems, or air traffic control machines
 in which case the failure of the Original Code could lead to death, personal
 injury, or severe physical or environmental damage.
 
-   9. Liability.
+9. Liability.
 
-9.1 Infringement. If any portion of, or functionality implemented by, the
+9.1 Infringement.  If any portion of, or functionality implemented by, the
 Original Code becomes the subject of a claim of infringement, Apple may, at
 its option: (a) attempt to procure the rights necessary for Apple and You
 to continue using the Affected Original Code; (b) modify the Affected Original
@@ -192,30 +192,30 @@ Code so that it is no longer infringing; or (c) suspend Your rights to use,
 reproduce, modify, sublicense and distribute the Affected Original Code until
 a final determination of the claim is made by a court or governmental administrative
 agency of competent jurisdiction and Apple lifts the suspension as set forth
-below. Such suspension of rights will be effective immediately upon Apple's
+below.  Such suspension of rights will be effective immediately upon Apple's
 posting of a notice to such effect on the Apple web site that is used for
-implementation of this License. Upon such final determination being made,
+implementation of this License.  Upon such final determination being made,
 if Apple is legally able, without the payment of a fee or royalty, to resume
 use, reproduction, modification, sublicensing and distribution of the Affected
 Original Code, Apple will lift the suspension of rights to the Affected Original
 Code by posting a notice to such effect on the Apple web site that is used
-for implementation of this License. If Apple suspends Your rights to Affected
+for implementation of this License.  If Apple suspends Your rights to Affected
 Original Code, nothing in this License shall be construed to restrict You,
 at Your option and subject to applicable law, from replacing the Affected
 Original Code with non-infringing code or independently negotiating for necessary
 rights from such third party.
 
-9.2 LIMITATION OF LIABILITY. UNDER NO CIRCUMSTANCES SHALL APPLE BE LIABLE
+9.2 LIMITATION OF LIABILITY.  UNDER NO CIRCUMSTANCES SHALL APPLE BE LIABLE
 FOR ANY INCIDENTAL, SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES ARISING OUT
 OF OR RELATING TO THIS LICENSE OR YOUR USE OR INABILITY TO USE THE ORIGINAL
 CODE, OR ANY PORTION THEREOF, WHETHER UNDER A THEORY OF CONTRACT, WARRANTY,
 TORT (INCLUDING NEGLIGENCE), PRODUCTS LIABILITY OR OTHERWISE, EVEN IF APPLE
 HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES AND NOTWITHSTANDING THE
-FAILURE OF ESSENTIAL PURPOSE OF ANY REMEDY. In no event shall Apple's total
+FAILURE OF ESSENTIAL PURPOSE OF ANY REMEDY.  In no event shall Apple's total
 liability to You for all damages under this License exceed the amount of fifty
 dollars ($50.00).
 
-10. Trademarks. This License does not grant any rights to use the trademarks
+10. Trademarks.  This License does not grant any rights to use the trademarks
 or trade names "Apple", "Apple Computer", "Mac OS X", "Mac OS X Server" or
 any other trademarks or trade names belonging to Apple (collectively "Apple
 Marks") and no Apple Marks may be used to endorse or promote products derived
@@ -223,18 +223,18 @@ from the Original Code other than as permitted by and in strict compliance
 at all times with Apple's third party trademark usage guidelines which are
 posted at http://www.apple.com/legal/guidelinesfor3rdparties.html.
 
-11. Ownership. Apple retains all rights, title and interest in and to the
+11. Ownership.  Apple retains all rights, title and interest in and to the
 Original Code and any Modifications made by or on behalf of Apple ("Apple
 Modifications"), and such Apple Modifications will not be automatically subject
-to this License. Apple may, at its sole discretion, choose to license such
+to this License.  Apple may, at its sole discretion, choose to license such
 Apple Modifications under this License, or on different terms from those contained
-in this License or may choose not to license them at all. Apple's development,
+in this License or may choose not to license them at all.  Apple's development,
 use, reproduction, modification, sublicensing and distribution of Covered
 Code will not be subject to this License.
 
-   12. Termination.
+12. Termination.
 
-12.1 Termination. This License and the rights granted hereunder will terminate:
+12.1 Termination.  This License and the rights granted hereunder will terminate:
 
 (a) automatically without notice from Apple if You fail to comply with any
 term(s) of this License and fail to cure such breach within 30 days of becoming
@@ -246,50 +246,49 @@ or
 (c) automatically without notice from Apple if You, at any time during the
 term of this License, commence an action for patent infringement against Apple.
 
-12.2 Effect of Termination. Upon termination, You agree to immediately stop
+12.2 Effect of Termination.  Upon termination, You agree to immediately stop
 any further use, reproduction, modification, sublicensing and distribution
 of the Covered Code and to destroy all copies of the Covered Code that are
 in your possession or control. All sublicenses to the Covered Code which have
 been properly granted prior to termination shall survive any termination of
 this License. Provisions which, by their nature, should remain in effect beyond
 the termination of this License shall survive, including but not limited to
-Sections 3, 5, 8, 9, 10, 11, 12.2 and 13. Neither party will be liable to
+Sections 3, 5, 8, 9, 10, 11, 12.2 and 13.  Neither party will be liable to
 the other for compensation, indemnity or damages of any sort solely as a result
 of terminating this License in accordance with its terms, and termination
 of this License will be without prejudice to any other right or remedy of
 either party.
 
-   13. Miscellaneous.
+13.  Miscellaneous.
 
-13.1 Government End Users. The Covered Code is a "commercial item" as defined
-in FAR 2.101. Government software and technical data rights in the Covered
+13.1 Government End Users.  The Covered Code is a "commercial item" as defined
+in FAR 2.101.  Government software and technical data rights in the Covered
 Code include only those rights customarily provided to the public as defined
 in this License. This customary commercial license in technical data and software
 is provided in accordance with FAR 12.211 (Technical Data) and 12.212 (Computer
 Software) and, for Department of Defense purchases, DFAR 252.227-7015 (Technical
 Data -- Commercial Items) and 227.7202-3 (Rights in Commercial Computer Software
-or Computer Software Documentation). Accordingly, all U.S. Government End
+or Computer Software Documentation).  Accordingly, all U.S. Government End
 Users acquire Covered Code with only those rights set forth herein.
 
-13.2 Relationship of Parties. This License will not be construed as creating
+13.2 Relationship of Parties.  This License will not be construed as creating
 an agency, partnership, joint venture or any other form of legal association
 between You and Apple, and You will not represent to the contrary, whether
 expressly, by implication, appearance or otherwise.
 
-13.3 Independent Development. Nothing in this License will impair Apple's
+13.3 Independent Development.  Nothing in this License will impair Apple's
 right to acquire, license, develop, have others develop for it, market and/or
 distribute technology or products that perform the same or similar functions
 as, or otherwise compete with, Modifications, Larger Works, technology or
 products that You may
+develop, produce, market or distribute.
 
-      develop, produce, market or distribute.
-
-13.4 Waiver; Construction. Failure by Apple to enforce any provision of this
+13.4 Waiver; Construction.  Failure by Apple to enforce any provision of this
 License will not be deemed a waiver of future enforcement of that or any other
-provision. Any law or regulation which provides that the language of a contract
+provision.  Any law or regulation which provides that the language of a contract
 shall be construed against the drafter will not apply to this License.
 
-13.5 Severability. (a) If for any reason a court of competent jurisdiction
+13.5 Severability.  (a) If for any reason a court of competent jurisdiction
 finds any provision of this License, or portion thereof, to be unenforceable,
 that provision of the License will be enforced to the maximum extent permissible
 so as to effect the economic benefits and intent of the parties, and the remainder
@@ -300,34 +299,36 @@ of either of those Sections, this License will immediately terminate and You
 must immediately discontinue any use of the Covered Code and destroy all copies
 of it that are in your possession or control.
 
-13.6 Dispute Resolution. Any litigation or other dispute resolution between
+13.6 Dispute Resolution.  Any litigation or other dispute resolution between
 You and Apple relating to this License shall take place in the Northern District
 of California, and You and Apple hereby consent to the personal jurisdiction
 of, and venue in, the state and federal courts within that District with respect
 to this License. The application of the United Nations Convention on Contracts
 for the International Sale of Goods is expressly excluded.
 
-13.7 Entire Agreement; Governing Law. This License constitutes the entire
-agreement between the parties with respect to the subject matter hereof. This
-License shall be governed by the laws of the United States and the State of
-California, except that body of California law concerning conflicts of law.
+13.7 Entire Agreement; Governing Law.  This License constitutes the entire
+agreement between the parties with respect to the subject matter hereof. 
+This License shall be governed by the laws of the United States and the State
+of California, except that body of California law concerning conflicts of
+law.
 
 Where You are located in the province of Quebec, Canada, the following clause
 applies: The parties hereby confirm that they have requested that this License
 and all related documents be drafted in English. Les parties ont exige que
 le present contrat et tous les documents connexes soient rediges en anglais.
+
 EXHIBIT A.
 
-"Portions Copyright (c) 1999-2000 Apple Computer, Inc. All Rights Reserved.
+"Portions Copyright (c) 1999-2000 Apple Computer, Inc.  All Rights Reserved.
 This file contains Original Code and/or Modifications of Original Code as
 defined in and that are subject to the Apple Public Source License Version
-1.1 (the "License"). You may not use this file except in compliance with the
-License. Please obtain a copy of the License at http://www.apple.com/publicsource
+1.1 (the "License").  You may not use this file except in compliance with
+the License.  Please obtain a copy of the License at http://www.apple.com/publicsource
 and read it before using this file.
 
 The Original Code and all software distributed under the License are distributed
 on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED,
 AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES, INCLUDING WITHOUT LIMITATION,
 ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NON-
-INFRINGEMENT. Please see the License for the specific language governing rights
-and limitations under the License."
+INFRINGEMENT.  Please see the License for the specific language governing
+rights and limitations under the License."
diff --git a/options/license/APSL-1.2 b/options/license/APSL-1.2
index e99cd808bd..8fe668600c 100644
--- a/options/license/APSL-1.2
+++ b/options/license/APSL-1.2
@@ -219,7 +219,7 @@ to this License. Apple may, at its sole discretion, choose to license such
 Apple Modifications under this License, or on different terms from those contained
 in this License or may choose not to license them at all.
 
-   12. Termination.
+12. Termination.
 
 12.1 Termination. This License and the rights granted hereunder will terminate:
 
@@ -245,7 +245,7 @@ for compensation, indemnity or damages of any sort solely as a result of termina
 this License in accordance with its terms, and termination of this License
 will be without prejudice to any other right or remedy of any party.
 
-   13. Miscellaneous.
+13. Miscellaneous.
 
 13.1 Government End Users. The Covered Code is a "commercial item" as defined
 in FAR 2.101. Government software and technical data rights in the Covered
@@ -301,6 +301,7 @@ Where You are located in the province of Quebec, Canada, the following clause
 applies: The parties hereby confirm that they have requested that this License
 and all related documents be drafted in English. Les parties ont exigé que
 le présent contrat et tous les documents connexes soient rédigés en anglais.
+
 EXHIBIT A.
 
 "Portions Copyright (c) 1999-2001 Apple Computer, Inc. All Rights Reserved.
diff --git a/options/license/APSL-2.0 b/options/license/APSL-2.0
index 4ee005b148..6489d0ab4d 100644
--- a/options/license/APSL-2.0
+++ b/options/license/APSL-2.0
@@ -1,33 +1,34 @@
 APPLE PUBLIC SOURCE LICENSE
+Version 2.0 -  August 6, 2003
 
-Version 2.0 - August 6, 2003 Please read this License carefully before downloading
-this software. By downloading or using this software, you are agreeing to
-be bound by the terms of this License. If you do not or cannot agree to the
-terms of this License, please do not download or use the software.
+Please read this License carefully before downloading this software.  By downloading
+or using this software, you are agreeing to be bound by the terms of this
+License.  If you do not or cannot agree to the terms of this License, please
+do not download or use the software.
 
-Apple Note: In January 2007, Apple changed its corporate name from "Apple
-Computer, Inc." to "Apple Inc." This change has been reflected below and copyright
-years updated, but no other changes have been made to the APSL 2.0.
+Apple Note:  In January 2007, Apple changed its corporate name from "Apple
+Computer, Inc." to "Apple Inc."  This change has been reflected below and
+copyright years updated, but no other changes have been made to the APSL 2.0.
 
-1. General; Definitions. This License applies to any program or other work
+1. General; Definitions.  This License applies to any program or other work
 which Apple Inc. ("Apple") makes publicly available and which contains a notice
 placed by Apple identifying such program or work as "Original Code" and stating
 that it is subject to the terms of this Apple Public Source License version
-2.0 ("License"). As used in this License:
+2.0 ("License").  As used in this License:
 
-1.1 "Applicable Patent Rights" mean: (a) in the case where Apple is the grantor
-of rights, (i) claims of patents that are now or hereafter acquired, owned
-by or assigned to Apple and (ii) that cover subject matter contained in the
-Original Code, but only to the extent necessary to use, reproduce and/or distribute
-the Original Code without infringement; and (b) in the case where You are
-the grantor of rights, (i) claims of patents that are now or hereafter acquired,
-owned by or assigned to You and (ii) that cover subject matter in Your Modifications,
-taken alone or in combination with Original Code.
+1.1  "Applicable Patent Rights" mean:  (a) in the case where Apple is the
+grantor of rights, (i) claims of patents that are now or hereafter acquired,
+owned by or assigned to Apple and (ii) that cover subject matter contained
+in the Original Code, but only to the extent necessary to use, reproduce and/or
+distribute the Original Code without infringement; and (b) in the case where
+You are the grantor of rights, (i) claims of patents that are now or hereafter
+acquired, owned by or assigned to You and (ii) that cover subject matter in
+Your Modifications, taken alone or in combination with Original Code.
 
 1.2 "Contributor" means any person or entity that creates or contributes to
 the creation of Modifications.
 
-1.3 "Covered Code" means the Original Code, Modifications, the combination
+1.3  "Covered Code" means the Original Code, Modifications, the combination
 of Original Code and any Modifications, and/or any respective portions thereof.
 
 1.4 "Externally Deploy" means: (a) to sublicense, distribute or otherwise
@@ -42,10 +43,10 @@ with code not governed by the terms of this License.
 1.6 "Modifications" mean any addition to, deletion from, and/or change to,
 the substance and/or structure of the Original Code, any previous Modifications,
 the combination of Original Code and any previous Modifications, and/or any
-respective portions thereof. When code is released as a series of files, a
-Modification is: (a) any addition to or deletion from the contents of a file
-containing Covered Code; and/or (b) any new file or other representation of
-computer program statements that contains any part of Covered Code.
+respective portions thereof.  When code is released as a series of files,
+a Modification is:  (a) any addition to or deletion from the contents of a
+file containing Covered Code; and/or (b) any new file or other representation
+of computer program statements that contains any part of Covered Code.
 
 1.7 "Original Code" means (a) the Source Code of a program or other work as
 originally made available by Apple under this License, including the Source
@@ -60,20 +61,20 @@ contains, plus any associated interface definition files, scripts used to
 control compilation and installation of an executable (object code).
 
 1.9 "You" or "Your" means an individual or a legal entity exercising rights
-under this License. For legal entities, "You" or "Your" includes any entity
+under this License.  For legal entities, "You" or "Your" includes any entity
 which controls, is controlled by, or is under common control with, You, where
 "control" means (a) the power, direct or indirect, to cause the direction
 or management of such entity, whether by contract or otherwise, or (b) ownership
 of fifty percent (50%) or more of the outstanding shares or beneficial ownership
 of such entity.
 
-2. Permitted Uses; Conditions & Restrictions. Subject to the terms and conditions
+2. Permitted Uses; Conditions & Restrictions.   Subject to the terms and conditions
 of this License, Apple hereby grants You, effective on the date You accept
 this License and download the Original Code, a world-wide, royalty-free, non-exclusive
 license, to the extent of Apple's Applicable Patent Rights and copyrights
 covering the Original Code, to do the following:
 
-2.1 Unmodified Code. You may use, reproduce, display, perform, internally
+2.1 Unmodified Code.  You may use, reproduce, display, perform, internally
 distribute within Your organization, and Externally Deploy verbatim, unmodified
 copies of the Original Code, for commercial or non-commercial purposes, provided
 that in each instance:
@@ -83,13 +84,13 @@ and other proprietary notices and disclaimers of Apple as they appear in the
 Original Code, and keep intact all notices in the Original Code that refer
 to this License; and
 
-(b) You must include a copy of this License with every copy of Source Code
+(b)  You must include a copy of this License with every copy of Source Code
 of Covered Code and documentation You distribute or Externally Deploy, and
 You may not offer or impose any terms on such Source Code that alter or restrict
 this License or the recipients' rights hereunder, except as permitted under
 Section 6.
 
-2.2 Modified Code. You may modify Covered Code and use, reproduce, display,
+2.2 Modified Code.  You may modify Covered Code and use, reproduce, display,
 perform, internally distribute within Your organization, and Externally Deploy
 Your Modifications and Covered Code, for commercial or non-commercial purposes,
 provided that in each instance You also meet all of these conditions:
@@ -112,14 +113,14 @@ or twelve (12) months from the date of initial External Deployment, whichever
 is longer. You should preferably distribute the Source Code of Your Externally
 Deployed Modifications electronically (e.g. download from a web site).
 
-2.3 Distribution of Executable Versions. In addition, if You Externally Deploy
+2.3 Distribution of Executable Versions.  In addition, if You Externally Deploy
 Covered Code (Original Code and/or Modifications) in object code, executable
 form only, You must include a prominent notice, in the code itself as well
 as in related documentation, stating that Source Code of the Covered Code
 is available under the terms of this License with information on how and where
 to obtain such Source Code.
 
-2.4 Third Party Rights. You expressly acknowledge and agree that although
+2.4 Third Party Rights.  You expressly acknowledge and agree that although
 Apple and each Contributor grants the licenses to their respective portions
 of the Covered Code set forth herein, no assurances are provided by Apple
 or any Contributor that the Covered Code does not infringe the patent or other
@@ -132,26 +133,26 @@ if any. For example, if a third party patent license is required to allow
 You to distribute the Covered Code, it is Your responsibility to acquire that
 license before distributing the Covered Code.
 
-3. Your Grants. In consideration of, and as a condition to, the licenses granted
-to You under this License, You hereby grant to any person or entity receiving
-or distributing Covered Code under this License a non-exclusive, royalty-free,
-perpetual, irrevocable license, under Your Applicable Patent Rights and other
-intellectual property rights (other than patent) owned or controlled by You,
-to use, reproduce, display, perform, modify, sublicense, distribute and Externally
-Deploy Your Modifications of the same scope and extent as Apple's licenses
-under Sections 2.1 and 2.2 above.
+3. Your Grants.  In consideration of, and as a condition to, the licenses
+granted to You under this License, You hereby grant to any person or entity
+receiving or distributing Covered Code under this License a non-exclusive,
+royalty-free, perpetual, irrevocable license, under Your Applicable Patent
+Rights and other intellectual property rights (other than patent) owned or
+controlled by You, to use, reproduce, display, perform, modify, sublicense,
+distribute and Externally Deploy Your Modifications of the same scope and
+extent as Apple's licenses under Sections 2.1 and 2.2 above.
 
-4. Larger Works. You may create a Larger Work by combining Covered Code with
+4. Larger Works.  You may create a Larger Work by combining Covered Code with
 other code not governed by the terms of this License and distribute the Larger
-Work as a single product. In each such instance, You must make sure the requirements
+Work as a single product.  In each such instance, You must make sure the requirements
 of this License are fulfilled for the Covered Code or any portion thereof.
 
-5. Limitations on Patent License. Except as expressly stated in Section 2,
-no other patent rights, express or implied, are granted by Apple herein. Modifications
-and/or Larger Works may require additional patent licenses from Apple which
-Apple may grant in its sole discretion.
+5. Limitations on Patent License.   Except as expressly stated in Section
+2, no other patent rights, express or implied, are granted by Apple herein.
+Modifications and/or Larger Works may require additional patent licenses from
+Apple which Apple may grant in its sole discretion.
 
-6. Additional Terms. You may choose to offer, and to charge a fee for, warranty,
+6. Additional Terms.  You may choose to offer, and to charge a fee for, warranty,
 support, indemnity or liability obligations and/or other rights consistent
 with the scope of the license granted herein ("Additional Terms") to one or
 more recipients of Covered Code. However, You may do so only on Your own behalf
@@ -161,36 +162,37 @@ offered by You alone, and You hereby agree to indemnify, defend and hold Apple
 and every Contributor harmless for any liability incurred by or claims asserted
 against Apple or such Contributor by reason of any such Additional Terms.
 
-7. Versions of the License. Apple may publish revised and/or new versions
-of this License from time to time. Each version will be given a distinguishing
-version number. Once Original Code has been published under a particular version
-of this License, You may continue to use it under the terms of that version.
-You may also choose to use such Original Code under the terms of any subsequent
-version of this License published by Apple. No one other than Apple has the
-right to modify the terms applicable to Covered Code created under this License.
+7. Versions of the License.  Apple may publish revised and/or new versions
+of this License from time to time.  Each version will be given a distinguishing
+version number.  Once Original Code has been published under a particular
+version of this License, You may continue to use it under the terms of that
+version. You may also choose to use such Original Code under the terms of
+any subsequent version of this License published by Apple.  No one other than
+Apple has the right to modify the terms applicable to Covered Code created
+under this License.
 
-8. NO WARRANTY OR SUPPORT. The Covered Code may contain in whole or in part
-pre-release, untested, or not fully tested works. The Covered Code may contain
+8. NO WARRANTY OR SUPPORT.  The Covered Code may contain in whole or in part
+pre-release, untested, or not fully tested works.  The Covered Code may contain
 errors that could cause failures or loss of data, and may be incomplete or
-contain inaccuracies. You expressly acknowledge and agree that use of the
-Covered Code, or any portion thereof, is at Your sole and entire risk. THE
+contain inaccuracies.  You expressly acknowledge and agree that use of the
+Covered Code, or any portion thereof, is at Your sole and entire risk.  THE
 COVERED CODE IS PROVIDED "AS IS" AND WITHOUT WARRANTY, UPGRADES OR SUPPORT
 OF ANY KIND AND APPLE AND APPLE'S LICENSOR(S) (COLLECTIVELY REFERRED TO AS
 "APPLE" FOR THE PURPOSES OF SECTIONS 8 AND 9) AND ALL CONTRIBUTORS EXPRESSLY
 DISCLAIM ALL WARRANTIES AND/OR CONDITIONS, EXPRESS OR IMPLIED, INCLUDING,
 BUT NOT LIMITED TO, THE IMPLIED WARRANTIES AND/OR CONDITIONS OF MERCHANTABILITY,
 OF SATISFACTORY QUALITY, OF FITNESS FOR A PARTICULAR PURPOSE, OF ACCURACY,
-OF QUIET ENJOYMENT, AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. APPLE AND EACH
-CONTRIBUTOR DOES NOT WARRANT AGAINST INTERFERENCE WITH YOUR ENJOYMENT OF THE
-COVERED CODE, THAT THE FUNCTIONS CONTAINED IN THE COVERED CODE WILL MEET YOUR
-REQUIREMENTS, THAT THE OPERATION OF THE COVERED CODE WILL BE UNINTERRUPTED
-OR ERROR-FREE, OR THAT DEFECTS IN THE COVERED CODE WILL BE CORRECTED. NO ORAL
-OR WRITTEN INFORMATION OR ADVICE GIVEN BY APPLE, AN APPLE AUTHORIZED REPRESENTATIVE
-OR ANY CONTRIBUTOR SHALL CREATE A WARRANTY. You acknowledge that the Covered
-Code is not intended for use in the operation of nuclear facilities, aircraft
-navigation, communication systems, or air traffic control machines in which
-case the failure of the Covered Code could lead to death, personal injury,
-or severe physical or environmental damage.
+OF QUIET ENJOYMENT, AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  APPLE AND
+EACH CONTRIBUTOR DOES NOT WARRANT AGAINST INTERFERENCE WITH YOUR ENJOYMENT
+OF THE COVERED CODE, THAT THE FUNCTIONS CONTAINED IN THE COVERED CODE WILL
+MEET YOUR REQUIREMENTS, THAT THE OPERATION OF THE COVERED CODE WILL BE UNINTERRUPTED
+OR ERROR-FREE, OR THAT DEFECTS IN THE COVERED CODE WILL BE CORRECTED.  NO
+ORAL OR WRITTEN INFORMATION OR ADVICE GIVEN BY APPLE, AN APPLE AUTHORIZED
+REPRESENTATIVE OR ANY CONTRIBUTOR SHALL CREATE A WARRANTY.  You acknowledge
+that the Covered Code is not intended for use in the operation of nuclear
+facilities, aircraft navigation, communication systems, or air traffic control
+machines in which case the failure of the Covered Code could lead to death,
+personal injury, or severe physical or environmental damage.
 
 9. LIMITATION OF LIABILITY. TO THE EXTENT NOT PROHIBITED BY LAW, IN NO EVENT
 SHALL APPLE OR ANY CONTRIBUTOR BE LIABLE FOR ANY INCIDENTAL, SPECIAL, INDIRECT
@@ -205,11 +207,11 @@ YOU. In no event shall Apple's total liability to You for all damages (other
 than as may be required by applicable law) under this License exceed the amount
 of fifty dollars ($50.00).
 
-10. Trademarks. This License does not grant any rights to use the trademarks
-or trade names "Apple", "Mac", "Mac OS", "QuickTime", "QuickTime Streaming
+10. Trademarks.  This License does not grant any rights to use the trademarks
+or trade names  "Apple", "Mac", "Mac OS", "QuickTime", "QuickTime Streaming
 Server" or any other trademarks, service marks, logos or trade names belonging
 to Apple (collectively "Apple Marks") or to any trademark, service mark, logo
-or trade name belonging to any Contributor. You agree not to use any Apple
+or trade name belonging to any Contributor.  You agree not to use any Apple
 Marks in or as part of the name of products derived from the Original Code
 or to endorse or promote products derived from the Original Code other than
 as expressly permitted by and in strict compliance at all times with Apple's
@@ -217,16 +219,16 @@ third party trademark usage guidelines which are posted at http://www.apple.com/
 
 11. Ownership. Subject to the licenses granted under this License, each Contributor
 retains all rights, title and interest in and to any Modifications made by
-such Contributor. Apple retains all rights, title and interest in and to the
-Original Code and any Modifications made by or on behalf of Apple ("Apple
+such Contributor.  Apple retains all rights, title and interest in and to
+the Original Code and any Modifications made by or on behalf of Apple ("Apple
 Modifications"), and such Apple Modifications will not be automatically subject
-to this License. Apple may, at its sole discretion, choose to license such
+to this License.  Apple may, at its sole discretion, choose to license such
 Apple Modifications under this License, or on different terms from those contained
 in this License or may choose not to license them at all.
 
-   12. Termination.
+12. Termination.
 
-12.1 Termination. This License and the rights granted hereunder will terminate:
+12.1 Termination.  This License and the rights granted hereunder will terminate:
 
 (a) automatically without notice from Apple if You fail to comply with any
 term(s) of this License and fail to cure such breach within 30 days of becoming
@@ -240,86 +242,89 @@ term of this License, commence an action for patent infringement against Apple;
 provided that Apple did not first commence an action for patent infringement
 against You in that instance.
 
-12.2 Effect of Termination. Upon termination, You agree to immediately stop
+12.2 Effect of Termination.  Upon termination, You agree to immediately stop
 any further use, reproduction, modification, sublicensing and distribution
-of the Covered Code. All sublicenses to the Covered Code which have been properly
-granted prior to termination shall survive any termination of this License.
-Provisions which, by their nature, should remain in effect beyond the termination
-of this License shall survive, including but not limited to Sections 3, 5,
-8, 9, 10, 11, 12.2 and 13. No party will be liable to any other for compensation,
-indemnity or damages of any sort solely as a result of terminating this License
-in accordance with its terms, and termination of this License will be without
-prejudice to any other right or remedy of any party.
+of the Covered Code.  All sublicenses to the Covered Code which have been
+properly granted prior to termination shall survive any termination of this
+License.  Provisions which, by their nature, should remain in effect beyond
+the termination of this License shall survive, including but not limited to
+Sections 3, 5, 8, 9, 10, 11, 12.2 and 13.  No party will be liable to any
+other for compensation, indemnity or damages of any sort solely as a result
+of terminating this License in accordance with its terms, and termination
+of this License will be without prejudice to any other right or remedy of
+any party.
 
-   13. Miscellaneous.
+13.  Miscellaneous.
 
-13.1 Government End Users. The Covered Code is a "commercial item" as defined
-in FAR 2.101. Government software and technical data rights in the Covered
+13.1 Government End Users.   The Covered Code is a "commercial item" as defined
+in FAR 2.101.  Government software and technical data rights in the Covered
 Code include only those rights customarily provided to the public as defined
 in this License. This customary commercial license in technical data and software
 is provided in accordance with FAR 12.211 (Technical Data) and 12.212 (Computer
 Software) and, for Department of Defense purchases, DFAR 252.227-7015 (Technical
 Data -- Commercial Items) and 227.7202-3 (Rights in Commercial Computer Software
-or Computer Software Documentation). Accordingly, all U.S. Government End
+or Computer Software Documentation).  Accordingly, all U.S. Government End
 Users acquire Covered Code with only those rights set forth herein.
 
-13.2 Relationship of Parties. This License will not be construed as creating
+13.2 Relationship of Parties.  This License will not be construed as creating
 an agency, partnership, joint venture or any other form of legal association
 between or among You, Apple or any Contributor, and You will not represent
 to the contrary, whether expressly, by implication, appearance or otherwise.
 
-13.3 Independent Development. Nothing in this License will impair Apple's
+13.3 Independent Development.   Nothing in this License will impair Apple's
 right to acquire, license, develop, have others develop for it, market and/or
 distribute technology or products that perform the same or similar functions
 as, or otherwise compete with, Modifications, Larger Works, technology or
 products that You may develop, produce, market or distribute.
 
-13.4 Waiver; Construction. Failure by Apple or any Contributor to enforce
+13.4 Waiver; Construction.  Failure by Apple or any Contributor to enforce
 any provision of this License will not be deemed a waiver of future enforcement
-of that or any other provision. Any law or regulation which provides that
+of that or any other provision.  Any law or regulation which provides that
 the language of a contract shall be construed against the drafter will not
 apply to this License.
 
-13.5 Severability. (a) If for any reason a court of competent jurisdiction
+13.5 Severability.  (a) If for any reason a court of competent jurisdiction
 finds any provision of this License, or portion thereof, to be unenforceable,
 that provision of the License will be enforced to the maximum extent permissible
 so as to effect the economic benefits and intent of the parties, and the remainder
-of this License will continue in full force and effect. (b) Notwithstanding
+of this License will continue in full force and effect.  (b) Notwithstanding
 the foregoing, if applicable law prohibits or restricts You from fully and/or
 specifically complying with Sections 2 and/or 3 or prevents the enforceability
 of either of those Sections, this License will immediately terminate and You
 must immediately discontinue any use of the Covered Code and destroy all copies
 of it that are in your possession or control.
 
-13.6 Dispute Resolution. Any litigation or other dispute resolution between
+13.6 Dispute Resolution.  Any litigation or other dispute resolution between
 You and Apple relating to this License shall take place in the Northern District
 of California, and You and Apple hereby consent to the personal jurisdiction
 of, and venue in, the state and federal courts within that District with respect
 to this License. The application of the United Nations Convention on Contracts
 for the International Sale of Goods is expressly excluded.
 
-13.7 Entire Agreement; Governing Law. This License constitutes the entire
-agreement between the parties with respect to the subject matter hereof. This
-License shall be governed by the laws of the United States and the State of
-California, except that body of California law concerning conflicts of law.
+13.7 Entire Agreement; Governing Law.  This License constitutes the entire
+agreement between the parties with respect to the subject matter hereof. 
+This License shall be governed by the laws of the United States and the State
+of California, except that body of California law concerning conflicts of
+law.
 
 Where You are located in the province of Quebec, Canada, the following clause
-applies: The parties hereby confirm that they have requested that this License
-and all related documents be drafted in English. Les parties ont exigé que
+applies:  The parties hereby confirm that they have requested that this License
+and all related documents be drafted in English.  Les parties ont exigé que
 le présent contrat et tous les documents connexes soient rédigés en anglais.
+
 EXHIBIT A.
 
-"Portions Copyright (c) 1999-2007 Apple Inc. All Rights Reserved.
+"Portions Copyright (c) 1999-2007 Apple Inc.  All Rights Reserved.
 
 This file contains Original Code and/or Modifications of Original Code as
 defined in and that are subject to the Apple Public Source License Version
-2.0 (the 'License'). You may not use this file except in compliance with the
-License. Please obtain a copy of the License at http://www.opensource.apple.com/apsl/
+2.0 (the 'License').  You may not use this file except in compliance with
+the License.  Please obtain a copy of the License at http://www.opensource.apple.com/apsl/
 and read it before using this file.
 
 The Original Code and all software distributed under the License are distributed
 on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED,
 AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES, INCLUDING WITHOUT LIMITATION,
 ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, QUIET
-ENJOYMENT OR NON-INFRINGEMENT. Please see the License for the specific language
+ENJOYMENT OR NON-INFRINGEMENT.  Please see the License for the specific language
 governing rights and limitations under the License."
diff --git a/options/license/Abstyles b/options/license/Abstyles
index 4ba6479144..1712c23173 100644
--- a/options/license/Abstyles
+++ b/options/license/Abstyles
@@ -1,14 +1,12 @@
 This is APREAMBL.TEX, version 1.10e, written by Hans-Hermann Bode
-
 (HHBODE@DOSUNI1.BITNET), for the BibTeX `adaptable' family, version 1.10.
-
 See the file APREAMBL.DOC for a detailed documentation.
 
 This program is distributed WITHOUT ANY WARRANTY, express or implied.
 
 Copyright (C) 1991, 1992 Hans-Hermann Bode
 
-Permission is granted to make and distribute verbatim copies of this document
+Permission is granted to make and distribute verbatim copies of this  document
 provided that the copyright notice and this permission notice are preserved
 on all copies.
 
diff --git a/options/license/Adobe-2006 b/options/license/Adobe-2006
index 9e3828254b..258e90ca57 100644
--- a/options/license/Adobe-2006
+++ b/options/license/Adobe-2006
@@ -1,5 +1,5 @@
-Adobe Systems Incorporated(r) Source Code License Agreement Copyright(c) 2006
-Adobe Systems Incorporated. All rights reserved.
+Adobe Systems Incorporated(r) Source Code License Agreement
+Copyright(c) 2006 Adobe Systems Incorporated. All rights reserved.
 
 Please read this Source Code License Agreement carefully before using the
 source code.
diff --git a/options/license/Adobe-Glyph b/options/license/Adobe-Glyph
index 8e1a4a7454..e0fdb82e0f 100644
--- a/options/license/Adobe-Glyph
+++ b/options/license/Adobe-Glyph
@@ -7,7 +7,6 @@ provided that:
 
 - No modification, editing or other alteration of this document is allowed;
 and
-
 - The above copyright notice and this permission notice shall be included
 in all copies of the documentation.
 
@@ -22,7 +21,7 @@ for indirect, incidental, special, consequential, or other similar damages,
 whether based on tort (including without limitation negligence or strict liability),
 contract or other legal or equitable grounds even if Adobe has been advised
 or had reason to know of the possibility of such damages. The Adobe materials
-are provided on an "AS IS" basis. Adobe specifically disclaims all express,
+are provided on an "AS IS" basis.Ê Adobe specifically disclaims all express,
 statutory, or implied warranties relating to the Adobe materials, including
 but not limited to those concerning merchantability or fitness for a particular
 purpose or non-infringement of any third party rights regarding the Adobe
diff --git a/options/license/Afmparse b/options/license/Afmparse
index 7f107554ff..b41f2a1d48 100644
--- a/options/license/Afmparse
+++ b/options/license/Afmparse
@@ -2,12 +2,11 @@
 
 This file may be freely copied and redistributed as long as:
 
-   1) This entire notice continues to be included in the file,
-
+     1) This entire notice continues to be included in the file,
 2) If the file has been modified in any way, a notice of such modification
 is conspicuously indicated.
 
-PostScript, Display PostScript, and Adobe are registered trademarks of Adobe
+PostScript, Display PostScript,and Adobe are registered trademarks of Adobe
 Systems Incorporated.
 
 THE INFORMATION BELOW IS FURNISHED AS IS, IS SUBJECT TO CHANGE WITHOUT NOTICE,
diff --git a/options/license/Aladdin b/options/license/Aladdin
index 204cb1f3d7..9339f670b1 100644
--- a/options/license/Aladdin
+++ b/options/license/Aladdin
@@ -1,12 +1,13 @@
 Aladdin Free Public License
+(Version 8, November 18, 1999)
 
-(Version 8, November 18, 1999) Copyright (C) 1994, 1995, 1997, 1998, 1999
-Aladdin Enterprises,
+Copyright (C) 1994, 1995, 1997, 1998, 1999 Aladdin Enterprises, Menlo Park,
+California, U.S.A. All rights reserved.
 
-Menlo Park, California, U.S.A. All rights reserved. NOTE: This License is
-not the same as any of the GNU Licenses published by the Free Software Foundation.
-Its terms are substantially different from those of the GNU Licenses. If you
-are familiar with the GNU Licenses, please read this license with extra care.
+NOTE: This License is not the same as any of the GNU Licenses published by
+the Free Software Foundation. Its terms are substantially different from those
+of the GNU Licenses. If you are familiar with the GNU Licenses, please read
+this license with extra care.
 
 Aladdin Enterprises hereby grants to anyone the permission to apply this License
 to their own work, as long as the entire License (including the above notices
@@ -18,8 +19,7 @@ to a work created in a country other than the United States, replacing the
 first paragraph of Section 6 with an appropriate reference to the laws of
 the appropriate country.
 
-   0. Subject Matter
-
+0. Subject Matter
 This License applies to the computer program known as "Aladdin Ghostscript."
 The "Program", below, refers to such program. The Program is a copyrighted
 work whose copyright is held by Aladdin Enterprises (the "Licensor"). Please
@@ -39,21 +39,18 @@ DISTRIBUTE THE PROGRAM OR ITS DERIVATIVE WORKS. THESE ACTIONS ARE PROHIBITED
 BY LAW. IF YOU DO NOT ACCEPT THESE TERMS AND CONDITIONS, DO NOT MODIFY OR
 DISTRIBUTE THE PROGRAM.
 
-   1. Licenses.
-
+1. Licenses.
 Licensor hereby grants you the following rights, provided that you comply
 with all of the restrictions set forth in this License and provided, further,
 that you distribute an unmodified copy of this License with the Program:
 
 (a) You may copy and distribute literal (i.e., verbatim) copies of the Program's
 source code as you receive it throughout the world, in any medium.
-
 (b) You may modify the Program, create works based on the Program and distribute
 copies of such throughout the world, in any medium.
 
-   2. Restrictions.
-
-   This license is subject to the following restrictions:
+2. Restrictions.
+This license is subject to the following restrictions:
 
 (a) Distribution of the Program or any work based on the Program by a commercial
 organization to any third party is prohibited if any payment is made in connection
@@ -73,7 +70,6 @@ independent of any other product or service. An example of a service that
 does not fall under this section is an on-line service that is operated by
 a company and that is only available to customers of that company. (This is
 not an exhaustive enumeration.)
-
 (ii) Distributing the Program on removable computer-readable media, provided
 that the files containing the Program are reproduced entirely and verbatim
 on such media, that all information on such media be redistributable for non-commercial
@@ -100,10 +96,8 @@ notices stating that you have modified the Program's files and the date of
 any change. In each source file that you have modified, you must include a
 prominent notice that you have modified the file, including your name, your
 e-mail address (if any), and the date and purpose of the change;
-
 (ii) You must cause the Work to be licensed as a whole and at no charge to
 all third parties under the terms of this License;
-
 (iii) If the Work normally reads commands interactively when run, you must
 cause it, at each time the Work commences operation, to print or display an
 announcement including an appropriate copyright notice and a notice that there
@@ -116,7 +110,6 @@ an "About box", the Work is required to print or display the notice only under
 the same circumstances; if the Program itself is interactive but does not
 normally print such an announcement, the Work is not required to print an
 announcement.);
-
 (iv) You must accompany the Work with the complete corresponding machine-readable
 source code, delivered on a medium customarily used for software interchange.
 The source code for a work means the preferred form of the work for making
@@ -128,13 +121,11 @@ is normally distributed (in either source or binary form) with the major compone
 (compiler, kernel, and so on) of the operating system on which the executable
 runs, you must also distribute the source code of that component if you have
 it and are allowed to do so;
-
 (v) If you distribute any written or printed material at all with the Work,
 such material must include either a written copy of this License, or a prominent
 written indication that the Work is covered by this License and written instructions
 for printing and/or displaying the copy of the License on the distribution
 medium;
-
 (vi) You may not impose any further restrictions on the recipient's exercise
 of the rights granted herein.
 
@@ -144,8 +135,7 @@ to copy the source code from the same place counts as distribution of the
 source code, even though third parties are not compelled to copy the source
 code along with the object code.
 
-   3. Reservation of Rights.
-
+3. Reservation of Rights.
 No rights are granted to the Program except as expressly set forth herein.
 You may not copy, modify, sublicense, or distribute the Program except as
 expressly provided under this License. Any attempt otherwise to copy, modify,
@@ -154,16 +144,14 @@ your rights under this License. However, parties who have received copies,
 or rights, from you under this License will not have their licenses terminated
 so long as such parties remain in full compliance.
 
-   4. Other Restrictions.
-
+4. Other Restrictions.
 If the distribution and/or use of the Program is restricted in certain countries
 for any reason, Licensor may add an explicit geographical distribution limitation
 excluding those countries, so that distribution is permitted only in or among
 countries not thus excluded. In such case, this License incorporates the limitation
 as if written in the body of this License.
 
-   5. Limitations.
-
+5. Limitations.
 THE PROGRAM IS PROVIDED TO YOU "AS IS," WITHOUT WARRANTY. THERE IS NO WARRANTY
 FOR THE PROGRAM, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
 THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -180,8 +168,7 @@ INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE
 PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER
 PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
 
-   6. General.
-
+6. General.
 This License is governed by the laws of the State of California, U.S.A., excluding
 choice of law rules.
 
diff --git a/options/license/Apache-1.0 b/options/license/Apache-1.0
index 923c623b3f..7bc81ab83b 100644
--- a/options/license/Apache-1.0
+++ b/options/license/Apache-1.0
@@ -12,21 +12,19 @@ and/or other materials provided with the distribution.
 
 3. All advertising materials mentioning features or use of this software must
 display the following acknowledgment: "This product includes software developed
-by the Apache Group for use in the Apache HTTP server project (http://www.apache.org/)
-."
+by the Apache Group for use in the Apache HTTP server project (http://www.apache.org/)."
 
-4. The name "Apache Server" and "Apache Group" must not be used to endorse
-or promote products derived from this software without prior written permission.
-For written permission, please contact apache@apache.org .
+4. The names "Apache" and "Apache Software Foundation" must not be used to
+endorse or promote products derived from this software without prior written
+permission. For written permission, please contact apache@apache.org.
 
 5. Products derived from this software may not be called "Apache" nor may
 "Apache" appear in their name, without prior written permission of the Apache
-Group .
+Group.
 
 6. Redistributions of any form whatsoever must retain the following acknowledgment:
-
 "This product includes software developed by the Apache Group for use in the
-Apache HTTP server project (http://www.apache.org/) ."
+Apache HTTP server project (http://www.apache.org/)."
 
 THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY EXPRESSED
 OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
diff --git a/options/license/Apache-1.1 b/options/license/Apache-1.1
index 6736b34d5a..c4cb049f33 100644
--- a/options/license/Apache-1.1
+++ b/options/license/Apache-1.1
@@ -1,5 +1,6 @@
-Apache License 1.1 Copyright (c) 2000 The Apache Software Foundation. All
-rights reserved.
+Apache License 1.1
+
+Copyright (c) 2000 The Apache Software Foundation.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
 are permitted provided that the following conditions are met:
@@ -13,16 +14,14 @@ and/or other materials provided with the distribution.
 
 3. The end-user documentation included with the redistribution, if any, must
 include the following acknowledgment:
-
 "This product includes software developed by the Apache Software Foundation
-(http://www.apache.org/) ."
-
+(http://www.apache.org/)."
 Alternately, this acknowledgment may appear in the software itself, if and
 wherever such third-party acknowledgments normally appear.
 
-4. The name "Apache" and "Apache Software Foundation" must not be used to
+4. The names "Apache" and "Apache Software Foundation" must not be used to
 endorse or promote products derived from this software without prior written
-permission. For written permission, please contact apache@apache.org .
+permission. For written permission, please contact apache@apache.org.
 
 5. Products derived from this software may not be called "Apache" [ex. "Jakarta,"
 "Apache," or "Apache Commons,"] nor may "Apache" [ex. the names] appear in
diff --git a/options/license/Apache-2.0 b/options/license/Apache-2.0
index 4ed90b9522..9a4104bbfb 100644
--- a/options/license/Apache-2.0
+++ b/options/license/Apache-2.0
@@ -1,24 +1,17 @@
 Apache License
-
 Version 2.0, January 2004
+http://www.apache.org/licenses/
 
-http://www.apache.org/licenses/ TERMS AND CONDITIONS FOR USE, REPRODUCTION,
-AND DISTRIBUTION
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
-   1. Definitions.
-
-      
+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
@@ -26,32 +19,22 @@ 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
@@ -59,8 +42,6 @@ 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
@@ -74,8 +55,6 @@ for the purpose of discussing and improving the Work, but excluding communicatio
 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.
@@ -175,13 +154,15 @@ 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
+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
+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
@@ -190,19 +171,13 @@ 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/options/license/Artistic-1.0 b/options/license/Artistic-1.0
index f87fe42011..3899ddcec6 100644
--- a/options/license/Artistic-1.0
+++ b/options/license/Artistic-1.0
@@ -47,15 +47,12 @@ Available, such as by posting said modifications to Usenet or an equivalent
 medium, or placing the modifications on a major archive site such as ftp.uu.net,
 or by allowing the Copyright Holder to include your modifications in the Standard
 Version of the Package.
-
-      b) use the modified Package only within your corporation or organization.
-
+     b) use the modified Package only within your corporation or organization.
 c) rename any non-standard executables so the names do not conflict with standard
 executables, which must also be provided, and provide a separate manual page
 for each non-standard executable that clearly documents how it differs from
 the Standard Version.
-
-      d) make other distribution arrangements with the Copyright Holder.
+     d) make other distribution arrangements with the Copyright Holder.
 
 4. You may distribute the programs of this Package in object code or executable
 form, provided that you do at least ONE of the following:
@@ -63,16 +60,13 @@ form, provided that you do at least ONE of the following:
 a) distribute a Standard Version of the executables and library files, together
 with instructions (in the manual page or equivalent) on where to get the Standard
 Version.
-
 b) accompany the distribution with the machine-readable source of the Package
 with your modifications.
-
 c) accompany any non-standard executables with their corresponding Standard
 Version executables, giving the non-standard executables non-standard names,
 and clearly documenting the differences in manual pages (or equivalent), together
 with instructions on where to get the Standard Version.
-
-      d) make other distribution arrangements with the Copyright Holder.
+     d) make other distribution arrangements with the Copyright Holder.
 
 5. You may charge a reasonable copying fee for any distribution of this Package.
 You may charge any fee you choose for support of this Package. You may not
@@ -94,4 +88,6 @@ products derived from this software without specific prior written permission.
 
 9. THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES,
 INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
-FITNESS FOR A PARTICULAR PURPOSE. The End
+FITNESS FOR A PARTICULAR PURPOSE.
+
+The End
diff --git a/options/license/Artistic-1.0-Perl b/options/license/Artistic-1.0-Perl
index 4591ee9f2e..c9b7c61742 100644
--- a/options/license/Artistic-1.0-Perl
+++ b/options/license/Artistic-1.0-Perl
@@ -23,8 +23,8 @@ the package.
 "You" is you, if you're thinking about copying or distributing this Package.
 
 "Reasonable copying fee" is whatever you can justify on the basis of media
-cost, duplication charges, time of people involved, and so on. (You will not
-be required to justify it to the Copyright Holder, but only to the computing
+cost, duplication charges, time of people involved, and so on.  (You will
+not be required to justify it to the Copyright Holder, but only to the computing
 community at large as a market that must bear the fee.)
 
 "Freely Available" means that no fee is charged for the item itself, though
@@ -36,7 +36,7 @@ Version of this Package without restriction, provided that you duplicate all
 of the original copyright notices and associated disclaimers.
 
 2. You may apply bug fixes, portability fixes and other modifications derived
-from the Public Domain or from the Copyright Holder. A Package modified in
+from the Public Domain or from the Copyright Holder.  A Package modified in
 such a way shall still be considered the Standard Version.
 
 3. You may otherwise modify your copy of this Package in any way, provided
@@ -48,15 +48,12 @@ Available, such as by posting said modifications to Usenet or an equivalent
 medium, or placing the modifications on a major archive site such as uunet.uu.net,
 or by allowing the Copyright Holder to include your modifications in the Standard
 Version of the Package.
-
-      b) use the modified Package only within your corporation or organization.
-
+     b) use the modified Package only within your corporation or organization.
 c) rename any non-standard executables so the names do not conflict with standard
 executables, which must also be provided, and provide a separate manual page
 for each non-standard executable that clearly documents how it differs from
 the Standard Version.
-
-      d) make other distribution arrangements with the Copyright Holder.
+     d) make other distribution arrangements with the Copyright Holder.
 
 4. You may distribute the programs of this Package in object code or executable
 form, provided that you do at least ONE of the following:
@@ -64,22 +61,19 @@ form, provided that you do at least ONE of the following:
 a) distribute a Standard Version of the executables and library files, together
 with instructions (in the manual page or equivalent) on where to get the Standard
 Version.
-
 b) accompany the distribution with the machine-readable source of the Package
 with your modifications.
-
 c) give non-standard executables non-standard names, and clearly document
 the differences in manual pages (or equivalent), together with instructions
 on where to get the Standard Version.
-
-      d) make other distribution arrangements with the Copyright Holder.
+     d) make other distribution arrangements with the Copyright Holder.
 
 5. You may charge a reasonable copying fee for any distribution of this Package.
-You may charge any fee you choose for support of this Package. You may not
-charge a fee for this Package itself. However, you may distribute this Package
+You may charge any fee you choose for support of this Package.  You may not
+charge a fee for this Package itself.  However, you may distribute this Package
 in aggregate with other (possibly commercial) programs as part of a larger
 (possibly commercial) software distribution provided that you do not advertise
-this Package as a product of your own. You may embed this Package's interpreter
+this Package as a product of your own.  You may embed this Package's interpreter
 within an executable of yours (by linking); this shall be construed as a mere
 form of aggregation, provided that the complete Standard Version of the interpreter
 is so embedded.
@@ -87,7 +81,7 @@ is so embedded.
 6. The scripts and library files supplied as input to or produced as output
 from the programs of this Package do not automatically fall under the copyright
 of this Package, but belong to whoever generated them, and may be sold commercially,
-and may be aggregated with this Package. If such scripts or library files
+and may be aggregated with this Package.  If such scripts or library files
 are aggregated with this Package via the so-called "undump" or "unexec" methods
 of producing a binary executable image, then distribution of such an image
 shall neither be construed as a distribution of this Package nor shall it
@@ -104,7 +98,7 @@ the regression tests for the language.
 8. Aggregation of this Package with a commercial distribution is always permitted
 provided that the use of this Package is embedded; that is, when no overt
 attempt is made to make this Package's interfaces visible to the end user
-of the commercial distribution. Such use shall not be construed as a distribution
+of the commercial distribution.  Such use shall not be construed as a distribution
 of this Package.
 
 9. The name of the Copyright Holder may not be used to endorse or promote
@@ -112,4 +106,6 @@ products derived from this software without specific prior written permission.
 
 10. THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES,
 INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
-FITNESS FOR A PARTICULAR PURPOSE. The End
+FITNESS FOR A PARTICULAR PURPOSE.
+
+The End
diff --git a/options/license/Artistic-1.0-cl8 b/options/license/Artistic-1.0-cl8
index 7463c897d8..f06933cadf 100644
--- a/options/license/Artistic-1.0-cl8
+++ b/options/license/Artistic-1.0-cl8
@@ -47,15 +47,12 @@ Available, such as by posting said modifications to Usenet or an equivalent
 medium, or placing the modifications on a major archive site such as ftp.uu.net,
 or by allowing the Copyright Holder to include your modifications in the Standard
 Version of the Package.
-
-      b) use the modified Package only within your corporation or organization.
-
+     b) use the modified Package only within your corporation or organization.
 c) rename any non-standard executables so the names do not conflict with standard
 executables, which must also be provided, and provide a separate manual page
 for each non-standard executable that clearly documents how it differs from
 the Standard Version.
-
-      d) make other distribution arrangements with the Copyright Holder.
+     d) make other distribution arrangements with the Copyright Holder.
 
 4. You may distribute the programs of this Package in object code or executable
 form, provided that you do at least ONE of the following:
@@ -63,16 +60,13 @@ form, provided that you do at least ONE of the following:
 a) distribute a Standard Version of the executables and library files, together
 with instructions (in the manual page or equivalent) on where to get the Standard
 Version.
-
 b) accompany the distribution with the machine-readable source of the Package
 with your modifications.
-
 c) accompany any non-standard executables with their corresponding Standard
 Version executables, giving the non-standard executables non-standard names,
 and clearly documenting the differences in manual pages (or equivalent), together
 with instructions on where to get the Standard Version.
-
-      d) make other distribution arrangements with the Copyright Holder.
+     d) make other distribution arrangements with the Copyright Holder.
 
 5. You may charge a reasonable copying fee for any distribution of this Package.
 You may charge any fee you choose for support of this Package. You may not
@@ -100,4 +94,6 @@ products derived from this software without specific prior written permission.
 
 10. THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES,
 INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
-FITNESS FOR A PARTICULAR PURPOSE. The End
+FITNESS FOR A PARTICULAR PURPOSE.
+
+The End
diff --git a/options/license/Artistic-2.0 b/options/license/Artistic-2.0
index 64507d04bd..19b7bbd9c7 100644
--- a/options/license/Artistic-2.0
+++ b/options/license/Artistic-2.0
@@ -14,68 +14,46 @@ of that Package while still keeping the Package available as open source and
 free software.
 
 You are always permitted to make arrangements wholly outside of this license
-directly with the Copyright Holder of a given Package. If the terms of this
+directly with the Copyright Holder of a given Package.  If the terms of this
 license do not permit the full use that you propose to make of the Package,
 you should contact the Copyright Holder and seek a different licensing arrangement.
 
 Definitions
 
-   
-
 "Copyright Holder" means the individual(s) or organization(s) named in the
 copyright notice for the entire Package.
 
-   
-
 "Contributor" means any party that has contributed code or other material
 to the Package, in accordance with the Copyright Holder's procedures.
 
-   
-
 "You" and "your" means any person who would like to copy, distribute, or modify
 the Package.
 
-   
-
 "Package" means the collection of files distributed by the Copyright Holder,
 and derivatives of that collection and/or of those files. A given Package
 may consist of either the Standard Version, or a Modified Version.
 
-   
-
 "Distribute" means providing a copy of the Package or making it accessible
 to anyone else, or in the case of a company or organization, to others outside
 of your company or organization.
 
-   
-
 "Distributor Fee" means any fee that you charge for Distributing this Package
-or providing support for this Package to another party. It does not mean licensing
-fees.
-
-   
+or providing support for this Package to another party.  It does not mean
+licensing fees.
 
 "Standard Version" refers to the Package if it has not been modified, or has
 been modified only in ways explicitly requested by the Copyright Holder.
 
-   
-
 "Modified Version" means the Package, if it has been changed, and such changes
 were not explicitly requested by the Copyright Holder.
 
-   
-
 "Original License" means this Artistic License as Distributed with the Standard
 Version of the Package, in its current version or as it may be modified by
 The Perl Foundation in the future.
 
-   
-
 "Source" form means the source code, documentation source, and configuration
 files for the Package.
 
-   
-
 "Compiled" form means the compiled bytecode, object code, binary, or any other
 form resulting from mechanical transformation or translation of the Source
 form.
@@ -91,11 +69,11 @@ Permissions for Redistribution of the Standard Version
 (2) You may Distribute verbatim copies of the Source form of the Standard
 Version of this Package in any medium without restriction, either gratis or
 for a Distributor Fee, provided that you duplicate all of the original copyright
-notices and associated disclaimers. At your discretion, such verbatim copies
+notices and associated disclaimers.  At your discretion, such verbatim copies
 may or may not include a Compiled form of the Package.
 
 (3) You may apply any bug fixes, portability changes, and other modifications
-made available from the Copyright Holder. The resulting Package will still
+made available from the Copyright Holder.  The resulting Package will still
 be considered the Standard Version, and as such will be subject to the Original
 License.
 
@@ -110,16 +88,13 @@ or modules, and provided that you do at least ONE of the following:
 (a) make the Modified Version available to the Copyright Holder of the Standard
 Version, under the Original License, so that the Copyright Holder may include
 your modifications in the Standard Version.
-
 (b) ensure that installation of your Modified Version does not prevent the
 user installing or running the Standard Version. In addition, the Modified
 Version must bear a name that is different from the name of the Standard Version.
-
 (c) allow anyone who receives a copy of the Modified Version to make the Source
 form of the Modified Version available to others under
 
-         (i) the Original License or
-
+          (i) the Original License or
 (ii) a license that permits the licensee to freely copy, modify and redistribute
 the Modified Version using the same licensing terms that apply to the copy
 that the licensee received, and requires that the Source form of the Modified
@@ -129,27 +104,27 @@ license fees are prohibited but Distributor Fees are allowed.
 Distribution of Compiled Forms of the Standard Version or Modified Versions
 without the Source
 
-(5) You may Distribute Compiled forms of the Standard Version without the
+(5)  You may Distribute Compiled forms of the Standard Version without the
 Source, provided that you include complete instructions on how to get the
-Source of the Standard Version. Such instructions must be valid at the time
-of your distribution. If these instructions, at any time while you are carrying
+Source of the Standard Version.  Such instructions must be valid at the time
+of your distribution.  If these instructions, at any time while you are carrying
 out such distribution, become invalid, you must provide new instructions on
 demand or cease further distribution. If you provide valid instructions or
 cease distribution within thirty days after you become aware that the instructions
 are invalid, then you do not forfeit any of your rights under this license.
 
-(6) You may Distribute a Modified Version in Compiled form without the Source,
+(6)  You may Distribute a Modified Version in Compiled form without the Source,
 provided that you comply with Section 4 with respect to the Source of the
 Modified Version.
 
 Aggregating or Linking the Package
 
-(7) You may aggregate the Package (either the Standard Version or Modified
+(7)  You may aggregate the Package (either the Standard Version or Modified
 Version) with other packages and Distribute the resulting aggregation provided
-that you do not charge a licensing fee for the Package. Distributor Fees are
-permitted, and licensing fees for other components in the aggregation are
-permitted. The terms of this license apply to the use and Distribution of
-the Standard or Modified Versions as included in the aggregation.
+that you do not charge a licensing fee for the Package.  Distributor Fees
+are permitted, and licensing fees for other components in the aggregation
+are permitted. The terms of this license apply to the use and Distribution
+of the Standard or Modified Versions as included in the aggregation.
 
 (8) You are permitted to link Modified and Standard Versions with other works,
 to embed the Package in a larger work of your own, or to build stand-alone
@@ -161,24 +136,24 @@ Items That are Not Considered Part of a Modified Version
 
 (9) Works (including, but not limited to, modules and scripts) that merely
 extend or make use of the Package, do not, by themselves, cause the Package
-to be a Modified Version. In addition, such works are not considered parts
+to be a Modified Version.  In addition, such works are not considered parts
 of the Package itself, and are not subject to the terms of this license.
 
 General Provisions
 
-(10) Any use, modification, and distribution of the Standard or Modified Versions
-is governed by this Artistic License. By using, modifying or distributing
+(10)  Any use, modification, and distribution of the Standard or Modified
+Versions is governed by this Artistic License. By using, modifying or distributing
 the Package, you accept this license. Do not use, modify, or distribute the
 Package, if you do not accept this license.
 
-(11) If your Modified Version has been derived from a Modified Version made
+(11)  If your Modified Version has been derived from a Modified Version made
 by someone other than you, you are nevertheless required to ensure that your
 Modified Version complies with the requirements of this license.
 
-(12) This license does not grant you the right to use any trademark, service
+(12)  This license does not grant you the right to use any trademark, service
 mark, tradename, or logo of the Copyright Holder.
 
-(13) This license includes the non-exclusive, worldwide, free-of-charge patent
+(13)  This license includes the non-exclusive, worldwide, free-of-charge patent
 license to make, have made, use, offer to sell, sell, import and otherwise
 transfer the Package with respect to any patent claims licensable by the Copyright
 Holder that are necessarily infringed by the Package. If you institute patent
@@ -187,8 +162,7 @@ that the Package constitutes direct or contributory patent infringement, then
 this Artistic License to you shall terminate on the date that such litigation
 is filed.
 
-   (14) Disclaimer of Warranty:
-
+(14)  Disclaimer of Warranty:
 THE PACKAGE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS "AS IS" AND
 WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES. THE IMPLIED WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT ARE DISCLAIMED TO THE
diff --git a/options/license/Autoconf-exception-3.0 b/options/license/Autoconf-exception-3.0
index 346c459f80..f212f9c7bc 100644
--- a/options/license/Autoconf-exception-3.0
+++ b/options/license/Autoconf-exception-3.0
@@ -1,6 +1,7 @@
 AUTOCONF CONFIGURE SCRIPT EXCEPTION
 
-Version 3.0, 18 August 2009 Copyright © 2009 Free Software Foundation, Inc. <http://fsf.org/>
+Version 3.0, 18 August 2009
+Copyright © 2009 Free Software Foundation, Inc. <http://fsf.org/>
 
 Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.
 
@@ -8,18 +9,18 @@ This Exception is an additional permission under section 7 of the GNU General Pu
 
 The purpose of this Exception is to allow distribution of Autoconf's typical output under terms of the recipient's choice (including proprietary).
 
-   0. Definitions.
+0. Definitions.
 
-   "Covered Code" is the source or object code of a version of Autoconf that is a covered work under this License.
+"Covered Code" is the source or object code of a version of Autoconf that is a covered work under this License.
 
-   "Normally Copied Code" for a version of Autoconf means all parts of its Covered Code which that version can copy from its code (i.e., not from its input file) into its minimally verbose, non-debugging and non-tracing output.
+"Normally Copied Code" for a version of Autoconf means all parts of its Covered Code which that version can copy from its code (i.e., not from its input file) into its minimally verbose, non-debugging and non-tracing output.
 
-   "Ineligible Code" is Covered Code that is not Normally Copied Code.
+"Ineligible Code" is Covered Code that is not Normally Copied Code.
 
-   1. Grant of Additional Permission.
+1. Grant of Additional Permission.
 
-   You have permission to propagate output of Autoconf, even if such propagation would otherwise violate the terms of GPLv3. However, if by modifying Autoconf you cause any Ineligible Code of the version you received to become Normally Copied Code of your modified version, then you void this Exception for the resulting covered work. If you convey that resulting covered work, you must remove this Exception in accordance with the second paragraph of Section 7 of GPLv3.
+You have permission to propagate output of Autoconf, even if such propagation would otherwise violate the terms of GPLv3. However, if by modifying Autoconf you cause any Ineligible Code of the version you received to become Normally Copied Code of your modified version, then you void this Exception for the resulting covered work. If you convey that resulting covered work, you must remove this Exception in accordance with the second paragraph of Section 7 of GPLv3.
 
-   2. No Weakening of Autoconf Copyleft.
+2. No Weakening of Autoconf Copyleft.
 
-   The availability of this Exception does not imply any general presumption that third-party software is unaffected by the copyleft requirements of the license of Autoconf.
+The availability of this Exception does not imply any general presumption that third-party software is unaffected by the copyleft requirements of the license of Autoconf.
diff --git a/options/license/BSD-1-Clause b/options/license/BSD-1-Clause
index 54ad9dca87..3b3c4e814b 100644
--- a/options/license/BSD-1-Clause
+++ b/options/license/BSD-1-Clause
@@ -1,18 +1,19 @@
-Copyright (c) <year> <owner> All rights reserved.
+Copyright (c) 1995, 1999 Berkeley Software Design, Inc.  All rights reserved.
 
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
 
-1. Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-
-THIS SOFTWARE IS PROVIDED BY Berkeley Software Design, Inc. "AS IS" AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL Berkeley Software Design, Inc. BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+THIS SOFTWARE IS PROVIDED BY Berkeley Software Design, Inc. ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL Berkeley Software Design, Inc. BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
diff --git a/options/license/BSD-2-Clause b/options/license/BSD-2-Clause
index 2d2bab1127..baa80b56a2 100644
--- a/options/license/BSD-2-Clause
+++ b/options/license/BSD-2-Clause
@@ -1,4 +1,4 @@
-Copyright (c) <year> <owner>. All rights reserved.
+Copyright (c) <year> <owner> All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
 are permitted provided that the following conditions are met:
diff --git a/options/license/BSD-3-Clause-Clear b/options/license/BSD-3-Clause-Clear
index 40066db07d..c3e519961f 100644
--- a/options/license/BSD-3-Clause-Clear
+++ b/options/license/BSD-3-Clause-Clear
@@ -1,5 +1,6 @@
-The Clear BSD License Copyright (c) [xxxx]-[xxxx] [Owner Organization]
+The Clear BSD License
 
+Copyright (c) [xxxx]-[xxxx] [Owner Organization]
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
diff --git a/options/license/BSD-3-Clause-LBNL b/options/license/BSD-3-Clause-LBNL
index 8a8e3e6888..376b540f15 100644
--- a/options/license/BSD-3-Clause-LBNL
+++ b/options/license/BSD-3-Clause-LBNL
@@ -1,9 +1,8 @@
 Copyright (c) 2003, The Regents of the University of California, through Lawrence
 Berkeley National Laboratory (subject to receipt of any required approvals
-from the U.S. Dept. of Energy). All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
+from the U.S. Dept. of Energy). All rights reserved. Redistribution and use
+in source and binary forms, with or without modification, are permitted provided
+that the following conditions are met:
 
 (1) Redistributions of source code must retain the above copyright notice,
 this list of conditions and the following disclaimer.
@@ -20,20 +19,20 @@ prior written permission.
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER , THE UNITED STATES
-GOVERNMENT, OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
-IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
 
 You are under no obligation whatsoever to provide any bug fixes, patches,
 or upgrades to the features, functionality or performance of the source code
 ("Enhancements") to anyone; however, if you choose to make your Enhancements
-available either publicly, or directly to Lawrence Berkeley National Laboratory
-, without imposing a separate written license agreement for such Enhancements,
+available either publicly, or directly to Lawrence Berkeley National Laboratory,
+without imposing a separate written license agreement for such Enhancements,
 then you hereby grant the following license: a non-exclusive, royalty-free
 perpetual license to install, use, modify, prepare derivative works, incorporate
 into other computer software, distribute, and sublicense such Enhancements
diff --git a/options/license/BSD-3-Clause-No-Nuclear-License b/options/license/BSD-3-Clause-No-Nuclear-License
index 6a5893889e..25dc09f4b5 100644
--- a/options/license/BSD-3-Clause-No-Nuclear-License
+++ b/options/license/BSD-3-Clause-No-Nuclear-License
@@ -1,3 +1,4 @@
+
 Copyright 1994-2009 Sun Microsystems, Inc. All Rights Reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
diff --git a/options/license/BSD-3-Clause-No-Nuclear-License-2014 b/options/license/BSD-3-Clause-No-Nuclear-License-2014
index 6695c579c1..3958fff4eb 100644
--- a/options/license/BSD-3-Clause-No-Nuclear-License-2014
+++ b/options/license/BSD-3-Clause-No-Nuclear-License-2014
@@ -1,3 +1,4 @@
+
 Copyright © 2008, 2014 Oracle and/or its affiliates. All rights reserved.
 
 Use is subject to license terms.
diff --git a/options/license/BSD-3-Clause-No-Nuclear-Warranty b/options/license/BSD-3-Clause-No-Nuclear-Warranty
index 3ffe250f0b..9800d4a054 100644
--- a/options/license/BSD-3-Clause-No-Nuclear-Warranty
+++ b/options/license/BSD-3-Clause-No-Nuclear-Warranty
@@ -1,3 +1,4 @@
+
 Copyright (c) 2003-2005 Sun Microsystems, Inc. All Rights Reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
diff --git a/options/license/BSD-3-Clause-Open-MPI b/options/license/BSD-3-Clause-Open-MPI
index cec800d81b..166a95b130 100644
--- a/options/license/BSD-3-Clause-Open-MPI
+++ b/options/license/BSD-3-Clause-Open-MPI
@@ -1,30 +1,34 @@
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
 
-- Redistributions of source code must retain the above copyright notice, this
-list of conditions and the following disclaimer.
+- Redistributions of source code must retain the above copyright
+  notice, this list of conditions and the following disclaimer.
 
-- Redistributions in binary form must reproduce the above copyright notice,
-this list of conditions and the following disclaimer listed in this license
-in the documentation and/or other materials provided with the distribution.
+- Redistributions in binary form must reproduce the above copyright
+  notice, this list of conditions and the following disclaimer listed
+  in this license in the documentation and/or other materials
+  provided with the distribution.
 
-- Neither the name of the copyright holders nor the names of its contributors
-may be used to endorse or promote products derived from this software without
-specific prior written permission.
+- Neither the name of the copyright holders nor the names of its
+  contributors may be used to endorse or promote products derived from
+  this software without specific prior written permission.
 
-The copyright holders provide no reassurances that the source code provided
-does not infringe any patent, copyright, or any other intellectual property
-rights of third parties. The copyright holders disclaim any liability to any
-recipient for claims brought against recipient by any third party for infringement
-of that parties intellectual property rights.
+The copyright holders provide no reassurances that the source code
+provided does not infringe any patent, copyright, or any other
+intellectual property rights of third parties.  The copyright holders
+disclaim any liability to any recipient for claims brought against
+recipient by any third party for infringement of that parties
+intellectual property rights.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/options/license/BSD-4-Clause b/options/license/BSD-4-Clause
index 34b7498064..c0fcf169ff 100644
--- a/options/license/BSD-4-Clause
+++ b/options/license/BSD-4-Clause
@@ -12,8 +12,7 @@ and/or other materials provided with the distribution.
 
 3. All advertising materials mentioning features or use of this software must
 display the following acknowledgement:
-
-   This product includes software developed by the organization .
+This product includes software developed by the the organization.
 
 4. Neither the name of the copyright holder nor the names of its contributors
 may be used to endorse or promote products derived from this software without
diff --git a/options/license/BSD-4-Clause-UC b/options/license/BSD-4-Clause-UC
index 77562b7a51..8214359037 100644
--- a/options/license/BSD-4-Clause-UC
+++ b/options/license/BSD-4-Clause-UC
@@ -21,7 +21,7 @@ by the University of California, Berkeley and its contributors.
 be used to endorse or promote products derived from this software without
 specific prior written permission.
 
-THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ''AS IS'' AND ANY
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY
 EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
 IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
diff --git a/options/license/BSD-Protection b/options/license/BSD-Protection
index 0d59ce600f..a0f5bcc106 100644
--- a/options/license/BSD-Protection
+++ b/options/license/BSD-Protection
@@ -1,7 +1,7 @@
 BSD Protection License
+February 2002
 
-February 2002 Preamble
-
+Preamble
 --------
 
 The Berkeley Software Distribution ("BSD") license has proven very effective
@@ -42,78 +42,66 @@ The precise terms and conditions for copying, distribution, and modification
 follow.
 
 BSD PROTECTION LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION, AND
-MODIFICATION ----------------------------------------------------------------
+MODIFICATION
+----------------------------------------------------------------
 
-   0. Definitions.
+0. Definitions.
 
 a) "Program", below, refers to any program or work distributed under the terms
 of this license.
-
 b) A "work based on the Program", below, refers to either the Program or any
 derivative work under copyright law.
+     c) "Modification", below, refers to the act of creating derivative works.
+     d) "You", below, refers to each licensee.
 
-      c) "Modification", below, refers to the act of creating derivative works.
-
-      d) "You", below, refers to each licensee.
-
-   1. Scope.
-
+1. Scope.
 This license governs the copying, distribution, and modification of the Program.
 Other activities are outside the scope of this license; The act of running
 the Program is not restricted, and the output from the Program is covered
 only if its contents constitute a work based on the Program.
 
-   2. Verbatim copies.
-
+2. Verbatim copies.
 You may copy and distribute verbatim copies of the Program as you receive
 it, in any medium, provided that you conspicuously and appropriately publish
 on each copy an appropriate copyright notice; keep intact all the notices
 that refer to this License and to the absence of any warranty; and give any
 other recipients of the Program a copy of this License along with the Program.
 
-   3. Modification and redistribution under closed license.
-
+3. Modification and redistribution under closed license.
 You may modify your copy or copies of the Program, and distribute the resulting
 derivative works, provided that you meet the following conditions:
 
 a) The copyright notice and disclaimer on the Program must be reproduced and
 included in the source code, documentation, and/or other materials provided
 in a manner in which such notices are normally distributed.
-
 b) The derivative work must be clearly identified as such, in order that it
 may not be confused with the original work.
-
 c) The license under which the derivative work is distributed must expressly
 prohibit the distribution of further derivative works.
 
-   4. Modification and redistribution under open license.
-
+4. Modification and redistribution under open license.
 You may modify your copy or copies of the Program, and distribute the resulting
 derivative works, provided that you meet the following conditions:
 
 a) The copyright notice and disclaimer on the Program must be reproduced and
 included in the source code, documentation, and/or other materials provided
 in a manner in which such notices are normally distributed.
-
 b) You must clearly indicate the nature and date of any changes made to the
 Program. The full details need not necessarily be included in the individual
 modified files, provided that each modified file is clearly marked as such
 and instructions are included on where the full details of the modifications
 may be found.
-
 c) You must cause any work that you distribute or publish, that in whole or
 in part contains or is derived from the Program or any part thereof, to be
 licensed as a whole at no charge to all third parties under the terms of this
 License.
 
-   5. Implied acceptance.
-
+5. Implied acceptance.
 You may not copy or distribute the Program or any derivative works except
 as expressly provided under this license. Consequently, any such action will
 be taken as implied acceptance of the terms of this license.
 
-   6. NO WARRANTY.
-
+6. NO WARRANTY.
 THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
 BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
 FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER,
diff --git a/options/license/BSD-Source-Code b/options/license/BSD-Source-Code
index 616f937f37..6c4651eb38 100644
--- a/options/license/BSD-Source-Code
+++ b/options/license/BSD-Source-Code
@@ -1,5 +1,4 @@
 Copyright (c) 2011, Deusty, LLC
-
 All rights reserved.
 
 Redistribution and use of this software in source and binary forms, with or
diff --git a/options/license/BUSL-1.1 b/options/license/BUSL-1.1
new file mode 100644
index 0000000000..2ef98f1be3
--- /dev/null
+++ b/options/license/BUSL-1.1
@@ -0,0 +1,71 @@
+Business Source License 1.1
+
+License text copyright © 2017 MariaDB Corporation Ab, All Rights Reserved.
+"Business Source License" is a trademark of MariaDB Corporation Ab.
+
+Terms
+
+The Licensor hereby grants you the right to copy, modify, create derivative
+works, redistribute, and make non-production use of the Licensed Work. The
+Licensor may make an Additional Use Grant, above, permitting limited
+production use.
+
+Effective on the Change Date, or the fourth anniversary of the first publicly
+available distribution of a specific version of the Licensed Work under this
+License, whichever comes first, the Licensor hereby grants you rights under
+the terms of the Change License, and the rights granted in the paragraph
+above terminate.
+
+If your use of the Licensed Work does not comply with the requirements
+currently in effect as described in this License, you must purchase a
+commercial license from the Licensor, its affiliated entities, or authorized
+resellers, or you must refrain from using the Licensed Work.
+
+All copies of the original and modified Licensed Work, and derivative works
+of the Licensed Work, are subject to this License. This License applies
+separately for each version of the Licensed Work and the Change Date may vary
+for each version of the Licensed Work released by Licensor.
+
+You must conspicuously display this License on each original or modified copy
+of the Licensed Work. If you receive the Licensed Work in original or
+modified form from a third party, the terms and conditions set forth in this
+License apply to your use of that work.
+
+Any use of the Licensed Work in violation of this License will automatically
+terminate your rights under this License for the current and all other
+versions of the Licensed Work.
+
+This License does not grant you any right in any trademark or logo of
+Licensor or its affiliates (provided that you may use a trademark or logo of
+Licensor as expressly required by this License).
+
+TO THE EXTENT PERMITTED BY APPLICABLE LAW, THE LICENSED WORK IS PROVIDED ON
+AN “AS IS” BASIS. LICENSOR HEREBY DISCLAIMS ALL WARRANTIES AND CONDITIONS,
+EXPRESS OR IMPLIED, INCLUDING (WITHOUT LIMITATION) WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, AND
+TITLE.
+
+MariaDB hereby grants you permission to use this License’s text to license
+your works, and to refer to it using the trademark “Business Source License”,
+as long as you comply with the Covenants of Licensor below.
+
+Covenants of Licensor
+
+In consideration of the right to use this License’s text and the “Business
+Source License” name and trademark, Licensor covenants to MariaDB, and to all
+other recipients of the licensed work to be provided by Licensor:
+
+1. To specify as the Change License the GPL Version 2.0 or any later version,
+   or a license that is compatible with GPL Version 2.0 or a later version,
+   where “compatible” means that software provided under the Change License can
+   be included in a program with software provided under GPL Version 2.0 or a
+   later version. Licensor may specify additional Change Licenses without
+   limitation.
+
+2. To either: (a) specify an additional grant of rights to use that does not
+   impose any additional restriction on the right granted in this License, as
+   the Additional Use Grant; or (b) insert the text “None”.
+
+3. To specify a Change Date.
+
+4. Not to modify this License in any other way.
diff --git a/options/license/Bahyph b/options/license/Bahyph
index 1c2d294f53..0f7344eece 100644
--- a/options/license/Bahyph
+++ b/options/license/Bahyph
@@ -12,12 +12,14 @@ can Julio Sanchez, GMV, Jos'e A. Ma~nas or any agents or representatives thereof
 be held responsible for any errors in this software nor for any damages derived
 from its use, even in case any of the above has been notified of the possibility
 of such damages. If any such situation arises, you responsible for repair.
-Use of this software is an explicit acceptance of these conditions.
+Use of this software is an explicit  acceptance of these conditions.
 
-You can use this software for any purpose. You cannot delete this copyright
+You can use this software for any purpose. You cannot delete this  copyright
 notice. If you change this software, you must include comments explaining
 who, when and why. You are kindly requested to send any changes to tex@gmv.es.
 If you change the generating script, you must include code in it such that
-any output is clearly labeled as generated by a modified script. Despite the
-lack of warranty, we would like to hear about any problem you find. Please
-report problems to tex@gmv.es. END OF COPYRIGHT NOTICE
+any output is clearly labeled as generated by a modified script.   Despite
+the lack of warranty, we would like to hear about any problem you find. Please
+report problems to tex@gmv.es.
+
+END OF COPYRIGHT NOTICE
diff --git a/options/license/Barr b/options/license/Barr
index 46f633b8d6..da9ef0f4cc 100644
--- a/options/license/Barr
+++ b/options/license/Barr
@@ -1,8 +1,8 @@
-This is a package of commutative diagram macros built on top of Xy-pic by
-Michael Barr (email: barr@barrs.org). Its use is unrestricted. It may be freely
-distributed, unchanged, for non-commercial or commercial use. If changed,
-it must be renamed. Inclusion in a commercial software package is also permitted,
-but I would appreciate receiving a free copy for my personal examination and
-use. There are no guarantees that this package is good for anything. I have
-tested it with LaTeX 2e, LaTeX 2.09 and Plain TeX. Although I know of no reason
-it will not work with AMSTeX, I have not tested it.
+This is a package of commutative diagram macros built on top of Xy-pic  by
+Michael Barr (email: barr@barrs.org). Its use is unrestricted. It  may be
+freely distributed, unchanged, for non-commercial or commercial  use. If changed,
+it must be renamed. Inclusion in a commercial  software package is also permitted,
+but I would appreciate receiving a  free copy for my personal examination
+and use. There are no guarantees  that this package is good for anything.
+I have tested it with LaTeX 2e,  LaTeX 2.09 and Plain TeX. Although I know
+of no reason it will not work  with AMSTeX, I have not tested it.
diff --git a/options/license/Beerware b/options/license/Beerware
index 6df3cc616c..63d85bf8f0 100644
--- a/options/license/Beerware
+++ b/options/license/Beerware
@@ -1,5 +1,4 @@
-"THE BEER-WARE LICENSE" (Revision 42):
-
-<phk@FreeBSD.ORG> wrote this file. As long as you retain this notice you can
-do whatever you want with this stuff. If we meet some day, and you think this
-stuff is worth it, you can buy me a beer in return Poul-Henning Kamp
+"THE BEER-WARE LICENSE" (Revision 42):  <phk@FreeBSD.ORG> wrote this file.
+As long as you retain this notice you  can do whatever you want with this
+stuff. If we meet some day, and you think  this stuff is worth it, you can
+buy me a beer in return Poul-Henning Kamp
diff --git a/options/license/BitTorrent-1.0 b/options/license/BitTorrent-1.0
index ced0c46877..5dc017c475 100644
--- a/options/license/BitTorrent-1.0
+++ b/options/license/BitTorrent-1.0
@@ -3,406 +3,521 @@ BitTorrent Open Source License
 Version 1.0
 
 This BitTorrent Open Source License (the "License") applies to the BitTorrent
-client and related software products as well as any updates or maintenance
-releases of that software ("BitTorrent Products") that are distributed by
-BitTorrent, Inc. ("Licensor"). Any BitTorrent Product licensed pursuant to
-this License is a Licensed Product. Licensed Product, in its entirety, is
-protected by U.S. copyright law. This License identifies the terms under which
+client and related software products as
+well as any updates or maintenance releases of that software ("BitTorrent
+Products") that are distributed by
+BitTorrent, Inc. ("Licensor").  Any BitTorrent Product licensed pursuant to
+this License is a Licensed Product.
+Licensed Product, in its entirety, is protected by U.S. copyright law.  This
+License identifies the terms under which
 you may use, copy, distribute or modify Licensed Product.
 
 Preamble
 
 This Preamble is intended to describe, in plain English, the nature and scope
-of this License. However, this Preamble is not a part of this license. The
-legal effect of this License is dependent only upon the terms of the License
-and not this Preamble.
+of this License.  However, this
+Preamble is not a part of this license.  The legal effect of this License
+is dependent only upon the terms of the
+License and not this Preamble.
 
 This License complies with the Open Source Definition and is derived from
-the Jabber Open Source License 1.0 (the "JOSL"), which has been approved by
-Open Source Initiative. Sections 4(c) and 4(f)(iii) from the JOSL have been
+the Jabber Open Source License 1.0 (the
+"JOSL"), which has been approved by Open Source Initiative. Sections 4(c)
+and 4(f)(iii) from the JOSL have been
 dropped.
 
 This License provides that:
 
-1. You may use, sell or give away the Licensed Product, alone or as a component
-of an aggregate software distribution containing programs from several different
-sources. No royalty or other fee is required.
+1.      You may use, sell or give away the Licensed Product, alone or as a
+component of an aggregate software
+distribution containing programs from several different sources.  No royalty
+or other fee is required.
 
-2. Both Source Code and executable versions of the Licensed Product, including
-Modifications made by previous Contributors, are available for your use. (The
-terms "Licensed Product," "Modifications," "Contributors" and "Source Code"
-are defined in the License.)
+2.      Both Source Code and executable versions of the Licensed Product,
+including Modifications made by previous
+Contributors, are available for your use.  (The terms "Licensed Product,"
+"Modifications," "Contributors" and "Source
+Code" are defined in the License.)
 
-3. You are allowed to make Modifications to the Licensed Product, and you
-can create Derivative Works from it. (The term "Derivative Works" is defined
-in the License.)
+3.      You are allowed to make Modifications to the Licensed Product, and
+you can create Derivative Works from it.
+(The term "Derivative Works" is defined in the License.)
 
-4. By accepting the Licensed Product under the provisions of this License,
-you agree that any Modifications you make to the Licensed Product and then
-distribute are governed by the provisions of this License. In particular,
-you must make the Source Code of your Modifications available to others.
+4.      By accepting the Licensed Product under the provisions of this License,
+you agree that any Modifications you
+make to the Licensed Product and then distribute are governed by the provisions
+of this License.  In particular, you
+must make the Source Code of your Modifications available to others.
 
-5. You may use the Licensed Product for any purpose, but the Licensor is not
-providing you any warranty whatsoever, nor is the Licensor accepting any liability
-in the event that the Licensed Product doesn't work properly or causes you
-any injury or damages.
+5.      You may use the Licensed Product for any purpose, but the Licensor
+is not providing you any warranty
+whatsoever, nor is the Licensor accepting any liability in the event that
+the Licensed Product doesn't work properly
+or causes you any injury or damages.
 
-6. If you sublicense the Licensed Product or Derivative Works, you may charge
-fees for warranty or support, or for accepting indemnity or liability obligations
-to your customers. You cannot charge for the Source Code.
+6.      If you sublicense the Licensed Product or Derivative Works, you may
+charge fees for warranty or support, or
+for accepting indemnity or liability obligations to your customers.  You cannot
+charge for the Source Code.
 
-7. If you assert any patent claims against the Licensor relating to the Licensed
-Product, or if you breach any terms of the License, your rights to the Licensed
-Product under this License automatically terminate.
+7.      If you assert any patent claims against the Licensor relating to the
+Licensed Product, or if you breach any
+terms of the License, your rights to the Licensed Product under this License
+automatically terminate.
 
 You may use this License to distribute your own Derivative Works, in which
-case the provisions of this License will apply to your Derivative Works just
-as they do to the original Licensed Product.
+case the provisions of this License will
+apply to your Derivative Works just as they do to the original Licensed Product.
 
 Alternatively, you may distribute your Derivative Works under any other OSI-approved
-Open Source license, or under a proprietary license of your choice. If you
-use any license other than this License, however, you must continue to fulfill
-the requirements of this License (including the provisions relating to publishing
-the Source Code) for those portions of your Derivative Works that consist
-of the Licensed Product, including the files containing Modifications.
+Open Source license, or under a
+proprietary license of your choice.  If you use any license other than this
+License, however, you must continue to
+fulfill the requirements of this License (including the provisions relating
+to publishing the Source Code) for those
+portions of your Derivative Works that consist of the Licensed Product, including
+the files containing Modifications.
 
-New versions of this License may be published from time to time. You may choose
-to continue to use the license terms in this version of the License or those
-from the new version. However, only the Licensor has the right to change the
-License terms as they apply to the Licensed Product.
+New versions of this License may be published from time to time.  You may
+choose to  continue to use the license
+terms in this version of the License or those from the new version.  However,
+only the Licensor has the right to
+change the License terms as they apply to the Licensed Product.
+
+This License relies on precise definitions for certain terms.  Those terms
+are defined when they are first used, and
+the definitions are repeated for your convenience in a Glossary at the end
+of the License.
 
-This License relies on precise definitions for certain terms. Those terms
-are defined when they are first used, and the definitions are repeated for
-your convenience in a Glossary at the end of the License.
 
 License Terms
 
-1. Grant of License From Licensor. Licensor hereby grants you a world-wide,
-royalty-free, non-exclusive license, subject to third party intellectual property
-claims, to do the following:
-
-a. Use, reproduce, modify, display, perform, sublicense and distribute any
-Modifications created by such Contributor or portions thereof, in both Source
-Code or as an executable program, either on an unmodified basis or as part
-of Derivative Works.
-
-b. Under claims of patents now or hereafter owned or controlled by Contributor,
-to make, use, sell, offer for sale, have made, and/or otherwise dispose of
-Modifications or portions thereof, but solely to the extent that any such
-claim is necessary to enable you to make, use, sell, offer for sale, have
-made, and/or otherwise dispose of Modifications or portions thereof or Derivative
-Works thereof.
-
-2. Grant of License to Modifications From Contributor. "Modifications" means
-any additions to or deletions from the substance or structure of (i) a file
-containing Licensed Product, or (ii) any new file that contains any part of
-Licensed Product. Hereinafter in this License, the term "Licensed Product"
-shall include all previous Modifications that you receive from any Contributor.
-By application of the provisions in Section 4(a) below, each person or entity
-who created or contributed to the creation of, and distributed, a Modification
-(a "Contributor") hereby grants you a world-wide, royalty-free, non-exclusive
+1.      Grant of License From Licensor.  Licensor hereby grants you a world-wide,
+royalty-free, non-exclusive
 license, subject to third party intellectual property claims, to do the following:
 
-a. Use, reproduce, modify, display, perform, sublicense and distribute any
-Modifications created by such Contributor or portions thereof, in both Source
-Code or as an executable program, either on an unmodified basis or as part
-of Derivative Works.
+a.       Use, reproduce, modify, display, perform, sublicense and distribute
+any Modifications created by such
+Contributor or portions thereof, in both Source Code or as an executable program,
+either on an unmodified basis or as
+part of Derivative Works.
 
-b. Under claims of patents now or hereafter owned or controlled by Contributor,
-to make, use, sell, offer for sale, have made, and/or otherwise dispose of
-Modifications or portions thereof, but solely to the extent that any such
-claim is necessary to enable you to make, use, sell, offer for sale, have
-made, and/or otherwise dispose of Modifications or portions thereof or Derivative
-Works thereof.
+b.       Under claims of patents now or hereafter owned or controlled by Contributor,
+to make, use, sell, offer for
+sale, have made, and/or otherwise dispose of Modifications or portions thereof,
+but solely to the extent that any
+such claim is necessary to enable you to make, use, sell, offer for sale,
+have made, and/or otherwise dispose of
+Modifications or portions thereof or Derivative Works thereof.
 
-3. Exclusions From License Grant. Nothing in this License shall be deemed
-to grant any rights to trademarks, copyrights, patents, trade secrets or any
-other intellectual property of Licensor or any Contributor except as expressly
-stated herein. No patent license is granted separate from the Licensed Product,
-for code that you delete from the Licensed Product, or for combinations of
-the Licensed Product with other software or hardware. No right is granted
-to the trademarks of Licensor or any Contributor even if such marks are included
-in the Licensed Product. Nothing in this License shall be interpreted to prohibit
-Licensor from licensing under different terms from this License any code that
-Licensor otherwise would have a right to license.
 
-   4. Your Obligations Regarding Distribution.
+2. Grant of License to Modifications From Contributor. "Modifications" means
+any additions to or deletions from the
+substance or structure of (i) a file containing Licensed Product, or (ii)
+any new file that contains any part of
+Licensed Product. Hereinafter in this License, the term "Licensed Product"
+shall include all previous Modifications
+that you receive from any Contributor. By application of the provisions in
+Section 4(a) below, each person or entity
+who created or contributed to the creation of, and distributed, a Modification
+(a "Contributor") hereby grants you a
+world-wide, royalty-free, non-exclusive license, subject to third party intellectual
+property claims, to do the
+following:
 
-a. Application of This License to Your Modifications. As an express condition
-for your use of the Licensed Product, you hereby agree that any Modifications
-that you create or to which you contribute, and which you distribute, are
-governed by the terms of this License including, without limitation, Section
-2. Any Modifications that you create or to which you contribute may be distributed
-only under the terms of this License or a future version of this License released
-under Section 7. You must include a copy of this License with every copy of
-the Modifications you distribute. You agree not to offer or impose any terms
-on any Source Code or executable version of the Licensed Product or Modifications
-that alter or restrict the applicable version of this License or the recipients'
-rights hereunder. However, you may include an additional document offering
-the additional rights described in Section 4(d).
+1. Use, reproduce, modify, display, perform, sublicense and distribute any
+Modifications created by such
+Contributor or portions thereof, in both Source Code or as an executable program,
+either on an unmodified basis or as
+part of Derivative Works.
 
-b. Availability of Source Code. You must make available, under the terms of
-this License, the Source Code of the Licensed Product and any Modifications
-that you distribute, either on the same media as you distribute any executable
-or other form of the Licensed Product, or via a mechanism generally accepted
-in the software development community for the electronic transfer of data
-(an "Electronic Distribution Mechanism"). The Source Code for any version
-of Licensed Product or Modifications that you distribute must remain available
-for at least twelve (12) months after the date it initially became available,
-or at least six (6) months after a subsequent version of said Licensed Product
-or Modifications has been made available. You are responsible for ensuring
-that the Source Code version remains available even if the Electronic Distribution
-Mechanism is maintained by a third party.
+2. Under claims of patents now or hereafter owned or controlled by Contributor,
+to make, use, sell, offer for
+sale, have made, and/or otherwise dispose of Modifications or portions thereof,
+but solely to the extent that any
+such claim is necessary to enable you to make, use, sell, offer for sale,
+have made, and/or otherwise dispose of
+Modifications or portions thereof or Derivative Works thereof.
 
-      c. Intellectual Property Matters.
 
-i. Third Party Claims. If you have knowledge that a license to a third party's
-intellectual property right is required to exercise the rights granted by
-this License, you must include a text file with the Source Code distribution
-titled "LEGAL" that describes the claim and the party making the claim in
-sufficient detail that a recipient will know whom to contact. If you obtain
-such knowledge after you make any Modifications available as described in
-Section 4(b), you shall promptly modify the LEGAL file in all copies you make
+3.      Exclusions From License Grant.  Nothing in this License shall be deemed
+to grant any rights to trademarks,
+copyrights, patents, trade secrets or any other intellectual property of Licensor
+or any Contributor except as
+expressly stated herein. No patent license is granted separate from the Licensed
+Product, for code that you delete
+from the Licensed Product, or for combinations of the Licensed Product with
+other software or hardware.  No right is
+granted to the trademarks of Licensor or any Contributor even if such marks
+are included in the Licensed Product.
+Nothing in this License shall be interpreted to prohibit Licensor from licensing
+under different terms from this
+License any code that Licensor otherwise would have a right to license.
+
+
+4.      Your Obligations Regarding Distribution.
+
+a.       Application of This License to Your Modifications.  As an express
+condition for your use of the Licensed
+Product, you hereby agree that any Modifications that you create or to which
+you contribute, and which you
+distribute, are governed by the terms of this License including, without limitation,
+Section 2.  Any Modifications
+that you create or to which you contribute may be distributed only under the
+terms of this License or a future
+version of this License released under Section 7.  You must include a copy
+of this License with every copy of the
+Modifications you distribute.  You agree not to offer or impose any terms
+on any Source Code or executable version of
+the Licensed Product or Modifications that alter or restrict the applicable
+version of this License or the
+recipients' rights hereunder. However, you may include an additional document
+offering the additional rights
+described in Section 4(d).
+
+b.       Availability of Source Code.  You must make available, under the
+terms of this License, the Source Code of
+the Licensed Product and any Modifications that you distribute, either on
+the same media as you distribute any
+executable or other form of the Licensed Product, or via a mechanism generally
+accepted in the software development
+community for the electronic transfer of data (an "Electronic Distribution
+Mechanism").  The Source Code for any
+version of Licensed Product or Modifications that you distribute must remain
+available for at least twelve (12)
+months after the date it initially became available, or at least six (6) months
+after a subsequent version of said
+Licensed Product or Modifications has been made available.  You are responsible
+for ensuring that the Source Code
+version remains available even if the Electronic Distribution Mechanism is
+maintained by a third party.
+
+c.       Intellectual Property Matters.
+
+i.            Third Party Claims.  If you have knowledge that a license to
+a third
+party's intellectual property right is required to exercise the rights granted
+by this License, you must include a
+text file with the Source Code distribution titled "LEGAL" that describes
+the claim and the party making the claim in
+sufficient detail that a recipient will know whom to contact.  If you obtain
+such knowledge after you make any
+Modifications available as described in Section 4(b), you shall promptly modify
+the LEGAL file in all copies you make
 available thereafter and shall take other steps (such as notifying appropriate
-mailing lists or newsgroups) reasonably calculated to inform those who received
-the Licensed Product from you that new knowledge has been obtained.
+mailing lists or newsgroups)
+reasonably calculated to inform those who received the Licensed Product from
+you that new knowledge has been
+obtained.
 
-ii. Contributor APIs. If your Modifications include an application programming
-interface ("API") and you have knowledge of patent licenses that are reasonably
-necessary to implement that API, you must also include this information in
-the LEGAL file.
+ii.            Contributor APIs.  If your Modifications include an application
+programming interface ("API") and you have knowledge of patent licenses that
+are reasonably necessary to implement
+that API, you must also include this information in the LEGAL file.
 
-iii. Representations. You represent that, except as disclosed pursuant to
+iii.            Representations.  You represent that, except as disclosed
+pursuant to
 4(c)(i) above, you believe that any Modifications you distribute are your
-original creations and that you have sufficient rights to grant the rights
-conveyed by this License.
+original creations and that you have
+sufficient rights to grant the rights conveyed by this License.
 
-d. Required Notices. You must duplicate this License in any documentation
-you provide along with the Source Code of any Modifications you create or
-to which you contribute, and which you distribute, wherever you describe recipients'
-rights relating to Licensed Product. You must duplicate the notice contained
-in Exhibit A (the "Notice") in each file of the Source Code of any copy you
-distribute of the Licensed Product. If you created a Modification, you may
-add your name as a Contributor to the Notice. If it is not possible to put
-the Notice in a particular Source Code file due to its structure, then you
-must include such Notice in a location (such as a relevant directory file)
-where a user would be likely to look for such a notice. You may choose to
-offer, and charge a fee for, warranty, support, indemnity or liability obligations
-to one or more recipients of Licensed Product. However, you may do so only
-on your own behalf, and not on behalf of the Licensor or any Contributor.
-You must make it clear that any such warranty, support, indemnity or liability
-obligation is offered by you alone, and you hereby agree to indemnify the
+d.       Required Notices.  You must duplicate this License in any documentation
+you provide along with the Source
+Code of any Modifications you create or to which you contribute, and which
+you distribute, wherever you describe
+recipients' rights relating to Licensed Product.  You must duplicate the notice
+contained in Exhibit A (the "Notice")
+in each file of the Source Code of any copy you distribute of the Licensed
+Product. If you created a Modification,
+you may add your name as a Contributor to the Notice.  If it is not possible
+to put the Notice in a particular Source
+Code file due to its structure, then you must include such Notice in a location
+(such as a relevant directory file)
+where a user would be likely to look for such a notice.  You may choose to
+offer, and charge a fee for, warranty,
+support, indemnity or liability obligations to one or more recipients of Licensed
+Product. However, you may do so
+only on your own behalf, and not on behalf of the Licensor or any Contributor.
+You must make it clear that any such
+warranty, support, indemnity or liability obligation is offered by you alone,
+and you hereby agree to indemnify the
 Licensor and every Contributor for any liability incurred by the Licensor
-or such Contributor as a result of warranty, support, indemnity or liability
-terms you offer.
+or such Contributor as a result of
+warranty, support, indemnity or liability terms you offer.
 
-e. Distribution of Executable Versions. You may distribute Licensed Product
-as an executable program under a license of your choice that may contain terms
-different from this License provided (i) you have satisfied the requirements
-of Sections 4(a) through 4(d) for that distribution, (ii) you include a conspicuous
-notice in the executable version, related documentation and collateral materials
-stating that the Source Code version of the Licensed Product is available
-under the terms of this License, including a description of how and where
-you have fulfilled the obligations of Section 4(b), and (iii) you make it
-clear that any terms that differ from this License are offered by you alone,
-not by Licensor or any Contributor. You hereby agree to indemnify the Licensor
-and every Contributor for any liability incurred by Licensor or such Contributor
-as a result of any terms you offer.
+e.        Distribution of Executable Versions.  You may distribute Licensed
+Product as an executable program under a
+license of your choice that may contain terms different from this License
+provided (i) you have satisfied the
+requirements of Sections 4(a) through 4(d) for that distribution, (ii) you
+include a conspicuous notice in the
+executable version, related documentation and collateral materials stating
+that the Source Code version of the
+Licensed Product is available under the terms of this License, including a
+description of how and where you have
+fulfilled the obligations of Section 4(b), and (iii) you make it clear that
+any terms that differ from this License
+are offered by you alone, not by Licensor or any Contributor.  You hereby
+agree to indemnify the Licensor and every
+Contributor for any liability incurred by Licensor or such Contributor as
+a result of any terms you offer.
 
-f. Distribution of Derivative Works. You may create Derivative Works (e.g.,
-combinations of some or all of the Licensed Product with other code) and distribute
-the Derivative Works as products under any other license you select, with
-the proviso that the requirements of this License are fulfilled for those
-portions of the Derivative Works that consist of the Licensed Product or any
-Modifications thereto.
+f.       Distribution of Derivative Works.  You may create Derivative Works
+(e.g., combinations of some or all of the
+Licensed Product with other code) and distribute the Derivative Works as products
+under any other license you select,
+with the proviso that the requirements of this License are fulfilled for those
+portions of the Derivative Works that
+consist of the Licensed Product or any Modifications thereto.
 
-5. Inability to Comply Due to Statute or Regulation. If it is impossible for
-you to comply with any of the terms of this License with respect to some or
-all of the Licensed Product due to statute, judicial order, or regulation,
-then you must (i) comply with the terms of this License to the maximum extent
-possible, (ii) cite the statute or regulation that prohibits you from adhering
-to the License, and (iii) describe the limitations and the code they affect.
-Such description must be included in the LEGAL file described in Section 4(d),
-and must be included with all distributions of the Source Code. Except to
-the extent prohibited by statute or regulation, such description must be sufficiently
-detailed for a recipient of ordinary skill at computer programming to be able
-to understand it.
 
-6. Application of This License. This License applies to code to which Licensor
-or Contributor has attached the Notice in Exhibit A, which is incorporated
-herein by this reference.
+5.      Inability to Comply Due to Statute or Regulation.  If it is impossible
+for you to comply with any of the
+terms of this License with respect to some or all of the Licensed Product
+due to statute, judicial order, or
+regulation, then you must (i) comply with the terms of this License to the
+maximum extent possible, (ii) cite the
+statute or regulation that prohibits you from adhering to the License, and
+(iii) describe the limitations and the
+code they affect. Such description must be included in the LEGAL file described
+in Section 4(d), and must be included
+with all distributions of the Source Code.  Except to the extent prohibited
+by statute or regulation, such
+description must be sufficiently detailed for a recipient of ordinary skill
+at computer programming to be able to
+understand it.
 
-   7. Versions of This License.
 
-a. New Versions. Licensor may publish from time to time revised and/or new
-versions of the License.
+6.      Application of This License.  This License applies to code to which
+Licensor or Contributor has attached the
+Notice in Exhibit A, which is incorporated herein by this reference.
 
-b. Effect of New Versions. Once Licensed Product has been published under
-a particular version of the License, you may always continue to use it under
-the terms of that version. You may also choose to use such Licensed Product
+
+7.      Versions of This License.
+
+a.       New Versions.  Licensor may publish from time to time revised and/or
+new versions of the License.
+
+b.       Effect of New Versions.  Once Licensed Product has been published
+under a particular version of the License,
+you may always continue to use it under the terms of that version.  You may
+also choose to use such Licensed Product
 under the terms of any subsequent version of the License published by Licensor.
-No one other than Licensor has the right to modify the terms applicable to
-Licensed Product created under this License.
+No one other than Licensor has the
+right to modify the terms applicable to Licensed Product created under this
+License.
 
-c. Derivative Works of this License. If you create or use a modified version
-of this License, which you may do only in order to apply it to software that
-is not already a Licensed Product under this License, you must rename your
+c.       Derivative Works of this License.  If you create or use a modified
+version of this License, which you may do
+only in order to apply it to software that is not already a Licensed Product
+under this License, you must rename your
 license so that it is not confusingly similar to this License, and must make
-it clear that your license contains terms that differ from this License. In
-so naming your license, you may not use any trademark of Licensor or any Contributor.
+it clear that your license contains
+terms that differ from this License.  In so naming your license, you may not
+use any trademark of Licensor or any
+Contributor.
 
-8. Disclaimer of Warranty. LICENSED PRODUCT IS PROVIDED UNDER THIS LICENSE
-ON AN AS IS BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED,
-INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE LICENSED PRODUCT IS FREE
+
+8.      Disclaimer of Warranty.  LICENSED PRODUCT IS PROVIDED UNDER THIS LICENSE
+ON AN AS IS BASIS, WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES
+THAT THE LICENSED PRODUCT IS FREE
 OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING.
-THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE LICENSED PRODUCT
-IS WITH YOU. SHOULD LICENSED PRODUCT PROVE DEFECTIVE IN ANY RESPECT, YOU (AND
+THE ENTIRE RISK AS TO THE QUALITY AND
+PERFORMANCE OF THE LICENSED PRODUCT IS WITH YOU.  SHOULD LICENSED PRODUCT
+PROVE DEFECTIVE IN ANY RESPECT, YOU (AND
 NOT THE LICENSOR OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY
-SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN
-ESSENTIAL PART OF THIS LICENSE. NO USE OF LICENSED PRODUCT IS AUTHORIZED HEREUNDER
-EXCEPT UNDER THIS DISCLAIMER.
+SERVICING, REPAIR OR CORRECTION.  THIS
+DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE
+OF LICENSED PRODUCT IS AUTHORIZED
+HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
 
-   9. Termination.
 
-a. Automatic Termination Upon Breach. This license and the rights granted
-hereunder will terminate automatically if you fail to comply with the terms
-herein and fail to cure such breach within thirty (30) days of becoming aware
-of the breach. All sublicenses to the Licensed Product that are properly granted
-shall survive any termination of this license. Provisions that, by their nature,
-must remain in effect beyond the termination of this License, shall survive.
+9.      Termination.
 
-b. Termination Upon Assertion of Patent Infringement. If you initiate litigation
-by asserting a patent infringement claim (excluding declaratory judgment actions)
-against Licensor or a Contributor (Licensor or Contributor against whom you
-file such an action is referred to herein as Respondent) alleging that Licensed
-Product directly or indirectly infringes any patent, then any and all rights
-granted by such Respondent to you under Sections 1 or 2 of this License shall
-terminate prospectively upon sixty (60) days notice from Respondent (the "Notice
+a.       Automatic Termination Upon Breach.  This license and the rights granted
+hereunder will terminate
+automatically if you fail to comply with the terms herein and fail to cure
+such breach within thirty (30) days of
+becoming aware of the breach.  All sublicenses to the Licensed Product that
+are properly granted shall survive any
+termination of this license.  Provisions that, by their nature, must remain
+in effect beyond the termination of this
+License, shall survive.
+
+b.       Termination Upon Assertion of Patent Infringement.  If you initiate
+litigation by asserting a patent
+infringement claim (excluding declaratory judgment actions) against Licensor
+or a Contributor (Licensor or
+Contributor against whom you file such an action is referred to herein as
+Respondent) alleging that Licensed Product
+directly or indirectly infringes any patent, then any and all rights granted
+by such Respondent to you under Sections
+1 or 2 of this License shall terminate prospectively upon sixty (60) days
+notice from Respondent (the "Notice
 Period") unless within that Notice Period you either agree in writing (i)
-to pay Respondent a mutually agreeable reasonably royalty for your past or
-future use of Licensed Product made by such Respondent, or (ii) withdraw your
+to pay Respondent a mutually agreeable
+reasonably royalty for your past or future use of Licensed Product made by
+such Respondent, or (ii) withdraw your
 litigation claim with respect to Licensed Product against such Respondent.
-If within said Notice Period a reasonable royalty and payment arrangement
-are not mutually agreed upon in writing by the parties or the litigation claim
-is not withdrawn, the rights granted by Licensor to you under Sections 1 and
-2 automatically terminate at the expiration of said Notice Period.
+If within said Notice Period a reasonable
+royalty and payment arrangement are not mutually agreed upon in writing by
+the parties or the litigation claim is not
+withdrawn, the rights granted by Licensor to you under Sections 1 and 2 automatically
+terminate at the expiration of
+said Notice Period.
 
-c. Reasonable Value of This License. If you assert a patent infringement claim
-against Respondent alleging that Licensed Product directly or indirectly infringes
-any patent where such claim is resolved (such as by license or settlement)
-prior to the initiation of patent infringement litigation, then the reasonable
-value of the licenses granted by said Respondent under Sections 1 and 2 shall
-be taken into account in determining the amount or value of any payment or
-license.
+c.       Reasonable Value of This License.  If you assert a patent infringement
+claim against Respondent alleging
+that Licensed Product directly or indirectly infringes any patent where such
+claim is resolved (such as by license or
+settlement) prior to the initiation of patent infringement litigation, then
+the reasonable value of the licenses
+granted by said Respondent under Sections 1 and 2 shall be taken into account
+in determining the amount or value of
+any payment or license.
 
-d. No Retroactive Effect of Termination. In the event of termination under
-Sections 9(a) or 9(b) above, all end user license agreements (excluding licenses
-to distributors and resellers) that have been validly granted by you or any
-distributor hereunder prior to termination shall survive termination.
+d.       No Retroactive Effect of Termination.  In the event of termination
+under Sections 9(a) or 9(b) above, all
+end user license agreements (excluding licenses to distributors and resellers)
+that have been validly granted by you
+or any distributor hereunder prior to termination shall survive termination.
 
-10. Limitation of Liability. UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY,
-WHETHER TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE LICENSOR,
-ANY CONTRIBUTOR, OR ANY DISTRIBUTOR OF LICENSED PRODUCT, OR ANY SUPPLIER OF
-ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL,
-OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES
-FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY
-AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE
-BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY
-SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY
 
+10.  Limitation of Liability.  UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY,
+WHETHER TORT (INCLUDING NEGLIGENCE),
+CONTRACT, OR OTHERWISE, SHALL THE LICENSOR, ANY CONTRIBUTOR, OR ANY DISTRIBUTOR
+OF LICENSED PRODUCT, OR ANY SUPPLIER
+OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL,
+INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF
+ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL,
+WORK STOPPAGE, COMPUTER FAILURE OR
+MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH
+PARTY SHALL HAVE BEEN INFORMED OF THE
+POSSIBILITY OF SUCH DAMAGES.  THIS LIMITATION OF LIABILITY SHALL NOT APPLY
+TO LIABILITY FOR DEATH OR PERSONAL INJURY
 RESULTING FROM SUCH PARTYS 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
+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.
 
-11. Responsibility for Claims. As between Licensor and Contributors, each
-party is responsible for claims and damages arising, directly or indirectly,
-out of its utilization of rights under this License. You agree to work with
+
+11.  Responsibility for Claims.  As between Licensor and Contributors, each
+party is responsible for claims and
+damages arising, directly or indirectly, out of its utilization of rights
+under this License.  You agree to work with
 Licensor and Contributors to distribute such responsibility on an equitable
-basis. Nothing herein is intended or
+basis.  Nothing herein is intended or
+shall be deemed to constitute any admission of liability.
 
-   shall be deemed to constitute any admission of liability.
 
-12. U.S. Government End Users. The Licensed Product is a commercial item,
-as that term is defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of commercial
-computer software and commercial computer software documentation, as such
-terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 C.F.R.
-12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all U.S. Government
-End Users acquire Licensed Product with only those rights set forth herein.
+12.  U.S. Government End Users.  The Licensed Product is a commercial item,
+as that term is defined in 48 C.F.R.
+2.101 (Oct. 1995), consisting of commercial computer software and commercial
+computer software documentation, as such
+terms are used in 48 C.F.R. 12.212 (Sept. 1995).  Consistent with 48 C.F.R.
+12.212 and 48 C.F.R. 227.7202-1 through
+227.7202-4 (June 1995), all U.S. Government End Users acquire Licensed Product
+with only those rights set forth
+herein.
 
-13. Miscellaneous. This License represents the complete agreement concerning
-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. This License shall be governed by California law provisions
-(except to the extent applicable law, if any, provides otherwise), excluding
-its conflict-of-law provisions. You expressly agree that any litigation relating
-to this license shall be subject to the jurisdiction of the Federal Courts
-of the Northern District of California or the Superior Court of the County
-of Santa Clara, California (as appropriate), with venue lying in Santa Clara
-County, California, with the losing party responsible for costs including,
-without limitation, court costs and reasonable attorneys fees and expenses.
-The application of the United Nations Convention on Contracts for the International
-Sale of Goods is expressly excluded. You and Licensor expressly waive any
-rights to a jury trial in any litigation concerning Licensed Product or this
-License. Any law or regulation that provides that the language of a contract
-shall be construed against the drafter shall not apply to this License.
 
-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 or a future version
-of this License issued under Section 7. 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 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.
+13.  Miscellaneous.  This License represents the complete agreement concerning
+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.  This License shall be governed by California law
+provisions (except to the extent applicable
+law, if any, provides otherwise), excluding its conflict-of-law provisions.
+You expressly agree that any litigation
+relating to this license shall be subject to the jurisdiction of the Federal
+Courts of the Northern District of
+California or the Superior Court of the County of Santa Clara, California
+(as appropriate), with venue lying in Santa
+Clara County, California, with the losing party responsible for costs including,
+without limitation, court costs and
+reasonable attorneys fees and expenses.  The application of the United Nations
+Convention on Contracts for the
+International Sale of Goods is expressly excluded.  You and Licensor expressly
+waive any rights to a jury trial in
+any litigation concerning Licensed Product or this License.  Any law or regulation
+that provides that the language of
+a contract shall be construed against the drafter shall not apply to this
+License.
 
-15. Glossary. All defined terms in this License that are used in more than
-one Section of this License are repeated here, in alphabetical order, for
-the convenience of the reader. The Section of this License in which each defined
+
+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 or a
+future version of this License issued under Section 7.  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 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.
+
+
+15.  Glossary.  All defined terms in this License that are used in more than
+one Section of this License are repeated
+here, in alphabetical order, for the convenience of the reader.  The Section
+of this License in which each defined
 term is first used is shown in parentheses.
 
-Contributor: Each person or entity who created or contributed to the creation
-of, and distributed, a Modification. (See Section 2)
+Contributor:  Each person or entity who created or contributed to the creation
+of, and distributed, a Modification.
+(See Section 2)
 
 Derivative Works: That term as used in this License is defined under U.S.
-copyright law. (See Section 1(b))
+copyright law.  (See Section 1(b))
 
-License: This BitTorrent Open Source License. (See first paragraph of License)
+License:  This BitTorrent Open Source License.  (See first paragraph of License)
 
-Licensed Product: Any BitTorrent Product licensed pursuant to this License.
-The term "Licensed Product" includes all previous Modifications from any Contributor
-that you receive. (See first paragraph of License and Section 2)
+Licensed Product:  Any BitTorrent Product licensed pursuant to this License.
+The term "Licensed Product" includes
+all previous Modifications from any Contributor that you receive.  (See first
+paragraph of License and Section 2)
 
-   Licensor: BitTorrent, Inc. (See first paragraph of License)
+Licensor:  BitTorrent, Inc.  (See first paragraph of License)
 
-Modifications: Any additions to or deletions from the substance or structure
-of (i) a file containing Licensed Product, or (ii) any new file that contains
-any part of Licensed Product. (See Section 2)
+Modifications:  Any additions to or deletions from the substance or structure
+of (i) a file containing Licensed
+Product, or (ii) any new file that contains any part of Licensed Product.
+(See Section 2)
 
-   Notice: The notice contained in Exhibit A. (See Section 4(e))
+Notice:  The notice contained in Exhibit A.  (See Section 4(e))
 
 Source Code: The preferred form for making modifications to the Licensed Product,
-including all modules contained therein, plus any associated interface definition
-files, scripts used to control compilation and installation of an executable
-program, or a list of differential comparisons against the Source Code of
-the Licensed Product. (See
+including all modules contained
+therein, plus any associated interface definition files, scripts used to control
+compilation and installation of an
+executable program, or a list of differential comparisons against the Source
+Code of the Licensed Product.  (See
+Section 1(a))
 
-   Section 1(a))
+You:  This term is defined in Section 14 of this License.
 
-   You: This term is defined in Section 14 of this License. EXHIBIT A
+
+EXHIBIT A
 
 The Notice below must appear in each file of the Source Code of any copy you
-distribute of the Licensed Product or any hereto. Contributors to any Modifications
-may add their own copyright notices to identify their own contributions.
+distribute of the Licensed Product or
+any hereto.  Contributors to any Modifications may add their own copyright
+notices to identify their own
+contributions.
 
 License:
 
 The contents of this file are subject to the BitTorrent Open Source License
-Version 1.0 (the License). You may not copy or use this file, in either source
-code or executable form, except in compliance with the License. You may obtain
-a copy of the License at http://www.bittorrent.com/license/.
+Version 1.0 (the License).  You may not
+copy or use this file, in either source code or executable form, except in
+compliance with the License.  You may
+obtain a copy of the License at http://www.bittorrent.com/license/.
 
 Software distributed under the License is distributed on an AS IS basis, WITHOUT
-WARRANTY OF ANY KIND, either express or implied. See the License for the specific
-language governing rights and limitations under the License.
+WARRANTY OF ANY KIND, either express
+or implied.  See the License for the specific language governing rights and
+limitations under the License.
diff --git a/options/license/BitTorrent-1.1 b/options/license/BitTorrent-1.1
index 20d3cac86e..d29c47cf21 100644
--- a/options/license/BitTorrent-1.1
+++ b/options/license/BitTorrent-1.1
@@ -1,5 +1,4 @@
 BitTorrent Open Source License
-
 Version 1.1
 
 This BitTorrent Open Source License (the "License") applies to the BitTorrent
@@ -64,7 +63,6 @@ receive compensation for the Source Code.
 7. If you assert any patent claims against the Licensor relating to the Licensed
 Product, or if you breach any terms of the License, your rights to the Licensed
 Product under this License automatically terminate.
-
 You may use this License to distribute your own Derivative Works, in which
 case the provisions of this License will apply to your Derivative Works just
 as they do to the original Licensed Product.
@@ -75,7 +73,6 @@ use any license other than this License, however, you must continue to fulfill
 the requirements of this License (including the provisions relating to publishing
 the Source Code) for those portions of your Derivative Works that consist
 of the Licensed Product, including the files containing
-
 Modifications.
 
 New versions of this License may be published from time to time in connection
@@ -101,7 +98,6 @@ a. Use, reproduce, modify, display, perform, sublicense and distribute any
 Modifications created by a Contributor or portions thereof, in both Source
 Code or as an executable program, either on an unmodified basis or as part
 of Derivative Works.
-
 b. Under claims of patents now or hereafter owned or controlled by Contributor,
 to make, use, sell, offer for sale, have made, and/or otherwise dispose of
 Modifications or portions thereof, but solely to the extent that any such
@@ -151,7 +147,7 @@ or display any trademark of Licensor or any Contributor in any domain name,
 directory filepath, advertisement, link or other reference to you in any manner
 or in any media.
 
-   4. Your Obligations Regarding Distribution.
+4. Your Obligations Regarding Distribution.
 
 a. Application of This License to Your Modifications. As an express condition
 for your use of the Licensed Product, you hereby agree that any Modifications
@@ -178,7 +174,7 @@ is distributed by you. You are responsible for ensuring that the Source Code
 version remains available even if the Electronic Distribution Mechanism is
 maintained by a third party.
 
-      c. Intellectual Property Matters.
+     c. Intellectual Property Matters.
 
 i. Third Party Claims. If you have knowledge that a license to a third party's
 intellectual property right is required to exercise the rights granted by
@@ -190,12 +186,10 @@ Section 4(b), you shall promptly modify the LEGAL file in all copies you make
 available thereafter and shall take other steps (such as notifying appropriate
 mailing lists or newsgroups) reasonably calculated to inform those who received
 the Licensed Product from you that new knowledge has been obtained.
-
 ii. Contributor APIs. If your Modifications include an application programming
 interface ("API") and you have knowledge of patent licenses that are reasonably
 necessary to implement that API, you must also include this information in
 the LEGAL file.
-
 iii. Representations. You represent that, except as disclosed pursuant to
 4(c)(i) above, you believe that any Modifications you distribute are your
 original creations and that you have sufficient rights to grant the rights
@@ -282,7 +276,7 @@ to understand it.
 or Contributor has attached the Notice in Exhibit A, which is incorporated
 herein by this reference.
 
-   7. Versions of This License.
+7. Versions of This License.
 
 a. New Versions. Licensor may publish from time to time revised and/or new
 versions of the License.
@@ -314,7 +308,7 @@ SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN
 ESSENTIAL PART OF THIS LICENSE. NO USE OF LICENSED PRODUCT IS AUTHORIZED HEREUNDER
 EXCEPT UNDER THIS DISCLAIMER.
 
-   9. Termination.
+9. Termination.
 
 a. Automatic Termination Upon Breach. This license and the rights granted
 hereunder will terminate automatically if you fail to comply with the terms
@@ -429,15 +423,14 @@ Licensed Product: Any BitTorrent Product licensed pursuant to this License.
 The term "Licensed Product" includes all previous Modifications from any Contributor
 that you receive. (See first paragraph of License and Section 2)
 
-   Licensor: BitTorrent, Inc. (See first paragraph of License)
+Licensor: BitTorrent, Inc. (See first paragraph of License)
 
 Modifications: Any additions to or deletions from the substance or structure
 of (i) a file containing Licensed
-
 Product, or (ii) any new file that contains any part of Licensed Product.
 (See Section 2)
 
-   Notice: The notice contained in Exhibit A. (See Section 4(e))
+Notice: The notice contained in Exhibit A. (See Section 4(e))
 
 Source Code: The preferred form for making modifications to the Licensed Product,
 including all modules contained therein, plus any associated interface definition
@@ -445,16 +438,17 @@ files, scripts used to control compilation and installation of an executable
 program, or a list of differential comparisons against the Source Code of
 the Licensed Product. (See Section 1(a))
 
-   You: This term is defined in Section 14 of this License. EXHIBIT A
+You: This term is defined in Section 14 of this License.
+
+EXHIBIT A
 
 The Notice below must appear in each file of the Source Code of any copy you
 distribute of the Licensed Product or any hereto. Contributors to any Modifications
 may add their own copyright notices to identify their own contributions.
 
 License:
-
 The contents of this file are subject to the BitTorrent Open Source License
-Version 1.1 (the License). You may not copy or use this file, in either source
+Version 1.0 (the License). You may not copy or use this file, in either source
 code or executable form, except in compliance with the License. You may obtain
 a copy of the License at http://www.bittorrent.com/license/.
 
diff --git a/options/license/BlueOak-1.0.0 b/options/license/BlueOak-1.0.0
index d0a35b9dae..c5402b9577 100644
--- a/options/license/BlueOak-1.0.0
+++ b/options/license/BlueOak-1.0.0
@@ -4,37 +4,44 @@ Version 1.0.0
 
 ## Purpose
 
-This license gives everyone as much permission to work with this software
-as possible, while protecting contributors from liability.
+This license gives everyone as much permission to work with
+this software as possible, while protecting contributors
+from liability.
 
 ## Acceptance
 
-In order to receive this license, you must agree to its rules. The rules of
-this license are both obligations under that agreement and conditions to your
-license. You must not do anything with this software that triggers a rule
-that you cannot or will not follow.
+In order to receive this license, you must agree to its
+rules.  The rules of this license are both obligations
+under that agreement and conditions to your license.
+You must not do anything with this software that triggers
+a rule that you cannot or will not follow.
 
 ## Copyright
 
-Each contributor licenses you to do everything with this software that would
-otherwise infringe that contributor's copyright in it.
+Each contributor licenses you to do everything with this
+software that would otherwise infringe that contributor's
+copyright in it.
 
 ## Notices
 
-You must ensure that everyone who gets a copy of any part of this software
-from you, with or without changes, also gets the text of this license or a
-link to <https://blueoakcouncil.org/license/1.0.0>.
+You must ensure that everyone who gets a copy of
+any part of this software from you, with or without
+changes, also gets the text of this license or a link to
+<https://blueoakcouncil.org/license/1.0.0>.
 
 ## Excuse
 
-If anyone notifies you in writing that you have not complied with [Notices](#notices)
-, you can keep your license by taking all practical steps to comply within
-30 days after the notice. If you do not do so, your license ends immediately.
+If anyone notifies you in writing that you have not
+complied with [Notices](#notices), you can keep your
+license by taking all practical steps to comply within 30
+days after the notice.  If you do not do so, your license
+ends immediately.
 
 ## Patent
 
-Each contributor licenses you to do everything with this software that would
-otherwise infringe any patent claims they can license or become able to license.
+Each contributor licenses you to do everything with this
+software that would otherwise infringe any patent claims
+they can license or become able to license.
 
 ## Reliability
 
@@ -42,6 +49,7 @@ No contributor can revoke this license.
 
 ## No Liability
 
-***As far as the law allows, this software comes as is, without any warranty
-or condition, and no contributor will be liable to anyone for any damages
-related to this software or this license, under any kind of legal claim.***
+***As far as the law allows, this software comes as is,
+without any warranty or condition, and no contributor
+will be liable to anyone for any damages related to this
+software or this license, under any kind of legal claim.***
diff --git a/options/license/Bootloader-exception b/options/license/Bootloader-exception
index eef7281a36..c557826705 100644
--- a/options/license/Bootloader-exception
+++ b/options/license/Bootloader-exception
@@ -1,3 +1,10 @@
-Bootloader Exception 
+Bootloader Exception
+--------------------
 
-In addition to the permissions in the GNU General Public License, the authors give you unlimited permission to link or embed compiled bootloader and related files into combinations with other programs, and to distribute those combinations without any restriction coming from the use of those files. (The General Public License restrictions do apply in other respects; for example, they cover modification of the files, and distribution when not linked into a combined executable.)
+In addition to the permissions in the GNU General Public License, the
+authors give you unlimited permission to link or embed compiled bootloader
+and related files into combinations with other programs, and to distribute
+those combinations without any restriction coming from the use of those
+files. (The General Public License restrictions do apply in other respects;
+for example, they cover modification of the files, and distribution when
+not linked into a combine executable.)
diff --git a/options/license/Borceux b/options/license/Borceux
index 6bf5464eb2..c3853d0716 100644
--- a/options/license/Borceux
+++ b/options/license/Borceux
@@ -1,35 +1,21 @@
 Copyright 1993 Francis Borceux
-
 You may freely use, modify, and/or distribute each of the files in this package
-without limitation. The package consists of the following files:
+without limitation.  The package consists of the following files:
 
 README
-
 compatibility/OldDiagram
-
 compatibility/OldMaxiDiagram
-
 compatibility/OldMicroDiagram
-
 compatibility/OldMiniDiagram
-
 compatibility/OldMultipleArrows
-
 diagram/Diagram
-
 diagram/MaxiDiagram
-
 diagram/MicroDiagram
-
 diagram/MiniDiagram
-
 diagram/MultipleArrows
-
 user-guides/Diagram_Mode_d_Emploi
-
 user-guides/Diagram_Read_Me
 
 Of course no support is guaranteed, but the author will attempt to assist
-with problems. Current email address:
-
+with problems.  Current email address:
 francis dot borceux at uclouvain dot be.
diff --git a/options/license/CAL-1.0 b/options/license/CAL-1.0
index 538f9d9610..e0ccf819dc 100644
--- a/options/license/CAL-1.0
+++ b/options/license/CAL-1.0
@@ -1,352 +1,349 @@
 # The Cryptographic Autonomy License, v. 1.0
 
-*This Cryptographic Autonomy License (the "License") applies to any Work whose
-owner has marked it with any of the following notices, or a similar demonstration
-of intent: *
-
-
+*This Cryptographic Autonomy License (the "License") applies to any
+Work whose owner has marked it with any of the following notices, or a
+similar demonstration of intent:*
 
 SPDX-License-Identifier: CAL-1.0
-
 Licensed under the Cryptographic Autonomy License version 1.0
 
-
-
 *or*
 
-
-
 SPDX-License-Identifier: CAL-1.0-Combined-Work-Exception
-
-Licensed under the Cryptographic Autonomy License version 1.0, with Combined
-Work Exception
+Licensed under the Cryptographic Autonomy License version 1.0, with
+Combined Work Exception
 
 ______________________________________________________________________
 
+## 1. Purpose
+
+This License gives You unlimited permission to use and modify the
+software to which it applies (the "Work"), either as-is or in modified
+form, for Your private purposes, while protecting the owners and
+contributors to the software from liability.
+
+This License also strives to protect the freedom and autonomy of third
+parties who receive the Work from you. If any non-affiliated third
+party receives any part, aspect, or element of the Work from You, this
+License requires that You provide that third party all the permissions
+and materials needed to independently use and modify the Work without
+that third party having a loss of data or capability due to your
+actions.
+
+The full permissions, conditions, and other terms are laid out below.
+
+## 2. Receiving a License
+
+In order to receive this License, You must agree to its rules. The
+rules of this License are both obligations of Your agreement with the
+Licensor and conditions to your License. You must not do anything with
+the Work that triggers a rule You cannot or will not follow.
+
+### 2.1. Application
+
+The terms of this License apply to the Work as you receive it from
+Licensor, as well as to any modifications, elaborations, or
+implementations created by You that contain any licensable portion of
+the Work (a "Modified Work"). Unless specified, any reference to the
+Work also applies to a Modified Work.
+
+### 2.2. Offer and Acceptance
+
+This License is automatically offered to every person and
+organization. You show that you accept this License and agree to its
+conditions by taking any action with the Work that, absent this
+License, would infringe any intellectual property right held by
+Licensor.
+
+### 2.3. Compliance and Remedies
 
-
-   ## 1. Purpose
-
-This License gives You unlimited permission to use and modify the software
-to which it applies (the "Work"), either as-is or in modified form, for Your
-private purposes, while protecting the owners and contributors to the software
-from liability.
-
-This License also strives to protect the freedom and autonomy of third parties
-who receive the Work from you. If any non-affiliated third party receives
-any part, aspect, or element of the Work from You, this License requires that
-You provide that third party all the permissions and materials needed to independently
-use and modify the Work without that third party having a loss of data or
-capability due to your actions.
-
-   The full permissions, conditions, and other terms are laid out below.
-
-   ## 2. Receiving a License
-
-In order to receive this License, You must agree to its rules. The rules of
-this License are both obligations of Your agreement with the Licensor and
-conditions to your License. You must not do anything with the Work that triggers
-a rule You cannot or will not follow.
-
-      ### 2.1. Application
-
-The terms of this License apply to the Work as you receive it from Licensor,
-as well as to any modifications, elaborations, or implementations created
-by You that contain any licensable portion of the Work (a "Modified Work").
-Unless specified, any reference to the Work also applies to a Modified Work.
-
-      ### 2.2. Offer and Acceptance
-
-This License is automatically offered to every person and organization. You
-show that you accept this License and agree to its conditions by taking any
-action with the Work that, absent this License, would infringe any intellectual
-property right held by Licensor.
-
-      ### 2.3. Compliance and Remedies
-
-Any failure to act according to the terms and conditions of this License places
-Your use of the Work outside the scope of the License and infringes the intellectual
-property rights of the Licensor. In the event of infringement, the terms and
-conditions of this License may be enforced by Licensor under the intellectual
-property laws of any jurisdiction to which You are subject. You also agree
-that either the Licensor or a Recipient (as an intended third-party beneficiary)
-may enforce the terms and conditions of this License against You via specific
-performance.
-
-   ## 3. Permissions 
-
-   
-
-      ### 3.1. Permissions Granted
-
-Conditioned on compliance with section 4, and subject to the limitations of
-section 3.2, Licensor grants You the world-wide, royalty-free, non-exclusive
-permission to:
-
-+ a) Take any action with the Work that would infringe the non-patent intellectual
-property laws of any jurisdiction to which You are subject; and
-
-+ b) claims that Licensor can license or becomes able to license, to the extent
-that those claims are embodied in the Work as distributed by Licensor.
-
-      ### 3.2. Limitations on Permissions Granted
-
-The following limitations apply to the permissions granted in section 3.1:
-
-         
-
-+ a) Licensor does not grant any patent license for claims that are only infringed
-due to modification of the Work as provided by Licensor, or the combination
-of the Work as provided by Licensor, directly or indirectly, with any other
-component, including other software or hardware.
-
-         
-
-+ b) Licensor does not grant any license to the trademarks, service marks,
-or logos of Licensor, except to the extent necessary to comply with the attribution
-conditions in section 4.1 of this License.
-
-   ## 4. Conditions
-
-If You exercise any permission granted by this License, such that the Work,
-or any part, aspect, or element of the Work, is distributed, communicated,
-made available, or made perceptible to a non-Affiliate third party (a "Recipient"),
-either via physical delivery or via a network connection to the Recipient,
-You must comply with the following conditions:
-
-      ### 4.1. Provide Access to Source Code
-
-Subject to the exception in section 4.4, You must provide to each Recipient
-a copy of, or no-charge unrestricted network access to, the Source Code corresponding
-to the Work ("Access").
-
-The "Source Code" of the Work means the form of the Work preferred for making
-modifications, including any comments, configuration information, documentation,
-help materials, installation instructions, cryptographic seeds or keys, and
-any information reasonably necessary for the Recipient to independently compile
-and use the Source Code and to have full access to the functionality contained
-in the Work.
-
-         #### 4.1.1. Providing Network Access to the Source Code
-
-Network Access to the Notices and Source Code may be provided by You or by
-a third party, such as a public software repository, and must persist during
-the same period in which You exercise any of the permissions granted to You
-under this License and for at least one year thereafter.
-
-         #### 4.1.2. Source Code for a Modified Work
-
-Subject to the exception in section 4.5, You must provide to each Recipient
-of a Modified Work Access to Source Code corresponding to those portions of
-the Work remaining in the Modified Work as well as the modifications used
-by You to create the Modified Work. The Source Code corresponding to the modifications
-in the Modified Work must be provided to the Recipient either a) under this
-License, or b) under a Compatible Open Source License.
-
-         #### 4.1.3. Coordinated Disclosure of Security Vulnerabilities
-
-You may delay providing the Source Code corresponding to a particular modification
-of the Work for up to ninety (90) days (the "Embargo Period") if:
-
-            
-
-+ a) the modification is intended to address a newly-identified vulnerability
-or a security flaw in the Work,
-
-            
-
-+ b) disclosure of the vulnerability or security flaw before the end of the
-Embargo Period would put the data, identity, or autonomy of one or more Recipients
-of the Work at significant risk,
-
-            
-
-+ c) You are participating in a coordinated disclosure of the vulnerability
-or security flaw with one or more additional Licensees, and
-
-            
-
-+ d) Access to the Source Code pertaining to the modification is provided
-to all Recipients at the end of the Embargo Period.
-
-      ### 4.2. Maintain User Autonomy
-
-In addition to providing each Recipient the opportunity to have Access to
-the Source Code, You cannot use the permissions given under this License to
-interfere with a Recipient's ability to fully use an independent copy of the
-Work generated from the Source Code You provide with the Recipient's own User
-Data.
-
-"User Data" means any data that is an input to or an output from the Work,
-where the presence of the data is necessary for substantially identical use
-of the Work in an equivalent context chosen by the Recipient, and where the
-Recipient has an existing ownership interest, an existing right to possess,
-or where the data has been generated by, for, or has been assigned to the
-Recipient.
-
-         #### 4.2.1. No Withholding User Data
-
-Throughout any period in which You exercise any of the permissions granted
-to You under this License, You must also provide to any Recipient to whom
-you provide services via the Work, a no-charge copy, provided in a commonly
-used electronic form, of the Recipient's User Data in your possession, to
-the extent that such User Data is available to You for use in conjunction
-with the Work.
-
-         #### 4.2.2. No Technical Measures that Limit Access
-
-You may not, by means of the use cryptographic methods applied to anything
-provided to the Recipient, by possession or control of cryptographic keys,
-seeds, hashes, by any other technological protection measures, or by any other
-method, limit a Recipient's ability to access any functionality present in
-Recipient's independent copy of the Work, or to deny a Recipient full control
-of the Recipient's User Data.
-
-         #### 4.2.3. No Legal or Contractual Measures that Limit Access
-
-You may not contractually restrict a Recipient's ability to independently
-exercise the permissions granted under this License. You waive any legal power
-to forbid circumvention of technical protection measures that include use
-of the Work, and You waive any claim that the capabilities of the Work were
-limited or modified as a means of enforcing the legal rights of third parties
-against Recipients.
-
-      ### 4.3. Provide Notices and Attribution
-
-You must retain all licensing, authorship, or attribution notices contained
-in the Source Code (the "Notices"), and provide all such Notices to each Recipient,
-together with a statement acknowledging the use of the Work. Notices may be
-provided directly to a Recipient or via an easy-to-find hyperlink to an Internet
-location also providing Access to Source Code.
-
-      ### 4.4. Scope of Conditions in this License
-
-You are required to uphold the conditions of this License only relative to
-those who are Recipients of the Work from You. Other than providing Recipients
-with the applicable Notices, Access to Source Code, and a copy of and full
-control of their User Data, nothing in this License requires You to provide
-processing services to or engage in network interactions with anyone.
-
-      ### 4.5. Combined Work Exception
-
-As an exception to condition that You provide Recipients Access to Source
-Code, any Source Code files marked by the Licensor as having the "Combined
-Work Exception," or any object code exclusively resulting from Source Code
-files so marked, may be combined with other Software into a "Larger Work."
-So long as you comply with the requirements to provide Recipients the applicable
-Notices and Access to the Source Code provided to You by Licensor, and you
-provide Recipients access to their User Data and do not limit Recipient's
-ability to independently work with their User Data, any other Software in
-the Larger Work as well as the Larger Work as a whole may be licensed under
-the terms of your choice.
-
-   ## 5. Term and Termination
-
-The term of this License begins when You receive the Work, and continues until
-terminated for any of the reasons described herein, or until all Licensor's
-intellectual property rights in the Software expire, whichever comes first
-("Term"). This License cannot be revoked, only terminated for the reasons
-listed below.
-
-      ### 5.1. Effect of Termination
-
-If this License is terminated for any reason, all permissions granted to You
-under Section 3 by any Licensor automatically terminate. You will immediately
-cease exercising any permissions granted in this License relative to the Work,
-including as part of any Modified Work.
-
-      ### 5.2. Termination for Non-Compliance; Reinstatement
-
-This License terminates automatically if You fail to comply with any of the
-conditions in section 4. As a special exception to termination for non-compliance,
-Your permissions for the Work under this License will automatically be reinstated
-if You come into compliance with all the conditions in section 2 within sixty
-(60) days of being notified by Licensor or an intended third-party beneficiary
-of Your noncompliance. You are eligible for reinstatement of permissions for
-the Work one time only, and only for the sixty days immediately after becoming
-aware of noncompliance. Loss of permissions granted for the Work under this
-License due to either a) sustained noncompliance lasting more than sixty days
-or b) subsequent termination for noncompliance after reinstatement, is permanent,
-unless rights are specifically restored by Licensor in writing.
-
-      ### 5.3. Termination Due to Litigation
-
-If You initiate litigation against Licensor, or any Recipient of the Work,
-either direct or indirect, asserting that the Work directly or indirectly
-infringes any patent, then all permissions granted to You by this License
-shall terminate. In the event of termination due to litigation, all permissions
-validly granted by You under this License, directly or indirectly, shall survive
-termination. Administrative review procedures, declaratory judgment actions,
-counterclaims in response to patent litigation, and enforcement actions against
-former Licensees terminated under this section do not cause termination due
+Any failure to act according to the terms and conditions of this
+License places Your use of the Work outside the scope of the License
+and infringes the intellectual property rights of the Licensor. In the
+event of infringement, the terms and conditions of this License may be
+enforced by Licensor under the intellectual property laws of any
+jurisdiction to which You are subject. You also agree that either the
+Licensor or a Recipient (as an intended third-party beneficiary) may
+enforce the terms and conditions of this License against You via
+specific performance.
+
+## 3. Permissions
+### 3.1. Permissions Granted
+
+Conditioned on compliance with section 4, and subject to the
+limitations of section 3.2, Licensor grants You the world-wide,
+royalty-free, non-exclusive permission to:
+
++ a) Take any action with the Work that would infringe the non-patent
+intellectual property laws of any jurisdiction to which You are
+subject; and
+
++ b) claims that Licensor can license or becomes able to
+license, to the extent that those claims are embodied in the Work as
+distributed by Licensor. ### 3.2. Limitations on Permissions Granted
+
+The following limitations apply to the permissions granted in section
+3.1:
+
++ a) Licensor does not grant any patent license for claims that are
+only infringed due to modification of the Work as provided by
+Licensor, or the combination of the Work as provided by Licensor,
+directly or indirectly, with any other component, including other
+software or hardware.
+
++ b) Licensor does not grant any license to the trademarks, service
+marks, or logos of Licensor, except to the extent necessary to comply
+with the attribution conditions in section 4.1 of this License.
+
+## 4. Conditions
+
+If You exercise any permission granted by this License, such that the
+Work, or any part, aspect, or element of the Work, is distributed,
+communicated, made available, or made perceptible to a non-Affiliate
+third party (a "Recipient"), either via physical delivery or via a
+network connection to the Recipient, You must comply with the
+following conditions:
+
+### 4.1. Provide Access to Source Code
+
+Subject to the exception in section 4.4, You must provide to each
+Recipient a copy of, or no-charge unrestricted network access to, the
+Source Code corresponding to the Work ("Access").
+
+The "Source Code" of the Work means the form of the Work preferred for
+making modifications, including any comments, configuration
+information, documentation, help materials, installation instructions,
+cryptographic seeds or keys, and any information reasonably necessary
+for the Recipient to independently compile and use the Source Code and
+to have full access to the functionality contained in the Work.
+
+#### 4.1.1. Providing Network Access to the Source Code
+
+Network Access to the Notices and Source Code may be provided by You
+or by a third party, such as a public software repository, and must
+persist during the same period in which You exercise any of the
+permissions granted to You under this License and for at least one
+year thereafter.
+
+#### 4.1.2. Source Code for a Modified Work
+
+Subject to the exception in section 4.5, You must provide to each
+Recipient of a Modified Work Access to Source Code corresponding to
+those portions of the Work remaining in the Modified Work as well as
+the modifications used by You to create the Modified Work. The Source
+Code corresponding to the modifications in the Modified Work must be
+provided to the Recipient either a) under this License, or b) under a
+Compatible Open Source License.
+
+#### 4.1.3. Coordinated Disclosure of Security Vulnerabilities
+
+You may delay providing the Source Code corresponding to a particular
+modification of the Work for up to ninety (90) days (the "Embargo
+Period") if:
+
++ a) the modification is intended to address a newly-identified
+vulnerability or a security flaw in the Work,
+
++ b) disclosure of the vulnerability or security flaw before the end
+of the Embargo Period would put the data, identity, or autonomy of one
+or more Recipients of the Work at significant risk,
+
++ c) You are participating in a coordinated disclosure of the
+vulnerability or security flaw with one or more additional Licensees,
+and
+
++ d) Access to the Source Code pertaining to the modification is
+provided to all Recipients at the end of the Embargo Period.
+
+### 4.2. Maintain User Autonomy
+
+In addition to providing each Recipient the opportunity to have Access
+to the Source Code, You cannot use the permissions given under this
+License to interfere with a Recipient's ability to fully use an
+independent copy of the Work generated from the Source Code You
+provide with the Recipient's own User Data.
+
+"User Data" means any data that is an input to or an output from the
+Work, where the presence of the data is necessary for substantially
+identical use of the Work in an equivalent context chosen by the
+Recipient, and where the Recipient has an existing ownership interest,
+an existing right to possess, or where the data has been generated by,
+for, or has been assigned to the Recipient.
+
+#### 4.2.1. No Withholding User Data
+
+Throughout any period in which You exercise any of the permissions
+granted to You under this License, You must also provide to any
+Recipient to whom you provide services via the Work, a no-charge copy,
+provided in a commonly used electronic form, of the Recipient's User
+Data in your possession, to the extent that such User Data is
+available to You for use in conjunction with the Work.
+
+#### 4.2.2. No Technical Measures that Limit Access
+
+You may not, by means of the use cryptographic methods applied to
+anything provided to the Recipient, by possession or control of
+cryptographic keys, seeds, hashes, by any other technological
+protection measures, or by any other method, limit a Recipient's
+ability to access any functionality present in Recipient's independent
+copy of the Work, or to deny a Recipient full control of the
+Recipient's User Data.
+
+#### 4.2.3. No Legal or Contractual Measures that Limit Access
+
+You may not contractually restrict a Recipient's ability to
+independently exercise the permissions granted under this License. You
+waive any legal power to forbid circumvention of technical protection
+measures that include use of the Work, and You waive any claim that
+the capabilities of the Work were limited or modified as a means of
+enforcing the legal rights of third parties against Recipients.
+
+### 4.3. Provide Notices and Attribution
+
+You must retain all licensing, authorship, or attribution notices
+contained in the Source Code (the "Notices"), and provide all such
+Notices to each Recipient, together with a statement acknowledging the
+use of the Work. Notices may be provided directly to a Recipient or
+via an easy-to-find hyperlink to an Internet location also providing
+Access to Source Code.
+
+### 4.4. Scope of Conditions in this License
+
+You are required to uphold the conditions of this License only
+relative to those who are Recipients of the Work from You. Other than
+providing Recipients with the applicable Notices, Access to Source
+Code, and a copy of and full control of their User Data, nothing in
+this License requires You to provide processing services to or engage
+in network interactions with anyone.
+
+### 4.5. Combined Work Exception
+
+As an exception to condition that You provide Recipients Access to
+Source Code, any Source Code files marked by the Licensor as having
+the "Combined Work Exception," or any object code exclusively
+resulting from Source Code files so marked, may be combined with other
+Software into a "Larger Work." So long as you comply with the
+requirements to provide Recipients the applicable Notices and Access
+to the Source Code provided to You by Licensor, and you provide
+Recipients access to their User Data and do not limit Recipient's
+ability to independently work with their User Data, any other Software
+in the Larger Work as well as the Larger Work as a whole may be
+licensed under the terms of your choice.
+
+## 5. Term and Termination
+
+The term of this License begins when You receive the Work, and
+continues until terminated for any of the reasons described herein, or
+until all Licensor's intellectual property rights in the Software
+expire, whichever comes first ("Term"). This License cannot be
+revoked, only terminated for the reasons listed below.
+
+### 5.1. Effect of Termination
+
+If this License is terminated for any reason, all permissions granted
+to You under Section 3 by any Licensor automatically terminate. You
+will immediately cease exercising any permissions granted in this
+License relative to the Work, including as part of any Modified Work.
+
+### 5.2. Termination for Non-Compliance; Reinstatement
+
+This License terminates automatically if You fail to comply with any
+of the conditions in section 4. As a special exception to termination
+for non-compliance, Your permissions for the Work under this License
+will automatically be reinstated if You come into compliance with all
+the conditions in section 2 within sixty (60) days of being notified
+by Licensor or an intended third-party beneficiary of Your
+noncompliance. You are eligible for reinstatement of permissions for
+the Work one time only, and only for the sixty days immediately after
+becoming aware of noncompliance. Loss of permissions granted for the
+Work under this License due to either a) sustained noncompliance
+lasting more than sixty days or b) subsequent termination for
+noncompliance after reinstatement, is permanent, unless rights are
+specifically restored by Licensor in writing.
+
+### 5.3. Termination Due to Litigation
+
+If You initiate litigation against Licensor, or any Recipient of the
+Work, either direct or indirect, asserting that the Work directly or
+indirectly infringes any patent, then all permissions granted to You
+by this License shall terminate. In the event of termination due to
+litigation, all permissions validly granted by You under this License,
+directly or indirectly, shall survive termination. Administrative
+review procedures, declaratory judgment actions, counterclaims in
+response to patent litigation, and enforcement actions against former
+Licensees terminated under this section do not cause termination due
 to litigation.
 
-   ## 6. Disclaimer of Warranty and Limit on Liability
+## 6. Disclaimer of Warranty and Limit on Liability
 
-As far as the law allows, the Work comes AS-IS, without any warranty of any
-kind, and no Licensor or contributor will be liable to anyone for any damages
-related to this software or this license, under any kind of legal claim, or
-for any type of damages, including indirect, special, incidental, or consequential
-damages of any type arising as a result of this License or the use of the
-Work including, without limitation, damages for loss of goodwill, work stoppage,
-computer failure or malfunction, loss of profits, revenue, or any and all
-other commercial damages or losses.
+As far as the law allows, the Work comes AS-IS, without any warranty
+of any kind, and no Licensor or contributor will be liable to anyone
+for any damages related to this software or this license, under any
+kind of legal claim, or for any type of damages, including indirect,
+special, incidental, or consequential damages of any type arising as a
+result of this License or the use of the Work including, without
+limitation, damages for loss of goodwill, work stoppage, computer
+failure or malfunction, loss of profits, revenue, or any and all other
+commercial damages or losses.
 
-   ## 7. Other Provisions 
+## 7. Other Provisions
+### 7.1. Affiliates
 
-   
+An "Affiliate" means any other entity that, directly or indirectly
+through one or more intermediaries, controls, is controlled by, or is
+under common control with, the Licensee. Employees of a Licensee and
+natural persons acting as contractors exclusively providing services
+to Licensee are also Affiliates.
 
-      ### 7.1. Affiliates
+### 7.2. Choice of Jurisdiction and Governing Law
 
-An "Affiliate" means any other entity that, directly or indirectly through
-one or more intermediaries, controls, is controlled by, or is under common
-control with, the Licensee. Employees of a Licensee and natural persons acting
-as contractors exclusively providing services to Licensee are also Affiliates.
+A Licensor may require that any action or suit by a Licensee relating
+to a Work provided by Licensor under this License may be brought only
+in the courts of a particular jurisdiction and under the laws of a
+particular jurisdiction (excluding its conflict-of-law provisions), if
+Licensor provides conspicuous notice of the particular jurisdiction to
+all Licensees.
 
-      ### 7.2. Choice of Jurisdiction and Governing Law
+### 7.3. No Sublicensing
 
-A Licensor may require that any action or suit by a Licensee relating to a
-Work provided by Licensor under this License may be brought only in the courts
-of a particular jurisdiction and under the laws of a particular jurisdiction
-(excluding its conflict-of-law provisions), if Licensor provides conspicuous
-notice of the particular jurisdiction to all Licensees.
+This License is not sublicensable. Each time You provide the Work or a
+Modified Work to a Recipient, the Recipient automatically receives a
+license under the terms described in this License. You may not impose
+any further reservations, conditions, or other provisions on any
+Recipients' exercise of the permissions granted herein.
 
-      ### 7.3. No Sublicensing
+### 7.4. Attorneys' Fees
 
-This License is not sublicensable. Each time You provide the Work or a Modified
-Work to a Recipient, the Recipient automatically receives a license under
-the terms described in this License. You may not impose any further reservations,
-conditions, or other provisions on any Recipients' exercise of the permissions
-granted herein.
+In any action to enforce the terms of this License, or seeking damages
+relating thereto, including by an intended third-party beneficiary,
+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. A "prevailing party" is the party that
+achieves, or avoids, compliance with this License, including through
+settlement. This section shall survive the termination of this
+License.
 
-      ### 7.4. Attorneys' Fees
+### 7.5. No Waiver
 
-In any action to enforce the terms of this License, or seeking damages relating
-thereto, including by an intended third-party beneficiary, 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. A "prevailing party" is
-the party that achieves, or avoids, compliance with this License, including
-through settlement. This section shall survive the termination of this License.
+Any failure by Licensor to enforce any provision of this License will
+not constitute a present or future waiver of such provision nor limit
+Licensor's ability to enforce such provision at a later time.
 
-      ### 7.5. No Waiver
+### 7.6. Severability
 
-Any failure by Licensor to enforce any provision of this License will not
-constitute a present or future waiver of such provision nor limit Licensor's
-ability to enforce such provision at a later time.
+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. Any invalid or unenforceable portion will be interpreted
+to the effect and intent of the original portion. If such a
+construction is not possible, the invalid or unenforceable portion
+will be severed from this License but the rest of this License will
+remain in full force and effect.
 
-      ### 7.6. Severability
+### 7.7. License for the Text of this License
 
-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. Any
-invalid or unenforceable portion will be interpreted to the effect and intent
-of the original portion. If such a construction is not possible, the invalid
-or unenforceable portion will be severed from this License but the rest of
-this License will remain in full force and effect.
-
-      ### 7.7. License for the Text of this License
-
-The text of this license is released under the Creative Commons Attribution-ShareAlike
-4.0 International License, with the caveat that any modifications of this
-license may not use the name "Cryptographic Autonomy License" or any name
-confusingly similar thereto to describe any derived work of this License.
+The text of this license is released under the Creative Commons
+Attribution-ShareAlike 4.0 International License, with the caveat that
+any modifications of this license may not use the name "Cryptographic
+Autonomy License" or any name confusingly similar thereto to describe
+any derived work of this License.
diff --git a/options/license/CAL-1.0-Combined-Work-Exception b/options/license/CAL-1.0-Combined-Work-Exception
index 538f9d9610..e0ccf819dc 100644
--- a/options/license/CAL-1.0-Combined-Work-Exception
+++ b/options/license/CAL-1.0-Combined-Work-Exception
@@ -1,352 +1,349 @@
 # The Cryptographic Autonomy License, v. 1.0
 
-*This Cryptographic Autonomy License (the "License") applies to any Work whose
-owner has marked it with any of the following notices, or a similar demonstration
-of intent: *
-
-
+*This Cryptographic Autonomy License (the "License") applies to any
+Work whose owner has marked it with any of the following notices, or a
+similar demonstration of intent:*
 
 SPDX-License-Identifier: CAL-1.0
-
 Licensed under the Cryptographic Autonomy License version 1.0
 
-
-
 *or*
 
-
-
 SPDX-License-Identifier: CAL-1.0-Combined-Work-Exception
-
-Licensed under the Cryptographic Autonomy License version 1.0, with Combined
-Work Exception
+Licensed under the Cryptographic Autonomy License version 1.0, with
+Combined Work Exception
 
 ______________________________________________________________________
 
+## 1. Purpose
+
+This License gives You unlimited permission to use and modify the
+software to which it applies (the "Work"), either as-is or in modified
+form, for Your private purposes, while protecting the owners and
+contributors to the software from liability.
+
+This License also strives to protect the freedom and autonomy of third
+parties who receive the Work from you. If any non-affiliated third
+party receives any part, aspect, or element of the Work from You, this
+License requires that You provide that third party all the permissions
+and materials needed to independently use and modify the Work without
+that third party having a loss of data or capability due to your
+actions.
+
+The full permissions, conditions, and other terms are laid out below.
+
+## 2. Receiving a License
+
+In order to receive this License, You must agree to its rules. The
+rules of this License are both obligations of Your agreement with the
+Licensor and conditions to your License. You must not do anything with
+the Work that triggers a rule You cannot or will not follow.
+
+### 2.1. Application
+
+The terms of this License apply to the Work as you receive it from
+Licensor, as well as to any modifications, elaborations, or
+implementations created by You that contain any licensable portion of
+the Work (a "Modified Work"). Unless specified, any reference to the
+Work also applies to a Modified Work.
+
+### 2.2. Offer and Acceptance
+
+This License is automatically offered to every person and
+organization. You show that you accept this License and agree to its
+conditions by taking any action with the Work that, absent this
+License, would infringe any intellectual property right held by
+Licensor.
+
+### 2.3. Compliance and Remedies
 
-
-   ## 1. Purpose
-
-This License gives You unlimited permission to use and modify the software
-to which it applies (the "Work"), either as-is or in modified form, for Your
-private purposes, while protecting the owners and contributors to the software
-from liability.
-
-This License also strives to protect the freedom and autonomy of third parties
-who receive the Work from you. If any non-affiliated third party receives
-any part, aspect, or element of the Work from You, this License requires that
-You provide that third party all the permissions and materials needed to independently
-use and modify the Work without that third party having a loss of data or
-capability due to your actions.
-
-   The full permissions, conditions, and other terms are laid out below.
-
-   ## 2. Receiving a License
-
-In order to receive this License, You must agree to its rules. The rules of
-this License are both obligations of Your agreement with the Licensor and
-conditions to your License. You must not do anything with the Work that triggers
-a rule You cannot or will not follow.
-
-      ### 2.1. Application
-
-The terms of this License apply to the Work as you receive it from Licensor,
-as well as to any modifications, elaborations, or implementations created
-by You that contain any licensable portion of the Work (a "Modified Work").
-Unless specified, any reference to the Work also applies to a Modified Work.
-
-      ### 2.2. Offer and Acceptance
-
-This License is automatically offered to every person and organization. You
-show that you accept this License and agree to its conditions by taking any
-action with the Work that, absent this License, would infringe any intellectual
-property right held by Licensor.
-
-      ### 2.3. Compliance and Remedies
-
-Any failure to act according to the terms and conditions of this License places
-Your use of the Work outside the scope of the License and infringes the intellectual
-property rights of the Licensor. In the event of infringement, the terms and
-conditions of this License may be enforced by Licensor under the intellectual
-property laws of any jurisdiction to which You are subject. You also agree
-that either the Licensor or a Recipient (as an intended third-party beneficiary)
-may enforce the terms and conditions of this License against You via specific
-performance.
-
-   ## 3. Permissions 
-
-   
-
-      ### 3.1. Permissions Granted
-
-Conditioned on compliance with section 4, and subject to the limitations of
-section 3.2, Licensor grants You the world-wide, royalty-free, non-exclusive
-permission to:
-
-+ a) Take any action with the Work that would infringe the non-patent intellectual
-property laws of any jurisdiction to which You are subject; and
-
-+ b) claims that Licensor can license or becomes able to license, to the extent
-that those claims are embodied in the Work as distributed by Licensor.
-
-      ### 3.2. Limitations on Permissions Granted
-
-The following limitations apply to the permissions granted in section 3.1:
-
-         
-
-+ a) Licensor does not grant any patent license for claims that are only infringed
-due to modification of the Work as provided by Licensor, or the combination
-of the Work as provided by Licensor, directly or indirectly, with any other
-component, including other software or hardware.
-
-         
-
-+ b) Licensor does not grant any license to the trademarks, service marks,
-or logos of Licensor, except to the extent necessary to comply with the attribution
-conditions in section 4.1 of this License.
-
-   ## 4. Conditions
-
-If You exercise any permission granted by this License, such that the Work,
-or any part, aspect, or element of the Work, is distributed, communicated,
-made available, or made perceptible to a non-Affiliate third party (a "Recipient"),
-either via physical delivery or via a network connection to the Recipient,
-You must comply with the following conditions:
-
-      ### 4.1. Provide Access to Source Code
-
-Subject to the exception in section 4.4, You must provide to each Recipient
-a copy of, or no-charge unrestricted network access to, the Source Code corresponding
-to the Work ("Access").
-
-The "Source Code" of the Work means the form of the Work preferred for making
-modifications, including any comments, configuration information, documentation,
-help materials, installation instructions, cryptographic seeds or keys, and
-any information reasonably necessary for the Recipient to independently compile
-and use the Source Code and to have full access to the functionality contained
-in the Work.
-
-         #### 4.1.1. Providing Network Access to the Source Code
-
-Network Access to the Notices and Source Code may be provided by You or by
-a third party, such as a public software repository, and must persist during
-the same period in which You exercise any of the permissions granted to You
-under this License and for at least one year thereafter.
-
-         #### 4.1.2. Source Code for a Modified Work
-
-Subject to the exception in section 4.5, You must provide to each Recipient
-of a Modified Work Access to Source Code corresponding to those portions of
-the Work remaining in the Modified Work as well as the modifications used
-by You to create the Modified Work. The Source Code corresponding to the modifications
-in the Modified Work must be provided to the Recipient either a) under this
-License, or b) under a Compatible Open Source License.
-
-         #### 4.1.3. Coordinated Disclosure of Security Vulnerabilities
-
-You may delay providing the Source Code corresponding to a particular modification
-of the Work for up to ninety (90) days (the "Embargo Period") if:
-
-            
-
-+ a) the modification is intended to address a newly-identified vulnerability
-or a security flaw in the Work,
-
-            
-
-+ b) disclosure of the vulnerability or security flaw before the end of the
-Embargo Period would put the data, identity, or autonomy of one or more Recipients
-of the Work at significant risk,
-
-            
-
-+ c) You are participating in a coordinated disclosure of the vulnerability
-or security flaw with one or more additional Licensees, and
-
-            
-
-+ d) Access to the Source Code pertaining to the modification is provided
-to all Recipients at the end of the Embargo Period.
-
-      ### 4.2. Maintain User Autonomy
-
-In addition to providing each Recipient the opportunity to have Access to
-the Source Code, You cannot use the permissions given under this License to
-interfere with a Recipient's ability to fully use an independent copy of the
-Work generated from the Source Code You provide with the Recipient's own User
-Data.
-
-"User Data" means any data that is an input to or an output from the Work,
-where the presence of the data is necessary for substantially identical use
-of the Work in an equivalent context chosen by the Recipient, and where the
-Recipient has an existing ownership interest, an existing right to possess,
-or where the data has been generated by, for, or has been assigned to the
-Recipient.
-
-         #### 4.2.1. No Withholding User Data
-
-Throughout any period in which You exercise any of the permissions granted
-to You under this License, You must also provide to any Recipient to whom
-you provide services via the Work, a no-charge copy, provided in a commonly
-used electronic form, of the Recipient's User Data in your possession, to
-the extent that such User Data is available to You for use in conjunction
-with the Work.
-
-         #### 4.2.2. No Technical Measures that Limit Access
-
-You may not, by means of the use cryptographic methods applied to anything
-provided to the Recipient, by possession or control of cryptographic keys,
-seeds, hashes, by any other technological protection measures, or by any other
-method, limit a Recipient's ability to access any functionality present in
-Recipient's independent copy of the Work, or to deny a Recipient full control
-of the Recipient's User Data.
-
-         #### 4.2.3. No Legal or Contractual Measures that Limit Access
-
-You may not contractually restrict a Recipient's ability to independently
-exercise the permissions granted under this License. You waive any legal power
-to forbid circumvention of technical protection measures that include use
-of the Work, and You waive any claim that the capabilities of the Work were
-limited or modified as a means of enforcing the legal rights of third parties
-against Recipients.
-
-      ### 4.3. Provide Notices and Attribution
-
-You must retain all licensing, authorship, or attribution notices contained
-in the Source Code (the "Notices"), and provide all such Notices to each Recipient,
-together with a statement acknowledging the use of the Work. Notices may be
-provided directly to a Recipient or via an easy-to-find hyperlink to an Internet
-location also providing Access to Source Code.
-
-      ### 4.4. Scope of Conditions in this License
-
-You are required to uphold the conditions of this License only relative to
-those who are Recipients of the Work from You. Other than providing Recipients
-with the applicable Notices, Access to Source Code, and a copy of and full
-control of their User Data, nothing in this License requires You to provide
-processing services to or engage in network interactions with anyone.
-
-      ### 4.5. Combined Work Exception
-
-As an exception to condition that You provide Recipients Access to Source
-Code, any Source Code files marked by the Licensor as having the "Combined
-Work Exception," or any object code exclusively resulting from Source Code
-files so marked, may be combined with other Software into a "Larger Work."
-So long as you comply with the requirements to provide Recipients the applicable
-Notices and Access to the Source Code provided to You by Licensor, and you
-provide Recipients access to their User Data and do not limit Recipient's
-ability to independently work with their User Data, any other Software in
-the Larger Work as well as the Larger Work as a whole may be licensed under
-the terms of your choice.
-
-   ## 5. Term and Termination
-
-The term of this License begins when You receive the Work, and continues until
-terminated for any of the reasons described herein, or until all Licensor's
-intellectual property rights in the Software expire, whichever comes first
-("Term"). This License cannot be revoked, only terminated for the reasons
-listed below.
-
-      ### 5.1. Effect of Termination
-
-If this License is terminated for any reason, all permissions granted to You
-under Section 3 by any Licensor automatically terminate. You will immediately
-cease exercising any permissions granted in this License relative to the Work,
-including as part of any Modified Work.
-
-      ### 5.2. Termination for Non-Compliance; Reinstatement
-
-This License terminates automatically if You fail to comply with any of the
-conditions in section 4. As a special exception to termination for non-compliance,
-Your permissions for the Work under this License will automatically be reinstated
-if You come into compliance with all the conditions in section 2 within sixty
-(60) days of being notified by Licensor or an intended third-party beneficiary
-of Your noncompliance. You are eligible for reinstatement of permissions for
-the Work one time only, and only for the sixty days immediately after becoming
-aware of noncompliance. Loss of permissions granted for the Work under this
-License due to either a) sustained noncompliance lasting more than sixty days
-or b) subsequent termination for noncompliance after reinstatement, is permanent,
-unless rights are specifically restored by Licensor in writing.
-
-      ### 5.3. Termination Due to Litigation
-
-If You initiate litigation against Licensor, or any Recipient of the Work,
-either direct or indirect, asserting that the Work directly or indirectly
-infringes any patent, then all permissions granted to You by this License
-shall terminate. In the event of termination due to litigation, all permissions
-validly granted by You under this License, directly or indirectly, shall survive
-termination. Administrative review procedures, declaratory judgment actions,
-counterclaims in response to patent litigation, and enforcement actions against
-former Licensees terminated under this section do not cause termination due
+Any failure to act according to the terms and conditions of this
+License places Your use of the Work outside the scope of the License
+and infringes the intellectual property rights of the Licensor. In the
+event of infringement, the terms and conditions of this License may be
+enforced by Licensor under the intellectual property laws of any
+jurisdiction to which You are subject. You also agree that either the
+Licensor or a Recipient (as an intended third-party beneficiary) may
+enforce the terms and conditions of this License against You via
+specific performance.
+
+## 3. Permissions
+### 3.1. Permissions Granted
+
+Conditioned on compliance with section 4, and subject to the
+limitations of section 3.2, Licensor grants You the world-wide,
+royalty-free, non-exclusive permission to:
+
++ a) Take any action with the Work that would infringe the non-patent
+intellectual property laws of any jurisdiction to which You are
+subject; and
+
++ b) claims that Licensor can license or becomes able to
+license, to the extent that those claims are embodied in the Work as
+distributed by Licensor. ### 3.2. Limitations on Permissions Granted
+
+The following limitations apply to the permissions granted in section
+3.1:
+
++ a) Licensor does not grant any patent license for claims that are
+only infringed due to modification of the Work as provided by
+Licensor, or the combination of the Work as provided by Licensor,
+directly or indirectly, with any other component, including other
+software or hardware.
+
++ b) Licensor does not grant any license to the trademarks, service
+marks, or logos of Licensor, except to the extent necessary to comply
+with the attribution conditions in section 4.1 of this License.
+
+## 4. Conditions
+
+If You exercise any permission granted by this License, such that the
+Work, or any part, aspect, or element of the Work, is distributed,
+communicated, made available, or made perceptible to a non-Affiliate
+third party (a "Recipient"), either via physical delivery or via a
+network connection to the Recipient, You must comply with the
+following conditions:
+
+### 4.1. Provide Access to Source Code
+
+Subject to the exception in section 4.4, You must provide to each
+Recipient a copy of, or no-charge unrestricted network access to, the
+Source Code corresponding to the Work ("Access").
+
+The "Source Code" of the Work means the form of the Work preferred for
+making modifications, including any comments, configuration
+information, documentation, help materials, installation instructions,
+cryptographic seeds or keys, and any information reasonably necessary
+for the Recipient to independently compile and use the Source Code and
+to have full access to the functionality contained in the Work.
+
+#### 4.1.1. Providing Network Access to the Source Code
+
+Network Access to the Notices and Source Code may be provided by You
+or by a third party, such as a public software repository, and must
+persist during the same period in which You exercise any of the
+permissions granted to You under this License and for at least one
+year thereafter.
+
+#### 4.1.2. Source Code for a Modified Work
+
+Subject to the exception in section 4.5, You must provide to each
+Recipient of a Modified Work Access to Source Code corresponding to
+those portions of the Work remaining in the Modified Work as well as
+the modifications used by You to create the Modified Work. The Source
+Code corresponding to the modifications in the Modified Work must be
+provided to the Recipient either a) under this License, or b) under a
+Compatible Open Source License.
+
+#### 4.1.3. Coordinated Disclosure of Security Vulnerabilities
+
+You may delay providing the Source Code corresponding to a particular
+modification of the Work for up to ninety (90) days (the "Embargo
+Period") if:
+
++ a) the modification is intended to address a newly-identified
+vulnerability or a security flaw in the Work,
+
++ b) disclosure of the vulnerability or security flaw before the end
+of the Embargo Period would put the data, identity, or autonomy of one
+or more Recipients of the Work at significant risk,
+
++ c) You are participating in a coordinated disclosure of the
+vulnerability or security flaw with one or more additional Licensees,
+and
+
++ d) Access to the Source Code pertaining to the modification is
+provided to all Recipients at the end of the Embargo Period.
+
+### 4.2. Maintain User Autonomy
+
+In addition to providing each Recipient the opportunity to have Access
+to the Source Code, You cannot use the permissions given under this
+License to interfere with a Recipient's ability to fully use an
+independent copy of the Work generated from the Source Code You
+provide with the Recipient's own User Data.
+
+"User Data" means any data that is an input to or an output from the
+Work, where the presence of the data is necessary for substantially
+identical use of the Work in an equivalent context chosen by the
+Recipient, and where the Recipient has an existing ownership interest,
+an existing right to possess, or where the data has been generated by,
+for, or has been assigned to the Recipient.
+
+#### 4.2.1. No Withholding User Data
+
+Throughout any period in which You exercise any of the permissions
+granted to You under this License, You must also provide to any
+Recipient to whom you provide services via the Work, a no-charge copy,
+provided in a commonly used electronic form, of the Recipient's User
+Data in your possession, to the extent that such User Data is
+available to You for use in conjunction with the Work.
+
+#### 4.2.2. No Technical Measures that Limit Access
+
+You may not, by means of the use cryptographic methods applied to
+anything provided to the Recipient, by possession or control of
+cryptographic keys, seeds, hashes, by any other technological
+protection measures, or by any other method, limit a Recipient's
+ability to access any functionality present in Recipient's independent
+copy of the Work, or to deny a Recipient full control of the
+Recipient's User Data.
+
+#### 4.2.3. No Legal or Contractual Measures that Limit Access
+
+You may not contractually restrict a Recipient's ability to
+independently exercise the permissions granted under this License. You
+waive any legal power to forbid circumvention of technical protection
+measures that include use of the Work, and You waive any claim that
+the capabilities of the Work were limited or modified as a means of
+enforcing the legal rights of third parties against Recipients.
+
+### 4.3. Provide Notices and Attribution
+
+You must retain all licensing, authorship, or attribution notices
+contained in the Source Code (the "Notices"), and provide all such
+Notices to each Recipient, together with a statement acknowledging the
+use of the Work. Notices may be provided directly to a Recipient or
+via an easy-to-find hyperlink to an Internet location also providing
+Access to Source Code.
+
+### 4.4. Scope of Conditions in this License
+
+You are required to uphold the conditions of this License only
+relative to those who are Recipients of the Work from You. Other than
+providing Recipients with the applicable Notices, Access to Source
+Code, and a copy of and full control of their User Data, nothing in
+this License requires You to provide processing services to or engage
+in network interactions with anyone.
+
+### 4.5. Combined Work Exception
+
+As an exception to condition that You provide Recipients Access to
+Source Code, any Source Code files marked by the Licensor as having
+the "Combined Work Exception," or any object code exclusively
+resulting from Source Code files so marked, may be combined with other
+Software into a "Larger Work." So long as you comply with the
+requirements to provide Recipients the applicable Notices and Access
+to the Source Code provided to You by Licensor, and you provide
+Recipients access to their User Data and do not limit Recipient's
+ability to independently work with their User Data, any other Software
+in the Larger Work as well as the Larger Work as a whole may be
+licensed under the terms of your choice.
+
+## 5. Term and Termination
+
+The term of this License begins when You receive the Work, and
+continues until terminated for any of the reasons described herein, or
+until all Licensor's intellectual property rights in the Software
+expire, whichever comes first ("Term"). This License cannot be
+revoked, only terminated for the reasons listed below.
+
+### 5.1. Effect of Termination
+
+If this License is terminated for any reason, all permissions granted
+to You under Section 3 by any Licensor automatically terminate. You
+will immediately cease exercising any permissions granted in this
+License relative to the Work, including as part of any Modified Work.
+
+### 5.2. Termination for Non-Compliance; Reinstatement
+
+This License terminates automatically if You fail to comply with any
+of the conditions in section 4. As a special exception to termination
+for non-compliance, Your permissions for the Work under this License
+will automatically be reinstated if You come into compliance with all
+the conditions in section 2 within sixty (60) days of being notified
+by Licensor or an intended third-party beneficiary of Your
+noncompliance. You are eligible for reinstatement of permissions for
+the Work one time only, and only for the sixty days immediately after
+becoming aware of noncompliance. Loss of permissions granted for the
+Work under this License due to either a) sustained noncompliance
+lasting more than sixty days or b) subsequent termination for
+noncompliance after reinstatement, is permanent, unless rights are
+specifically restored by Licensor in writing.
+
+### 5.3. Termination Due to Litigation
+
+If You initiate litigation against Licensor, or any Recipient of the
+Work, either direct or indirect, asserting that the Work directly or
+indirectly infringes any patent, then all permissions granted to You
+by this License shall terminate. In the event of termination due to
+litigation, all permissions validly granted by You under this License,
+directly or indirectly, shall survive termination. Administrative
+review procedures, declaratory judgment actions, counterclaims in
+response to patent litigation, and enforcement actions against former
+Licensees terminated under this section do not cause termination due
 to litigation.
 
-   ## 6. Disclaimer of Warranty and Limit on Liability
+## 6. Disclaimer of Warranty and Limit on Liability
 
-As far as the law allows, the Work comes AS-IS, without any warranty of any
-kind, and no Licensor or contributor will be liable to anyone for any damages
-related to this software or this license, under any kind of legal claim, or
-for any type of damages, including indirect, special, incidental, or consequential
-damages of any type arising as a result of this License or the use of the
-Work including, without limitation, damages for loss of goodwill, work stoppage,
-computer failure or malfunction, loss of profits, revenue, or any and all
-other commercial damages or losses.
+As far as the law allows, the Work comes AS-IS, without any warranty
+of any kind, and no Licensor or contributor will be liable to anyone
+for any damages related to this software or this license, under any
+kind of legal claim, or for any type of damages, including indirect,
+special, incidental, or consequential damages of any type arising as a
+result of this License or the use of the Work including, without
+limitation, damages for loss of goodwill, work stoppage, computer
+failure or malfunction, loss of profits, revenue, or any and all other
+commercial damages or losses.
 
-   ## 7. Other Provisions 
+## 7. Other Provisions
+### 7.1. Affiliates
 
-   
+An "Affiliate" means any other entity that, directly or indirectly
+through one or more intermediaries, controls, is controlled by, or is
+under common control with, the Licensee. Employees of a Licensee and
+natural persons acting as contractors exclusively providing services
+to Licensee are also Affiliates.
 
-      ### 7.1. Affiliates
+### 7.2. Choice of Jurisdiction and Governing Law
 
-An "Affiliate" means any other entity that, directly or indirectly through
-one or more intermediaries, controls, is controlled by, or is under common
-control with, the Licensee. Employees of a Licensee and natural persons acting
-as contractors exclusively providing services to Licensee are also Affiliates.
+A Licensor may require that any action or suit by a Licensee relating
+to a Work provided by Licensor under this License may be brought only
+in the courts of a particular jurisdiction and under the laws of a
+particular jurisdiction (excluding its conflict-of-law provisions), if
+Licensor provides conspicuous notice of the particular jurisdiction to
+all Licensees.
 
-      ### 7.2. Choice of Jurisdiction and Governing Law
+### 7.3. No Sublicensing
 
-A Licensor may require that any action or suit by a Licensee relating to a
-Work provided by Licensor under this License may be brought only in the courts
-of a particular jurisdiction and under the laws of a particular jurisdiction
-(excluding its conflict-of-law provisions), if Licensor provides conspicuous
-notice of the particular jurisdiction to all Licensees.
+This License is not sublicensable. Each time You provide the Work or a
+Modified Work to a Recipient, the Recipient automatically receives a
+license under the terms described in this License. You may not impose
+any further reservations, conditions, or other provisions on any
+Recipients' exercise of the permissions granted herein.
 
-      ### 7.3. No Sublicensing
+### 7.4. Attorneys' Fees
 
-This License is not sublicensable. Each time You provide the Work or a Modified
-Work to a Recipient, the Recipient automatically receives a license under
-the terms described in this License. You may not impose any further reservations,
-conditions, or other provisions on any Recipients' exercise of the permissions
-granted herein.
+In any action to enforce the terms of this License, or seeking damages
+relating thereto, including by an intended third-party beneficiary,
+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. A "prevailing party" is the party that
+achieves, or avoids, compliance with this License, including through
+settlement. This section shall survive the termination of this
+License.
 
-      ### 7.4. Attorneys' Fees
+### 7.5. No Waiver
 
-In any action to enforce the terms of this License, or seeking damages relating
-thereto, including by an intended third-party beneficiary, 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. A "prevailing party" is
-the party that achieves, or avoids, compliance with this License, including
-through settlement. This section shall survive the termination of this License.
+Any failure by Licensor to enforce any provision of this License will
+not constitute a present or future waiver of such provision nor limit
+Licensor's ability to enforce such provision at a later time.
 
-      ### 7.5. No Waiver
+### 7.6. Severability
 
-Any failure by Licensor to enforce any provision of this License will not
-constitute a present or future waiver of such provision nor limit Licensor's
-ability to enforce such provision at a later time.
+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. Any invalid or unenforceable portion will be interpreted
+to the effect and intent of the original portion. If such a
+construction is not possible, the invalid or unenforceable portion
+will be severed from this License but the rest of this License will
+remain in full force and effect.
 
-      ### 7.6. Severability
+### 7.7. License for the Text of this License
 
-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. Any
-invalid or unenforceable portion will be interpreted to the effect and intent
-of the original portion. If such a construction is not possible, the invalid
-or unenforceable portion will be severed from this License but the rest of
-this License will remain in full force and effect.
-
-      ### 7.7. License for the Text of this License
-
-The text of this license is released under the Creative Commons Attribution-ShareAlike
-4.0 International License, with the caveat that any modifications of this
-license may not use the name "Cryptographic Autonomy License" or any name
-confusingly similar thereto to describe any derived work of this License.
+The text of this license is released under the Creative Commons
+Attribution-ShareAlike 4.0 International License, with the caveat that
+any modifications of this license may not use the name "Cryptographic
+Autonomy License" or any name confusingly similar thereto to describe
+any derived work of this License.
diff --git a/options/license/CATOSL-1.1 b/options/license/CATOSL-1.1
index d53787c1de..b18fa79a54 100644
--- a/options/license/CATOSL-1.1
+++ b/options/license/CATOSL-1.1
@@ -1,5 +1,4 @@
 Computer Associates Trusted Open Source License
-
 Version 1.1
 
 PLEASE READ THIS DOCUMENT CAREFULLY AND IN ITS ENTIRETY. THE ACCOMPANYING
@@ -26,7 +25,7 @@ Contributions to the Program must be distributed under the terms of this License
 The provisions that follow set forth the terms and conditions under which
 you may use the Program.
 
-   1. DEFINITIONS
+1. DEFINITIONS
 
 1.1 Contribution means (a) in the case of CA, the Original Program; and (b)
 in the case of each Contributor (including CA), changes and additions to the
@@ -55,11 +54,11 @@ by the use or sale of its Contribution alone or when combined with the Program.
 License is attached and as released by CA, including source code, object code
 and documentation, if any.
 
-      1.7 Program means the Original Program and Contributions.
+1.7 Program means the Original Program and Contributions.
 
 1.8 Recipient means anyone who modifies, copies, uses or distributes the Program.
 
-   2. GRANT OF RIGHTS
+2. GRANT OF RIGHTS
 
 2.1 Subject to the terms of this License, each Contributor hereby grants Recipient
 an irrevocable, non-exclusive, worldwide, royalty-free license to reproduce,
@@ -99,7 +98,7 @@ any other intellectual property rights needed, if any.
 and interest in the copyrights in its Contributions, and has the right to
 grant the copyright licenses set forth in this License.
 
-   3. DISTRIBUTION REQUIREMENTS
+3. DISTRIBUTION REQUIREMENTS
 
 3.1 If the Program is distributed in object code form, then a prominent notice
 must be included in the code itself as well as in any related documentation,
@@ -108,31 +107,25 @@ with information on how and where to obtain the source code. A Contributor
 may choose to distribute the Program in object code form under its own license
 agreement, provided that:
 
-         * it complies with the terms and conditions of this License; and
-
-         * its license agreement:
-
+     * it complies with the terms and conditions of this License; and
+     * its license agreement:
 * effectively disclaims on behalf of all Contributors all warranties and conditions,
 express and implied, including warranties or conditions of title and non-infringement,
 and implied warranties or conditions of merchantability and fitness for a
 particular purpose, to the maximum extent permitted by applicable law;
-
 * effectively excludes on behalf of all Contributors all liability for damages,
 including direct, indirect, special, incidental and consequential damages,
 such as lost profits, to the maximum extent permitted by applicable law;
-
 * states that any provisions which are inconsistent with this License are
 offered by that Contributor alone and not by any other party; and
-
 * states that source code for the Program is available from such Contributor
 at the cost of distribution, and informs licensees how to obtain it in a reasonable
 manner.
 
-      3.2 When the Program is made available in source code form:
+3.2 When the Program is made available in source code form:
 
-         * it must be made available under this License; and
-
-* a copy of this License must be included with each copy of the Program.
+     * it must be made available under this License; and
+     * a copy of this License must be included with each copy of the Program.
 
 3.3 This License is intended to facilitate the commercial distribution of
 the Program by any Contributor. However, Contributors may only charge Recipients
@@ -188,7 +181,7 @@ obligations set forth in Section 4, each Contributor must identify itself
 as the originator of its Contribution, if any, in a manner that reasonably
 allows subsequent Recipients to identify the originator of the Contribution.
 
-   4. CONTRIBUTION RESTRICTIONS
+4. CONTRIBUTION RESTRICTIONS
 
 4.1 Each Contributor must cause the Program to which the Contributor provides
 a Contribution to contain a file documenting the changes the Contributor made
@@ -200,7 +193,7 @@ derived, in (a) the Program source code, and (b) in any notice in an executable
 version or related documentation in which the Contributor describes the origin
 or ownership of the Program.
 
-   5. NO WARRANTY
+5. NO WARRANTY
 
 5.1 EXCEPT AS EXPRESSLY SET FORTH IN THIS LICENSE, THE PROGRAM IS PROVIDED
 AS IS AND IN ITS PRESENT STATE AND CONDITION. NO WARRANTY, REPRESENTATION,
@@ -222,7 +215,7 @@ the operation of nuclear facilities, aircraft navigation, communication systems,
 or air traffic control machines in which case the failure of the Program could
 lead to death, personal injury, or severe physical or environmental damage.
 
-   6. DISCLAIMER OF LIABILITY
+6. DISCLAIMER OF LIABILITY
 
 6.1 EXCEPT AS EXPRESSLY SET FORTH IN THIS LICENSE, AND TO THE EXTENT PERMITTED
 BY LAW, NO CONTRIBUTOR SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
@@ -233,7 +226,7 @@ ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE
 OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 DAMAGES.
 
-   7. TRADEMARKS AND BRANDING
+7. TRADEMARKS AND BRANDING
 
 7.1 This License does not grant any Recipient or any third party any rights
 to use the trademarks or trade names now or subsequently posted at http://www.ca.com/catrdmrk.htm,
@@ -247,7 +240,7 @@ to endorse or promote products derived from the Original Program.
 logos, and product names belonging to the Recipient provided that all copyright
 and other attribution notices remain in the Program.
 
-   8. PATENT LITIGATION
+8. PATENT LITIGATION
 
 8.1 If Recipient institutes patent litigation against any person or entity
 (including a cross-claim or counterclaim in a lawsuit) alleging that the Program
@@ -255,7 +248,7 @@ itself (excluding combinations of the Program with other software or hardware)
 infringes such Recipients patent(s), then such Recipients rights granted under
 Section 2.2 shall terminate as of the date such litigation is filed.
 
-   9. OWNERSHIP
+9. OWNERSHIP
 
 9.1 Subject to the licenses granted under this License in Sections 2.1 and
 2.2 above, each Contributor retains all rights, title and interest in and
@@ -267,7 +260,7 @@ choose to license such CA Contributions under this License, or on different
 terms from those contained in this License or may choose not to license them
 at all.
 
-   10. TERMINATION
+10. TERMINATION
 
 10.1 All of Recipients rights under this License shall terminate if it fails
 to comply with any of the material terms or conditions of this License and
@@ -278,7 +271,7 @@ practicable. However, Recipients obligations under this License and any licenses
 granted by Recipient as a Contributor relating to the Program shall continue
 and survive termination.
 
-   11. GENERAL
+11. GENERAL
 
 11.1 If any provision of this License is invalid or unenforceable under applicable
 law, it shall not affect the validity or enforceability of the remainder of
diff --git a/options/license/CC-BY-1.0 b/options/license/CC-BY-1.0
index e69a8076d9..ec2fe97b25 100644
--- a/options/license/CC-BY-1.0
+++ b/options/license/CC-BY-1.0
@@ -1,9 +1,10 @@
-Creative Commons Attribution 1.0 CREATIVE COMMONS CORPORATION IS NOT A LAW
-FIRM AND DOES NOT PROVIDE LEGAL SERVICES. DISTRIBUTION OF THIS DRAFT LICENSE
-DOES NOT CREATE AN ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES
-THIS INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
-REGARDING THE INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING
-FROM ITS USE.
+Creative Commons Attribution 1.0
+
+CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE LEGAL
+SERVICES. DISTRIBUTION OF THIS DRAFT LICENSE DOES NOT CREATE AN ATTORNEY-CLIENT
+RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS INFORMATION ON AN "AS-IS" BASIS.
+CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE INFORMATION PROVIDED, AND
+DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM ITS USE.
 
 License
 
@@ -16,7 +17,7 @@ BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO
 BE BOUND BY THE TERMS OF THIS LICENSE. THE LICENSOR GRANTS YOU THE RIGHTS
 CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS.
 
-   1. Definitions
+1. Definitions
 
 a. "Collective Work" means a work, such as a periodical issue, anthology or
 encyclopedia, in which the Work in its entirety in unmodified form, along
@@ -35,7 +36,7 @@ Work will not be considered a Derivative Work for the purpose of this License.
 c. "Licensor" means the individual or entity that offers the Work under the
 terms of this License.
 
-      d. "Original Author" means the individual or entity who created the Work.
+     d. "Original Author" means the individual or entity who created the Work.
 
 e. "Work" means the copyrightable work of authorship offered under the terms
 of this License.
@@ -58,7 +59,7 @@ the Work as stated below:
 a. to reproduce the Work, to incorporate the Work into one or more Collective
 Works, and to reproduce the Work as incorporated in the Collective Works;
 
-      b. to create and reproduce Derivative Works;
+     b. to create and reproduce Derivative Works;
 
 c. to distribute copies or phonorecords of, display publicly, perform publicly,
 and perform publicly by means of a digital audio transmission the Work including
@@ -109,7 +110,7 @@ such credit will appear where any other comparable authorship credit appears
 and in a manner at least as prominent as such other comparable authorship
 credit.
 
-   5. Representations, Warranties and Disclaimer
+5. Representations, Warranties and Disclaimer
 
 a. By offering the Work for public release under this License, Licensor represents
 and warrants that, to the best of Licensor's knowledge after reasonable inquiry:
@@ -135,7 +136,7 @@ TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE
 OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN
 IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
 
-   7. Termination
+7. Termination
 
 a. This License and the rights granted hereunder will terminate automatically
 upon any breach by You of the terms of this License. Individuals or entities
@@ -153,7 +154,7 @@ license that has been, or is required to be, granted under the terms of this
 License), and this License will continue in full force and effect unless terminated
 as stated above.
 
-   8. Miscellaneous
+8. Miscellaneous
 
 a. Each time You distribute or publicly digitally perform the Work or a Collective
 Work, the Licensor offers to the recipient a license to the Work on the same
@@ -180,6 +181,7 @@ not be bound by any additional provisions that may appear in any communication
 from You. This License may not be modified without the mutual written agreement
 of the Licensor and You.
 
+
 Creative Commons is not a party to this License, and makes no warranty whatsoever
 in connection with the Work. Creative Commons will not be liable to You or
 any party on any legal theory for any damages whatsoever, including without
diff --git a/options/license/CC-BY-2.0 b/options/license/CC-BY-2.0
index bf0b9074d0..1fd5541f7d 100644
--- a/options/license/CC-BY-2.0
+++ b/options/license/CC-BY-2.0
@@ -1,9 +1,10 @@
-Creative Commons Attribution 2.0 CREATIVE COMMONS CORPORATION IS NOT A LAW
-FIRM AND DOES NOT PROVIDE LEGAL SERVICES. DISTRIBUTION OF THIS LICENSE DOES
-NOT CREATE AN ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
-INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES REGARDING
-THE INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM
-ITS USE.
+Creative Commons Attribution 2.0
+
+CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE LEGAL
+SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN ATTORNEY-CLIENT
+RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS INFORMATION ON AN "AS-IS" BASIS.
+CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE INFORMATION PROVIDED, AND
+DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM ITS USE.
 
 License
 
@@ -16,7 +17,7 @@ BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO
 BE BOUND BY THE TERMS OF THIS LICENSE. THE LICENSOR GRANTS YOU THE RIGHTS
 CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS.
 
-   1. Definitions
+1. Definitions
 
 a. "Collective Work" means a work, such as a periodical issue, anthology or
 encyclopedia, in which the Work in its entirety in unmodified form, along
@@ -39,7 +40,7 @@ this License.
 c. "Licensor" means the individual or entity that offers the Work under the
 terms of this License.
 
-      d. "Original Author" means the individual or entity who created the Work.
+     d. "Original Author" means the individual or entity who created the Work.
 
 e. "Work" means the copyrightable work of authorship offered under the terms
 of this License.
@@ -62,7 +63,7 @@ the Work as stated below:
 a. to reproduce the Work, to incorporate the Work into one or more Collective
 Works, and to reproduce the Work as incorporated in the Collective Works;
 
-      b. to create and reproduce Derivative Works;
+     b. to create and reproduce Derivative Works;
 
 c. to distribute copies or phonorecords of, display publicly, perform publicly,
 and perform publicly by means of a digital audio transmission the Work including
@@ -71,7 +72,7 @@ as incorporated in Collective Works;
 d. to distribute copies or phonorecords of, display publicly, perform publicly,
 and perform publicly by means of a digital audio transmission Derivative Works.
 
-      e. For the avoidance of doubt, where the work is a musical composition:
+     e. For the avoidance of doubt, where the work is a musical composition:
 
 i. Performance Royalties Under Blanket Licenses. Licensor waives the exclusive
 right to collect, whether individually or via a performance rights society
@@ -137,7 +138,7 @@ such credit will appear where any other comparable authorship credit appears
 and in a manner at least as prominent as such other comparable authorship
 credit.
 
-   5. Representations, Warranties and Disclaimer
+5. Representations, Warranties and Disclaimer
 
 UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS
 THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING
@@ -153,7 +154,7 @@ INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS
 LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY
 OF SUCH DAMAGES.
 
-   7. Termination
+7. Termination
 
 a. This License and the rights granted hereunder will terminate automatically
 upon any breach by You of the terms of this License. Individuals or entities
@@ -171,7 +172,7 @@ license that has been, or is required to be, granted under the terms of this
 License), and this License will continue in full force and effect unless terminated
 as stated above.
 
-   8. Miscellaneous
+8. Miscellaneous
 
 a. Each time You distribute or publicly digitally perform the Work or a Collective
 Work, the Licensor offers to the recipient a license to the Work on the same
diff --git a/options/license/CC-BY-3.0 b/options/license/CC-BY-3.0
index a58210656e..58843e4941 100644
--- a/options/license/CC-BY-3.0
+++ b/options/license/CC-BY-3.0
@@ -1,9 +1,10 @@
-Creative Commons Attribution 3.0 Unported CREATIVE COMMONS CORPORATION IS
-NOT A LAW FIRM AND DOES NOT PROVIDE LEGAL SERVICES. DISTRIBUTION OF THIS LICENSE
-DOES NOT CREATE AN ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES
-THIS INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
-REGARDING THE INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING
-FROM ITS USE.
+Creative Commons Attribution 3.0 Unported
+
+CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE LEGAL
+SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN ATTORNEY-CLIENT
+RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS INFORMATION ON AN "AS-IS" BASIS.
+CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE INFORMATION PROVIDED, AND
+DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM ITS USE.
 
 License
 
@@ -17,7 +18,7 @@ BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY BE CONSIDE
 TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION
 OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS.
 
-   1. Definitions
+1. Definitions
 
 a. "Adaptation" means a work based upon the Work, or upon the Work and other
 pre-existing works, such as a translation, adaptation, derivative work, arrangement
@@ -117,9 +118,9 @@ has been modified.";
 c. to Distribute and Publicly Perform the Work including as incorporated in
 Collections; and,
 
-      d. to Distribute and Publicly Perform Adaptations.
+     d. to Distribute and Publicly Perform Adaptations.
 
-      e. For the avoidance of doubt:
+     e. For the avoidance of doubt:
 
 i. Non-waivable Compulsory License Schemes. In those jurisdictions in which
 the right to collect royalties through any statutory or compulsory licensing
@@ -176,8 +177,8 @@ notice, terms of service or by other reasonable means, the name of such party
 or parties; (ii) the title of the Work if supplied; (iii) to the extent reasonably
 practicable, the URI, if any, that Licensor specifies to be associated with
 the Work, unless such URI does not refer to the copyright notice or licensing
-information for the Work; and (iv), consistent with Section 3(b), in the case
-of an Adaptation, a credit identifying the use of the Work in the Adaptation
+information for the Work; and (iv) , consistent with Section 3(b), in the
+case of an Adaptation, a credit identifying the use of the Work in the Adaptation
 (e.g., "French translation of the Work by Original Author," or "Screenplay
 based on original Work by Original Author"). The credit required by this Section
 4 (b) may be implemented in any reasonable manner; provided, however, that
@@ -207,7 +208,7 @@ permitted by the applicable national law, to enable You to reasonably exercise
 Your right under Section 3(b) of this License (right to make Adaptations)
 but not otherwise.
 
-   5. Representations, Warranties and Disclaimer
+5. Representations, Warranties and Disclaimer
 
 UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS
 THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING
@@ -223,7 +224,7 @@ INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS
 LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY
 OF SUCH DAMAGES.
 
-   7. Termination
+7. Termination
 
 a. This License and the rights granted hereunder will terminate automatically
 upon any breach by You of the terms of this License. Individuals or entities
@@ -241,7 +242,7 @@ license that has been, or is required to be, granted under the terms of this
 License), and this License will continue in full force and effect unless terminated
 as stated above.
 
-   8. Miscellaneous
+8. Miscellaneous
 
 a. Each time You Distribute or Publicly Perform the Work or a Collection,
 the Licensor offers to the recipient a license to the Work on the same terms
diff --git a/options/license/CC-BY-3.0-AT b/options/license/CC-BY-3.0-AT
index 4facf5f4e6..a22f2000f7 100644
--- a/options/license/CC-BY-3.0-AT
+++ b/options/license/CC-BY-3.0-AT
@@ -2,7 +2,9 @@ CREATIVE COMMONS IST KEINE RECHTSANWALTSKANZLEI UND LEISTET KEINE RECHTSBERATUNG
 DIE BEREITSTELLUNG DIESER LIZENZ FÜHRT ZU KEINEM MANDATSVERHÄLTNIS. CREATIVE
 COMMONS STELLT DIESE INFORMATIONEN OHNE GEWÄHR ZUR VERFÜGUNG. CREATIVE COMMONS
 ÜBERNIMMT KEINE GEWÄHRLEISTUNG FÜR DIE GELIEFERTEN INFORMATIONEN UND SCHLIEßT
-DIE HAFTUNG FÜR SCHÄDEN AUS, DIE SICH AUS DEREN GEBRAUCH ERGEBEN. Lizenz
+DIE HAFTUNG FÜR SCHÄDEN AUS, DIE SICH AUS DEREN GEBRAUCH ERGEBEN.
+
+Lizenz
 
 DER GEGENSTAND DIESER LIZENZ (WIE UNTER "SCHUTZGEGENSTAND" DEFINIERT) WIRD
 UNTER DEN BEDINGUNGEN DIESER CREATIVE COMMONS PUBLIC LICENSE ("CCPL", "LIZENZ"
@@ -17,7 +19,7 @@ SOWEIT DIESE LIZENZ ALS LIZENZVERTRAG ANZUSEHEN IST, GEWÄHRT IHNEN DER LIZENZGE
 DIE IN DER LIZENZ GENANNTEN RECHTE UNENTGELTLICH UND IM AUSTAUSCH DAFÜR, DASS
 SIE DAS GEBUNDENSEIN AN DIE LIZENZBEDINGUNGEN AKZEPTIEREN.
 
-   1. Definitionen
+1. Definitionen
 
 a. Der Begriff "Bearbeitung" im Sinne dieser Lizenz bezeichnet das Ergebnis
 jeglicher Art von Veränderung des Schutzgegenstandes, solange dieses erkennbar
@@ -57,7 +59,7 @@ auch ein Lichtbild oder anderes Objekt eines verwandten Schutzrechts sein,
 unabhängig von der Art seiner Fixierung und unabhängig davon, auf welche Weise
 jeweils eine Wahrnehmung erfolgen kann, gleichviel ob in analoger oder digitaler
 Form. Soweit Datenbanken oder Zusammenstellungen von Daten einen immaterialgüterrechtlichen
-Schutz eigener Art genießen, unterfallen auch sie dem Begriff „Schutzgegenstand"
+Schutz eigener Art genießen, unterfallen auch sie dem Begriff „Schutzgegenstand“
 im Sinne dieser Lizenz.
 
 g. Mit "Sie" bzw. "Ihnen" ist die natürliche oder juristische Person gemeint,
@@ -84,7 +86,7 @@ Wiedergabe sowie das Herstellen von Vervielfältigungsstücken dieser Festhaltun
 sowie die Speicherung einer geschützten Darbietung oder eines Bild- und/oder
 Schallträgers in digitaler Form oder auf einem anderen elektronischen Medium.
 
-   2. Beschränkungen der Verwertungsrechte
+2. Beschränkungen der Verwertungsrechte
 
 Diese Lizenz ist in keiner Weise darauf gerichtet, Befugnisse zur Nutzung
 des Schutzgegenstandes zu vermindern, zu beschränken oder zu vereiteln, die
@@ -93,7 +95,7 @@ der Ausschließlichkeitsrechte des Rechtsinhabers oder anderen entsprechenden
 Rechtsnormen oder sich aus dem Fehlen eines immaterialgüterrechtlichen Schutzes
 ergeben.
 
-   3. Lizenzierung
+3. Lizenzierung
 
 Unter den Bedingungen dieser Lizenz erteilt Ihnen der Lizenzgeber - unbeschadet
 unverzichtbarer Rechte und vorbehaltlich des Abschnitts 3.e) - die vergütungsfreie,
@@ -143,7 +145,7 @@ von Daten Schutzgegenstand dieser Lizenz oder Teil dessen sind und einen immater
 Schutz eigener Art genießen, verzichtet der Lizenzgeber auf die Geltendmachung
 sämtlicher daraus resultierender Rechte.
 
-   4. Bedingungen
+4. Bedingungen
 
 Die Erteilung der Nutzungsbewilligung gemäß Abschnitt 3 dieser Lizenz erfolgt
 ausdrücklich nur unter den folgenden Bedingungen:
@@ -180,10 +182,10 @@ Sie selbst – soweit bekannt – Folgendes angeben:
 i. Den Namen (oder das Pseudonym, falls ein solches verwendet wird) Rechteinhabers,
 und/oder falls der Lizenzgeber im Rechtevermerk, in den Nutzungsbedingungen
 oder auf andere angemessene Weise eine Zuschreibung an Dritte vorgenommen
-hat (z.B. an eine Stiftung, ein Verlagshaus oder eine Zeitung) („Zuschreibungsempfänger"),
+hat (z.B. an eine Stiftung, ein Verlagshaus oder eine Zeitung) („Zuschreibungsempfänger“),
 Namen bzw. Bezeichnung dieses oder dieser Dritten;
 
-         ii. den Titel des Inhaltes;
+        ii. den Titel des Inhaltes;
 
 iii. in einer praktikablen Form den Uniform-Resource-Identifier (URI, z.B.
 Internetadresse), den der Lizenzgeber zum Schutzgegenstand angegeben hat,
@@ -215,7 +217,7 @@ Schutz eigener Art genießen.
 d. (Urheber)Persönlichkeitsrechte bleiben - soweit sie bestehen - von dieser
 Lizenz unberührt.
 
-   5. Gewährleistung
+5. Gewährleistung
 
 SOFERN KEINE ANDERS LAUTENDE, SCHRIFTLICHE VEREINBARUNG ZWISCHEN DEM LIZENZGEBER
 UND IHNEN GESCHLOSSEN WURDE UND SOWEIT MÄNGEL NICHT ARGLISTIG VERSCHWIEGEN
@@ -227,7 +229,7 @@ ERKENNBARKEIT FÜR DEN LIZENZGEBER, DIE VERKEHRSFÄHIGKEIT DES SCHUTZGEGENSTANDE
 SEINE VERWENDBARKEIT FÜR EINEN BESTIMMTEN ZWECK SOWIE DIE KORREKTHEIT VON
 BESCHREIBUNGEN.
 
-   6. Haftungsbeschränkung
+6. Haftungsbeschränkung
 
 ÜBER DIE IN ZIFFER 5 GENANNTE GEWÄHRLEISTUNG HINAUS HAFTET DER LIZENZGEBER
 IHNEN GEGENÜBER FÜR SCHÄDEN JEGLICHER ART NUR BEI GROBER FAHRLÄSSIGKEIT ODER
@@ -235,7 +237,7 @@ VORSATZ, UND ÜBERNIMMT DARÜBER HINAUS KEINERLEI FREIWILLIGE HAFTUNG FÜR FOLGE
 ODER ANDERE SCHÄDEN, AUCH WENN ER ÜBER DIE MÖGLICHKEIT IHRES EINTRITTS UNTERRICHTET
 WURDE.
 
-   7. Erlöschen
+7. Erlöschen
 
 a. Diese Lizenz und die durch sie erteilte Nutzungsbewilligung erlöschen mit
 Wirkung für die Zukunft im Falle eines Verstoßes gegen die Lizenzbedingungen
@@ -258,7 +260,7 @@ Lizenz bereits erfolgt ist bzw. zukünftig noch erfolgen muss) dient und diese
 Lizenz unter Berücksichtigung der oben zum Erlöschen genannten Bedingungen
 vollumfänglich wirksam bleibt.
 
-   8. Sonstige Bestimmungen
+8. Sonstige Bestimmungen
 
 a. Jedes Mal wenn Sie den Schutzgegenstand für sich genommen oder als Teil
 eines Sammelwerkes verbreiten oder öffentlich wiedergeben, bietet der Lizenzgeber
diff --git a/options/license/CC-BY-3.0-US b/options/license/CC-BY-3.0-US
new file mode 100644
index 0000000000..6affd1e514
--- /dev/null
+++ b/options/license/CC-BY-3.0-US
@@ -0,0 +1,248 @@
+Creative Commons Attribution 3.0 United States
+
+CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE LEGAL
+SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN ATTORNEY-CLIENT
+RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS INFORMATION ON AN "AS-IS" BASIS.
+CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE INFORMATION PROVIDED, AND
+DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM ITS USE.
+
+License
+
+THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS
+PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR
+OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS
+LICENSE OR COPYRIGHT LAW IS PROHIBITED.
+
+BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO
+BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY BE CONSIDERED
+TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION
+OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS.
+
+1. Definitions
+
+a. "Collective Work" means a work, such as a periodical issue, anthology or
+encyclopedia, in which the Work in its entirety in unmodified form, along
+with one or more other contributions, constituting separate and independent
+works in themselves, are assembled into a collective whole. A work that constitutes
+a Collective Work will not be considered a Derivative Work (as defined below)
+for the purposes of this License.
+
+b. "Derivative Work" means a work based upon the Work or upon the Work and
+other pre-existing works, such as a translation, musical arrangement, dramatization,
+fictionalization, motion picture version, sound recording, art reproduction,
+abridgment, condensation, or any other form in which the Work may be recast,
+transformed, or adapted, except that a work that constitutes a Collective
+Work will not be considered a Derivative Work for the purpose of this License.
+For the avoidance of doubt, where the Work is a musical composition or sound
+recording, the synchronization of the Work in timed-relation with a moving
+image ("synching") will be considered a Derivative Work for the purpose of
+this License.
+
+c. "Licensor" means the individual, individuals, entity or entities that offers
+the Work under the terms of this License.
+
+d. "Original Author" means the individual, individuals, entity or entities
+who created the Work.
+
+e. "Work" means the copyrightable work of authorship offered under the terms
+of this License.
+
+f. "You" means an individual or entity exercising rights under this License
+who has not previously violated the terms of this License with respect to
+the Work, or who has received express permission from the Licensor to exercise
+rights under this License despite a previous violation.
+
+2. Fair Use Rights. Nothing in this license is intended to reduce, limit,
+or restrict any rights arising from fair use, first sale or other limitations
+on the exclusive rights of the copyright owner under copyright law or other
+applicable laws.
+
+3. License Grant. Subject to the terms and conditions of this License, Licensor
+hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for
+the duration of the applicable copyright) license to exercise the rights in
+the Work as stated below:
+
+a. to reproduce the Work, to incorporate the Work into one or more Collective
+Works, and to reproduce the Work as incorporated in the Collective Works;
+
+b. to create and reproduce Derivative Works provided that any such Derivative
+Work, including any translation in any medium, takes reasonable steps to clearly
+label, demarcate or otherwise identify that changes were made to the original
+Work. For example, a translation could be marked "The original work was translated
+from English to Spanish," or a modification could indicate "The original work
+has been modified.";;
+
+c. to distribute copies or phonorecords of, display publicly, perform publicly,
+and perform publicly by means of a digital audio transmission the Work including
+as incorporated in Collective Works;
+
+d. to distribute copies or phonorecords of, display publicly, perform publicly,
+and perform publicly by means of a digital audio transmission Derivative Works.
+
+    e. For the avoidance of doubt, where the Work is a musical composition:
+
+i. Performance Royalties Under Blanket Licenses. Licensor waives the exclusive
+right to collect, whether individually or, in the event that Licensor is a
+member of a performance rights society (e.g. ASCAP, BMI, SESAC), via that
+society, royalties for the public performance or public digital performance
+(e.g. webcast) of the Work.
+
+ii. Mechanical Rights and Statutory Royalties. Licensor waives the exclusive
+right to collect, whether individually or via a music rights agency or designated
+agent (e.g. Harry Fox Agency), royalties for any phonorecord You create from
+the Work ("cover version") and distribute, subject to the compulsory license
+created by 17 USC Section 115 of the US Copyright Act (or the equivalent in
+other jurisdictions).
+
+f. Webcasting Rights and Statutory Royalties. For the avoidance of doubt,
+where the Work is a sound recording, Licensor waives the exclusive right to
+collect, whether individually or via a performance-rights society (e.g. SoundExchange),
+royalties for the public digital performance (e.g. webcast) of the Work, subject
+to the compulsory license created by 17 USC Section 114 of the US Copyright
+Act (or the equivalent in other jurisdictions).
+
+The above rights may be exercised in all media and formats whether now known
+or hereafter devised. The above rights include the right to make such modifications
+as are technically necessary to exercise the rights in other media and formats.
+All rights not expressly granted by Licensor are hereby reserved.
+
+4. Restrictions. The license granted in Section 3 above is expressly made
+subject to and limited by the following restrictions:
+
+a. You may distribute, publicly display, publicly perform, or publicly digitally
+perform the Work only under the terms of this License, and You must include
+a copy of, or the Uniform Resource Identifier for, this License with every
+copy or phonorecord of the Work You distribute, publicly display, publicly
+perform, or publicly digitally perform. You may not offer or impose any terms
+on the Work that restrict the terms of this License or the ability of a recipient
+of the Work to exercise the rights granted to that recipient under the terms
+of the License. You may not sublicense the Work. You must keep intact all
+notices that refer to this License and to the disclaimer of warranties. When
+You distribute, publicly display, publicly perform, or publicly digitally
+perform the Work, You may not impose any technological measures on the Work
+that restrict the ability of a recipient of the Work from You to exercise
+the rights granted to that recipient under the terms of the License. This
+Section 4(a) applies to the Work as incorporated in a Collective Work, but
+this does not require the Collective Work apart from the Work itself to be
+made subject to the terms of this License. If You create a Collective Work,
+upon notice from any Licensor You must, to the extent practicable, remove
+from the Collective Work any credit as required by Section 4(b), as requested.
+If You create a Derivative Work, upon notice from any Licensor You must, to
+the extent practicable, remove from the Derivative Work any credit as required
+by Section 4(b), as requested.
+
+b. If You distribute, publicly display, publicly perform, or publicly digitally
+perform the Work (as defined in Section 1 above) or any Derivative Works (as
+defined in Section 1 above) or Collective Works (as defined in Section 1 above),
+You must, unless a request has been made pursuant to Section 4(a), keep intact
+all copyright notices for the Work and provide, reasonable to the medium or
+means You are utilizing: (i) the name of the Original Author (or pseudonym,
+if applicable) if supplied, and/or (ii) if the Original Author and/or Licensor
+designate another party or parties (e.g. a sponsor institute, publishing entity,
+journal) for attribution ("Attribution Parties") in Licensor's copyright notice,
+terms of service or by other reasonable means, the name of such party or parties;
+the title of the Work if supplied; to the extent reasonably practicable, the
+Uniform Resource Identifier, if any, that Licensor specifies to be associated
+with the Work, unless such URI does not refer to the copyright notice or licensing
+information for the Work; and, consistent with Section 3(b) in the case of
+a Derivative Work, a credit identifying the use of the Work in the Derivative
+Work (e.g., "French translation of the Work by Original Author," or "Screenplay
+based on original Work by Original Author"). The credit required by this Section
+4(b) may be implemented in any reasonable manner; provided, however, that
+in the case of a Derivative Work or Collective Work, at a minimum such credit
+will appear, if a credit for all contributing authors of the Derivative Work
+or Collective Work appears, then as part of these credits and in a manner
+at least as prominent as the credits for the other contributing authors. For
+the avoidance of doubt, You may only use the credit required by this Section
+for the purpose of attribution in the manner set out above and, by exercising
+Your rights under this License, You may not implicitly or explicitly assert
+or imply any connection with, sponsorship or endorsement by the Original Author,
+Licensor and/or Attribution Parties, as appropriate, of You or Your use of
+the Work, without the separate, express prior written permission of the Original
+Author, Licensor and/or Attribution Parties.
+
+5. Representations, Warranties and Disclaimer
+
+UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS
+THE WORK AS-IS AND ONLY TO THE EXTENT OF ANY RIGHTS HELD IN THE LICENSED WORK
+BY THE LICENSOR. THE LICENSOR MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY
+KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING,
+WITHOUT LIMITATION, WARRANTIES OF TITLE, MARKETABILITY, MERCHANTIBILITY, FITNESS
+FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER
+DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE.
+SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH
+EXCLUSION MAY NOT APPLY TO YOU.
+
+6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW,
+IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL,
+INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS
+LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY
+OF SUCH DAMAGES.
+
+7. Termination
+
+a. This License and the rights granted hereunder will terminate automatically
+upon any breach by You of the terms of this License. Individuals or entities
+who have received Derivative Works (as defined in Section 1 above) or Collective
+Works (as defined in Section 1 above) from You under this License, however,
+will not have their licenses terminated provided such individuals or entities
+remain in full compliance with those licenses. Sections 1, 2, 5, 6, 7, and
+8 will survive any termination of this License.
+
+b. Subject to the above terms and conditions, the license granted here is
+perpetual (for the duration of the applicable copyright in the Work). Notwithstanding
+the above, Licensor reserves the right to release the Work under different
+license terms or to stop distributing the Work at any time; provided, however
+that any such election will not serve to withdraw this License (or any other
+license that has been, or is required to be, granted under the terms of this
+License), and this License will continue in full force and effect unless terminated
+as stated above.
+
+8. Miscellaneous
+
+a. Each time You distribute or publicly digitally perform the Work (as defined
+in Section 1 above) or a Collective Work (as defined in Section 1 above),
+the Licensor offers to the recipient a license to the Work on the same terms
+and conditions as the license granted to You under this License.
+
+b. Each time You distribute or publicly digitally perform a Derivative Work,
+Licensor offers to the recipient a license to the original Work on the same
+terms and conditions as the license granted to You under this License.
+
+c. If any provision of this License is invalid or unenforceable under applicable
+law, it shall not affect the validity or enforceability of the remainder of
+the terms of this License, and without further action by the parties to this
+agreement, such provision shall be reformed to the minimum extent necessary
+to make such provision valid and enforceable.
+
+d. No term or provision of this License shall be deemed waived and no breach
+consented to unless such waiver or consent shall be in writing and signed
+by the party to be charged with such waiver or consent.
+
+e. This License constitutes the entire agreement between the parties with
+respect to the Work licensed here. There are no understandings, agreements
+or representations with respect to the Work not specified here. Licensor shall
+not be bound by any additional provisions that may appear in any communication
+from You. This License may not be modified without the mutual written agreement
+of the Licensor and You.
+
+Creative Commons Notice
+
+Creative Commons is not a party to this License, and makes no warranty whatsoever
+in connection with the Work. Creative Commons will not be liable to You or
+any party on any legal theory for any damages whatsoever, including without
+limitation any general, special, incidental or consequential damages arising
+in connection to this license. Notwithstanding the foregoing two (2) sentences,
+if Creative Commons has expressly identified itself as the Licensor hereunder,
+it shall have all rights and obligations of Licensor.
+
+Except for the limited purpose of indicating to the public that the Work is
+licensed under the CCPL, Creative Commons does not authorize the use by either
+party of the trademark "Creative Commons" or any related trademark or logo
+of Creative Commons without the prior written consent of Creative Commons.
+Any permitted use will be in compliance with Creative Commons' then-current
+trademark usage guidelines, as may be published on its website or otherwise
+made available upon request from time to time. For the avoidance of doubt,
+this trademark restriction does not form part of the License.
+
+Creative Commons may be contacted at https://creativecommons.org/.
diff --git a/options/license/CC-BY-4.0 b/options/license/CC-BY-4.0
index 3f92dfc5fd..3d6abd8730 100644
--- a/options/license/CC-BY-4.0
+++ b/options/license/CC-BY-4.0
@@ -1,11 +1,13 @@
-Creative Commons Attribution 4.0 International Creative Commons Corporation
-("Creative Commons") is not a law firm and does not provide legal services
-or legal advice. Distribution of Creative Commons public licenses does not
-create a lawyer-client or other relationship. Creative Commons makes its licenses
-and related information available on an "as-is" basis. Creative Commons gives
-no warranties regarding its licenses, any material licensed under their terms
-and conditions, or any related information. Creative Commons disclaims all
-liability for damages resulting from their use to the fullest extent possible.
+Creative Commons Attribution 4.0 International
+
+Creative Commons Corporation (“Creative Commons”) is not a law firm and does
+not provide legal services or legal advice. Distribution of Creative Commons
+public licenses does not create a lawyer-client or other relationship. Creative
+Commons makes its licenses and related information available on an “as-is”
+basis. Creative Commons gives no warranties regarding its licenses, any material
+licensed under their terms and conditions, or any related information. Creative
+Commons disclaims all liability for damages resulting from their use to the
+fullest extent possible.
 
 Using Creative Commons Public Licenses
 
@@ -24,11 +26,11 @@ they choose before applying it. Licensors should also secure all rights necessar
 before applying our licenses so that the public can reuse the material as
 expected. Licensors should clearly mark any material not subject to the license.
 This includes other CC-licensed material, or material used under an exception
-or limitation to copyright. More considerations for licensors : wiki.creativecommons.org/Considerations_for_licensors
+or limitation to copyright. More considerations for licensors.
 
 Considerations for the public: By using one of our public licenses, a licensor
 grants the public permission to use the licensed material under specified
-terms and conditions. If the licensor's permission is not necessary for any
+terms and conditions. If the licensor’s permission is not necessary for any
 reason–for example, because of any applicable exception or limitation to copyright–then
 that use is not regulated by the license. Our licenses grant only permissions
 under copyright and certain other rights that a licensor has authority to
@@ -36,9 +38,9 @@ grant. Use of the licensed material may still be restricted for other reasons,
 including because others have copyright or other rights in the material. A
 licensor may make special requests, such as asking that all changes be marked
 or described. Although not required by our licenses, you are encouraged to
-respect those requests where reasonable. More considerations for the public
-: wiki.creativecommons.org/Considerations_for_licensees Creative Commons Attribution
-4.0 International Public License
+respect those requests where reasonable. More considerations for the public.
+
+Creative Commons Attribution 4.0 International Public License
 
 By exercising the Licensed Rights (defined below), You accept and agree to
 be bound by the terms and conditions of this Creative Commons Attribution
@@ -51,7 +53,7 @@ conditions.
 
 Section 1 – Definitions.
 
-a. Adapted Material means material subject to Copyright and Similar Rights
+a.	Adapted Material means material subject to Copyright and Similar Rights
 that is derived from or based upon the Licensed Material and in which the
 Licensed Material is translated, altered, arranged, transformed, or otherwise
 modified in a manner requiring permission under the Copyright and Similar
@@ -60,69 +62,69 @@ Licensed Material is a musical work, performance, or sound recording, Adapted
 Material is always produced where the Licensed Material is synched in timed
 relation with a moving image.
 
-b. Adapter's License means the license You apply to Your Copyright and Similar
+b.	Adapter's License means the license You apply to Your Copyright and Similar
 Rights in Your contributions to Adapted Material in accordance with the terms
 and conditions of this Public License.
 
-c. Copyright and Similar Rights means copyright and/or similar rights closely
+c.	Copyright and Similar Rights means copyright and/or similar rights closely
 related to copyright including, without limitation, performance, broadcast,
 sound recording, and Sui Generis Database Rights, without regard to how the
 rights are labeled or categorized. For purposes of this Public License, the
 rights specified in Section 2(b)(1)-(2) are not Copyright and Similar Rights.
 
-d. Effective Technological Measures means those measures that, in the absence
+d.	Effective Technological Measures means those measures that, in the absence
 of proper authority, may not be circumvented under laws fulfilling obligations
 under Article 11 of the WIPO Copyright Treaty adopted on December 20, 1996,
 and/or similar international agreements.
 
-e. Exceptions and Limitations means fair use, fair dealing, and/or any other
+e.	Exceptions and Limitations means fair use, fair dealing, and/or any other
 exception or limitation to Copyright and Similar Rights that applies to Your
 use of the Licensed Material.
 
-f. Licensed Material means the artistic or literary work, database, or other
+f.	Licensed Material means the artistic or literary work, database, or other
 material to which the Licensor applied this Public License.
 
-g. Licensed Rights means the rights granted to You subject to the terms and
+g.	Licensed Rights means the rights granted to You subject to the terms and
 conditions of this Public License, which are limited to all Copyright and
 Similar Rights that apply to Your use of the Licensed Material and that the
 Licensor has authority to license.
 
-h. Licensor means the individual(s) or entity(ies) granting rights under this
+h.	Licensor means the individual(s) or entity(ies) granting rights under this
 Public License.
 
-i. Share means to provide material to the public by any means or process that
+i.	Share means to provide material to the public by any means or process that
 requires permission under the Licensed Rights, such as reproduction, public
 display, public performance, distribution, dissemination, communication, or
 importation, and to make material available to the public including in ways
 that members of the public may access the material from a place and at a time
 individually chosen by them.
 
-j. Sui Generis Database Rights means rights other than copyright resulting
+j.	Sui Generis Database Rights means rights other than copyright resulting
 from Directive 96/9/EC of the European Parliament and of the Council of 11
 March 1996 on the legal protection of databases, as amended and/or succeeded,
 as well as other essentially equivalent rights anywhere in the world.
 
-k. You means the individual or entity exercising the Licensed Rights under
+k.	You means the individual or entity exercising the Licensed Rights under
 this Public License. Your has a corresponding meaning.
 
 Section 2 – Scope.
 
-   a. License grant.
+     a.	License grant.
 
 1. Subject to the terms and conditions of this Public License, the Licensor
 hereby grants You a worldwide, royalty-free, non-sublicensable, non-exclusive,
 irrevocable license to exercise the Licensed Rights in the Licensed Material
 to:
 
-         A. reproduce and Share the Licensed Material, in whole or in part; and
+A. reproduce and Share the Licensed Material, in whole or in part; and
 
-         B. produce, reproduce, and Share Adapted Material.
+               B. produce, reproduce, and Share Adapted Material.
 
 2. Exceptions and Limitations. For the avoidance of doubt, where Exceptions
 and Limitations apply to Your use, this Public License does not apply, and
 You do not need to comply with its terms and conditions.
 
-      3. Term. The term of this Public License is specified in Section 6(a).
+3. Term. The term of this Public License is specified in Section 6(a).
 
 4. Media and formats; technical modifications allowed. The Licensor authorizes
 You to exercise the Licensed Rights in all media and formats whether now known
@@ -134,7 +136,7 @@ Effective Technological Measures. For purposes of this Public License, simply
 making modifications authorized by this Section 2(a)(4) never produces Adapted
 Material.
 
-      5. Downstream recipients.
+          5. Downstream recipients.
 
 A. Offer from the Licensor – Licensed Material. Every recipient of the Licensed
 Material automatically receives an offer from the Licensor to exercise the
@@ -145,13 +147,13 @@ or different terms or conditions on, or apply any Effective Technological
 Measures to, the Licensed Material if doing so restricts exercise of the Licensed
 Rights by any recipient of the Licensed Material.
 
-6. No endorsement. Nothing in this Public License constitutes or may be construed
+6.  No endorsement. Nothing in this Public License constitutes or may be construed
 as permission to assert or imply that You are, or that Your use of the Licensed
 Material is, connected with, or sponsored, endorsed, or granted official status
 by, the Licensor or others designated to receive attribution as provided in
 Section 3(a)(1)(A)(i).
 
-   b. Other rights.
+b. Other rights.
 
 1. Moral rights, such as the right of integrity, are not licensed under this
 Public License, nor are publicity, privacy, and/or other similar personality
@@ -172,7 +174,7 @@ Section 3 – License Conditions.
 Your exercise of the Licensed Rights is expressly made subject to the following
 conditions.
 
-   a. Attribution.
+     a.	Attribution.
 
 1. If You Share the Licensed Material (including in modified form), You must:
 
@@ -183,11 +185,11 @@ i. identification of the creator(s) of the Licensed Material and any others
 designated to receive attribution, in any reasonable manner requested by the
 Licensor (including by pseudonym if designated);
 
-            ii. a copyright notice;
+                    ii. a copyright notice;
 
-            iii. a notice that refers to this Public License;
+                    iii. a notice that refers to this Public License;
 
-            iv. a notice that refers to the disclaimer of warranties;
+                    iv.	a notice that refers to the disclaimer of warranties;
 
 v. a URI or hyperlink to the Licensed Material to the extent reasonably practicable;
 
@@ -214,25 +216,24 @@ Section 4 – Sui Generis Database Rights.
 Where the Licensed Rights include Sui Generis Database Rights that apply to
 Your use of the Licensed Material:
 
-a. for the avoidance of doubt, Section 2(a)(1) grants You the right to extract,
+a.	for the avoidance of doubt, Section 2(a)(1) grants You the right to extract,
 reuse, reproduce, and Share all or a substantial portion of the contents of
 the database;
 
-b. if You include all or a substantial portion of the database contents in
+b.	if You include all or a substantial portion of the database contents in
 a database in which You have Sui Generis Database Rights, then the database
 in which You have Sui Generis Database Rights (but not its individual contents)
 is Adapted Material; and
 
-c. You must comply with the conditions in Section 3(a) if You Share all or
+c.	You must comply with the conditions in Section 3(a) if You Share all or
 a substantial portion of the contents of the database.
-
 For the avoidance of doubt, this Section 4 supplements and does not replace
 Your obligations under this Public License where the Licensed Rights include
 other Copyright and Similar Rights.
 
 Section 5 – Disclaimer of Warranties and Limitation of Liability.
 
-a. Unless otherwise separately undertaken by the Licensor, to the extent possible,
+a.	Unless otherwise separately undertaken by the Licensor, to the extent possible,
 the Licensor offers the Licensed Material as-is and as-available, and makes
 no representations or warranties of any kind concerning the Licensed Material,
 whether express, implied, statutory, or other. This includes, without limitation,
@@ -241,7 +242,7 @@ absence of latent or other defects, accuracy, or the presence or absence of
 errors, whether or not known or discoverable. Where disclaimers of warranties
 are not allowed in full or in part, this disclaimer may not apply to You.
 
-b. To the extent possible, in no event will the Licensor be liable to You
+b.	To the extent possible, in no event will the Licensor be liable to You
 on any legal theory (including, without limitation, negligence) or otherwise
 for any direct, special, indirect, incidental, consequential, punitive, exemplary,
 or other losses, costs, expenses, or damages arising out of this Public License
@@ -250,75 +251,74 @@ the possibility of such losses, costs, expenses, or damages. Where a limitation
 of liability is not allowed in full or in part, this limitation may not apply
 to You.
 
-c. The disclaimer of warranties and limitation of liability provided above
+c.	The disclaimer of warranties and limitation of liability provided above
 shall be interpreted in a manner that, to the extent possible, most closely
 approximates an absolute disclaimer and waiver of all liability.
 
 Section 6 – Term and Termination.
 
-a. This Public License applies for the term of the Copyright and Similar Rights
+a.	This Public License applies for the term of the Copyright and Similar Rights
 licensed here. However, if You fail to comply with this Public License, then
 Your rights under this Public License terminate automatically.
 
-b. Where Your right to use the Licensed Material has terminated under Section
+b.	Where Your right to use the Licensed Material has terminated under Section
 6(a), it reinstates:
 
 1. automatically as of the date the violation is cured, provided it is cured
 within 30 days of Your discovery of the violation; or
 
-      2. upon express reinstatement by the Licensor.
+          2. upon express reinstatement by the Licensor.
 
-c. For the avoidance of doubt, this Section 6(b) does not affect any right
+c.	For the avoidance of doubt, this Section 6(b) does not affect any right
 the Licensor may have to seek remedies for Your violations of this Public
 License.
 
-d. For the avoidance of doubt, the Licensor may also offer the Licensed Material
+d.	For the avoidance of doubt, the Licensor may also offer the Licensed Material
 under separate terms or conditions or stop distributing the Licensed Material
 at any time; however, doing so will not terminate this Public License.
 
-   e. Sections 1, 5, 6, 7, and 8 survive termination of this Public License.
+     e.	Sections 1, 5, 6, 7, and 8 survive termination of this Public License.
 
 Section 7 – Other Terms and Conditions.
 
-a. The Licensor shall not be bound by any additional or different terms or
+a.	The Licensor shall not be bound by any additional or different terms or
 conditions communicated by You unless expressly agreed.
 
-b. Any arrangements, understandings, or agreements regarding the Licensed
+b.	Any arrangements, understandings, or agreements regarding the Licensed
 Material not stated herein are separate from and independent of the terms
 and conditions of this Public License.
 
 Section 8 – Interpretation.
 
-a. For the avoidance of doubt, this Public License does not, and shall not
+a.	For the avoidance of doubt, this Public License does not, and shall not
 be interpreted to, reduce, limit, restrict, or impose conditions on any use
 of the Licensed Material that could lawfully be made without permission under
 this Public License.
 
-b. To the extent possible, if any provision of this Public License is deemed
+b.	To the extent possible, if any provision of this Public License is deemed
 unenforceable, it shall be automatically reformed to the minimum extent necessary
 to make it enforceable. If the provision cannot be reformed, it shall be severed
 from this Public License without affecting the enforceability of the remaining
 terms and conditions.
 
-c. No term or condition of this Public License will be waived and no failure
+c.	No term or condition of this Public License will be waived and no failure
 to comply consented to unless expressly agreed to by the Licensor.
 
-d. Nothing in this Public License constitutes or may be interpreted as a limitation
+d.	Nothing in this Public License constitutes or may be interpreted as a limitation
 upon, or waiver of, any privileges and immunities that apply to the Licensor
 or You, including from the legal processes of any jurisdiction or authority.
 
 Creative Commons is not a party to its public licenses. Notwithstanding, Creative
 Commons may elect to apply one of its public licenses to material it publishes
-and in those instances will be considered the "Licensor." The text of the
-Creative Commons public licenses is dedicated to the public domain under the
-CC0 Public Domain Dedication. Except for the limited purpose of indicating
-that material is shared under a Creative Commons public license or as otherwise
-permitted by the Creative Commons policies published at creativecommons.org/policies,
-Creative Commons does not authorize the use of the trademark "Creative Commons"
-or any other trademark or logo of Creative Commons without its prior written
-consent including, without limitation, in connection with any unauthorized
-modifications to any of its public licenses or any other arrangements, understandings,
-or agreements concerning use of licensed material. For the avoidance of doubt,
-this paragraph does not form part of the public licenses.
+and in those instances will be considered the “Licensor.” Except for the limited
+purpose of indicating that material is shared under a Creative Commons public
+license or as otherwise permitted by the Creative Commons policies published
+at creativecommons.org/policies, Creative Commons does not authorize the use
+of the trademark “Creative Commons” or any other trademark or logo of Creative
+Commons without its prior written consent including, without limitation, in
+connection with any unauthorized modifications to any of its public licenses
+or any other arrangements, understandings, or agreements concerning use of
+licensed material. For the avoidance of doubt, this paragraph does not form
+part of the public licenses.
 
 Creative Commons may be contacted at creativecommons.org.
diff --git a/options/license/CC-BY-NC-1.0 b/options/license/CC-BY-NC-1.0
index f553ccabab..6de73de661 100644
--- a/options/license/CC-BY-NC-1.0
+++ b/options/license/CC-BY-NC-1.0
@@ -1,9 +1,10 @@
-Creative Commons Attribution-NonCommercial 1.0 CREATIVE COMMONS CORPORATION
-IS NOT A LAW FIRM AND DOES NOT PROVIDE LEGAL SERVICES. DISTRIBUTION OF THIS
-DRAFT LICENSE DOES NOT CREATE AN ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS
-PROVIDES THIS INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
-REGARDING THE INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING
-FROM ITS USE.
+Creative Commons Attribution-NonCommercial 1.0
+
+CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE LEGAL
+SERVICES. DISTRIBUTION OF THIS DRAFT LICENSE DOES NOT CREATE AN ATTORNEY-CLIENT
+RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS INFORMATION ON AN "AS-IS" BASIS.
+CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE INFORMATION PROVIDED, AND
+DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM ITS USE.
 
 License
 
@@ -16,7 +17,7 @@ BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO
 BE BOUND BY THE TERMS OF THIS LICENSE. THE LICENSOR GRANTS YOU THE RIGHTS
 CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS.
 
-   1. Definitions
+1. Definitions
 
 a. "Collective Work" means a work, such as a periodical issue, anthology or
 encyclopedia, in which the Work in its entirety in unmodified form, along
@@ -35,7 +36,7 @@ Work will not be considered a Derivative Work for the purpose of this License.
 c. "Licensor" means the individual or entity that offers the Work under the
 terms of this License.
 
-      d. "Original Author" means the individual or entity who created the Work.
+     d. "Original Author" means the individual or entity who created the Work.
 
 e. "Work" means the copyrightable work of authorship offered under the terms
 of this License.
@@ -58,7 +59,7 @@ the Work as stated below:
 a. to reproduce the Work, to incorporate the Work into one or more Collective
 Works, and to reproduce the Work as incorporated in the Collective Works;
 
-      b. to create and reproduce Derivative Works;
+     b. to create and reproduce Derivative Works;
 
 c. to distribute copies or phonorecords of, display publicly, perform publicly,
 and perform publicly by means of a digital audio transmission the Work including
@@ -117,7 +118,7 @@ such credit will appear where any other comparable authorship credit appears
 and in a manner at least as prominent as such other comparable authorship
 credit.
 
-   5. Representations, Warranties and Disclaimer
+5. Representations, Warranties and Disclaimer
 
 By offering the Work for public release under this License, Licensor represents
 and warrants that, to the best of Licensor's knowledge after reasonable inquiry:
@@ -140,7 +141,7 @@ TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE
 OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN
 IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
 
-   7. Termination
+7. Termination
 
 a. This License and the rights granted hereunder will terminate automatically
 upon any breach by You of the terms of this License. Individuals or entities
@@ -158,7 +159,7 @@ license that has been, or is required to be, granted under the terms of this
 License), and this License will continue in full force and effect unless terminated
 as stated above.
 
-   8. Miscellaneous
+8. Miscellaneous
 
 a. Each time You distribute or publicly digitally perform the Work or a Collective
 Work, the Licensor offers to the recipient a license to the Work on the same
diff --git a/options/license/CC-BY-NC-2.0 b/options/license/CC-BY-NC-2.0
index d84a86aed0..117dff45a3 100644
--- a/options/license/CC-BY-NC-2.0
+++ b/options/license/CC-BY-NC-2.0
@@ -1,9 +1,10 @@
-Creative Commons Attribution-NonCommercial 2.0 CREATIVE COMMONS CORPORATION
-IS NOT A LAW FIRM AND DOES NOT PROVIDE LEGAL SERVICES. DISTRIBUTION OF THIS
-LICENSE DOES NOT CREATE AN ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS
-PROVIDES THIS INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
-REGARDING THE INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING
-FROM ITS USE.
+Creative Commons Attribution-NonCommercial 2.0
+
+CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE LEGAL
+SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN ATTORNEY-CLIENT
+RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS INFORMATION ON AN "AS-IS" BASIS.
+CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE INFORMATION PROVIDED, AND
+DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM ITS USE.
 
 License
 
@@ -16,7 +17,7 @@ BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO
 BE BOUND BY THE TERMS OF THIS LICENSE. THE LICENSOR GRANTS YOU THE RIGHTS
 CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS.
 
-   1. Definitions
+1. Definitions
 
 a. "Collective Work" means a work, such as a periodical issue, anthology or
 encyclopedia, in which the Work in its entirety in unmodified form, along
@@ -39,7 +40,7 @@ this License.
 c. "Licensor" means the individual or entity that offers the Work under the
 terms of this License.
 
-      d. "Original Author" means the individual or entity who created the Work.
+     d. "Original Author" means the individual or entity who created the Work.
 
 e. "Work" means the copyrightable work of authorship offered under the terms
 of this License.
@@ -62,7 +63,7 @@ the Work as stated below:
 a. to reproduce the Work, to incorporate the Work into one or more Collective
 Works, and to reproduce the Work as incorporated in the Collective Works;
 
-      b. to create and reproduce Derivative Works;
+     b. to create and reproduce Derivative Works;
 
 c. to distribute copies or phonorecords of, display publicly, perform publicly,
 and perform publicly by means of a digital audio transmission the Work including
@@ -125,7 +126,7 @@ such credit will appear where any other comparable authorship credit appears
 and in a manner at least as prominent as such other comparable authorship
 credit.
 
-      d. For the avoidance of doubt, where the Work is a musical composition:
+     d. For the avoidance of doubt, where the Work is a musical composition:
 
 i. Performance Royalties Under Blanket Licenses. Licensor reserves the exclusive
 right to collect, whether individually or via a performance rights society
@@ -149,7 +150,7 @@ Act (or the equivalent in other jurisdictions), if Your public digital performan
 is primarily intended for or directed toward commercial advantage or private
 monetary compensation.
 
-   5. Representations, Warranties and Disclaimer
+5. Representations, Warranties and Disclaimer
 
 UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS
 THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING
@@ -165,7 +166,7 @@ INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS
 LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY
 OF SUCH DAMAGES.
 
-   7. Termination
+7. Termination
 
 a. This License and the rights granted hereunder will terminate automatically
 upon any breach by You of the terms of this License. Individuals or entities
@@ -183,7 +184,7 @@ license that has been, or is required to be, granted under the terms of this
 License), and this License will continue in full force and effect unless terminated
 as stated above.
 
-   8. Miscellaneous
+8. Miscellaneous
 
 a. Each time You distribute or publicly digitally perform the Work or a Collective
 Work, the Licensor offers to the recipient a license to the Work on the same
diff --git a/options/license/CC-BY-NC-3.0 b/options/license/CC-BY-NC-3.0
index 25d8e70458..b604543f53 100644
--- a/options/license/CC-BY-NC-3.0
+++ b/options/license/CC-BY-NC-3.0
@@ -1,9 +1,10 @@
-Creative Commons Attribution-NonCommercial 3.0 Unported CREATIVE COMMONS CORPORATION
-IS NOT A LAW FIRM AND DOES NOT PROVIDE LEGAL SERVICES. DISTRIBUTION OF THIS
-LICENSE DOES NOT CREATE AN ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS
-PROVIDES THIS INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
-REGARDING THE INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING
-FROM ITS USE.
+Creative Commons Attribution-NonCommercial 3.0 Unported
+
+CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE LEGAL
+SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN ATTORNEY-CLIENT
+RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS INFORMATION ON AN "AS-IS" BASIS.
+CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE INFORMATION PROVIDED, AND
+DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM ITS USE.
 
 License
 
@@ -17,7 +18,7 @@ BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY BE CONSIDE
 TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION
 OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS.
 
-   1. Definitions
+1. Definitions
 
 a. "Adaptation" means a work based upon the Work, or upon the Work and other
 pre-existing works, such as a translation, adaptation, derivative work, arrangement
@@ -117,7 +118,7 @@ has been modified.";
 c. to Distribute and Publicly Perform the Work including as incorporated in
 Collections; and,
 
-      d. to Distribute and Publicly Perform Adaptations.
+     d. to Distribute and Publicly Perform Adaptations.
 
 The above rights may be exercised in all media and formats whether now known
 or hereafter devised. The above rights include the right to make such modifications
@@ -185,7 +186,7 @@ Parties, as appropriate, of You or Your use of the Work, without the separate,
 express prior written permission of the Original Author, Licensor and/or Attribution
 Parties.
 
-      d. For the avoidance of doubt:
+     d. For the avoidance of doubt:
 
 i. Non-waivable Compulsory License Schemes. In those jurisdictions in which
 the right to collect royalties through any statutory or compulsory licensing
@@ -221,7 +222,7 @@ permitted by the applicable national law, to enable You to reasonably exercise
 Your right under Section 3(b) of this License (right to make Adaptations)
 but not otherwise.
 
-   5. Representations, Warranties and Disclaimer
+5. Representations, Warranties and Disclaimer
 
 UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS
 THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING
@@ -237,7 +238,7 @@ INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS
 LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY
 OF SUCH DAMAGES.
 
-   7. Termination
+7. Termination
 
 a. This License and the rights granted hereunder will terminate automatically
 upon any breach by You of the terms of this License. Individuals or entities
@@ -255,7 +256,7 @@ license that has been, or is required to be, granted under the terms of this
 License), and this License will continue in full force and effect unless terminated
 as stated above.
 
-   8. Miscellaneous
+8. Miscellaneous
 
 a. Each time You Distribute or Publicly Perform the Work or a Collection,
 the Licensor offers to the recipient a license to the Work on the same terms
diff --git a/options/license/CC-BY-NC-4.0 b/options/license/CC-BY-NC-4.0
index 1a79609760..cc7b931b3a 100644
--- a/options/license/CC-BY-NC-4.0
+++ b/options/license/CC-BY-NC-4.0
@@ -1,12 +1,13 @@
-Creative Commons Attribution-NonCommercial 4.0 International Creative Commons
-Corporation ("Creative Commons") is not a law firm and does not provide legal
-services or legal advice. Distribution of Creative Commons public licenses
-does not create a lawyer-client or other relationship. Creative Commons makes
-its licenses and related information available on an "as-is" basis. Creative
-Commons gives no warranties regarding its licenses, any material licensed
-under their terms and conditions, or any related information. Creative Commons
-disclaims all liability for damages resulting from their use to the fullest
-extent possible.
+Creative Commons Attribution-NonCommercial 4.0 International
+
+Creative Commons Corporation (“Creative Commons”) is not a law firm and does
+not provide legal services or legal advice. Distribution of Creative Commons
+public licenses does not create a lawyer-client or other relationship. Creative
+Commons makes its licenses and related information available on an “as-is”
+basis. Creative Commons gives no warranties regarding its licenses, any material
+licensed under their terms and conditions, or any related information. Creative
+Commons disclaims all liability for damages resulting from their use to the
+fullest extent possible.
 
 Using Creative Commons Public Licenses
 
@@ -17,8 +18,6 @@ specified in the public license below. The following considerations are for
 informational purposes only, are not exhaustive, and do not form part of our
 licenses.
 
-   
-
 Considerations for licensors: Our public licenses are intended for use by
 those authorized to give the public permission to use material in ways otherwise
 restricted by copyright and certain other rights. Our licenses are irrevocable.
@@ -27,13 +26,11 @@ they choose before applying it. Licensors should also secure all rights necessar
 before applying our licenses so that the public can reuse the material as
 expected. Licensors should clearly mark any material not subject to the license.
 This includes other CC-licensed material, or material used under an exception
-or limitation to copyright. More considerations for licensors : wiki.creativecommons.org/Considerations_for_licensors
-
-   
+or limitation to copyright. More considerations for licensors.
 
 Considerations for the public: By using one of our public licenses, a licensor
 grants the public permission to use the licensed material under specified
-terms and conditions. If the licensor's permission is not necessary for any
+terms and conditions. If the licensor’s permission is not necessary for any
 reason–for example, because of any applicable exception or limitation to copyright–then
 that use is not regulated by the license. Our licenses grant only permissions
 under copyright and certain other rights that a licensor has authority to
@@ -41,9 +38,9 @@ grant. Use of the licensed material may still be restricted for other reasons,
 including because others have copyright or other rights in the material. A
 licensor may make special requests, such as asking that all changes be marked
 or described. Although not required by our licenses, you are encouraged to
-respect those requests where reasonable. More considerations for the public
-: wiki.creativecommons.org/Considerations_for_licensees Creative Commons Attribution-NonCommercial
-4.0 International Public License
+respect those requests where reasonable. More considerations for the public.
+
+Creative Commons Attribution-NonCommercial 4.0 International Public License
 
 By exercising the Licensed Rights (defined below), You accept and agree to
 be bound by the terms and conditions of this Creative Commons Attribution-NonCommercial
@@ -54,11 +51,9 @@ Licensor grants You such rights in consideration of benefits the Licensor
 receives from making the Licensed Material available under these terms and
 conditions.
 
-   
+Section 1 – Definitions.
 
-   Section 1 – Definitions.
-
-a. Adapted Material means material subject to Copyright and Similar Rights
+a.	Adapted Material means material subject to Copyright and Similar Rights
 that is derived from or based upon the Licensed Material and in which the
 Licensed Material is translated, altered, arranged, transformed, or otherwise
 modified in a manner requiring permission under the Copyright and Similar
@@ -67,63 +62,61 @@ Licensed Material is a musical work, performance, or sound recording, Adapted
 Material is always produced where the Licensed Material is synched in timed
 relation with a moving image.
 
-b. Adapter's License means the license You apply to Your Copyright and Similar
+b.	Adapter's License means the license You apply to Your Copyright and Similar
 Rights in Your contributions to Adapted Material in accordance with the terms
 and conditions of this Public License.
 
-c. Copyright and Similar Rights means copyright and/or similar rights closely
+c.	Copyright and Similar Rights means copyright and/or similar rights closely
 related to copyright including, without limitation, performance, broadcast,
 sound recording, and Sui Generis Database Rights, without regard to how the
 rights are labeled or categorized. For purposes of this Public License, the
 rights specified in Section 2(b)(1)-(2) are not Copyright and Similar Rights.
 
-d. Effective Technological Measures means those measures that, in the absence
+d.	Effective Technological Measures means those measures that, in the absence
 of proper authority, may not be circumvented under laws fulfilling obligations
 under Article 11 of the WIPO Copyright Treaty adopted on December 20, 1996,
 and/or similar international agreements.
 
-e. Exceptions and Limitations means fair use, fair dealing, and/or any other
+e.	Exceptions and Limitations means fair use, fair dealing, and/or any other
 exception or limitation to Copyright and Similar Rights that applies to Your
 use of the Licensed Material.
 
-f. Licensed Material means the artistic or literary work, database, or other
+f.	Licensed Material means the artistic or literary work, database, or other
 material to which the Licensor applied this Public License.
 
-g. Licensed Rights means the rights granted to You subject to the terms and
+g.	Licensed Rights means the rights granted to You subject to the terms and
 conditions of this Public License, which are limited to all Copyright and
 Similar Rights that apply to Your use of the Licensed Material and that the
 Licensor has authority to license.
 
-h. Licensor means the individual(s) or entity(ies) granting rights under this
+h.	Licensor means the individual(s) or entity(ies) granting rights under this
 Public License.
 
-i. NonCommercial means not primarily intended for or directed towards commercial
+i.	NonCommercial means not primarily intended for or directed towards commercial
 advantage or monetary compensation. For purposes of this Public License, the
 exchange of the Licensed Material for other material subject to Copyright
 and Similar Rights by digital file-sharing or similar means is NonCommercial
 provided there is no payment of monetary compensation in connection with the
 exchange.
 
-j. Share means to provide material to the public by any means or process that
+j.	Share means to provide material to the public by any means or process that
 requires permission under the Licensed Rights, such as reproduction, public
 display, public performance, distribution, dissemination, communication, or
 importation, and to make material available to the public including in ways
 that members of the public may access the material from a place and at a time
 individually chosen by them.
 
-k. Sui Generis Database Rights means rights other than copyright resulting
+k.	Sui Generis Database Rights means rights other than copyright resulting
 from Directive 96/9/EC of the European Parliament and of the Council of 11
 March 1996 on the legal protection of databases, as amended and/or succeeded,
 as well as other essentially equivalent rights anywhere in the world.
 
-l. You means the individual or entity exercising the Licensed Rights under
+l.	You means the individual or entity exercising the Licensed Rights under
 this Public License. Your has a corresponding meaning.
 
-   
+Section 2 – Scope.
 
-   Section 2 – Scope.
-
-      a. License grant.
+     a.	License grant.
 
 1. Subject to the terms and conditions of this Public License, the Licensor
 hereby grants You a worldwide, royalty-free, non-sublicensable, non-exclusive,
@@ -140,7 +133,7 @@ only.
 and Limitations apply to Your use, this Public License does not apply, and
 You do not need to comply with its terms and conditions.
 
-         3. Term. The term of this Public License is specified in Section 6(a).
+3. Term. The term of this Public License is specified in Section 6(a).
 
 4. Media and formats; technical modifications allowed. The Licensor authorizes
 You to exercise the Licensed Rights in all media and formats whether now known
@@ -152,7 +145,7 @@ Effective Technological Measures. For purposes of this Public License, simply
 making modifications authorized by this Section 2(a)(4) never produces Adapted
 Material.
 
-         5. Downstream recipients.
+          5. Downstream recipients.
 
 A. Offer from the Licensor – Licensed Material. Every recipient of the Licensed
 Material automatically receives an offer from the Licensor to exercise the
@@ -169,7 +162,7 @@ Material is, connected with, or sponsored, endorsed, or granted official status
 by, the Licensor or others designated to receive attribution as provided in
 Section 3(a)(1)(A)(i).
 
-      b. Other rights.
+     b.	Other rights.
 
 1. Moral rights, such as the right of integrity, are not licensed under this
 Public License, nor are publicity, privacy, and/or other similar personality
@@ -186,31 +179,29 @@ licensing scheme. In all other cases the Licensor expressly reserves any right
 to collect such royalties, including when the Licensed Material is used other
 than for NonCommercial purposes.
 
-   
-
-   Section 3 – License Conditions.
+Section 3 – License Conditions.
 
 Your exercise of the Licensed Rights is expressly made subject to the following
 conditions.
 
-      a. Attribution.
+     a.	Attribution.
 
 1. If You Share the Licensed Material (including in modified form), You must:
 
 A. retain the following if it is supplied by the Licensor with the Licensed
 Material:
 
-i. identification of the creator(s) of the Licensed Material and any others
+i.	identification of the creator(s) of the Licensed Material and any others
 designated to receive attribution, in any reasonable manner requested by the
 Licensor (including by pseudonym if designated);
 
-               ii. a copyright notice;
+                    ii.	a copyright notice;
 
-               iii. a notice that refers to this Public License;
+                    iii. a notice that refers to this Public License;
 
-               iv. a notice that refers to the disclaimer of warranties;
+                    iv.	a notice that refers to the disclaimer of warranties;
 
-v. a URI or hyperlink to the Licensed Material to the extent reasonably practicable;
+v.	a URI or hyperlink to the Licensed Material to the extent reasonably practicable;
 
 B. indicate if You modified the Licensed Material and retain an indication
 of any previous modifications; and
@@ -230,34 +221,29 @@ by Section 3(a)(1)(A) to the extent reasonably practicable.
 must not prevent recipients of the Adapted Material from complying with this
 Public License.
 
-   
-
-   Section 4 – Sui Generis Database Rights.
+Section 4 – Sui Generis Database Rights.
 
 Where the Licensed Rights include Sui Generis Database Rights that apply to
 Your use of the Licensed Material:
 
-a. for the avoidance of doubt, Section 2(a)(1) grants You the right to extract,
+a.	for the avoidance of doubt, Section 2(a)(1) grants You the right to extract,
 reuse, reproduce, and Share all or a substantial portion of the contents of
 the database for NonCommercial purposes only;
 
-b. if You include all or a substantial portion of the database contents in
+b.	if You include all or a substantial portion of the database contents in
 a database in which You have Sui Generis Database Rights, then the database
 in which You have Sui Generis Database Rights (but not its individual contents)
 is Adapted Material; and
 
-c. You must comply with the conditions in Section 3(a) if You Share all or
+c.	You must comply with the conditions in Section 3(a) if You Share all or
 a substantial portion of the contents of the database.
-
 For the avoidance of doubt, this Section 4 supplements and does not replace
 Your obligations under this Public License where the Licensed Rights include
 other Copyright and Similar Rights.
 
-   
+Section 5 – Disclaimer of Warranties and Limitation of Liability.
 
-   Section 5 – Disclaimer of Warranties and Limitation of Liability.
-
-a. Unless otherwise separately undertaken by the Licensor, to the extent possible,
+a.	Unless otherwise separately undertaken by the Licensor, to the extent possible,
 the Licensor offers the Licensed Material as-is and as-available, and makes
 no representations or warranties of any kind concerning the Licensed Material,
 whether express, implied, statutory, or other. This includes, without limitation,
@@ -266,7 +252,7 @@ absence of latent or other defects, accuracy, or the presence or absence of
 errors, whether or not known or discoverable. Where disclaimers of warranties
 are not allowed in full or in part, this disclaimer may not apply to You.
 
-b. To the extent possible, in no event will the Licensor be liable to You
+b.	To the extent possible, in no event will the Licensor be liable to You
 on any legal theory (including, without limitation, negligence) or otherwise
 for any direct, special, indirect, incidental, consequential, punitive, exemplary,
 or other losses, costs, expenses, or damages arising out of this Public License
@@ -275,80 +261,73 @@ the possibility of such losses, costs, expenses, or damages. Where a limitation
 of liability is not allowed in full or in part, this limitation may not apply
 to You.
 
-c. The disclaimer of warranties and limitation of liability provided above
+c.	The disclaimer of warranties and limitation of liability provided above
 shall be interpreted in a manner that, to the extent possible, most closely
 approximates an absolute disclaimer and waiver of all liability.
 
-   
+Section 6 – Term and Termination.
 
-   Section 6 – Term and Termination.
-
-a. This Public License applies for the term of the Copyright and Similar Rights
+a.	This Public License applies for the term of the Copyright and Similar Rights
 licensed here. However, if You fail to comply with this Public License, then
 Your rights under this Public License terminate automatically.
 
-b. Where Your right to use the Licensed Material has terminated under Section
+b.	Where Your right to use the Licensed Material has terminated under Section
 6(a), it reinstates:
 
 1. automatically as of the date the violation is cured, provided it is cured
 within 30 days of Your discovery of the violation; or
 
-         2. upon express reinstatement by the Licensor.
+          2. upon express reinstatement by the Licensor.
 
 For the avoidance of doubt, this Section 6(b) does not affect any right the
 Licensor may have to seek remedies for Your violations of this Public License.
 
-c. For the avoidance of doubt, the Licensor may also offer the Licensed Material
+c.	For the avoidance of doubt, the Licensor may also offer the Licensed Material
 under separate terms or conditions or stop distributing the Licensed Material
 at any time; however, doing so will not terminate this Public License.
 
-      d. Sections 1, 5, 6, 7, and 8 survive termination of this Public License.
+     d.	Sections 1, 5, 6, 7, and 8 survive termination of this Public License.
 
-   
+Section 7 – Other Terms and Conditions.
 
-   Section 7 – Other Terms and Conditions.
-
-a. The Licensor shall not be bound by any additional or different terms or
+a.	The Licensor shall not be bound by any additional or different terms or
 conditions communicated by You unless expressly agreed.
 
-b. Any arrangements, understandings, or agreements regarding the Licensed
+b.	Any arrangements, understandings, or agreements regarding the Licensed
 Material not stated herein are separate from and independent of the terms
 and conditions of this Public License.
 
-   
+Section 8 – Interpretation.
 
-   Section 8 – Interpretation.
-
-a. For the avoidance of doubt, this Public License does not, and shall not
+a.	For the avoidance of doubt, this Public License does not, and shall not
 be interpreted to, reduce, limit, restrict, or impose conditions on any use
 of the Licensed Material that could lawfully be made without permission under
 this Public License.
 
-b. To the extent possible, if any provision of this Public License is deemed
+b.	To the extent possible, if any provision of this Public License is deemed
 unenforceable, it shall be automatically reformed to the minimum extent necessary
 to make it enforceable. If the provision cannot be reformed, it shall be severed
 from this Public License without affecting the enforceability of the remaining
 terms and conditions.
 
-c. No term or condition of this Public License will be waived and no failure
+c.	No term or condition of this Public License will be waived and no failure
 to comply consented to unless expressly agreed to by the Licensor.
 
-d. Nothing in this Public License constitutes or may be interpreted as a limitation
+d.	Nothing in this Public License constitutes or may be interpreted as a limitation
 upon, or waiver of, any privileges and immunities that apply to the Licensor
 or You, including from the legal processes of any jurisdiction or authority.
 
 Creative Commons is not a party to its public licenses. Notwithstanding, Creative
 Commons may elect to apply one of its public licenses to material it publishes
-and in those instances will be considered the "Licensor." The text of the
-Creative Commons public licenses is dedicated to the public domain under the
-CC0 Public Domain Dedication. Except for the limited purpose of indicating
-that material is shared under a Creative Commons public license or as otherwise
-permitted by the Creative Commons policies published at creativecommons.org/policies,
-Creative Commons does not authorize the use of the trademark "Creative Commons"
-or any other trademark or logo of Creative Commons without its prior written
-consent including, without limitation, in connection with any unauthorized
-modifications to any of its public licenses or any other arrangements, understandings,
-or agreements concerning use of licensed material. For the avoidance of doubt,
-this paragraph does not form part of the public licenses.
+and in those instances will be considered the “Licensor.” Except for the limited
+purpose of indicating that material is shared under a Creative Commons public
+license or as otherwise permitted by the Creative Commons policies published
+at creativecommons.org/policies, Creative Commons does not authorize the use
+of the trademark “Creative Commons” or any other trademark or logo of Creative
+Commons without its prior written consent including, without limitation, in
+connection with any unauthorized modifications to any of its public licenses
+or any other arrangements, understandings, or agreements concerning use of
+licensed material. For the avoidance of doubt, this paragraph does not form
+part of the public licenses.
 
 Creative Commons may be contacted at creativecommons.org.
diff --git a/options/license/CC-BY-NC-ND-1.0 b/options/license/CC-BY-NC-ND-1.0
index 3e599c8539..fb547ae047 100644
--- a/options/license/CC-BY-NC-ND-1.0
+++ b/options/license/CC-BY-NC-ND-1.0
@@ -1,9 +1,10 @@
-Creative Commons Attribution-NoDerivs-NonCommercial 1.0 CREATIVE COMMONS CORPORATION
-IS NOT A LAW FIRM AND DOES NOT PROVIDE LEGAL SERVICES. DISTRIBUTION OF THIS
-DRAFT LICENSE DOES NOT CREATE AN ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS
-PROVIDES THIS INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
-REGARDING THE INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING
-FROM ITS USE.
+Creative Commons Attribution-NoDerivs-NonCommercial 1.0
+
+CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE LEGAL
+SERVICES. DISTRIBUTION OF THIS DRAFT LICENSE DOES NOT CREATE AN ATTORNEY-CLIENT
+RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS INFORMATION ON AN "AS-IS" BASIS.
+CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE INFORMATION PROVIDED, AND
+DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM ITS USE.
 
 License
 
@@ -16,7 +17,7 @@ BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO
 BE BOUND BY THE TERMS OF THIS LICENSE. THE LICENSOR GRANTS YOU THE RIGHTS
 CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS.
 
-   1. Definitions
+1. Definitions
 
 a. "Collective Work" means a work, such as a periodical issue, anthology or
 encyclopedia, in which the Work in its entirety in unmodified form, along
@@ -35,7 +36,7 @@ Work will not be considered a Derivative Work for the purpose of this License.
 c. "Licensor" means the individual or entity that offers the Work under the
 terms of this License.
 
-      d. "Original Author" means the individual or entity who created the Work.
+     d. "Original Author" means the individual or entity who created the Work.
 
 e. "Work" means the copyrightable work of authorship offered under the terms
 of this License.
@@ -106,7 +107,7 @@ in the case of a Collective Work, at a minimum such credit will appear where
 any other comparable authorship credit appears and in a manner at least as
 prominent as such other comparable authorship credit.
 
-   5. Representations, Warranties and Disclaimer
+5. Representations, Warranties and Disclaimer
 
 a. By offering the Work for public release under this License, Licensor represents
 and warrants that, to the best of Licensor's knowledge after reasonable inquiry:
@@ -132,7 +133,7 @@ TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE
 OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN
 IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
 
-   7. Termination
+7. Termination
 
 a. This License and the rights granted hereunder will terminate automatically
 upon any breach by You of the terms of this License. Individuals or entities
@@ -150,7 +151,7 @@ license that has been, or is required to be, granted under the terms of this
 License), and this License will continue in full force and effect unless terminated
 as stated above.
 
-   8. Miscellaneous
+8. Miscellaneous
 
 a. Each time You distribute or publicly digitally perform the Work or a Collective
 Work, the Licensor offers to the recipient a license to the Work on the same
diff --git a/options/license/CC-BY-NC-ND-2.0 b/options/license/CC-BY-NC-ND-2.0
index a19bdb4b09..d079d89e7b 100644
--- a/options/license/CC-BY-NC-ND-2.0
+++ b/options/license/CC-BY-NC-ND-2.0
@@ -1,9 +1,10 @@
-Creative Commons Attribution-NonCommercial-NoDerivs 2.0 CREATIVE COMMONS CORPORATION
-IS NOT A LAW FIRM AND DOES NOT PROVIDE LEGAL SERVICES. DISTRIBUTION OF THIS
-LICENSE DOES NOT CREATE AN ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS
-PROVIDES THIS INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
-REGARDING THE INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING
-FROM ITS USE.
+Creative Commons Attribution-NonCommercial-NoDerivs 2.0
+
+CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE LEGAL
+SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN ATTORNEY-CLIENT
+RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS INFORMATION ON AN "AS-IS" BASIS.
+CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE INFORMATION PROVIDED, AND
+DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM ITS USE.
 
 License
 
@@ -16,7 +17,7 @@ BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO
 BE BOUND BY THE TERMS OF THIS LICENSE. THE LICENSOR GRANTS YOU THE RIGHTS
 CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS.
 
-   1. Definitions
+1. Definitions
 
 a. "Collective Work" means a work, such as a periodical issue, anthology or
 encyclopedia, in which the Work in its entirety in unmodified form, along
@@ -39,7 +40,7 @@ this License.
 c. "Licensor" means the individual or entity that offers the Work under the
 terms of this License.
 
-      d. "Original Author" means the individual or entity who created the Work.
+     d. "Original Author" means the individual or entity who created the Work.
 
 e. "Work" means the copyrightable work of authorship offered under the terms
 of this License.
@@ -115,7 +116,7 @@ Work, at a minimum such credit will appear where any other comparable authorship
 credit appears and in a manner at least as prominent as such other comparable
 authorship credit.
 
-      d. For the avoidance of doubt, where the Work is a musical composition:
+     d. For the avoidance of doubt, where the Work is a musical composition:
 
 i. Performancf Royalties Under Blanket Licenses. Licensor reserves the exclusive
 right to collect, whether individually or via a performance rights society
@@ -140,7 +141,7 @@ of the US Copyright Act (or the equivalent in other jurisdictions), if Your
 public digital performance is primarily intended for or directed toward commercial
 advantage or private monetary compensation.
 
-   5. Representations, Warranties and Disclaimer
+5. Representations, Warranties and Disclaimer
 
 UNLESS OTHERWISE MUTUALLY AGREED BY THE PARTIES IN WRITING, LICENSOR OFFERS
 THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING
@@ -156,7 +157,7 @@ INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS
 LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY
 OF SUCH DAMAGES.
 
-   7. Termination
+7. Termination
 
 a. This License and the rights granted hereunder will terminate automatically
 upon any breach by You of the terms of this License. Individuals or entities
@@ -174,7 +175,7 @@ license that has been, or is required to be, granted under the terms of this
 License), and this License will continue in full force and effect unless terminated
 as stated above.
 
-   8. Miscellaneous
+8. Miscellaneous
 
 a. Each time You distribute or publicly digitally perform the Work or a Collective
 Work, the Licensor offers to the recipient a license to the Work on the same
diff --git a/options/license/CC-BY-NC-ND-3.0 b/options/license/CC-BY-NC-ND-3.0
index 15de8fee70..52c9f369fb 100644
--- a/options/license/CC-BY-NC-ND-3.0
+++ b/options/license/CC-BY-NC-ND-3.0
@@ -1,9 +1,10 @@
-Creative Commons Attribution-NonCommercial-NoDerivs 3.0 Unported CREATIVE
-COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE LEGAL SERVICES.
-DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN ATTORNEY-CLIENT RELATIONSHIP.
-CREATIVE COMMONS PROVIDES THIS INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS
-MAKES NO WARRANTIES REGARDING THE INFORMATION PROVIDED, AND DISCLAIMS LIABILITY
-FOR DAMAGES RESULTING FROM ITS USE.
+Creative Commons Attribution-NonCommercial-NoDerivs 3.0 Unported
+
+CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE LEGAL
+SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN ATTORNEY-CLIENT
+RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS INFORMATION ON AN "AS-IS" BASIS.
+CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE INFORMATION PROVIDED, AND
+DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM ITS USE.
 
 License
 
@@ -17,7 +18,7 @@ BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY BE CONSIDE
 TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION
 OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS.
 
-   1. Definitions
+1. Definitions
 
 a. "Adaptation" means a work based upon the Work, or upon the Work and other
 pre-existing works, such as a translation, adaptation, derivative work, arrangement
@@ -169,7 +170,7 @@ and/or Attribution Parties, as appropriate, of You or Your use of the Work,
 without the separate, express prior written permission of the Original Author,
 Licensor and/or Attribution Parties.
 
-      d. For the avoidance of doubt:
+     d. For the avoidance of doubt:
 
 i. Non-waivable Compulsory License Schemes. In those jurisdictions in which
 the right to collect royalties through any statutory or compulsory licensing
@@ -197,7 +198,7 @@ the Work either by itself or as part of any Collections, You must not distort,
 mutilate, modify or take other derogatory action in relation to the Work which
 would be prejudicial to the Original Author's honor or reputation.
 
-   5. Representations, Warranties and Disclaimer
+5. Representations, Warranties and Disclaimer
 
 UNLESS OTHERWISE MUTUALLY AGREED BY THE PARTIES IN WRITING, LICENSOR OFFERS
 THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING
@@ -213,7 +214,7 @@ INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS
 LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY
 OF SUCH DAMAGES.
 
-   7. Termination
+7. Termination
 
 a. This License and the rights granted hereunder will terminate automatically
 upon any breach by You of the terms of this License. Individuals or entities
@@ -231,7 +232,7 @@ license that has been, or is required to be, granted under the terms of this
 License), and this License will continue in full force and effect unless terminated
 as stated above.
 
-   8. Miscellaneous
+8. Miscellaneous
 
 a. Each time You Distribute or Publicly Perform the Work or a Collection,
 the Licensor offers to the recipient a license to the Work on the same terms
diff --git a/options/license/CC-BY-NC-ND-3.0-IGO b/options/license/CC-BY-NC-ND-3.0-IGO
index b56ae7284a..105f656979 100644
--- a/options/license/CC-BY-NC-ND-3.0-IGO
+++ b/options/license/CC-BY-NC-ND-3.0-IGO
@@ -20,7 +20,7 @@ BE BOUND BY THE TERMS OF THIS LICENSE. THE LICENSOR GRANTS YOU THE RIGHTS
 CONTAINED HERE IN CONSIDERATION FOR YOUR ACCEPTANCE AND AGREEMENT TO THE TERMS
 OF THE LICENSE.
 
-   1. Definitions
+1. Definitions
 
 a. "IGO" means, solely and exclusively for purposes of this License, an organization
 established by a treaty or other instrument governed by international law
@@ -86,14 +86,15 @@ to exercise the rights in the Work as follows:
 
 a. to Reproduce, Distribute and Publicly Perform the Work, to incorporate
 the Work into one or more Collections, and to Reproduce, Distribute and Publicly
-Perform the Work as incorporated in the Collections. This License lasts for
-the duration of the term of the copyright in the Work licensed by the Licensor.
-The above rights may be exercised in all media and formats whether now known
-or hereafter devised. The above rights include the right to make such modifications
-as are technically necessary to exercise the rights in other media and formats,
-but otherwise you have no rights to make Adaptations. All rights not expressly
-granted by the Licensor are hereby reserved, including but not limited to
-the rights set forth in Section 4(d).
+Perform the Work as incorporated in the Collections.
+
+This License lasts for the duration of the term of the copyright in the Work
+licensed by the Licensor. The above rights may be exercised in all media and
+formats whether now known or hereafter devised. The above rights include the
+right to make such modifications as are technically necessary to exercise
+the rights in other media and formats, but otherwise you have no rights to
+make Adaptations. All rights not expressly granted by the Licensor are hereby
+reserved, including but not limited to the rights set forth in Section 4(d).
 
 4. Restrictions. The license granted in Section 3 above is expressly made
 subject to and limited by the following restrictions:
@@ -145,7 +146,7 @@ connection with, sponsorship or endorsement by the Licensor or others designated
 for attribution, of You or Your use of the Work, without the separate, express
 prior written permission of the Licensor or such others.
 
-      d. For the avoidance of doubt:
+    d. For the avoidance of doubt:
 
 i. Non-waivable Compulsory License Schemes. In those jurisdictions in which
 the right to collect royalties through any statutory or compulsory licensing
@@ -172,19 +173,22 @@ Collections, You must not distort, mutilate, modify or take other derogatory
 action in relation to the Work which would be prejudicial to the honor or
 reputation of the Licensor where moral rights apply.
 
-5. Representations, Warranties and Disclaimer THE LICENSOR OFFERS THE WORK
-AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE
-WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION,
-WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT,
-OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ERRORS,
-WHETHER OR NOT DISCOVERABLE.
+5. Representations, Warranties and Disclaimer
 
-6. Limitation on Liability IN NO EVENT WILL THE LICENSOR BE LIABLE TO YOU
-ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR
-EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN
-IF THE LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+THE LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES
+OF ANY KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE,
+INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER
+DEFECTS, ACCURACY, OR THE PRESENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE.
 
-   7. Termination
+6. Limitation on Liability
+
+IN NO EVENT WILL THE LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY
+SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING
+OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF THE LICENSOR HAS BEEN
+ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+7. Termination
 
 a. Subject to the terms and conditions set forth in this License, the license
 granted here lasts for the duration of the term of the copyright in the Work
@@ -208,7 +212,7 @@ of You discovering the violation, or upon express reinstatement by the Licensor.
 For the avoidance of doubt, this Section 7(b) does not affect any rights the
 Licensor may have to seek remedies for violations of this License by You.
 
-   8. Miscellaneous
+8. Miscellaneous
 
 a. Each time You Distribute or Publicly Perform the Work or a Collection,
 the Licensor offers to the recipient a license to the Work on the same terms
diff --git a/options/license/CC-BY-NC-ND-4.0 b/options/license/CC-BY-NC-ND-4.0
index 22d2f69714..f80409c7c2 100644
--- a/options/license/CC-BY-NC-ND-4.0
+++ b/options/license/CC-BY-NC-ND-4.0
@@ -1,8 +1,9 @@
 Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International
-Creative Commons Corporation ("Creative Commons") is not a law firm and does
+
+Creative Commons Corporation (“Creative Commons”) is not a law firm and does
 not provide legal services or legal advice. Distribution of Creative Commons
 public licenses does not create a lawyer-client or other relationship. Creative
-Commons makes its licenses and related information available on an "as-is"
+Commons makes its licenses and related information available on an “as-is”
 basis. Creative Commons gives no warranties regarding its licenses, any material
 licensed under their terms and conditions, or any related information. Creative
 Commons disclaims all liability for damages resulting from their use to the
@@ -25,11 +26,11 @@ they choose before applying it. Licensors should also secure all rights necessar
 before applying our licenses so that the public can reuse the material as
 expected. Licensors should clearly mark any material not subject to the license.
 This includes other CC-licensed material, or material used under an exception
-or limitation to copyright. More considerations for licensors : wiki.creativecommons.org/Considerations_for_licensors
+or limitation to copyright. More considerations for licensors.
 
 Considerations for the public: By using one of our public licenses, a licensor
 grants the public permission to use the licensed material under specified
-terms and conditions. If the licensor's permission is not necessary for any
+terms and conditions. If the licensor’s permission is not necessary for any
 reason–for example, because of any applicable exception or limitation to copyright–then
 that use is not regulated by the license. Our licenses grant only permissions
 under copyright and certain other rights that a licensor has authority to
@@ -37,8 +38,7 @@ grant. Use of the licensed material may still be restricted for other reasons,
 including because others have copyright or other rights in the material. A
 licensor may make special requests, such as asking that all changes be marked
 or described. Although not required by our licenses, you are encouraged to
-respect those requests where reasonable. More considerations for the public
-: wiki.creativecommons.org/Considerations_for_licensees
+respect those requests where reasonable. More considerations for the public.
 
 Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International
 Public License
@@ -52,11 +52,9 @@ Licensor grants You such rights in consideration of benefits the Licensor
 receives from making the Licensed Material available under these terms and
 conditions.
 
-   
+Section 1 – Definitions.
 
-   Section 1 – Definitions.
-
-a. Adapted Material means material subject to Copyright and Similar Rights
+a.	Adapted Material means material subject to Copyright and Similar Rights
 that is derived from or based upon the Licensed Material and in which the
 Licensed Material is translated, altered, arranged, transformed, or otherwise
 modified in a manner requiring permission under the Copyright and Similar
@@ -65,59 +63,57 @@ Licensed Material is a musical work, performance, or sound recording, Adapted
 Material is always produced where the Licensed Material is synched in timed
 relation with a moving image.
 
-b. Copyright and Similar Rights means copyright and/or similar rights closely
+b.	Copyright and Similar Rights means copyright and/or similar rights closely
 related to copyright including, without limitation, performance, broadcast,
 sound recording, and Sui Generis Database Rights, without regard to how the
 rights are labeled or categorized. For purposes of this Public License, the
 rights specified in Section 2(b)(1)-(2) are not Copyright and Similar Rights.
 
-c. Effective Technological Measures means those measures that, in the absence
+c.	Effective Technological Measures means those measures that, in the absence
 of proper authority, may not be circumvented under laws fulfilling obligations
 under Article 11 of the WIPO Copyright Treaty adopted on December 20, 1996,
 and/or similar international agreements.
 
-d. Exceptions and Limitations means fair use, fair dealing, and/or any other
+d.	Exceptions and Limitations means fair use, fair dealing, and/or any other
 exception or limitation to Copyright and Similar Rights that applies to Your
 use of the Licensed Material.
 
-e. Licensed Material means the artistic or literary work, database, or other
+e.	Licensed Material means the artistic or literary work, database, or other
 material to which the Licensor applied this Public License.
 
-f. Licensed Rights means the rights granted to You subject to the terms and
+f.	Licensed Rights means the rights granted to You subject to the terms and
 conditions of this Public License, which are limited to all Copyright and
 Similar Rights that apply to Your use of the Licensed Material and that the
 Licensor has authority to license.
 
-g. Licensor means the individual(s) or entity(ies) granting rights under this
+g.	Licensor means the individual(s) or entity(ies) granting rights under this
 Public License.
 
-h. NonCommercial means not primarily intended for or directed towards commercial
+h.	NonCommercial means not primarily intended for or directed towards commercial
 advantage or monetary compensation. For purposes of this Public License, the
 exchange of the Licensed Material for other material subject to Copyright
 and Similar Rights by digital file-sharing or similar means is NonCommercial
 provided there is no payment of monetary compensation in connection with the
 exchange.
 
-i. Share means to provide material to the public by any means or process that
+i.	Share means to provide material to the public by any means or process that
 requires permission under the Licensed Rights, such as reproduction, public
 display, public performance, distribution, dissemination, communication, or
 importation, and to make material available to the public including in ways
 that members of the public may access the material from a place and at a time
 individually chosen by them.
 
-j. Sui Generis Database Rights means rights other than copyright resulting
+j.	Sui Generis Database Rights means rights other than copyright resulting
 from Directive 96/9/EC of the European Parliament and of the Council of 11
 March 1996 on the legal protection of databases, as amended and/or succeeded,
 as well as other essentially equivalent rights anywhere in the world.
 
-k. You means the individual or entity exercising the Licensed Rights under
+k.	You means the individual or entity exercising the Licensed Rights under
 this Public License. Your has a corresponding meaning.
 
-   
+Section 2 – Scope.
 
-   Section 2 – Scope.
-
-      a. License grant.
+     a.	License grant.
 
 1. Subject to the terms and conditions of this Public License, the Licensor
 hereby grants You a worldwide, royalty-free, non-sublicensable, non-exclusive,
@@ -134,7 +130,7 @@ purposes only.
 and Limitations apply to Your use, this Public License does not apply, and
 You do not need to comply with its terms and conditions.
 
-         3. Term. The term of this Public License is specified in Section 6(a).
+3. Term. The term of this Public License is specified in Section 6(a).
 
 4. Media and formats; technical modifications allowed. The Licensor authorizes
 You to exercise the Licensed Rights in all media and formats whether now known
@@ -146,8 +142,7 @@ Effective Technological Measures. For purposes of this Public License, simply
 making modifications authorized by this Section 2(a)(4) never produces Adapted
 Material.
 
-         5. Downstream recipients.
-
+          5. Downstream recipients.
 A. Offer from the Licensor – Licensed Material. Every recipient of the Licensed
 Material automatically receives an offer from the Licensor to exercise the
 Licensed Rights under the terms and conditions of this Public License.
@@ -163,7 +158,7 @@ Material is, connected with, or sponsored, endorsed, or granted official status
 by, the Licensor or others designated to receive attribution as provided in
 Section 3(a)(1)(A)(i).
 
-      b. Other rights.
+     b.	Other rights.
 
 1. Moral rights, such as the right of integrity, are not licensed under this
 Public License, nor are publicity, privacy, and/or other similar personality
@@ -180,31 +175,29 @@ licensing scheme. In all other cases the Licensor expressly reserves any right
 to collect such royalties, including when the Licensed Material is used other
 than for NonCommercial purposes.
 
-   
-
-   Section 3 – License Conditions.
+Section 3 – License Conditions.
 
 Your exercise of the Licensed Rights is expressly made subject to the following
 conditions.
 
-      a. Attribution.
+     a.	Attribution.
 
-         1. If You Share the Licensed Material, You must:
+          1. If You Share the Licensed Material, You must:
 
 A. retain the following if it is supplied by the Licensor with the Licensed
 Material:
 
-i. identification of the creator(s) of the Licensed Material and any others
+i.	identification of the creator(s) of the Licensed Material and any others
 designated to receive attribution, in any reasonable manner requested by the
 Licensor (including by pseudonym if designated);
 
-               ii. a copyright notice;
+                    ii.	a copyright notice;
 
-               iii. a notice that refers to this Public License;
+                    iii. a notice that refers to this Public License;
 
-               iv. a notice that refers to the disclaimer of warranties;
+                    iv.	a notice that refers to the disclaimer of warranties;
 
-v. a URI or hyperlink to the Licensed Material to the extent reasonably practicable;
+v.	a URI or hyperlink to the Licensed Material to the extent reasonably practicable;
 
 B. indicate if You modified the Licensed Material and retain an indication
 of any previous modifications; and
@@ -223,35 +216,30 @@ URI or hyperlink to a resource that includes the required information.
 3. If requested by the Licensor, You must remove any of the information required
 by Section 3(a)(1)(A) to the extent reasonably practicable.
 
-   
-
-   Section 4 – Sui Generis Database Rights.
+Section 4 – Sui Generis Database Rights.
 
 Where the Licensed Rights include Sui Generis Database Rights that apply to
 Your use of the Licensed Material:
 
-a. for the avoidance of doubt, Section 2(a)(1) grants You the right to extract,
+a.	for the avoidance of doubt, Section 2(a)(1) grants You the right to extract,
 reuse, reproduce, and Share all or a substantial portion of the contents of
 the database for NonCommercial purposes only and provided You do not Share
 Adapted Material;
 
-b. if You include all or a substantial portion of the database contents in
+b.	if You include all or a substantial portion of the database contents in
 a database in which You have Sui Generis Database Rights, then the database
 in which You have Sui Generis Database Rights (but not its individual contents)
 is Adapted Material; and
 
-c. You must comply with the conditions in Section 3(a) if You Share all or
+c.	You must comply with the conditions in Section 3(a) if You Share all or
 a substantial portion of the contents of the database.
-
 For the avoidance of doubt, this Section 4 supplements and does not replace
 Your obligations under this Public License where the Licensed Rights include
 other Copyright and Similar Rights.
 
-   
+Section 5 – Disclaimer of Warranties and Limitation of Liability.
 
-   Section 5 – Disclaimer of Warranties and Limitation of Liability.
-
-a. Unless otherwise separately undertaken by the Licensor, to the extent possible,
+a.	Unless otherwise separately undertaken by the Licensor, to the extent possible,
 the Licensor offers the Licensed Material as-is and as-available, and makes
 no representations or warranties of any kind concerning the Licensed Material,
 whether express, implied, statutory, or other. This includes, without limitation,
@@ -260,7 +248,7 @@ absence of latent or other defects, accuracy, or the presence or absence of
 errors, whether or not known or discoverable. Where disclaimers of warranties
 are not allowed in full or in part, this disclaimer may not apply to You.
 
-b. To the extent possible, in no event will the Licensor be liable to You
+b.	To the extent possible, in no event will the Licensor be liable to You
 on any legal theory (including, without limitation, negligence) or otherwise
 for any direct, special, indirect, incidental, consequential, punitive, exemplary,
 or other losses, costs, expenses, or damages arising out of this Public License
@@ -269,80 +257,73 @@ the possibility of such losses, costs, expenses, or damages. Where a limitation
 of liability is not allowed in full or in part, this limitation may not apply
 to You.
 
-c. The disclaimer of warranties and limitation of liability provided above
+c.	The disclaimer of warranties and limitation of liability provided above
 shall be interpreted in a manner that, to the extent possible, most closely
 approximates an absolute disclaimer and waiver of all liability.
 
-   
+Section 6 – Term and Termination.
 
-   Section 6 – Term and Termination.
-
-a. This Public License applies for the term of the Copyright and Similar Rights
+a.	This Public License applies for the term of the Copyright and Similar Rights
 licensed here. However, if You fail to comply with this Public License, then
 Your rights under this Public License terminate automatically.
 
-b. Where Your right to use the Licensed Material has terminated under Section
+b.	Where Your right to use the Licensed Material has terminated under Section
 6(a), it reinstates:
 
 1. automatically as of the date the violation is cured, provided it is cured
 within 30 days of Your discovery of the violation; or
 
-         2. upon express reinstatement by the Licensor.
+          2. upon express reinstatement by the Licensor.
 
 For the avoidance of doubt, this Section 6(b) does not affect any right the
 Licensor may have to seek remedies for Your violations of this Public License.
 
-c. For the avoidance of doubt, the Licensor may also offer the Licensed Material
+c.	For the avoidance of doubt, the Licensor may also offer the Licensed Material
 under separate terms or conditions or stop distributing the Licensed Material
 at any time; however, doing so will not terminate this Public License.
 
-      d. Sections 1, 5, 6, 7, and 8 survive termination of this Public License.
+     d.	Sections 1, 5, 6, 7, and 8 survive termination of this Public License.
 
-   
+Section 7 – Other Terms and Conditions.
 
-   Section 7 – Other Terms and Conditions.
-
-a. The Licensor shall not be bound by any additional or different terms or
+a.	The Licensor shall not be bound by any additional or different terms or
 conditions communicated by You unless expressly agreed.
 
-b. Any arrangements, understandings, or agreements regarding the Licensed
+b.	Any arrangements, understandings, or agreements regarding the Licensed
 Material not stated herein are separate from and independent of the terms
 and conditions of this Public License.
 
-   
+Section 8 – Interpretation.
 
-   Section 8 – Interpretation.
-
-a. For the avoidance of doubt, this Public License does not, and shall not
+a.	For the avoidance of doubt, this Public License does not, and shall not
 be interpreted to, reduce, limit, restrict, or impose conditions on any use
 of the Licensed Material that could lawfully be made without permission under
 this Public License.
 
-b. To the extent possible, if any provision of this Public License is deemed
+b.	To the extent possible, if any provision of this Public License is deemed
 unenforceable, it shall be automatically reformed to the minimum extent necessary
 to make it enforceable. If the provision cannot be reformed, it shall be severed
 from this Public License without affecting the enforceability of the remaining
 terms and conditions.
 
-c. No term or condition of this Public License will be waived and no failure
+c.	No term or condition of this Public License will be waived and no failure
 to comply consented to unless expressly agreed to by the Licensor.
 
-d. Nothing in this Public License constitutes or may be interpreted as a limitation
+d.	Nothing in this Public License constitutes or may be interpreted as a limitation
 upon, or waiver of, any privileges and immunities that apply to the Licensor
 or You, including from the legal processes of any jurisdiction or authority.
 
 Creative Commons is not a party to its public licenses. Notwithstanding, Creative
 Commons may elect to apply one of its public licenses to material it publishes
-and in those instances will be considered the "Licensor." The text of the
-Creative Commons public licenses is dedicated to the public domain under the
-CC0 Public Domain Dedication. Except for the limited purpose of indicating
-that material is shared under a Creative Commons public license or as otherwise
-permitted by the Creative Commons policies published at creativecommons.org/policies,
-Creative Commons does not authorize the use of the trademark "Creative Commons"
-or any other trademark or logo of Creative Commons without its prior written
-consent including, without limitation, in connection with any unauthorized
-modifications to any of its public licenses or any other arrangements, understandings,
-or agreements concerning use of licensed material. For the avoidance of doubt,
-this paragraph does not form part of the public licenses.
+and in those instances will be considered the “Licensor.” Except for the limited
+purpose of indicating that material is shared under a Creative Commons public
+license or as otherwise permitted by the Creative Commons policies published
+at creativecommons.org/policies, Creative Commons does not authorize the use
+of the trademark “Creative Commons” or any other trademark or logo of Creative
+Commons without its prior written consent including, without limitation, in
+connection with any unauthorized modifications to any of its public licenses
+or any other arrangements, understandings, or agreements concerning use of
+licensed material. For the avoidance of doubt, this paragraph does not form
+part of the public licenses.
 
 Creative Commons may be contacted at creativecommons.org.
diff --git a/options/license/CC-BY-NC-SA-1.0 b/options/license/CC-BY-NC-SA-1.0
index 026883ed75..3cc7f7733e 100644
--- a/options/license/CC-BY-NC-SA-1.0
+++ b/options/license/CC-BY-NC-SA-1.0
@@ -1,9 +1,10 @@
-Creative Commons Attribution-NonCommercial-ShareAlike 1.0 CREATIVE COMMONS
-CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE LEGAL SERVICES. DISTRIBUTION
-OF THIS DRAFT LICENSE DOES NOT CREATE AN ATTORNEY-CLIENT RELATIONSHIP. CREATIVE
-COMMONS PROVIDES THIS INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES
-NO WARRANTIES REGARDING THE INFORMATION PROVIDED, AND DISCLAIMS LIABILITY
-FOR DAMAGES RESULTING FROM ITS USE.
+Creative Commons Attribution-NonCommercial-ShareAlike 1.0
+
+CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE LEGAL
+SERVICES. DISTRIBUTION OF THIS DRAFT LICENSE DOES NOT CREATE AN ATTORNEY-CLIENT
+RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS INFORMATION ON AN "AS-IS" BASIS.
+CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE INFORMATION PROVIDED, AND
+DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM ITS USE.
 
 License
 
@@ -16,7 +17,7 @@ BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO
 BE BOUND BY THE TERMS OF THIS LICENSE. THE LICENSOR GRANTS YOU THE RIGHTS
 CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS.
 
-   1. Definitions
+1. Definitions
 
 a. "Collective Work" means a work, such as a periodical issue, anthology or
 encyclopedia, in which the Work in its entirety in unmodified form, along
@@ -35,7 +36,7 @@ Work will not be considered a Derivative Work for the purpose of this License.
 c. "Licensor" means the individual or entity that offers the Work under the
 terms of this License.
 
-      d. "Original Author" means the individual or entity who created the Work.
+     d. "Original Author" means the individual or entity who created the Work.
 
 e. "Work" means the copyrightable work of authorship offered under the terms
 of this License.
@@ -58,7 +59,7 @@ the Work as stated below:
 a. to reproduce the Work, to incorporate the Work into one or more Collective
 Works, and to reproduce the Work as incorporated in the Collective Works;
 
-      b. to create and reproduce Derivative Works;
+     b. to create and reproduce Derivative Works;
 
 c. to distribute copies or phonorecords of, display publicly, perform publicly,
 and perform publicly by means of a digital audio transmission the Work including
@@ -133,7 +134,7 @@ such credit will appear where any other comparable authorship credit appears
 and in a manner at least as prominent as such other comparable authorship
 credit.
 
-   5. Representations, Warranties and Disclaimer
+5. Representations, Warranties and Disclaimer
 
 a. By offering the Work for public release under this License, Licensor represents
 and warrants that, to the best of Licensor's knowledge after reasonable inquiry:
@@ -159,7 +160,7 @@ TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE
 OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN
 IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
 
-   7. Termination
+7. Termination
 
 a. This License and the rights granted hereunder will terminate automatically
 upon any breach by You of the terms of this License. Individuals or entities
@@ -177,7 +178,7 @@ license that has been, or is required to be, granted under the terms of this
 License), and this License will continue in full force and effect unless terminated
 as stated above.
 
-   8. Miscellaneous
+8. Miscellaneous
 
 a. Each time You distribute or publicly digitally perform the Work or a Collective
 Work, the Licensor offers to the recipient a license to the Work on the same
diff --git a/options/license/CC-BY-NC-SA-2.0 b/options/license/CC-BY-NC-SA-2.0
index c2c3406fa0..488424312d 100644
--- a/options/license/CC-BY-NC-SA-2.0
+++ b/options/license/CC-BY-NC-SA-2.0
@@ -1,9 +1,10 @@
-Creative Commons Attribution-NonCommercial-ShareAlike 2.0 CREATIVE COMMONS
-CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE LEGAL SERVICES. DISTRIBUTION
-OF THIS LICENSE DOES NOT CREATE AN ATTORNEY-CLIENT RELATIONSHIP. CREATIVE
-COMMONS PROVIDES THIS INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES
-NO WARRANTIES REGARDING THE INFORMATION PROVIDED, AND DISCLAIMS LIABILITY
-FOR DAMAGES RESULTING FROM ITS USE.
+Creative Commons Attribution-NonCommercial-ShareAlike 2.0
+
+CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE LEGAL
+SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN ATTORNEY-CLIENT
+RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS INFORMATION ON AN "AS-IS" BASIS.
+CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE INFORMATION PROVIDED, AND
+DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM ITS USE.
 
 License
 
@@ -16,7 +17,7 @@ BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO
 BE BOUND BY THE TERMS OF THIS LICENSE. THE LICENSOR GRANTS YOU THE RIGHTS
 CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS.
 
-   1. Definitions
+1. Definitions
 
 a. "Collective Work" means a work, such as a periodical issue, anthology or
 encyclopedia, in which the Work in its entirety in unmodified form, along
@@ -39,7 +40,7 @@ this License.
 c. "Licensor" means the individual or entity that offers the Work under the
 terms of this License.
 
-      d. "Original Author" means the individual or entity who created the Work.
+     d. "Original Author" means the individual or entity who created the Work.
 
 e. "Work" means the copyrightable work of authorship offered under the terms
 of this License.
@@ -66,7 +67,7 @@ the Work as stated below:
 a. to reproduce the Work, to incorporate the Work into one or more Collective
 Works, and to reproduce the Work as incorporated in the Collective Works;
 
-      b. to create and reproduce Derivative Works;
+     b. to create and reproduce Derivative Works;
 
 c. to distribute copies or phonorecords of, display publicly, perform publicly,
 and perform publicly by means of a digital audio transmission the Work including
@@ -148,7 +149,7 @@ such credit will appear where any other comparable authorship credit appears
 and in a manner at least as prominent as such other comparable authorship
 credit.
 
-      e. For the avoidance of doubt, where the Work is a musical composition:
+     e. For the avoidance of doubt, where the Work is a musical composition:
 
 i. Performance Royalties Under Blanket Licenses. Licensor reserves the exclusive
 right to collect, whether individually or via a performance rights society
@@ -173,7 +174,7 @@ of the US Copyright Act (or the equivalent in other jurisdictions), if Your
 public digital performance is primarily intended for or directed toward commercial
 advantage or private monetary compensation.
 
-   5. Representations, Warranties and Disclaimer
+5. Representations, Warranties and Disclaimer
 
 UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS
 THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING
@@ -189,7 +190,7 @@ INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS
 LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY
 OF SUCH DAMAGES.
 
-   7. Termination
+7. Termination
 
 a. This License and the rights granted hereunder will terminate automatically
 upon any breach by You of the terms of this License. Individuals or entities
@@ -207,7 +208,7 @@ license that has been, or is required to be, granted under the terms of this
 License), and this License will continue in full force and effect unless terminated
 as stated above.
 
-   8. Miscellaneous
+8. Miscellaneous
 
 a. Each time You distribute or publicly digitally perform the Work or a Collective
 Work, the Licensor offers to the recipient a license to the Work on the same
diff --git a/options/license/CC-BY-NC-SA-3.0 b/options/license/CC-BY-NC-SA-3.0
index 19606c0fb8..c52d54d709 100644
--- a/options/license/CC-BY-NC-SA-3.0
+++ b/options/license/CC-BY-NC-SA-3.0
@@ -1,9 +1,10 @@
-Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported CREATIVE
-COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE LEGAL SERVICES.
-DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN ATTORNEY-CLIENT RELATIONSHIP.
-CREATIVE COMMONS PROVIDES THIS INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS
-MAKES NO WARRANTIES REGARDING THE INFORMATION PROVIDED, AND DISCLAIMS LIABILITY
-FOR DAMAGES RESULTING FROM ITS USE.
+Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported
+
+CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE LEGAL
+SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN ATTORNEY-CLIENT
+RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS INFORMATION ON AN "AS-IS" BASIS.
+CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE INFORMATION PROVIDED, AND
+DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM ITS USE.
 
 License
 
@@ -17,7 +18,7 @@ BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY BE CONSIDE
 TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION
 OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS.
 
-   1. Definitions
+1. Definitions
 
 a. "Adaptation" means a work based upon the Work, or upon the Work and other
 pre-existing works, such as a translation, adaptation, derivative work, arrangement
@@ -121,7 +122,7 @@ has been modified.";
 c. to Distribute and Publicly Perform the Work including as incorporated in
 Collections; and,
 
-      d. to Distribute and Publicly Perform Adaptations.
+     d. to Distribute and Publicly Perform Adaptations.
 
 The above rights may be exercised in all media and formats whether now known
 or hereafter devised. The above rights include the right to make such modifications
@@ -210,7 +211,7 @@ Parties, as appropriate, of You or Your use of the Work, without the separate,
 express prior written permission of the Original Author, Licensor and/or Attribution
 Parties.
 
-      e. For the avoidance of doubt:
+     e. For the avoidance of doubt:
 
 i. Non-waivable Compulsory License Schemes. In those jurisdictions in which
 the right to collect royalties through any statutory or compulsory licensing
@@ -246,7 +247,7 @@ permitted by the applicable national law, to enable You to reasonably exercise
 Your right under Section 3(b) of this License (right to make Adaptations)
 but not otherwise.
 
-   5. Representations, Warranties and Disclaimer
+5. Representations, Warranties and Disclaimer
 
 UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING AND TO THE FULLEST
 EXTENT PERMITTED BY APPLICABLE LAW, LICENSOR OFFERS THE WORK AS-IS AND MAKES
@@ -263,7 +264,7 @@ INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS
 LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY
 OF SUCH DAMAGES.
 
-   7. Termination
+7. Termination
 
 a. This License and the rights granted hereunder will terminate automatically
 upon any breach by You of the terms of this License. Individuals or entities
@@ -281,7 +282,7 @@ license that has been, or is required to be, granted under the terms of this
 License), and this License will continue in full force and effect unless terminated
 as stated above.
 
-   8. Miscellaneous
+8. Miscellaneous
 
 a. Each time You Distribute or Publicly Perform the Work or a Collection,
 the Licensor offers to the recipient a license to the Work on the same terms
diff --git a/options/license/CC-BY-NC-SA-4.0 b/options/license/CC-BY-NC-SA-4.0
index 5797ceb359..af0fc6badc 100644
--- a/options/license/CC-BY-NC-SA-4.0
+++ b/options/license/CC-BY-NC-SA-4.0
@@ -1,12 +1,13 @@
-Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International Creative
-Commons Corporation ("Creative Commons") is not a law firm and does not provide
-legal services or legal advice. Distribution of Creative Commons public licenses
-does not create a lawyer-client or other relationship. Creative Commons makes
-its licenses and related information available on an "as-is" basis. Creative
-Commons gives no warranties regarding its licenses, any material licensed
-under their terms and conditions, or any related information. Creative Commons
-disclaims all liability for damages resulting from their use to the fullest
-extent possible.
+Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International
+
+Creative Commons Corporation (“Creative Commons”) is not a law firm and does
+not provide legal services or legal advice. Distribution of Creative Commons
+public licenses does not create a lawyer-client or other relationship. Creative
+Commons makes its licenses and related information available on an “as-is”
+basis. Creative Commons gives no warranties regarding its licenses, any material
+licensed under their terms and conditions, or any related information. Creative
+Commons disclaims all liability for damages resulting from their use to the
+fullest extent possible.
 
 Using Creative Commons Public Licenses
 
@@ -25,11 +26,11 @@ they choose before applying it. Licensors should also secure all rights necessar
 before applying our licenses so that the public can reuse the material as
 expected. Licensors should clearly mark any material not subject to the license.
 This includes other CC-licensed material, or material used under an exception
-or limitation to copyright. More considerations for licensors : wiki.creativecommons.org/Considerations_for_licensors
+or limitation to copyright. More considerations for licensors.
 
 Considerations for the public: By using one of our public licenses, a licensor
 grants the public permission to use the licensed material under specified
-terms and conditions. If the licensor's permission is not necessary for any
+terms and conditions. If the licensor’s permission is not necessary for any
 reason–for example, because of any applicable exception or limitation to copyright–then
 that use is not regulated by the license. Our licenses grant only permissions
 under copyright and certain other rights that a licensor has authority to
@@ -37,8 +38,7 @@ grant. Use of the licensed material may still be restricted for other reasons,
 including because others have copyright or other rights in the material. A
 licensor may make special requests, such as asking that all changes be marked
 or described. Although not required by our licenses, you are encouraged to
-respect those requests where reasonable. More considerations for the public
-: wiki.creativecommons.org/Considerations_for_licensees
+respect those requests where reasonable. More considerations for the public.
 
 Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International Public
 License
@@ -54,7 +54,7 @@ conditions.
 
 Section 1 – Definitions.
 
-a. Adapted Material means material subject to Copyright and Similar Rights
+a.	Adapted Material means material subject to Copyright and Similar Rights
 that is derived from or based upon the Licensed Material and in which the
 Licensed Material is translated, altered, arranged, transformed, or otherwise
 modified in a manner requiring permission under the Copyright and Similar
@@ -63,69 +63,69 @@ Licensed Material is a musical work, performance, or sound recording, Adapted
 Material is always produced where the Licensed Material is synched in timed
 relation with a moving image.
 
-b. Adapter's License means the license You apply to Your Copyright and Similar
+b.	Adapter's License means the license You apply to Your Copyright and Similar
 Rights in Your contributions to Adapted Material in accordance with the terms
 and conditions of this Public License.
 
-c. BY-NC-SA Compatible License means a license listed at creativecommons.org/compatiblelicenses,
+c.	BY-NC-SA Compatible License means a license listed at creativecommons.org/compatiblelicenses,
 approved by Creative Commons as essentially the equivalent of this Public
 License.
 
-d. Copyright and Similar Rights means copyright and/or similar rights closely
+d.	Copyright and Similar Rights means copyright and/or similar rights closely
 related to copyright including, without limitation, performance, broadcast,
 sound recording, and Sui Generis Database Rights, without regard to how the
 rights are labeled or categorized. For purposes of this Public License, the
 rights specified in Section 2(b)(1)-(2) are not Copyright and Similar Rights.
 
-e. Effective Technological Measures means those measures that, in the absence
+e.	Effective Technological Measures means those measures that, in the absence
 of proper authority, may not be circumvented under laws fulfilling obligations
 under Article 11 of the WIPO Copyright Treaty adopted on December 20, 1996,
 and/or similar international agreements.
 
-f. Exceptions and Limitations means fair use, fair dealing, and/or any other
+f.	Exceptions and Limitations means fair use, fair dealing, and/or any other
 exception or limitation to Copyright and Similar Rights that applies to Your
 use of the Licensed Material.
 
-g. License Elements means the license attributes listed in the name of a Creative
+g.	License Elements means the license attributes listed in the name of a Creative
 Commons Public License. The License Elements of this Public License are Attribution,
 NonCommercial, and ShareAlike.
 
-h. Licensed Material means the artistic or literary work, database, or other
+h.	Licensed Material means the artistic or literary work, database, or other
 material to which the Licensor applied this Public License.
 
-i. Licensed Rights means the rights granted to You subject to the terms and
+i.	Licensed Rights means the rights granted to You subject to the terms and
 conditions of this Public License, which are limited to all Copyright and
 Similar Rights that apply to Your use of the Licensed Material and that the
 Licensor has authority to license.
 
-j. Licensor means the individual(s) or entity(ies) granting rights under this
+j.	Licensor means the individual(s) or entity(ies) granting rights under this
 Public License.
 
-k. NonCommercial means not primarily intended for or directed towards commercial
+k.	NonCommercial means not primarily intended for or directed towards commercial
 advantage or monetary compensation. For purposes of this Public License, the
 exchange of the Licensed Material for other material subject to Copyright
 and Similar Rights by digital file-sharing or similar means is NonCommercial
 provided there is no payment of monetary compensation in connection with the
 exchange.
 
-l. Share means to provide material to the public by any means or process that
+l.	Share means to provide material to the public by any means or process that
 requires permission under the Licensed Rights, such as reproduction, public
 display, public performance, distribution, dissemination, communication, or
 importation, and to make material available to the public including in ways
 that members of the public may access the material from a place and at a time
 individually chosen by them.
 
-m. Sui Generis Database Rights means rights other than copyright resulting
+m.	Sui Generis Database Rights means rights other than copyright resulting
 from Directive 96/9/EC of the European Parliament and of the Council of 11
 March 1996 on the legal protection of databases, as amended and/or succeeded,
 as well as other essentially equivalent rights anywhere in the world.
 
-n. You means the individual or entity exercising the Licensed Rights under
+n.	You means the individual or entity exercising the Licensed Rights under
 this Public License. Your has a corresponding meaning.
 
 Section 2 – Scope.
 
-   a. License grant.
+     a.	License grant.
 
 1. Subject to the terms and conditions of this Public License, the Licensor
 hereby grants You a worldwide, royalty-free, non-sublicensable, non-exclusive,
@@ -142,7 +142,7 @@ only.
 and Limitations apply to Your use, this Public License does not apply, and
 You do not need to comply with its terms and conditions.
 
-      3. Term. The term of this Public License is specified in Section 6(a).
+3. Term. The term of this Public License is specified in Section 6(a).
 
 4. Media and formats; technical modifications allowed. The Licensor authorizes
 You to exercise the Licensed Rights in all media and formats whether now known
@@ -154,7 +154,7 @@ Effective Technological Measures. For purposes of this Public License, simply
 making modifications authorized by this Section 2(a)(4) never produces Adapted
 Material.
 
-      5. Downstream recipients.
+          5. Downstream recipients.
 
 A. Offer from the Licensor – Licensed Material. Every recipient of the Licensed
 Material automatically receives an offer from the Licensor to exercise the
@@ -163,7 +163,7 @@ Licensed Rights under the terms and conditions of this Public License.
 B. Additional offer from the Licensor – Adapted Material. Every recipient
 of Adapted Material from You automatically receives an offer from the Licensor
 to exercise the Licensed Rights in the Adapted Material under the conditions
-of the Adapter's License You apply.
+of the Adapter’s License You apply.
 
 C. No downstream restrictions. You may not offer or impose any additional
 or different terms or conditions on, or apply any Effective Technological
@@ -176,7 +176,7 @@ Material is, connected with, or sponsored, endorsed, or granted official status
 by, the Licensor or others designated to receive attribution as provided in
 Section 3(a)(1)(A)(i).
 
-   b. Other rights.
+     b.	Other rights.
 
 1. Moral rights, such as the right of integrity, are not licensed under this
 Public License, nor are publicity, privacy, and/or other similar personality
@@ -198,26 +198,24 @@ Section 3 – License Conditions.
 Your exercise of the Licensed Rights is expressly made subject to the following
 conditions.
 
-   a. Attribution.
+     a.	Attribution.
 
 1. If You Share the Licensed Material (including in modified form), You must:
 
 A. retain the following if it is supplied by the Licensor with the Licensed
 Material:
 
-i. identification of the creator(s) of the Licensed Material and any others
+i.	identification of the creator(s) of the Licensed Material and any others
 designated to receive attribution, in any reasonable manner requested by the
 Licensor (including by pseudonym if designated);
 
-            ii. a copyright notice;
+                    ii.	a copyright notice;
 
-            iii. a notice that refers to this Public License;
+                    iii. a notice that refers to this Public License;
 
-            iv. a notice that refers to the disclaimer of warranties;
+                    iv.	a notice that refers to the disclaimer of warranties;
 
-            
-
-v. a URI or hyperlink to the Licensed Material to the extent reasonably practicable;
+v.	a URI or hyperlink to the Licensed Material to the extent reasonably practicable;
 
 B. indicate if You modified the Licensed Material and retain an indication
 of any previous modifications; and
@@ -233,10 +231,10 @@ URI or hyperlink to a resource that includes the required information.
 3. If requested by the Licensor, You must remove any of the information required
 by Section 3(a)(1)(A) to the extent reasonably practicable.
 
-b. ShareAlike.In addition to the conditions in Section 3(a), if You Share
+b.	ShareAlike.In addition to the conditions in Section 3(a), if You Share
 Adapted Material You produce, the following conditions also apply.
 
-1. The Adapter's License You apply must be a Creative Commons license with
+1. The Adapter’s License You apply must be a Creative Commons license with
 the same License Elements, this version or later, or a BY-NC-SA Compatible
 License.
 
@@ -253,25 +251,24 @@ Section 4 – Sui Generis Database Rights.
 Where the Licensed Rights include Sui Generis Database Rights that apply to
 Your use of the Licensed Material:
 
-a. for the avoidance of doubt, Section 2(a)(1) grants You the right to extract,
+a.	for the avoidance of doubt, Section 2(a)(1) grants You the right to extract,
 reuse, reproduce, and Share all or a substantial portion of the contents of
 the database for NonCommercial purposes only;
 
-b. if You include all or a substantial portion of the database contents in
+b.	if You include all or a substantial portion of the database contents in
 a database in which You have Sui Generis Database Rights, then the database
 in which You have Sui Generis Database Rights (but not its individual contents)
 is Adapted Material, including for purposes of Section 3(b); and
 
-c. You must comply with the conditions in Section 3(a) if You Share all or
+c.	You must comply with the conditions in Section 3(a) if You Share all or
 a substantial portion of the contents of the database.
-
 For the avoidance of doubt, this Section 4 supplements and does not replace
 Your obligations under this Public License where the Licensed Rights include
 other Copyright and Similar Rights.
 
 Section 5 – Disclaimer of Warranties and Limitation of Liability.
 
-a. Unless otherwise separately undertaken by the Licensor, to the extent possible,
+a.	Unless otherwise separately undertaken by the Licensor, to the extent possible,
 the Licensor offers the Licensed Material as-is and as-available, and makes
 no representations or warranties of any kind concerning the Licensed Material,
 whether express, implied, statutory, or other. This includes, without limitation,
@@ -280,7 +277,7 @@ absence of latent or other defects, accuracy, or the presence or absence of
 errors, whether or not known or discoverable. Where disclaimers of warranties
 are not allowed in full or in part, this disclaimer may not apply to You.
 
-b. To the extent possible, in no event will the Licensor be liable to You
+b.	To the extent possible, in no event will the Licensor be liable to You
 on any legal theory (including, without limitation, negligence) or otherwise
 for any direct, special, indirect, incidental, consequential, punitive, exemplary,
 or other losses, costs, expenses, or damages arising out of this Public License
@@ -289,74 +286,73 @@ the possibility of such losses, costs, expenses, or damages. Where a limitation
 of liability is not allowed in full or in part, this limitation may not apply
 to You.
 
-c. The disclaimer of warranties and limitation of liability provided above
+c.	The disclaimer of warranties and limitation of liability provided above
 shall be interpreted in a manner that, to the extent possible, most closely
 approximates an absolute disclaimer and waiver of all liability.
 
 Section 6 – Term and Termination.
 
-a. This Public License applies for the term of the Copyright and Similar Rights
+a.	This Public License applies for the term of the Copyright and Similar Rights
 licensed here. However, if You fail to comply with this Public License, then
 Your rights under this Public License terminate automatically.
 
-b. Where Your right to use the Licensed Material has terminated under Section
+b.	Where Your right to use the Licensed Material has terminated under Section
 6(a), it reinstates:
 
-1. automatically as of the date the violation is cured, provided it is cured
+1.	automatically as of the date the violation is cured, provided it is cured
 within 30 days of Your discovery of the violation; or
 
-      2. upon express reinstatement by the Licensor.
+          2.	upon express reinstatement by the Licensor.
 
 For the avoidance of doubt, this Section 6(b) does not affect any right the
 Licensor may have to seek remedies for Your violations of this Public License.
 
-c. For the avoidance of doubt, the Licensor may also offer the Licensed Material
+c.	For the avoidance of doubt, the Licensor may also offer the Licensed Material
 under separate terms or conditions or stop distributing the Licensed Material
 at any time; however, doing so will not terminate this Public License.
 
-   d. Sections 1, 5, 6, 7, and 8 survive termination of this Public License.
+     d.	Sections 1, 5, 6, 7, and 8 survive termination of this Public License.
 
 Section 7 – Other Terms and Conditions.
 
-a. The Licensor shall not be bound by any additional or different terms or
+a.	The Licensor shall not be bound by any additional or different terms or
 conditions communicated by You unless expressly agreed.
 
-b. Any arrangements, understandings, or agreements regarding the Licensed
+b.	Any arrangements, understandings, or agreements regarding the Licensed
 Material not stated herein are separate from and independent of the terms
 and conditions of this Public License.
 
 Section 8 – Interpretation.
 
-a. For the avoidance of doubt, this Public License does not, and shall not
+a.	For the avoidance of doubt, this Public License does not, and shall not
 be interpreted to, reduce, limit, restrict, or impose conditions on any use
 of the Licensed Material that could lawfully be made without permission under
 this Public License.
 
-b. To the extent possible, if any provision of this Public License is deemed
+b.	To the extent possible, if any provision of this Public License is deemed
 unenforceable, it shall be automatically reformed to the minimum extent necessary
 to make it enforceable. If the provision cannot be reformed, it shall be severed
 from this Public License without affecting the enforceability of the remaining
 terms and conditions.
 
-c. No term or condition of this Public License will be waived and no failure
+c.	No term or condition of this Public License will be waived and no failure
 to comply consented to unless expressly agreed to by the Licensor.
 
-d. Nothing in this Public License constitutes or may be interpreted as a limitation
+d.	Nothing in this Public License constitutes or may be interpreted as a limitation
 upon, or waiver of, any privileges and immunities that apply to the Licensor
 or You, including from the legal processes of any jurisdiction or authority.
 
 Creative Commons is not a party to its public licenses. Notwithstanding, Creative
 Commons may elect to apply one of its public licenses to material it publishes
-and in those instances will be considered the "Licensor." The text of the
-Creative Commons public licenses is dedicated to the public domain under the
-CC0 Public Domain Dedication. Except for the limited purpose of indicating
-that material is shared under a Creative Commons public license or as otherwise
-permitted by the Creative Commons policies published at creativecommons.org/policies,
-Creative Commons does not authorize the use of the trademark "Creative Commons"
-or any other trademark or logo of Creative Commons without its prior written
-consent including, without limitation, in connection with any unauthorized
-modifications to any of its public licenses or any other arrangements, understandings,
-or agreements concerning use of licensed material. For the avoidance of doubt,
-this paragraph does not form part of the public licenses.
+and in those instances will be considered the “Licensor.” Except for the limited
+purpose of indicating that material is shared under a Creative Commons public
+license or as otherwise permitted by the Creative Commons policies published
+at creativecommons.org/policies, Creative Commons does not authorize the use
+of the trademark “Creative Commons” or any other trademark or logo of Creative
+Commons without its prior written consent including, without limitation, in
+connection with any unauthorized modifications to any of its public licenses
+or any other arrangements, understandings, or agreements concerning use of
+licensed material. For the avoidance of doubt, this paragraph does not form
+part of the public licenses.
 
 Creative Commons may be contacted at creativecommons.org.
diff --git a/options/license/CC-BY-ND-1.0 b/options/license/CC-BY-ND-1.0
index a18d1ab47a..2b1b5a8132 100644
--- a/options/license/CC-BY-ND-1.0
+++ b/options/license/CC-BY-ND-1.0
@@ -1,9 +1,10 @@
-Creative Commons Attribution-NoDerivs 1.0 CREATIVE COMMONS CORPORATION IS
-NOT A LAW FIRM AND DOES NOT PROVIDE LEGAL SERVICES. DISTRIBUTION OF THIS DRAFT
-LICENSE DOES NOT CREATE AN ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS
-PROVIDES THIS INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
-REGARDING THE INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING
-FROM ITS USE.
+Creative Commons Attribution-NoDerivs 1.0
+
+CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE LEGAL
+SERVICES. DISTRIBUTION OF THIS DRAFT LICENSE DOES NOT CREATE AN ATTORNEY-CLIENT
+RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS INFORMATION ON AN "AS-IS" BASIS.
+CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE INFORMATION PROVIDED, AND
+DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM ITS USE.
 
 License
 
@@ -16,7 +17,7 @@ BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO
 BE BOUND BY THE TERMS OF THIS LICENSE. THE LICENSOR GRANTS YOU THE RIGHTS
 CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS.
 
-   1. Definitions
+1. Definitions
 
 a. "Collective Work" means a work, such as a periodical issue, anthology or
 encyclopedia, in which the Work in its entirety in unmodified form, along
@@ -35,7 +36,7 @@ Work will not be considered a Derivative Work for the purpose of this License.
 c. "Licensor" means the individual or entity that offers the Work under the
 terms of this License.
 
-      d. "Original Author" means the individual or entity who created the Work.
+     d. "Original Author" means the individual or entity who created the Work.
 
 e. "Work" means the copyrightable work of authorship offered under the terms
 of this License.
@@ -98,7 +99,7 @@ in the case of a Collective Work, at a minimum such credit will appear where
 any other comparable authorship credit appears and in a manner at least as
 prominent as such other comparable authorship credit.
 
-   5. Representations, Warranties and Disclaimer
+5. Representations, Warranties and Disclaimer
 
 a. By offering the Work for public release under this License, Licensor represents
 and warrants that, to the best of Licensor's knowledge after reasonable inquiry:
@@ -124,7 +125,7 @@ TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE
 OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN
 IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
 
-   7. Termination
+7. Termination
 
 a. This License and the rights granted hereunder will terminate automatically
 upon any breach by You of the terms of this License. Individuals or entities
@@ -142,7 +143,7 @@ license that has been, or is required to be, granted under the terms of this
 License), and this License will continue in full force and effect unless terminated
 as stated above.
 
-   8. Miscellaneous
+8. Miscellaneous
 
 a. Each time You distribute or publicly digitally perform the Work or a Collective
 Work, the Licensor offers to the recipient a license to the Work on the same
diff --git a/options/license/CC-BY-ND-2.0 b/options/license/CC-BY-ND-2.0
index 1a41ece832..a4b0a32f49 100644
--- a/options/license/CC-BY-ND-2.0
+++ b/options/license/CC-BY-ND-2.0
@@ -1,9 +1,10 @@
-Creative Commons Attribution-NoDerivs 2.0 CREATIVE COMMONS CORPORATION IS
-NOT A LAW FIRM AND DOES NOT PROVIDE LEGAL SERVICES. DISTRIBUTION OF THIS LICENSE
-DOES NOT CREATE AN ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES
-THIS INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
-REGARDING THE INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING
-FROM ITS USE.
+Creative Commons Attribution-NoDerivs 2.0
+
+CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE LEGAL
+SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN ATTORNEY-CLIENT
+RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS INFORMATION ON AN "AS-IS" BASIS.
+CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE INFORMATION PROVIDED, AND
+DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM ITS USE.
 
 License
 
@@ -16,7 +17,7 @@ BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO
 BE BOUND BY THE TERMS OF THIS LICENSE. THE LICENSOR GRANTS YOU THE RIGHTS
 CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS.
 
-   1. Definitions
+1. Definitions
 
 a. "Collective Work" means a work, such as a periodical issue, anthology or
 encyclopedia, in which the Work in its entirety in unmodified form, along
@@ -39,7 +40,7 @@ this License.
 c. "Licensor" means the individual or entity that offers the Work under the
 terms of this License.
 
-      d. "Original Author" means the individual or entity who created the Work.
+     d. "Original Author" means the individual or entity who created the Work.
 
 e. "Work" means the copyrightable work of authorship offered under the terms
 of this License.
@@ -66,7 +67,7 @@ b. to distribute copies or phonorecords of, display publicly, perform publicly,
 and perform publicly by means of a digital audio transmission the Work including
 as incorporated in Collective Works.
 
-      c. For the avoidance of doubt, where the work is a musical composition:
+     c. For the avoidance of doubt, where the work is a musical composition:
 
 i. Performance Royalties Under Blanket Licenses. Licensor waives the exclusive
 right to collect, whether individually or via a performance rights society
@@ -87,8 +88,6 @@ royalties for the public digital performance (e.g. webcast) of the Work, subject
 to the compulsory license created by 17 USC Section 114 of the US Copyright
 Act (or the equivalent in other jurisdictions).
 
-   
-
 The above rights may be exercised in all media and formats whether now known
 or hereafter devised. The above rights include the right to make such modifications
 as are technically necessary to exercise the rights in other media and formats,
@@ -129,7 +128,7 @@ that in the case of a Collective Work, at a minimum such credit will appear
 where any other comparable authorship credit appears and in a manner at least
 as prominent as such other comparable authorship credit.
 
-   5. Representations, Warranties and Disclaimer
+5. Representations, Warranties and Disclaimer
 
 UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS
 THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING
@@ -146,7 +145,7 @@ INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS
 LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY
 OF SUCH DAMAGES.
 
-   7. Termination
+7. Termination
 
 a. This License and the rights granted hereunder will terminate automatically
 upon any breach by You of the terms of this License. Individuals or entities
@@ -164,7 +163,7 @@ license that has been, or is required to be, granted under the terms of this
 License), and this License will continue in full force and effect unless terminated
 as stated above.
 
-   8. Miscellaneous
+8. Miscellaneous
 
 a. Each time You distribute or publicly digitally perform the Work, the Licensor
 offers to the recipient a license to the Work on the same terms and conditions
@@ -202,4 +201,4 @@ consent of Creative Commons. Any permitted use will be in compliance with
 Creative Commons' then-current trademark usage guidelines, as may be published
 on its website or otherwise made available upon request from time to time.
 
-Creative Commons may be contacted at https://creativecommons.org/.
+Creative Commons may be contacted at http://creativecommons.org/.
diff --git a/options/license/CC-BY-ND-3.0 b/options/license/CC-BY-ND-3.0
index 33575d1880..d3eedb3a31 100644
--- a/options/license/CC-BY-ND-3.0
+++ b/options/license/CC-BY-ND-3.0
@@ -1,9 +1,10 @@
-Creative Commons Attribution-NoDerivs 3.0 Unported CREATIVE COMMONS CORPORATION
-IS NOT A LAW FIRM AND DOES NOT PROVIDE LEGAL SERVICES. DISTRIBUTION OF THIS
-LICENSE DOES NOT CREATE AN ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS
-PROVIDES THIS INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
-REGARDING THE INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING
-FROM ITS USE.
+Creative Commons Attribution-NoDerivs 3.0 Unported
+
+CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE LEGAL
+SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN ATTORNEY-CLIENT
+RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS INFORMATION ON AN "AS-IS" BASIS.
+CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE INFORMATION PROVIDED, AND
+DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM ITS USE.
 
 License
 
@@ -17,7 +18,7 @@ BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY BE CONSIDE
 TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION
 OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS.
 
-   1. Definitions
+1. Definitions
 
 a. "Adaptation" means a work based upon the Work, or upon the Work and other
 pre-existing works, such as a translation, adaptation, derivative work, arrangement
@@ -109,7 +110,7 @@ and to Reproduce the Work as incorporated in the Collections; and,
 b. to Distribute and Publicly Perform the Work including as incorporated in
 Collections.
 
-      c. For the avoidance of doubt:
+     c. For the avoidance of doubt:
 
 i. Non-waivable Compulsory License Schemes. In those jurisdictions in which
 the right to collect royalties through any statutory or compulsory licensing
@@ -183,7 +184,7 @@ the Work either by itself or as part of any Collections, You must not distort,
 mutilate, modify or take other derogatory action in relation to the Work which
 would be prejudicial to the Original Author's honor or reputation.
 
-   5. Representations, Warranties and Disclaimer
+5. Representations, Warranties and Disclaimer
 
 UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS
 THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING
@@ -199,7 +200,7 @@ INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS
 LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY
 OF SUCH DAMAGES.
 
-   7. Termination
+7. Termination
 
 a. This License and the rights granted hereunder will terminate automatically
 upon any breach by You of the terms of this License. Individuals or entities
@@ -217,7 +218,7 @@ license that has been, or is required to be, granted under the terms of this
 License), and this License will continue in full force and effect unless terminated
 as stated above.
 
-   8. Miscellaneous
+8. Miscellaneous
 
 a. Each time You Distribute or Publicly Perform the Work or a Collection,
 the Licensor offers to the recipient a license to the Work on the same terms
diff --git a/options/license/CC-BY-ND-4.0 b/options/license/CC-BY-ND-4.0
index 7f7a7880c1..60c5c47d68 100644
--- a/options/license/CC-BY-ND-4.0
+++ b/options/license/CC-BY-ND-4.0
@@ -1,12 +1,13 @@
-Creative Commons Attribution-NoDerivatives 4.0 International Creative Commons
-Corporation ("Creative Commons") is not a law firm and does not provide legal
-services or legal advice. Distribution of Creative Commons public licenses
-does not create a lawyer-client or other relationship. Creative Commons makes
-its licenses and related information available on an "as-is" basis. Creative
-Commons gives no warranties regarding its licenses, any material licensed
-under their terms and conditions, or any related information. Creative Commons
-disclaims all liability for damages resulting from their use to the fullest
-extent possible.
+Creative Commons Attribution-NoDerivatives 4.0 International
+
+Creative Commons Corporation (“Creative Commons”) is not a law firm and does
+not provide legal services or legal advice. Distribution of Creative Commons
+public licenses does not create a lawyer-client or other relationship. Creative
+Commons makes its licenses and related information available on an “as-is”
+basis. Creative Commons gives no warranties regarding its licenses, any material
+licensed under their terms and conditions, or any related information. Creative
+Commons disclaims all liability for damages resulting from their use to the
+fullest extent possible.
 
 Using Creative Commons Public Licenses
 
@@ -25,11 +26,11 @@ they choose before applying it. Licensors should also secure all rights necessar
 before applying our licenses so that the public can reuse the material as
 expected. Licensors should clearly mark any material not subject to the license.
 This includes other CC-licensed material, or material used under an exception
-or limitation to copyright. More considerations for licensors : wiki.creativecommons.org/Considerations_for_licensors
+or limitation to copyright. More considerations for licensors.
 
 Considerations for the public: By using one of our public licenses, a licensor
 grants the public permission to use the licensed material under specified
-terms and conditions. If the licensor's permission is not necessary for any
+terms and conditions. If the licensor’s permission is not necessary for any
 reason–for example, because of any applicable exception or limitation to copyright–then
 that use is not regulated by the license. Our licenses grant only permissions
 under copyright and certain other rights that a licensor has authority to
@@ -37,8 +38,7 @@ grant. Use of the licensed material may still be restricted for other reasons,
 including because others have copyright or other rights in the material. A
 licensor may make special requests, such as asking that all changes be marked
 or described. Although not required by our licenses, you are encouraged to
-respect those requests where reasonable. More considerations for the public
-: wiki.creativecommons.org/Considerations_for_licensees
+respect those requests where reasonable. More considerations for the public.
 
 Creative Commons Attribution-NoDerivatives 4.0 International Public License
 
@@ -53,7 +53,7 @@ conditions.
 
 Section 1 – Definitions.
 
-a. Adapted Material means material subject to Copyright and Similar Rights
+a.	Adapted Material means material subject to Copyright and Similar Rights
 that is derived from or based upon the Licensed Material and in which the
 Licensed Material is translated, altered, arranged, transformed, or otherwise
 modified in a manner requiring permission under the Copyright and Similar
@@ -62,65 +62,65 @@ Licensed Material is a musical work, performance, or sound recording, Adapted
 Material is always produced where the Licensed Material is synched in timed
 relation with a moving image.
 
-b. Copyright and Similar Rights means copyright and/or similar rights closely
+b.	Copyright and Similar Rights means copyright and/or similar rights closely
 related to copyright including, without limitation, performance, broadcast,
 sound recording, and Sui Generis Database Rights, without regard to how the
 rights are labeled or categorized. For purposes of this Public License, the
 rights specified in Section 2(b)(1)-(2) are not Copyright and Similar Rights.
 
-c. Effective Technological Measures means those measures that, in the absence
+c.	Effective Technological Measures means those measures that, in the absence
 of proper authority, may not be circumvented under laws fulfilling obligations
 under Article 11 of the WIPO Copyright Treaty adopted on December 20, 1996,
 and/or similar international agreements.
 
-d. Exceptions and Limitations means fair use, fair dealing, and/or any other
+d.	Exceptions and Limitations means fair use, fair dealing, and/or any other
 exception or limitation to Copyright and Similar Rights that applies to Your
 use of the Licensed Material.
 
-e. Licensed Material means the artistic or literary work, database, or other
+e.	Licensed Material means the artistic or literary work, database, or other
 material to which the Licensor applied this Public License.
 
-f. Licensed Rights means the rights granted to You subject to the terms and
+f.	Licensed Rights means the rights granted to You subject to the terms and
 conditions of this Public License, which are limited to all Copyright and
 Similar Rights that apply to Your use of the Licensed Material and that the
 Licensor has authority to license.
 
-g. Licensor means the individual(s) or entity(ies) granting rights under this
+g.	Licensor means the individual(s) or entity(ies) granting rights under this
 Public License.
 
-h. Share means to provide material to the public by any means or process that
+h.	Share means to provide material to the public by any means or process that
 requires permission under the Licensed Rights, such as reproduction, public
 display, public performance, distribution, dissemination, communication, or
 importation, and to make material available to the public including in ways
 that members of the public may access the material from a place and at a time
 individually chosen by them.
 
-i. Sui Generis Database Rights means rights other than copyright resulting
+i.	Sui Generis Database Rights means rights other than copyright resulting
 from Directive 96/9/EC of the European Parliament and of the Council of 11
 March 1996 on the legal protection of databases, as amended and/or succeeded,
 as well as other essentially equivalent rights anywhere in the world.
 
-j. You means the individual or entity exercising the Licensed Rights under
+j.	You means the individual or entity exercising the Licensed Rights under
 this Public License. Your has a corresponding meaning.
 
 Section 2 – Scope.
 
-   a. License grant.
+     a.	License grant.
 
 1. Subject to the terms and conditions of this Public License, the Licensor
 hereby grants You a worldwide, royalty-free, non-sublicensable, non-exclusive,
 irrevocable license to exercise the Licensed Rights in the Licensed Material
 to:
 
-         A. reproduce and Share the Licensed Material, in whole or in part; and
+A. reproduce and Share the Licensed Material, in whole or in part; and
 
-         B. produce and reproduce, but not Share, Adapted Material.
+               B. produce and reproduce, but not Share, Adapted Material.
 
 2. Exceptions and Limitations. For the avoidance of doubt, where Exceptions
 and Limitations apply to Your use, this Public License does not apply, and
 You do not need to comply with its terms and conditions.
 
-      3. Term. The term of this Public License is specified in Section 6(a).
+3. Term. The term of this Public License is specified in Section 6(a).
 
 4. Media and formats; technical modifications allowed. The Licensor authorizes
 You to exercise the Licensed Rights in all media and formats whether now known
@@ -132,7 +132,7 @@ Effective Technological Measures. For purposes of this Public License, simply
 making modifications authorized by this Section 2(a)(4) never produces Adapted
 Material.
 
-      5. Downstream recipients.
+          5. Downstream recipients.
 
 A. Offer from the Licensor – Licensed Material. Every recipient of the Licensed
 Material automatically receives an offer from the Licensor to exercise the
@@ -149,7 +149,7 @@ Material is, connected with, or sponsored, endorsed, or granted official status
 by, the Licensor or others designated to receive attribution as provided in
 Section 3(a)(1)(A)(i).
 
-   b. Other rights.
+     b.	Other rights.
 
 1. Moral rights, such as the right of integrity, are not licensed under this
 Public License, nor are publicity, privacy, and/or other similar personality
@@ -170,9 +170,9 @@ Section 3 – License Conditions.
 Your exercise of the Licensed Rights is expressly made subject to the following
 conditions.
 
-   a. Attribution.
+     a.	Attribution.
 
-      1. If You Share the Licensed Material, You must:
+          1. If You Share the Licensed Material, You must:
 
 A. retain the following if it is supplied by the Licensor with the Licensed
 Material:
@@ -181,13 +181,13 @@ i. identification of the creator(s) of the Licensed Material and any others
 designated to receive attribution, in any reasonable manner requested by the
 Licensor (including by pseudonym if designated);
 
-            ii. a copyright notice;
+                    ii.	a copyright notice;
 
-            iii. a notice that refers to this Public License;
+                    iii. a notice that refers to this Public License;
 
-            iv. a notice that refers to the disclaimer of warranties;
+                    iv.	a notice that refers to the disclaimer of warranties;
 
-v. a URI or hyperlink to the Licensed Material to the extent reasonably practicable;
+v.	a URI or hyperlink to the Licensed Material to the extent reasonably practicable;
 
 B. indicate if You modified the Licensed Material and retain an indication
 of any previous modifications; and
@@ -211,25 +211,24 @@ Section 4 – Sui Generis Database Rights.
 Where the Licensed Rights include Sui Generis Database Rights that apply to
 Your use of the Licensed Material:
 
-a. for the avoidance of doubt, Section 2(a)(1) grants You the right to extract,
+a.	for the avoidance of doubt, Section 2(a)(1) grants You the right to extract,
 reuse, reproduce, and Share all or a substantial portion of the contents of
 the database, provided You do not Share Adapted Material;
 
-b. if You include all or a substantial portion of the database contents in
+b.	if You include all or a substantial portion of the database contents in
 a database in which You have Sui Generis Database Rights, then the database
 in which You have Sui Generis Database Rights (but not its individual contents)
 is Adapted Material; and
 
-c. You must comply with the conditions in Section 3(a) if You Share all or
+c.	You must comply with the conditions in Section 3(a) if You Share all or
 a substantial portion of the contents of the database.
-
 For the avoidance of doubt, this Section 4 supplements and does not replace
 Your obligations under this Public License where the Licensed Rights include
 other Copyright and Similar Rights.
 
 Section 5 – Disclaimer of Warranties and Limitation of Liability.
 
-a. Unless otherwise separately undertaken by the Licensor, to the extent possible,
+a.	Unless otherwise separately undertaken by the Licensor, to the extent possible,
 the Licensor offers the Licensed Material as-is and as-available, and makes
 no representations or warranties of any kind concerning the Licensed Material,
 whether express, implied, statutory, or other. This includes, without limitation,
@@ -238,7 +237,7 @@ absence of latent or other defects, accuracy, or the presence or absence of
 errors, whether or not known or discoverable. Where disclaimers of warranties
 are not allowed in full or in part, this disclaimer may not apply to You.
 
-b. To the extent possible, in no event will the Licensor be liable to You
+b.	To the extent possible, in no event will the Licensor be liable to You
 on any legal theory (including, without limitation, negligence) or otherwise
 for any direct, special, indirect, incidental, consequential, punitive, exemplary,
 or other losses, costs, expenses, or damages arising out of this Public License
@@ -247,75 +246,74 @@ the possibility of such losses, costs, expenses, or damages. Where a limitation
 of liability is not allowed in full or in part, this limitation may not apply
 to You.
 
-c. The disclaimer of warranties and limitation of liability provided above
+c.	The disclaimer of warranties and limitation of liability provided above
 shall be interpreted in a manner that, to the extent possible, most closely
 approximates an absolute disclaimer and waiver of all liability.
 
 Section 6 – Term and Termination.
 
-a. This Public License applies for the term of the Copyright and Similar Rights
+a.	This Public License applies for the term of the Copyright and Similar Rights
 licensed here. However, if You fail to comply with this Public License, then
 Your rights under this Public License terminate automatically.
 
-b. Where Your right to use the Licensed Material has terminated under Section
+b.	Where Your right to use the Licensed Material has terminated under Section
 6(a), it reinstates:
 
 1. automatically as of the date the violation is cured, provided it is cured
 within 30 days of Your discovery of the violation; or
 
-      2. upon express reinstatement by the Licensor.
+          2. upon express reinstatement by the Licensor.
 
-c. For the avoidance of doubt, this Section 6(b) does not affect any right
+c.	For the avoidance of doubt, this Section 6(b) does not affect any right
 the Licensor may have to seek remedies for Your violations of this Public
 License.
 
-d. For the avoidance of doubt, the Licensor may also offer the Licensed Material
+d.	For the avoidance of doubt, the Licensor may also offer the Licensed Material
 under separate terms or conditions or stop distributing the Licensed Material
 at any time; however, doing so will not terminate this Public License.
 
-   e. Sections 1, 5, 6, 7, and 8 survive termination of this Public License.
+     e.	Sections 1, 5, 6, 7, and 8 survive termination of this Public License.
 
 Section 7 – Other Terms and Conditions.
 
-a. The Licensor shall not be bound by any additional or different terms or
+a.	The Licensor shall not be bound by any additional or different terms or
 conditions communicated by You unless expressly agreed.
 
-b. Any arrangements, understandings, or agreements regarding the Licensed
+b.	Any arrangements, understandings, or agreements regarding the Licensed
 Material not stated herein are separate from and independent of the terms
 and conditions of this Public License.
 
 Section 8 – Interpretation.
 
-a. For the avoidance of doubt, this Public License does not, and shall not
+a.	For the avoidance of doubt, this Public License does not, and shall not
 be interpreted to, reduce, limit, restrict, or impose conditions on any use
 of the Licensed Material that could lawfully be made without permission under
 this Public License.
 
-b. To the extent possible, if any provision of this Public License is deemed
+b.	To the extent possible, if any provision of this Public License is deemed
 unenforceable, it shall be automatically reformed to the minimum extent necessary
 to make it enforceable. If the provision cannot be reformed, it shall be severed
 from this Public License without affecting the enforceability of the remaining
 terms and conditions.
 
-c. No term or condition of this Public License will be waived and no failure
+c.	No term or condition of this Public License will be waived and no failure
 to comply consented to unless expressly agreed to by the Licensor.
 
-d. Nothing in this Public License constitutes or may be interpreted as a limitation
+d.	Nothing in this Public License constitutes or may be interpreted as a limitation
 upon, or waiver of, any privileges and immunities that apply to the Licensor
 or You, including from the legal processes of any jurisdiction or authority.
 
 Creative Commons is not a party to its public licenses. Notwithstanding, Creative
 Commons may elect to apply one of its public licenses to material it publishes
-and in those instances will be considered the "Licensor." The text of the
-Creative Commons public licenses is dedicated to the public domain under the
-CC0 Public Domain Dedication. Except for the limited purpose of indicating
-that material is shared under a Creative Commons public license or as otherwise
-permitted by the Creative Commons policies published at creativecommons.org/policies,
-Creative Commons does not authorize the use of the trademark "Creative Commons"
-or any other trademark or logo of Creative Commons without its prior written
-consent including, without limitation, in connection with any unauthorized
-modifications to any of its public licenses or any other arrangements, understandings,
-or agreements concerning use of licensed material. For the avoidance of doubt,
-this paragraph does not form part of the public licenses.
+and in those instances will be considered the “Licensor.” Except for the limited
+purpose of indicating that material is shared under a Creative Commons public
+license or as otherwise permitted by the Creative Commons policies published
+at creativecommons.org/policies, Creative Commons does not authorize the use
+of the trademark “Creative Commons” or any other trademark or logo of Creative
+Commons without its prior written consent including, without limitation, in
+connection with any unauthorized modifications to any of its public licenses
+or any other arrangements, understandings, or agreements concerning use of
+licensed material. For the avoidance of doubt, this paragraph does not form
+part of the public licenses.
 
 Creative Commons may be contacted at creativecommons.org.
diff --git a/options/license/CC-BY-SA-1.0 b/options/license/CC-BY-SA-1.0
index cdbad3e06b..903a26e59b 100644
--- a/options/license/CC-BY-SA-1.0
+++ b/options/license/CC-BY-SA-1.0
@@ -1,9 +1,10 @@
-Creative Commons Attribution-ShareAlike 1.0 CREATIVE COMMONS CORPORATION IS
-NOT A LAW FIRM AND DOES NOT PROVIDE LEGAL SERVICES. DISTRIBUTION OF THIS DRAFT
-LICENSE DOES NOT CREATE AN ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS
-PROVIDES THIS INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
-REGARDING THE INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING
-FROM ITS USE.
+Creative Commons Attribution-ShareAlike 1.0
+
+CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE LEGAL
+SERVICES. DISTRIBUTION OF THIS DRAFT LICENSE DOES NOT CREATE AN ATTORNEY-CLIENT
+RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS INFORMATION ON AN "AS-IS" BASIS.
+CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE INFORMATION PROVIDED, AND
+DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM ITS USE.
 
 License
 
@@ -16,7 +17,7 @@ BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO
 BE BOUND BY THE TERMS OF THIS LICENSE. THE LICENSOR GRANTS YOU THE RIGHTS
 CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS.
 
-   1. Definitions
+1. Definitions
 
 a. "Collective Work" means a work, such as a periodical issue, anthology or
 encyclopedia, in which the Work in its entirety in unmodified form, along
@@ -35,7 +36,7 @@ Work will not be considered a Derivative Work for the purpose of this License.
 c. "Licensor" means the individual or entity that offers the Work under the
 terms of this License.
 
-      d. "Original Author" means the individual or entity who created the Work.
+     d. "Original Author" means the individual or entity who created the Work.
 
 e. "Work" means the copyrightable work of authorship offered under the terms
 of this License.
@@ -58,7 +59,7 @@ the Work as stated below:
 a. to reproduce the Work, to incorporate the Work into one or more Collective
 Works, and to reproduce the Work as incorporated in the Collective Works;
 
-      b. to create and reproduce Derivative Works;
+     b. to create and reproduce Derivative Works;
 
 c. to distribute copies or phonorecords of, display publicly, perform publicly,
 and perform publicly by means of a digital audio transmission the Work including
@@ -125,7 +126,7 @@ such credit will appear where any other comparable authorship credit appears
 and in a manner at least as prominent as such other comparable authorship
 credit.
 
-   5. Representations, Warranties and Disclaimer
+5. Representations, Warranties and Disclaimer
 
 a. By offering the Work for public release under this License, Licensor represents
 and warrants that, to the best of Licensor's knowledge after reasonable inquiry:
@@ -151,7 +152,7 @@ TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE
 OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN
 IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
 
-   7. Termination
+7. Termination
 
 a. This License and the rights granted hereunder will terminate automatically
 upon any breach by You of the terms of this License. Individuals or entities
@@ -169,7 +170,7 @@ license that has been, or is required to be, granted under the terms of this
 License), and this License will continue in full force and effect unless terminated
 as stated above.
 
-   8. Miscellaneous
+8. Miscellaneous
 
 a. Each time You distribute or publicly digitally perform the Work or a Collective
 Work, the Licensor offers to the recipient a license to the Work on the same
diff --git a/options/license/CC-BY-SA-2.0 b/options/license/CC-BY-SA-2.0
index 400c7c35d0..852a09c7c2 100644
--- a/options/license/CC-BY-SA-2.0
+++ b/options/license/CC-BY-SA-2.0
@@ -1,9 +1,10 @@
-Creative Commons Attribution-ShareAlike 2.0 CREATIVE COMMONS CORPORATION IS
-NOT A LAW FIRM AND DOES NOT PROVIDE LEGAL SERVICES. DISTRIBUTION OF THIS LICENSE
-DOES NOT CREATE AN ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES
-THIS INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
-REGARDING THE INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING
-FROM ITS USE.
+Creative Commons Attribution-ShareAlike 2.0
+
+CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE LEGAL
+SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN ATTORNEY-CLIENT
+RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS INFORMATION ON AN "AS-IS" BASIS.
+CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE INFORMATION PROVIDED, AND
+DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM ITS USE.
 
 License
 
@@ -16,7 +17,7 @@ BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO
 BE BOUND BY THE TERMS OF THIS LICENSE. THE LICENSOR GRANTS YOU THE RIGHTS
 CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS.
 
-   1. Definitions
+1. Definitions
 
 a. "Collective Work" means a work, such as a periodical issue, anthology or
 encyclopedia, in which the Work in its entirety in unmodified form, along
@@ -39,7 +40,7 @@ this License.
 c. "Licensor" means the individual or entity that offers the Work under the
 terms of this License.
 
-      d. "Original Author" means the individual or entity who created the Work.
+     d. "Original Author" means the individual or entity who created the Work.
 
 e. "Work" means the copyrightable work of authorship offered under the terms
 of this License.
@@ -66,7 +67,7 @@ the Work as stated below:
 a. to reproduce the Work, to incorporate the Work into one or more Collective
 Works, and to reproduce the Work as incorporated in the Collective Works;
 
-      b. to create and reproduce Derivative Works;
+     b. to create and reproduce Derivative Works;
 
 c. to distribute copies or phonorecords of, display publicly, perform publicly,
 and perform publicly by means of a digital audio transmission the Work including
@@ -75,7 +76,7 @@ as incorporated in Collective Works;
 d. to distribute copies or phonorecords of, display publicly, perform publicly,
 and perform publicly by means of a digital audio transmission Derivative Works.
 
-      e. For the avoidance of doubt, where the work is a musical composition:
+     e. For the avoidance of doubt, where the work is a musical composition:
 
 i. Performance Royalties Under Blanket Licenses. Licensor waives the exclusive
 right to collect, whether individually or via a performance rights society
@@ -160,7 +161,7 @@ such credit will appear where any other comparable authorship credit appears
 and in a manner at least as prominent as such other comparable authorship
 credit.
 
-   5. Representations, Warranties and Disclaimer
+5. Representations, Warranties and Disclaimer
 
 UNLESS OTHERWISE AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS THE
 WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING
@@ -177,7 +178,7 @@ INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS
 LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY
 OF SUCH DAMAGES.
 
-   7. Termination
+7. Termination
 
 a. This License and the rights granted hereunder will terminate automatically
 upon any breach by You of the terms of this License. Individuals or entities
@@ -195,7 +196,7 @@ license that has been, or is required to be, granted under the terms of this
 License), and this License will continue in full force and effect unless terminated
 as stated above.
 
-   8. Miscellaneous
+8. Miscellaneous
 
 a. Each time You distribute or publicly digitally perform the Work or a Collective
 Work, the Licensor offers to the recipient a license to the Work on the same
diff --git a/options/license/CC-BY-SA-2.0-UK b/options/license/CC-BY-SA-2.0-UK
new file mode 100644
index 0000000000..b31c10413f
--- /dev/null
+++ b/options/license/CC-BY-SA-2.0-UK
@@ -0,0 +1,248 @@
+Creative Commons Attribution - Share-Alike 2.0 England and Wales
+
+CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE LEGAL
+SERVICES. DISTRIBUTION OF THIS LICENCE DOES NOT CREATE AN ATTORNEY-CLIENT
+RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS INFORMATION ON AN "AS-IS" BASIS.
+CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE INFORMATION PROVIDED, AND
+DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM ITS USE.
+
+Licence
+
+THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS
+PUBLIC LICENCE ("CCPL" OR "LICENCE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR
+OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS
+LICENCE OR COPYRIGHT LAW IS PROHIBITED. BY EXERCISING ANY RIGHTS TO THE WORK
+PROVIDED HERE, YOU ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENCE.
+THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR
+ACCEPTANCE OF SUCH TERMS AND CONDITIONS.
+
+This Creative Commons England and Wales Public Licence enables You (all capitalised
+terms defined below) to view, edit, modify, translate and distribute Works
+worldwide, under the terms of this licence, provided that You credit the Original
+Author.
+
+'The Licensor' [one or more legally recognised persons or entities offering
+the Work under the terms and conditions of this Licence]
+
+and
+
+'You'
+
+agree as follows:
+
+1. Definitions
+
+a. "Attribution" means acknowledging all the parties who have contributed
+to and have rights in the Work or Collective Work under this Licence.
+
+b. "Collective Work" means the Work in its entirety in unmodified form along
+with a number of other separate and independent works, assembled into a collective
+whole.
+
+c. "Derivative Work" means any work created by the editing, modification,
+adaptation or translation of the Work in any media (however a work that constitutes
+a Collective Work will not be considered a Derivative Work for the purpose
+of this Licence). For the avoidance of doubt, where the Work is a musical
+composition or sound recording, the synchronization of the Work in timed-relation
+with a moving image ("synching") will be considered a Derivative Work for
+the purpose of this Licence.
+
+d. "Licence" means this Creative Commons England and Wales Public Licence
+agreement.
+
+e. "Licence Elements" means the following high-level licence attributes indicated
+in the title of this Licence: Attribution, Share-Alike.
+
+    f. "Original Author" means the individual (or entity) who created the Work.
+
+g. "Work" means the work protected by copyright which is offered under the
+terms of this Licence.
+
+h. For the purpose of this Licence, when not inconsistent with the context,
+words in the singular number include the plural number.
+
+2. Licence Terms
+
+2.1 The Licensor hereby grants to You a worldwide, royalty-free, non-exclusive,
+Licence for use and for the duration of copyright in the Work.
+
+You may:
+
+    * copy the Work;
+
+    * create one or more derivative Works;
+
+    * incorporate the Work into one or more Collective Works;
+
+* copy Derivative Works or the Work as incorporated in any Collective Work;
+and
+
+* publish, distribute, archive, perform or otherwise disseminate the Work
+or the Work as incorporated in any Collective Work, to the public in any material
+form in any media whether now known or hereafter created.
+
+HOWEVER,
+
+You must not:
+
+* impose any terms on the use to be made of the Work, the Derivative Work
+or the Work as incorporated in a Collective Work that alter or restrict the
+terms of this Licence or any rights granted under it or has the effect or
+intent of restricting the ability to exercise those rights;
+
+* impose any digital rights management technology on the Work or the Work
+as incorporated in a Collective Work that alters or restricts the terms of
+this Licence or any rights granted under it or has the effect or intent of
+restricting the ability to exercise those rights;
+
+    * sublicense the Work;
+
+* subject the Work to any derogatory treatment as defined in the Copyright,
+Designs and Patents Act 1988.
+
+FINALLY,
+
+You must:
+
+* make reference to this Licence (by Uniform Resource Identifier (URI), spoken
+word or as appropriate to the media used) on all copies of the Work and Collective
+Works published, distributed, performed or otherwise disseminated or made
+available to the public by You;
+
+* recognise the Licensor's / Original Author's right of attribution in any
+Work and Collective Work that You publish, distribute, perform or otherwise
+disseminate to the public and ensure that You credit the Licensor / Original
+Author as appropriate to the media used; and
+
+* to the extent reasonably practicable, keep intact all notices that refer
+to this Licence, in particular the URI, if any, that the Licensor specifies
+to be associated with the Work, unless such URI does not refer to the copyright
+notice or licensing information for the Work.
+
+Additional Provisions for third parties making use of the Work
+
+2.2. Further licence from the Licensor
+
+Each time You publish, distribute, perform or otherwise disseminate
+
+    * the Work; or
+
+    * any Derivative Work; or
+
+    * the Work as incorporated in a Collective Work
+
+the Licensor agrees to offer to the relevant third party making use of the
+Work (in any of the alternatives set out above) a licence to use the Work
+on the same terms and conditions as granted to You hereunder.
+
+2.3. Further licence from You
+
+Each time You publish, distribute, perform or otherwise disseminate
+
+    * a Derivative Work; or
+
+    * a Derivative Work as incorporated in a Collective Work
+
+You agree to offer to the relevant third party making use of the Work (in
+either of the alternatives set out above) a licence to use the Derivative
+Work on any of the following premises:
+
+* a licence to the Derivative Work on the same terms and conditions as the
+licence granted to You hereunder; or
+
+    * a later version of the licence granted to You hereunder; or
+
+    * any other Creative Commons licence with the same Licence Elements.
+
+2.4. This Licence does not affect any rights that the User may have under
+any applicable law, including fair use, fair dealing or any other legally
+recognised limitation or exception to copyright infringement.
+
+2.5. All rights not expressly granted by the Licensor are hereby reserved,
+including but not limited to, the exclusive right to collect, whether individually
+or via a licensing body, such as a collecting society, royalties for any use
+of the Work which results in commercial advantage or private monetary compensation.
+
+3. Warranties and Disclaimer
+
+Except as required by law, the Work is licensed by the Licensor on an "as
+is" and "as available" basis and without any warranty of any kind, either
+express or implied.
+
+4. Limit of Liability
+
+Subject to any liability which may not be excluded or limited by law the Licensor
+shall not be liable and hereby expressly excludes all liability for loss or
+damage howsoever and whenever caused to You.
+
+5. Termination
+
+The rights granted to You under this Licence shall terminate automatically
+upon any breach by You of the terms of this Licence. Individuals or entities
+who have received Collective Works from You under this Licence, however, will
+not have their Licences terminated provided such individuals or entities remain
+in full compliance with those Licences.
+
+6. General
+
+6.1. The validity or enforceability of the remaining terms of this agreement
+is not affected by the holding of any provision of it to be invalid or unenforceable.
+
+6.2. This Licence constitutes the entire Licence Agreement between the parties
+with respect to the Work licensed here. There are no understandings, agreements
+or representations with respect to the Work not specified here. The Licensor
+shall not be bound by any additional provisions that may appear in any communication
+in any form.
+
+6.3. A person who is not a party to this Licence shall have no rights under
+the Contracts (Rights of Third Parties) Act 1999 to enforce any of its terms.
+
+6.4. This Licence shall be governed by the law of England and Wales and the
+parties irrevocably submit to the exclusive jurisdiction of the Courts of
+England and Wales.
+
+7. On the role of Creative Commons
+
+7.1. Neither the Licensor nor the User may use the Creative Commons logo except
+to indicate that the Work is licensed under a Creative Commons Licence. Any
+permitted use has to be in compliance with the Creative Commons trade mark
+usage guidelines at the time of use of the Creative Commons trade mark. These
+guidelines may be found on the Creative Commons website or be otherwise available
+upon request from time to time.
+
+7.2. Creative Commons Corporation does not profit financially from its role
+in providing this Licence and will not investigate the claims of any Licensor
+or user of the Licence.
+
+7.3. One of the conditions that Creative Commons Corporation requires of the
+Licensor and You is an acknowledgement of its limited role and agreement by
+all who use the Licence that the Corporation is not responsible to anyone
+for the statements and actions of You or the Licensor or anyone else attempting
+to use or using this Licence.
+
+7.4. Creative Commons Corporation is not a party to this Licence, and makes
+no warranty whatsoever in connection to the Work or in connection to the Licence,
+and in all events is not liable for any loss or damage resulting from the
+Licensor's or Your reliance on this Licence or on its enforceability.
+
+7.5. USE OF THIS LICENCE MEANS THAT YOU AND THE LICENSOR EACH ACCEPTS THESE
+CONDITIONS IN SECTION 7.1, 7.2, 7.3, 7.4 AND EACH ACKNOWLEDGES CREATIVE COMMONS
+CORPORATION'S VERY LIMITED ROLE AS A FACILITATOR OF THE LICENCE FROM THE LICENSOR
+TO YOU.
+
+Creative Commons is not a party to this Licence, and makes no warranty whatsoever
+in connection with the Work. Creative Commons will not be liable to You or
+any party on any legal theory for any damages whatsoever, including without
+limitation any general, special, incidental or consequential damages arising
+in connection to this licence. Notwithstanding the foregoing two (2) sentences,
+if Creative Commons has expressly identified itself as the Licensor hereunder,
+it shall have all rights and obligations of Licensor.
+
+Except for the limited purpose of indicating to the public that the Work is
+licensed under the CCPL, neither party will use the trademark "Creative Commons"
+or any related trademark or logo of Creative Commons without the prior written
+consent of Creative Commons. Any permitted use will be in compliance with
+Creative Commons' then-current trademark usage guidelines, as may be published
+on its website or otherwise made available upon request from time to time.
+
+Creative Commons may be contacted at https://creativecommons.org/.
diff --git a/options/license/CC-BY-SA-3.0 b/options/license/CC-BY-SA-3.0
index f7061c7ae3..c1020d9299 100644
--- a/options/license/CC-BY-SA-3.0
+++ b/options/license/CC-BY-SA-3.0
@@ -1,9 +1,10 @@
-Creative Commons Attribution-ShareAlike 3.0 Unported CREATIVE COMMONS CORPORATION
-IS NOT A LAW FIRM AND DOES NOT PROVIDE LEGAL SERVICES. DISTRIBUTION OF THIS
-LICENSE DOES NOT CREATE AN ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS
-PROVIDES THIS INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
-REGARDING THE INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING
-FROM ITS USE.
+Creative Commons Attribution-ShareAlike 3.0 Unported
+
+CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE LEGAL
+SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN ATTORNEY-CLIENT
+RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS INFORMATION ON AN "AS-IS" BASIS.
+CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE INFORMATION PROVIDED, AND
+DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM ITS USE.
 
 License
 
@@ -17,7 +18,7 @@ BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY BE CONSIDE
 TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION
 OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS.
 
-   1. Definitions
+1. Definitions
 
 a. "Adaptation" means a work based upon the Work, or upon the Work and other
 pre-existing works, such as a translation, adaptation, derivative work, arrangement
@@ -130,9 +131,9 @@ has been modified.";
 c. to Distribute and Publicly Perform the Work including as incorporated in
 Collections; and,
 
-      d. to Distribute and Publicly Perform Adaptations.
+     d. to Distribute and Publicly Perform Adaptations.
 
-      e. For the avoidance of doubt:
+     e. For the avoidance of doubt:
 
 i. Non-waivable Compulsory License Schemes. In those jurisdictions in which
 the right to collect royalties through any statutory or compulsory licensing
@@ -215,8 +216,8 @@ notice, terms of service or by other reasonable means, the name of such party
 or parties; (ii) the title of the Work if supplied; (iii) to the extent reasonably
 practicable, the URI, if any, that Licensor specifies to be associated with
 the Work, unless such URI does not refer to the copyright notice or licensing
-information for the Work; and (iv), consistent with Section 3(b), in the case
-of an Adaptation, a credit identifying the use of the Work in the Adaptation
+information for the Work; and (iv) , consistent with Ssection 3(b), in the
+case of an Adaptation, a credit identifying the use of the Work in the Adaptation
 (e.g., "French translation of the Work by Original Author," or "Screenplay
 based on original Work by Original Author"). The credit required by this Section
 4(c) may be implemented in any reasonable manner; provided, however, that
@@ -246,7 +247,7 @@ permitted by the applicable national law, to enable You to reasonably exercise
 Your right under Section 3(b) of this License (right to make Adaptations)
 but not otherwise.
 
-   5. Representations, Warranties and Disclaimer
+5. Representations, Warranties and Disclaimer
 
 UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS
 THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING
@@ -262,7 +263,7 @@ INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS
 LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY
 OF SUCH DAMAGES.
 
-   7. Termination
+7. Termination
 
 a. This License and the rights granted hereunder will terminate automatically
 upon any breach by You of the terms of this License. Individuals or entities
@@ -280,7 +281,7 @@ license that has been, or is required to be, granted under the terms of this
 License), and this License will continue in full force and effect unless terminated
 as stated above.
 
-   8. Miscellaneous
+8. Miscellaneous
 
 a. Each time You Distribute or Publicly Perform the Work or a Collection,
 the Licensor offers to the recipient a license to the Work on the same terms
diff --git a/options/license/CC-BY-SA-3.0-AT b/options/license/CC-BY-SA-3.0-AT
index fb39b2e584..59e48dfb14 100644
--- a/options/license/CC-BY-SA-3.0-AT
+++ b/options/license/CC-BY-SA-3.0-AT
@@ -2,10 +2,12 @@ CREATIVE COMMONS IST KEINE RECHTSANWALTSKANZLEI UND LEISTET KEINE RECHTSBERATUNG
 DIE BEREITSTELLUNG DIESER LIZENZ FÜHRT ZU KEINEM MANDATSVERHÄLTNIS. CREATIVE
 COMMONS STELLT DIESE INFORMATIONEN OHNE GEWÄHR ZUR VERFÜGUNG. CREATIVE COMMONS
 ÜBERNIMMT KEINE GEWÄHRLEISTUNG FÜR DIE GELIEFERTEN INFORMATIONEN UND SCHLIEßT
-DIE HAFTUNG FÜR SCHÄDEN AUS, DIE SICH AUS DEREN GEBRAUCH ERGEBEN. Lizenz
+DIE HAFTUNG FÜR SCHÄDEN AUS, DIE SICH AUS DEREN GEBRAUCH ERGEBEN.
 
-DER GEGENSTAND DIESER LIZENZ (WIE UNTER „SCHUTZGEGENSTAND" DEFINIERT) WIRD
-UNTER DEN BEDINGUNGEN DIESER CREATIVE COMMONS PUBLIC LICENSE ("CCPL", „LIZENZ"
+Lizenz
+
+DER GEGENSTAND DIESER LIZENZ (WIE UNTER „SCHUTZGEGENSTAND“ DEFINIERT) WIRD
+UNTER DEN BEDINGUNGEN DIESER CREATIVE COMMONS PUBLIC LICENSE ("CCPL", „LIZENZ“
 ODER "LIZENZVERTRAG") ZUR VERFÜGUNG GESTELLT. DER SCHUTZGEGENSTAND IST DURCH
 DAS URHEBERRECHT UND/ODER ANDERE GESETZE GESCHÜTZT. JEDE FORM DER NUTZUNG
 DES SCHUTZGEGENSTANDES, DIE NICHT AUFGRUND DIESER LIZENZ ODER DURCH GESETZE
@@ -17,7 +19,7 @@ SOWEIT DIESE LIZENZ ALS LIZENZVERTRAG ANZUSEHEN IST, GEWÄHRT IHNEN DER LIZENZGE
 DIE IN DER LIZENZ GENANNTEN RECHTE UNENTGELTLICH UND IM AUSTAUSCH DAFÜR, DASS
 SIE DAS GEBUNDENSEIN AN DIE LIZENZBEDINGUNGEN AKZEPTIEREN.
 
-   1. Definitionen
+1. Definitionen
 
 a. Der Begriff "Bearbeitung" im Sinne dieser Lizenz bezeichnet das Ergebnis
 jeglicher Art von Veränderung des Schutzgegenstandes, solange dieses erkennbar
@@ -62,7 +64,7 @@ auch ein Lichtbild oder anderes Objekt eines verwandten Schutzrechts sein,
 unabhängig von der Art seiner Fixierung und unabhängig davon, auf welche Weise
 jeweils eine Wahrnehmung erfolgen kann, gleichviel ob in analoger oder digitaler
 Form. Soweit Datenbanken oder Zusammenstellungen von Daten einen immaterialgüterrechtlichen
-Schutz eigener Art genießen, unterfallen auch sie dem Begriff „Schutzgegenstand"
+Schutz eigener Art genießen, unterfallen auch sie dem Begriff „Schutzgegenstand“
 im Sinne dieser Lizenz.
 
 h. Mit "Sie" bzw. "Ihnen" ist die natürliche oder juristische Person gemeint,
@@ -94,7 +96,7 @@ https://creativecommons.org/compatiblelicenses aufgelistet ist und die durch
 Creative Commons als grundsätzlich zur vorliegenden Lizenz äquivalent akzeptiert
 wurde, da zumindest folgende Voraussetzungen erfüllt sind:
 
-      Diese mit Creative Commons kompatible Lizenz
+    Diese mit Creative Commons kompatible Lizenz
 
 i. enthält Bestimmungen, welche die gleichen Ziele verfolgen, die gleiche
 Bedeutung haben und die gleichen Wirkungen erzeugen wie die Lizenzelemente
@@ -105,7 +107,7 @@ unter vorliegender Lizenz, unter einer anderen rechtsordnungsspezifisch angepass
 Creative-Commons-Lizenz mit denselben Lizenzelementen wie vorliegende Lizenz
 aufweist oder unter der entsprechenden Creative-Commons-Unported-Lizenz.
 
-   2. Beschränkungen der Verwertungsrechte
+2. Beschränkungen der Verwertungsrechte
 
 Diese Lizenz ist in keiner Weise darauf gerichtet, Befugnisse zur Nutzung
 des Schutzgegenstandes zu vermindern, zu beschränken oder zu vereiteln, die
@@ -114,7 +116,7 @@ der Ausschließlichkeitsrechte des Rechtsinhabers oder anderen entsprechenden
 Rechtsnormen oder sich aus dem Fehlen eines immaterialgüterrechtlichen Schutzes
 ergeben.
 
-   3. Lizenzierung
+3. Lizenzierung
 
 Unter den Bedingungen dieser Lizenz erteilt Ihnen der Lizenzgeber - unbeschadet
 unverzichtbarer Rechte und vorbehaltlich des Abschnitts 3.e) - die vergütungsfreie,
@@ -164,7 +166,7 @@ von Daten Schutzgegenstand dieser Lizenz oder Teil dessen sind und einen immater
 Schutz eigener Art genießen, verzichtet der Lizenzgeber auf die Geltendmachung
 sämtlicher daraus resultierender Rechte.
 
-   4. Bedingungen
+4. Bedingungen
 
 Die Erteilung der Nutzungsbewilligung gemäß Abschnitt 3 dieser Lizenz erfolgt
 ausdrücklich nur unter den folgenden Bedingungen:
@@ -190,11 +192,11 @@ entfernen. Wenn Sie eine Bearbeitung vornehmen, müssen Sie – soweit dies prak
 ist – auf die Mitteilung eines Lizenzgebers hin von der Bearbeitung die in
 Abschnitt 4.c) aufgezählten Hinweise entfernen.
 
-      b. Sie dürfen eine Bearbeitung ausschließlich unter den Bedingungen
+    b. Sie dürfen eine Bearbeitung ausschließlich unter den Bedingungen
 
-         i. dieser Lizenz,
+        i. dieser Lizenz,
 
-ii. einer späteren Version dieser Lizenz mit denselben Lizenzelementen,
+        ii. einer späteren Version dieser Lizenz mit denselben Lizenzelementen,
 
 iii. einer rechtsordnungsspezifischen Creative-Commons-Lizenz mit denselben
 Lizenzelementen ab Version 3.0 aufwärts (z.B. Namensnennung - Weitergabe unter
@@ -203,9 +205,9 @@ gleichen Bedingungen 3.0 US),
 iv. der Creative-Commons-Unported-Lizenz mit denselben Lizenzelementen ab
 Version 3.0 aufwärts, oder
 
-         v. einer mit Creative Commons kompatiblen Lizenz
+        v. einer mit Creative Commons kompatiblen Lizenz
 
-      verbreiten oder öffentlich wiedergeben.
+    verbreiten oder öffentlich wiedergeben.
 
 Falls Sie die Bearbeitung gemäß Abschnitt b)(v) unter einer mit Creative Commons
 kompatiblen Lizenz lizenzieren, müssen Sie deren Lizenzbestimmungen Folge
@@ -239,10 +241,10 @@ Sie selbst – soweit bekannt – Folgendes angeben:
 i. Den Namen (oder das Pseudonym, falls ein solches verwendet wird) des Rechteinhabers,
 und/oder falls der Lizenzgeber im Rechtevermerk, in den Nutzungsbedingungen
 oder auf andere angemessene Weise eine Zuschreibung an Dritte vorgenommen
-hat (z.B. an eine Stiftung, ein Verlagshaus oder eine Zeitung) („Zuschreibungsempfänger"),
+hat (z.B. an eine Stiftung, ein Verlagshaus oder eine Zeitung) („Zuschreibungsempfänger“),
 Namen bzw. Bezeichnung dieses oder dieser Dritten;
 
-         ii. den Titel des Inhaltes;
+        ii. den Titel des Inhaltes;
 
 iii. in einer praktikablen Form den Uniform-Resource-Identifier (URI, z.B.
 Internetadresse), den der Lizenzgeber zum Schutzgegenstand angegeben hat,
@@ -274,7 +276,7 @@ Schutz eigener Art genießen.
 e. (Urheber)Persönlichkeitsrechte bleiben - soweit sie bestehen - von dieser
 Lizenz unberührt.
 
-   5. Gewährleistung
+5. Gewährleistung
 
 SOFERN KEINE ANDERS LAUTENDE, SCHRIFTLICHE VEREINBARUNG ZWISCHEN DEM LIZENZGEBER
 UND IHNEN GESCHLOSSEN WURDE UND SOWEIT MÄNGEL NICHT ARGLISTIG VERSCHWIEGEN
@@ -286,7 +288,7 @@ ERKENNBARKEIT FÜR DEN LIZENZGEBER, DIE VERKEHRSFÄHIGKEIT DES SCHUTZGEGENSTANDE
 SEINE VERWENDBARKEIT FÜR EINEN BESTIMMTEN ZWECK SOWIE DIE KORREKTHEIT VON
 BESCHREIBUNGEN.
 
-   6. Haftungsbeschränkung
+6. Haftungsbeschränkung
 
 ÜBER DIE IN ZIFFER 5 GENANNTE GEWÄHRLEISTUNG HINAUS HAFTET DER LIZENZGEBER
 IHNEN GEGENÜBER FÜR SCHÄDEN JEGLICHER ART NUR BEI GROBER FAHRLÄSSIGKEIT ODER
@@ -294,7 +296,7 @@ VORSATZ, UND ÜBERNIMMT DARÜBER HINAUS KEINERLEI FREIWILLIGE HAFTUNG FÜR FOLGE
 ODER ANDERE SCHÄDEN, AUCH WENN ER ÜBER DIE MÖGLICHKEIT IHRES EINTRITTS UNTERRICHTET
 WURDE.
 
-   7. Erlöschen
+7. Erlöschen
 
 a. Diese Lizenz und die durch sie erteilte Nutzungsbewilligung erlöschen mit
 Wirkung für die Zukunft im Falle eines Verstoßes gegen die Lizenzbedingungen
@@ -317,7 +319,7 @@ Lizenz bereits erfolgt ist bzw. zukünftig noch erfolgen muss) dient und diese
 Lizenz unter Berücksichtigung der oben zum Erlöschen genannten Bedingungen
 vollumfänglich wirksam bleibt.
 
-   8. Sonstige Bestimmungen
+8. Sonstige Bestimmungen
 
 a. Jedes Mal wenn Sie den Schutzgegenstand für sich genommen oder als Teil
 eines Sammelwerkes verbreiten oder öffentlich wiedergeben, bietet der Lizenzgeber
diff --git a/options/license/CC-BY-SA-4.0 b/options/license/CC-BY-SA-4.0
index f50cdd32a0..4dfebb88f6 100644
--- a/options/license/CC-BY-SA-4.0
+++ b/options/license/CC-BY-SA-4.0
@@ -1,12 +1,13 @@
-Creative Commons Attribution-ShareAlike 4.0 International Creative Commons
-Corporation ("Creative Commons") is not a law firm and does not provide legal
-services or legal advice. Distribution of Creative Commons public licenses
-does not create a lawyer-client or other relationship. Creative Commons makes
-its licenses and related information available on an "as-is" basis. Creative
-Commons gives no warranties regarding its licenses, any material licensed
-under their terms and conditions, or any related information. Creative Commons
-disclaims all liability for damages resulting from their use to the fullest
-extent possible.
+Creative Commons Attribution-ShareAlike 4.0 International
+
+Creative Commons Corporation (“Creative Commons”) is not a law firm and does
+not provide legal services or legal advice. Distribution of Creative Commons
+public licenses does not create a lawyer-client or other relationship. Creative
+Commons makes its licenses and related information available on an “as-is”
+basis. Creative Commons gives no warranties regarding its licenses, any material
+licensed under their terms and conditions, or any related information. Creative
+Commons disclaims all liability for damages resulting from their use to the
+fullest extent possible.
 
 Using Creative Commons Public Licenses
 
@@ -25,11 +26,11 @@ they choose before applying it. Licensors should also secure all rights necessar
 before applying our licenses so that the public can reuse the material as
 expected. Licensors should clearly mark any material not subject to the license.
 This includes other CC-licensed material, or material used under an exception
-or limitation to copyright. More considerations for licensors : wiki.creativecommons.org/Considerations_for_licensors
+or limitation to copyright. More considerations for licensors.
 
 Considerations for the public: By using one of our public licenses, a licensor
 grants the public permission to use the licensed material under specified
-terms and conditions. If the licensor's permission is not necessary for any
+terms and conditions. If the licensor’s permission is not necessary for any
 reason–for example, because of any applicable exception or limitation to copyright–then
 that use is not regulated by the license. Our licenses grant only permissions
 under copyright and certain other rights that a licensor has authority to
@@ -39,7 +40,7 @@ licensor may make special requests, such as asking that all changes be marked
 or described.
 
 Although not required by our licenses, you are encouraged to respect those
-requests where reasonable. More considerations for the public : wiki.creativecommons.org/Considerations_for_licensees
+requests where reasonable. More considerations for the public.
 
 Creative Commons Attribution-ShareAlike 4.0 International Public License
 
@@ -54,7 +55,7 @@ conditions.
 
 Section 1 – Definitions.
 
-a. Adapted Material means material subject to Copyright and Similar Rights
+a.	Adapted Material means material subject to Copyright and Similar Rights
 that is derived from or based upon the Licensed Material and in which the
 Licensed Material is translated, altered, arranged, transformed, or otherwise
 modified in a manner requiring permission under the Copyright and Similar
@@ -63,77 +64,77 @@ Licensed Material is a musical work, performance, or sound recording, Adapted
 Material is always produced where the Licensed Material is synched in timed
 relation with a moving image.
 
-b. Adapter's License means the license You apply to Your Copyright and Similar
+b.	Adapter's License means the license You apply to Your Copyright and Similar
 Rights in Your contributions to Adapted Material in accordance with the terms
 and conditions of this Public License.
 
-c. BY-SA Compatible License means a license listed at creativecommons.org/compatiblelicenses,
+c.	BY-SA Compatible License means a license listed at creativecommons.org/compatiblelicenses,
 approved by Creative Commons as essentially the equivalent of this Public
 License.
 
-d. Copyright and Similar Rights means copyright and/or similar rights closely
+d.	Copyright and Similar Rights means copyright and/or similar rights closely
 related to copyright including, without limitation, performance, broadcast,
 sound recording, and Sui Generis Database Rights, without regard to how the
 rights are labeled or categorized. For purposes of this Public License, the
 rights specified in Section 2(b)(1)-(2) are not Copyright and Similar Rights.
 
-e. Effective Technological Measures means those measures that, in the absence
+e.	Effective Technological Measures means those measures that, in the absence
 of proper authority, may not be circumvented under laws fulfilling obligations
 under Article 11 of the WIPO Copyright Treaty adopted on December 20, 1996,
 and/or similar international agreements.
 
-f. Exceptions and Limitations means fair use, fair dealing, and/or any other
+f.	Exceptions and Limitations means fair use, fair dealing, and/or any other
 exception or limitation to Copyright and Similar Rights that applies to Your
 use of the Licensed Material.
 
-g. License Elements means the license attributes listed in the name of a Creative
+g.	License Elements means the license attributes listed in the name of a Creative
 Commons Public License. The License Elements of this Public License are Attribution
 and ShareAlike.
 
-h. Licensed Material means the artistic or literary work, database, or other
+h.	Licensed Material means the artistic or literary work, database, or other
 material to which the Licensor applied this Public License.
 
-i. Licensed Rights means the rights granted to You subject to the terms and
+i.	Licensed Rights means the rights granted to You subject to the terms and
 conditions of this Public License, which are limited to all Copyright and
 Similar Rights that apply to Your use of the Licensed Material and that the
 Licensor has authority to license.
 
-j. Licensor means the individual(s) or entity(ies) granting rights under this
+j.	Licensor means the individual(s) or entity(ies) granting rights under this
 Public License.
 
-k. Share means to provide material to the public by any means or process that
+k.	Share means to provide material to the public by any means or process that
 requires permission under the Licensed Rights, such as reproduction, public
 display, public performance, distribution, dissemination, communication, or
 importation, and to make material available to the public including in ways
 that members of the public may access the material from a place and at a time
 individually chosen by them.
 
-l. Sui Generis Database Rights means rights other than copyright resulting
+l.	Sui Generis Database Rights means rights other than copyright resulting
 from Directive 96/9/EC of the European Parliament and of the Council of 11
 March 1996 on the legal protection of databases, as amended and/or succeeded,
 as well as other essentially equivalent rights anywhere in the world.
 
-m. You means the individual or entity exercising the Licensed Rights under
+m.	You means the individual or entity exercising the Licensed Rights under
 this Public License. Your has a corresponding meaning.
 
 Section 2 – Scope.
 
-   a. License grant.
+     a.	License grant.
 
 1. Subject to the terms and conditions of this Public License, the Licensor
 hereby grants You a worldwide, royalty-free, non-sublicensable, non-exclusive,
 irrevocable license to exercise the Licensed Rights in the Licensed Material
 to:
 
-         A. reproduce and Share the Licensed Material, in whole or in part; and
+A. reproduce and Share the Licensed Material, in whole or in part; and
 
-         B. produce, reproduce, and Share Adapted Material.
+               B. produce, reproduce, and Share Adapted Material.
 
 2. Exceptions and Limitations. For the avoidance of doubt, where Exceptions
 and Limitations apply to Your use, this Public License does not apply, and
 You do not need to comply with its terms and conditions.
 
-      3. Term. The term of this Public License is specified in Section 6(a).
+3. Term. The term of this Public License is specified in Section 6(a).
 
 4. Media and formats; technical modifications allowed. The Licensor authorizes
 You to exercise the Licensed Rights in all media and formats whether now known
@@ -145,7 +146,7 @@ Effective Technological Measures. For purposes of this Public License, simply
 making modifications authorized by this Section 2(a)(4) never produces Adapted
 Material.
 
-      5. Downstream recipients.
+          5. Downstream recipients.
 
 A. Offer from the Licensor – Licensed Material. Every recipient of the Licensed
 Material automatically receives an offer from the Licensor to exercise the
@@ -154,7 +155,7 @@ Licensed Rights under the terms and conditions of this Public License.
 B. Additional offer from the Licensor – Adapted Material. Every recipient
 of Adapted Material from You automatically receives an offer from the Licensor
 to exercise the Licensed Rights in the Adapted Material under the conditions
-of the Adapter's License You apply.
+of the Adapter’s License You apply.
 
 C. No downstream restrictions. You may not offer or impose any additional
 or different terms or conditions on, or apply any Effective Technological
@@ -167,7 +168,7 @@ Material is, connected with, or sponsored, endorsed, or granted official status
 by, the Licensor or others designated to receive attribution as provided in
 Section 3(a)(1)(A)(i).
 
-   b. Other rights.
+     b.	Other rights.
 
 1. Moral rights, such as the right of integrity, are not licensed under this
 Public License, nor are publicity, privacy, and/or other similar personality
@@ -188,24 +189,24 @@ Section 3 – License Conditions.
 Your exercise of the Licensed Rights is expressly made subject to the following
 conditions.
 
-   a. Attribution.
+     a.	Attribution.
 
 1. If You Share the Licensed Material (including in modified form), You must:
 
 A. retain the following if it is supplied by the Licensor with the Licensed
 Material:
 
-i. identification of the creator(s) of the Licensed Material and any others
+i.	identification of the creator(s) of the Licensed Material and any others
 designated to receive attribution, in any reasonable manner requested by the
 Licensor (including by pseudonym if designated);
 
-            ii. a copyright notice;
+                    ii.	a copyright notice;
 
-            iii. a notice that refers to this Public License;
+                    iii. a notice that refers to this Public License;
 
-            iv. a notice that refers to the disclaimer of warranties;
+                    iv.	a notice that refers to the disclaimer of warranties;
 
-v. a URI or hyperlink to the Licensed Material to the extent reasonably practicable;
+v.	a URI or hyperlink to the Licensed Material to the extent reasonably practicable;
 
 B. indicate if You modified the Licensed Material and retain an indication
 of any previous modifications; and
@@ -221,10 +222,10 @@ URI or hyperlink to a resource that includes the required information.
 3. If requested by the Licensor, You must remove any of the information required
 by Section 3(a)(1)(A) to the extent reasonably practicable.
 
-b. ShareAlike.In addition to the conditions in Section 3(a), if You Share
+b.	ShareAlike.In addition to the conditions in Section 3(a), if You Share
 Adapted Material You produce, the following conditions also apply.
 
-1. The Adapter's License You apply must be a Creative Commons license with
+1. The Adapter’s License You apply must be a Creative Commons license with
 the same License Elements, this version or later, or a BY-SA Compatible License.
 
 2. You must include the text of, or the URI or hyperlink to, the Adapter's
@@ -240,25 +241,24 @@ Section 4 – Sui Generis Database Rights.
 Where the Licensed Rights include Sui Generis Database Rights that apply to
 Your use of the Licensed Material:
 
-a. for the avoidance of doubt, Section 2(a)(1) grants You the right to extract,
+a.	for the avoidance of doubt, Section 2(a)(1) grants You the right to extract,
 reuse, reproduce, and Share all or a substantial portion of the contents of
 the database;
 
-b. if You include all or a substantial portion of the database contents in
+b.	if You include all or a substantial portion of the database contents in
 a database in which You have Sui Generis Database Rights, then the database
 in which You have Sui Generis Database Rights (but not its individual contents)
 is Adapted Material, including for purposes of Section 3(b); and
 
-c. You must comply with the conditions in Section 3(a) if You Share all or
+c.	You must comply with the conditions in Section 3(a) if You Share all or
 a substantial portion of the contents of the database.
-
 For the avoidance of doubt, this Section 4 supplements and does not replace
 Your obligations under this Public License where the Licensed Rights include
 other Copyright and Similar Rights.
 
 Section 5 – Disclaimer of Warranties and Limitation of Liability.
 
-a. Unless otherwise separately undertaken by the Licensor, to the extent possible,
+a.	Unless otherwise separately undertaken by the Licensor, to the extent possible,
 the Licensor offers the Licensed Material as-is and as-available, and makes
 no representations or warranties of any kind concerning the Licensed Material,
 whether express, implied, statutory, or other. This includes, without limitation,
@@ -267,7 +267,7 @@ absence of latent or other defects, accuracy, or the presence or absence of
 errors, whether or not known or discoverable. Where disclaimers of warranties
 are not allowed in full or in part, this disclaimer may not apply to You.
 
-b. To the extent possible, in no event will the Licensor be liable to You
+b.	To the extent possible, in no event will the Licensor be liable to You
 on any legal theory (including, without limitation, negligence) or otherwise
 for any direct, special, indirect, incidental, consequential, punitive, exemplary,
 or other losses, costs, expenses, or damages arising out of this Public License
@@ -276,75 +276,74 @@ the possibility of such losses, costs, expenses, or damages. Where a limitation
 of liability is not allowed in full or in part, this limitation may not apply
 to You.
 
-c. The disclaimer of warranties and limitation of liability provided above
+c.	The disclaimer of warranties and limitation of liability provided above
 shall be interpreted in a manner that, to the extent possible, most closely
 approximates an absolute disclaimer and waiver of all liability.
 
 Section 6 – Term and Termination.
 
-a. This Public License applies for the term of the Copyright and Similar Rights
+a.	This Public License applies for the term of the Copyright and Similar Rights
 licensed here. However, if You fail to comply with this Public License, then
 Your rights under this Public License terminate automatically.
 
-b. Where Your right to use the Licensed Material has terminated under Section
+b.	Where Your right to use the Licensed Material has terminated under Section
 6(a), it reinstates:
 
 1. automatically as of the date the violation is cured, provided it is cured
 within 30 days of Your discovery of the violation; or
 
-      2. upon express reinstatement by the Licensor.
+          2. upon express reinstatement by the Licensor.
 
-c. For the avoidance of doubt, this Section 6(b) does not affect any right
+c.	For the avoidance of doubt, this Section 6(b) does not affect any right
 the Licensor may have to seek remedies for Your violations of this Public
 License.
 
-d. For the avoidance of doubt, the Licensor may also offer the Licensed Material
+d.	For the avoidance of doubt, the Licensor may also offer the Licensed Material
 under separate terms or conditions or stop distributing the Licensed Material
 at any time; however, doing so will not terminate this Public License.
 
-   e. Sections 1, 5, 6, 7, and 8 survive termination of this Public License.
+     e.	Sections 1, 5, 6, 7, and 8 survive termination of this Public License.
 
 Section 7 – Other Terms and Conditions.
 
-a. The Licensor shall not be bound by any additional or different terms or
+a.	The Licensor shall not be bound by any additional or different terms or
 conditions communicated by You unless expressly agreed.
 
-b. Any arrangements, understandings, or agreements regarding the Licensed
+b.	Any arrangements, understandings, or agreements regarding the Licensed
 Material not stated herein are separate from and independent of the terms
 and conditions of this Public License.
 
 Section 8 – Interpretation.
 
-a. For the avoidance of doubt, this Public License does not, and shall not
+a.	For the avoidance of doubt, this Public License does not, and shall not
 be interpreted to, reduce, limit, restrict, or impose conditions on any use
 of the Licensed Material that could lawfully be made without permission under
 this Public License.
 
-b. To the extent possible, if any provision of this Public License is deemed
+b.	To the extent possible, if any provision of this Public License is deemed
 unenforceable, it shall be automatically reformed to the minimum extent necessary
 to make it enforceable. If the provision cannot be reformed, it shall be severed
 from this Public License without affecting the enforceability of the remaining
 terms and conditions.
 
-c. No term or condition of this Public License will be waived and no failure
+c.	No term or condition of this Public License will be waived and no failure
 to comply consented to unless expressly agreed to by the Licensor.
 
-d. Nothing in this Public License constitutes or may be interpreted as a limitation
+d.	Nothing in this Public License constitutes or may be interpreted as a limitation
 upon, or waiver of, any privileges and immunities that apply to the Licensor
 or You, including from the legal processes of any jurisdiction or authority.
 
 Creative Commons is not a party to its public licenses. Notwithstanding, Creative
 Commons may elect to apply one of its public licenses to material it publishes
-and in those instances will be considered the "Licensor." The text of the
-Creative Commons public licenses is dedicated to the public domain under the
-CC0 Public Domain Dedication. Except for the limited purpose of indicating
-that material is shared under a Creative Commons public license or as otherwise
-permitted by the Creative Commons policies published at creativecommons.org/policies,
-Creative Commons does not authorize the use of the trademark "Creative Commons"
-or any other trademark or logo of Creative Commons without its prior written
-consent including, without limitation, in connection with any unauthorized
-modifications to any of its public licenses or any other arrangements, understandings,
-or agreements concerning use of licensed material. For the avoidance of doubt,
-this paragraph does not form part of the public licenses.
+and in those instances will be considered the “Licensor.” Except for the limited
+purpose of indicating that material is shared under a Creative Commons public
+license or as otherwise permitted by the Creative Commons policies published
+at creativecommons.org/policies, Creative Commons does not authorize the use
+of the trademark “Creative Commons” or any other trademark or logo of Creative
+Commons without its prior written consent including, without limitation, in
+connection with any unauthorized modifications to any of its public licenses
+or any other arrangements, understandings, or agreements concerning use of
+licensed material. For the avoidance of doubt, this paragraph does not form
+part of the public licenses.
 
 Creative Commons may be contacted at creativecommons.org.
diff --git a/options/license/CC-PDDC b/options/license/CC-PDDC
index 9e675aeb9a..60d51ba25b 100644
--- a/options/license/CC-PDDC
+++ b/options/license/CC-PDDC
@@ -1,3 +1,4 @@
+
 The person or persons who have associated work with this document (the "Dedicator"
 or "Certifier") hereby either (a) certifies that, to the best of his knowledge,
 the work of authorship identified is in the public domain of the country from
diff --git a/options/license/CC0-1.0 b/options/license/CC0-1.0
index a343ccd433..0e259d42c9 100644
--- a/options/license/CC0-1.0
+++ b/options/license/CC0-1.0
@@ -1,119 +1,121 @@
 Creative Commons Legal Code
 
-CC0 1.0 Universal CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES
-NOT PROVIDE LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE
-AN ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS INFORMATION
-ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE USE
-OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED HEREUNDER, AND DISCLAIMS
-LIABILITY FOR DAMAGES RESULTING FROM THE USE OF THIS DOCUMENT OR THE INFORMATION
-OR WORKS PROVIDED HEREUNDER.
+CC0 1.0 Universal
+
+    CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
+    LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN
+    ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
+    INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
+    REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS
+    PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM
+    THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED
+    HEREUNDER.
 
 Statement of Purpose
 
-The laws of most jurisdictions throughout the world automatically confer exclusive
-Copyright and Related Rights (defined below) upon the creator and subsequent
-owner(s) (each and all, an "owner") of an original work of authorship and/or
-a database (each, a "Work").
+The laws of most jurisdictions throughout the world automatically confer
+exclusive Copyright and Related Rights (defined below) upon the creator
+and subsequent owner(s) (each and all, an "owner") of an original work of
+authorship and/or a database (each, a "Work").
 
-Certain owners wish to permanently relinquish those rights to a Work for the
-purpose of contributing to a commons of creative, cultural and scientific
-works ("Commons") that the public can reliably and without fear of later claims
-of infringement build upon, modify, incorporate in other works, reuse and
-redistribute as freely as possible in any form whatsoever and for any purposes,
-including without limitation commercial purposes. These owners may contribute
-to the Commons to promote the ideal of a free culture and the further production
-of creative, cultural and scientific works, or to gain reputation or greater
-distribution for their Work in part through the use and efforts of others.
+Certain owners wish to permanently relinquish those rights to a Work for
+the purpose of contributing to a commons of creative, cultural and
+scientific works ("Commons") that the public can reliably and without fear
+of later claims of infringement build upon, modify, incorporate in other
+works, reuse and redistribute as freely as possible in any form whatsoever
+and for any purposes, including without limitation commercial purposes.
+These owners may contribute to the Commons to promote the ideal of a free
+culture and the further production of creative, cultural and scientific
+works, or to gain reputation or greater distribution for their Work in
+part through the use and efforts of others.
 
-For these and/or other purposes and motivations, and without any expectation
-of additional consideration or compensation, the person associating CC0 with
-a Work (the "Affirmer"), to the extent that he or she is an owner of Copyright
-and Related Rights in the Work, voluntarily elects to apply CC0 to the Work
-and publicly distribute the Work under its terms, with knowledge of his or
-her Copyright and Related Rights in the Work and the meaning and intended
-legal effect of CC0 on those rights.
+For these and/or other purposes and motivations, and without any
+expectation of additional consideration or compensation, the person
+associating CC0 with a Work (the "Affirmer"), to the extent that he or she
+is an owner of Copyright and Related Rights in the Work, voluntarily
+elects to apply CC0 to the Work and publicly distribute the Work under its
+terms, with knowledge of his or her Copyright and Related Rights in the
+Work and the meaning and intended legal effect of CC0 on those rights.
 
-1. Copyright and Related Rights. A Work made available under CC0 may be protected
-by copyright and related or neighboring rights ("Copyright and Related Rights").
-Copyright and Related Rights include, but are not limited to, the following:
+1. Copyright and Related Rights. A Work made available under CC0 may be
+protected by copyright and related or neighboring rights ("Copyright and
+Related Rights"). Copyright and Related Rights include, but are not
+limited to, the following:
 
-i. the right to reproduce, adapt, distribute, perform, display, communicate,
-and translate a Work;
+  i. the right to reproduce, adapt, distribute, perform, display,
+     communicate, and translate a Work;
+ ii. moral rights retained by the original author(s) and/or performer(s);
+iii. publicity and privacy rights pertaining to a person's image or
+     likeness depicted in a Work;
+ iv. rights protecting against unfair competition in regards to a Work,
+     subject to the limitations in paragraph 4(a), below;
+  v. rights protecting the extraction, dissemination, use and reuse of data
+     in a Work;
+ vi. database rights (such as those arising under Directive 96/9/EC of the
+     European Parliament and of the Council of 11 March 1996 on the legal
+     protection of databases, and under any national implementation
+     thereof, including any amended or successor version of such
+     directive); and
+vii. other similar, equivalent or corresponding rights throughout the
+     world based on applicable law or treaty, and any national
+     implementations thereof.
 
-      ii. moral rights retained by the original author(s) and/or performer(s);
-
-iii. publicity and privacy rights pertaining to a person's image or likeness
-depicted in a Work;
-
-iv. rights protecting against unfair competition in regards to a Work, subject
-to the limitations in paragraph 4(a), below;
-
-v. rights protecting the extraction, dissemination, use and reuse of data
-in a Work;
-
-vi. database rights (such as those arising under Directive 96/9/EC of the
-European Parliament and of the Council of 11 March 1996 on the legal protection
-of databases, and under any national implementation thereof, including any
-amended or successor version of such directive); and
-
-vii. other similar, equivalent or corresponding rights throughout the world
-based on applicable law or treaty, and any national implementations thereof.
-
-2. Waiver. To the greatest extent permitted by, but not in contravention of,
-applicable law, Affirmer hereby overtly, fully, permanently, irrevocably and
-unconditionally waives, abandons, and surrenders all of Affirmer's Copyright
-and Related Rights and associated claims and causes of action, whether now
-known or unknown (including existing as well as future claims and causes of
-action), in the Work (i) in all territories worldwide, (ii) for the maximum
-duration provided by applicable law or treaty (including future time extensions),
-(iii) in any current or future medium and for any number of copies, and (iv)
-for any purpose whatsoever, including without limitation commercial, advertising
-or promotional purposes (the "Waiver"). Affirmer makes the Waiver for the
-benefit of each member of the public at large and to the detriment of Affirmer's
-heirs and successors, fully intending that such Waiver shall not be subject
-to revocation, rescission, cancellation, termination, or any other legal or
+2. Waiver. To the greatest extent permitted by, but not in contravention
+of, applicable law, Affirmer hereby overtly, fully, permanently,
+irrevocably and unconditionally waives, abandons, and surrenders all of
+Affirmer's Copyright and Related Rights and associated claims and causes
+of action, whether now known or unknown (including existing as well as
+future claims and causes of action), in the Work (i) in all territories
+worldwide, (ii) for the maximum duration provided by applicable law or
+treaty (including future time extensions), (iii) in any current or future
+medium and for any number of copies, and (iv) for any purpose whatsoever,
+including without limitation commercial, advertising or promotional
+purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each
+member of the public at large and to the detriment of Affirmer's heirs and
+successors, fully intending that such Waiver shall not be subject to
+revocation, rescission, cancellation, termination, or any other legal or
 equitable action to disrupt the quiet enjoyment of the Work by the public
 as contemplated by Affirmer's express Statement of Purpose.
 
-3. Public License Fallback. Should any part of the Waiver for any reason be
-judged legally invalid or ineffective under applicable law, then the Waiver
-shall be preserved to the maximum extent permitted taking into account Affirmer's
-express Statement of Purpose. In addition, to the extent the Waiver is so
-judged Affirmer hereby grants to each affected person a royalty-free, non
-transferable, non sublicensable, non exclusive, irrevocable and unconditional
-license to exercise Affirmer's Copyright and Related Rights in the Work (i)
-in all territories worldwide, (ii) for the maximum duration provided by applicable
-law or treaty (including future time extensions), (iii) in any current or
-future medium and for any number of copies, and (iv) for any purpose whatsoever,
-including without limitation commercial, advertising or promotional purposes
-(the "License"). The License shall be deemed effective as of the date CC0
-was applied by Affirmer to the Work. Should any part of the License for any
+3. Public License Fallback. Should any part of the Waiver for any reason
+be judged legally invalid or ineffective under applicable law, then the
+Waiver shall be preserved to the maximum extent permitted taking into
+account Affirmer's express Statement of Purpose. In addition, to the
+extent the Waiver is so judged Affirmer hereby grants to each affected
+person a royalty-free, non transferable, non sublicensable, non exclusive,
+irrevocable and unconditional license to exercise Affirmer's Copyright and
+Related Rights in the Work (i) in all territories worldwide, (ii) for the
+maximum duration provided by applicable law or treaty (including future
+time extensions), (iii) in any current or future medium and for any number
+of copies, and (iv) for any purpose whatsoever, including without
+limitation commercial, advertising or promotional purposes (the
+"License"). The License shall be deemed effective as of the date CC0 was
+applied by Affirmer to the Work. Should any part of the License for any
 reason be judged legally invalid or ineffective under applicable law, such
-partial invalidity or ineffectiveness shall not invalidate the remainder of
-the License, and in such case Affirmer hereby affirms that he or she will
-not (i) exercise any of his or her remaining Copyright and Related Rights
-in the Work or (ii) assert any associated claims and causes of action with
-respect to the Work, in either case contrary to Affirmer's express Statement
-of Purpose.
+partial invalidity or ineffectiveness shall not invalidate the remainder
+of the License, and in such case Affirmer hereby affirms that he or she
+will not (i) exercise any of his or her remaining Copyright and Related
+Rights in the Work or (ii) assert any associated claims and causes of
+action with respect to the Work, in either case contrary to Affirmer's
+express Statement of Purpose.
 
-   4. Limitations and Disclaimers.
+4. Limitations and Disclaimers.
 
-a. No trademark or patent rights held by Affirmer are waived, abandoned, surrendered,
-licensed or otherwise affected by this document.
-
-b. Affirmer offers the Work as-is and makes no representations or warranties
-of any kind concerning the Work, express, implied, statutory or otherwise,
-including without limitation warranties of title, merchantability, fitness
-for a particular purpose, non infringement, or the absence of latent or other
-defects, accuracy, or the present or absence of errors, whether or not discoverable,
-all to the greatest extent permissible under applicable law.
-
-c. Affirmer disclaims responsibility for clearing rights of other persons
-that may apply to the Work or any use thereof, including without limitation
-any person's Copyright and Related Rights in the Work. Further, Affirmer disclaims
-responsibility for obtaining any necessary consents, permissions or other
-rights required for any use of the Work.
-
-d. Affirmer understands and acknowledges that Creative Commons is not a party
-to this document and has no duty or obligation with respect to this CC0 or
-use of the Work.
+ a. No trademark or patent rights held by Affirmer are waived, abandoned,
+    surrendered, licensed or otherwise affected by this document.
+ b. Affirmer offers the Work as-is and makes no representations or
+    warranties of any kind concerning the Work, express, implied,
+    statutory or otherwise, including without limitation warranties of
+    title, merchantability, fitness for a particular purpose, non
+    infringement, or the absence of latent or other defects, accuracy, or
+    the present or absence of errors, whether or not discoverable, all to
+    the greatest extent permissible under applicable law.
+ c. Affirmer disclaims responsibility for clearing rights of other persons
+    that may apply to the Work or any use thereof, including without
+    limitation any person's Copyright and Related Rights in the Work.
+    Further, Affirmer disclaims responsibility for obtaining any necessary
+    consents, permissions or other rights required for any use of the
+    Work.
+ d. Affirmer understands and acknowledges that Creative Commons is not a
+    party to this document and has no duty or obligation with respect to
+    this CC0 or use of the Work.
diff --git a/options/license/CDDL-1.0 b/options/license/CDDL-1.0
index 4070a78674..8d88c97467 100644
--- a/options/license/CDDL-1.0
+++ b/options/license/CDDL-1.0
@@ -1,36 +1,35 @@
 COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL)
-
 Version 1.0
 
-   1. Definitions.
+1. Definitions.
 
-1.1. "Contributor" means each individual or entity that creates or contributes
+1.1. “Contributor” means each individual or entity that creates or contributes
 to the creation of Modifications.
 
-1.2. "Contributor Version" means the combination of the Original Software,
+1.2. “Contributor Version” means the combination of the Original Software,
 prior Modifications used by a Contributor (if any), and the Modifications
 made by that particular Contributor.
 
-1.3. "Covered Software" means (a) the Original Software, or (b) Modifications,
+1.3. “Covered Software” means (a) the Original Software, or (b) Modifications,
 or (c) the combination of files containing Original Software with files containing
 Modifications, in each case including portions thereof.
 
-1.4. "Executable" means the Covered Software in any form other than Source
+1.4. “Executable” means the Covered Software in any form other than Source
 Code.
 
-1.5. "Initial Developer" means the individual or entity that first makes Original
+1.5. “Initial Developer” means the individual or entity that first makes Original
 Software available under this License.
 
-1.6. "Larger Work" means a work which combines Covered Software or portions
+1.6. “Larger Work” means a work which combines Covered Software or portions
 thereof with code not governed by the terms of this License.
 
-      1.7. "License" means this document.
+1.7. “License” means this document.
 
-1.8. "Licensable" means having the right to grant, to the maximum extent possible,
+1.8. “Licensable” means having the right to grant, to the maximum extent possible,
 whether at the time of the initial grant or subsequently acquired, any and
 all of the rights conveyed herein.
 
-1.9. "Modifications" means the Source Code and Executable form of any of the
+1.9. “Modifications” means the Source Code and Executable form of any of the
 following:
 
 A. Any file that results from an addition to, deletion from or modification
@@ -42,29 +41,28 @@ Modification; or
 C. Any new file that is contributed or otherwise made available under the
 terms of this License.
 
-1.10. "Original Software" means the Source Code and Executable form of computer
+1.10. “Original Software” means the Source Code and Executable form of computer
 software code that is originally released under this License.
 
-1.11. "Patent Claims" means any patent claim(s), now owned or hereafter acquired,
+1.11. “Patent Claims” means any patent claim(s), now owned or hereafter acquired,
 including without limitation, method, process, and apparatus claims, in any
 patent Licensable by grantor.
 
-1.12. "Source Code" means (a) the common form of computer software code in
+1.12. “Source Code” means (a) the common form of computer software code in
 which modifications are made and (b) associated documentation included in
 or with such code.
 
-1.13. "You" (or "Your") means an individual or a legal entity exercising rights
+1.13. “You” (or “Your”) means an individual or a legal entity exercising rights
 under, and complying with all of the terms of, this License. For legal entities,
-"You" includes any entity which controls, is controlled by, or is under common
-control with You. For purposes of this definition, "control" means (a) the
+“You” includes any entity which controls, is controlled by, or is under common
+control with You. For purposes of this definition, “control” means (a) the
 power, direct or indirect, to cause the direction or management of such entity,
 whether by contract or otherwise, or (b) ownership of more than fifty percent
 (50%) of the outstanding shares or beneficial ownership of such entity.
 
-   2. License Grants.
-
-      2.1. The Initial Developer Grant.
+2. License Grants.
 
+2.1. The Initial Developer Grant.
 Conditioned upon Your compliance with Section 3.1 below and subject to third
 party intellectual property claims, the Initial Developer hereby grants You
 a world-wide, royalty-free, non-exclusive license:
@@ -87,8 +85,7 @@ for code that You delete from the Original Software, or (2) for infringements
 caused by: (i) the modification of the Original Software, or (ii) the combination
 of the Original Software with other software or devices.
 
-      2.2. Contributor Grant.
-
+2.2. Contributor Grant.
 Conditioned upon Your compliance with Section 3.1 below and subject to third
 party intellectual property claims, each Contributor hereby grants You a world-wide,
 royalty-free, non-exclusive license:
@@ -118,10 +115,9 @@ with other software (except as part of the Contributor Version) or other devices
 or (3) under Patent Claims infringed by Covered Software in the absence of
 Modifications made by that Contributor.
 
-   3. Distribution Obligations.
-
-      3.1. Availability of Source Code.
+3. Distribution Obligations.
 
+3.1. Availability of Source Code.
 Any Covered Software that You distribute or otherwise make available in Executable
 form must also be made available in Source Code form and that Source Code
 form must be distributed only under the terms of this License. You must include
@@ -131,26 +127,23 @@ of any such Covered Software in Executable form as to how they can obtain
 such Covered Software in Source Code form in a reasonable manner on or through
 a medium customarily used for software exchange.
 
-      3.2. Modifications.
-
+3.2. Modifications.
 The Modifications that You create or to which You contribute are governed
 by the terms of this License. You represent that You believe Your Modifications
 are Your original creation(s) and/or You have sufficient rights to grant the
 rights conveyed by this License.
 
-      3.3. Required Notices.
-
+3.3. Required Notices.
 You must include a notice in each of Your Modifications that identifies You
 as the Contributor of the Modification. You may not remove or alter any copyright,
 patent or trademark notices contained within the Covered Software, or any
 notices of licensing or any descriptive text giving attribution to any Contributor
 or the Initial Developer.
 
-      3.4. Application of Additional Terms.
-
+3.4. Application of Additional Terms.
 You may not offer or impose any terms on any Covered Software in Source Code
 form that alters or restricts the applicable version of this License or the
-recipients' rights hereunder. You may choose to offer, and to charge a fee
+recipients’ rights hereunder. You may choose to offer, and to charge a fee
 for, warranty, support, indemnity or liability obligations to one or more
 recipients of Covered Software. However, you may do so only on Your own behalf,
 and not on behalf of the Initial Developer or any Contributor. You must make
@@ -160,13 +153,12 @@ Initial Developer and every Contributor for any liability incurred by the
 Initial Developer or such Contributor as a result of warranty, support, indemnity
 or liability terms You offer.
 
-      3.5. Distribution of Executable Versions.
-
+3.5. Distribution of Executable Versions.
 You may distribute the Executable form of the Covered Software under the terms
 of this License or under the terms of a license of Your choice, which may
 contain terms different from this License, provided that You are in compliance
 with the terms of this License and that the license for the Executable form
-does not attempt to limit or alter the recipient's rights in the Source Code
+does not attempt to limit or alter the recipient’s rights in the Source Code
 form from the rights set forth in this License. If You distribute the Covered
 Software in Executable form under a different license, You must make it absolutely
 clear that any terms which differ from this License are offered by You alone,
@@ -175,24 +167,21 @@ the Initial Developer and every Contributor for any liability incurred by
 the Initial Developer or such Contributor as a result of any such terms You
 offer.
 
-      3.6. Larger Works.
-
+3.6. Larger Works.
 You may create a Larger Work by combining Covered Software with other code
 not governed by the terms of this License and distribute the Larger Work as
 a single product. In such a case, You must make sure the requirements of this
 License are fulfilled for the Covered Software.
 
-   4. Versions of the License.
-
-      4.1. New Versions.
+4. Versions of the License.
 
+4.1. New Versions.
 Sun Microsystems, Inc. is the initial license steward and may publish revised
 and/or new versions of this License from time to time. Each version will be
 given a distinguishing version number. Except as provided in Section 4.3,
 no one other than the license steward has the right to modify this License.
 
-      4.2. Effect of New Versions.
-
+4.2. Effect of New Versions.
 You may always continue to use, distribute or otherwise make the Covered Software
 available under the terms of the version of the License under which You originally
 received the Covered Software. If the Initial Developer includes a notice
@@ -204,8 +193,7 @@ You may also choose to use, distribute or otherwise make the Covered Software
 available under the terms of any subsequent version of the License published
 by the license steward.
 
-      4.3. Modified Versions.
-
+4.3. Modified Versions.
 When You are an Initial Developer and You want to create a new license for
 Your Original Software, You may create and use a modified version of this
 License if You: (a) rename the license and remove any references to the name
@@ -213,9 +201,9 @@ of the license steward (except to note that the license differs from this
 License); and (b) otherwise make it clear that the license contains terms
 which differ from this License.
 
-   5. DISCLAIMER OF WARRANTY.
+5. DISCLAIMER OF WARRANTY.
 
-COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT
+COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN “AS IS” BASIS, WITHOUT
 WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION,
 WARRANTIES THAT THE COVERED SOFTWARE IS FREE OF DEFECTS, MERCHANTABLE, FIT
 FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY
@@ -225,7 +213,7 @@ CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION.
 THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE.
 NO USE OF ANY COVERED SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
 
-   6. TERMINATION.
+6. TERMINATION.
 
 6.1. This License and the rights granted hereunder will terminate automatically
 if You fail to comply with terms herein and fail to cure such breach within
@@ -234,7 +222,7 @@ must remain in effect beyond the termination of this License shall survive.
 
 6.2. If You assert a patent infringement claim (excluding declaratory judgment
 actions) against Initial Developer or a Contributor (the Initial Developer
-or Contributor against whom You assert such claim is referred to as "Participant")
+or Contributor against whom You assert such claim is referred to as “Participant”)
 alleging that the Participant Software (meaning the Contributor Version where
 the Participant is a Contributor or the Original Software where the Participant
 is the Initial Developer) directly or indirectly infringes any patent, then
@@ -252,7 +240,7 @@ user licenses that have been validly granted by You or any distributor hereunder
 prior to termination (excluding licenses granted to You by any distributor)
 shall survive termination.
 
-   7. LIMITATION OF LIABILITY.
+7. LIMITATION OF LIABILITY.
 
 UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING
 NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER, ANY
@@ -263,36 +251,36 @@ DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE
 OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF
 SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS
 LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL
-INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW
+INJURY RESULTING FROM SUCH PARTY’S 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.
 
-   8. U.S. GOVERNMENT END USERS.
+8. U.S. GOVERNMENT END USERS.
 
-The Covered Software is a "commercial item," as that term is defined in 48
-C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer software" (as
-that term is defined at 48 C.F.R. § 252.227-7014(a)(1)) and "commercial computer
-software documentation" as such terms are used in 48 C.F.R. 12.212 (Sept.
+The Covered Software is a “commercial item,” as that term is defined in 48
+C.F.R. 2.101 (Oct. 1995), consisting of “commercial computer software” (as
+that term is defined at 48 C.F.R. § 252.227-7014(a)(1)) and “commercial computer
+software documentation” as such terms are used in 48 C.F.R. 12.212 (Sept.
 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4
 (June 1995), all U.S. Government End Users acquire Covered Software with only
 those rights set forth herein. This U.S. Government Rights clause is in lieu
 of, and supersedes, any other FAR, DFAR, or other clause or provision that
 addresses Government rights in computer software under this License.
 
-   9. MISCELLANEOUS.
+9. MISCELLANEOUS.
 
 This License represents the complete agreement concerning 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. This
 License shall be governed by the law of the jurisdiction specified in a notice
 contained within the Original Software (except to the extent applicable law,
-if any, provides otherwise), excluding such jurisdiction's conflict-of-law
+if any, provides otherwise), excluding such jurisdiction’s conflict-of-law
 provisions. Any litigation relating to this License shall be subject to the
 jurisdiction of the courts located in the jurisdiction and venue specified
 in a notice contained within the Original Software, with the losing party
 responsible for costs, including, without limitation, court costs and reasonable
-attorneys' fees and expenses. The application of the United Nations Convention
+attorneys’ fees and expenses. The application of the United Nations Convention
 on Contracts for the International Sale of Goods is expressly excluded. Any
 law or regulation which provides that the language of a contract shall be
 construed against the drafter shall not apply to this License. You agree that
@@ -300,7 +288,7 @@ You alone are responsible for compliance with the United States export administr
 regulations (and the export control laws and regulation of any other countries)
 when You use, distribute or otherwise make available any Covered Software.
 
-   10. RESPONSIBILITY FOR CLAIMS.
+10. RESPONSIBILITY FOR CLAIMS.
 
 As between Initial Developer and the Contributors, each party is responsible
 for claims and damages arising, directly or indirectly, out of its utilization
diff --git a/options/license/CDDL-1.1 b/options/license/CDDL-1.1
index f55f2c89d0..c12608d532 100644
--- a/options/license/CDDL-1.1
+++ b/options/license/CDDL-1.1
@@ -1,36 +1,35 @@
 COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL)
-
 Version 1.1
 
-   1. Definitions.
+1. Definitions.
 
-1.1. "Contributor" means each individual or entity that creates or contributes
+1.1. “Contributor” means each individual or entity that creates or contributes
 to the creation of Modifications.
 
-1.2. "Contributor Version" means the combination of the Original Software,
+1.2. “Contributor Version” means the combination of the Original Software,
 prior Modifications used by a Contributor (if any), and the Modifications
 made by that particular Contributor.
 
-1.3. "Covered Software" means (a) the Original Software, or (b) Modifications,
+1.3. “Covered Software” means (a) the Original Software, or (b) Modifications,
 or (c) the combination of files containing Original Software with files containing
 Modifications, in each case including portions thereof.
 
-1.4. "Executable" means the Covered Software in any form other than Source
+1.4. “Executable” means the Covered Software in any form other than Source
 Code.
 
-1.5. "Initial Developer" means the individual or entity that first makes Original
+1.5. “Initial Developer” means the individual or entity that first makes Original
 Software available under this License.
 
-1.6. "Larger Work" means a work which combines Covered Software or portions
+1.6. “Larger Work” means a work which combines Covered Software or portions
 thereof with code not governed by the terms of this License.
 
-      1.7. "License" means this document.
+1.7. “License” means this document.
 
-1.8. "Licensable" means having the right to grant, to the maximum extent possible,
+1.8. “Licensable” means having the right to grant, to the maximum extent possible,
 whether at the time of the initial grant or subsequently acquired, any and
 all of the rights conveyed herein.
 
-1.9. "Modifications" means the Source Code and Executable form of any of the
+1.9. “Modifications” means the Source Code and Executable form of any of the
 following:
 
 A. Any file that results from an addition to, deletion from or modification
@@ -42,29 +41,28 @@ Modification; or
 C. Any new file that is contributed or otherwise made available under the
 terms of this License.
 
-1.10. "Original Software" means the Source Code and Executable form of computer
+1.10. “Original Software” means the Source Code and Executable form of computer
 software code that is originally released under this License.
 
-1.11. "Patent Claims" means any patent claim(s), now owned or hereafter acquired,
+1.11. “Patent Claims” means any patent claim(s), now owned or hereafter acquired,
 including without limitation, method, process, and apparatus claims, in any
 patent Licensable by grantor.
 
-1.12. "Source Code" means (a) the common form of computer software code in
+1.12. “Source Code” means (a) the common form of computer software code in
 which modifications are made and (b) associated documentation included in
 or with such code.
 
-1.13. "You" (or "Your") means an individual or a legal entity exercising rights
+1.13. “You” (or “Your”) means an individual or a legal entity exercising rights
 under, and complying with all of the terms of, this License. For legal entities,
-"You" includes any entity which controls, is controlled by, or is under common
-control with You. For purposes of this definition, "control" means (a) the
+“You” includes any entity which controls, is controlled by, or is under common
+control with You. For purposes of this definition, “control” means (a) the
 power, direct or indirect, to cause the direction or management of such entity,
 whether by contract or otherwise, or (b) ownership of more than fifty percent
 (50%) of the outstanding shares or beneficial ownership of such entity.
 
-   2. License Grants.
-
-      2.1. The Initial Developer Grant.
+2. License Grants.
 
+2.1. The Initial Developer Grant.
 Conditioned upon Your compliance with Section 3.1 below and subject to third
 party intellectual property claims, the Initial Developer hereby grants You
 a world-wide, royalty-free, non-exclusive license:
@@ -87,8 +85,7 @@ for code that You delete from the Original Software, or (2) for infringements
 caused by: (i) the modification of the Original Software, or (ii) the combination
 of the Original Software with other software or devices.
 
-      2.2. Contributor Grant.
-
+2.2. Contributor Grant.
 Conditioned upon Your compliance with Section 3.1 below and subject to third
 party intellectual property claims, each Contributor hereby grants You a world-wide,
 royalty-free, non-exclusive license:
@@ -118,10 +115,9 @@ with other software (except as part of the Contributor Version) or other devices
 or (3) under Patent Claims infringed by Covered Software in the absence of
 Modifications made by that Contributor.
 
-   3. Distribution Obligations.
-
-      3.1. Availability of Source Code.
+3. Distribution Obligations.
 
+3.1. Availability of Source Code.
 Any Covered Software that You distribute or otherwise make available in Executable
 form must also be made available in Source Code form and that Source Code
 form must be distributed only under the terms of this License. You must include
@@ -131,23 +127,20 @@ of any such Covered Software in Executable form as to how they can obtain
 such Covered Software in Source Code form in a reasonable manner on or through
 a medium customarily used for software exchange.
 
-      3.2. Modifications.
-
+3.2. Modifications.
 The Modifications that You create or to which You contribute are governed
 by the terms of this License. You represent that You believe Your Modifications
 are Your original creation(s) and/or You have sufficient rights to grant the
 rights conveyed by this License.
 
-      3.3. Required Notices.
-
+3.3. Required Notices.
 You must include a notice in each of Your Modifications that identifies You
 as the Contributor of the Modification. You may not remove or alter any copyright,
 patent or trademark notices contained within the Covered Software, or any
 notices of licensing or any descriptive text giving attribution to any Contributor
 or the Initial Developer.
 
-      3.4. Application of Additional Terms.
-
+3.4. Application of Additional Terms.
 You may not offer or impose any terms on any Covered Software in Source Code
 form that alters or restricts the applicable version of this License or the
 recipients' rights hereunder. You may choose to offer, and to charge a fee
@@ -160,8 +153,7 @@ Initial Developer and every Contributor for any liability incurred by the
 Initial Developer or such Contributor as a result of warranty, support, indemnity
 or liability terms You offer.
 
-      3.5. Distribution of Executable Versions.
-
+3.5. Distribution of Executable Versions.
 You may distribute the Executable form of the Covered Software under the terms
 of this License or under the terms of a license of Your choice, which may
 contain terms different from this License, provided that You are in compliance
@@ -175,24 +167,21 @@ the Initial Developer and every Contributor for any liability incurred by
 the Initial Developer or such Contributor as a result of any such terms You
 offer.
 
-      3.6. Larger Works.
-
+3.6. Larger Works.
 You may create a Larger Work by combining Covered Software with other code
 not governed by the terms of this License and distribute the Larger Work as
 a single product. In such a case, You must make sure the requirements of this
 License are fulfilled for the Covered Software.
 
-   4. Versions of the License.
-
-      4.1. New Versions.
+4. Versions of the License.
 
+4.1. New Versions.
 Oracle is the initial license steward and may publish revised and/or new versions
 of this License from time to time. Each version will be given a distinguishing
 version number. Except as provided in Section 4.3, no one other than the license
 steward has the right to modify this License.
 
-      4.2. Effect of New Versions.
-
+4.2. Effect of New Versions.
 You may always continue to use, distribute or otherwise make the Covered Software
 available under the terms of the version of the License under which You originally
 received the Covered Software. If the Initial Developer includes a notice
@@ -204,8 +193,7 @@ You may also choose to use, distribute or otherwise make the Covered Software
 available under the terms of any subsequent version of the License published
 by the license steward.
 
-      4.3. Modified Versions.
-
+4.3. Modified Versions.
 When You are an Initial Developer and You want to create a new license for
 Your Original Software, You may create and use a modified version of this
 License if You: (a) rename the license and remove any references to the name
@@ -213,9 +201,8 @@ of the license steward (except to note that the license differs from this
 License); and (b) otherwise make it clear that the license contains terms
 which differ from this License.
 
-   5. DISCLAIMER OF WARRANTY.
-
-COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT
+5. DISCLAIMER OF WARRANTY.
+COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN “AS IS” BASIS, WITHOUT
 WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION,
 WARRANTIES THAT THE COVERED SOFTWARE IS FREE OF DEFECTS, MERCHANTABLE, FIT
 FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY
@@ -225,7 +212,7 @@ CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION.
 THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE.
 NO USE OF ANY COVERED SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
 
-   6. TERMINATION.
+6. TERMINATION.
 
 6.1. This License and the rights granted hereunder will terminate automatically
 if You fail to comply with terms herein and fail to cure such breach within
@@ -234,7 +221,7 @@ must remain in effect beyond the termination of this License shall survive.
 
 6.2. If You assert a patent infringement claim (excluding declaratory judgment
 actions) against Initial Developer or a Contributor (the Initial Developer
-or Contributor against whom You assert such claim is referred to as "Participant")
+or Contributor against whom You assert such claim is referred to as “Participant”)
 alleging that the Participant Software (meaning the Contributor Version where
 the Participant is a Contributor or the Original Software where the Participant
 is the Initial Developer) directly or indirectly infringes any patent, then
@@ -259,7 +246,7 @@ user licenses that have been validly granted by You or any distributor hereunder
 prior to termination (excluding licenses granted to You by any distributor)
 shall survive termination.
 
-   7. LIMITATION OF LIABILITY.
+7. LIMITATION OF LIABILITY.
 
 UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING
 NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER, ANY
@@ -275,19 +262,19 @@ SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL
 OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO
 YOU.
 
-   8. U.S. GOVERNMENT END USERS.
+8. U.S. GOVERNMENT END USERS.
 
-The Covered Software is a "commercial item," as that term is defined in 48
-C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer software" (as
-that term is defined at 48 C.F.R. § 252.227-7014(a)(1)) and "commercial computer
-software documentation" as such terms are used in 48 C.F.R. 12.212 (Sept.
+The Covered Software is a “commercial item,” as that term is defined in 48
+C.F.R. 2.101 (Oct. 1995), consisting of “commercial computer software” (as
+that term is defined at 48 C.F.R. § 252.227-7014(a)(1)) and “commercial computer
+software documentation” as such terms are used in 48 C.F.R. 12.212 (Sept.
 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4
 (June 1995), all U.S. Government End Users acquire Covered Software with only
 those rights set forth herein. This U.S. Government Rights clause is in lieu
 of, and supersedes, any other FAR, DFAR, or other clause or provision that
 addresses Government rights in computer software under this License.
 
-   9. MISCELLANEOUS.
+9. MISCELLANEOUS.
 
 This License represents the complete agreement concerning subject matter hereof.
 If any provision of this License is held to be unenforceable, such provision
@@ -307,7 +294,7 @@ You alone are responsible for compliance with the United States export administr
 regulations (and the export control laws and regulation of any other countries)
 when You use, distribute or otherwise make available any Covered Software.
 
-   10. RESPONSIBILITY FOR CLAIMS.
+10. RESPONSIBILITY FOR CLAIMS.
 
 As between Initial Developer and the Contributors, each party is responsible
 for claims and damages arising, directly or indirectly, out of its utilization
@@ -318,7 +305,6 @@ of liability.
 
 NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND DISTRIBUTION LICENSE
 (CDDL)
-
 The code released under the CDDL shall be governed by the laws of the State
 of California (excluding conflict-of-law provisions). Any litigation relating
 to this License shall be subject to the jurisdiction of the Federal Courts
diff --git a/options/license/CDLA-Permissive-1.0 b/options/license/CDLA-Permissive-1.0
index 5715eadee3..8a34c355d2 100644
--- a/options/license/CDLA-Permissive-1.0
+++ b/options/license/CDLA-Permissive-1.0
@@ -1,6 +1,6 @@
-Community Data License Agreement - Permissive - Version 1.0
+Community Data License Agreement – Permissive – Version 1.0
 
-This is the Community Data License Agreement - Permissive, Version 1.0 ("Agreement").
+This is the Community Data License Agreement – Permissive, Version 1.0 (“Agreement”).
 Data is provided to You under this Agreement by each of the Data Providers.
 Your exercise of any of the rights and permissions granted below constitutes
 Your acceptance and agreement to be bound by the terms and conditions of this
@@ -8,73 +8,73 @@ Agreement.
 
 The benefits that each Data Provider receives from making Data available and
 that You receive from Data or otherwise under these terms and conditions shall
-be deemed sufficient consideration for the formation of this Agreement. Accordingly,
-Data Provider(s) and You (the "Parties") agree as follows:
+be deemed sufficient consideration for the formation of this Agreement.  Accordingly,
+Data Provider(s) and You (the “Parties”) agree as follows:
 
-   Section 1. Definitions
+Section 1.  Definitions
 
-1.1 "Add" means to supplement Data with Your own or someone else's Data, resulting
-in Your "Additions." Additions do not include Results.
+1.1 “Add” means to supplement Data with Your own or someone else’s Data, resulting
+in Your “Additions.”  Additions do not include Results.
 
-1.2 "Computational Use" means Your analysis (through the use of computational
-devices or otherwise) or other interpretation of Data. By way of example and
-not limitation, "Computational Use" includes the application of any computational
+1.2 “Computational Use” means Your analysis (through the use of computational
+devices or otherwise) or other interpretation of Data.  By way of example
+and not limitation, “Computational Use” includes the application of any computational
 analytical technique, the purpose of which is the analysis of any Data in
 digital form to generate information about Data such as patterns, trends,
 correlations, inferences, insights and attributes.
 
-1.3 "Data" means the information (including copyrightable information, such
+1.3 “Data” means the information (including copyrightable information, such
 as images or text), collectively or individually, whether created or gathered
 by a Data Provider or an Entity acting on its behalf, to which rights are
 granted under this Agreement.
 
-1.4 "Data Provider" means any Entity (including any employee or contractor
+1.4 “Data Provider” means any Entity (including any employee or contractor
 of such Entity authorized to Publish Data on behalf of such Entity) that Publishes
 Data under this Agreement prior to Your Receiving it.
 
-1.5 "Enhanced Data" means the subset of Data that You Publish and that is
+1.5 “Enhanced Data” means the subset of Data that You Publish and that is
 composed of (a) Your Additions and/or (b) Modifications to Data You have received
 under this Agreement.
 
-1.6 "Entity" means any natural person or organization that exists under the
+1.6 “Entity” means any natural person or organization that exists under the
 laws of the jurisdiction in which it is organized, together with all other
 entities that control, are controlled by, or are under common control with
-that entity. For the purposes of this definition, "control" means (a) the
+that entity.  For the purposes of this definition, “control” means (a) the
 power, directly or indirectly, to cause the direction or management of such
 entity, whether by contract or otherwise, (b) the ownership of more than fifty
 percent (50%) of the outstanding shares or securities, (c) the beneficial
 ownership of such entity or, (d) the ability to appoint, whether by agreement
 or right, the majority of directors of an Entity.
 
-1.7 "Modify" means to delete, erase, correct or re-arrange Data, resulting
-in "Modifications." Modifications do not include Results.
+1.7 “Modify” means to delete, erase, correct or re-arrange Data, resulting
+in “Modifications.”  Modifications do not include Results.
 
-1.8 "Publish" means to make all or a subset of Data (including Your Enhanced
+1.8 “Publish” means to make all or a subset of Data (including Your Enhanced
 Data) available in any manner which enables its Use, including by providing
-a copy on physical media or remote access. For any form of Entity, that is
+a copy on physical media or remote access.  For any form of Entity, that is
 to make the Data available to any individual who is not employed by that Entity
-or engaged as a contractor or agent to perform work on that Entity's behalf.
-A "Publication" occurs each time You Publish Data.
+or engaged as a contractor or agent to perform work on that Entity’s behalf.
+A “Publication” occurs each time You Publish Data.
 
-1.9 "Receive" or "Receives" means to have been given access to Data, locally
+1.9 “Receive” or “Receives” means to have been given access to Data, locally
 or remotely.
 
-1.10 "Results" means the outcomes or outputs that You obtain from Your Computational
-Use of Data. Results shall not include more than a de minimis portion of the
-Data on which the Computational Use is based.
+1.10 “Results” means the outcomes or outputs that You obtain from Your Computational
+Use of Data.  Results shall not include more than a de minimis portion of
+the Data on which the Computational Use is based.
 
-1.11 "Sui Generis Database Rights" means rights, other than copyright, resulting
+1.11 “Sui Generis Database Rights” means rights, other than copyright, resulting
 from Directive 96/9/EC of the European Parliament and of the Council of 11
 March 1996 on the legal protection of databases, as amended and/or succeeded,
 as well as other equivalent rights anywhere in the world.
 
-1.12 "Use" means using Data (including accessing, copying, studying, reviewing,
+1.12 “Use” means using Data (including accessing, copying, studying, reviewing,
 adapting, analyzing, evaluating, or making Computational Use of it), either
 by machines or humans, or a combination of both.
 
-1.13 "You" or "Your" means any Entity that Receives Data under this Agreement.
+1.13 “You” or “Your” means any Entity that Receives Data under this Agreement.
 
-   Section 2. Right and License to Use and to Publish
+Section 2.  Right and License to Use and to Publish
 
 2.1 Subject to the conditions set forth in Section 3 of this Agreement, Data
 Provider(s) hereby grant(s) to You a worldwide, non-exclusive, irrevocable
@@ -91,9 +91,9 @@ to the conditions set forth in Section 3 of this Agreement.
 2.3 Except for these rights and licenses expressly granted, no other intellectual
 property rights are granted or should be implied.
 
-   Section 3. Conditions on Rights Granted
+Section 3.  Conditions on Rights Granted
 
-      3.1 If You Publish Data You Receive or Enhanced Data:
+3.1 If You Publish Data You Receive or Enhanced Data:
 
 (a) You may do so under a license of Your choice provided that You give anyone
 who Receives the Data from You the text of this Agreement, the name of this
@@ -123,7 +123,7 @@ to or the consent of any Data Provider.
 3.4 This Agreement imposes no obligations or restrictions on Your Use or Publication
 of Results.
 
-   Section 4. Data Provider(s)' Representations
+Section 4.  Data Provider(s)’ Representations
 
 4.1 Each Data Provider represents that the Data Provider has exercised reasonable
 care, to assure that: (a) the Data it Publishes was created or generated by
@@ -131,14 +131,14 @@ it or was obtained from others with the right to Publish the Data under this
 Agreement; and (b) Publication of such Data does not violate any privacy or
 confidentiality obligation undertaken by the Data Provider.
 
-   Section 5. Termination
+Section 5.  Termination
 
 5.1 All of Your rights under this Agreement will terminate, and Your right
 to Receive, Use or Publish the Data will be revoked or modified if You materially
 fail to comply with the terms and conditions of this Agreement and You do
 not cure such failure in a reasonable period of time after becoming aware
-of such noncompliance. If Your rights under this Agreement terminate, You
-agree to cease Receipt, Use and Publication of Data. However, Your obligations
+of such noncompliance.  If Your rights under this Agreement terminate, You
+agree to cease Receipt, Use and Publication of Data.  However, Your obligations
 and any rights and permissions granted by You under this Agreement relating
 to Data that You Published prior to such termination will continue and survive.
 
@@ -148,10 +148,10 @@ other than a claim asserting breach of this Agreement, then any rights previousl
 granted to You to Receive, Use and Publish Data under this Agreement will
 terminate as of the date such litigation is filed.
 
-   Section 6. Disclaimer of Warranties and Limitation of Liability
+Section 6.  Disclaimer of Warranties and Limitation of Liability
 
 6.1 EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE DATA (INCLUDING ENHANCED
-DATA) IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
+DATA) IS PROVIDED 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.
@@ -164,11 +164,11 @@ ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE DATA OR THE EXERCISE
 OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 DAMAGES.
 
-   Section 7. Miscellaneous
+Section 7.  Miscellaneous
 
 7.1 You agree that it is solely Your responsibility to comply with all applicable
 laws with regard to Your Use or Publication of Data, including any applicable
-privacy, data protection, security and export laws. You agree to take reasonable
+privacy, data protection, security and export laws.  You agree to take reasonable
 steps to assist a Data Provider fulfilling responsibilities to comply with
 applicable laws with regard to Use or Publication of Data Received hereunder.
 
@@ -187,9 +187,9 @@ no reservation or expectation of any rights of privacy or confidentiality
 in that Data.
 
 7.5 The Community Data License Agreement workgroup under The Linux Foundation
-is the steward of this Agreement ("Steward"). No one other than the Steward
-has the right to modify or publish new versions of this Agreement. Each version
-will be given a distinguishing version number. You may Use and Publish Data
+is the steward of this Agreement (“Steward”).  No one other than the Steward
+has the right to modify or publish new versions of this Agreement.  Each version
+will be given a distinguishing version number.  You may Use and Publish Data
 Received hereunder under the terms of the version of the Agreement under which
 You originally Received the Data, or under the terms of any subsequent version
 published by the Steward.
diff --git a/options/license/CDLA-Sharing-1.0 b/options/license/CDLA-Sharing-1.0
index cb63657281..6fdf00bb01 100644
--- a/options/license/CDLA-Sharing-1.0
+++ b/options/license/CDLA-Sharing-1.0
@@ -1,6 +1,6 @@
-Community Data License Agreement - Sharing - Version 1.0
+Community Data License Agreement – Sharing – Version 1.0
 
-This is the Community Data License Agreement - Sharing, Version 1.0 ("Agreement").
+This is the Community Data License Agreement – Sharing, Version 1.0 (“Agreement”).
 Data is provided to You under this Agreement by each of the Data Providers.
 Your exercise of any of the rights and permissions granted below constitutes
 Your acceptance and agreement to be bound by the terms and conditions of this
@@ -8,78 +8,78 @@ Agreement.
 
 The benefits that each Data Provider receives from making Data available and
 that You receive from Data or otherwise under these terms and conditions shall
-be deemed sufficient consideration for the formation of this Agreement. Accordingly,
-Data Provider(s) and You (the "Parties") agree as follows:
+be deemed sufficient consideration for the formation of this Agreement.  Accordingly,
+Data Provider(s) and You (the “Parties”) agree as follows:
 
-   Section 1. Definitions
+Section 1.  Definitions
 
-1.1 "Add" means to supplement Data with Your own or someone else's Data, resulting
-in Your "Additions." Additions do not include Results.
+1.1 “Add” means to supplement Data with Your own or someone else’s Data, resulting
+in Your “Additions.”  Additions do not include Results.
 
-1.2 "Computational Use" means Your analysis (through the use of computational
-devices or otherwise) or other interpretation of Data. By way of example and
-not limitation, "Computational Use" includes the application of any computational
+1.2 “Computational Use” means Your analysis (through the use of computational
+devices or otherwise) or other interpretation of Data.  By way of example
+and not limitation, “Computational Use” includes the application of any computational
 analytical technique, the purpose of which is the analysis of any Data in
 digital form to generate information about Data such as patterns, trends,
 correlations, inferences, insights and attributes.
 
-1.3 "Data" means the information (including copyrightable information, such
+1.3 “Data” means the information (including copyrightable information, such
 as images or text), collectively or individually, whether created or gathered
 by a Data Provider or an Entity acting on its behalf, to which rights are
 granted under this Agreement.
 
-1.4 "Data Provider" means any Entity (including any employee or contractor
+1.4 “Data Provider” means any Entity (including any employee or contractor
 of such Entity authorized to Publish Data on behalf of such Entity) that Publishes
 Data under this Agreement prior to Your Receiving it.
 
-1.5 "Enhanced Data" means the subset of Data that You Publish and that is
+1.5 “Enhanced Data” means the subset of Data that You Publish and that is
 composed of (a) Your Additions and/or (b) Modifications to Data You have received
 under this Agreement.
 
-1.6 "Entity" means any natural person or organization that exists under the
+1.6 “Entity” means any natural person or organization that exists under the
 laws of the jurisdiction in which it is organized, together with all other
 entities that control, are controlled by, or are under common control with
-that entity. For the purposes of this definition, "control" means (a) the
+that entity.  For the purposes of this definition, “control” means (a) the
 power, directly or indirectly, to cause the direction or management of such
 entity, whether by contract or otherwise, (b) the ownership of more than fifty
 percent (50%) of the outstanding shares or securities, (c) the beneficial
 ownership of such entity or, (d) the ability to appoint, whether by agreement
 or right, the majority of directors of an Entity.
 
-1.7 "Ledger" means a digital record of Data or grants of rights in Data governed
+1.7 “Ledger” means a digital record of Data or grants of rights in Data governed
 by this Agreement, using any technology having functionality to record and
 store Data or grants, contributions, or licenses to Data governed by this
 Agreement.
 
-1.8 "Modify" means to delete, erase, correct or re-arrange Data, resulting
-in "Modifications." Modifications do not include Results.
+1.8 “Modify” means to delete, erase, correct or re-arrange Data, resulting
+in “Modifications.”  Modifications do not include Results.
 
-1.9 "Publish" means to make all or a subset of Data (including Your Enhanced
+1.9 “Publish” means to make all or a subset of Data (including Your Enhanced
 Data) available in any manner which enables its Use, including by providing
-a copy on physical media or remote access. For any form of Entity, that is
+a copy on physical media or remote access.  For any form of Entity, that is
 to make the Data available to any individual who is not employed by that Entity
-or engaged as a contractor or agent to perform work on that Entity's behalf.
-A "Publication" occurs each time You Publish Data.
+or engaged as a contractor or agent to perform work on that Entity’s behalf.
+A “Publication” occurs each time You Publish Data.
 
-1.10 "Receive" or "Receives" means to have been given access to Data, locally
+1.10 “Receive” or “Receives” means to have been given access to Data, locally
 or remotely.
 
-1.11 "Results" means the outcomes or outputs that You obtain from Your Computational
-Use of Data. Results shall not include more than a de minimis portion of the
-Data on which the Computational Use is based.
+1.11 “Results” means the outcomes or outputs that You obtain from Your Computational
+Use of Data.  Results shall not include more than a de minimis portion of
+the Data on which the Computational Use is based.
 
-1.12 "Sui Generis Database Rights" means rights, other than copyright, resulting
+1.12 “Sui Generis Database Rights” means rights, other than copyright, resulting
 from Directive 96/9/EC of the European Parliament and of the Council of 11
 March 1996 on the legal protection of databases, as amended and/or succeeded,
 as well as other equivalent rights anywhere in the world.
 
-1.13 "Use" means using Data (including accessing, copying, studying, reviewing,
+1.13 “Use” means using Data (including accessing, copying, studying, reviewing,
 adapting, analyzing, evaluating, or making Computational Use of it), either
 by machines or humans, or a combination of both.
 
-1.14 "You" or "Your" means any Entity that Receives Data under this Agreement.
+1.14 “You” or “Your” means any Entity that Receives Data under this Agreement.
 
-   Section 2. Right and License to Use and to Publish
+Section 2.  Right and License to Use and to Publish
 
 2.1 Subject to the conditions set forth in Section 3 of this Agreement, Data
 Provider(s) hereby grant(s) to You a worldwide, non-exclusive, irrevocable
@@ -96,9 +96,9 @@ to the conditions set forth in Section 3 of this Agreement.
 2.3 Except for these rights and licenses expressly granted, no other intellectual
 property rights are granted or should be implied.
 
-   Section 3. Conditions on Rights Granted
+Section 3.  Conditions on Rights Granted
 
-      3.1 If You Publish Data You Receive or Enhanced Data:
+3.1 If You Publish Data You Receive or Enhanced Data:
 
 (a) The Data (including the Enhanced Data) must be Published under this Agreement
 in accordance with this Section 3; and
@@ -121,11 +121,11 @@ in the Ledger.
 3.3 If You Publish Data You Receive, You must do so under an unmodified form
 of this Agreement and include the text of this Agreement, the name of this
 Agreement and/or a hyperlink or other method reasonably likely to provide
-a copy of the text of this Agreement. You may not modify this Agreement or
+a copy of the text of this Agreement.  You may not modify this Agreement or
 impose any further restrictions on the exercise of the rights granted under
 this Agreement, including by adding any restriction on commercial or non-commercial
 Use of Data (including Your Enhanced Data) or by limiting permitted Use of
-such Data to any particular platform, technology or field of endeavor. Notices
+such Data to any particular platform, technology or field of endeavor.  Notices
 that purport to modify this Agreement shall be of no effect.
 
 3.4 You and each Data Provider agree that Enhanced Data shall not be considered
@@ -136,7 +136,7 @@ to or the consent of any Data Provider.
 3.5 This Agreement imposes no obligations or restrictions on Your Use or Publication
 of Results.
 
-   Section 4. Data Provider(s)' Representations
+Section 4.  Data Provider(s)’ Representations
 
 4.1 Each Data Provider represents that the Data Provider has exercised reasonable
 care, to assure that: (a) the Data it Publishes was created or generated by
@@ -144,14 +144,14 @@ it or was obtained from others with the right to Publish the Data under this
 Agreement; and (b) Publication of such Data does not violate any privacy or
 confidentiality obligation undertaken by the Data Provider.
 
-   Section 5. Termination
+Section 5.  Termination
 
 5.1 All of Your rights under this Agreement will terminate, and Your right
 to Receive, Use or Publish the Data will be revoked or modified if You materially
 fail to comply with the terms and conditions of this Agreement and You do
 not cure such failure in a reasonable period of time after becoming aware
-of such noncompliance. If Your rights under this Agreement terminate, You
-agree to cease Receipt, Use and Publication of Data. However, Your obligations
+of such noncompliance.  If Your rights under this Agreement terminate, You
+agree to cease Receipt, Use and Publication of Data.  However, Your obligations
 and any rights and permissions granted by You under this Agreement relating
 to Data that You Published prior to such termination will continue and survive.
 
@@ -161,10 +161,10 @@ other than a claim asserting breach of this Agreement, then any rights previousl
 granted to You to Receive, Use and Publish Data under this Agreement will
 terminate as of the date such litigation is filed.
 
-   Section 6. Disclaimer of Warranties and Limitation of Liability
+Section 6.  Disclaimer of Warranties and Limitation of Liability
 
 6.1 EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE DATA (INCLUDING ENHANCED
-DATA) IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
+DATA) IS PROVIDED 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.
@@ -177,11 +177,11 @@ ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE DATA OR THE EXERCISE
 OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 DAMAGES.
 
-   Section 7. Miscellaneous
+Section 7.  Miscellaneous
 
 7.1 You agree that it is solely Your responsibility to comply with all applicable
 laws with regard to Your Use or Publication of Data, including any applicable
-privacy, data protection, security and export laws. You agree to take reasonable
+privacy, data protection, security and export laws.  You agree to take reasonable
 steps to assist a Data Provider fulfilling responsibilities to comply with
 applicable laws with regard to Use or Publication of Data Received hereunder.
 
@@ -200,9 +200,9 @@ no reservation or expectation of any rights of privacy or confidentiality
 in that Data.
 
 7.5 The Community Data License Agreement workgroup under The Linux Foundation
-is the steward of this Agreement ("Steward"). No one other than the Steward
-has the right to modify or publish new versions of this Agreement. Each version
-will be given a distinguishing version number. You may Use and Publish Data
+is the steward of this Agreement (“Steward”).  No one other than the Steward
+has the right to modify or publish new versions of this Agreement.  Each version
+will be given a distinguishing version number.  You may Use and Publish Data
 Received hereunder under the terms of the version of the Agreement under which
 You originally Received the Data, or under the terms of any subsequent version
 published by the Steward.
diff --git a/options/license/CECILL-1.0 b/options/license/CECILL-1.0
index 4e05e283ff..b734af1917 100644
--- a/options/license/CECILL-1.0
+++ b/options/license/CECILL-1.0
@@ -1,19 +1,19 @@
-CONTRAT DE LICENCE DE LOGICIEL LIBRE CeCILL Avertissement
+CONTRAT DE LICENCE DE LOGICIEL LIBRE CeCILL
 
-Ce contrat est une licence de logiciel libre issue d'une concertation entre
+Avertissement
+
+Ce contrat est une licence de logiciel libre issue d’une concertation entre
 ses auteurs afin que le respect de deux grands principes préside à sa rédaction:
-
-• d'une part, sa conformité au droit français, tant au regard du droit de
+	•	d’une part, sa conformité au droit français, tant au regard du droit de
 la responsabilité civile que du droit de la propriété intellectuelle et de
-la protection qu'il offre aux auteurs et titulaires des droits patrimoniaux
+la protection qu’il offre aux auteurs et titulaires des droits patrimoniaux
 sur un logiciel.
-
-• d'autre part, le respect des principes de diffusion des logiciels libres:
+	•	d’autre part, le respect des principes de diffusion des logiciels libres:
 accès au code source, droits étendus conférés aux utilisateurs.
 
 Les auteurs de la licence CeCILL1 sont:
 
-Commissariat à l'Energie Atomique – CEA, établissement public de caractère
+Commissariat à l’Energie Atomique – CEA, établissement public de caractère
 scientifique technique et industriel, dont le siège est situé 31-33 rue de
 la Fédération, 75752 PARIS cedex 15.
 
@@ -34,40 +34,39 @@ régi par cette licence dans le cadre d'un modèle de diffusion «open source».
 L'exercice de ces libertés est assorti de certains devoirs à la charge des
 utilisateurs afin de préserver ce statut au cours des redistributions ultérieures.
 
-L'accessibilité au code source et les droits de copie, de modification et
-de redistribution qui en découlent ont pour contrepartie de n'offrir aux utilisateurs
-qu'une garantie limitée et de ne faire peser sur l'auteur du logiciel, le
-titulaire des droits patrimoniaux et les concédants successifs qu'une responsabilité
+L’accessibilité au code source et les droits de copie, de modification et
+de redistribution qui en découlent ont pour contrepartie de n’offrir aux utilisateurs
+qu’une garantie limitée et de ne faire peser sur l’auteur du logiciel, le
+titulaire des droits patrimoniaux et les concédants successifs qu’une responsabilité
 restreinte.
 
-A cet égard l'attention de l'utilisateur est attirée sur les risques associés
-au chargement, à l'utilisation, à la modification et/ou au développement et
-à la reproduction du logiciel par l'utilisateur étant donné sa spécificité
+A cet égard l’attention de l’utilisateur est attirée sur les risques associés
+au chargement, à l’utilisation, à la modification et/ou au développement et
+à la reproduction du logiciel par l’utilisateur étant donné sa spécificité
 de logiciel libre, qui peut le rendre complexe à manipuler et qui le réserve
 donc à des développeurs et des professionnels avertis possédant des connaissances
 informatiques approfondies. Les utilisateurs sont donc invités à charger et
-tester l'adéquation du Logiciel à leurs besoins dans des conditions permettant
+tester l’adéquation du Logiciel à leurs besoins dans des conditions permettant
 d'assurer la sécurité de leurs systèmes et ou de leurs données et, plus généralement,
 à l'utiliser et l'exploiter dans les même conditions de sécurité. Ce contrat
 peut être reproduit et diffusé librement, sous réserve de le conserver en
-l'état, sans ajout ni suppression de clauses.
+l’état, sans ajout ni suppression de clauses.
 
-Ce contrat est susceptible de s'appliquer à tout logiciel dont le titulaire
-des droits patrimoniaux décide de soumettre l'exploitation aux dispositions
-qu'il contient.
+Ce contrat est susceptible de s’appliquer à tout logiciel dont le titulaire
+des droits patrimoniaux décide de soumettre l’exploitation aux dispositions
+qu’il contient.
 
 Article 1er - DEFINITIONS
 
-Dans ce contrat, les termes suivants, lorsqu'ils seront écrits avec une lettre
+Dans ce contrat, les termes suivants, lorsqu’ils seront écrits avec une lettre
 capitale, auront la signification suivante:
 
 Contrat: désigne le présent contrat de licence, ses éventuelles versions postérieures
 et annexes.
 
 Logiciel: désigne le logiciel sous sa forme de Code Objet et/ou de Code Source
-et le cas échéant sa documentation, dans leur état au moment de l'acceptation
+et le cas échéant sa documentation, dans leur état au moment de l’acceptation
 du
-
 Contrat par le Licencié.
 
 Logiciel Initial: désigne le Logiciel sous sa forme de Code Source et de Code
@@ -76,24 +75,24 @@ première diffusion sous les termes du Contrat.
 
 Logiciel Modifié: désigne le Logiciel modifié par au moins une Contribution.
 
-Code Source: désigne l'ensemble des instructions et des lignes de programme
-du Logiciel et auquel l'accès est nécessaire en vue de modifier le Logiciel.
+Code Source: désigne l’ensemble des instructions et des lignes de programme
+du Logiciel et auquel l’accès est nécessaire en vue de modifier le Logiciel.
 
 Code Objet: désigne les fichiers binaires issus de la compilation du Code
 Source.
 
-Titulaire : désigne le détenteur des droits patrimoniaux d'auteur sur le Logiciel
+Titulaire : désigne le détenteur des droits patrimoniaux d’auteur sur le Logiciel
 Initial.
 
 Licencié(s): désigne le ou les utilisateur(s) du Logiciel ayant accepté le
 Contrat.
 
-Contributeur: désigne le Licencié auteur d'au moins une Contribution.
+Contributeur: désigne le Licencié auteur d’au moins une Contribution.
 
 Concédant: désigne le Titulaire ou toute personne physique ou morale distribuant
 le Logiciel sous le Contrat.
 
-Contributions: désigne l'ensemble des modifications, corrections, traductions,
+Contributions: désigne l’ensemble des modifications, corrections, traductions,
 adaptations et/ou nouvelles fonctionnalités intégrées dans le Logiciel par
 tout
 
@@ -102,13 +101,12 @@ Contributeur, ainsi que les Modules Statiques.
 Module: désigne un ensemble de fichiers sources y compris leur documentation
 qui, une fois compilé sous forme exécutable, permet de réaliser des fonctionnalités
 ou
-
 services supplémentaires à ceux fournis par le Logiciel.
 
 Module Dynamique: désigne tout Module, créé par le Contributeur, indépendant
 du Logiciel, tel que ce Module et le Logiciel sont sous forme de deux exécutables
-indépendants qui s'exécutent dans un espace d'adressage indépendant, l'un
-appelant l'autre au moment de leur exécution.
+indépendants qui s’exécutent dans un espace d’adressage indépendant, l’un
+appelant l’autre au moment de leur exécution.
 
 Module Statique: désigne tout Module créé par le Contributeur et lié au Logiciel
 par un lien statique rendant leur code objet dépendant l'un de l'autre. Ce
@@ -116,25 +114,23 @@ Module et le Logiciel auquel il est lié, sont regroupés en un seul exécutable
 
 Parties: désigne collectivement le Licencié et le Concédant.
 
-Ces termes s'entendent au singulier comme au pluriel.
+Ces termes s’entendent au singulier comme au pluriel.
 
 Article 2 - OBJET
 
-Le Contrat a pour objet la concession par le Concédant au Licencié d'une Licence
+Le Contrat a pour objet la concession par le Concédant au Licencié d’une Licence
 non exclusive, transférable et mondiale du Logiciel telle que définie ci-après
 à l'article 5 pour toute la durée de protection des droits portant sur ce
 Logiciel.
 
 Article 3 - ACCEPTATION
 
-3.1. L'acceptation par le Licencié des termes du Contrat est réputée acquise
+3.1. L’acceptation par le Licencié des termes du Contrat est réputée acquise
 du fait du premier des faits suivants:
-
-• (i) le chargement du Logiciel par tout moyen notamment par téléchargement
-à partir d'un serveur distant ou par chargement à partir d'un support physique;
-
-• (ii) le premier exercice par le Licencié de l'un quelconque des droits concédés
-par le Contrat.
+	•	(i) le chargement du Logiciel par tout moyen notamment par téléchargement
+à partir d’un serveur distant ou par chargement à partir d’un support physique;
+	•	(ii) le premier exercice par le Licencié de l’un quelconque des droits
+concédés par le Contrat.
 
 3.2. Un exemplaire du Contrat, contenant notamment un avertissement relatif
 aux spécificités du Logiciel, à la restriction de garantie et à la limitation
@@ -144,12 +140,12 @@ et le Licencié reconnaît en avoir pris connaissances.
 
 Article 4 - ENTREE EN VIGUEUR ET DUREE
 
-   4.1. ENTREE EN VIGUEUR
+4.1.ENTREE EN VIGUEUR
 
 Le Contrat entre en vigueur à la date de son acceptation par le Licencié telle
 que définie en 3.1.
 
-   4.2. DUREE
+4.2. DUREE
 
 Le Contrat produira ses effets pendant toute la durée légale de protection
 des droits patrimoniaux portant sur le Logiciel.
@@ -161,38 +157,34 @@ Logiciel pour toutes destinations et pour la durée du Contrat dans les conditio
 ci-après détaillées.
 
 Par ailleurs, le Concédant concède au Licencié à titre gracieux les droits
-d'exploitation du ou des brevets qu'il détient sur tout ou partie des inventions
-
+d’exploitation du ou des brevets qu’il détient sur tout ou partie des inventions
 implémentées dans le Logiciel.
 
-   5.1. DROITS D'UTILISATION
+5.1. DROITS D’UTILISATION
 
 Le Licencié est autorisé à utiliser le Logiciel, sans restriction quant aux
-domaines d'application, étant ci-après précisé que cela comporte:
-
-1. la reproduction permanente ou provisoire du Logiciel en tout ou partie
+domaines d’application, étant ci-après précisé que cela comporte:
+	1.	la reproduction permanente ou provisoire du Logiciel en tout ou partie
 par tout moyen et sous toute forme.
-
-2. le chargement, l'affichage, l'exécution, ou le stockage du Logiciel sur
+	2.	le chargement, l’affichage, l’exécution, ou le stockage du Logiciel sur
 tout support.
-
-3. la possibilité d'en observer, d'en étudier, ou d'en tester le fonctionnement
-afin de déterminer les idées et principes qui sont à la base de n'importe
+	3.	la possibilité d’en observer, d’en étudier, ou d’en tester le fonctionnement
+afin de déterminer les idées et principes qui sont à la base de n’importe
 quel élément de ce Logiciel; et ceci, lorsque le Licencié effectue toute opération
-de chargement, d'affichage, d'exécution, de transmission ou de stockage du
-Logiciel qu'il est en droit d'effectuer en vertu du Contrat.
+de chargement, d’affichage, d’exécution, de transmission ou de stockage du
+Logiciel qu’il est en droit d’effectuer en vertu du Contrat.
 
-   5.2. DROIT D'APPORTER DES CONTRIBUTIONS
+5.2. DROIT D’APPORTER DES CONTRIBUTIONS
 
-Le droit d'apporter des Contributions comporte le droit de traduire, d'adapter,
-d'arranger ou d'apporter toute autre modification du Logiciel et le droit
+Le droit d’apporter des Contributions comporte le droit de traduire, d’adapter,
+d’arranger ou d’apporter toute autre modification du Logiciel et le droit
 de reproduire le Logiciel en résultant.
 
 Le Licencié est autorisé à apporter toute Contribution au Logiciel sous réserve
-de mentionner, de façon explicite, son nom en tant qu'auteur de cette Contribution
+de mentionner, de façon explicite, son nom en tant qu’auteur de cette Contribution
 et la date de création de celle-ci.
 
-   5.3. DROITS DE DISTRIBUTION ET DE DIFFUSION
+5.3. DROITS DE DISTRIBUTION ET DE DIFFUSION
 
 Le droit de distribution et de diffusion comporte notamment le droit de transmettre
 et de communiquer le Logiciel au public sur tout support et par tout moyen
@@ -202,231 +194,206 @@ ou des exemplaires du Logiciel par tout procédé.
 Le Licencié est autorisé à redistribuer des copies du Logiciel, modifié ou
 non, à des tiers dans les conditions ci-après détaillées.
 
-      5.3.1. REDISTRIBUTION DU LOGICIEL SANS MODIFICATION
-
+5.3.1. REDISTRIBUTION DU LOGICIEL SANS MODIFICATION
 Le Licencié est autorisé à redistribuer des copies conformes du Logiciel,
 sous forme de Code Source ou de Code Objet, à condition que cette redistribution
 respecte les dispositions du Contrat dans leur totalité et soit accompagnée:
-
-         1. d'un exemplaire du Contrat,
-
-2. d'un avertissement relatif à la restriction de garantie et de responsabilité
+	1.	d’un exemplaire du Contrat,
+	2.	d’un avertissement relatif à la restriction de garantie et de responsabilité
 du Concédant telle que prévue aux articles 8 et 9,
-
 et que, dans le cas où seul le Code Objet du Logiciel est redistribué, le
-Licencié permette aux futurs Licenciés d'accéder facilement au Code Source
-complet du Logiciel en indiquant les modalités d'accès, étant entendu que
-le coût additionnel d'acquisition du Code Source ne devra pas excéder le simple
+Licencié permette aux futurs Licenciés d’accéder facilement au Code Source
+complet du Logiciel en indiquant les modalités d’accès, étant entendu que
+le coût additionnel d’acquisition du Code Source ne devra pas excéder le simple
 coût de transfert des données.
 
-      5.3.2. REDISTRIBUTION DU LOGICIEL MODIFIE
-
+5.3.2. REDISTRIBUTION DU LOGICIEL MODIFIE
 Lorsque le Licencié apporte une Contribution au Logiciel, les conditions de
-redistribution du Logiciel Modifié sont alors soumises à l'intégralité des
+redistribution du Logiciel Modifié sont alors soumises à l’intégralité des
 dispositions du Contrat.
-
 Le Licencié est autorisé à redistribuer le Logiciel Modifié, sous forme de
 Code Source ou de Code Objet, à condition que cette redistribution respecte
 les dispositions du Contrat dans leur totalité et soit accompagnée:
-
-         1. d'un exemplaire du Contrat,
-
-2. d'un avertissement relatif à la restriction de garantie et de responsabilité
+	1.	d’un exemplaire du Contrat,
+	2.	d’un avertissement relatif à la restriction de garantie et de responsabilité
 du concédant telle que prévue aux articles 8 et 9,
-
 et que, dans le cas où seul le Code Objet du Logiciel Modifié est redistribué,
-le Licencié permette aux futurs Licenciés d'accéder facilement au Code Source
-complet du Logiciel Modifié en indiquant les modalités d'accès, étant entendu
-que le coût additionnel d'acquisition du Code Source ne devra pas excéder
+le Licencié permette aux futurs Licenciés d’accéder facilement au Code Source
+complet du Logiciel Modifié en indiquant les modalités d’accès, étant entendu
+que le coût additionnel d’acquisition du Code Source ne devra pas excéder
 le simple coût de transfert des données.
 
-      5.3.3. REDISTRIBUTION DES MODULES DYNAMIQUES
-
+5.3.3. REDISTRIBUTION DES MODULES DYNAMIQUES
 Lorsque le Licencié a développé un Module Dynamique les conditions du Contrat
-ne s'appliquent pas à ce Module Dynamique, qui peut être distribué sous un
+ne s’appliquent pas à ce Module Dynamique, qui peut être distribué sous un
 contrat de licence différent.
 
-      5.3.4. COMPATIBILITE AVEC LA LICENCE GPL
-
+5.3.4. COMPATIBILITE AVEC LA LICENCE GPL
 Dans le cas où le Logiciel, Modifié ou non, est intégré à un code soumis aux
-dispositions de la licence GPL, le Licencié est autorisé à redistribuer l'ensemble
+dispositions de la licence GPL, le Licencié est autorisé à redistribuer l’ensemble
 sous la licence GPL.
-
 Dans le cas où le Logiciel Modifié intègre un code soumis aux dispositions
 de la licence GPL, le Licencié est autorisé à redistribuer le Logiciel Modifié
 sous la licence GPL.
 
 Article 6 - PROPRIETE INTELLECTUELLE
 
-   6.1. SUR LE LOGICIEL INITIAL
-
+6.1. SUR LE LOGICIEL INITIAL
 Le Titulaire est détenteur des droits patrimoniaux sur le Logiciel Initial.
 Toute utilisation du Logiciel Initial est soumise au respect des conditions
-dans lesquelles le Titulaire a choisi de diffuser son œuvre et nul autre n'a
+dans lesquelles le Titulaire a choisi de diffuser son œuvre et nul autre n’a
 la faculté de modifier les conditions de diffusion de ce Logiciel Initial.
-
 Le Titulaire s'engage à maintenir la diffusion du Logiciel initial sous les
 conditions du Contrat et ce, pour la durée visée à l'article 4.2.
 
-   6.2. SUR LES CONTRIBUTIONS
-
+6.2. SUR LES CONTRIBUTIONS
 Les droits de propriété intellectuelle sur les Contributions sont attachés
 au titulaire de droits patrimoniaux désigné par la législation applicable.
 
-   6.3. SUR LES MODULES DYNAMIQUES
-
+6.3. SUR LES MODULES DYNAMIQUES
 Le Licencié ayant développé un Module Dynamique est titulaire des droits de
 propriété intellectuelle sur ce Module Dynamique et reste libre du choix du
 contrat régissant sa diffusion.
 
-   6.4. DISPOSITIONS COMMUNES
+6.4. DISPOSITIONS COMMUNES
 
-      6.4.1. Le Licencié s'engage expressément:
-
-1. à ne pas supprimer ou modifier de quelque manière que ce soit les mentions
+6.4.1. Le Licencié s’engage expressément:
+	1.	à ne pas supprimer ou modifier de quelque manière que ce soit les mentions
 de propriété intellectuelle apposées sur le Logiciel;
-
-2. à reproduire à l'identique lesdites mentions de propriété intellectuelle
+	2.	à reproduire à l’identique lesdites mentions de propriété intellectuelle
 sur les copies du Logiciel.
-
-6.4.2. Le Licencié s'engage à ne pas porter atteinte, directement ou indirectement,
+6.4.2. Le Licencié s’engage à ne pas porter atteinte, directement ou indirectement,
 aux droits de propriété intellectuelle du Titulaire et/ou des Contributeurs
-et à prendre, le cas échéant, à l'égard de son personnel toutes les mesures
+et à prendre, le cas échéant, à l’égard de son personnel toutes les mesures
 nécessaires pour assurer le respect des dits droits de propriété intellectuelle
 du Titulaire et/ou des Contributeurs.
 
 Article 7 - SERVICES ASSOCIES
 
-7.1. Le Contrat n'oblige en aucun cas le Concédant à la réalisation de prestations
-d'assistance technique ou de maintenance du Logiciel.
-
+7.1. Le Contrat n’oblige en aucun cas le Concédant à la réalisation de prestations
+d’assistance technique ou de maintenance du Logiciel.
 Cependant le Concédant reste libre de proposer ce type de services. Les termes
-et conditions d'une telle assistance technique et/ou d'une telle maintenance
+et conditions d’une telle assistance technique et/ou d’une telle maintenance
 seront alors déterminés dans un acte séparé. Ces actes de maintenance et/ou
-assistance technique n'engageront que la seule responsabilité du Concédant
+assistance technique n’engageront que la seule responsabilité du Concédant
 qui les propose.
 
 7.2. De même, tout Concédant est libre de proposer, sous sa seule responsabilité,
-à ses licenciés une garantie, qui n'engagera que lui, lors de la redistribution
-du Logiciel et/ou du Logiciel Modifié et ce, dans les conditions qu'il souhaite.
-Cette garantie et les modalités financières de son application feront l'objet
-d'un acte séparé entre le Concédant et le Licencié.
+à ses licenciés une garantie, qui n’engagera que lui, lors de la redistribution
+du Logiciel et/ou du Logiciel Modifié et ce, dans les conditions qu’il souhaite.
+Cette garantie et les modalités financières de son application feront l’objet
+d’un acte séparé entre le Concédant et le Licencié.
 
 Article 8 - RESPONSABILITE
 
-8.1. Sous réserve des dispositions de l'article 8.2, si le Concédant n'exécute
+8.1. Sous réserve des dispositions de l’article 8.2, si le Concédant n’exécute
 pas tout ou partie des obligations mises à sa charge par le Contrat, le Licencié
 a la faculté, sous réserve de prouver la faute du Concédant concerné, de solliciter
-la réparation du préjudice direct qu'il subit et dont il apportera la preuve.
+la réparation du préjudice direct qu’il subit et dont il apportera la preuve.
 
 8.2. La responsabilité du Concédant est limitée aux engagements pris en application
 du Contrat et ne saurait être engagée en raison notamment:(i) des dommages
-dus à l'inexécution, totale ou partielle, de ses obligations par le Licencié,
-(ii) des dommages directs ou indirects découlant de l'utilisation ou des performances
-du Logiciel subis par le Licencié lorsqu'il s'agit d'un professionnel utilisant
+dus à l’inexécution, totale ou partielle, de ses obligations par le Licencié,
+(ii) des dommages directs ou indirects découlant de l’utilisation ou des performances
+du Logiciel subis par le Licencié lorsqu’il s’agit d’un professionnel utilisant
 le Logiciel à des fins professionnelles et (iii) des dommages indirects découlant
-de l'utilisation ou des performances du Logiciel. Les Parties conviennent
+de l’utilisation ou des performances du Logiciel. Les Parties conviennent
 expressément que tout préjudice financier ou commercial (par exemple perte
-de données, perte de bénéfices, perte d'exploitation, perte de clientèle ou
+de données, perte de bénéfices, perte d’exploitation, perte de clientèle ou
 de commandes, manque à gagner, trouble commercial quelconque) ou toute action
 dirigée contre le Licencié par un tiers, constitue un dommage indirect et
-n'ouvre pas droit à réparation par le Concédant.
+n’ouvre pas droit à réparation par le Concédant.
 
 Article 9 - GARANTIE
 
-9.1. Le Licencié reconnaît que l'état actuel des connaissances scientifiques
+9.1. Le Licencié reconnaît que l’état actuel des connaissances scientifiques
 et techniques au moment de la mise en circulation du Logiciel ne permet pas
-d'en tester et d'en vérifier toutes les utilisations ni de détecter l'existence
-d'éventuels défauts. L'attention du Licencié a été attirée sur ce point sur
-les risques associés au chargement, à l'utilisation, la modification et/ou
+d’en tester et d’en vérifier toutes les utilisations ni de détecter l’existence
+d’éventuels défauts. L’attention du Licencié a été attirée sur ce point sur
+les risques associés au chargement, à l’utilisation, la modification et/ou
 au développement et à la reproduction du Logiciel qui sont réservés à des
 utilisateurs avertis.
-
 Il relève de la responsabilité du Licencié de contrôler, par tous moyens,
-l'adéquation du produit à ses besoins, son bon fonctionnement et de s'assurer
-qu'il ne causera pas de dommages aux personnes et aux biens.
+l’adéquation du produit à ses besoins, son bon fonctionnement et de s'assurer
+qu’il ne causera pas de dommages aux personnes et aux biens.
 
 9.2. Le Concédant déclare de bonne foi être en droit de concéder l'ensemble
 des droits attachés au Logiciel (comprenant notamment les droits visés à l'article
 5).
 
 9.3. Le Licencié reconnaît que le Logiciel est fourni «en l'état» par le Concédant
-sans autre garantie, expresse ou tacite, que celle prévue à l'article 9.2
+sans autre garantie, expresse ou tacite, que celle prévue à l’article 9.2
 et notamment sans aucune garantie sur sa valeur commerciale, son caractère
 sécurisé, innovant ou pertinent.
-
 En particulier, le Concédant ne garantit pas que le Logiciel est exempt d'erreur,
-qu'il fonctionnera sans interruption, qu'il sera compatible avec l'équipement
-du Licencié et sa configuration logicielle ni qu'il remplira les besoins du
+qu’il fonctionnera sans interruption, qu’il sera compatible avec l’équipement
+du Licencié et sa configuration logicielle ni qu’il remplira les besoins du
 Licencié.
 
 9.4. Le Concédant ne garantit pas, de manière expresse ou tacite, que le Logiciel
-ne porte pas atteinte à un quelconque droit de propriété intellectuelle d'un
+ne porte pas atteinte à un quelconque droit de propriété intellectuelle d’un
 tiers portant sur un brevet, un logiciel ou sur tout autre droit de propriété.
 Ainsi, le Concédant exclut toute garantie au profit du Licencié contre les
-actions en contrefaçon qui pourraient être diligentées au titre de l'utilisation,
+actions en contrefaçon qui pourraient être diligentées au titre de l’utilisation,
 de la modification, et de la redistribution du Logiciel. Néanmoins, si de
 telles actions sont exercées contre le Licencié, le Concédant lui apportera
 son aide technique et juridique pour sa défense. Cette aide technique et juridique
 est déterminée au cas par cas entre le Concédant concerné et le Licencié dans
-le cadre d'un protocole d'accord. Le Concédant dégage toute responsabilité
-quant à l'utilisation de la dénomination du Logiciel par le Licencié. Aucune
-garantie n'est apportée quant à l'existence de droits antérieurs sur le nom
-du Logiciel et sur l'existence d'une marque.
+le cadre d’un protocole d’accord. Le Concédant dégage toute responsabilité
+quant à l’utilisation de la dénomination du Logiciel par le Licencié. Aucune
+garantie n’est apportée quant à l’existence de droits antérieurs sur le nom
+du Logiciel et sur l’existence d’une marque.
 
 Article 10 - RESILIATION
 
 10.1. En cas de manquement par le Licencié aux obligations mises à sa charge
 par le Contrat, le Concédant pourra résilier de plein droit le Contrat trente
 (30) jours après notification adressée au Licencié et restée sans effet.
-
-10.2. Le Licencié dont le Contrat est résilié n'est plus autorisé à utiliser,
-modifier ou distribuer le Logiciel. Cependant, toutes les licences qu'il aura
+10.2. Le Licencié dont le Contrat est résilié n’est plus autorisé à utiliser,
+modifier ou distribuer le Logiciel. Cependant, toutes les licences qu’il aura
 concédées antérieurement à la résiliation du Contrat resteront valides sous
-réserve qu'elles aient été effectuées en conformité avec le Contrat.
+réserve qu’elles aient été effectuées en conformité avec le Contrat.
 
 Article 11 - DISPOSITIONS DIVERSES
 
-   11.1. CAUSE EXTERIEURE
-
-Aucune des Parties ne sera responsable d'un retard ou d'une défaillance d'exécution
+11.1. CAUSE EXTERIEURE
+Aucune des Parties ne sera responsable d’un retard ou d’une défaillance d’exécution
 du Contrat qui serait dû à un cas de force majeure, un cas fortuit ou une
 cause extérieure, telle que, notamment, le mauvais fonctionnement ou les interruptions
 du réseau électrique ou de télécommunication, la paralysie du réseau liée
-à une attaque informatique, l'intervention des autorités gouvernementales,
+à une attaque informatique, l’intervention des autorités gouvernementales,
 les catastrophes naturelles, les dégâts des eaux, les tremblements de terre,
-le feu, les explosions, les grèves et les conflits sociaux, l'état de guerre…
+le feu, les explosions, les grèves et les conflits sociaux, l’état de guerre…
 
-11.2. Le fait, par l'une ou l'autre des Parties, d'omettre en une ou plusieurs
-occasions de se prévaloir d'une ou plusieurs dispositions du Contrat, ne pourra
-en aucun cas impliquer renonciation par la Partie intéressée à s'en prévaloir
+11.2. Le fait, par l’une ou l’autre des Parties, d’omettre en une ou plusieurs
+occasions de se prévaloir d’une ou plusieurs dispositions du Contrat, ne pourra
+en aucun cas impliquer renonciation par la Partie intéressée à s’en prévaloir
 ultérieurement.
 
 11.3. Le Contrat annule et remplace toute convention antérieure, écrite ou
-orale, entre les Parties sur le même objet et constitue l'accord entier entre
+orale, entre les Parties sur le même objet et constitue l’accord entier entre
 les Parties sur cet objet. Aucune addition ou modification aux termes du Contrat
-n'aura d'effet à l'égard des Parties à moins d'être faite par écrit et signée
+n’aura d’effet à l’égard des Parties à moins d’être faite par écrit et signée
 par leurs représentants dûment habilités.
 
-11.4. Dans l'hypothèse où une ou plusieurs des dispositions du Contrat s'avèrerait
+11.4. Dans l’hypothèse où une ou plusieurs des dispositions du Contrat s’avèrerait
 contraire à une loi ou à un texte applicable, existants ou futurs, cette loi
 ou ce texte prévaudrait, et les Parties feraient les amendements nécessaires
 pour se conformer à cette loi ou à ce texte. Toutes les autres dispositions
 resteront en vigueur. De même, la nullité, pour quelque raison que ce soit,
-d'une des dispositions du Contrat ne saurait entraîner la nullité de l'ensemble
+d’une des dispositions du Contrat ne saurait entraîner la nullité de l’ensemble
 du Contrat.
 
-   11.5. LANGUE
-
+11.5. LANGUE
 Le Contrat est rédigé en langue française et en langue anglaise. En cas de
-divergence d'interprétation, seule la version française fait foi.
+divergence d’interprétation, seule la version française fait foi.
 
 Article 12 - NOUVELLES VERSIONS DU CONTRAT
 
 12.1. Toute personne est autorisée à copier et distribuer des copies de ce
 Contrat.
 
-12.2. Afin d'en préserver la cohérence, le texte du Contrat est protégé et
+12.2. Afin d’en préserver la cohérence, le texte du Contrat est protégé et
 ne peut être modifié que par les auteurs de la licence, lesquels se réservent
 le droit de publier périodiquement des mises à jour ou de nouvelles versions
 du Contrat, qui possèderont chacune un numéro distinct. Ces versions ultérieures
@@ -440,12 +407,14 @@ une version postérieure, sous réserve des dispositions de l'article 5.3.4.
 Article 13 - LOI APPLICABLE ET COMPETENCE TERRITORIALE
 
 13.1. Le Contrat est régi par la loi française. Les Parties conviennent de
-tenter de régler à l'amiable les différends ou litiges qui viendraient à se
-produire par suite ou à l'occasion du Contrat.
+tenter de régler à l’amiable les différends ou litiges qui viendraient à se
+produire par suite ou à l’occasion du Contrat.
 
-13.2. A défaut d'accord amiable dans un délai de deux (2) mois à compter de
-leur survenance et sauf situation relevant d'une procédure d'urgence, les
+13.2. A défaut d’accord amiable dans un délai de deux (2) mois à compter de
+leur survenance et sauf situation relevant d’une procédure d’urgence, les
 différends ou litiges seront portés par la Partie la plus diligente devant
 les Tribunaux compétents de Paris.
 
-1 Ce: CEA, C: CNRS, I: INRIA, LL: Logiciel Libre Version 1 du 21/06/2004
+1 Ce: CEA, C: CNRS, I: INRIA, LL: Logiciel Libre
+
+Version 1 du 21/06/2004
diff --git a/options/license/CECILL-1.1 b/options/license/CECILL-1.1
index b3db070ee1..21fe2f3c9a 100644
--- a/options/license/CECILL-1.1
+++ b/options/license/CECILL-1.1
@@ -1,41 +1,33 @@
-FREE SOFTWARE LICENSING AGREEMENT CeCILL Notice
+ FREE SOFTWARE LICENSING AGREEMENT CeCILL
+
+Notice
 
 This Agreement is a free software license that is the result of discussions
 between its authors in order to ensure compliance with the two main principles
 guiding its drafting:
-
 - firstly, its conformity with French law, both as regards the law of torts
 and intellectual property law, and the protection that it offers to authors
 and the holders of economic rights over software.
-
 - secondly, compliance with the principles for the distribution of free software:
 access to source codes, extended user-rights.
 
 The following bodies are the authors of this license CeCILL (Ce : CEA, C :
 CNRS, I : INRIA, LL : Logiciel Libre):
 
-   
-
 Commissariat à l'Energie Atomique - CEA, a public scientific, technical and
 industrial establishment, having its principal place of business at 31-33
 rue de la Fédération, 75752 PARIS cedex 15, France.
 
-   
-
 Centre National de la Recherche Scientifique - CNRS, a public scientific and
 technological establishment, having its principal place of business at 3 rue
 Michel-Ange 75794 Paris cedex 16, France.
 
-   
-
 Institut National de Recherche en Informatique et en Automatique - INRIA,
 a public scientific and technological establishment, having its principal
 place of business at Domaine de Voluceau, Rocquencourt, BP 105, 78153 Le Chesnay
 cedex.
 
-   
-
-   PREAMBLE
+PREAMBLE
 
 The purpose of this Free Software Licensing Agreement is to grant users the
 right to modify and redistribute the software governed by this license within
@@ -65,106 +57,74 @@ herefrom.
 This Agreement may apply to any or all software for which the holder of the
 economic rights decides to submit the operation thereof to its provisions.
 
-   Article 1 - DEFINITIONS
+Article 1 - DEFINITIONS
 
 For the purposes of this Agreement, when the following expressions commence
 with a capital letter, they shall have the following meaning:
 
-      
-
 Agreement: means this Licensing Agreement, and any or all of its subsequent
 versions.
 
-      
-
 Software: means the software in its Object Code and/or Source Code form and,
 where applicable, its documentation, "as is" at the time when the Licensee
 accepts the Agreement.
 
-      
-
 Initial Software: means the Software in its Source Code and/or Object Code
 form and, where applicable, its documentation, "as is" at the time when it
 is distributed for the first time under the terms and conditions of the Agreement.
 
-      
-
 Modified Software: means the Software modified by at least one Contribution.
 
-      
-
 Source Code: means all the Software's instructions and program lines to which
 access is required so as to modify the Software.
 
-      
-
 Object Code: means the binary files originating from the compilation of the
 Source Code.
 
-      
-
 Holder: means the holder of the economic rights over the Initial Software.
 
-      
+Licensee(s): mean(s) the Software user(s) having accepted the Agreement.
 
-      Licensee(s): mean(s) the Software user(s) having accepted the Agreement.
-
-      
-
-      Contributor: means a Licensee having made at least one Contribution.
-
-      
+Contributor: means a Licensee having made at least one Contribution.
 
 Licensor: means the Holder, or any or all other individual or legal entity,
 that distributes the Software under the Agreement.
 
-      
-
 Contributions: mean any or all modifications, corrections, translations, adaptations
 and/or new functionalities integrated into the Software by any or all Contributor,
 and the Static Modules.
 
-      
-
 Module: means a set of sources files including their documentation that, once
 compiled in executable form, enables supplementary functionalities or services
 to be developed in addition to those offered by the Software.
 
-      
-
 Dynamic Module: means any or all module, created by the Contributor, that
 is independent of the Software, so that this module and the Software are in
 two different executable forms that are run in separate address spaces, with
 one calling the other when they are run.
 
-      
-
 Static Module: means any or all module, created by the Contributor and connected
 to the Software by a static link that makes their object codes interdependent.
 This module and the Software to which it is connected, are combined in a single
 executable.
 
-      
+Parties: mean both the Licensee and the Licensor.
 
-      Parties: mean both the Licensee and the Licensor.
+These expressions may be used both in singular and plural form.
 
-   These expressions may be used both in singular and plural form.
-
-   Article 2 - PURPOSE
+Article 2 - PURPOSE
 
 The purpose of the Agreement is to enable the Licensor to grant the Licensee
 a free, non-exclusive, transferable and worldwide License for the Software
 as set forth in Article 5 hereinafter for the whole term of protection of
 the rights over said Software.
 
-   Article 3 - ACCEPTANCE
+Article 3 - ACCEPTANCE
 
 3.1. The Licensee shall be deemed as having accepted the terms and conditions
 of this Agreement by the occurrence of the first of the following events:
-
 (i) loading the Software by any or all means, notably, by downloading from
 a remote server, or by loading from a physical medium;
-
 (ii) the first time the Licensee exercises any of the rights granted hereunder.
 
 3.2. One copy of the Agreement, containing a notice relating to the specific
@@ -173,14 +133,14 @@ use by experienced users has been provided to the Licensee prior to its acceptan
 as set forth in Article 3.1 hereinabove, and the Licensee hereby acknowledges
 that it is aware thereof.
 
-   Article 4 - EFFECTIVE DATE AND TERM
+Article 4 - EFFECTIVE DATE AND TERM
 
-      4.1. EFFECTIVE DATE
+4.1. EFFECTIVE DATE
 
 The Agreement shall become effective on the date when it is accepted by the
 Licensee as set forth in Article 3.1.
 
-      4.2. TERM
+4.2. TERM
 
 The Agreement shall remain in force during the whole legal term of protection
 of the economic rights over the Software.
@@ -195,24 +155,21 @@ Otherwise, the Licensor grants to the Licensee free of charge exploitation
 rights on the patents he holds on whole or part of the inventions implemented
 in the Software.
 
-      5.1. RIGHTS OF USE
+5.1. RIGHTS OF USE
 
 The Licensee is authorized to use the Software, unrestrictedly, as regards
 the fields of application, with it being hereinafter specified that this relates
 to:
-
 1. permanent or temporary reproduction of all or part of the Software by any
 or all means and in any or all form.
-
 2. loading, displaying, running, or storing the Software on any or all medium.
-
 3. entitlement to observe, study or test the operation thereof so as to establish
 the ideas and principles that form the basis for any or all constituent elements
 of said Software. This shall apply when the Licensee carries out any or all
 loading, displaying, running, transmission or storage operation as regards
 the Software, that it is entitled to carry out hereunder.
 
-      5.2. ENTITLEMENT TO MAKE CONTRIBUTIONS
+5.2. entitlement to make CONTRIBUTIONS
 
 The right to make Contributions includes the right to translate, adapt, arrange,
 or make any or all modification to the Software, and the right to reproduce
@@ -222,7 +179,7 @@ The Licensee is authorized to make any or all Contribution to the Software
 provided that it explicitly mentions its name as the author of said Contribution
 and the date of the development thereof.
 
-      5.3. DISTRIBUTION AND PUBLICATION RIGHTS
+5.3. DISTRIBUTION AND PUBLICATION RIGHTS
 
 In particular, the right of distribution and publication includes the right
 to transmit and communicate the Software to the general public on any or all
@@ -232,14 +189,13 @@ any or all process. The Licensee is further authorized to redistribute copies
 of the modified or unmodified Software to third parties according to the terms
 and conditions set forth hereinafter.
 
-         5.3.1. REDISTRIBUTION OF SOFTWARE WITHOUT MODIFICATION
+5.3.1. REDISTRIBUTION OF SOFTWARE WITHOUT MODIFICATION
 
 The Licensee is authorized to redistribute true copies of the Software in
 Source Code or Object Code form, provided that said redistribution complies
 with all the provisions of the Agreement and is accompanied by:
 
-            1. a copy of the Agreement,
-
+     1. a copy of the Agreement,
 2. a notice relating to the limitation of both the Licensor's warranty and
 liability as set forth in Articles 8 and 9,
 
@@ -249,7 +205,7 @@ Source Code by providing them with the terms and conditions for access thereto,
 it being understood that the additional cost of acquiring the Source Code
 shall not exceed the cost of transferring the data.
 
-         5.3.2. REDISTRIBUTION OF MODIFIED SOFTWARE
+5.3.2. REDISTRIBUTION OF MODIFIED SOFTWARE
 
 When the Licensee makes a Contribution to the Software, the terms and conditions
 for the redistribution of the Modified Software shall then be subject to all
@@ -259,8 +215,7 @@ The Licensee is authorized to redistribute the Modified Software, in Source
 Code or Object Code form, provided that said redistribution complies with
 all the provisions of the Agreement and is accompanied by:
 
-            1. a copy of the Agreement,
-
+     1. a copy of the Agreement,
 2. a notice relating to the limitation of both the Licensor's warranty and
 liability as set forth in Articles 8 and 9,
 
@@ -270,13 +225,13 @@ full Source Code by providing them with the terms and conditions for access
 thereto, it being understood that the additional cost of acquiring the Source
 Code shall not exceed the cost of transferring the data.
 
-         5.3.3. REDISTRIBUTION OF DYNAMIC MODULES
+5.3.3. redistribution OF DYNAMIC MODULES
 
 When the Licensee has developed a Dynamic Module, the terms and conditions
 hereof do not apply to said Dynamic Module, that may be distributed under
 a separate Licensing Agreement.
 
-         5.3.4. COMPATIBILITY WITH THE GPL LICENSE
+5.3.4. COMPATIBILITY WITH THE GPL LICENSE
 
 In the event that the Modified or unmodified Software is included in a code
 that is subject to the provisions of the GPL License, the Licensee is authorized
@@ -286,9 +241,9 @@ In the event that the Modified Software includes a code that is subject to
 the provisions of the GPL License, the Licensee is authorized to redistribute
 the Modified Software under the GPL License.
 
-   Article 6 - INTELLECTUAL PROPERTY
+Article 6 - INTELLECTUAL PROPERTY
 
-      6.1. OVER THE INITIAL SOFTWARE
+6.1. OVER THE INITIAL SOFTWARE
 
 The Holder owns the economic rights over the Initial Software. Any or all
 use of the Initial Software is subject to compliance with the terms and conditions
@@ -300,37 +255,32 @@ The Holder undertakes to maintain the distribution of the Initial Software
 under the conditions of the Agreement, for the duration set forth in article
 4.2..
 
-      6.2. OVER THE CONTRIBUTIONS
+6.2. OVER THE CONTRIBUTIONS
 
 The intellectual property rights over the Contributions belong to the holder
 of the economic rights as designated by effective legislation.
 
-      6.3. OVER THE DYNAMIC MODULES
+6.3. OVER THE DYNAMIC MODULES
 
 The Licensee having developed a Dynamic Module is the holder of the intellectual
 property rights over said Dynamic Module and is free to choose the agreement
 that shall govern its distribution.
 
-      6.4. JOINT PROVISIONS
+6.4. JOINT PROVISIONS
 
-         
-
-         6.4.1. The Licensee expressly undertakes:
+6.4.1. The Licensee expressly undertakes:
 
 1. not to remove, or modify, in any or all manner, the intellectual property
 notices affixed to the Software;
-
 2. to reproduce said notices, in an identical manner, in the copies of the
 Software.
 
-         
-
 6.4.2. The Licensee undertakes not to directly or indirectly infringe the
 intellectual property rights of the Holder and/or Contributors and to take,
 where applicable, vis-à-vis its staff, any or all measures required to ensure
 respect for said intellectual property rights of the Holder and/or Contributors.
 
-   Article 7 - RELATED SERVICES
+Article 7 - RELATED SERVICES
 
 7.1. Under no circumstances shall the Agreement oblige the Licensor to provide
 technical assistance or maintenance services for the Software.
@@ -347,7 +297,7 @@ under terms and conditions that it shall decide upon itself. Said warranty,
 and the financial terms and conditions of its application, shall be subject
 to a separate instrument executed between the Licensor and the Licensee.
 
-   Article 8 - LIABILITY
+Article 8 - LIABILITY
 
 8.1. Subject to the provisions of Article 8.2, should the Licensor fail to
 fulfill all or part of its obligations hereunder, the Licensee shall be entitled
@@ -367,7 +317,7 @@ activities) or any or all legal proceedings instituted against the Licensee
 by a third party, shall constitute consequential loss and shall not provide
 entitlement to any or all compensation from the Licensor.
 
-   Article 9 - WARRANTY
+Article 9 - WARRANTY
 
 9.1. The Licensee acknowledges that the current situation as regards scientific
 and technical know-how at the time when the Software was distributed did not
@@ -409,7 +359,7 @@ as regards the Licensee's use of the Software's name. No warranty shall be
 provided as regards the existence of prior rights over the name of the Software
 and as regards the existence of a trademark.
 
-   Article 10 - TERMINATION
+Article 10 - TERMINATION
 
 10.1. In the event of a breach by the Licensee of its obligations hereunder,
 the Licensor may automatically terminate this Agreement thirty (30) days after
@@ -421,9 +371,9 @@ it may have granted prior to termination of the Agreement shall remain valid
 subject to their having been granted in compliance with the terms and conditions
 hereof.
 
-   Article 11 - MISCELLANEOUS PROVISIONS
+Article 11 - MISCELLANEOUS PROVISIONS
 
-      11.1. EXCUSABLE EVENTS
+11.1. EXCUSABLE EVENTS
 
 Neither Party shall be liable for any or all delay, or failure to perform
 the Agreement, that may be attributable to an event of force majeure, an act
@@ -453,12 +403,12 @@ provisions shall remain effective. Similarly, the fact that a provision of
 the Agreement may be null and void, for any reason whatsoever, shall not cause
 the Agreement as a whole to be null and void.
 
-      11.5. LANGUAGE
+11.5. LANGUAGE
 
 The Agreement is drafted in both French and English. In the event of a conflict
 as regards construction, the French version shall be deemed authentic.
 
-   Article 12 - NEW VERSIONS OF THE AGREEMENT
+Article 12 - NEW VERSIONS OF THE AGREEMENT
 
 12.1. Any or all person is authorized to duplicate and distribute copies of
 this Agreement.
@@ -473,7 +423,7 @@ by Free Software.
 may only be subsequently distributed under the same version of the Agreement,
 or a subsequent version, subject to the provisions of article 5.3.4.
 
-   Article 13 - GOVERNING LAW AND JURISDICTION
+Article 13 - GOVERNING LAW AND JURISDICTION
 
 13.1. The Agreement is governed by French law. The Parties agree to endeavor
 to settle the disagreements or disputes that may arise during the performance
@@ -484,4 +434,4 @@ from their occurrence, and unless emergency proceedings are necessary, the
 disagreements or disputes shall be referred to the Paris Courts having jurisdiction,
 by the first Party to take action.
 
-Version 1.1 of 10/26/2004
+ Version 1.1 of 10/26/2004
diff --git a/options/license/CECILL-2.0 b/options/license/CECILL-2.0
index 243b7dc799..f5985c07da 100644
--- a/options/license/CECILL-2.0
+++ b/options/license/CECILL-2.0
@@ -1,477 +1,506 @@
-CeCILL FREE SOFTWARE LICENSE AGREEMENT Notice
 
-This Agreement is a Free Software license agreement that is the result of
-discussions between its authors in order to ensure compliance with the two
-main principles guiding its drafting:
+CeCILL FREE SOFTWARE LICENSE AGREEMENT
 
-* firstly, compliance with the principles governing the distribution of Free
-Software: access to source code, broad rights granted to users,
 
-* secondly, the election of a governing law, French law, with which it is
-conformant, both as regards the law of torts and intellectual property law,
-and the protection that it offers to both authors and holders of the economic
-rights over software.
+    Notice
 
-The authors of the CeCILL¹ license are:
+This Agreement is a Free Software license agreement that is the result
+of discussions between its authors in order to ensure compliance with
+the two main principles guiding its drafting:
 
-   
+    * firstly, compliance with the principles governing the distribution
+      of Free Software: access to source code, broad rights granted to
+      users,
+    * secondly, the election of a governing law, French law, with which
+      it is conformant, both as regards the law of torts and
+      intellectual property law, and the protection that it offers to
+      both authors and holders of the economic rights over software.
 
-Commissariat à l'Energie Atomique - CEA, a public scientific, technical and
-industrial research establishment, having its principal place of business
-at 25 rue Leblanc, immeuble Le Ponant D, 75015 Paris, France.
+The authors of the CeCILL (for Ce[a] C[nrs] I[nria] L[ogiciel] L[ibre])
+license are:
 
-   
+Commissariat à l'Energie Atomique - CEA, a public scientific, technical
+and industrial research establishment, having its principal place of
+business at 25 rue Leblanc, immeuble Le Ponant D, 75015 Paris, France.
 
-Centre National de la Recherche Scientifique - CNRS, a public scientific and
-technological establishment, having its principal place of business at 3 rue
-Michel-Ange, 75794 Paris cedex 16, France.
+Centre National de la Recherche Scientifique - CNRS, a public scientific
+and technological establishment, having its principal place of business
+at 3 rue Michel-Ange, 75794 Paris cedex 16, France.
 
-   
+Institut National de Recherche en Informatique et en Automatique -
+INRIA, a public scientific and technological establishment, having its
+principal place of business at Domaine de Voluceau, Rocquencourt, BP
+105, 78153 Le Chesnay cedex, France.
 
-Institut National de Recherche en Informatique et en Automatique - INRIA,
-a public scientific and technological establishment, having its principal
-place of business at Domaine de Voluceau, Rocquencourt, BP 105, 78153 Le Chesnay
-cedex, France.
 
-Preamble The purpose of this Free Software license agreement is to grant users
-the right to modify and redistribute the software governed by this license
-within the framework of an open source distribution model.
+    Preamble
 
-The exercising of these rights is conditional upon certain obligations for
-users so as to preserve this status for all subsequent redistributions.
+The purpose of this Free Software license agreement is to grant users
+the right to modify and redistribute the software governed by this
+license within the framework of an open source distribution model.
 
-In consideration of access to the source code and the rights to copy, modify
-and redistribute granted by the license, users are provided only with a limited
-warranty and the software's author, the holder of the economic rights, and
-the successive licensors only have limited liability.
+The exercising of these rights is conditional upon certain obligations
+for users so as to preserve this status for all subsequent redistributions.
 
-In this respect, the risks associated with loading, using, modifying and/or
-developing or reproducing the software by the user are brought to the user's
-attention, given its Free Software status, which may make it complicated to
-use, with the result that its use is reserved for developers and experienced
-professionals having in-depth computer knowledge. Users are therefore encouraged
-to load and test the suitability of the software as regards their requirements
-in conditions enabling the security of their systems and/or data to be ensured
-and, more generally, to use and operate it in the same conditions of security.
-This Agreement may be freely reproduced and published, provided it is not
-altered, and that no provisions are either added or removed herefrom.
+In consideration of access to the source code and the rights to copy,
+modify and redistribute granted by the license, users are provided only
+with a limited warranty and the software's author, the holder of the
+economic rights, and the successive licensors only have limited liability.
 
-This Agreement may apply to any or all software for which the holder of the
-economic rights decides to submit the use thereof to its provisions.
+In this respect, the risks associated with loading, using, modifying
+and/or developing or reproducing the software by the user are brought to
+the user's attention, given its Free Software status, which may make it
+complicated to use, with the result that its use is reserved for
+developers and experienced professionals having in-depth computer
+knowledge. Users are therefore encouraged to load and test the
+suitability of the software as regards their requirements in conditions
+enabling the security of their systems and/or data to be ensured and,
+more generally, to use and operate it in the same conditions of
+security. This Agreement may be freely reproduced and published,
+provided it is not altered, and that no provisions are either added or
+removed herefrom.
 
-   Article 1 - DEFINITIONS
+This Agreement may apply to any or all software for which the holder of
+the economic rights decides to submit the use thereof to its provisions.
 
-For the purpose of this Agreement, when the following expressions commence
-with a capital letter, they shall have the following meaning:
 
-      
+    Article 1 - DEFINITIONS
 
-Agreement: means this license agreement, and its possible subsequent versions
-and annexes.
+For the purpose of this Agreement, when the following expressions
+commence with a capital letter, they shall have the following meaning:
 
-      
+Agreement: means this license agreement, and its possible subsequent
+versions and annexes.
 
-Software: means the software in its Object Code and/or Source Code form and,
-where applicable, its documentation, "as is" when the Licensee accepts the
-Agreement.
+Software: means the software in its Object Code and/or Source Code form
+and, where applicable, its documentation, "as is" when the Licensee
+accepts the Agreement.
 
-      
+Initial Software: means the Software in its Source Code and possibly its
+Object Code form and, where applicable, its documentation, "as is" when
+it is first distributed under the terms and conditions of the Agreement.
 
-Initial Software: means the Software in its Source Code and possibly its Object
-Code form and, where applicable, its documentation, "as is" when it is first
-distributed under the terms and conditions of the Agreement.
+Modified Software: means the Software modified by at least one
+Contribution.
 
-      
+Source Code: means all the Software's instructions and program lines to
+which access is required so as to modify the Software.
 
-Modified Software: means the Software modified by at least one Contribution.
+Object Code: means the binary files originating from the compilation of
+the Source Code.
 
-      
+Holder: means the holder(s) of the economic rights over the Initial
+Software.
 
-Source Code: means all the Software's instructions and program lines to which
-access is required so as to modify the Software.
+Licensee: means the Software user(s) having accepted the Agreement.
 
-      
+Contributor: means a Licensee having made at least one Contribution.
 
-Object Code: means the binary files originating from the compilation of the
-Source Code.
+Licensor: means the Holder, or any other individual or legal entity, who
+distributes the Software under the Agreement.
 
-      
+Contribution: means any or all modifications, corrections, translations,
+adaptations and/or new functions integrated into the Software by any or
+all Contributors, as well as any or all Internal Modules.
 
-Holder: means the holder(s) of the economic rights over the Initial Software.
+Module: means a set of sources files including their documentation that
+enables supplementary functions or services in addition to those offered
+by the Software.
 
-      
+External Module: means any or all Modules, not derived from the
+Software, so that this Module and the Software run in separate address
+spaces, with one calling the other when they are run.
 
-      Licensee: means the Software user(s) having accepted the Agreement.
+Internal Module: means any or all Module, connected to the Software so
+that they both execute in the same address space.
 
-      
+GNU GPL: means the GNU General Public License version 2 or any
+subsequent version, as published by the Free Software Foundation Inc.
 
-      Contributor: means a Licensee having made at least one Contribution.
+Parties: mean both the Licensee and the Licensor.
 
-      
+These expressions may be used both in singular and plural form.
 
-Licensor: means the Holder, or any other individual or legal entity, who distributes
-the Software under the Agreement.
 
-      
+    Article 2 - PURPOSE
 
-Contribution: means any or all modifications, corrections, translations, adaptations
-and/or new functions integrated into the Software by any or all Contributors,
-as well as any or all Internal Modules.
+The purpose of the Agreement is the grant by the Licensor to the
+Licensee of a non-exclusive, transferable and worldwide license for the
+Software as set forth in Article 5 hereinafter for the whole term of the
+protection granted by the rights over said Software.
 
-      
 
-Module: means a set of sources files including their documentation that enables
-supplementary functions or services in addition to those offered by the Software.
+    Article 3 - ACCEPTANCE
 
-      
+3.1 The Licensee shall be deemed as having accepted the terms and
+conditions of this Agreement upon the occurrence of the first of the
+following events:
 
-External Module: means any or all Modules, not derived from the Software,
-so that this Module and the Software run in separate address spaces, with
-one calling the other when they are run.
+    * (i) loading the Software by any or all means, notably, by
+      downloading from a remote server, or by loading from a physical
+      medium;
+    * (ii) the first time the Licensee exercises any of the rights
+      granted hereunder.
 
-      
+3.2 One copy of the Agreement, containing a notice relating to the
+characteristics of the Software, to the limited warranty, and to the
+fact that its use is restricted to experienced users has been provided
+to the Licensee prior to its acceptance as set forth in Article 3.1
+hereinabove, and the Licensee hereby acknowledges that it has read and
+understood it.
 
-Internal Module: means any or all Module, connected to the Software so that
-they both execute in the same address space.
 
-      
+    Article 4 - EFFECTIVE DATE AND TERM
 
-GNU GPL: means the GNU General Public License version 2 or any subsequent
-version, as published by the Free Software Foundation Inc.
-
-      
-
-      Parties: mean both the Licensee and the Licensor.
-
-   These expressions may be used both in singular and plural form.
-
-   Article 2 - PURPOSE
-
-The purpose of the Agreement is the grant by the Licensor to the Licensee
-of a non-exclusive, transferable and worldwide license for the Software as
-set forth in Article 5 hereinafter for the whole term of the protection granted
-by the rights over said Software.
-
-   Article 3 - ACCEPTANCE
-
-3.1 The Licensee shall be deemed as having accepted the terms and conditions
-of this Agreement upon the occurrence of the first of the following events:
-
-(i) loading the Software by any or all means, notably, by downloading from
-a remote server, or by loading from a physical medium;
-
-(ii) the first time the Licensee exercises any of the rights granted hereunder.
-
-3.2 One copy of the Agreement, containing a notice relating to the characteristics
-of the Software, to the limited warranty, and to the fact that its use is
-restricted to experienced users has been provided to the Licensee prior to
-its acceptance as set forth in Article 3.1 hereinabove, and the Licensee hereby
-acknowledges that it has read and understood it.
-
-   Article 4 - EFFECTIVE DATE AND TERM
 
       4.1 EFFECTIVE DATE
 
-The Agreement shall become effective on the date when it is accepted by the
-Licensee as set forth in Article 3.1.
+The Agreement shall become effective on the date when it is accepted by
+the Licensee as set forth in Article 3.1.
+
 
       4.2 TERM
 
-The Agreement shall remain in force for the entire legal term of protection
-of the economic rights over the Software.
+The Agreement shall remain in force for the entire legal term of
+protection of the economic rights over the Software.
 
-   Article 5 - SCOPE OF RIGHTS GRANTED
 
-The Licensor hereby grants to the Licensee, who accepts, the following rights
-over the Software for any or all use, and for the term of the Agreement, on
-the basis of the terms and conditions set forth hereinafter.
+    Article 5 - SCOPE OF RIGHTS GRANTED
+
+The Licensor hereby grants to the Licensee, who accepts, the following
+rights over the Software for any or all use, and for the term of the
+Agreement, on the basis of the terms and conditions set forth hereinafter.
+
+Besides, if the Licensor owns or comes to own one or more patents
+protecting all or part of the functions of the Software or of its
+components, the Licensor undertakes not to enforce the rights granted by
+these patents against successive Licensees using, exploiting or
+modifying the Software. If these patents are transferred, the Licensor
+undertakes to have the transferees subscribe to the obligations set
+forth in this paragraph.
 
-Besides, if the Licensor owns or comes to own one or more patents protecting
-all or part of the functions of the Software or of its components, the Licensor
-undertakes not to enforce the rights granted by these patents against successive
-Licensees using, exploiting or modifying the Software. If these patents are
-transferred, the Licensor undertakes to have the transferees subscribe to
-the obligations set forth in this paragraph.
 
       5.1 RIGHT OF USE
 
-The Licensee is authorized to use the Software, without any limitation as
-to its fields of application, with it being hereinafter specified that this
-comprises:
+The Licensee is authorized to use the Software, without any limitation
+as to its fields of application, with it being hereinafter specified
+that this comprises:
 
-1. permanent or temporary reproduction of all or part of the Software by any
-or all means and in any or all form.
+   1. permanent or temporary reproduction of all or part of the Software
+      by any or all means and in any or all form.
 
-2. loading, displaying, running, or storing the Software on any or all medium.
+   2. loading, displaying, running, or storing the Software on any or
+      all medium.
+
+   3. entitlement to observe, study or test its operation so as to
+      determine the ideas and principles behind any or all constituent
+      elements of said Software. This shall apply when the Licensee
+      carries out any or all loading, displaying, running, transmission
+      or storage operation as regards the Software, that it is entitled
+      to carry out hereunder.
 
-3. entitlement to observe, study or test its operation so as to determine
-the ideas and principles behind any or all constituent elements of said Software.
-This shall apply when the Licensee carries out any or all loading, displaying,
-running, transmission or storage operation as regards the Software, that it
-is entitled to carry out hereunder.
 
       5.2 ENTITLEMENT TO MAKE CONTRIBUTIONS
 
-The right to make Contributions includes the right to translate, adapt, arrange,
-or make any or all modifications to the Software, and the right to reproduce
-the resulting software.
+The right to make Contributions includes the right to translate, adapt,
+arrange, or make any or all modifications to the Software, and the right
+to reproduce the resulting software.
+
+The Licensee is authorized to make any or all Contributions to the
+Software provided that it includes an explicit notice that it is the
+author of said Contribution and indicates the date of the creation thereof.
 
-The Licensee is authorized to make any or all Contributions to the Software
-provided that it includes an explicit notice that it is the author of said
-Contribution and indicates the date of the creation thereof.
 
       5.3 RIGHT OF DISTRIBUTION
 
-In particular, the right of distribution includes the right to publish, transmit
-and communicate the Software to the general public on any or all medium, and
-by any or all means, and the right to market, either in consideration of a
-fee, or free of charge, one or more copies of the Software by any means.
+In particular, the right of distribution includes the right to publish,
+transmit and communicate the Software to the general public on any or
+all medium, and by any or all means, and the right to market, either in
+consideration of a fee, or free of charge, one or more copies of the
+Software by any means.
 
-The Licensee is further authorized to distribute copies of the modified or
-unmodified Software to third parties according to the terms and conditions
-set forth hereinafter.
+The Licensee is further authorized to distribute copies of the modified
+or unmodified Software to third parties according to the terms and
+conditions set forth hereinafter.
 
-         5.3.1. DISTRIBUTION OF SOFTWARE WITHOUT MODIFICATION
 
-The Licensee is authorized to distribute true copies of the Software in Source
-Code or Object Code form, provided that said distribution complies with all
-the provisions of the Agreement and is accompanied by:
+        5.3.1 DISTRIBUTION OF SOFTWARE WITHOUT MODIFICATION
 
-            1. a copy of the Agreement,
+The Licensee is authorized to distribute true copies of the Software in
+Source Code or Object Code form, provided that said distribution
+complies with all the provisions of the Agreement and is accompanied by:
 
-2. a notice relating to the limitation of both the Licensor's warranty and
-liability as set forth in Articles 8 and 9,
+   1. a copy of the Agreement,
 
-and that, in the event that only the Object Code of the Software is redistributed,
-the Licensee allows future Licensees unhindered access to the full Source
-Code of the Software by indicating how to access it, it being understood that
-the additional cost of acquiring the Source Code shall not exceed the cost
-of transferring the data.
+   2. a notice relating to the limitation of both the Licensor's
+      warranty and liability as set forth in Articles 8 and 9,
 
-         5.3.2. DISTRIBUTION OF MODIFIED SOFTWARE
-
-When the Licensee makes a Contribution to the Software, the terms and conditions
-for the distribution of the resulting Modified Software become subject to
-all the provisions of this Agreement.
-
-The Licensee is authorized to distribute the Modified Software, in source
-code or object code form, provided that said distribution complies with all
-the provisions of the Agreement and is accompanied by:
-
-            1. a copy of the Agreement,
-
-2. a notice relating to the limitation of both the Licensor's warranty and
-liability as set forth in Articles 8 and 9,
-
-and that, in the event that only the object code of the Modified Software
-is redistributed, the Licensee allows future Licensees unhindered access to
-the full source code of the Modified Software by indicating how to access
-it, it being understood that the additional cost of acquiring the source code
+and that, in the event that only the Object Code of the Software is
+redistributed, the Licensee allows future Licensees unhindered access to
+the full Source Code of the Software by indicating how to access it, it
+being understood that the additional cost of acquiring the Source Code
 shall not exceed the cost of transferring the data.
 
-         5.3.3. DISTRIBUTION OF EXTERNAL MODULES
 
-When the Licensee has developed an External Module, the terms and conditions
-of this Agreement do not apply to said External Module, that may be distributed
-under a separate license agreement.
+        5.3.2 DISTRIBUTION OF MODIFIED SOFTWARE
 
-         5.3.4. COMPATIBILITY WITH THE GNU GPL
+When the Licensee makes a Contribution to the Software, the terms and
+conditions for the distribution of the resulting Modified Software
+become subject to all the provisions of this Agreement.
 
-The Licensee can include a code that is subject to the provisions of one of
-the versions of the GNU GPL in the Modified or unmodified Software, and distribute
-that entire code under the terms of the same version of the GNU GPL.
+The Licensee is authorized to distribute the Modified Software, in
+source code or object code form, provided that said distribution
+complies with all the provisions of the Agreement and is accompanied by:
 
-The Licensee can include the Modified or unmodified Software in a code that
-is subject to the provisions of one of the versions of the GNU GPL, and distribute
-that entire code under the terms of the same version of the GNU GPL.
+   1. a copy of the Agreement,
+
+   2. a notice relating to the limitation of both the Licensor's
+      warranty and liability as set forth in Articles 8 and 9,
+
+and that, in the event that only the object code of the Modified
+Software is redistributed, the Licensee allows future Licensees
+unhindered access to the full source code of the Modified Software by
+indicating how to access it, it being understood that the additional
+cost of acquiring the source code shall not exceed the cost of
+transferring the data.
+
+
+        5.3.3 DISTRIBUTION OF EXTERNAL MODULES
+
+When the Licensee has developed an External Module, the terms and
+conditions of this Agreement do not apply to said External Module, that
+may be distributed under a separate license agreement.
+
+
+        5.3.4 COMPATIBILITY WITH THE GNU GPL
+
+The Licensee can include a code that is subject to the provisions of one
+of the versions of the GNU GPL in the Modified or unmodified Software,
+and distribute that entire code under the terms of the same version of
+the GNU GPL.
+
+The Licensee can include the Modified or unmodified Software in a code
+that is subject to the provisions of one of the versions of the GNU GPL,
+and distribute that entire code under the terms of the same version of
+the GNU GPL.
+
+
+    Article 6 - INTELLECTUAL PROPERTY
 
-   Article 6 - INTELLECTUAL PROPERTY
 
       6.1 OVER THE INITIAL SOFTWARE
 
-The Holder owns the economic rights over the Initial Software. Any or all
-use of the Initial Software is subject to compliance with the terms and conditions
-under which the Holder has elected to distribute its work and no one shall
-be entitled to modify the terms and conditions for the distribution of said
-Initial Software.
+The Holder owns the economic rights over the Initial Software. Any or
+all use of the Initial Software is subject to compliance with the terms
+and conditions under which the Holder has elected to distribute its work
+and no one shall be entitled to modify the terms and conditions for the
+distribution of said Initial Software.
+
+The Holder undertakes that the Initial Software will remain ruled at
+least by this Agreement, for the duration set forth in Article 4.2.
 
-The Holder undertakes that the Initial Software will remain ruled at least
-by this Agreement, for the duration set forth in Article 4.2.
 
       6.2 OVER THE CONTRIBUTIONS
 
-The Licensee who develops a Contribution is the owner of the intellectual
-property rights over this Contribution as defined by applicable law.
+The Licensee who develops a Contribution is the owner of the
+intellectual property rights over this Contribution as defined by
+applicable law.
+
 
       6.3 OVER THE EXTERNAL MODULES
 
-The Licensee who develops an External Module is the owner of the intellectual
-property rights over this External Module as defined by applicable law and
-is free to choose the type of agreement that shall govern its distribution.
+The Licensee who develops an External Module is the owner of the
+intellectual property rights over this External Module as defined by
+applicable law and is free to choose the type of agreement that shall
+govern its distribution.
+
 
       6.4 JOINT PROVISIONS
 
-      The Licensee expressly undertakes:
+The Licensee expressly undertakes:
 
-1. not to remove, or modify, in any manner, the intellectual property notices
-attached to the Software;
+   1. not to remove, or modify, in any manner, the intellectual property
+      notices attached to the Software;
 
-2. to reproduce said notices, in an identical manner, in the copies of the
-Software modified or not.
+   2. to reproduce said notices, in an identical manner, in the copies
+      of the Software modified or not.
 
-The Licensee undertakes not to directly or indirectly infringe the intellectual
-property rights of the Holder and/or Contributors on the Software and to take,
-where applicable, vis-à-vis its staff, any and all measures required to ensure
-respect of said intellectual property rights of the Holder and/or Contributors.
+The Licensee undertakes not to directly or indirectly infringe the
+intellectual property rights of the Holder and/or Contributors on the
+Software and to take, where applicable, vis-à-vis its staff, any and all
+measures required to ensure respect of said intellectual property rights
+of the Holder and/or Contributors.
 
-   Article 7 - RELATED SERVICES
 
-7.1 Under no circumstances shall the Agreement oblige the Licensor to provide
-technical assistance or maintenance services for the Software.
+    Article 7 - RELATED SERVICES
 
-However, the Licensor is entitled to offer this type of services. The terms
-and conditions of such technical assistance, and/or such maintenance, shall
-be set forth in a separate instrument. Only the Licensor offering said maintenance
-and/or technical assistance services shall incur liability therefor.
+7.1 Under no circumstances shall the Agreement oblige the Licensor to
+provide technical assistance or maintenance services for the Software.
 
-7.2 Similarly, any Licensor is entitled to offer to its licensees, under its
-sole responsibility, a warranty, that shall only be binding upon itself, for
-the redistribution of the Software and/or the Modified Software, under terms
-and conditions that it is free to decide. Said warranty, and the financial
-terms and conditions of its application, shall be subject of a separate instrument
-executed between the Licensor and the Licensee.
+However, the Licensor is entitled to offer this type of services. The
+terms and conditions of such technical assistance, and/or such
+maintenance, shall be set forth in a separate instrument. Only the
+Licensor offering said maintenance and/or technical assistance services
+shall incur liability therefor.
 
-   Article 8 - LIABILITY
+7.2 Similarly, any Licensor is entitled to offer to its licensees, under
+its sole responsibility, a warranty, that shall only be binding upon
+itself, for the redistribution of the Software and/or the Modified
+Software, under terms and conditions that it is free to decide. Said
+warranty, and the financial terms and conditions of its application,
+shall be subject of a separate instrument executed between the Licensor
+and the Licensee.
 
-8.1 Subject to the provisions of Article 8.2, the Licensee shall be entitled
-to claim compensation for any direct loss it may have suffered from the Software
-as a result of a fault on the part of the relevant Licensor, subject to providing
-evidence thereof.
 
-8.2 The Licensor's liability is limited to the commitments made under this
-Agreement and shall not be incurred as a result of in particular: (i) loss
-due the Licensee's total or partial failure to fulfill its obligations, (ii)
-direct or consequential loss that is suffered by the Licensee due to the use
-or performance of the Software, and (iii) more generally, any consequential
-loss. In particular the Parties expressly agree that any or all pecuniary
-or business loss (i.e. loss of data, loss of profits, operating loss, loss
-of customers or orders, opportunity cost, any disturbance to business activities)
-or any or all legal proceedings instituted against the Licensee by a third
-party, shall constitute consequential loss and shall not provide entitlement
-to any or all compensation from the Licensor.
+    Article 8 - LIABILITY
 
-   Article 9 - WARRANTY
+8.1 Subject to the provisions of Article 8.2, the Licensee shall be
+entitled to claim compensation for any direct loss it may have suffered
+from the Software as a result of a fault on the part of the relevant
+Licensor, subject to providing evidence thereof.
 
-9.1 The Licensee acknowledges that the scientific and technical state-of-the-art
-when the Software was distributed did not enable all possible uses to be tested
-and verified, nor for the presence of possible defects to be detected. In
-this respect, the Licensee's attention has been drawn to the risks associated
-with loading, using, modifying and/or developing and reproducing the Software
-which are reserved for experienced users.
+8.2 The Licensor's liability is limited to the commitments made under
+this Agreement and shall not be incurred as a result of in particular:
+(i) loss due the Licensee's total or partial failure to fulfill its
+obligations, (ii) direct or consequential loss that is suffered by the
+Licensee due to the use or performance of the Software, and (iii) more
+generally, any consequential loss. In particular the Parties expressly
+agree that any or all pecuniary or business loss (i.e. loss of data,
+loss of profits, operating loss, loss of customers or orders,
+opportunity cost, any disturbance to business activities) or any or all
+legal proceedings instituted against the Licensee by a third party,
+shall constitute consequential loss and shall not provide entitlement to
+any or all compensation from the Licensor.
 
-The Licensee shall be responsible for verifying, by any or all means, the
-suitability of the product for its requirements, its good working order, and
-for ensuring that it shall not cause damage to either persons or properties.
 
-9.2 The Licensor hereby represents, in good faith, that it is entitled to
-grant all the rights over the Software (including in particular the rights
-set forth in Article 5).
+    Article 9 - WARRANTY
 
-9.3 The Licensee acknowledges that the Software is supplied "as is" by the
-Licensor without any other express or tacit warranty, other than that provided
-for in Article 9.2 and, in particular, without any warranty as to its commercial
-value, its secured, safe, innovative or relevant nature.
+9.1 The Licensee acknowledges that the scientific and technical
+state-of-the-art when the Software was distributed did not enable all
+possible uses to be tested and verified, nor for the presence of
+possible defects to be detected. In this respect, the Licensee's
+attention has been drawn to the risks associated with loading, using,
+modifying and/or developing and reproducing the Software which are
+reserved for experienced users.
 
-Specifically, the Licensor does not warrant that the Software is free from
-any error, that it will operate without interruption, that it will be compatible
-with the Licensee's own equipment and software configuration, nor that it
-will meet the Licensee's requirements.
+The Licensee shall be responsible for verifying, by any or all means,
+the suitability of the product for its requirements, its good working
+order, and for ensuring that it shall not cause damage to either persons
+or properties.
 
-9.4 The Licensor does not either expressly or tacitly warrant that the Software
-does not infringe any third party intellectual property right relating to
-a patent, software or any other property right. Therefore, the Licensor disclaims
-any and all liability towards the Licensee arising out of any or all proceedings
-for infringement that may be instituted in respect of the use, modification
-and redistribution of the Software. Nevertheless, should such proceedings
-be instituted against the Licensee, the Licensor shall provide it with technical
-and legal assistance for its defense. Such technical and legal assistance
-shall be decided on a case-by-case basis between the relevant Licensor and
-the Licensee pursuant to a memorandum of understanding. The Licensor disclaims
-any and all liability as regards the Licensee's use of the name of the Software.
-No warranty is given as regards the existence of prior rights over the name
-of the Software or as regards the existence of a trademark.
+9.2 The Licensor hereby represents, in good faith, that it is entitled
+to grant all the rights over the Software (including in particular the
+rights set forth in Article 5).
 
-   Article 10 - TERMINATION
+9.3 The Licensee acknowledges that the Software is supplied "as is" by
+the Licensor without any other express or tacit warranty, other than
+that provided for in Article 9.2 and, in particular, without any warranty
+as to its commercial value, its secured, safe, innovative or relevant
+nature.
 
-10.1 In the event of a breach by the Licensee of its obligations hereunder,
-the Licensor may automatically terminate this Agreement thirty (30) days after
-notice has been sent to the Licensee and has remained ineffective.
+Specifically, the Licensor does not warrant that the Software is free
+from any error, that it will operate without interruption, that it will
+be compatible with the Licensee's own equipment and software
+configuration, nor that it will meet the Licensee's requirements.
 
-10.2 A Licensee whose Agreement is terminated shall no longer be authorized
-to use, modify or distribute the Software. However, any licenses that it may
-have granted prior to termination of the Agreement shall remain valid subject
-to their having been granted in compliance with the terms and conditions hereof.
+9.4 The Licensor does not either expressly or tacitly warrant that the
+Software does not infringe any third party intellectual property right
+relating to a patent, software or any other property right. Therefore,
+the Licensor disclaims any and all liability towards the Licensee
+arising out of any or all proceedings for infringement that may be
+instituted in respect of the use, modification and redistribution of the
+Software. Nevertheless, should such proceedings be instituted against
+the Licensee, the Licensor shall provide it with technical and legal
+assistance for its defense. Such technical and legal assistance shall be
+decided on a case-by-case basis between the relevant Licensor and the
+Licensee pursuant to a memorandum of understanding. The Licensor
+disclaims any and all liability as regards the Licensee's use of the
+name of the Software. No warranty is given as regards the existence of
+prior rights over the name of the Software or as regards the existence
+of a trademark.
+
+
+    Article 10 - TERMINATION
+
+10.1 In the event of a breach by the Licensee of its obligations
+hereunder, the Licensor may automatically terminate this Agreement
+thirty (30) days after notice has been sent to the Licensee and has
+remained ineffective.
+
+10.2 A Licensee whose Agreement is terminated shall no longer be
+authorized to use, modify or distribute the Software. However, any
+licenses that it may have granted prior to termination of the Agreement
+shall remain valid subject to their having been granted in compliance
+with the terms and conditions hereof.
+
+
+    Article 11 - MISCELLANEOUS
 
-   Article 11 - MISCELLANEOUS
 
       11.1 EXCUSABLE EVENTS
 
-Neither Party shall be liable for any or all delay, or failure to perform
-the Agreement, that may be attributable to an event of force majeure, an act
-of God or an outside cause, such as defective functioning or interruptions
-of the electricity or telecommunications networks, network paralysis following
-a virus attack, intervention by government authorities, natural disasters,
-water damage, earthquakes, fire, explosions, strikes and labor unrest, war,
-etc.
+Neither Party shall be liable for any or all delay, or failure to
+perform the Agreement, that may be attributable to an event of force
+majeure, an act of God or an outside cause, such as defective
+functioning or interruptions of the electricity or telecommunications
+networks, network paralysis following a virus attack, intervention by
+government authorities, natural disasters, water damage, earthquakes,
+fire, explosions, strikes and labor unrest, war, etc.
 
-11.2 Any failure by either Party, on one or more occasions, to invoke one
-or more of the provisions hereof, shall under no circumstances be interpreted
-as being a waiver by the interested Party of its right to invoke said provision(s)
-subsequently.
+11.2 Any failure by either Party, on one or more occasions, to invoke
+one or more of the provisions hereof, shall under no circumstances be
+interpreted as being a waiver by the interested Party of its right to
+invoke said provision(s) subsequently.
 
-11.3 The Agreement cancels and replaces any or all previous agreements, whether
-written or oral, between the Parties and having the same purpose, and constitutes
-the entirety of the agreement between said Parties concerning said purpose.
-No supplement or modification to the terms and conditions hereof shall be
-effective as between the Parties unless it is made in writing and signed by
-their duly authorized representatives.
+11.3 The Agreement cancels and replaces any or all previous agreements,
+whether written or oral, between the Parties and having the same
+purpose, and constitutes the entirety of the agreement between said
+Parties concerning said purpose. No supplement or modification to the
+terms and conditions hereof shall be effective as between the Parties
+unless it is made in writing and signed by their duly authorized
+representatives.
+
+11.4 In the event that one or more of the provisions hereof were to
+conflict with a current or future applicable act or legislative text,
+said act or legislative text shall prevail, and the Parties shall make
+the necessary amendments so as to comply with said act or legislative
+text. All other provisions shall remain effective. Similarly, invalidity
+of a provision of the Agreement, for any reason whatsoever, shall not
+cause the Agreement as a whole to be invalid.
 
-11.4 In the event that one or more of the provisions hereof were to conflict
-with a current or future applicable act or legislative text, said act or legislative
-text shall prevail, and the Parties shall make the necessary amendments so
-as to comply with said act or legislative text. All other provisions shall
-remain effective. Similarly, invalidity of a provision of the Agreement, for
-any reason whatsoever, shall not cause the Agreement as a whole to be invalid.
 
       11.5 LANGUAGE
 
-The Agreement is drafted in both French and English and both versions are
-deemed authentic.
+The Agreement is drafted in both French and English and both versions
+are deemed authentic.
 
-   Article 12 - NEW VERSIONS OF THE AGREEMENT
 
-12.1 Any person is authorized to duplicate and distribute copies of this Agreement.
+    Article 12 - NEW VERSIONS OF THE AGREEMENT
 
-12.2 So as to ensure coherence, the wording of this Agreement is protected
-and may only be modified by the authors of the License, who reserve the right
-to periodically publish updates or new versions of the Agreement, each with
-a separate number. These subsequent versions may address new issues encountered
-by Free Software.
+12.1 Any person is authorized to duplicate and distribute copies of this
+Agreement.
 
-12.3 Any Software distributed under a given version of the Agreement may only
-be subsequently distributed under the same version of the Agreement or a subsequent
-version, subject to the provisions of Article 5.3.4.
+12.2 So as to ensure coherence, the wording of this Agreement is
+protected and may only be modified by the authors of the License, who
+reserve the right to periodically publish updates or new versions of the
+Agreement, each with a separate number. These subsequent versions may
+address new issues encountered by Free Software.
 
-   Article 13 - GOVERNING LAW AND JURISDICTION
+12.3 Any Software distributed under a given version of the Agreement may
+only be subsequently distributed under the same version of the Agreement
+or a subsequent version, subject to the provisions of Article 5.3.4.
 
-13.1 The Agreement is governed by French law. The Parties agree to endeavor
-to seek an amicable solution to any disagreements or disputes that may arise
-during the performance of the Agreement.
 
-13.2 Failing an amicable solution within two (2) months as from their occurrence,
-and unless emergency proceedings are necessary, the disagreements or disputes
-shall be referred to the Paris Courts having jurisdiction, by the more diligent
-Party.
+    Article 13 - GOVERNING LAW AND JURISDICTION
 
-Version 2.0 dated 2006-09-05. 1 CeCILL stands for Ce(a) C(nrs) I(nria) L(ogiciel)
-L(ibre)
+13.1 The Agreement is governed by French law. The Parties agree to
+endeavor to seek an amicable solution to any disagreements or disputes
+that may arise during the performance of the Agreement.
+
+13.2 Failing an amicable solution within two (2) months as from their
+occurrence, and unless emergency proceedings are necessary, the
+disagreements or disputes shall be referred to the Paris Courts having
+jurisdiction, by the more diligent Party.
+
+
+Version 2.0 dated 2006-09-05.
diff --git a/options/license/CECILL-2.1 b/options/license/CECILL-2.1
index 44d7b76639..d290c0694a 100644
--- a/options/license/CECILL-2.1
+++ b/options/license/CECILL-2.1
@@ -1,493 +1,518 @@
-CeCILL FREE SOFTWARE LICENSE AGREEMENT
 
-Version 2.1 dated 2013-06-21 Notice
+  CeCILL FREE SOFTWARE LICENSE AGREEMENT
 
-This Agreement is a Free Software license agreement that is the result of
-discussions between its authors in order to ensure compliance with the two
-main principles guiding its drafting:
+Version 2.1 dated 2013-06-21
 
-* firstly, compliance with the principles governing the distribution of Free
-Software: access to source code, broad rights granted to users,
 
-* secondly, the election of a governing law, French law, with which it is
-conformant, both as regards the law of torts and intellectual property law,
-and the protection that it offers to both authors and holders of the economic
-rights over software.
+    Notice
 
-The authors of the CeCILL¹ license are:
+This Agreement is a Free Software license agreement that is the result
+of discussions between its authors in order to ensure compliance with
+the two main principles guiding its drafting:
 
-   
+  * firstly, compliance with the principles governing the distribution
+    of Free Software: access to source code, broad rights granted to users,
+  * secondly, the election of a governing law, French law, with which it
+    is conformant, both as regards the law of torts and intellectual
+    property law, and the protection that it offers to both authors and
+    holders of the economic rights over software.
 
-Commissariat à l'énergie atomique et aux énergies alternatives - CEA, a public
-scientific, technical and industrial research establishment, having its principal
-place of business at 25 rue Leblanc, immeuble Le Ponant D, 75015 Paris, France.
+The authors of the CeCILL (for Ce[a] C[nrs] I[nria] L[ogiciel] L[ibre])
+license are:
 
-   
+Commissariat à l'énergie atomique et aux énergies alternatives - CEA, a
+public scientific, technical and industrial research establishment,
+having its principal place of business at 25 rue Leblanc, immeuble Le
+Ponant D, 75015 Paris, France.
 
-Centre National de la Recherche Scientifique - CNRS, a public scientific and
-technological establishment, having its principal place of business at 3 rue
-Michel-Ange, 75794 Paris cedex 16, France.
+Centre National de la Recherche Scientifique - CNRS, a public scientific
+and technological establishment, having its principal place of business
+at 3 rue Michel-Ange, 75794 Paris cedex 16, France.
 
-   
+Institut National de Recherche en Informatique et en Automatique -
+Inria, a public scientific and technological establishment, having its
+principal place of business at Domaine de Voluceau, Rocquencourt, BP
+105, 78153 Le Chesnay cedex, France.
 
-Institut National de Recherche en Informatique et en Automatique - Inria,
-a public scientific and technological establishment, having its principal
-place of business at Domaine de Voluceau, Rocquencourt, BP 105, 78153 Le Chesnay
-cedex, France.
 
-Preamble The purpose of this Free Software license agreement is to grant users
-the right to modify and redistribute the software governed by this license
-within the framework of an open source distribution model.
+    Preamble
 
-The exercising of this right is conditional upon certain obligations for users
-so as to preserve this status for all subsequent redistributions.
+The purpose of this Free Software license agreement is to grant users
+the right to modify and redistribute the software governed by this
+license within the framework of an open source distribution model.
 
-In consideration of access to the source code and the rights to copy, modify
-and redistribute granted by the license, users are provided only with a limited
-warranty and the software's author, the holder of the economic rights, and
-the successive licensors only have limited liability.
+The exercising of this right is conditional upon certain obligations for
+users so as to preserve this status for all subsequent redistributions.
 
-In this respect, the risks associated with loading, using, modifying and/or
-developing or reproducing the software by the user are brought to the user's
-attention, given its Free Software status, which may make it complicated to
-use, with the result that its use is reserved for developers and experienced
-professionals having in-depth computer knowledge. Users are therefore encouraged
-to load and test the suitability of the software as regards their requirements
-in conditions enabling the security of their systems and/or data to be ensured
-and, more generally, to use and operate it in the same conditions of security.
-This Agreement may be freely reproduced and published, provided it is not
-altered, and that no provisions are either added or removed herefrom.
+In consideration of access to the source code and the rights to copy,
+modify and redistribute granted by the license, users are provided only
+with a limited warranty and the software's author, the holder of the
+economic rights, and the successive licensors only have limited liability.
 
-This Agreement may apply to any or all software for which the holder of the
-economic rights decides to submit the use thereof to its provisions.
+In this respect, the risks associated with loading, using, modifying
+and/or developing or reproducing the software by the user are brought to
+the user's attention, given its Free Software status, which may make it
+complicated to use, with the result that its use is reserved for
+developers and experienced professionals having in-depth computer
+knowledge. Users are therefore encouraged to load and test the
+suitability of the software as regards their requirements in conditions
+enabling the security of their systems and/or data to be ensured and,
+more generally, to use and operate it in the same conditions of
+security. This Agreement may be freely reproduced and published,
+provided it is not altered, and that no provisions are either added or
+removed herefrom.
 
-Frequently asked questions can be found on the official website of the CeCILL
-licenses family (http://www.cecill.info/index.en.html) for any necessary clarification.
+This Agreement may apply to any or all software for which the holder of
+the economic rights decides to submit the use thereof to its provisions.
 
-   Article 1 - DEFINITIONS
+Frequently asked questions can be found on the official website of the
+CeCILL licenses family (http://www.cecill.info/index.en.html) for any
+necessary clarification.
 
-For the purpose of this Agreement, when the following expressions commence
-with a capital letter, they shall have the following meaning:
 
-      
+    Article 1 - DEFINITIONS
 
-Agreement: means this license agreement, and its possible subsequent versions
-and annexes.
+For the purpose of this Agreement, when the following expressions
+commence with a capital letter, they shall have the following meaning:
 
-      
+Agreement: means this license agreement, and its possible subsequent
+versions and annexes.
 
-Software: means the software in its Object Code and/or Source Code form and,
-where applicable, its documentation, "as is" when the Licensee accepts the
-Agreement.
+Software: means the software in its Object Code and/or Source Code form
+and, where applicable, its documentation, "as is" when the Licensee
+accepts the Agreement.
 
-      
+Initial Software: means the Software in its Source Code and possibly its
+Object Code form and, where applicable, its documentation, "as is" when
+it is first distributed under the terms and conditions of the Agreement.
 
-Initial Software: means the Software in its Source Code and possibly its Object
-Code form and, where applicable, its documentation, "as is" when it is first
-distributed under the terms and conditions of the Agreement.
+Modified Software: means the Software modified by at least one
+Contribution.
 
-      
+Source Code: means all the Software's instructions and program lines to
+which access is required so as to modify the Software.
 
-Modified Software: means the Software modified by at least one Contribution.
+Object Code: means the binary files originating from the compilation of
+the Source Code.
 
-      
+Holder: means the holder(s) of the economic rights over the Initial
+Software.
 
-Source Code: means all the Software's instructions and program lines to which
-access is required so as to modify the Software.
+Licensee: means the Software user(s) having accepted the Agreement.
 
-      
+Contributor: means a Licensee having made at least one Contribution.
 
-Object Code: means the binary files originating from the compilation of the
-Source Code.
+Licensor: means the Holder, or any other individual or legal entity, who
+distributes the Software under the Agreement.
 
-      
+Contribution: means any or all modifications, corrections, translations,
+adaptations and/or new functions integrated into the Software by any or
+all Contributors, as well as any or all Internal Modules.
 
-Holder: means the holder(s) of the economic rights over the Initial Software.
+Module: means a set of sources files including their documentation that
+enables supplementary functions or services in addition to those offered
+by the Software.
 
-      
+External Module: means any or all Modules, not derived from the
+Software, so that this Module and the Software run in separate address
+spaces, with one calling the other when they are run.
 
-      Licensee: means the Software user(s) having accepted the Agreement.
+Internal Module: means any or all Module, connected to the Software so
+that they both execute in the same address space.
 
-      
-
-      Contributor: means a Licensee having made at least one Contribution.
-
-      
-
-Licensor: means the Holder, or any other individual or legal entity, who distributes
-the Software under the Agreement.
-
-      
-
-Contribution: means any or all modifications, corrections, translations, adaptations
-and/or new functions integrated into the Software by any or all Contributors,
-as well as any or all Internal Modules.
-
-      
-
-Module: means a set of sources files including their documentation that enables
-supplementary functions or services in addition to those offered by the Software.
-
-      
-
-External Module: means any or all Modules, not derived from the Software,
-so that this Module and the Software run in separate address spaces, with
-one calling the other when they are run.
-
-      
-
-Internal Module: means any or all Module, connected to the Software so that
-they both execute in the same address space.
-
-      
-
-GNU GPL: means the GNU General Public License version 2 or any subsequent
-version, as published by the Free Software Foundation Inc.
-
-      
-
-GNU Affero GPL: means the GNU Affero General Public License version 3 or any
+GNU GPL: means the GNU General Public License version 2 or any
 subsequent version, as published by the Free Software Foundation Inc.
 
-      
+GNU Affero GPL: means the GNU Affero General Public License version 3 or
+any subsequent version, as published by the Free Software Foundation Inc.
 
-EUPL: means the European Union Public License version 1.1 or any subsequent
-version, as published by the European Commission.
+EUPL: means the European Union Public License version 1.1 or any
+subsequent version, as published by the European Commission.
 
-      
+Parties: mean both the Licensee and the Licensor.
 
-      Parties: mean both the Licensee and the Licensor.
+These expressions may be used both in singular and plural form.
 
-   These expressions may be used both in singular and plural form.
 
-   Article 2 - PURPOSE
+    Article 2 - PURPOSE
 
-The purpose of the Agreement is the grant by the Licensor to the Licensee
-of a non-exclusive, transferable and worldwide license for the Software as
-set forth in Article 5 <#scope> hereinafter for the whole term of the protection
-granted by the rights over said Software.
+The purpose of the Agreement is the grant by the Licensor to the
+Licensee of a non-exclusive, transferable and worldwide license for the
+Software as set forth in Article 5 <#scope> hereinafter for the whole
+term of the protection granted by the rights over said Software.
 
-   Article 3 - ACCEPTANCE
 
-3.1 The Licensee shall be deemed as having accepted the terms and conditions
-of this Agreement upon the occurrence of the first of the following events:
+    Article 3 - ACCEPTANCE
 
-(i) loading the Software by any or all means, notably, by downloading from
-a remote server, or by loading from a physical medium;
+3.1 The Licensee shall be deemed as having accepted the terms and
+conditions of this Agreement upon the occurrence of the first of the
+following events:
 
-(ii) the first time the Licensee exercises any of the rights granted hereunder.
+  * (i) loading the Software by any or all means, notably, by
+    downloading from a remote server, or by loading from a physical medium;
+  * (ii) the first time the Licensee exercises any of the rights granted
+    hereunder.
 
-3.2 One copy of the Agreement, containing a notice relating to the characteristics
-of the Software, to the limited warranty, and to the fact that its use is
-restricted to experienced users has been provided to the Licensee prior to
-its acceptance as set forth in Article 3.1 <#accepting> hereinabove, and the
-Licensee hereby acknowledges that it has read and understood it.
+3.2 One copy of the Agreement, containing a notice relating to the
+characteristics of the Software, to the limited warranty, and to the
+fact that its use is restricted to experienced users has been provided
+to the Licensee prior to its acceptance as set forth in Article 3.1
+<#accepting> hereinabove, and the Licensee hereby acknowledges that it
+has read and understood it.
+
+
+    Article 4 - EFFECTIVE DATE AND TERM
 
-   Article 4 - EFFECTIVE DATE AND TERM
 
       4.1 EFFECTIVE DATE
 
-The Agreement shall become effective on the date when it is accepted by the
-Licensee as set forth in Article 3.1 <#accepting> .
+The Agreement shall become effective on the date when it is accepted by
+the Licensee as set forth in Article 3.1 <#accepting>.
+
 
       4.2 TERM
 
-The Agreement shall remain in force for the entire legal term of protection
-of the economic rights over the Software.
+The Agreement shall remain in force for the entire legal term of
+protection of the economic rights over the Software.
 
-   Article 5 - SCOPE OF RIGHTS GRANTED
 
-The Licensor hereby grants to the Licensee, who accepts, the following rights
-over the Software for any or all use, and for the term of the Agreement, on
-the basis of the terms and conditions set forth hereinafter.
+    Article 5 - SCOPE OF RIGHTS GRANTED
+
+The Licensor hereby grants to the Licensee, who accepts, the following
+rights over the Software for any or all use, and for the term of the
+Agreement, on the basis of the terms and conditions set forth hereinafter.
+
+Besides, if the Licensor owns or comes to own one or more patents
+protecting all or part of the functions of the Software or of its
+components, the Licensor undertakes not to enforce the rights granted by
+these patents against successive Licensees using, exploiting or
+modifying the Software. If these patents are transferred, the Licensor
+undertakes to have the transferees subscribe to the obligations set
+forth in this paragraph.
 
-Besides, if the Licensor owns or comes to own one or more patents protecting
-all or part of the functions of the Software or of its components, the Licensor
-undertakes not to enforce the rights granted by these patents against successive
-Licensees using, exploiting or modifying the Software. If these patents are
-transferred, the Licensor undertakes to have the transferees subscribe to
-the obligations set forth in this paragraph.
 
       5.1 RIGHT OF USE
 
-The Licensee is authorized to use the Software, without any limitation as
-to its fields of application, with it being hereinafter specified that this
-comprises:
+The Licensee is authorized to use the Software, without any limitation
+as to its fields of application, with it being hereinafter specified
+that this comprises:
 
-1. permanent or temporary reproduction of all or part of the Software by any
-or all means and in any or all form.
+ 1. permanent or temporary reproduction of all or part of the Software
+    by any or all means and in any or all form.
 
-2. loading, displaying, running, or storing the Software on any or all medium.
+ 2. loading, displaying, running, or storing the Software on any or all
+    medium.
+
+ 3. entitlement to observe, study or test its operation so as to
+    determine the ideas and principles behind any or all constituent
+    elements of said Software. This shall apply when the Licensee
+    carries out any or all loading, displaying, running, transmission or
+    storage operation as regards the Software, that it is entitled to
+    carry out hereunder.
 
-3. entitlement to observe, study or test its operation so as to determine
-the ideas and principles behind any or all constituent elements of said Software.
-This shall apply when the Licensee carries out any or all loading, displaying,
-running, transmission or storage operation as regards the Software, that it
-is entitled to carry out hereunder.
 
       5.2 ENTITLEMENT TO MAKE CONTRIBUTIONS
 
-The right to make Contributions includes the right to translate, adapt, arrange,
-or make any or all modifications to the Software, and the right to reproduce
-the resulting software.
+The right to make Contributions includes the right to translate, adapt,
+arrange, or make any or all modifications to the Software, and the right
+to reproduce the resulting software.
+
+The Licensee is authorized to make any or all Contributions to the
+Software provided that it includes an explicit notice that it is the
+author of said Contribution and indicates the date of the creation thereof.
 
-The Licensee is authorized to make any or all Contributions to the Software
-provided that it includes an explicit notice that it is the author of said
-Contribution and indicates the date of the creation thereof.
 
       5.3 RIGHT OF DISTRIBUTION
 
-In particular, the right of distribution includes the right to publish, transmit
-and communicate the Software to the general public on any or all medium, and
-by any or all means, and the right to market, either in consideration of a
-fee, or free of charge, one or more copies of the Software by any means.
+In particular, the right of distribution includes the right to publish,
+transmit and communicate the Software to the general public on any or
+all medium, and by any or all means, and the right to market, either in
+consideration of a fee, or free of charge, one or more copies of the
+Software by any means.
 
-The Licensee is further authorized to distribute copies of the modified or
-unmodified Software to third parties according to the terms and conditions
-set forth hereinafter.
+The Licensee is further authorized to distribute copies of the modified
+or unmodified Software to third parties according to the terms and
+conditions set forth hereinafter.
 
-         5.3.1. DISTRIBUTION OF SOFTWARE WITHOUT MODIFICATION
 
-The Licensee is authorized to distribute true copies of the Software in Source
-Code or Object Code form, provided that said distribution complies with all
-the provisions of the Agreement and is accompanied by:
+        5.3.1 DISTRIBUTION OF SOFTWARE WITHOUT MODIFICATION
 
-            1. a copy of the Agreement,
+The Licensee is authorized to distribute true copies of the Software in
+Source Code or Object Code form, provided that said distribution
+complies with all the provisions of the Agreement and is accompanied by:
 
-2. a notice relating to the limitation of both the Licensor's warranty and
-liability as set forth in Articles 8 and 9,
+ 1. a copy of the Agreement,
 
-and that, in the event that only the Object Code of the Software is redistributed,
-the Licensee allows effective access to the full Source Code of the Software
-for a period of at least three years from the distribution of the Software,
-it being understood that the additional acquisition cost of the Source Code
-shall not exceed the cost of the data transfer.
+ 2. a notice relating to the limitation of both the Licensor's warranty
+    and liability as set forth in Articles 8 and 9,
 
-         5.3.2. DISTRIBUTION OF MODIFIED SOFTWARE
+and that, in the event that only the Object Code of the Software is
+redistributed, the Licensee allows effective access to the full Source
+Code of the Software for a period of at least three years from the
+distribution of the Software, it being understood that the additional
+acquisition cost of the Source Code shall not exceed the cost of the
+data transfer.
 
-When the Licensee makes a Contribution to the Software, the terms and conditions
-for the distribution of the resulting Modified Software become subject to
-all the provisions of this Agreement.
 
-The Licensee is authorized to distribute the Modified Software, in source
-code or object code form, provided that said distribution complies with all
-the provisions of the Agreement and is accompanied by:
+        5.3.2 DISTRIBUTION OF MODIFIED SOFTWARE
 
-            1. a copy of the Agreement,
+When the Licensee makes a Contribution to the Software, the terms and
+conditions for the distribution of the resulting Modified Software
+become subject to all the provisions of this Agreement.
 
-2. a notice relating to the limitation of both the Licensor's warranty and
-liability as set forth in Articles 8 and 9,
+The Licensee is authorized to distribute the Modified Software, in
+source code or object code form, provided that said distribution
+complies with all the provisions of the Agreement and is accompanied by:
 
-and, in the event that only the object code of the Modified Software is redistributed,
+ 1. a copy of the Agreement,
 
-3. a note stating the conditions of effective access to the full source code
-of the Modified Software for a period of at least three years from the distribution
-of the Modified Software, it being understood that the additional acquisition
-cost of the source code shall not exceed the cost of the data transfer.
+ 2. a notice relating to the limitation of both the Licensor's warranty
+    and liability as set forth in Articles 8 and 9,
 
-         5.3.3. DISTRIBUTION OF EXTERNAL MODULES
+and, in the event that only the object code of the Modified Software is
+redistributed,
 
-When the Licensee has developed an External Module, the terms and conditions
-of this Agreement do not apply to said External Module, that may be distributed
-under a separate license agreement.
+ 3. a note stating the conditions of effective access to the full source
+    code of the Modified Software for a period of at least three years
+    from the distribution of the Modified Software, it being understood
+    that the additional acquisition cost of the source code shall not
+    exceed the cost of the data transfer.
 
-         5.3.4. COMPATIBILITY WITH OTHER LICENSES
 
-The Licensee can include a code that is subject to the provisions of one of
-the versions of the GNU GPL, GNU Affero GPL and/or EUPL in the Modified or
-unmodified Software, and distribute that entire code under the terms of the
-same version of the GNU GPL, GNU Affero GPL and/or EUPL.
+        5.3.3 DISTRIBUTION OF EXTERNAL MODULES
 
-The Licensee can include the Modified or unmodified Software in a code that
-is subject to the provisions of one of the versions of the GNU GPL, GNU Affero
-GPL and/or EUPL and distribute that entire code under the terms of the same
-version of the GNU GPL, GNU Affero GPL and/or EUPL.
+When the Licensee has developed an External Module, the terms and
+conditions of this Agreement do not apply to said External Module, that
+may be distributed under a separate license agreement.
+
+
+        5.3.4 COMPATIBILITY WITH OTHER LICENSES
+
+The Licensee can include a code that is subject to the provisions of one
+of the versions of the GNU GPL, GNU Affero GPL and/or EUPL in the
+Modified or unmodified Software, and distribute that entire code under
+the terms of the same version of the GNU GPL, GNU Affero GPL and/or EUPL.
+
+The Licensee can include the Modified or unmodified Software in a code
+that is subject to the provisions of one of the versions of the GNU GPL,
+GNU Affero GPL and/or EUPL and distribute that entire code under the
+terms of the same version of the GNU GPL, GNU Affero GPL and/or EUPL.
+
+
+    Article 6 - INTELLECTUAL PROPERTY
 
-   Article 6 - INTELLECTUAL PROPERTY
 
       6.1 OVER THE INITIAL SOFTWARE
 
-The Holder owns the economic rights over the Initial Software. Any or all
-use of the Initial Software is subject to compliance with the terms and conditions
-under which the Holder has elected to distribute its work and no one shall
-be entitled to modify the terms and conditions for the distribution of said
-Initial Software.
+The Holder owns the economic rights over the Initial Software. Any or
+all use of the Initial Software is subject to compliance with the terms
+and conditions under which the Holder has elected to distribute its work
+and no one shall be entitled to modify the terms and conditions for the
+distribution of said Initial Software.
+
+The Holder undertakes that the Initial Software will remain ruled at
+least by this Agreement, for the duration set forth in Article 4.2 <#term>.
 
-The Holder undertakes that the Initial Software will remain ruled at least
-by this Agreement, for the duration set forth in Article 4.2 <#term> .
 
       6.2 OVER THE CONTRIBUTIONS
 
-The Licensee who develops a Contribution is the owner of the intellectual
-property rights over this Contribution as defined by applicable law.
+The Licensee who develops a Contribution is the owner of the
+intellectual property rights over this Contribution as defined by
+applicable law.
+
 
       6.3 OVER THE EXTERNAL MODULES
 
-The Licensee who develops an External Module is the owner of the intellectual
-property rights over this External Module as defined by applicable law and
-is free to choose the type of agreement that shall govern its distribution.
+The Licensee who develops an External Module is the owner of the
+intellectual property rights over this External Module as defined by
+applicable law and is free to choose the type of agreement that shall
+govern its distribution.
+
 
       6.4 JOINT PROVISIONS
 
-      The Licensee expressly undertakes:
+The Licensee expressly undertakes:
 
-1. not to remove, or modify, in any manner, the intellectual property notices
-attached to the Software;
+ 1. not to remove, or modify, in any manner, the intellectual property
+    notices attached to the Software;
 
-2. to reproduce said notices, in an identical manner, in the copies of the
-Software modified or not.
+ 2. to reproduce said notices, in an identical manner, in the copies of
+    the Software modified or not.
 
-The Licensee undertakes not to directly or indirectly infringe the intellectual
-property rights on the Software of the Holder and/or Contributors, and to
-take, where applicable, vis-à-vis its staff, any and all measures required
-to ensure respect of said intellectual property rights of the Holder and/or
-Contributors.
+The Licensee undertakes not to directly or indirectly infringe the
+intellectual property rights on the Software of the Holder and/or
+Contributors, and to take, where applicable, vis-à-vis its staff, any
+and all measures required to ensure respect of said intellectual
+property rights of the Holder and/or Contributors.
 
-   Article 7 - RELATED SERVICES
 
-7.1 Under no circumstances shall the Agreement oblige the Licensor to provide
-technical assistance or maintenance services for the Software.
+    Article 7 - RELATED SERVICES
 
-However, the Licensor is entitled to offer this type of services. The terms
-and conditions of such technical assistance, and/or such maintenance, shall
-be set forth in a separate instrument. Only the Licensor offering said maintenance
-and/or technical assistance services shall incur liability therefor.
+7.1 Under no circumstances shall the Agreement oblige the Licensor to
+provide technical assistance or maintenance services for the Software.
 
-7.2 Similarly, any Licensor is entitled to offer to its licensees, under its
-sole responsibility, a warranty, that shall only be binding upon itself, for
-the redistribution of the Software and/or the Modified Software, under terms
-and conditions that it is free to decide. Said warranty, and the financial
-terms and conditions of its application, shall be subject of a separate instrument
-executed between the Licensor and the Licensee.
+However, the Licensor is entitled to offer this type of services. The
+terms and conditions of such technical assistance, and/or such
+maintenance, shall be set forth in a separate instrument. Only the
+Licensor offering said maintenance and/or technical assistance services
+shall incur liability therefor.
 
-   Article 8 - LIABILITY
+7.2 Similarly, any Licensor is entitled to offer to its licensees, under
+its sole responsibility, a warranty, that shall only be binding upon
+itself, for the redistribution of the Software and/or the Modified
+Software, under terms and conditions that it is free to decide. Said
+warranty, and the financial terms and conditions of its application,
+shall be subject of a separate instrument executed between the Licensor
+and the Licensee.
 
-8.1 Subject to the provisions of Article 8.2, the Licensee shall be entitled
-to claim compensation for any direct loss it may have suffered from the Software
-as a result of a fault on the part of the relevant Licensor, subject to providing
-evidence thereof.
 
-8.2 The Licensor's liability is limited to the commitments made under this
-Agreement and shall not be incurred as a result of in particular: (i) loss
-due the Licensee's total or partial failure to fulfill its obligations, (ii)
-direct or consequential loss that is suffered by the Licensee due to the use
-or performance of the Software, and (iii) more generally, any consequential
-loss. In particular the Parties expressly agree that any or all pecuniary
-or business loss (i.e. loss of data, loss of profits, operating loss, loss
-of customers or orders, opportunity cost, any disturbance to business activities)
-or any or all legal proceedings instituted against the Licensee by a third
-party, shall constitute consequential loss and shall not provide entitlement
-to any or all compensation from the Licensor.
+    Article 8 - LIABILITY
 
-   Article 9 - WARRANTY
+8.1 Subject to the provisions of Article 8.2, the Licensee shall be
+entitled to claim compensation for any direct loss it may have suffered
+from the Software as a result of a fault on the part of the relevant
+Licensor, subject to providing evidence thereof.
 
-9.1 The Licensee acknowledges that the scientific and technical state-of-the-art
-when the Software was distributed did not enable all possible uses to be tested
-and verified, nor for the presence of possible defects to be detected. In
-this respect, the Licensee's attention has been drawn to the risks associated
-with loading, using, modifying and/or developing and reproducing the Software
-which are reserved for experienced users.
+8.2 The Licensor's liability is limited to the commitments made under
+this Agreement and shall not be incurred as a result of in particular:
+(i) loss due the Licensee's total or partial failure to fulfill its
+obligations, (ii) direct or consequential loss that is suffered by the
+Licensee due to the use or performance of the Software, and (iii) more
+generally, any consequential loss. In particular the Parties expressly
+agree that any or all pecuniary or business loss (i.e. loss of data,
+loss of profits, operating loss, loss of customers or orders,
+opportunity cost, any disturbance to business activities) or any or all
+legal proceedings instituted against the Licensee by a third party,
+shall constitute consequential loss and shall not provide entitlement to
+any or all compensation from the Licensor.
 
-The Licensee shall be responsible for verifying, by any or all means, the
-suitability of the product for its requirements, its good working order, and
-for ensuring that it shall not cause damage to either persons or properties.
 
-9.2 The Licensor hereby represents, in good faith, that it is entitled to
-grant all the rights over the Software (including in particular the rights
-set forth in Article 5 <#scope> ).
+    Article 9 - WARRANTY
 
-9.3 The Licensee acknowledges that the Software is supplied "as is" by the
-Licensor without any other express or tacit warranty, other than that provided
-for in Article 9.2 <#good-faith> and, in particular, without any warranty
-as to its commercial value, its secured, safe, innovative or relevant nature.
+9.1 The Licensee acknowledges that the scientific and technical
+state-of-the-art when the Software was distributed did not enable all
+possible uses to be tested and verified, nor for the presence of
+possible defects to be detected. In this respect, the Licensee's
+attention has been drawn to the risks associated with loading, using,
+modifying and/or developing and reproducing the Software which are
+reserved for experienced users.
 
-Specifically, the Licensor does not warrant that the Software is free from
-any error, that it will operate without interruption, that it will be compatible
-with the Licensee's own equipment and software configuration, nor that it
-will meet the Licensee's requirements.
+The Licensee shall be responsible for verifying, by any or all means,
+the suitability of the product for its requirements, its good working
+order, and for ensuring that it shall not cause damage to either persons
+or properties.
 
-9.4 The Licensor does not either expressly or tacitly warrant that the Software
-does not infringe any third party intellectual property right relating to
-a patent, software or any other property right. Therefore, the Licensor disclaims
-any and all liability towards the Licensee arising out of any or all proceedings
-for infringement that may be instituted in respect of the use, modification
-and redistribution of the Software. Nevertheless, should such proceedings
-be instituted against the Licensee, the Licensor shall provide it with technical
-and legal expertise for its defense. Such technical and legal expertise shall
-be decided on a case-by-case basis between the relevant Licensor and the Licensee
-pursuant to a memorandum of understanding. The Licensor disclaims any and
-all liability as regards the Licensee's use of the name of the Software. No
-warranty is given as regards the existence of prior rights over the name of
-the Software or as regards the existence of a trademark.
+9.2 The Licensor hereby represents, in good faith, that it is entitled
+to grant all the rights over the Software (including in particular the
+rights set forth in Article 5 <#scope>).
 
-   Article 10 - TERMINATION
+9.3 The Licensee acknowledges that the Software is supplied "as is" by
+the Licensor without any other express or tacit warranty, other than
+that provided for in Article 9.2 <#good-faith> and, in particular,
+without any warranty as to its commercial value, its secured, safe,
+innovative or relevant nature.
 
-10.1 In the event of a breach by the Licensee of its obligations hereunder,
-the Licensor may automatically terminate this Agreement thirty (30) days after
-notice has been sent to the Licensee and has remained ineffective.
+Specifically, the Licensor does not warrant that the Software is free
+from any error, that it will operate without interruption, that it will
+be compatible with the Licensee's own equipment and software
+configuration, nor that it will meet the Licensee's requirements.
 
-10.2 A Licensee whose Agreement is terminated shall no longer be authorized
-to use, modify or distribute the Software. However, any licenses that it may
-have granted prior to termination of the Agreement shall remain valid subject
-to their having been granted in compliance with the terms and conditions hereof.
+9.4 The Licensor does not either expressly or tacitly warrant that the
+Software does not infringe any third party intellectual property right
+relating to a patent, software or any other property right. Therefore,
+the Licensor disclaims any and all liability towards the Licensee
+arising out of any or all proceedings for infringement that may be
+instituted in respect of the use, modification and redistribution of the
+Software. Nevertheless, should such proceedings be instituted against
+the Licensee, the Licensor shall provide it with technical and legal
+expertise for its defense. Such technical and legal expertise shall be
+decided on a case-by-case basis between the relevant Licensor and the
+Licensee pursuant to a memorandum of understanding. The Licensor
+disclaims any and all liability as regards the Licensee's use of the
+name of the Software. No warranty is given as regards the existence of
+prior rights over the name of the Software or as regards the existence
+of a trademark.
+
+
+    Article 10 - TERMINATION
+
+10.1 In the event of a breach by the Licensee of its obligations
+hereunder, the Licensor may automatically terminate this Agreement
+thirty (30) days after notice has been sent to the Licensee and has
+remained ineffective.
+
+10.2 A Licensee whose Agreement is terminated shall no longer be
+authorized to use, modify or distribute the Software. However, any
+licenses that it may have granted prior to termination of the Agreement
+shall remain valid subject to their having been granted in compliance
+with the terms and conditions hereof.
+
+
+    Article 11 - MISCELLANEOUS
 
-   Article 11 - MISCELLANEOUS
 
       11.1 EXCUSABLE EVENTS
 
-Neither Party shall be liable for any or all delay, or failure to perform
-the Agreement, that may be attributable to an event of force majeure, an act
-of God or an outside cause, such as defective functioning or interruptions
-of the electricity or telecommunications networks, network paralysis following
-a virus attack, intervention by government authorities, natural disasters,
-water damage, earthquakes, fire, explosions, strikes and labor unrest, war,
-etc.
+Neither Party shall be liable for any or all delay, or failure to
+perform the Agreement, that may be attributable to an event of force
+majeure, an act of God or an outside cause, such as defective
+functioning or interruptions of the electricity or telecommunications
+networks, network paralysis following a virus attack, intervention by
+government authorities, natural disasters, water damage, earthquakes,
+fire, explosions, strikes and labor unrest, war, etc.
 
-11.2 Any failure by either Party, on one or more occasions, to invoke one
-or more of the provisions hereof, shall under no circumstances be interpreted
-as being a waiver by the interested Party of its right to invoke said provision(s)
-subsequently.
+11.2 Any failure by either Party, on one or more occasions, to invoke
+one or more of the provisions hereof, shall under no circumstances be
+interpreted as being a waiver by the interested Party of its right to
+invoke said provision(s) subsequently.
 
-11.3 The Agreement cancels and replaces any or all previous agreements, whether
-written or oral, between the Parties and having the same purpose, and constitutes
-the entirety of the agreement between said Parties concerning said purpose.
-No supplement or modification to the terms and conditions hereof shall be
-effective as between the Parties unless it is made in writing and signed by
-their duly authorized representatives.
+11.3 The Agreement cancels and replaces any or all previous agreements,
+whether written or oral, between the Parties and having the same
+purpose, and constitutes the entirety of the agreement between said
+Parties concerning said purpose. No supplement or modification to the
+terms and conditions hereof shall be effective as between the Parties
+unless it is made in writing and signed by their duly authorized
+representatives.
+
+11.4 In the event that one or more of the provisions hereof were to
+conflict with a current or future applicable act or legislative text,
+said act or legislative text shall prevail, and the Parties shall make
+the necessary amendments so as to comply with said act or legislative
+text. All other provisions shall remain effective. Similarly, invalidity
+of a provision of the Agreement, for any reason whatsoever, shall not
+cause the Agreement as a whole to be invalid.
 
-11.4 In the event that one or more of the provisions hereof were to conflict
-with a current or future applicable act or legislative text, said act or legislative
-text shall prevail, and the Parties shall make the necessary amendments so
-as to comply with said act or legislative text. All other provisions shall
-remain effective. Similarly, invalidity of a provision of the Agreement, for
-any reason whatsoever, shall not cause the Agreement as a whole to be invalid.
 
       11.5 LANGUAGE
 
-The Agreement is drafted in both French and English and both versions are
-deemed authentic.
+The Agreement is drafted in both French and English and both versions
+are deemed authentic.
 
-   Article 12 - NEW VERSIONS OF THE AGREEMENT
 
-12.1 Any person is authorized to duplicate and distribute copies of this Agreement.
+    Article 12 - NEW VERSIONS OF THE AGREEMENT
 
-12.2 So as to ensure coherence, the wording of this Agreement is protected
-and may only be modified by the authors of the License, who reserve the right
-to periodically publish updates or new versions of the Agreement, each with
-a separate number. These subsequent versions may address new issues encountered
-by Free Software.
+12.1 Any person is authorized to duplicate and distribute copies of this
+Agreement.
 
-12.3 Any Software distributed under a given version of the Agreement may only
-be subsequently distributed under the same version of the Agreement or a subsequent
-version, subject to the provisions of Article 5.3.4 <#compatibility> .
+12.2 So as to ensure coherence, the wording of this Agreement is
+protected and may only be modified by the authors of the License, who
+reserve the right to periodically publish updates or new versions of the
+Agreement, each with a separate number. These subsequent versions may
+address new issues encountered by Free Software.
 
-   Article 13 - GOVERNING LAW AND JURISDICTION
+12.3 Any Software distributed under a given version of the Agreement may
+only be subsequently distributed under the same version of the Agreement
+or a subsequent version, subject to the provisions of Article 5.3.4
+<#compatibility>.
 
-13.1 The Agreement is governed by French law. The Parties agree to endeavor
-to seek an amicable solution to any disagreements or disputes that may arise
-during the performance of the Agreement.
 
-13.2 Failing an amicable solution within two (2) months as from their occurrence,
-and unless emergency proceedings are necessary, the disagreements or disputes
-shall be referred to the Paris Courts having jurisdiction, by the more diligent
-Party. 1 CeCILL stands for Ce(a) C(nrs) I(nria) L(ogiciel) L(ibre)
+    Article 13 - GOVERNING LAW AND JURISDICTION
+
+13.1 The Agreement is governed by French law. The Parties agree to
+endeavor to seek an amicable solution to any disagreements or disputes
+that may arise during the performance of the Agreement.
+
+13.2 Failing an amicable solution within two (2) months as from their
+occurrence, and unless emergency proceedings are necessary, the
+disagreements or disputes shall be referred to the Paris Courts having
+jurisdiction, by the more diligent Party.
diff --git a/options/license/CECILL-B b/options/license/CECILL-B
index 18887a5caa..c02c70e620 100644
--- a/options/license/CECILL-B
+++ b/options/license/CECILL-B
@@ -1,484 +1,515 @@
-CeCILL-B FREE SOFTWARE LICENSE AGREEMENT Notice
 
-This Agreement is a Free Software license agreement that is the result of
-discussions between its authors in order to ensure compliance with the two
-main principles guiding its drafting:
+CeCILL-B FREE SOFTWARE LICENSE AGREEMENT
 
-* firstly, compliance with the principles governing the distribution of Free
-Software: access to source code, broad rights granted to users,
 
-* secondly, the election of a governing law, French law, with which it is
-conformant, both as regards the law of torts and intellectual property law,
-and the protection that it offers to both authors and holders of the economic
-rights over software.
+    Notice
 
-The authors of the CeCILL¹ license are:
+This Agreement is a Free Software license agreement that is the result
+of discussions between its authors in order to ensure compliance with
+the two main principles guiding its drafting:
 
-   
+    * firstly, compliance with the principles governing the distribution
+      of Free Software: access to source code, broad rights granted to
+      users,
+    * secondly, the election of a governing law, French law, with which
+      it is conformant, both as regards the law of torts and
+      intellectual property law, and the protection that it offers to
+      both authors and holders of the economic rights over software.
 
-Commissariat à l'Energie Atomique - CEA, a public scientific, technical and
-industrial research establishment, having its principal place of business
-at 25 rue Leblanc, immeuble Le Ponant D, 75015 Paris, France.
+The authors of the CeCILL-B (for Ce[a] C[nrs] I[nria] L[ogiciel] L[ibre])
+license are:
 
-   
+Commissariat à l'Energie Atomique - CEA, a public scientific, technical
+and industrial research establishment, having its principal place of
+business at 25 rue Leblanc, immeuble Le Ponant D, 75015 Paris, France.
 
-Centre National de la Recherche Scientifique - CNRS, a public scientific and
-technological establishment, having its principal place of business at 3 rue
-Michel-Ange, 75794 Paris cedex 16, France.
+Centre National de la Recherche Scientifique - CNRS, a public scientific
+and technological establishment, having its principal place of business
+at 3 rue Michel-Ange, 75794 Paris cedex 16, France.
 
-   
+Institut National de Recherche en Informatique et en Automatique -
+INRIA, a public scientific and technological establishment, having its
+principal place of business at Domaine de Voluceau, Rocquencourt, BP
+105, 78153 Le Chesnay cedex, France.
 
-Institut National de Recherche en Informatique et en Automatique - INRIA,
-a public scientific and technological establishment, having its principal
-place of business at Domaine de Voluceau, Rocquencourt, BP 105, 78153 Le Chesnay
-cedex, France.
 
-Preamble This Agreement is an open source software license intended to give
-users significant freedom to modify and redistribute the software licensed
+    Preamble
+
+This Agreement is an open source software license intended to give users
+significant freedom to modify and redistribute the software licensed
 hereunder.
 
-The exercising of this freedom is conditional upon a strong obligation of
-giving credits for everybody that distributes a software incorporating a software
-ruled by the current license so as all contributions to be properly identified
-and acknowledged.
+The exercising of this freedom is conditional upon a strong obligation
+of giving credits for everybody that distributes a software
+incorporating a software ruled by the current license so as all
+contributions to be properly identified and acknowledged.
 
-In consideration of access to the source code and the rights to copy, modify
-and redistribute granted by the license, users are provided only with a limited
-warranty and the software's author, the holder of the economic rights, and
-the successive licensors only have limited liability.
+In consideration of access to the source code and the rights to copy,
+modify and redistribute granted by the license, users are provided only
+with a limited warranty and the software's author, the holder of the
+economic rights, and the successive licensors only have limited liability.
 
-In this respect, the risks associated with loading, using, modifying and/or
-developing or reproducing the software by the user are brought to the user's
-attention, given its Free Software status, which may make it complicated to
-use, with the result that its use is reserved for developers and experienced
-professionals having in-depth computer knowledge. Users are therefore encouraged
-to load and test the suitability of the software as regards their requirements
-in conditions enabling the security of their systems and/or data to be ensured
-and, more generally, to use and operate it in the same conditions of security.
-This Agreement may be freely reproduced and published, provided it is not
-altered, and that no provisions are either added or removed herefrom.
+In this respect, the risks associated with loading, using, modifying
+and/or developing or reproducing the software by the user are brought to
+the user's attention, given its Free Software status, which may make it
+complicated to use, with the result that its use is reserved for
+developers and experienced professionals having in-depth computer
+knowledge. Users are therefore encouraged to load and test the
+suitability of the software as regards their requirements in conditions
+enabling the security of their systems and/or data to be ensured and,
+more generally, to use and operate it in the same conditions of
+security. This Agreement may be freely reproduced and published,
+provided it is not altered, and that no provisions are either added or
+removed herefrom.
 
-This Agreement may apply to any or all software for which the holder of the
-economic rights decides to submit the use thereof to its provisions.
+This Agreement may apply to any or all software for which the holder of
+the economic rights decides to submit the use thereof to its provisions.
 
-   Article 1 - DEFINITIONS
 
-For the purpose of this Agreement, when the following expressions commence
-with a capital letter, they shall have the following meaning:
+    Article 1 - DEFINITIONS
 
-      
+For the purpose of this Agreement, when the following expressions
+commence with a capital letter, they shall have the following meaning:
 
-Agreement: means this license agreement, and its possible subsequent versions
-and annexes.
+Agreement: means this license agreement, and its possible subsequent
+versions and annexes.
 
-      
+Software: means the software in its Object Code and/or Source Code form
+and, where applicable, its documentation, "as is" when the Licensee
+accepts the Agreement.
 
-Software: means the software in its Object Code and/or Source Code form and,
-where applicable, its documentation, "as is" when the Licensee accepts the
-Agreement.
+Initial Software: means the Software in its Source Code and possibly its
+Object Code form and, where applicable, its documentation, "as is" when
+it is first distributed under the terms and conditions of the Agreement.
 
-      
+Modified Software: means the Software modified by at least one
+Contribution.
 
-Initial Software: means the Software in its Source Code and possibly its Object
-Code form and, where applicable, its documentation, "as is" when it is first
-distributed under the terms and conditions of the Agreement.
+Source Code: means all the Software's instructions and program lines to
+which access is required so as to modify the Software.
 
-      
+Object Code: means the binary files originating from the compilation of
+the Source Code.
 
-Modified Software: means the Software modified by at least one Contribution.
+Holder: means the holder(s) of the economic rights over the Initial
+Software.
 
-      
+Licensee: means the Software user(s) having accepted the Agreement.
 
-Source Code: means all the Software's instructions and program lines to which
-access is required so as to modify the Software.
+Contributor: means a Licensee having made at least one Contribution.
 
-      
+Licensor: means the Holder, or any other individual or legal entity, who
+distributes the Software under the Agreement.
 
-Object Code: means the binary files originating from the compilation of the
-Source Code.
+Contribution: means any or all modifications, corrections, translations,
+adaptations and/or new functions integrated into the Software by any or
+all Contributors, as well as any or all Internal Modules.
 
-      
+Module: means a set of sources files including their documentation that
+enables supplementary functions or services in addition to those offered
+by the Software.
 
-Holder: means the holder(s) of the economic rights over the Initial Software.
+External Module: means any or all Modules, not derived from the
+Software, so that this Module and the Software run in separate address
+spaces, with one calling the other when they are run.
 
-      
+Internal Module: means any or all Module, connected to the Software so
+that they both execute in the same address space.
 
-      Licensee: means the Software user(s) having accepted the Agreement.
+Parties: mean both the Licensee and the Licensor.
 
-      
+These expressions may be used both in singular and plural form.
 
-      Contributor: means a Licensee having made at least one Contribution.
 
-      
+    Article 2 - PURPOSE
 
-Licensor: means the Holder, or any other individual or legal entity, who distributes
-the Software under the Agreement.
+The purpose of the Agreement is the grant by the Licensor to the
+Licensee of a non-exclusive, transferable and worldwide license for the
+Software as set forth in Article 5 hereinafter for the whole term of the
+protection granted by the rights over said Software.
 
-      
 
-Contribution: means any or all modifications, corrections, translations, adaptations
-and/or new functions integrated into the Software by any or all Contributors,
-as well as any or all Internal Modules.
+    Article 3 - ACCEPTANCE
 
-      
+3.1 The Licensee shall be deemed as having accepted the terms and
+conditions of this Agreement upon the occurrence of the first of the
+following events:
 
-Module: means a set of sources files including their documentation that enables
-supplementary functions or services in addition to those offered by the Software.
+    * (i) loading the Software by any or all means, notably, by
+      downloading from a remote server, or by loading from a physical
+      medium;
+    * (ii) the first time the Licensee exercises any of the rights
+      granted hereunder.
 
-      
+3.2 One copy of the Agreement, containing a notice relating to the
+characteristics of the Software, to the limited warranty, and to the
+fact that its use is restricted to experienced users has been provided
+to the Licensee prior to its acceptance as set forth in Article 3.1
+hereinabove, and the Licensee hereby acknowledges that it has read and
+understood it.
 
-External Module: means any or all Modules, not derived from the Software,
-so that this Module and the Software run in separate address spaces, with
-one calling the other when they are run.
 
-      
+    Article 4 - EFFECTIVE DATE AND TERM
 
-Internal Module: means any or all Module, connected to the Software so that
-they both execute in the same address space.
-
-      
-
-      Parties: mean both the Licensee and the Licensor.
-
-   These expressions may be used both in singular and plural form.
-
-   Article 2 - PURPOSE
-
-The purpose of the Agreement is the grant by the Licensor to the Licensee
-of a non-exclusive, transferable and worldwide license for the Software as
-set forth in Article 5 hereinafter for the whole term of the protection granted
-by the rights over said Software.
-
-   Article 3 - ACCEPTANCE
-
-3.1 The Licensee shall be deemed as having accepted the terms and conditions
-of this Agreement upon the occurrence of the first of the following events:
-
-(i) loading the Software by any or all means, notably, by downloading from
-a remote server, or by loading from a physical medium;
-
-(ii) the first time the Licensee exercises any of the rights granted hereunder.
-
-3.2 One copy of the Agreement, containing a notice relating to the characteristics
-of the Software, to the limited warranty, and to the fact that its use is
-restricted to experienced users has been provided to the Licensee prior to
-its acceptance as set forth in Article 3.1 hereinabove, and the Licensee hereby
-acknowledges that it has read and understood it.
-
-   Article 4 - EFFECTIVE DATE AND TERM
 
       4.1 EFFECTIVE DATE
 
-The Agreement shall become effective on the date when it is accepted by the
-Licensee as set forth in Article 3.1.
+The Agreement shall become effective on the date when it is accepted by
+the Licensee as set forth in Article 3.1.
+
 
       4.2 TERM
 
-The Agreement shall remain in force for the entire legal term of protection
-of the economic rights over the Software.
+The Agreement shall remain in force for the entire legal term of
+protection of the economic rights over the Software.
 
-   Article 5 - SCOPE OF RIGHTS GRANTED
 
-The Licensor hereby grants to the Licensee, who accepts, the following rights
-over the Software for any or all use, and for the term of the Agreement, on
-the basis of the terms and conditions set forth hereinafter.
+    Article 5 - SCOPE OF RIGHTS GRANTED
+
+The Licensor hereby grants to the Licensee, who accepts, the following
+rights over the Software for any or all use, and for the term of the
+Agreement, on the basis of the terms and conditions set forth hereinafter.
+
+Besides, if the Licensor owns or comes to own one or more patents
+protecting all or part of the functions of the Software or of its
+components, the Licensor undertakes not to enforce the rights granted by
+these patents against successive Licensees using, exploiting or
+modifying the Software. If these patents are transferred, the Licensor
+undertakes to have the transferees subscribe to the obligations set
+forth in this paragraph.
 
-Besides, if the Licensor owns or comes to own one or more patents protecting
-all or part of the functions of the Software or of its components, the Licensor
-undertakes not to enforce the rights granted by these patents against successive
-Licensees using, exploiting or modifying the Software. If these patents are
-transferred, the Licensor undertakes to have the transferees subscribe to
-the obligations set forth in this paragraph.
 
       5.1 RIGHT OF USE
 
-The Licensee is authorized to use the Software, without any limitation as
-to its fields of application, with it being hereinafter specified that this
-comprises:
+The Licensee is authorized to use the Software, without any limitation
+as to its fields of application, with it being hereinafter specified
+that this comprises:
 
-1. permanent or temporary reproduction of all or part of the Software by any
-or all means and in any or all form.
+   1. permanent or temporary reproduction of all or part of the Software
+      by any or all means and in any or all form.
 
-2. loading, displaying, running, or storing the Software on any or all medium.
+   2. loading, displaying, running, or storing the Software on any or
+      all medium.
+
+   3. entitlement to observe, study or test its operation so as to
+      determine the ideas and principles behind any or all constituent
+      elements of said Software. This shall apply when the Licensee
+      carries out any or all loading, displaying, running, transmission
+      or storage operation as regards the Software, that it is entitled
+      to carry out hereunder.
 
-3. entitlement to observe, study or test its operation so as to determine
-the ideas and principles behind any or all constituent elements of said Software.
-This shall apply when the Licensee carries out any or all loading, displaying,
-running, transmission or storage operation as regards the Software, that it
-is entitled to carry out hereunder.
 
       5.2 ENTITLEMENT TO MAKE CONTRIBUTIONS
 
-The right to make Contributions includes the right to translate, adapt, arrange,
-or make any or all modifications to the Software, and the right to reproduce
-the resulting software.
+The right to make Contributions includes the right to translate, adapt,
+arrange, or make any or all modifications to the Software, and the right
+to reproduce the resulting software.
+
+The Licensee is authorized to make any or all Contributions to the
+Software provided that it includes an explicit notice that it is the
+author of said Contribution and indicates the date of the creation thereof.
 
-The Licensee is authorized to make any or all Contributions to the Software
-provided that it includes an explicit notice that it is the author of said
-Contribution and indicates the date of the creation thereof.
 
       5.3 RIGHT OF DISTRIBUTION
 
-In particular, the right of distribution includes the right to publish, transmit
-and communicate the Software to the general public on any or all medium, and
-by any or all means, and the right to market, either in consideration of a
-fee, or free of charge, one or more copies of the Software by any means.
+In particular, the right of distribution includes the right to publish,
+transmit and communicate the Software to the general public on any or
+all medium, and by any or all means, and the right to market, either in
+consideration of a fee, or free of charge, one or more copies of the
+Software by any means.
 
-The Licensee is further authorized to distribute copies of the modified or
-unmodified Software to third parties according to the terms and conditions
-set forth hereinafter.
+The Licensee is further authorized to distribute copies of the modified
+or unmodified Software to third parties according to the terms and
+conditions set forth hereinafter.
 
-         5.3.1. DISTRIBUTION OF SOFTWARE WITHOUT MODIFICATION
 
-The Licensee is authorized to distribute true copies of the Software in Source
-Code or Object Code form, provided that said distribution complies with all
-the provisions of the Agreement and is accompanied by:
+        5.3.1 DISTRIBUTION OF SOFTWARE WITHOUT MODIFICATION
 
-            1. a copy of the Agreement,
+The Licensee is authorized to distribute true copies of the Software in
+Source Code or Object Code form, provided that said distribution
+complies with all the provisions of the Agreement and is accompanied by:
 
-2. a notice relating to the limitation of both the Licensor's warranty and
-liability as set forth in Articles 8 and 9,
+   1. a copy of the Agreement,
 
-and that, in the event that only the Object Code of the Software is redistributed,
-the Licensee allows effective access to the full Source Code of the Software
-at a minimum during the entire period of its distribution of the Software,
-it being understood that the additional cost of acquiring the Source Code
-shall not exceed the cost of transferring the data.
+   2. a notice relating to the limitation of both the Licensor's
+      warranty and liability as set forth in Articles 8 and 9,
 
-         5.3.2. DISTRIBUTION OF MODIFIED SOFTWARE
+and that, in the event that only the Object Code of the Software is
+redistributed, the Licensee allows effective access to the full Source
+Code of the Software at a minimum during the entire period of its
+distribution of the Software, it being understood that the additional
+cost of acquiring the Source Code shall not exceed the cost of
+transferring the data.
 
-If the Licensee makes any Contribution to the Software, the resulting Modified
-Software may be distributed under a license agreement other than this Agreement
-subject to compliance with the provisions of Article 5.3.4.
 
-         5.3.3. DISTRIBUTION OF EXTERNAL MODULES
+        5.3.2 DISTRIBUTION OF MODIFIED SOFTWARE
 
-When the Licensee has developed an External Module, the terms and conditions
-of this Agreement do not apply to said External Module, that may be distributed
-under a separate license agreement.
+If the Licensee makes any Contribution to the Software, the resulting
+Modified Software may be distributed under a license agreement other
+than this Agreement subject to compliance with the provisions of Article
+5.3.4.
 
-         5.3.4. CREDITS
 
-Any Licensee who may distribute a Modified Software hereby expressly agrees
-to:
+        5.3.3 DISTRIBUTION OF EXTERNAL MODULES
 
-1. indicate in the related documentation that it is based on the Software
-licensed hereunder, and reproduce the intellectual property notice for the
-Software,
+When the Licensee has developed an External Module, the terms and
+conditions of this Agreement do not apply to said External Module, that
+may be distributed under a separate license agreement.
 
-2. ensure that written indications of the Software intended use, intellectual
-property notice and license hereunder are included in easily accessible format
-from the Modified Software interface,
 
-3. mention, on a freely accessible website describing the Modified Software,
-at least throughout the distribution term thereof, that it is based on the
-Software licensed hereunder, and reproduce the Software intellectual property
-notice,
+        5.3.4 CREDITS
 
-4. where it is distributed to a third party that may distribute a Modified
-Software without having to make its source code available, make its best efforts
-to ensure that said third party agrees to comply with the obligations set
-forth in this Article .
+Any Licensee who may distribute a Modified Software hereby expressly
+agrees to:
 
-If the Software, whether or not modified, is distributed with an External
-Module designed for use in connection with the Software, the Licensee shall
-submit said External Module to the foregoing obligations.
+   1. indicate in the related documentation that it is based on the
+      Software licensed hereunder, and reproduce the intellectual
+      property notice for the Software,
 
-         5.3.5. COMPATIBILITY WITH THE CeCILL AND CeCILL-C LICENSES
+   2. ensure that written indications of the Software intended use,
+      intellectual property notice and license hereunder are included in
+      easily accessible format from the Modified Software interface,
 
-Where a Modified Software contains a Contribution subject to the CeCILL license,
-the provisions set forth in Article 5.3.4 shall be optional.
+   3. mention, on a freely accessible website describing the Modified
+      Software, at least throughout the distribution term thereof, that
+      it is based on the Software licensed hereunder, and reproduce the
+      Software intellectual property notice,
 
-A Modified Software may be distributed under the CeCILL-C license. In such
-a case the provisions set forth in Article 5.3.4 shall be optional.
+   4. where it is distributed to a third party that may distribute a
+      Modified Software without having to make its source code
+      available, make its best efforts to ensure that said third party
+      agrees to comply with the obligations set forth in this Article .
+
+If the Software, whether or not modified, is distributed with an
+External Module designed for use in connection with the Software, the
+Licensee shall submit said External Module to the foregoing obligations.
+
+
+        5.3.5 COMPATIBILITY WITH THE CeCILL AND CeCILL-C LICENSES
+
+Where a Modified Software contains a Contribution subject to the CeCILL
+license, the provisions set forth in Article 5.3.4 shall be optional.
+
+A Modified Software may be distributed under the CeCILL-C license. In
+such a case the provisions set forth in Article 5.3.4 shall be optional.
+
+
+    Article 6 - INTELLECTUAL PROPERTY
 
-   Article 6 - INTELLECTUAL PROPERTY
 
       6.1 OVER THE INITIAL SOFTWARE
 
-The Holder owns the economic rights over the Initial Software. Any or all
-use of the Initial Software is subject to compliance with the terms and conditions
-under which the Holder has elected to distribute its work and no one shall
-be entitled to modify the terms and conditions for the distribution of said
-Initial Software.
+The Holder owns the economic rights over the Initial Software. Any or
+all use of the Initial Software is subject to compliance with the terms
+and conditions under which the Holder has elected to distribute its work
+and no one shall be entitled to modify the terms and conditions for the
+distribution of said Initial Software.
+
+The Holder undertakes that the Initial Software will remain ruled at
+least by this Agreement, for the duration set forth in Article 4.2.
 
-The Holder undertakes that the Initial Software will remain ruled at least
-by this Agreement, for the duration set forth in Article 4.2.
 
       6.2 OVER THE CONTRIBUTIONS
 
-The Licensee who develops a Contribution is the owner of the intellectual
-property rights over this Contribution as defined by applicable law.
+The Licensee who develops a Contribution is the owner of the
+intellectual property rights over this Contribution as defined by
+applicable law.
+
 
       6.3 OVER THE EXTERNAL MODULES
 
-The Licensee who develops an External Module is the owner of the intellectual
-property rights over this External Module as defined by applicable law and
-is free to choose the type of agreement that shall govern its distribution.
+The Licensee who develops an External Module is the owner of the
+intellectual property rights over this External Module as defined by
+applicable law and is free to choose the type of agreement that shall
+govern its distribution.
+
 
       6.4 JOINT PROVISIONS
 
-      The Licensee expressly undertakes:
+The Licensee expressly undertakes:
 
-1. not to remove, or modify, in any manner, the intellectual property notices
-attached to the Software;
+   1. not to remove, or modify, in any manner, the intellectual property
+      notices attached to the Software;
 
-2. to reproduce said notices, in an identical manner, in the copies of the
-Software modified or not.
+   2. to reproduce said notices, in an identical manner, in the copies
+      of the Software modified or not.
 
-The Licensee undertakes not to directly or indirectly infringe the intellectual
-property rights of the Holder and/or Contributors on the Software and to take,
-where applicable, vis-à-vis its staff, any and all measures required to ensure
-respect of said intellectual property rights of the Holder and/or Contributors.
+The Licensee undertakes not to directly or indirectly infringe the
+intellectual property rights of the Holder and/or Contributors on the
+Software and to take, where applicable, vis-à-vis its staff, any and all
+measures required to ensure respect of said intellectual property rights
+of the Holder and/or Contributors.
 
-   Article 7 - RELATED SERVICES
 
-7.1 Under no circumstances shall the Agreement oblige the Licensor to provide
-technical assistance or maintenance services for the Software.
+    Article 7 - RELATED SERVICES
 
-However, the Licensor is entitled to offer this type of services. The terms
-and conditions of such technical assistance, and/or such maintenance, shall
-be set forth in a separate instrument. Only the Licensor offering said maintenance
-and/or technical assistance services shall incur liability therefor.
+7.1 Under no circumstances shall the Agreement oblige the Licensor to
+provide technical assistance or maintenance services for the Software.
 
-7.2 Similarly, any Licensor is entitled to offer to its licensees, under its
-sole responsibility, a warranty, that shall only be binding upon itself, for
-the redistribution of the Software and/or the Modified Software, under terms
-and conditions that it is free to decide. Said warranty, and the financial
-terms and conditions of its application, shall be subject of a separate instrument
-executed between the Licensor and the Licensee.
+However, the Licensor is entitled to offer this type of services. The
+terms and conditions of such technical assistance, and/or such
+maintenance, shall be set forth in a separate instrument. Only the
+Licensor offering said maintenance and/or technical assistance services
+shall incur liability therefor.
 
-   Article 8 - LIABILITY
+7.2 Similarly, any Licensor is entitled to offer to its licensees, under
+its sole responsibility, a warranty, that shall only be binding upon
+itself, for the redistribution of the Software and/or the Modified
+Software, under terms and conditions that it is free to decide. Said
+warranty, and the financial terms and conditions of its application,
+shall be subject of a separate instrument executed between the Licensor
+and the Licensee.
 
-8.1 Subject to the provisions of Article 8.2, the Licensee shall be entitled
-to claim compensation for any direct loss it may have suffered from the Software
-as a result of a fault on the part of the relevant Licensor, subject to providing
-evidence thereof.
 
-8.2 The Licensor's liability is limited to the commitments made under this
-Agreement and shall not be incurred as a result of in particular: (i) loss
-due the Licensee's total or partial failure to fulfill its obligations, (ii)
-direct or consequential loss that is suffered by the Licensee due to the use
-or performance of the Software, and (iii) more generally, any consequential
-loss. In particular the Parties expressly agree that any or all pecuniary
-or business loss (i.e. loss of data, loss of profits, operating loss, loss
-of customers or orders, opportunity cost, any disturbance to business activities)
-or any or all legal proceedings instituted against the Licensee by a third
-party, shall constitute consequential loss and shall not provide entitlement
-to any or all compensation from the Licensor.
+    Article 8 - LIABILITY
 
-   Article 9 - WARRANTY
+8.1 Subject to the provisions of Article 8.2, the Licensee shall be
+entitled to claim compensation for any direct loss it may have suffered
+from the Software as a result of a fault on the part of the relevant
+Licensor, subject to providing evidence thereof.
 
-9.1 The Licensee acknowledges that the scientific and technical state-of-the-art
-when the Software was distributed did not enable all possible uses to be tested
-and verified, nor for the presence of possible defects to be detected. In
-this respect, the Licensee's attention has been drawn to the risks associated
-with loading, using, modifying and/or developing and reproducing the Software
-which are reserved for experienced users.
+8.2 The Licensor's liability is limited to the commitments made under
+this Agreement and shall not be incurred as a result of in particular:
+(i) loss due the Licensee's total or partial failure to fulfill its
+obligations, (ii) direct or consequential loss that is suffered by the
+Licensee due to the use or performance of the Software, and (iii) more
+generally, any consequential loss. In particular the Parties expressly
+agree that any or all pecuniary or business loss (i.e. loss of data,
+loss of profits, operating loss, loss of customers or orders,
+opportunity cost, any disturbance to business activities) or any or all
+legal proceedings instituted against the Licensee by a third party,
+shall constitute consequential loss and shall not provide entitlement to
+any or all compensation from the Licensor.
 
-The Licensee shall be responsible for verifying, by any or all means, the
-suitability of the product for its requirements, its good working order, and
-for ensuring that it shall not cause damage to either persons or properties.
 
-9.2 The Licensor hereby represents, in good faith, that it is entitled to
-grant all the rights over the Software (including in particular the rights
-set forth in Article 5).
+    Article 9 - WARRANTY
 
-9.3 The Licensee acknowledges that the Software is supplied "as is" by the
-Licensor without any other express or tacit warranty, other than that provided
-for in Article 9.2 and, in particular, without any warranty as to its commercial
-value, its secured, safe, innovative or relevant nature.
+9.1 The Licensee acknowledges that the scientific and technical
+state-of-the-art when the Software was distributed did not enable all
+possible uses to be tested and verified, nor for the presence of
+possible defects to be detected. In this respect, the Licensee's
+attention has been drawn to the risks associated with loading, using,
+modifying and/or developing and reproducing the Software which are
+reserved for experienced users.
 
-Specifically, the Licensor does not warrant that the Software is free from
-any error, that it will operate without interruption, that it will be compatible
-with the Licensee's own equipment and software configuration, nor that it
-will meet the Licensee's requirements.
+The Licensee shall be responsible for verifying, by any or all means,
+the suitability of the product for its requirements, its good working
+order, and for ensuring that it shall not cause damage to either persons
+or properties.
 
-9.4 The Licensor does not either expressly or tacitly warrant that the Software
-does not infringe any third party intellectual property right relating to
-a patent, software or any other property right. Therefore, the Licensor disclaims
-any and all liability towards the Licensee arising out of any or all proceedings
-for infringement that may be instituted in respect of the use, modification
-and redistribution of the Software. Nevertheless, should such proceedings
-be instituted against the Licensee, the Licensor shall provide it with technical
-and legal assistance for its defense. Such technical and legal assistance
-shall be decided on a case-by-case basis between the relevant Licensor and
-the Licensee pursuant to a memorandum of understanding. The Licensor disclaims
-any and all liability as regards the Licensee's use of the name of the Software.
-No warranty is given as regards the existence of prior rights over the name
-of the Software or as regards the existence of a trademark.
+9.2 The Licensor hereby represents, in good faith, that it is entitled
+to grant all the rights over the Software (including in particular the
+rights set forth in Article 5).
 
-   Article 10 - TERMINATION
+9.3 The Licensee acknowledges that the Software is supplied "as is" by
+the Licensor without any other express or tacit warranty, other than
+that provided for in Article 9.2 and, in particular, without any warranty
+as to its commercial value, its secured, safe, innovative or relevant
+nature.
 
-10.1 In the event of a breach by the Licensee of its obligations hereunder,
-the Licensor may automatically terminate this Agreement thirty (30) days after
-notice has been sent to the Licensee and has remained ineffective.
+Specifically, the Licensor does not warrant that the Software is free
+from any error, that it will operate without interruption, that it will
+be compatible with the Licensee's own equipment and software
+configuration, nor that it will meet the Licensee's requirements.
 
-10.2 A Licensee whose Agreement is terminated shall no longer be authorized
-to use, modify or distribute the Software. However, any licenses that it may
-have granted prior to termination of the Agreement shall remain valid subject
-to their having been granted in compliance with the terms and conditions hereof.
+9.4 The Licensor does not either expressly or tacitly warrant that the
+Software does not infringe any third party intellectual property right
+relating to a patent, software or any other property right. Therefore,
+the Licensor disclaims any and all liability towards the Licensee
+arising out of any or all proceedings for infringement that may be
+instituted in respect of the use, modification and redistribution of the
+Software. Nevertheless, should such proceedings be instituted against
+the Licensee, the Licensor shall provide it with technical and legal
+assistance for its defense. Such technical and legal assistance shall be
+decided on a case-by-case basis between the relevant Licensor and the
+Licensee pursuant to a memorandum of understanding. The Licensor
+disclaims any and all liability as regards the Licensee's use of the
+name of the Software. No warranty is given as regards the existence of
+prior rights over the name of the Software or as regards the existence
+of a trademark.
+
+
+    Article 10 - TERMINATION
+
+10.1 In the event of a breach by the Licensee of its obligations
+hereunder, the Licensor may automatically terminate this Agreement
+thirty (30) days after notice has been sent to the Licensee and has
+remained ineffective.
+
+10.2 A Licensee whose Agreement is terminated shall no longer be
+authorized to use, modify or distribute the Software. However, any
+licenses that it may have granted prior to termination of the Agreement
+shall remain valid subject to their having been granted in compliance
+with the terms and conditions hereof.
+
+
+    Article 11 - MISCELLANEOUS
 
-   Article 11 - MISCELLANEOUS
 
       11.1 EXCUSABLE EVENTS
 
-Neither Party shall be liable for any or all delay, or failure to perform
-the Agreement, that may be attributable to an event of force majeure, an act
-of God or an outside cause, such as defective functioning or interruptions
-of the electricity or telecommunications networks, network paralysis following
-a virus attack, intervention by government authorities, natural disasters,
-water damage, earthquakes, fire, explosions, strikes and labor unrest, war,
-etc.
+Neither Party shall be liable for any or all delay, or failure to
+perform the Agreement, that may be attributable to an event of force
+majeure, an act of God or an outside cause, such as defective
+functioning or interruptions of the electricity or telecommunications
+networks, network paralysis following a virus attack, intervention by
+government authorities, natural disasters, water damage, earthquakes,
+fire, explosions, strikes and labor unrest, war, etc.
 
-11.2 Any failure by either Party, on one or more occasions, to invoke one
-or more of the provisions hereof, shall under no circumstances be interpreted
-as being a waiver by the interested Party of its right to invoke said provision(s)
-subsequently.
+11.2 Any failure by either Party, on one or more occasions, to invoke
+one or more of the provisions hereof, shall under no circumstances be
+interpreted as being a waiver by the interested Party of its right to
+invoke said provision(s) subsequently.
 
-11.3 The Agreement cancels and replaces any or all previous agreements, whether
-written or oral, between the Parties and having the same purpose, and constitutes
-the entirety of the agreement between said Parties concerning said purpose.
-No supplement or modification to the terms and conditions hereof shall be
-effective as between the Parties unless it is made in writing and signed by
-their duly authorized representatives.
+11.3 The Agreement cancels and replaces any or all previous agreements,
+whether written or oral, between the Parties and having the same
+purpose, and constitutes the entirety of the agreement between said
+Parties concerning said purpose. No supplement or modification to the
+terms and conditions hereof shall be effective as between the Parties
+unless it is made in writing and signed by their duly authorized
+representatives.
+
+11.4 In the event that one or more of the provisions hereof were to
+conflict with a current or future applicable act or legislative text,
+said act or legislative text shall prevail, and the Parties shall make
+the necessary amendments so as to comply with said act or legislative
+text. All other provisions shall remain effective. Similarly, invalidity
+of a provision of the Agreement, for any reason whatsoever, shall not
+cause the Agreement as a whole to be invalid.
 
-11.4 In the event that one or more of the provisions hereof were to conflict
-with a current or future applicable act or legislative text, said act or legislative
-text shall prevail, and the Parties shall make the necessary amendments so
-as to comply with said act or legislative text. All other provisions shall
-remain effective. Similarly, invalidity of a provision of the Agreement, for
-any reason whatsoever, shall not cause the Agreement as a whole to be invalid.
 
       11.5 LANGUAGE
 
-The Agreement is drafted in both French and English and both versions are
-deemed authentic.
+The Agreement is drafted in both French and English and both versions
+are deemed authentic.
 
-   Article 12 - NEW VERSIONS OF THE AGREEMENT
 
-12.1 Any person is authorized to duplicate and distribute copies of this Agreement.
+    Article 12 - NEW VERSIONS OF THE AGREEMENT
 
-12.2 So as to ensure coherence, the wording of this Agreement is protected
-and may only be modified by the authors of the License, who reserve the right
-to periodically publish updates or new versions of the Agreement, each with
-a separate number. These subsequent versions may address new issues encountered
-by Free Software.
+12.1 Any person is authorized to duplicate and distribute copies of this
+Agreement.
 
-12.3 Any Software distributed under a given version of the Agreement may only
-be subsequently distributed under the same version of the Agreement or a subsequent
-version.
+12.2 So as to ensure coherence, the wording of this Agreement is
+protected and may only be modified by the authors of the License, who
+reserve the right to periodically publish updates or new versions of the
+Agreement, each with a separate number. These subsequent versions may
+address new issues encountered by Free Software.
 
-   Article 13 - GOVERNING LAW AND JURISDICTION
+12.3 Any Software distributed under a given version of the Agreement may
+only be subsequently distributed under the same version of the Agreement
+or a subsequent version.
 
-13.1 The Agreement is governed by French law. The Parties agree to endeavor
-to seek an amicable solution to any disagreements or disputes that may arise
-during the performance of the Agreement.
 
-13.2 Failing an amicable solution within two (2) months as from their occurrence,
-and unless emergency proceedings are necessary, the disagreements or disputes
-shall be referred to the Paris Courts having jurisdiction, by the more diligent
-Party.
+    Article 13 - GOVERNING LAW AND JURISDICTION
 
-Version 1.0 dated 2006-09-05. 1 CeCILL stands for Ce(a) C(nrs) I(nria) L(ogiciel)
-L(ibre)
+13.1 The Agreement is governed by French law. The Parties agree to
+endeavor to seek an amicable solution to any disagreements or disputes
+that may arise during the performance of the Agreement.
+
+13.2 Failing an amicable solution within two (2) months as from their
+occurrence, and unless emergency proceedings are necessary, the
+disagreements or disputes shall be referred to the Paris Courts having
+jurisdiction, by the more diligent Party.
+
+
+Version 1.0 dated 2006-09-05.
diff --git a/options/license/CECILL-C b/options/license/CECILL-C
index 11f1b30819..2bb09b4b04 100644
--- a/options/license/CECILL-C
+++ b/options/license/CECILL-C
@@ -1,487 +1,517 @@
-CeCILL-C FREE SOFTWARE LICENSE AGREEMENT Notice
 
-This Agreement is a Free Software license agreement that is the result of
-discussions between its authors in order to ensure compliance with the two
-main principles guiding its drafting:
+CeCILL-C FREE SOFTWARE LICENSE AGREEMENT
 
-* firstly, compliance with the principles governing the distribution of Free
-Software: access to source code, broad rights granted to users,
 
-* secondly, the election of a governing law, French law, with which it is
-conformant, both as regards the law of torts and intellectual property law,
-and the protection that it offers to both authors and holders of the economic
-rights over software.
+    Notice
 
-The authors of the CeCILL¹ license are:
+This Agreement is a Free Software license agreement that is the result
+of discussions between its authors in order to ensure compliance with
+the two main principles guiding its drafting:
 
-   
+    * firstly, compliance with the principles governing the distribution
+      of Free Software: access to source code, broad rights granted to
+      users,
+    * secondly, the election of a governing law, French law, with which
+      it is conformant, both as regards the law of torts and
+      intellectual property law, and the protection that it offers to
+      both authors and holders of the economic rights over software.
 
-Commissariat à l'Energie Atomique - CEA, a public scientific, technical and
-industrial research establishment, having its principal place of business
-at 25 rue Leblanc, immeuble Le Ponant D, 75015 Paris, France.
+The authors of the CeCILL-C (for Ce[a] C[nrs] I[nria] L[ogiciel] L[ibre])
+license are:
 
-   
+Commissariat à l'Energie Atomique - CEA, a public scientific, technical
+and industrial research establishment, having its principal place of
+business at 25 rue Leblanc, immeuble Le Ponant D, 75015 Paris, France.
 
-Centre National de la Recherche Scientifique - CNRS, a public scientific and
-technological establishment, having its principal place of business at 3 rue
-Michel-Ange, 75794 Paris cedex 16, France.
+Centre National de la Recherche Scientifique - CNRS, a public scientific
+and technological establishment, having its principal place of business
+at 3 rue Michel-Ange, 75794 Paris cedex 16, France.
 
-   
+Institut National de Recherche en Informatique et en Automatique -
+INRIA, a public scientific and technological establishment, having its
+principal place of business at Domaine de Voluceau, Rocquencourt, BP
+105, 78153 Le Chesnay cedex, France.
 
-Institut National de Recherche en Informatique et en Automatique - INRIA,
-a public scientific and technological establishment, having its principal
-place of business at Domaine de Voluceau, Rocquencourt, BP 105, 78153 Le Chesnay
-cedex, France.
 
-Preamble The purpose of this Free Software license agreement is to grant users
+    Preamble
+
+The purpose of this Free Software license agreement is to grant users
 the right to modify and re-use the software governed by this license.
 
-The exercising of this right is conditional upon the obligation to make available
-to the community the modifications made to the source code of the software
-so as to contribute to its evolution.
+The exercising of this right is conditional upon the obligation to make
+available to the community the modifications made to the source code of
+the software so as to contribute to its evolution.
 
-In consideration of access to the source code and the rights to copy, modify
-and redistribute granted by the license, users are provided only with a limited
-warranty and the software's author, the holder of the economic rights, and
-the successive licensors only have limited liability.
+In consideration of access to the source code and the rights to copy,
+modify and redistribute granted by the license, users are provided only
+with a limited warranty and the software's author, the holder of the
+economic rights, and the successive licensors only have limited liability.
 
-In this respect, the risks associated with loading, using, modifying and/or
-developing or reproducing the software by the user are brought to the user's
-attention, given its Free Software status, which may make it complicated to
-use, with the result that its use is reserved for developers and experienced
-professionals having in-depth computer knowledge. Users are therefore encouraged
-to load and test the suitability of the software as regards their requirements
-in conditions enabling the security of their systems and/or data to be ensured
-and, more generally, to use and operate it in the same conditions of security.
-This Agreement may be freely reproduced and published, provided it is not
-altered, and that no provisions are either added or removed herefrom.
+In this respect, the risks associated with loading, using, modifying
+and/or developing or reproducing the software by the user are brought to
+the user's attention, given its Free Software status, which may make it
+complicated to use, with the result that its use is reserved for
+developers and experienced professionals having in-depth computer
+knowledge. Users are therefore encouraged to load and test the
+suitability of the software as regards their requirements in conditions
+enabling the security of their systems and/or data to be ensured and,
+more generally, to use and operate it in the same conditions of
+security. This Agreement may be freely reproduced and published,
+provided it is not altered, and that no provisions are either added or
+removed herefrom.
 
-This Agreement may apply to any or all software for which the holder of the
-economic rights decides to submit the use thereof to its provisions.
+This Agreement may apply to any or all software for which the holder of
+the economic rights decides to submit the use thereof to its provisions.
 
-   Article 1 - DEFINITIONS
 
-For the purpose of this Agreement, when the following expressions commence
-with a capital letter, they shall have the following meaning:
+    Article 1 - DEFINITIONS
 
-      
+For the purpose of this Agreement, when the following expressions
+commence with a capital letter, they shall have the following meaning:
 
-Agreement: means this license agreement, and its possible subsequent versions
-and annexes.
+Agreement: means this license agreement, and its possible subsequent
+versions and annexes.
 
-      
+Software: means the software in its Object Code and/or Source Code form
+and, where applicable, its documentation, "as is" when the Licensee
+accepts the Agreement.
 
-Software: means the software in its Object Code and/or Source Code form and,
-where applicable, its documentation, "as is" when the Licensee accepts the
-Agreement.
+Initial Software: means the Software in its Source Code and possibly its
+Object Code form and, where applicable, its documentation, "as is" when
+it is first distributed under the terms and conditions of the Agreement.
 
-      
+Modified Software: means the Software modified by at least one
+Integrated Contribution.
 
-Initial Software: means the Software in its Source Code and possibly its Object
-Code form and, where applicable, its documentation, "as is" when it is first
-distributed under the terms and conditions of the Agreement.
+Source Code: means all the Software's instructions and program lines to
+which access is required so as to modify the Software.
 
-      
+Object Code: means the binary files originating from the compilation of
+the Source Code.
 
-Modified Software: means the Software modified by at least one Integrated
+Holder: means the holder(s) of the economic rights over the Initial
+Software.
+
+Licensee: means the Software user(s) having accepted the Agreement.
+
+Contributor: means a Licensee having made at least one Integrated
 Contribution.
 
-      
+Licensor: means the Holder, or any other individual or legal entity, who
+distributes the Software under the Agreement.
 
-Source Code: means all the Software's instructions and program lines to which
-access is required so as to modify the Software.
+Integrated Contribution: means any or all modifications, corrections,
+translations, adaptations and/or new functions integrated into the
+Source Code by any or all Contributors.
 
-      
+Related Module: means a set of sources files including their
+documentation that, without modification to the Source Code, enables
+supplementary functions or services in addition to those offered by the
+Software.
 
-Object Code: means the binary files originating from the compilation of the
-Source Code.
+Derivative Software: means any combination of the Software, modified or
+not, and of a Related Module.
 
-      
+Parties: mean both the Licensee and the Licensor.
 
-Holder: means the holder(s) of the economic rights over the Initial Software.
+These expressions may be used both in singular and plural form.
 
-      
 
-      Licensee: means the Software user(s) having accepted the Agreement.
+    Article 2 - PURPOSE
 
-      
+The purpose of the Agreement is the grant by the Licensor to the
+Licensee of a non-exclusive, transferable and worldwide license for the
+Software as set forth in Article 5 hereinafter for the whole term of the
+protection granted by the rights over said Software.
 
-Contributor: means a Licensee having made at least one Integrated Contribution.
 
-      
+    Article 3 - ACCEPTANCE
 
-Licensor: means the Holder, or any other individual or legal entity, who distributes
-the Software under the Agreement.
+3.1 The Licensee shall be deemed as having accepted the terms and
+conditions of this Agreement upon the occurrence of the first of the
+following events:
 
-      
+    * (i) loading the Software by any or all means, notably, by
+      downloading from a remote server, or by loading from a physical
+      medium;
+    * (ii) the first time the Licensee exercises any of the rights
+      granted hereunder.
 
-Integrated Contribution: means any or all modifications, corrections, translations,
-adaptations and/or new functions integrated into the Source Code by any or
-all Contributors.
+3.2 One copy of the Agreement, containing a notice relating to the
+characteristics of the Software, to the limited warranty, and to the
+fact that its use is restricted to experienced users has been provided
+to the Licensee prior to its acceptance as set forth in Article 3.1
+hereinabove, and the Licensee hereby acknowledges that it has read and
+understood it.
 
-      
 
-Related Module: means a set of sources files including their documentation
-that, without modification to the Source Code, enables supplementary functions
-or services in addition to those offered by the Software.
+    Article 4 - EFFECTIVE DATE AND TERM
 
-      
-
-Derivative Software: means any combination of the Software, modified or not,
-and of a Related Module.
-
-      
-
-      Parties: mean both the Licensee and the Licensor.
-
-   These expressions may be used both in singular and plural form.
-
-   Article 2 - PURPOSE
-
-The purpose of the Agreement is the grant by the Licensor to the Licensee
-of a non-exclusive, transferable and worldwide license for the Software as
-set forth in Article 5 hereinafter for the whole term of the protection granted
-by the rights over said Software.
-
-   Article 3 - ACCEPTANCE
-
-3.1 The Licensee shall be deemed as having accepted the terms and conditions
-of this Agreement upon the occurrence of the first of the following events:
-
-(i) loading the Software by any or all means, notably, by downloading from
-a remote server, or by loading from a physical medium;
-
-(ii) the first time the Licensee exercises any of the rights granted hereunder.
-
-3.2 One copy of the Agreement, containing a notice relating to the characteristics
-of the Software, to the limited warranty, and to the fact that its use is
-restricted to experienced users has been provided to the Licensee prior to
-its acceptance as set forth in Article 3.1 hereinabove, and the Licensee hereby
-acknowledges that it has read and understood it.
-
-   Article 4 - EFFECTIVE DATE AND TERM
 
       4.1 EFFECTIVE DATE
 
-The Agreement shall become effective on the date when it is accepted by the
-Licensee as set forth in Article 3.1.
+The Agreement shall become effective on the date when it is accepted by
+the Licensee as set forth in Article 3.1.
+
 
       4.2 TERM
 
-The Agreement shall remain in force for the entire legal term of protection
-of the economic rights over the Software.
+The Agreement shall remain in force for the entire legal term of
+protection of the economic rights over the Software.
 
-   Article 5 - SCOPE OF RIGHTS GRANTED
 
-The Licensor hereby grants to the Licensee, who accepts, the following rights
-over the Software for any or all use, and for the term of the Agreement, on
-the basis of the terms and conditions set forth hereinafter.
+    Article 5 - SCOPE OF RIGHTS GRANTED
+
+The Licensor hereby grants to the Licensee, who accepts, the following
+rights over the Software for any or all use, and for the term of the
+Agreement, on the basis of the terms and conditions set forth hereinafter.
+
+Besides, if the Licensor owns or comes to own one or more patents
+protecting all or part of the functions of the Software or of its
+components, the Licensor undertakes not to enforce the rights granted by
+these patents against successive Licensees using, exploiting or
+modifying the Software. If these patents are transferred, the Licensor
+undertakes to have the transferees subscribe to the obligations set
+forth in this paragraph.
 
-Besides, if the Licensor owns or comes to own one or more patents protecting
-all or part of the functions of the Software or of its components, the Licensor
-undertakes not to enforce the rights granted by these patents against successive
-Licensees using, exploiting or modifying the Software. If these patents are
-transferred, the Licensor undertakes to have the transferees subscribe to
-the obligations set forth in this paragraph.
 
       5.1 RIGHT OF USE
 
-The Licensee is authorized to use the Software, without any limitation as
-to its fields of application, with it being hereinafter specified that this
-comprises:
+The Licensee is authorized to use the Software, without any limitation
+as to its fields of application, with it being hereinafter specified
+that this comprises:
 
-1. permanent or temporary reproduction of all or part of the Software by any
-or all means and in any or all form.
+   1. permanent or temporary reproduction of all or part of the Software
+      by any or all means and in any or all form.
 
-2. loading, displaying, running, or storing the Software on any or all medium.
+   2. loading, displaying, running, or storing the Software on any or
+      all medium.
+
+   3. entitlement to observe, study or test its operation so as to
+      determine the ideas and principles behind any or all constituent
+      elements of said Software. This shall apply when the Licensee
+      carries out any or all loading, displaying, running, transmission
+      or storage operation as regards the Software, that it is entitled
+      to carry out hereunder.
 
-3. entitlement to observe, study or test its operation so as to determine
-the ideas and principles behind any or all constituent elements of said Software.
-This shall apply when the Licensee carries out any or all loading, displaying,
-running, transmission or storage operation as regards the Software, that it
-is entitled to carry out hereunder.
 
       5.2 RIGHT OF MODIFICATION
 
-The right of modification includes the right to translate, adapt, arrange,
-or make any or all modifications to the Software, and the right to reproduce
-the resulting software. It includes, in particular, the right to create a
-Derivative Software.
+The right of modification includes the right to translate, adapt,
+arrange, or make any or all modifications to the Software, and the right
+to reproduce the resulting software. It includes, in particular, the
+right to create a Derivative Software.
+
+The Licensee is authorized to make any or all modification to the
+Software provided that it includes an explicit notice that it is the
+author of said modification and indicates the date of the creation thereof.
 
-The Licensee is authorized to make any or all modification to the Software
-provided that it includes an explicit notice that it is the author of said
-modification and indicates the date of the creation thereof.
 
       5.3 RIGHT OF DISTRIBUTION
 
-In particular, the right of distribution includes the right to publish, transmit
-and communicate the Software to the general public on any or all medium, and
-by any or all means, and the right to market, either in consideration of a
-fee, or free of charge, one or more copies of the Software by any means.
+In particular, the right of distribution includes the right to publish,
+transmit and communicate the Software to the general public on any or
+all medium, and by any or all means, and the right to market, either in
+consideration of a fee, or free of charge, one or more copies of the
+Software by any means.
 
-The Licensee is further authorized to distribute copies of the modified or
-unmodified Software to third parties according to the terms and conditions
-set forth hereinafter.
+The Licensee is further authorized to distribute copies of the modified
+or unmodified Software to third parties according to the terms and
+conditions set forth hereinafter.
 
-         5.3.1. DISTRIBUTION OF SOFTWARE WITHOUT MODIFICATION
 
-The Licensee is authorized to distribute true copies of the Software in Source
-Code or Object Code form, provided that said distribution complies with all
-the provisions of the Agreement and is accompanied by:
+        5.3.1 DISTRIBUTION OF SOFTWARE WITHOUT MODIFICATION
 
-            1. a copy of the Agreement,
+The Licensee is authorized to distribute true copies of the Software in
+Source Code or Object Code form, provided that said distribution
+complies with all the provisions of the Agreement and is accompanied by:
 
-2. a notice relating to the limitation of both the Licensor's warranty and
-liability as set forth in Articles 8 and 9,
+   1. a copy of the Agreement,
 
-and that, in the event that only the Object Code of the Software is redistributed,
-the Licensee allows effective access to the full Source Code of the Software
-at a minimum during the entire period of its distribution of the Software,
-it being understood that the additional cost of acquiring the Source Code
-shall not exceed the cost of transferring the data.
+   2. a notice relating to the limitation of both the Licensor's
+      warranty and liability as set forth in Articles 8 and 9,
 
-         5.3.2. DISTRIBUTION OF MODIFIED SOFTWARE
+and that, in the event that only the Object Code of the Software is
+redistributed, the Licensee allows effective access to the full Source
+Code of the Software at a minimum during the entire period of its
+distribution of the Software, it being understood that the additional
+cost of acquiring the Source Code shall not exceed the cost of
+transferring the data.
 
-When the Licensee makes an Integrated Contribution to the Software, the terms
-and conditions for the distribution of the resulting Modified Software become
-subject to all the provisions of this Agreement.
 
-The Licensee is authorized to distribute the Modified Software, in source
-code or object code form, provided that said distribution complies with all
-the provisions of the Agreement and is accompanied by:
+        5.3.2 DISTRIBUTION OF MODIFIED SOFTWARE
 
-            1. a copy of the Agreement,
+When the Licensee makes an Integrated Contribution to the Software, the
+terms and conditions for the distribution of the resulting Modified
+Software become subject to all the provisions of this Agreement.
 
-2. a notice relating to the limitation of both the Licensor's warranty and
-liability as set forth in Articles 8 and 9,
+The Licensee is authorized to distribute the Modified Software, in
+source code or object code form, provided that said distribution
+complies with all the provisions of the Agreement and is accompanied by:
 
-and that, in the event that only the object code of the Modified Software
-is redistributed, the Licensee allows effective access to the full source
-code of the Modified Software at a minimum during the entire period of its
-distribution of the Modified Software, it being understood that the additional
-cost of acquiring the source code shall not exceed the cost of transferring
-the data.
+   1. a copy of the Agreement,
 
-         5.3.3. DISTRIBUTION OF DERIVATIVE SOFTWARE
+   2. a notice relating to the limitation of both the Licensor's
+      warranty and liability as set forth in Articles 8 and 9,
 
-When the Licensee creates Derivative Software, this Derivative Software may
-be distributed under a license agreement other than this Agreement, subject
-to compliance with the requirement to include a notice concerning the rights
-over the Software as defined in Article 6.4. In the event the creation of
-the Derivative Software required modification of the Source Code, the Licensee
-undertakes that:
+and that, in the event that only the object code of the Modified
+Software is redistributed, the Licensee allows effective access to the
+full source code of the Modified Software at a minimum during the entire
+period of its distribution of the Modified Software, it being understood
+that the additional cost of acquiring the source code shall not exceed
+the cost of transferring the data.
 
-1. the resulting Modified Software will be governed by this Agreement,
 
-2. the Integrated Contributions in the resulting Modified Software will be
-clearly identified and documented,
+        5.3.3 DISTRIBUTION OF DERIVATIVE SOFTWARE
 
-3. the Licensee will allow effective access to the source code of the Modified
-Software, at a minimum during the entire period of distribution of the Derivative
-Software, such that such modifications may be carried over in a subsequent
-version of the Software; it being understood that the additional cost of purchasing
-the source code of the Modified Software shall not exceed the cost of transferring
-the data.
+When the Licensee creates Derivative Software, this Derivative Software
+may be distributed under a license agreement other than this Agreement,
+subject to compliance with the requirement to include a notice
+concerning the rights over the Software as defined in Article 6.4.
+In the event the creation of the Derivative Software required modification
+of the Source Code, the Licensee undertakes that:
 
-         5.3.4. COMPATIBILITY WITH THE CeCILL LICENSE
+   1. the resulting Modified Software will be governed by this Agreement,
+   2. the Integrated Contributions in the resulting Modified Software
+      will be clearly identified and documented,
+   3. the Licensee will allow effective access to the source code of the
+      Modified Software, at a minimum during the entire period of
+      distribution of the Derivative Software, such that such
+      modifications may be carried over in a subsequent version of the
+      Software; it being understood that the additional cost of
+      purchasing the source code of the Modified Software shall not
+      exceed the cost of transferring the data.
 
-When a Modified Software contains an Integrated Contribution subject to the
-CeCILL license agreement, or when a Derivative Software contains a Related
-Module subject to the CeCILL license agreement, the provisions set forth in
-the third item of Article 6.4 are optional.
 
-   Article 6 - INTELLECTUAL PROPERTY
+        5.3.4 COMPATIBILITY WITH THE CeCILL LICENSE
+
+When a Modified Software contains an Integrated Contribution subject to
+the CeCILL license agreement, or when a Derivative Software contains a
+Related Module subject to the CeCILL license agreement, the provisions
+set forth in the third item of Article 6.4 are optional.
+
+
+    Article 6 - INTELLECTUAL PROPERTY
+
 
       6.1 OVER THE INITIAL SOFTWARE
 
-The Holder owns the economic rights over the Initial Software. Any or all
-use of the Initial Software is subject to compliance with the terms and conditions
-under which the Holder has elected to distribute its work and no one shall
-be entitled to modify the terms and conditions for the distribution of said
-Initial Software.
+The Holder owns the economic rights over the Initial Software. Any or
+all use of the Initial Software is subject to compliance with the terms
+and conditions under which the Holder has elected to distribute its work
+and no one shall be entitled to modify the terms and conditions for the
+distribution of said Initial Software.
+
+The Holder undertakes that the Initial Software will remain ruled at
+least by this Agreement, for the duration set forth in Article 4.2.
 
-The Holder undertakes that the Initial Software will remain ruled at least
-by this Agreement, for the duration set forth in Article 4.2.
 
       6.2 OVER THE INTEGRATED CONTRIBUTIONS
 
-The Licensee who develops an Integrated Contribution is the owner of the intellectual
-property rights over this Contribution as defined by applicable law.
+The Licensee who develops an Integrated Contribution is the owner of the
+intellectual property rights over this Contribution as defined by
+applicable law.
+
 
       6.3 OVER THE RELATED MODULES
 
-The Licensee who develops a Related Module is the owner of the intellectual
-property rights over this Related Module as defined by applicable law and
-is free to choose the type of agreement that shall govern its distribution
-under the conditions defined in Article 5.3.3.
+The Licensee who develops a Related Module is the owner of the
+intellectual property rights over this Related Module as defined by
+applicable law and is free to choose the type of agreement that shall
+govern its distribution under the conditions defined in Article 5.3.3.
+
 
       6.4 NOTICE OF RIGHTS
 
-      The Licensee expressly undertakes:
+The Licensee expressly undertakes:
 
-1. not to remove, or modify, in any manner, the intellectual property notices
-attached to the Software;
+   1. not to remove, or modify, in any manner, the intellectual property
+      notices attached to the Software;
 
-2. to reproduce said notices, in an identical manner, in the copies of the
-Software modified or not;
+   2. to reproduce said notices, in an identical manner, in the copies
+      of the Software modified or not;
 
-3. to ensure that use of the Software, its intellectual property notices and
-the fact that it is governed by the Agreement is indicated in a text that
-is easily accessible, specifically from the interface of any Derivative Software.
+   3. to ensure that use of the Software, its intellectual property
+      notices and the fact that it is governed by the Agreement is
+      indicated in a text that is easily accessible, specifically from
+      the interface of any Derivative Software.
 
-The Licensee undertakes not to directly or indirectly infringe the intellectual
-property rights of the Holder and/or Contributors on the Software and to take,
-where applicable, vis-à-vis its staff, any and all measures required to ensure
-respect of said intellectual property rights of the Holder and/or Contributors.
+The Licensee undertakes not to directly or indirectly infringe the
+intellectual property rights of the Holder and/or Contributors on the
+Software and to take, where applicable, vis-à-vis its staff, any and all
+measures required to ensure respect of said intellectual property rights
+of the Holder and/or Contributors.
 
-   Article 7 - RELATED SERVICES
 
-7.1 Under no circumstances shall the Agreement oblige the Licensor to provide
-technical assistance or maintenance services for the Software.
+    Article 7 - RELATED SERVICES
 
-However, the Licensor is entitled to offer this type of services. The terms
-and conditions of such technical assistance, and/or such maintenance, shall
-be set forth in a separate instrument. Only the Licensor offering said maintenance
-and/or technical assistance services shall incur liability therefor.
+7.1 Under no circumstances shall the Agreement oblige the Licensor to
+provide technical assistance or maintenance services for the Software.
 
-7.2 Similarly, any Licensor is entitled to offer to its licensees, under its
-sole responsibility, a warranty, that shall only be binding upon itself, for
-the redistribution of the Software and/or the Modified Software, under terms
-and conditions that it is free to decide. Said warranty, and the financial
-terms and conditions of its application, shall be subject of a separate instrument
-executed between the Licensor and the Licensee.
+However, the Licensor is entitled to offer this type of services. The
+terms and conditions of such technical assistance, and/or such
+maintenance, shall be set forth in a separate instrument. Only the
+Licensor offering said maintenance and/or technical assistance services
+shall incur liability therefor.
 
-   Article 8 - LIABILITY
+7.2 Similarly, any Licensor is entitled to offer to its licensees, under
+its sole responsibility, a warranty, that shall only be binding upon
+itself, for the redistribution of the Software and/or the Modified
+Software, under terms and conditions that it is free to decide. Said
+warranty, and the financial terms and conditions of its application,
+shall be subject of a separate instrument executed between the Licensor
+and the Licensee.
 
-8.1 Subject to the provisions of Article 8.2, the Licensee shall be entitled
-to claim compensation for any direct loss it may have suffered from the Software
-as a result of a fault on the part of the relevant Licensor, subject to providing
-evidence thereof.
 
-8.2 The Licensor's liability is limited to the commitments made under this
-Agreement and shall not be incurred as a result of in particular: (i) loss
-due the Licensee's total or partial failure to fulfill its obligations, (ii)
-direct or consequential loss that is suffered by the Licensee due to the use
-or performance of the Software, and (iii) more generally, any consequential
-loss. In particular the Parties expressly agree that any or all pecuniary
-or business loss (i.e. loss of data, loss of profits, operating loss, loss
-of customers or orders, opportunity cost, any disturbance to business activities)
-or any or all legal proceedings instituted against the Licensee by a third
-party, shall constitute consequential loss and shall not provide entitlement
-to any or all compensation from the Licensor.
+    Article 8 - LIABILITY
 
-   Article 9 - WARRANTY
+8.1 Subject to the provisions of Article 8.2, the Licensee shall be
+entitled to claim compensation for any direct loss it may have suffered
+from the Software as a result of a fault on the part of the relevant
+Licensor, subject to providing evidence thereof.
 
-9.1 The Licensee acknowledges that the scientific and technical state-of-the-art
-when the Software was distributed did not enable all possible uses to be tested
-and verified, nor for the presence of possible defects to be detected. In
-this respect, the Licensee's attention has been drawn to the risks associated
-with loading, using, modifying and/or developing and reproducing the Software
-which are reserved for experienced users.
+8.2 The Licensor's liability is limited to the commitments made under
+this Agreement and shall not be incurred as a result of in particular:
+(i) loss due the Licensee's total or partial failure to fulfill its
+obligations, (ii) direct or consequential loss that is suffered by the
+Licensee due to the use or performance of the Software, and (iii) more
+generally, any consequential loss. In particular the Parties expressly
+agree that any or all pecuniary or business loss (i.e. loss of data,
+loss of profits, operating loss, loss of customers or orders,
+opportunity cost, any disturbance to business activities) or any or all
+legal proceedings instituted against the Licensee by a third party,
+shall constitute consequential loss and shall not provide entitlement to
+any or all compensation from the Licensor.
 
-The Licensee shall be responsible for verifying, by any or all means, the
-suitability of the product for its requirements, its good working order, and
-for ensuring that it shall not cause damage to either persons or properties.
 
-9.2 The Licensor hereby represents, in good faith, that it is entitled to
-grant all the rights over the Software (including in particular the rights
-set forth in Article 5).
+    Article 9 - WARRANTY
 
-9.3 The Licensee acknowledges that the Software is supplied "as is" by the
-Licensor without any other express or tacit warranty, other than that provided
-for in Article 9.2 and, in particular, without any warranty as to its commercial
-value, its secured, safe, innovative or relevant nature.
+9.1 The Licensee acknowledges that the scientific and technical
+state-of-the-art when the Software was distributed did not enable all
+possible uses to be tested and verified, nor for the presence of
+possible defects to be detected. In this respect, the Licensee's
+attention has been drawn to the risks associated with loading, using,
+modifying and/or developing and reproducing the Software which are
+reserved for experienced users.
 
-Specifically, the Licensor does not warrant that the Software is free from
-any error, that it will operate without interruption, that it will be compatible
-with the Licensee's own equipment and software configuration, nor that it
-will meet the Licensee's requirements.
+The Licensee shall be responsible for verifying, by any or all means,
+the suitability of the product for its requirements, its good working
+order, and for ensuring that it shall not cause damage to either persons
+or properties.
 
-9.4 The Licensor does not either expressly or tacitly warrant that the Software
-does not infringe any third party intellectual property right relating to
-a patent, software or any other property right. Therefore, the Licensor disclaims
-any and all liability towards the Licensee arising out of any or all proceedings
-for infringement that may be instituted in respect of the use, modification
-and redistribution of the Software. Nevertheless, should such proceedings
-be instituted against the Licensee, the Licensor shall provide it with technical
-and legal assistance for its defense. Such technical and legal assistance
-shall be decided on a case-by-case basis between the relevant Licensor and
-the Licensee pursuant to a memorandum of understanding. The Licensor disclaims
-any and all liability as regards the Licensee's use of the name of the Software.
-No warranty is given as regards the existence of prior rights over the name
-of the Software or as regards the existence of a trademark.
+9.2 The Licensor hereby represents, in good faith, that it is entitled
+to grant all the rights over the Software (including in particular the
+rights set forth in Article 5).
 
-   Article 10 - TERMINATION
+9.3 The Licensee acknowledges that the Software is supplied "as is" by
+the Licensor without any other express or tacit warranty, other than
+that provided for in Article 9.2 and, in particular, without any warranty
+as to its commercial value, its secured, safe, innovative or relevant
+nature.
 
-10.1 In the event of a breach by the Licensee of its obligations hereunder,
-the Licensor may automatically terminate this Agreement thirty (30) days after
-notice has been sent to the Licensee and has remained ineffective.
+Specifically, the Licensor does not warrant that the Software is free
+from any error, that it will operate without interruption, that it will
+be compatible with the Licensee's own equipment and software
+configuration, nor that it will meet the Licensee's requirements.
 
-10.2 A Licensee whose Agreement is terminated shall no longer be authorized
-to use, modify or distribute the Software. However, any licenses that it may
-have granted prior to termination of the Agreement shall remain valid subject
-to their having been granted in compliance with the terms and conditions hereof.
+9.4 The Licensor does not either expressly or tacitly warrant that the
+Software does not infringe any third party intellectual property right
+relating to a patent, software or any other property right. Therefore,
+the Licensor disclaims any and all liability towards the Licensee
+arising out of any or all proceedings for infringement that may be
+instituted in respect of the use, modification and redistribution of the
+Software. Nevertheless, should such proceedings be instituted against
+the Licensee, the Licensor shall provide it with technical and legal
+assistance for its defense. Such technical and legal assistance shall be
+decided on a case-by-case basis between the relevant Licensor and the
+Licensee pursuant to a memorandum of understanding. The Licensor
+disclaims any and all liability as regards the Licensee's use of the
+name of the Software. No warranty is given as regards the existence of
+prior rights over the name of the Software or as regards the existence
+of a trademark.
+
+
+    Article 10 - TERMINATION
+
+10.1 In the event of a breach by the Licensee of its obligations
+hereunder, the Licensor may automatically terminate this Agreement
+thirty (30) days after notice has been sent to the Licensee and has
+remained ineffective.
+
+10.2 A Licensee whose Agreement is terminated shall no longer be
+authorized to use, modify or distribute the Software. However, any
+licenses that it may have granted prior to termination of the Agreement
+shall remain valid subject to their having been granted in compliance
+with the terms and conditions hereof.
+
+
+    Article 11 - MISCELLANEOUS
 
-   Article 11 - MISCELLANEOUS
 
       11.1 EXCUSABLE EVENTS
 
-Neither Party shall be liable for any or all delay, or failure to perform
-the Agreement, that may be attributable to an event of force majeure, an act
-of God or an outside cause, such as defective functioning or interruptions
-of the electricity or telecommunications networks, network paralysis following
-a virus attack, intervention by government authorities, natural disasters,
-water damage, earthquakes, fire, explosions, strikes and labor unrest, war,
-etc.
+Neither Party shall be liable for any or all delay, or failure to
+perform the Agreement, that may be attributable to an event of force
+majeure, an act of God or an outside cause, such as defective
+functioning or interruptions of the electricity or telecommunications
+networks, network paralysis following a virus attack, intervention by
+government authorities, natural disasters, water damage, earthquakes,
+fire, explosions, strikes and labor unrest, war, etc.
 
-11.2 Any failure by either Party, on one or more occasions, to invoke one
-or more of the provisions hereof, shall under no circumstances be interpreted
-as being a waiver by the interested Party of its right to invoke said provision(s)
-subsequently.
+11.2 Any failure by either Party, on one or more occasions, to invoke
+one or more of the provisions hereof, shall under no circumstances be
+interpreted as being a waiver by the interested Party of its right to
+invoke said provision(s) subsequently.
 
-11.3 The Agreement cancels and replaces any or all previous agreements, whether
-written or oral, between the Parties and having the same purpose, and constitutes
-the entirety of the agreement between said Parties concerning said purpose.
-No supplement or modification to the terms and conditions hereof shall be
-effective as between the Parties unless it is made in writing and signed by
-their duly authorized representatives.
+11.3 The Agreement cancels and replaces any or all previous agreements,
+whether written or oral, between the Parties and having the same
+purpose, and constitutes the entirety of the agreement between said
+Parties concerning said purpose. No supplement or modification to the
+terms and conditions hereof shall be effective as between the Parties
+unless it is made in writing and signed by their duly authorized
+representatives.
+
+11.4 In the event that one or more of the provisions hereof were to
+conflict with a current or future applicable act or legislative text,
+said act or legislative text shall prevail, and the Parties shall make
+the necessary amendments so as to comply with said act or legislative
+text. All other provisions shall remain effective. Similarly, invalidity
+of a provision of the Agreement, for any reason whatsoever, shall not
+cause the Agreement as a whole to be invalid.
 
-11.4 In the event that one or more of the provisions hereof were to conflict
-with a current or future applicable act or legislative text, said act or legislative
-text shall prevail, and the Parties shall make the necessary amendments so
-as to comply with said act or legislative text. All other provisions shall
-remain effective. Similarly, invalidity of a provision of the Agreement, for
-any reason whatsoever, shall not cause the Agreement as a whole to be invalid.
 
       11.5 LANGUAGE
 
-The Agreement is drafted in both French and English and both versions are
-deemed authentic.
+The Agreement is drafted in both French and English and both versions
+are deemed authentic.
 
-   Article 12 - NEW VERSIONS OF THE AGREEMENT
 
-12.1 Any person is authorized to duplicate and distribute copies of this Agreement.
+    Article 12 - NEW VERSIONS OF THE AGREEMENT
 
-12.2 So as to ensure coherence, the wording of this Agreement is protected
-and may only be modified by the authors of the License, who reserve the right
-to periodically publish updates or new versions of the Agreement, each with
-a separate number. These subsequent versions may address new issues encountered
-by Free Software.
+12.1 Any person is authorized to duplicate and distribute copies of this
+Agreement.
 
-12.3 Any Software distributed under a given version of the Agreement may only
-be subsequently distributed under the same version of the Agreement or a subsequent
-version.
+12.2 So as to ensure coherence, the wording of this Agreement is
+protected and may only be modified by the authors of the License, who
+reserve the right to periodically publish updates or new versions of the
+Agreement, each with a separate number. These subsequent versions may
+address new issues encountered by Free Software.
 
-   Article 13 - GOVERNING LAW AND JURISDICTION
+12.3 Any Software distributed under a given version of the Agreement may
+only be subsequently distributed under the same version of the Agreement
+or a subsequent version.
 
-13.1 The Agreement is governed by French law. The Parties agree to endeavor
-to seek an amicable solution to any disagreements or disputes that may arise
-during the performance of the Agreement.
 
-13.2 Failing an amicable solution within two (2) months as from their occurrence,
-and unless emergency proceedings are necessary, the disagreements or disputes
-shall be referred to the Paris Courts having jurisdiction, by the more diligent
-Party.
+    Article 13 - GOVERNING LAW AND JURISDICTION
 
-Version 1.0 dated 2006-09-05. 1 CeCILL stands for Ce(a) C(nrs) I(nria) L(ogiciel)
-L(ibre)
+13.1 The Agreement is governed by French law. The Parties agree to
+endeavor to seek an amicable solution to any disagreements or disputes
+that may arise during the performance of the Agreement.
+
+13.2 Failing an amicable solution within two (2) months as from their
+occurrence, and unless emergency proceedings are necessary, the
+disagreements or disputes shall be referred to the Paris Courts having
+jurisdiction, by the more diligent Party.
+
+
+Version 1.0 dated 2006-09-05.
diff --git a/options/license/CERN-OHL-1.1 b/options/license/CERN-OHL-1.1
index f100df4759..7f9be9a210 100644
--- a/options/license/CERN-OHL-1.1
+++ b/options/license/CERN-OHL-1.1
@@ -1,11 +1,8 @@
 CERN OHL v1.1
-
 2011-07-08 - CERN, Geneva, Switzerland
-
 CERN Open Hardware Licence v1.1
 
 Preamble
-
 Through this CERN Open Hardware Licence ("CERN OHL") version 1.1, the Organization
 wishes to disseminate its hardware designs (as published on http://www.ohwr.org/)
 as widely as possible, and generally to foster collaboration among public
@@ -14,43 +11,31 @@ welcome to use the CERN OHL, in unmodified form only, for the distribution
 of his own Open Hardware designs. Any other right is reserved.
 
 1. Definitions
-
 In this Licence, the following terms have the following meanings:
-
-"Licence" means this CERN OHL.
-
-"Documentation" means schematic diagrams, designs, circuit or circuit board
+“Licence” means this CERN OHL.
+“Documentation” means schematic diagrams, designs, circuit or circuit board
 layouts, mechanical drawings, flow charts and descriptive text, and other
 explanatory material that is explicitly stated as being made available under
 the conditions of this Licence. The Documentation may be in any medium, including
 but not limited to computer files and representations on paper, film, or any
 other media.
-
-"Product" means either an entire, or any part of a, device built using the
+“Product” means either an entire, or any part of a, device built using the
 Documentation or the modified Documentation.
-
-"Licensee" means any natural or legal person exercising rights under this
+“Licensee” means any natural or legal person exercising rights under this
 Licence.
-
-"Licensor" means any natural or legal person that creates or modifies Documentation
+“Licensor” means any natural or legal person that creates or modifies Documentation
 and subsequently communicates to the public and/ or distributes the resulting
 Documentation under the terms and conditions of this Licence.
-
 A Licensee may at the same time be a Licensor, and vice versa.
 
-
-
 2. Applicability
-
 2.1 This Licence governs the use, copying, modification, communication to
 the public and distribution of the Documentation, and the manufacture and
 distribution of Products. By exercising any right granted under this Licence,
 the Licensee irrevocably accepts these terms and conditions.
-
 2.2 This Licence is granted by the Licensor directly to the Licensee, and
 shall apply worldwide and without limitation in time. The Licensee may assign
 his licence rights or grant sub-licences.
-
 2.3 This Licence does not apply to software, firmware, or code loaded into
 programmable devices which may be used in conjunction with the Documentation,
 the modified Documentation or with Products. The use of such software, firmware,
@@ -58,37 +43,29 @@ or code is subject to the applicable licence terms and conditions.
 
 3. Copying, modification, communication to the public and distribution of
 the Documentation
-
 3.1 The Licensee shall keep intact all copyright and trademarks notices and
 all notices that refer to this Licence and to the disclaimer of warranties
 that is included in the Documentation. He shall include a copy thereof in
 every copy of the documentation or, as the case may be, modified Documentation,
 that he communicates to the public or distributes.
-
 3.2 The Licensee may use, copy, communicate to the public and distribute verbatim
 copies of the Documentation, in any medium, subject to the requirements specified
 in section 3.1.
-
 3.3 The Licensee may modify the Documentation or any portion thereof. The
 Licensee may communicate to the public and distribute the modified Documentation
 (thereby in addition to being a Licensee also becoming a Licensor), always
 provided that he shall:
-
-      a. comply with section 3.1;
-
+a. comply with section 3.1;
 b. cause the modified Documentation to carry prominent notices stating that
 the Licensee has modified the Documentation, with the date and details of
 the modifications;
-
 c. license the modified Documentation under the terms and conditions of this
 Licence or, where applicable, a later version of this Licence as may be issued
 by CERN; and
-
 d. send a copy of the modified Documentation to all Licensors that contributed
 to the parts of the Documentation that were modified, as well as to any other
 Licensor who has requested to receive a copy of the modified Documentation
 and has provided a means of contact with the Documentation.
-
 3.4 The Licence includes a licence to those patents or registered designs
 that are held by the Licensor, to the extent necessary to make use of the
 rights granted under this Licence. The scope of this section 3.4 shall be
@@ -96,18 +73,15 @@ strictly limited to the parts of the Documentation or modified Documentation
 created by the Licensor.
 
 4. Manufacture and distribution of Products
-
 4.1 The Licensee may manufacture or distribute Products always provided that
 the Licensee distributes to each recipient of such Products a copy of the
 Documentation or modified Documentation, as applicable, and complies with
 section 3.
-
 4.2 The Licensee is invited to inform in writing any Licensor who has indicated
 its wish to receive this information about the type, quantity and dates of
 production of Products the Licensee has (had) manufactured.
 
 5. Warranty and liability
-
 5.1 DISCLAIMER – The Documentation and any modified Documentation are provided
 "as is" and any express or implied warranties, including, but not limited
 to, implied warranties of merchantability, of satisfactory quality, and fitness
@@ -120,24 +94,22 @@ be with the Licensee and not the Licensor. This disclaimer of warranty is
 an essential part of this Licence and a condition for the grant of any rights
 granted under this Licence. The Licensee warrants that it does not act in
 a consumer capacity.
-
 5.2 LIMITATION OF LIABILITY – The Licensor shall have no liability for direct,
 indirect, special, incidental, consequential, exemplary, punitive or other
 damages of any character including, without limitation, procurement of substitute
 goods or services, loss of use, data or profits, or business interruption,
-however caused and on any theory of contract, warranty, tort (including negligence),
-product liability or otherwise, arising in any way in relation to the Documentation,
-modified Documentation and/or the use, manufacture or distribution of a Product,
-even if advised of the possibility of such damages, and the Licensee shall
-hold the Licensor(s) free and harmless from any liability, costs, damages,
-fees and expenses, including claims by third parties, in relation to such
-use.
+however caused and on any
+theory of contract, warranty, tort (including negligence), product liability
+or otherwise, arising in any way in relation to the Documentation, modified
+Documentation and/or the use, manufacture or distribution of a Product, even
+if advised of the possibility of such damages, and the Licensee shall hold
+the Licensor(s) free and harmless
+from any liability, costs, damages, fees and expenses, including claims by
+third parties, in relation to such use.
 
 6. General
-
 6.1 The rights granted under this Licence do not imply or represent any transfer
 or assignment of intellectual property rights to the Licensee.
-
 6.2 The Licensee shall not use or make reference to any of the names, acronyms,
 images or logos under which the Licensor is known, save in so far as required
 to comply with section 3. Any such permitted use or reference shall be factual
@@ -145,16 +117,13 @@ and shall in no event suggest any kind of endorsement by the Licensor or its
 personnel of the modified Documentation or any Product, or any kind of implication
 by the Licensor or its personnel in the preparation of the modified Documentation
 or Product.
-
 6.3 CERN may publish updated versions of this Licence which retain the same
 general provisions as this version, but differ in detail so far this is required
 and reasonable. New versions will be published with a unique version number.
-
 6.4 This Licence shall terminate with immediate effect, upon written notice
 and without involvement of a court if the Licensee fails to comply with any
 of its terms and conditions, or if the Licensee initiates legal action against
 Licensor in relation to this Licence. Section 5 shall continue to apply.
-
 6.5 Except as may be otherwise agreed with the Intergovernmental Organization,
 any dispute with respect to this Licence involving an Intergovernmental Organization
 shall, by virtue of the latter's Intergovernmental status, be settled by international
diff --git a/options/license/CERN-OHL-1.2 b/options/license/CERN-OHL-1.2
index c9cab3cb3d..2c289a3ecb 100644
--- a/options/license/CERN-OHL-1.2
+++ b/options/license/CERN-OHL-1.2
@@ -1,11 +1,8 @@
 CERN OHL v1.2
-
 2013-09-06 - CERN, Geneva, Switzerland
-
 CERN Open Hardware Licence v1.2
 
 Preamble
-
 Through this CERN Open Hardware Licence ("CERN OHL") version 1.2, CERN wishes
 to provide a tool to foster collaboration and sharing among hardware designers.
 The CERN OHL is copyright CERN. Anyone is welcome to use the CERN OHL, in
@@ -15,50 +12,36 @@ does not constitute an endorsement of the licensor or its designs nor does
 it imply any involvement by CERN in the development of such designs.
 
 1. Definitions
-
 In this Licence, the following terms have the following meanings:
-
-"Licence" means this CERN OHL.
-
-"Documentation" means schematic diagrams, designs, circuit or circuit board
+“Licence” means this CERN OHL.
+“Documentation” means schematic diagrams, designs, circuit or circuit board
 layouts, mechanical drawings, flow charts and descriptive text, and other
 explanatory material that is explicitly stated as being made available under
 the conditions of this Licence. The Documentation may be in any medium, including
 but not limited to computer files and representations on paper, film, or any
 other media.
-
-"Documentation Location" means a location where the Licensor has placed Documentation,
+“Documentation Location” means a location where the Licensor has placed Documentation,
 and which he believes will be publicly accessible for at least three years
 from the first communication to the public or distribution of Documentation.
-
-"Product" means either an entire, or any part of a, device built using the
+“Product” means either an entire, or any part of a, device built using the
 Documentation or the modified Documentation.
-
-"Licensee" means any natural or legal person exercising rights under this
+“Licensee” means any natural or legal person exercising rights under this
 Licence.
-
-"Licensor" means any natural or legal person that creates or modifies Documentation
+“Licensor” means any natural or legal person that creates or modifies Documentation
 and subsequently communicates to the public and/ or distributes the resulting
 Documentation under the terms and conditions of this Licence.
-
 A Licensee may at the same time be a Licensor, and vice versa.
-
 Use of the masculine gender includes the feminine and neuter genders and is
 employed solely to facilitate reading.
 
-
-
 2. Applicability
-
 2.1. This Licence governs the use, copying, modification, communication to
 the public and distribution of the Documentation, and the manufacture and
 distribution of Products. By exercising any right granted under this Licence,
 the Licensee irrevocably accepts these terms and conditions.
-
 2.2. This Licence is granted by the Licensor directly to the Licensee, and
 shall apply worldwide and without limitation in time. The Licensee may assign
 his licence rights or grant sub-licences.
-
 2.3. This Licence does not extend to software, firmware, or code loaded into
 programmable devices which may be used in conjunction with the Documentation,
 the modified Documentation or with Products, unless such software, firmware,
@@ -68,18 +51,15 @@ terms and conditions.
 
 3. Copying, modification, communication to the public and distribution of
 the Documentation
-
 3.1. The Licensee shall keep intact all copyright and trademarks notices,
 all notices referring to Documentation Location, and all notices that refer
 to this Licence and to the disclaimer of warranties that are included in the
 Documentation. He shall include a copy thereof in every copy of the Documentation
 or, as the case may be, modified Documentation, that he communicates to the
 public or distributes.
-
 3.2. The Licensee may copy, communicate to the public and distribute verbatim
 copies of the Documentation, in any medium, subject to the requirements specified
 in section 3.1.
-
 3.3. The Licensee may modify the Documentation or any portion thereof provided
 that upon modification of the Documentation, the Licensee shall make the modified
 Documentation available from a Documentation Location such that it can be
@@ -88,30 +68,23 @@ public or distributes the modified Documentation under section 3.4, and, where
 required by section 4.1, by a recipient of a Product. However, the Licensor
 shall not assert his rights under the foregoing proviso unless or until a
 Product is distributed.
-
 3.4. The Licensee may communicate to the public and distribute the modified
 Documentation (thereby in addition to being a Licensee also becoming a Licensor),
 always provided that he shall:
-
-      a) comply with section 3.1;
-
+a) comply with section 3.1;
 b) cause the modified Documentation to carry prominent notices stating that
 the Licensee has modified the Documentation, with the date and description
 of the modifications;
-
 c) cause the modified Documentation to carry a new Documentation Location
 notice if the original Documentation provided for one;
-
 d) make available the modified Documentation at the same level of abstraction
 as that of the Documentation, in the preferred format for making modifications
 to it (e.g. the native format of the CAD tool as applicable), and in the event
 that format is proprietary, in a format viewable with a tool licensed under
 an OSI-approved license if the proprietary tool can create it; and
-
 e) license the modified Documentation under the terms and conditions of this
 Licence or, where applicable, a later version of this Licence as may be issued
 by CERN.
-
 3.5. The Licence includes a non-exclusive licence to those patents or registered
 designs that are held by, under the control of, or sub-licensable by the Licensor,
 to the extent necessary to make use of the rights granted under this Licence.
@@ -119,19 +92,16 @@ The scope of this section 3.5 shall be strictly limited to the parts of the
 Documentation or modified Documentation created by the Licensor.
 
 4. Manufacture and distribution of Products
-
 4.1. The Licensee may manufacture or distribute Products always provided that,
 where such manufacture or distribution requires a licence under this Licence
 the Licensee provides to each recipient of such Products an easy means of
 accessing a copy of the Documentation or modified Documentation, as applicable,
 as set out in section 3.
-
 4.2. The Licensee is invited to inform any Licensor who has indicated his
 wish to receive this information about the type, quantity and dates of production
 of Products the Licensee has (had) manufactured
 
 5. Warranty and liability
-
 5.1. DISCLAIMER – The Documentation and any modified Documentation are provided
 "as is" and any express or implied warranties, including, but not limited
 to, implied warranties of merchantability, of satisfactory quality, non-infringement
@@ -144,7 +114,6 @@ of a Product shall be with the Licensee and not the Licensor. This disclaimer
 of warranty is an essential part of this Licence and a condition for the grant
 of any rights granted under this Licence. The Licensee warrants that it does
 not act in a consumer capacity.
-
 5.2. LIMITATION OF LIABILITY – The Licensor shall have no liability for direct,
 indirect, special, incidental, consequential, exemplary, punitive or other
 damages of any character including, without limitation, procurement of substitute
@@ -158,11 +127,9 @@ fees and expenses, including claims by third parties, in relation to such
 use.
 
 6. General
-
 6.1. Except for the rights explicitly granted hereunder, this Licence does
 not imply or represent any transfer or assignment of intellectual property
 rights to the Licensee.
-
 6.2. The Licensee shall not use or make reference to any of the names (including
 acronyms and abbreviations), images, or logos under which the Licensor is
 known, save in so far as required to comply with section 3. Any such permitted
@@ -170,11 +137,9 @@ use or reference shall be factual and shall in no event suggest any kind of
 endorsement by the Licensor or its personnel of the modified Documentation
 or any Product, or any kind of implication by the Licensor or its personnel
 in the preparation of the modified Documentation or Product.
-
 6.3. CERN may publish updated versions of this Licence which retain the same
 general provisions as this version, but differ in detail so far this is required
 and reasonable. New versions will be published with a unique version number.
-
 6.4. This Licence shall terminate with immediate effect, upon written notice
 and without involvement of a court if the Licensee fails to comply with any
 of its terms and conditions, or if the Licensee initiates legal action against
diff --git a/options/license/CERN-OHL-P-2.0 b/options/license/CERN-OHL-P-2.0
index 941456de59..f19d2b7adc 100644
--- a/options/license/CERN-OHL-P-2.0
+++ b/options/license/CERN-OHL-P-2.0
@@ -1,168 +1,199 @@
 CERN Open Hardware Licence Version 2 - Permissive
 
+
 Preamble
 
-CERN has developed this licence to promote collaboration among hardware designers
-and to provide a legal tool which supports the freedom to use, study, modify,
-share and distribute hardware designs and products based on those designs.
-Version 2 of the CERN Open Hardware Licence comes in three variants: this
-licence, CERN-OHL-P (permissive); and two reciprocal licences: CERN- OHL-W
-(weakly reciprocal) and CERN-OHL-S (strongly reciprocal).
+CERN has developed this licence to promote collaboration among
+hardware designers and to provide a legal tool which supports the
+freedom to use, study, modify, share and distribute hardware designs
+and products based on those designs. Version 2 of the CERN Open
+Hardware Licence comes in three variants: this licence, CERN-OHL-P
+(permissive); and two reciprocal licences: CERN- OHL-W (weakly
+reciprocal) and CERN-OHL-S (strongly reciprocal).
 
-The CERN-OHL-P is copyright CERN 2020. Anyone is welcome to use it, in unmodified
-form only.
+The CERN-OHL-P is copyright CERN 2020. Anyone is welcome to use it, in
+unmodified form only.
 
-Use of this Licence does not imply any endorsement by CERN of any Licensor
-or their designs nor does it imply any involvement by CERN in their development.
+Use of this Licence does not imply any endorsement by CERN of any
+Licensor or their designs nor does it imply any involvement by CERN in
+their development.
 
-   1 Definitions
 
-      1.1 'Licence' means this CERN-OHL-P.
+1 Definitions
 
-1.2 'Source' means information such as design materials or digital code which
-can be applied to Make or test a Product or to prepare a Product for use,
-Conveyance or sale, regardless of its medium or how it is expressed. It may
-include Notices.
+  1.1 'Licence' means this CERN-OHL-P.
 
-1.3 'Covered Source' means Source that is explicitly made available under
-this Licence.
+  1.2 'Source' means information such as design materials or digital
+      code which can be applied to Make or test a Product or to
+      prepare a Product for use, Conveyance or sale, regardless of its
+      medium or how it is expressed. It may include Notices.
 
-1.4 'Product' means any device, component, work or physical object, whether
-in finished or intermediate form, arising from the use, application or processing
-of Covered Source.
+  1.3 'Covered Source' means Source that is explicitly made available
+      under this Licence.
 
-1.5 'Make' means to create or configure something, whether by manufacture,
-assembly, compiling, loading or applying Covered Source or another Product
-or otherwise.
+  1.4 'Product' means any device, component, work or physical object,
+      whether in finished or intermediate form, arising from the use,
+      application or processing of Covered Source.
 
-1.6 'Notice' means copyright, acknowledgement and trademark notices, references
-to the location of any Notices, modification notices (subsection 3.3(b)) and
-all notices that refer to this Licence and to the disclaimer of warranties
-that are included in the Covered Source.
+  1.5 'Make' means to create or configure something, whether by
+     manufacture, assembly, compiling, loading or applying Covered
+     Source or another Product or otherwise.
 
-1.7 'Licensee' or 'You' means any person exercising rights under this Licence.
+  1.6 'Notice' means copyright, acknowledgement and trademark notices,
+      references to the location of any Notices, modification notices
+      (subsection 3.3(b)) and all notices that refer to this Licence
+      and to the disclaimer of warranties that are included in the
+      Covered Source.
 
-1.8 'Licensor' means a person who creates Source or modifies Covered Source
-and subsequently Conveys the resulting Covered Source under the terms and
-conditions of this Licence. A person may be a Licensee and a Licensor at the
-same time.
+  1.7 'Licensee' or 'You' means any person exercising rights under
+      this Licence.
 
-      1.9 'Convey' means to communicate to the public or distribute.
+  1.8 'Licensor' means a person who creates Source or modifies Covered
+      Source and subsequently Conveys the resulting Covered Source
+      under the terms and conditions of this Licence. A person may be
+      a Licensee and a Licensor at the same time.
 
-   2 Applicability
+  1.9 'Convey' means to communicate to the public or distribute.
 
-2.1 This Licence governs the use, copying, modification, Conveying of Covered
-Source and Products, and the Making of Products. By exercising any right granted
-under this Licence, You irrevocably accept these terms and conditions.
 
-2.2 This Licence is granted by the Licensor directly to You, and shall apply
-worldwide and without limitation in time.
+2 Applicability
 
-2.3 You shall not attempt to restrict by contract or otherwise the rights
-granted under this Licence to other Licensees.
+  2.1 This Licence governs the use, copying, modification, Conveying
+      of Covered Source and Products, and the Making of Products. By
+      exercising any right granted under this Licence, You irrevocably
+      accept these terms and conditions.
 
-2.4 This Licence is not intended to restrict fair use, fair dealing, or any
-other similar right.
+  2.2 This Licence is granted by the Licensor directly to You, and
+      shall apply worldwide and without limitation in time.
 
-   3 Copying, modifying and Conveying Covered Source
+  2.3 You shall not attempt to restrict by contract or otherwise the
+      rights granted under this Licence to other Licensees.
 
-3.1 You may copy and Convey verbatim copies of Covered Source, in any medium,
-provided You retain all Notices.
+  2.4 This Licence is not intended to restrict fair use, fair dealing,
+      or any other similar right.
 
-      3.2 You may modify Covered Source, other than Notices.
 
-You may only delete Notices if they are no longer applicable to the corresponding
-Covered Source as modified by You and You may add additional Notices applicable
-to Your modifications.
+3 Copying, modifying and Conveying Covered Source
 
-3.3 You may Convey modified Covered Source (with the effect that You shall
-also become a Licensor) provided that You:
+  3.1 You may copy and Convey verbatim copies of Covered Source, in
+      any medium, provided You retain all Notices.
 
-         a) retain Notices as required in subsection 3.2; and
+  3.2 You may modify Covered Source, other than Notices.
 
-b) add a Notice to the modified Covered Source stating that You have modified
-it, with the date and brief description of how You have modified it.
+      You may only delete Notices if they are no longer applicable to
+      the corresponding Covered Source as modified by You and You may
+      add additional Notices applicable to Your modifications.
 
-3.4 You may Convey Covered Source or modified Covered Source under licence
-terms which differ from the terms of this Licence provided that:
+  3.3 You may Convey modified Covered Source (with the effect that You
+      shall also become a Licensor) provided that You:
 
-         a) You comply at all times with subsection 3.3; and
+       a) retain Notices as required in subsection 3.2; and
 
-b) You provide a copy of this Licence to anyone to whom You Convey Covered
-Source or modified Covered Source.
+       b) add a Notice to the modified Covered Source stating that You
+          have modified it, with the date and brief description of how
+          You have modified it.
 
-   4 Making and Conveying Products
+  3.4 You may Convey Covered Source or modified Covered Source under
+      licence terms which differ from the terms of this Licence
+      provided that:
 
-You may Make Products, and/or Convey them, provided that You ensure that the
-recipient of the Product has access to any Notices applicable to the Product.
+       a) You comply at all times with subsection 3.3; and
 
-   5 DISCLAIMER AND LIABILITY
+       b) You provide a copy of this Licence to anyone to whom You
+          Convey Covered Source or modified Covered Source.
 
-5.1 DISCLAIMER OF WARRANTY -- The Covered Source and any Products are provided
-'as is' and any express or implied warranties, including, but not limited
-to, implied warranties of merchantability, of satisfactory quality, non-infringement
-of third party rights, and fitness for a particular purpose or use are disclaimed
-in respect of any Source or Product to the maximum extent permitted by law.
-The Licensor makes no representation that any Source or Product does not or
-will not infringe any patent, copyright, trade secret or other proprietary
-right. The entire risk as to the use, quality, and performance of any Source
-or Product shall be with You and not the Licensor. This disclaimer of warranty
-is an essential part of this Licence and a condition for the grant of any
-rights granted under this Licence.
 
-5.2 EXCLUSION AND LIMITATION OF LIABILITY -- The Licensor shall, to the maximum
-extent permitted by law, have no liability for direct, indirect, special,
-incidental, consequential, exemplary, punitive or other damages of any character
-including, without limitation, procurement of substitute goods or services,
-loss of use, data or profits, or business interruption, however caused and
-on any theory of contract, warranty, tort (including negligence), product
-liability or otherwise, arising in any way in relation to the Covered Source,
-modified Covered Source and/or the Making or Conveyance of a Product, even
-if advised of the possibility of such damages, and You shall hold the Licensor(s)
-free and harmless from any liability, costs, damages, fees and expenses, including
-claims by third parties, in relation to such use.
+4 Making and Conveying Products
 
-   6 Patents
+You may Make Products, and/or Convey them, provided that You ensure
+that the recipient of the Product has access to any Notices applicable
+to the Product.
 
-6.1 Subject to the terms and conditions of this Licence, each Licensor hereby
-grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
-irrevocable (except as stated in this section 6, or where terminated by the
-Licensor for cause) patent license to Make, have Made, use, offer to sell,
-sell, import, and otherwise transfer the Covered Source and Products, where
-such licence applies only to those patent claims licensable by such Licensor
-that are necessarily infringed by exercising rights under the Covered Source
-as Conveyed by that Licensor.
 
-6.2 If You institute patent litigation against any entity (including a cross-claim
-or counterclaim in a lawsuit) alleging that the Covered Source or a Product
-constitutes direct or contributory patent infringement, or You seek any declaration
-that a patent licensed to You under this Licence is invalid or unenforceable
-then any rights granted to You under this Licence shall terminate as of the
-date such process is initiated.
+5 DISCLAIMER AND LIABILITY
 
-   7 General
+  5.1 DISCLAIMER OF WARRANTY -- The Covered Source and any Products
+      are provided 'as is' and any express or implied warranties,
+      including, but not limited to, implied warranties of
+      merchantability, of satisfactory quality, non-infringement of
+      third party rights, and fitness for a particular purpose or use
+      are disclaimed in respect of any Source or Product to the
+      maximum extent permitted by law. The Licensor makes no
+      representation that any Source or Product does not or will not
+      infringe any patent, copyright, trade secret or other
+      proprietary right. The entire risk as to the use, quality, and
+      performance of any Source or Product shall be with You and not
+      the Licensor. This disclaimer of warranty is an essential part
+      of this Licence and a condition for the grant of any rights
+      granted under this Licence.
 
-7.1 If any provisions of this Licence are or subsequently become invalid or
-unenforceable for any reason, the remaining provisions shall remain effective.
+  5.2 EXCLUSION AND LIMITATION OF LIABILITY -- The Licensor shall, to
+      the maximum extent permitted by law, have no liability for
+      direct, indirect, special, incidental, consequential, exemplary,
+      punitive or other damages of any character including, without
+      limitation, procurement of substitute goods or services, loss of
+      use, data or profits, or business interruption, however caused
+      and on any theory of contract, warranty, tort (including
+      negligence), product liability or otherwise, arising in any way
+      in relation to the Covered Source, modified Covered Source
+      and/or the Making or Conveyance of a Product, even if advised of
+      the possibility of such damages, and You shall hold the
+      Licensor(s) free and harmless from any liability, costs,
+      damages, fees and expenses, including claims by third parties,
+      in relation to such use.
 
-7.2 You shall not use any of the name (including acronyms and abbreviations),
-image, or logo by which the Licensor or CERN is known, except where needed
-to comply with section 3, or where the use is otherwise allowed by law. Any
-such permitted use shall be factual and shall not be made so as to suggest
-any kind of endorsement or implication of involvement by the Licensor or its
-personnel.
 
-7.3 CERN may publish updated versions and variants of this Licence which it
-considers to be in the spirit of this version, but may differ in detail to
-address new problems or concerns. New versions will be published with a unique
-version number and a variant identifier specifying the variant. If the Licensor
-has specified that a given variant applies to the Covered Source without specifying
-a version, You may treat that Covered Source as being released under any version
-of the CERN-OHL with that variant. If no variant is specified, the Covered
-Source shall be treated as being released under CERN-OHL-S. The Licensor may
-also specify that the Covered Source is subject to a specific version of the
-CERN-OHL or any later version in which case You may apply this or any later
-version of CERN-OHL with the same variant identifier published by CERN.
+6 Patents
 
-7.4 This Licence shall not be enforceable except by a Licensor acting as such,
-and third party beneficiary rights are specifically excluded.
+  6.1 Subject to the terms and conditions of this Licence, each
+      Licensor hereby grants to You a perpetual, worldwide,
+      non-exclusive, no-charge, royalty-free, irrevocable (except as
+      stated in this section 6, or where terminated by the Licensor
+      for cause) patent license to Make, have Made, use, offer to
+      sell, sell, import, and otherwise transfer the Covered Source
+      and Products, where such licence applies only to those patent
+      claims licensable by such Licensor that are necessarily
+      infringed by exercising rights under the Covered Source as
+      Conveyed by that Licensor.
+
+  6.2 If You institute patent litigation against any entity (including
+      a cross-claim or counterclaim in a lawsuit) alleging that the
+      Covered Source or a Product constitutes direct or contributory
+      patent infringement, or You seek any declaration that a patent
+      licensed to You under this Licence is invalid or unenforceable
+      then any rights granted to You under this Licence shall
+      terminate as of the date such process is initiated.
+
+
+7 General
+
+  7.1 If any provisions of this Licence are or subsequently become
+      invalid or unenforceable for any reason, the remaining
+      provisions shall remain effective.
+
+  7.2 You shall not use any of the name (including acronyms and
+      abbreviations), image, or logo by which the Licensor or CERN is
+      known, except where needed to comply with section 3, or where
+      the use is otherwise allowed by law. Any such permitted use
+      shall be factual and shall not be made so as to suggest any kind
+      of endorsement or implication of involvement by the Licensor or
+      its personnel.
+
+  7.3 CERN may publish updated versions and variants of this Licence
+      which it considers to be in the spirit of this version, but may
+      differ in detail to address new problems or concerns. New
+      versions will be published with a unique version number and a
+      variant identifier specifying the variant. If the Licensor has
+      specified that a given variant applies to the Covered Source
+      without specifying a version, You may treat that Covered Source
+      as being released under any version of the CERN-OHL with that
+      variant. If no variant is specified, the Covered Source shall be
+      treated as being released under CERN-OHL-S. The Licensor may
+      also specify that the Covered Source is subject to a specific
+      version of the CERN-OHL or any later version in which case You
+      may apply this or any later version of CERN-OHL with the same
+      variant identifier published by CERN.
+
+  7.4 This Licence shall not be enforceable except by a Licensor
+      acting as such, and third party beneficiary rights are
+      specifically excluded.
diff --git a/options/license/CERN-OHL-S-2.0 b/options/license/CERN-OHL-S-2.0
index 4d21490693..114486fd94 100644
--- a/options/license/CERN-OHL-S-2.0
+++ b/options/license/CERN-OHL-S-2.0
@@ -1,240 +1,289 @@
 CERN Open Hardware Licence Version 2 - Strongly Reciprocal
 
+
 Preamble
 
-CERN has developed this licence to promote collaboration among hardware designers
-and to provide a legal tool which supports the freedom to use, study, modify,
-share and distribute hardware designs and products based on those designs.
-Version 2 of the CERN Open Hardware Licence comes in three variants: CERN-OHL-P
-(permissive); and two reciprocal licences: CERN-OHL-W (weakly reciprocal)
-and this licence, CERN-OHL-S (strongly reciprocal).
+CERN has developed this licence to promote collaboration among
+hardware designers and to provide a legal tool which supports the
+freedom to use, study, modify, share and distribute hardware designs
+and products based on those designs. Version 2 of the CERN Open
+Hardware Licence comes in three variants: CERN-OHL-P (permissive); and
+two reciprocal licences: CERN-OHL-W (weakly reciprocal) and this
+licence, CERN-OHL-S (strongly reciprocal).
 
-The CERN-OHL-S is copyright CERN 2020. Anyone is welcome to use it, in unmodified
-form only.
+The CERN-OHL-S is copyright CERN 2020. Anyone is welcome to use it, in
+unmodified form only.
 
-Use of this Licence does not imply any endorsement by CERN of any Licensor
-or their designs nor does it imply any involvement by CERN in their development.
+Use of this Licence does not imply any endorsement by CERN of any
+Licensor or their designs nor does it imply any involvement by CERN in
+their development.
 
-   1 Definitions
 
-      1.1 'Licence' means this CERN-OHL-S.
+1 Definitions
 
-      1.2 'Compatible Licence' means
+  1.1 'Licence' means this CERN-OHL-S.
 
-         a) any earlier version of the CERN Open Hardware licence, or
+  1.2 'Compatible Licence' means
 
-         b) any version of the CERN-OHL-S, or
+       a) any earlier version of the CERN Open Hardware licence, or
 
-c) any licence which permits You to treat the Source to which it applies as
-licensed under CERN-OHL-S provided that on Conveyance of any such Source,
-or any associated Product You treat the Source in question as being licensed
-under CERN-OHL-S.
+       b) any version of the CERN-OHL-S, or
 
-1.3 'Source' means information such as design materials or digital code which
-can be applied to Make or test a Product or to prepare a Product for use,
-Conveyance or sale, regardless of its medium or how it is expressed. It may
-include Notices.
+       c) any licence which permits You to treat the Source to which
+          it applies as licensed under CERN-OHL-S provided that on
+          Conveyance of any such Source, or any associated Product You
+          treat the Source in question as being licensed under
+          CERN-OHL-S.
 
-1.4 'Covered Source' means Source that is explicitly made available under
-this Licence.
+  1.3 'Source' means information such as design materials or digital
+      code which can be applied to Make or test a Product or to
+      prepare a Product for use, Conveyance or sale, regardless of its
+      medium or how it is expressed. It may include Notices.
 
-1.5 'Product' means any device, component, work or physical object, whether
-in finished or intermediate form, arising from the use, application or processing
-of Covered Source.
+  1.4 'Covered Source' means Source that is explicitly made available
+      under this Licence.
 
-1.6 'Make' means to create or configure something, whether by manufacture,
-assembly, compiling, loading or applying Covered Source or another Product
-or otherwise.
+  1.5 'Product' means any device, component, work or physical object,
+      whether in finished or intermediate form, arising from the use,
+      application or processing of Covered Source.
 
-1.7 'Available Component' means any part, sub-assembly, library or code which:
+  1.6 'Make' means to create or configure something, whether by
+      manufacture, assembly, compiling, loading or applying Covered
+      Source or another Product or otherwise.
 
-a) is licensed to You as Complete Source under a Compatible Licence; or
+  1.7 'Available Component' means any part, sub-assembly, library or
+      code which:
 
-b) is available, at the time a Product or the Source containing it is first
-Conveyed, to You and any other prospective licensees
+       a) is licensed to You as Complete Source under a Compatible
+          Licence; or
 
-i) as a physical part with sufficient rights and information (including any
-configuration and programming files and information about its characteristics
-and interfaces) to enable it either to be Made itself, or to be sourced and
-used to Make the Product; or
+       b) is available, at the time a Product or the Source containing
+          it is first Conveyed, to You and any other prospective
+          licensees
 
-ii) as part of the normal distribution of a tool used to design or Make the
-Product.
+            i) as a physical part with sufficient rights and
+               information (including any configuration and
+               programming files and information about its
+               characteristics and interfaces) to enable it either to
+               be Made itself, or to be sourced and used to Make the
+               Product; or
+           ii) as part of the normal distribution of a tool used to
+               design or Make the Product.
 
-1.8 'Complete Source' means the set of all Source necessary to Make a Product,
-in the preferred form for making modifications, including necessary installation
-and interfacing information both for the Product, and for any included Available
-Components. If the format is proprietary, it must also be made available in
-a format (if the proprietary tool can create it) which is viewable with a
-tool available to potential licensees and licensed under a licence approved
-by the Free Software Foundation or the Open Source Initiative. Complete Source
-need not include the Source of any Available Component, provided that You
-include in the Complete Source sufficient information to enable a recipient
-to Make or source and use the Available Component to Make the Product.
+  1.8 'Complete Source' means the set of all Source necessary to Make
+      a Product, in the preferred form for making modifications,
+      including necessary installation and interfacing information
+      both for the Product, and for any included Available Components.
+      If the format is proprietary, it must also be made available in
+      a format (if the proprietary tool can create it) which is
+      viewable with a tool available to potential licensees and
+      licensed under a licence approved by the Free Software
+      Foundation or the Open Source Initiative. Complete Source need
+      not include the Source of any Available Component, provided that
+      You include in the Complete Source sufficient information to
+      enable a recipient to Make or source and use the Available
+      Component to Make the Product.
 
-1.9 'Source Location' means a location where a Licensor has placed Covered
-Source, and which that Licensor reasonably believes will remain easily accessible
-for at least three years for anyone to obtain a digital copy.
+  1.9 'Source Location' means a location where a Licensor has placed
+      Covered Source, and which that Licensor reasonably believes will
+      remain easily accessible for at least three years for anyone to
+      obtain a digital copy.
 
-1.10 'Notice' means copyright, acknowledgement and trademark notices, Source
-Location references, modification notices (subsection 3.3(b)) and all notices
-that refer to this Licence and to the disclaimer of warranties that are included
-in the Covered Source.
+ 1.10 'Notice' means copyright, acknowledgement and trademark notices,
+      Source Location references, modification notices (subsection
+      3.3(b)) and all notices that refer to this Licence and to the
+      disclaimer of warranties that are included in the Covered
+      Source.
 
-1.11 'Licensee' or 'You' means any person exercising rights under this Licence.
+ 1.11 'Licensee' or 'You' means any person exercising rights under
+      this Licence.
 
-1.12 'Licensor' means a natural or legal person who creates or modifies Covered
-Source. A person may be a Licensee and a Licensor at the same time.
+ 1.12 'Licensor' means a natural or legal person who creates or
+      modifies Covered Source. A person may be a Licensee and a
+      Licensor at the same time.
 
-      1.13 'Convey' means to communicate to the public or distribute.
+ 1.13 'Convey' means to communicate to the public or distribute.
 
-   2 Applicability
 
-2.1 This Licence governs the use, copying, modification, Conveying of Covered
-Source and Products, and the Making of Products. By exercising any right granted
-under this Licence, You irrevocably accept these terms and conditions.
+2 Applicability
 
-2.2 This Licence is granted by the Licensor directly to You, and shall apply
-worldwide and without limitation in time.
+  2.1 This Licence governs the use, copying, modification, Conveying
+      of Covered Source and Products, and the Making of Products. By
+      exercising any right granted under this Licence, You irrevocably
+      accept these terms and conditions.
 
-2.3 You shall not attempt to restrict by contract or otherwise the rights
-granted under this Licence to other Licensees.
+  2.2 This Licence is granted by the Licensor directly to You, and
+      shall apply worldwide and without limitation in time.
 
-2.4 This Licence is not intended to restrict fair use, fair dealing, or any
-other similar right.
+  2.3 You shall not attempt to restrict by contract or otherwise the
+      rights granted under this Licence to other Licensees.
 
-   3 Copying, modifying and Conveying Covered Source
+  2.4 This Licence is not intended to restrict fair use, fair dealing,
+      or any other similar right.
 
-3.1 You may copy and Convey verbatim copies of Covered Source, in any medium,
-provided You retain all Notices.
 
-3.2 You may modify Covered Source, other than Notices, provided that You irrevocably
-undertake to make that modified Covered Source available from a Source Location
-should You Convey a Product in circumstances where the recipient does not
-otherwise receive a copy of the modified Covered Source. In each case subsection
-3.3 shall apply.
+3 Copying, modifying and Conveying Covered Source
 
-You may only delete Notices if they are no longer applicable to the corresponding
-Covered Source as modified by You and You may add additional Notices applicable
-to Your modifications. Including Covered Source in a larger work is modifying
-the Covered Source, and the larger work becomes modified Covered Source.
+  3.1 You may copy and Convey verbatim copies of Covered Source, in
+      any medium, provided You retain all Notices.
 
-3.3 You may Convey modified Covered Source (with the effect that You shall
-also become a Licensor) provided that You:
+  3.2 You may modify Covered Source, other than Notices, provided that
+      You irrevocably undertake to make that modified Covered Source
+      available from a Source Location should You Convey a Product in
+      circumstances where the recipient does not otherwise receive a
+      copy of the modified Covered Source. In each case subsection 3.3
+      shall apply.
 
-         a) retain Notices as required in subsection 3.2;
+      You may only delete Notices if they are no longer applicable to
+      the corresponding Covered Source as modified by You and You may
+      add additional Notices applicable to Your modifications.
+      Including Covered Source in a larger work is modifying the
+      Covered Source, and the larger work becomes modified Covered
+      Source.
 
-b) add a Notice to the modified Covered Source stating that You have modified
-it, with the date and brief description of how You have modified it;
+  3.3 You may Convey modified Covered Source (with the effect that You
+      shall also become a Licensor) provided that You:
 
-c) add a Source Location Notice for the modified Covered Source if You Convey
-in circumstances where the recipient does not otherwise receive a copy of
-the modified Covered Source; and
+       a) retain Notices as required in subsection 3.2;
 
-d) license the modified Covered Source under the terms and conditions of this
-Licence (or, as set out in subsection 8.3, a later version, if permitted by
-the licence of the original Covered Source). Such modified Covered Source
-must be licensed as a whole, but excluding Available Components contained
-in it, which remain licensed under their own applicable licences.
+       b) add a Notice to the modified Covered Source stating that You
+          have modified it, with the date and brief description of how
+          You have modified it;
 
-   4 Making and Conveying Products
+       c) add a Source Location Notice for the modified Covered Source
+          if You Convey in circumstances where the recipient does not
+          otherwise receive a copy of the modified Covered Source; and
 
-You may Make Products, and/or Convey them, provided that You either provide
-each recipient with a copy of the Complete Source or ensure that each recipient
-is notified of the Source Location of the Complete Source. That Complete Source
-is Covered Source, and You must accordingly satisfy Your obligations set out
-in subsection 3.3. If specified in a Notice, the Product must visibly and
-securely display the Source Location on it or its packaging or documentation
-in the manner specified in that Notice.
+       d) license the modified Covered Source under the terms and
+          conditions of this Licence (or, as set out in subsection
+          8.3, a later version, if permitted by the licence of the
+          original Covered Source). Such modified Covered Source must
+          be licensed as a whole, but excluding Available Components
+          contained in it, which remain licensed under their own
+          applicable licences.
 
-   5 Research and Development
 
-You may Convey Covered Source, modified Covered Source or Products to a legal
-entity carrying out development, testing or quality assurance work on Your
-behalf provided that the work is performed on terms which prevent the entity
-from both using the Source or Products for its own internal purposes and Conveying
-the Source or Products or any modifications to them to any person other than
-You. Any modifications made by the entity shall be deemed to be made by You
-pursuant to subsection 3.2.
+4 Making and Conveying Products
 
-   6 DISCLAIMER AND LIABILITY
+You may Make Products, and/or Convey them, provided that You either
+provide each recipient with a copy of the Complete Source or ensure
+that each recipient is notified of the Source Location of the Complete
+Source. That Complete Source is Covered Source, and You must
+accordingly satisfy Your obligations set out in subsection 3.3. If
+specified in a Notice, the Product must visibly and securely display
+the Source Location on it or its packaging or documentation in the
+manner specified in that Notice.
 
-6.1 DISCLAIMER OF WARRANTY -- The Covered Source and any Products are provided
-'as is' and any express or implied warranties, including, but not limited
-to, implied warranties of merchantability, of satisfactory quality, non-infringement
-of third party rights, and fitness for a particular purpose or use are disclaimed
-in respect of any Source or Product to the maximum extent permitted by law.
-The Licensor makes no representation that any Source or Product does not or
-will not infringe any patent, copyright, trade secret or other proprietary
-right. The entire risk as to the use, quality, and performance of any Source
-or Product shall be with You and not the Licensor. This disclaimer of warranty
-is an essential part of this Licence and a condition for the grant of any
-rights granted under this Licence.
 
-6.2 EXCLUSION AND LIMITATION OF LIABILITY -- The Licensor shall, to the maximum
-extent permitted by law, have no liability for direct, indirect, special,
-incidental, consequential, exemplary, punitive or other damages of any character
-including, without limitation, procurement of substitute goods or services,
-loss of use, data or profits, or business interruption, however caused and
-on any theory of contract, warranty, tort (including negligence), product
-liability or otherwise, arising in any way in relation to the Covered Source,
-modified Covered Source and/or the Making or Conveyance of a Product, even
-if advised of the possibility of such damages, and You shall hold the Licensor(s)
-free and harmless from any liability, costs, damages, fees and expenses, including
-claims by third parties, in relation to such use.
+5 Research and Development
 
-   7 Patents
+You may Convey Covered Source, modified Covered Source or Products to
+a legal entity carrying out development, testing or quality assurance
+work on Your behalf provided that the work is performed on terms which
+prevent the entity from both using the Source or Products for its own
+internal purposes and Conveying the Source or Products or any
+modifications to them to any person other than You. Any modifications
+made by the entity shall be deemed to be made by You pursuant to
+subsection 3.2.
 
-7.1 Subject to the terms and conditions of this Licence, each Licensor hereby
-grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
-irrevocable (except as stated in subsections 7.2 and 8.4) patent license to
-Make, have Made, use, offer to sell, sell, import, and otherwise transfer
-the Covered Source and Products, where such licence applies only to those
-patent claims licensable by such Licensor that are necessarily infringed by
-exercising rights under the Covered Source as Conveyed by that Licensor.
 
-7.2 If You institute patent litigation against any entity (including a cross-claim
-or counterclaim in a lawsuit) alleging that the Covered Source or a Product
-constitutes direct or contributory patent infringement, or You seek any declaration
-that a patent licensed to You under this Licence is invalid or unenforceable
-then any rights granted to You under this Licence shall terminate as of the
-date such process is initiated.
+6 DISCLAIMER AND LIABILITY
 
-   8 General
+  6.1 DISCLAIMER OF WARRANTY -- The Covered Source and any Products
+      are provided 'as is' and any express or implied warranties,
+      including, but not limited to, implied warranties of
+      merchantability, of satisfactory quality, non-infringement of
+      third party rights, and fitness for a particular purpose or use
+      are disclaimed in respect of any Source or Product to the
+      maximum extent permitted by law. The Licensor makes no
+      representation that any Source or Product does not or will not
+      infringe any patent, copyright, trade secret or other
+      proprietary right. The entire risk as to the use, quality, and
+      performance of any Source or Product shall be with You and not
+      the Licensor. This disclaimer of warranty is an essential part
+      of this Licence and a condition for the grant of any rights
+      granted under this Licence.
 
-8.1 If any provisions of this Licence are or subsequently become invalid or
-unenforceable for any reason, the remaining provisions shall remain effective.
+  6.2 EXCLUSION AND LIMITATION OF LIABILITY -- The Licensor shall, to
+      the maximum extent permitted by law, have no liability for
+      direct, indirect, special, incidental, consequential, exemplary,
+      punitive or other damages of any character including, without
+      limitation, procurement of substitute goods or services, loss of
+      use, data or profits, or business interruption, however caused
+      and on any theory of contract, warranty, tort (including
+      negligence), product liability or otherwise, arising in any way
+      in relation to the Covered Source, modified Covered Source
+      and/or the Making or Conveyance of a Product, even if advised of
+      the possibility of such damages, and You shall hold the
+      Licensor(s) free and harmless from any liability, costs,
+      damages, fees and expenses, including claims by third parties,
+      in relation to such use.
 
-8.2 You shall not use any of the name (including acronyms and abbreviations),
-image, or logo by which the Licensor or CERN is known, except where needed
-to comply with section 3, or where the use is otherwise allowed by law. Any
-such permitted use shall be factual and shall not be made so as to suggest
-any kind of endorsement or implication of involvement by the Licensor or its
-personnel.
 
-8.3 CERN may publish updated versions and variants of this Licence which it
-considers to be in the spirit of this version, but may differ in detail to
-address new problems or concerns. New versions will be published with a unique
-version number and a variant identifier specifying the variant. If the Licensor
-has specified that a given variant applies to the Covered Source without specifying
-a version, You may treat that Covered Source as being released under any version
-of the CERN-OHL with that variant. If no variant is specified, the Covered
-Source shall be treated as being released under CERN-OHL-S. The Licensor may
-also specify that the Covered Source is subject to a specific version of the
-CERN-OHL or any later version in which case You may apply this or any later
-version of CERN-OHL with the same variant identifier published by CERN.
+7 Patents
 
-8.4 This Licence shall terminate with immediate effect if You fail to comply
-with any of its terms and conditions.
+  7.1 Subject to the terms and conditions of this Licence, each
+      Licensor hereby grants to You a perpetual, worldwide,
+      non-exclusive, no-charge, royalty-free, irrevocable (except as
+      stated in subsections 7.2 and 8.4) patent license to Make, have
+      Made, use, offer to sell, sell, import, and otherwise transfer
+      the Covered Source and Products, where such licence applies only
+      to those patent claims licensable by such Licensor that are
+      necessarily infringed by exercising rights under the Covered
+      Source as Conveyed by that Licensor.
 
-8.5 However, if You cease all breaches of this Licence, then Your Licence
-from any Licensor is reinstated unless such Licensor has terminated this Licence
-by giving You, while You remain in breach, a notice specifying the breach
-and requiring You to cure it within 30 days, and You have failed to come into
-compliance in all material respects by the end of the 30 day period. Should
-You repeat the breach after receipt of a cure notice and subsequent reinstatement,
-this Licence will terminate immediately and permanently. Section 6 shall continue
-to apply after any termination.
+  7.2 If You institute patent litigation against any entity (including
+      a cross-claim or counterclaim in a lawsuit) alleging that the
+      Covered Source or a Product constitutes direct or contributory
+      patent infringement, or You seek any declaration that a patent
+      licensed to You under this Licence is invalid or unenforceable
+      then any rights granted to You under this Licence shall
+      terminate as of the date such process is initiated.
 
-8.6 This Licence shall not be enforceable except by a Licensor acting as such,
-and third party beneficiary rights are specifically excluded.
+
+8 General
+
+  8.1 If any provisions of this Licence are or subsequently become
+      invalid or unenforceable for any reason, the remaining
+      provisions shall remain effective.
+
+  8.2 You shall not use any of the name (including acronyms and
+      abbreviations), image, or logo by which the Licensor or CERN is
+      known, except where needed to comply with section 3, or where
+      the use is otherwise allowed by law. Any such permitted use
+      shall be factual and shall not be made so as to suggest any kind
+      of endorsement or implication of involvement by the Licensor or
+      its personnel.
+
+  8.3 CERN may publish updated versions and variants of this Licence
+      which it considers to be in the spirit of this version, but may
+      differ in detail to address new problems or concerns. New
+      versions will be published with a unique version number and a
+      variant identifier specifying the variant. If the Licensor has
+      specified that a given variant applies to the Covered Source
+      without specifying a version, You may treat that Covered Source
+      as being released under any version of the CERN-OHL with that
+      variant. If no variant is specified, the Covered Source shall be
+      treated as being released under CERN-OHL-S. The Licensor may
+      also specify that the Covered Source is subject to a specific
+      version of the CERN-OHL or any later version in which case You
+      may apply this or any later version of CERN-OHL with the same
+      variant identifier published by CERN.
+
+  8.4 This Licence shall terminate with immediate effect if You fail
+      to comply with any of its terms and conditions.
+
+  8.5 However, if You cease all breaches of this Licence, then Your
+      Licence from any Licensor is reinstated unless such Licensor has
+      terminated this Licence by giving You, while You remain in
+      breach, a notice specifying the breach and requiring You to cure
+      it within 30 days, and You have failed to come into compliance
+      in all material respects by the end of the 30 day period. Should
+      You repeat the breach after receipt of a cure notice and
+      subsequent reinstatement, this Licence will terminate
+      immediately and permanently. Section 6 shall continue to apply
+      after any termination.
+
+  8.6 This Licence shall not be enforceable except by a Licensor
+      acting as such, and third party beneficiary rights are
+      specifically excluded.
diff --git a/options/license/CERN-OHL-W-2.0 b/options/license/CERN-OHL-W-2.0
index 8563cd280c..0f882860af 100644
--- a/options/license/CERN-OHL-W-2.0
+++ b/options/license/CERN-OHL-W-2.0
@@ -2,260 +2,309 @@ CERN Open Hardware Licence Version 2 - Weakly Reciprocal
 
 Preamble
 
-CERN has developed this licence to promote collaboration among hardware designers
-and to provide a legal tool which supports the freedom to use, study, modify,
-share and distribute hardware designs and products based on those designs.
-Version 2 of the CERN Open Hardware Licence comes in three variants: CERN-OHL-P
-(permissive); and two reciprocal licences: this licence, CERN- OHL-W (weakly
-reciprocal) and CERN-OHL-S (strongly reciprocal).
+CERN has developed this licence to promote collaboration among
+hardware designers and to provide a legal tool which supports the
+freedom to use, study, modify, share and distribute hardware designs
+and products based on those designs. Version 2 of the CERN Open
+Hardware Licence comes in three variants: CERN-OHL-P (permissive); and
+two reciprocal licences: this licence, CERN- OHL-W (weakly reciprocal)
+and CERN-OHL-S (strongly reciprocal).
 
-The CERN-OHL-W is copyright CERN 2020. Anyone is welcome to use it, in unmodified
-form only.
+The CERN-OHL-W is copyright CERN 2020. Anyone is welcome to use it, in
+unmodified form only.
 
-Use of this Licence does not imply any endorsement by CERN of any Licensor
-or their designs nor does it imply any involvement by CERN in their development.
+Use of this Licence does not imply any endorsement by CERN of any
+Licensor or their designs nor does it imply any involvement by CERN in
+their development.
 
-   1 Definitions
 
-      1.1 'Licence' means this CERN-OHL-W.
+1 Definitions
 
-      1.2 'Compatible Licence' means
+  1.1 'Licence' means this CERN-OHL-W.
 
-         a) any earlier version of the CERN Open Hardware licence, or
+  1.2 'Compatible Licence' means
 
-         b) any version of the CERN-OHL-S or the CERN-OHL-W, or
+       a) any earlier version of the CERN Open Hardware licence, or
 
-c) any licence which permits You to treat the Source to which it applies as
-licensed under CERN-OHL-S or CERN-OHL-W provided that on Conveyance of any
-such Source, or any associated Product You treat the Source in question as
-being licensed under CERN-OHL-S or CERN-OHL-W as appropriate.
+       b) any version of the CERN-OHL-S or the CERN-OHL-W, or
 
-1.3 'Source' means information such as design materials or digital code which
-can be applied to Make or test a Product or to prepare a Product for use,
-Conveyance or sale, regardless of its medium or how it is expressed. It may
-include Notices.
+       c) any licence which permits You to treat the Source to which
+          it applies as licensed under CERN-OHL-S or CERN-OHL-W
+          provided that on Conveyance of any such Source, or any
+          associated Product You treat the Source in question as being
+          licensed under CERN-OHL-S or CERN-OHL-W as appropriate.
 
-1.4 'Covered Source' means Source that is explicitly made available under
-this Licence.
+  1.3 'Source' means information such as design materials or digital
+      code which can be applied to Make or test a Product or to
+      prepare a Product for use, Conveyance or sale, regardless of its
+      medium or how it is expressed. It may include Notices.
 
-1.5 'Product' means any device, component, work or physical object, whether
-in finished or intermediate form, arising from the use, application or processing
-of Covered Source.
+  1.4 'Covered Source' means Source that is explicitly made available
+      under this Licence.
 
-1.6 'Make' means to create or configure something, whether by manufacture,
-assembly, compiling, loading or applying Covered Source or another Product
-or otherwise.
+  1.5 'Product' means any device, component, work or physical object,
+      whether in finished or intermediate form, arising from the use,
+      application or processing of Covered Source.
 
-1.7 'Available Component' means any part, sub-assembly, library or code which:
+  1.6 'Make' means to create or configure something, whether by
+      manufacture, assembly, compiling, loading or applying Covered
+      Source or another Product or otherwise.
 
-a) is licensed to You as Complete Source under a Compatible Licence; or
+  1.7 'Available Component' means any part, sub-assembly, library or
+      code which:
 
-b) is available, at the time a Product or the Source containing it is first
-Conveyed, to You and any other prospective licensees
+      a) is licensed to You as Complete Source under a Compatible
+         Licence; or
 
-i) with sufficient rights and information (including any configuration and
-programming files and information about its characteristics and interfaces)
-to enable it either to be Made itself, or to be sourced and used to Make the
-Product; or
+      b) is available, at the time a Product or the Source containing
+         it is first Conveyed, to You and any other prospective
+         licensees
 
-ii) as part of the normal distribution of a tool used to design or Make the
-Product.
+           i) with sufficient rights and information (including any
+              configuration and programming files and information
+              about its characteristics and interfaces) to enable it
+              either to be Made itself, or to be sourced and used to
+              Make the Product; or
+          ii) as part of the normal distribution of a tool used to
+              design or Make the Product.
 
-      1.8 'External Material' means anything (including Source) which:
+  1.8 'External Material' means anything (including Source) which:
 
-a) is only combined with Covered Source in such a way that it interfaces with
-the Covered Source using a documented interface which is described in the
-Covered Source; and
+      a) is only combined with Covered Source in such a way that it
+         interfaces with the Covered Source using a documented
+         interface which is described in the Covered Source; and
 
-b) is not a derivative of or contains Covered Source, or, if it is, it is
-solely to the extent necessary to facilitate such interfacing.
+      b) is not a derivative of or contains Covered Source, or, if it
+         is, it is solely to the extent necessary to facilitate such
+         interfacing.
 
-1.9 'Complete Source' means the set of all Source necessary to Make a Product,
-in the preferred form for making modifications, including necessary installation
-and interfacing information both for the Product, and for any included Available
-Components. If the format is proprietary, it must also be made available in
-a format (if the proprietary tool can create it) which is viewable with a
-tool available to potential licensees and licensed under a licence approved
-by the Free Software Foundation or the Open Source Initiative. Complete Source
-need not include the Source of any Available Component, provided that You
-include in the Complete Source sufficient information to enable a recipient
-to Make or source and use the Available Component to Make the Product.
+  1.9 'Complete Source' means the set of all Source necessary to Make
+      a Product, in the preferred form for making modifications,
+      including necessary installation and interfacing information
+      both for the Product, and for any included Available Components.
+      If the format is proprietary, it must also be made available in
+      a format (if the proprietary tool can create it) which is
+      viewable with a tool available to potential licensees and
+      licensed under a licence approved by the Free Software
+      Foundation or the Open Source Initiative. Complete Source need
+      not include the Source of any Available Component, provided that
+      You include in the Complete Source sufficient information to
+      enable a recipient to Make or source and use the Available
+      Component to Make the Product.
 
-1.10 'Source Location' means a location where a Licensor has placed Covered
-Source, and which that Licensor reasonably believes will remain easily accessible
-for at least three years for anyone to obtain a digital copy.
+ 1.10 'Source Location' means a location where a Licensor has placed
+      Covered Source, and which that Licensor reasonably believes will
+      remain easily accessible for at least three years for anyone to
+      obtain a digital copy.
 
-1.11 'Notice' means copyright, acknowledgement and trademark notices, Source
-Location references, modification notices (subsection 3.3(b)) and all notices
-that refer to this Licence and to the disclaimer of warranties that are included
-in the Covered Source.
+ 1.11 'Notice' means copyright, acknowledgement and trademark notices,
+      Source Location references, modification notices (subsection
+      3.3(b)) and all notices that refer to this Licence and to the
+      disclaimer of warranties that are included in the Covered
+      Source.
 
-1.12 'Licensee' or 'You' means any person exercising rights under this Licence.
+ 1.12 'Licensee' or 'You' means any person exercising rights under
+      this Licence.
 
-1.13 'Licensor' means a natural or legal person who creates or modifies Covered
-Source. A person may be a Licensee and a Licensor at the same time.
+ 1.13 'Licensor' means a natural or legal person who creates or
+      modifies Covered Source. A person may be a Licensee and a
+      Licensor at the same time.
 
-      1.14 'Convey' means to communicate to the public or distribute.
+ 1.14 'Convey' means to communicate to the public or distribute.
 
-   2 Applicability
 
-2.1 This Licence governs the use, copying, modification, Conveying of Covered
-Source and Products, and the Making of Products. By exercising any right granted
-under this Licence, You irrevocably accept these terms and conditions.
+2 Applicability
 
-2.2 This Licence is granted by the Licensor directly to You, and shall apply
-worldwide and without limitation in time.
+  2.1 This Licence governs the use, copying, modification, Conveying
+      of Covered Source and Products, and the Making of Products. By
+      exercising any right granted under this Licence, You irrevocably
+      accept these terms and conditions.
 
-2.3 You shall not attempt to restrict by contract or otherwise the rights
-granted under this Licence to other Licensees.
+  2.2 This Licence is granted by the Licensor directly to You, and
+      shall apply worldwide and without limitation in time.
 
-2.4 This Licence is not intended to restrict fair use, fair dealing, or any
-other similar right.
+  2.3 You shall not attempt to restrict by contract or otherwise the
+      rights granted under this Licence to other Licensees.
 
-   3 Copying, modifying and Conveying Covered Source
+  2.4 This Licence is not intended to restrict fair use, fair dealing,
+      or any other similar right.
 
-3.1 You may copy and Convey verbatim copies of Covered Source, in any medium,
-provided You retain all Notices.
 
-3.2 You may modify Covered Source, other than Notices, provided that You irrevocably
-undertake to make that modified Covered Source available from a Source Location
-should You Convey a Product in circumstances where the recipient does not
-otherwise receive a copy of the modified Covered Source. In each case subsection
-3.3 shall apply.
+3 Copying, modifying and Conveying Covered Source
 
-You may only delete Notices if they are no longer applicable to the corresponding
-Covered Source as modified by You and You may add additional Notices applicable
-to Your modifications.
+  3.1 You may copy and Convey verbatim copies of Covered Source, in
+      any medium, provided You retain all Notices.
 
-3.3 You may Convey modified Covered Source (with the effect that You shall
-also become a Licensor) provided that You:
+  3.2 You may modify Covered Source, other than Notices, provided that
+      You irrevocably undertake to make that modified Covered Source
+      available from a Source Location should You Convey a Product in
+      circumstances where the recipient does not otherwise receive a
+      copy of the modified Covered Source. In each case subsection 3.3
+      shall apply.
 
-         a) retain Notices as required in subsection 3.2;
+      You may only delete Notices if they are no longer applicable to
+      the corresponding Covered Source as modified by You and You may
+      add additional Notices applicable to Your modifications.
 
-b) add a Notice to the modified Covered Source stating that You have modified
-it, with the date and brief description of how You have modified it;
+  3.3 You may Convey modified Covered Source (with the effect that You
+      shall also become a Licensor) provided that You:
 
-c) add a Source Location Notice for the modified Covered Source if You Convey
-in circumstances where the recipient does not otherwise receive a copy of
-the modified Covered Source; and
+       a) retain Notices as required in subsection 3.2;
 
-d) license the modified Covered Source under the terms and conditions of this
-Licence (or, as set out in subsection 8.3, a later version, if permitted by
-the licence of the original Covered Source). Such modified Covered Source
-must be licensed as a whole, but excluding Available Components contained
-in it or External Material to which it is interfaced, which remain licensed
-under their own applicable licences.
+       b) add a Notice to the modified Covered Source stating that You
+          have modified it, with the date and brief description of how
+          You have modified it;
 
-   4 Making and Conveying Products
+       c) add a Source Location Notice for the modified Covered Source
+          if You Convey in circumstances where the recipient does not
+          otherwise receive a copy of the modified Covered Source; and
 
-4.1 You may Make Products, and/or Convey them, provided that You either provide
-each recipient with a copy of the Complete Source or ensure that each recipient
-is notified of the Source Location of the Complete Source. That Complete Source
-includes Covered Source and You must accordingly satisfy Your obligations
-set out in subsection 3.3. If specified in a Notice, the Product must visibly
-and securely display the Source Location on it or its packaging or documentation
-in the manner specified in that Notice.
+       d) license the modified Covered Source under the terms and
+          conditions of this Licence (or, as set out in subsection
+          8.3, a later version, if permitted by the licence of the
+          original Covered Source). Such modified Covered Source must
+          be licensed as a whole, but excluding Available Components
+          contained in it or External Material to which it is
+          interfaced, which remain licensed under their own applicable
+          licences.
 
-4.2 Where You Convey a Product which incorporates External Material, the Complete
-Source for that Product which You are required to provide under subsection
-4.1 need not include any Source for the External Material.
 
-4.3 You may license Products under terms of Your choice, provided that such
-terms do not restrict or attempt to restrict any recipients' rights under
-this Licence to the Covered Source.
+4 Making and Conveying Products
 
-   5 Research and Development
+  4.1 You may Make Products, and/or Convey them, provided that You
+      either provide each recipient with a copy of the Complete Source
+      or ensure that each recipient is notified of the Source Location
+      of the Complete Source. That Complete Source includes Covered
+      Source and You must accordingly satisfy Your obligations set out
+      in subsection 3.3. If specified in a Notice, the Product must
+      visibly and securely display the Source Location on it or its
+      packaging or documentation in the manner specified in that
+      Notice.
 
-You may Convey Covered Source, modified Covered Source or Products to a legal
-entity carrying out development, testing or quality assurance work on Your
-behalf provided that the work is performed on terms which prevent the entity
-from both using the Source or Products for its own internal purposes and Conveying
-the Source or Products or any modifications to them to any person other than
-You. Any modifications made by the entity shall be deemed to be made by You
-pursuant to subsection 3.2.
+  4.2 Where You Convey a Product which incorporates External Material,
+      the Complete Source for that Product which You are required to
+      provide under subsection 4.1 need not include any Source for the
+      External Material.
 
-   6 DISCLAIMER AND LIABILITY
+  4.3 You may license Products under terms of Your choice, provided
+      that such terms do not restrict or attempt to restrict any
+      recipients' rights under this Licence to the Covered Source.
 
-6.1 DISCLAIMER OF WARRANTY -- The Covered Source and any Products are provided
-'as is' and any express or implied warranties, including, but not limited
-to, implied warranties of merchantability, of satisfactory quality, non-infringement
-of third party rights, and fitness for a particular purpose or use are disclaimed
-in respect of any Source or Product to the maximum extent permitted by law.
-The Licensor makes no representation that any Source or Product does not or
-will not infringe any patent, copyright, trade secret or other proprietary
-right. The entire risk as to the use, quality, and performance of any Source
-or Product shall be with You and not the Licensor. This disclaimer of warranty
-is an essential part of this Licence and a condition for the grant of any
-rights granted under this Licence.
 
-6.2 EXCLUSION AND LIMITATION OF LIABILITY -- The Licensor shall, to the maximum
-extent permitted by law, have no liability for direct, indirect, special,
-incidental, consequential, exemplary, punitive or other damages of any character
-including, without limitation, procurement of substitute goods or services,
-loss of use, data or profits, or business interruption, however caused and
-on any theory of contract, warranty, tort (including negligence), product
-liability or otherwise, arising in any way in relation to the Covered Source,
-modified Covered Source and/or the Making or Conveyance of a Product, even
-if advised of the possibility of such damages, and You shall hold the Licensor(s)
-free and harmless from any liability, costs, damages, fees and expenses, including
-claims by third parties, in relation to such use.
+5 Research and Development
 
-   7 Patents
+You may Convey Covered Source, modified Covered Source or Products to
+a legal entity carrying out development, testing or quality assurance
+work on Your behalf provided that the work is performed on terms which
+prevent the entity from both using the Source or Products for its own
+internal purposes and Conveying the Source or Products or any
+modifications to them to any person other than You. Any modifications
+made by the entity shall be deemed to be made by You pursuant to
+subsection 3.2.
 
-7.1 Subject to the terms and conditions of this Licence, each Licensor hereby
-grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
-irrevocable (except as stated in subsections 7.2 and 8.4) patent license to
-Make, have Made, use, offer to sell, sell, import, and otherwise transfer
-the Covered Source and Products, where such licence applies only to those
-patent claims licensable by such Licensor that are necessarily infringed by
-exercising rights under the Covered Source as Conveyed by that Licensor.
 
-7.2 If You institute patent litigation against any entity (including a cross-claim
-or counterclaim in a lawsuit) alleging that the Covered Source or a Product
-constitutes direct or contributory patent infringement, or You seek any declaration
-that a patent licensed to You under this Licence is invalid or unenforceable
-then any rights granted to You under this Licence shall terminate as of the
-date such process is initiated.
+6 DISCLAIMER AND LIABILITY
 
-   8 General
+  6.1 DISCLAIMER OF WARRANTY -- The Covered Source and any Products
+      are provided 'as is' and any express or implied warranties,
+      including, but not limited to, implied warranties of
+      merchantability, of satisfactory quality, non-infringement of
+      third party rights, and fitness for a particular purpose or use
+      are disclaimed in respect of any Source or Product to the
+      maximum extent permitted by law. The Licensor makes no
+      representation that any Source or Product does not or will not
+      infringe any patent, copyright, trade secret or other
+      proprietary right. The entire risk as to the use, quality, and
+      performance of any Source or Product shall be with You and not
+      the Licensor. This disclaimer of warranty is an essential part
+      of this Licence and a condition for the grant of any rights
+      granted under this Licence.
 
-8.1 If any provisions of this Licence are or subsequently become invalid or
-unenforceable for any reason, the remaining provisions shall remain effective.
+  6.2 EXCLUSION AND LIMITATION OF LIABILITY -- The Licensor shall, to
+      the maximum extent permitted by law, have no liability for
+      direct, indirect, special, incidental, consequential, exemplary,
+      punitive or other damages of any character including, without
+      limitation, procurement of substitute goods or services, loss of
+      use, data or profits, or business interruption, however caused
+      and on any theory of contract, warranty, tort (including
+      negligence), product liability or otherwise, arising in any way
+      in relation to the Covered Source, modified Covered Source
+      and/or the Making or Conveyance of a Product, even if advised of
+      the possibility of such damages, and You shall hold the
+      Licensor(s) free and harmless from any liability, costs,
+      damages, fees and expenses, including claims by third parties,
+      in relation to such use.
 
-8.2 You shall not use any of the name (including acronyms and abbreviations),
-image, or logo by which the Licensor or CERN is known, except where needed
-to comply with section 3, or where the use is otherwise allowed by law. Any
-such permitted use shall be factual and shall not be made so as to suggest
-any kind of endorsement or implication of involvement by the Licensor or its
-personnel.
 
-8.3 CERN may publish updated versions and variants of this Licence which it
-considers to be in the spirit of this version, but may differ in detail to
-address new problems or concerns. New versions will be published with a unique
-version number and a variant identifier specifying the variant. If the Licensor
-has specified that a given variant applies to the Covered Source without specifying
-a version, You may treat that Covered Source as being released under any version
-of the CERN-OHL with that variant. If no variant is specified, the Covered
-Source shall be treated as being released under CERN-OHL-S. The Licensor may
-also specify that the Covered Source is subject to a specific version of the
-CERN-OHL or any later version in which case You may apply this or any later
-version of CERN-OHL with the same variant identifier published by CERN.
+7 Patents
 
-You may treat Covered Source licensed under CERN-OHL-W as licensed under CERN-OHL-S
-if and only if all Available Components referenced in the Covered Source comply
-with the corresponding definition of Available Component for CERN-OHL-S.
+  7.1 Subject to the terms and conditions of this Licence, each
+      Licensor hereby grants to You a perpetual, worldwide,
+      non-exclusive, no-charge, royalty-free, irrevocable (except as
+      stated in subsections 7.2 and 8.4) patent license to Make, have
+      Made, use, offer to sell, sell, import, and otherwise transfer
+      the Covered Source and Products, where such licence applies only
+      to those patent claims licensable by such Licensor that are
+      necessarily infringed by exercising rights under the Covered
+      Source as Conveyed by that Licensor.
 
-8.4 This Licence shall terminate with immediate effect if You fail to comply
-with any of its terms and conditions.
+  7.2 If You institute patent litigation against any entity (including
+      a cross-claim or counterclaim in a lawsuit) alleging that the
+      Covered Source or a Product constitutes direct or contributory
+      patent infringement, or You seek any declaration that a patent
+      licensed to You under this Licence is invalid or unenforceable
+      then any rights granted to You under this Licence shall
+      terminate as of the date such process is initiated.
 
-8.5 However, if You cease all breaches of this Licence, then Your Licence
-from any Licensor is reinstated unless such Licensor has terminated this Licence
-by giving You, while You remain in breach, a notice specifying the breach
-and requiring You to cure it within 30 days, and You have failed to come into
-compliance in all material respects by the end of the 30 day period. Should
-You repeat the breach after receipt of a cure notice and subsequent reinstatement,
-this Licence will terminate immediately and permanently. Section 6 shall continue
-to apply after any termination.
 
-8.6 This Licence shall not be enforceable except by a Licensor acting as such,
-and third party beneficiary rights are specifically excluded.
+8 General
+
+  8.1 If any provisions of this Licence are or subsequently become
+      invalid or unenforceable for any reason, the remaining
+      provisions shall remain effective.
+
+  8.2 You shall not use any of the name (including acronyms and
+      abbreviations), image, or logo by which the Licensor or CERN is
+      known, except where needed to comply with section 3, or where
+      the use is otherwise allowed by law. Any such permitted use
+      shall be factual and shall not be made so as to suggest any kind
+      of endorsement or implication of involvement by the Licensor or
+      its personnel.
+
+  8.3 CERN may publish updated versions and variants of this Licence
+      which it considers to be in the spirit of this version, but may
+      differ in detail to address new problems or concerns. New
+      versions will be published with a unique version number and a
+      variant identifier specifying the variant. If the Licensor has
+      specified that a given variant applies to the Covered Source
+      without specifying a version, You may treat that Covered Source
+      as being released under any version of the CERN-OHL with that
+      variant. If no variant is specified, the Covered Source shall be
+      treated as being released under CERN-OHL-S. The Licensor may
+      also specify that the Covered Source is subject to a specific
+      version of the CERN-OHL or any later version in which case You
+      may apply this or any later version of CERN-OHL with the same
+      variant identifier published by CERN.
+
+      You may treat Covered Source licensed under CERN-OHL-W as
+      licensed under CERN-OHL-S if and only if all Available
+      Components referenced in the Covered Source comply with the
+      corresponding definition of Available Component for CERN-OHL-S.
+
+  8.4 This Licence shall terminate with immediate effect if You fail
+      to comply with any of its terms and conditions.
+
+  8.5 However, if You cease all breaches of this Licence, then Your
+      Licence from any Licensor is reinstated unless such Licensor has
+      terminated this Licence by giving You, while You remain in
+      breach, a notice specifying the breach and requiring You to cure
+      it within 30 days, and You have failed to come into compliance
+      in all material respects by the end of the 30 day period. Should
+      You repeat the breach after receipt of a cure notice and
+      subsequent reinstatement, this Licence will terminate
+      immediately and permanently. Section 6 shall continue to apply
+      after any termination.
+
+  8.6 This Licence shall not be enforceable except by a Licensor
+      acting as such, and third party beneficiary rights are
+      specifically excluded.
diff --git a/options/license/CNRI-Jython b/options/license/CNRI-Jython
index d1c661720a..2116448654 100644
--- a/options/license/CNRI-Jython
+++ b/options/license/CNRI-Jython
@@ -1,66 +1,55 @@
 
-
 1. This LICENSE AGREEMENT is between the Corporation for National Research
 Initiatives, having an office at 1895 Preston White Drive, Reston, VA 20191
 ("CNRI"), and the Individual or Organization ("Licensee") accessing and using
 JPython version 1.1.x in source or binary form and its associated documentation
 as provided herein ("Software").
 
-   
-
-2. Subject to the terms and conditions of this License Agreement, CNRI hereby
+2.  Subject to the terms and conditions of this License Agreement, CNRI hereby
 grants Licensee a non-exclusive, non-transferable, royalty-free, world-wide
 license to reproduce, analyze, test, perform and/or display publicly, prepare
 derivative works, distribute, and otherwise use the Software alone or in any
 derivative version, provided, however, that CNRI's License Agreement and CNRI's
-notice of copyright, i.e., "Copyright (c) 1996-1999 Corporation for National
-Research Initiatives; All Rights Reserved" are both retained in the Software,
+notice of copyright, i.e., “Copyright (c) 1996-1999 Corporation for National
+Research Initiatives; All Rights Reserved” are both retained in the Software,
 alone or in any derivative version prepared by Licensee.
-
 Alternatively, in lieu of CNRI's License Agreement, Licensee may substitute
 the following text (omitting the quotes), provided, however, that such text
 is displayed prominently in the Software alone or in any derivative version
-prepared by Licensee: "JPython (Version 1.1.x) is made available subject to
+prepared by Licensee: “JPython (Version 1.1.x) is made available subject to
 the terms and conditions in CNRI's License Agreement. This Agreement may be
 located on the Internet using the following unique, persistent identifier
 (known as a handle): 1895.22/1006. The License may also be obtained from a
-proxy server on the Web using the following URL: http://hdl.handle.net/1895.22/1006."
-
-3. In the event Licensee prepares a derivative work that is based on or incorporates
+proxy server on the Web using the following URL: http://hdl.handle.net/1895.22/1006.”
+3.  In the event Licensee prepares a derivative work that is based on or incorporates
 the Software or any part thereof, and wants to make the derivative work available
 to the public as provided herein, then Licensee hereby agrees to indicate
 in any such work, in a prominently visible way, the nature of the modifications
 made to CNRI's Software.
-
 4. Licensee may not use CNRI trademarks or trade name, including JPython or
 CNRI, in a trademark sense to endorse or promote products or services of Licensee,
 or any third party. Licensee may use the mark JPython in connection with Licensee's
 derivative versions that are based on or incorporate the Software, but only
-in the form "JPython-based ___________________," or equivalent.
-
-5. CNRI is making the Software available to Licensee on an "AS IS" basis.
+in the form “JPython-based ___________________,” or equivalent.
+5. CNRI is making the Software available to Licensee on an “AS IS” basis.
 CNRI MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED. BY WAY OF
 EXAMPLE, BUT NOT LIMITATION, CNRI MAKES NO AND DISCLAIMS ANY REPRESENTATION
 OR WARRANTY OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT
 THE USE OF THE SOFTWARE WILL NOT INFRINGE ANY THIRD PARTY RIGHTS.
-
 6. CNRI SHALL NOT BE LIABLE TO LICENSEE OR OTHER USERS OF THE SOFTWARE FOR
 ANY INCIDENTAL, SPECIAL OR CONSEQUENTIAL DAMAGES OR LOSS AS A RESULT OF USING,
 MODIFYING OR DISTRIBUTING THE SOFTWARE, OR ANY DERIVATIVE THEREOF, EVEN IF
 ADVISED OF THE POSSIBILITY THEREOF. SOME STATES DO NOT ALLOW THE LIMITATION
 OR EXCLUSION OF LIABILITY SO THE ABOVE DISCLAIMER MAY NOT APPLY TO LICENSEE.
-
 7. This License Agreement may be terminated by CNRI (i) immediately upon written
 notice from CNRI of any material breach by the Licensee, if the nature of
 the breach is such that it cannot be promptly remedied; or (ii) sixty (60)
 days following notice from CNRI to Licensee of a material remediable breach,
 if Licensee has not remedied such breach within that sixty-day period.
-
 8. This License Agreement shall be governed by and interpreted in all respects
 by the law of the State of Virginia, excluding conflict of law provisions.
 Nothing in this Agreement shall be deemed to create any relationship of agency,
 partnership, or joint venture between CNRI and Licensee.
-
 9. By clicking on the "ACCEPT" button where indicated, or by installing, copying
 or otherwise using the Software, Licensee agrees to be bound by the terms
 and conditions of this License Agreement.
diff --git a/options/license/CNRI-Python-GPL-Compatible b/options/license/CNRI-Python-GPL-Compatible
index 3594e0553b..45e4cbb6b7 100644
--- a/options/license/CNRI-Python-GPL-Compatible
+++ b/options/license/CNRI-Python-GPL-Compatible
@@ -62,4 +62,6 @@ party.
 
 8. By clicking on the "ACCEPT" button where indicated, or by copying, installing
 or otherwise using Python 1.6.1, Licensee agrees to be bound by the terms
-and conditions of this License Agreement. ACCEPT
+and conditions of this License Agreement.
+
+ACCEPT
diff --git a/options/license/CPAL-1.0 b/options/license/CPAL-1.0
index 0205b7bb58..4360d88123 100644
--- a/options/license/CPAL-1.0
+++ b/options/license/CPAL-1.0
@@ -1,38 +1,38 @@
 Common Public Attribution License Version 1.0 (CPAL)
 
-   1. "Definitions"
+1. “Definitions”
 
-1.0.1 "Commercial Use" means distribution or otherwise making the Covered
+1.0.1 “Commercial Use” means distribution or otherwise making the Covered
 Code available to a third party.
 
-1.1 "Contributor" means each entity that creates or contributes to the creation
+1.1 “Contributor” means each entity that creates or contributes to the creation
 of Modifications.
 
-1.2 "Contributor Version" means the combination of the Original Code, prior
+1.2 “Contributor Version” means the combination of the Original Code, prior
 Modifications used by a Contributor, and the Modifications made by that particular
 Contributor.
 
-1.3 "Covered Code" means the Original Code or Modifications or the combination
+1.3 “Covered Code” means the Original Code or Modifications or the combination
 of the Original Code and Modifications, in each case including portions thereof.
 
-1.4 "Electronic Distribution Mechanism" means a mechanism generally accepted
+1.4 “Electronic Distribution Mechanism” means a mechanism generally accepted
 in the software development community for the electronic transfer of data.
 
-      1.5 "Executable" means Covered Code in any form other than Source Code.
+1.5 “Executable” means Covered Code in any form other than Source Code.
 
-1.6 "Initial Developer" means the individual or entity identified as the Initial
+1.6 “Initial Developer” means the individual or entity identified as the Initial
 Developer in the Source Code notice required by Exhibit A.
 
-1.7 "Larger Work" means a work which combines Covered Code or portions thereof
+1.7 “Larger Work” means a work which combines Covered Code or portions thereof
 with code not governed by the terms of this License.
 
-      1.8 "License" means this document.
+1.8 “License” means this document.
 
-1.8.1 "Licensable" means having the right to grant, to the maximum extent
+1.8.1 “Licensable” means having the right to grant, to the maximum extent
 possible, whether at the time of the initial grant or subsequently acquired,
 any and all of the rights conveyed herein.
 
-1.9 "Modifications" means any addition to or deletion from the substance or
+1.9 “Modifications” means any addition to or deletion from the substance or
 structure of either the Original Code or any previous Modifications. When
 Covered Code is released as a series of files, a Modification is:
 
@@ -41,37 +41,36 @@ Code or previous Modifications.
 
 B. Any new file that contains any part of the Original Code or previous Modifications.
 
-1.10 "Original Code" means Source Code of computer software code which is
+1.10 “Original Code” means Source Code of computer software code which is
 described in the Source Code notice required by Exhibit A as Original Code,
 and which, at the time of its release under this License is not already Covered
 Code governed by this License.
 
-1.10.1 "Patent Claims" means any patent claim(s), now owned or hereafter acquired,
+1.10.1 “Patent Claims” means any patent claim(s), now owned or hereafter acquired,
 including without limitation, method, process, and apparatus claims, in any
 patent Licensable by grantor.
 
-1.11 "Source Code" means the preferred form of the Covered Code for making
+1.11 “Source Code” means the preferred form of the Covered Code for making
 modifications to it, including all modules it contains, plus any associated
 interface definition files, scripts used to control compilation and installation
 of an Executable, or source code differential comparisons against either the
-Original Code or another well known, available Covered Code of the Contributor's
+Original Code or another well known, available Covered Code of the Contributor’s
 choice. The Source Code can be in a compressed or archival form, provided
 the appropriate decompression or de-archiving software is widely available
 for no charge.
 
-1.12 "You" (or "Your") means an individual or a legal entity exercising rights
+1.12 “You” (or “Your”) means an individual or a legal entity exercising rights
 under, and complying with all of the terms of, this License or a future version
-of this License issued under Section 6.1. For legal entities, "You" includes
+of this License issued under Section 6.1. For legal entities, “You” includes
 any entity which controls, is controlled by, or is under common control with
-You. For purposes of this definition, "control" means (a) the power, direct
+You. For purposes of this definition, “control” means (a) the power, direct
 or indirect, to cause the direction or management of such entity, whether
 by contract or otherwise, or (b) ownership of more than fifty percent (50%)
 of the outstanding shares or beneficial ownership of such entity.
 
-   2. Source Code License.
-
-      2.1 The Initial Developer Grant.
+2. Source Code License.
 
+2.1 The Initial Developer Grant.
 The Initial Developer hereby grants You a world-wide, royalty-free, non-exclusive
 license, subject to third party intellectual property claims:
 
@@ -93,8 +92,7 @@ for code that You delete from the Original Code; 2) separate from the Original
 Code; or 3) for infringements caused by: i) the modification of the Original
 Code or ii) the combination of the Original Code with other software or devices.
 
-      2.2 Contributor Grant.
-
+2.2 Contributor Grant.
 Subject to third party intellectual property claims, each Contributor hereby
 grants You a world-wide, royalty-free, non-exclusive license
 
@@ -122,10 +120,9 @@ Modifications made by that Contributor with other software (except as part
 of the Contributor Version) or other devices; or 4) under Patent Claims infringed
 by Covered Code in the absence of Modifications made by that Contributor.
 
-   3. Distribution Obligations.
-
-      3.1 Application of License.
+3. Distribution Obligations.
 
+3.1 Application of License.
 The Modifications which You create or to which You contribute are governed
 by the terms of this License, including without limitation Section 2.2. The
 Source Code version of Covered Code may be distributed only under the terms
@@ -133,11 +130,10 @@ of this License or a future version of this License released under Section
 6.1, and You must include a copy of this License with every copy of the Source
 Code You distribute. You may not offer or impose any terms on any Source Code
 version that alters or restricts the applicable version of this License or
-the recipients' rights hereunder. However, You may include an additional document
+the recipients’ rights hereunder. However, You may include an additional document
 offering the additional rights described in Section 3.5.
 
-      3.2 Availability of Source Code.
-
+3.2 Availability of Source Code.
 Any Modification which You create or to which You contribute must be made
 available in Source Code form under the terms of this License either on the
 same media as an Executable version or via an accepted Electronic Distribution
@@ -149,8 +145,7 @@ has been made available to such recipients. You are responsible for ensuring
 that the Source Code version remains available even if the Electronic Distribution
 Mechanism is maintained by a third party.
 
-      3.3 Description of Modifications.
-
+3.3 Description of Modifications.
 You must cause all Covered Code to which You contribute to contain a file
 documenting the changes You made to create that Covered Code and the date
 of any change. You must include a prominent statement that the Modification
@@ -159,12 +154,12 @@ Developer and including the name of the Initial Developer in (a) the Source
 Code, and (b) in any notice in an Executable version or related documentation
 in which You describe the origin or ownership of the Covered Code.
 
-      3.4 Intellectual Property Matters
+3.4 Intellectual Property Matters
 
-(a) Third Party Claims. If Contributor has knowledge that a license under
-a third party's intellectual property rights is required to exercise the rights
+(a) Third Party Claims.  If Contributor has knowledge that a license under
+a third party’s intellectual property rights is required to exercise the rights
 granted by such Contributor under Sections 2.1 or 2.2, Contributor must include
-a text file with the Source Code distribution titled "LEGAL" which describes
+a text file with the Source Code distribution titled “LEGAL” which describes
 the claim and the party making the claim in sufficient detail that a recipient
 will know whom to contact. If Contributor obtains such knowledge after the
 Modification is made available as described in Section 3.2, Contributor shall
@@ -173,25 +168,24 @@ and shall take other steps (such as notifying appropriate mailing lists or
 newsgroups) reasonably calculated to inform those who received the Covered
 Code that new knowledge has been obtained.
 
-(b) Contributor APIs. If Contributor's Modifications include an application
+(b) Contributor APIs.  If Contributor’s Modifications include an application
 programming interface and Contributor has knowledge of patent licenses which
 are reasonably necessary to implement that API, Contributor must also include
 this information in the LEGAL file.
 
 (c) Representations. Contributor represents that, except as disclosed pursuant
-to Section 3.4(a) above, Contributor believes that Contributor's Modifications
-are Contributor's original creation(s) and/or Contributor has sufficient rights
+to Section 3.4(a) above, Contributor believes that Contributor’s Modifications
+are Contributor’s original creation(s) and/or Contributor has sufficient rights
 to grant the rights conveyed by this License.
 
-      3.5 Required Notices.
-
+3.5 Required Notices.
 You must duplicate the notice in Exhibit A in each file of the Source Code.
 If it is not possible to put such notice in a particular Source Code file
 due to its structure, then You must include such notice in a location (such
 as a relevant directory) where a user would be likely to look for such a notice.
 If You created one or more Modification(s) You may add your name as a Contributor
 to the notice described in Exhibit A. You must also duplicate this License
-in any documentation for the Source Code where You describe recipients' rights
+in any documentation for the Source Code where You describe recipients’ rights
 or ownership rights relating to Covered Code. You may choose to offer, and
 to charge a fee for, warranty, support, indemnity or liability obligations
 to one or more recipients of Covered Code. However, You may do so only on
@@ -202,20 +196,19 @@ the Initial Developer and every Contributor for any liability incurred by
 the Initial Developer or such Contributor as a result of warranty, support,
 indemnity or liability terms You offer.
 
-      3.6 Distribution of Executable Versions.
-
+3.6 Distribution of Executable Versions.
 You may distribute Covered Code in Executable form only if the requirements
 of Section 3.1-3.5 have been met for that Covered Code, and if You include
 a notice stating that the Source Code version of the Covered Code is available
 under the terms of this License, including a description of how and where
 You have fulfilled the obligations of Section 3.2. The notice must be conspicuously
 included in any notice in an Executable version, related documentation or
-collateral in which You describe recipients' rights relating to the Covered
+collateral in which You describe recipients’ rights relating to the Covered
 Code. You may distribute the Executable version of Covered Code or ownership
 rights under a license of Your choice, which may contain terms different from
 this License, provided that You are in compliance with the terms of this License
 and that the license for the Executable version does not attempt to limit
-or alter the recipient's rights in the Source Code version from the rights
+or alter the recipient’s rights in the Source Code version from the rights
 set forth in this License. If You distribute the Executable version under
 a different license You must make it absolutely clear that any terms which
 differ from this License are offered by You alone, not by the Initial Developer,
@@ -224,15 +217,13 @@ Developer, Original Developer and every Contributor for any liability incurred
 by the Initial Developer, Original Developer or such Contributor as a result
 of any such terms You offer.
 
-      3.7 Larger Works.
-
+3.7 Larger Works.
 You may create a Larger Work by combining Covered Code with other code not
 governed by the terms of this License and distribute the Larger Work as a
 single product. In such a case, You must make sure the requirements of this
 License are fulfilled for the Covered Code.
 
-   4. Inability to Comply Due to Statute or Regulation.
-
+4. Inability to Comply Due to Statute or Regulation.
 If it is impossible for You to comply with any of the terms of this License
 with respect to some or all of the Covered Code due to statute, judicial order,
 or regulation then You must: (a) comply with the terms of this License to
@@ -243,42 +234,37 @@ Except to the extent prohibited by statute or regulation, such description
 must be sufficiently detailed for a recipient of ordinary skill to be able
 to understand it.
 
-   5. Application of this License.
-
+5. Application of this License.
 This License applies to code to which the Initial Developer has attached the
 notice in Exhibit A and to related Covered Code.
 
-   6. Versions of the License.
+6. Versions of the License.
 
-      6.1 New Versions.
-
-Socialtext, Inc. ("Socialtext") may publish revised and/or new versions of
+6.1 New Versions.
+Socialtext, Inc. (“Socialtext”) may publish revised and/or new versions of
 the License from time to time. Each version will be given a distinguishing
 version number.
 
-      6.2 Effect of New Versions.
-
+6.2 Effect of New Versions.
 Once Covered Code has been published under a particular version of the License,
 You may always continue to use it under the terms of that version. You may
 also choose to use such Covered Code under the terms of any subsequent version
 of the License published by Socialtext. No one other than Socialtext has the
 right to modify the terms applicable to Covered Code created under this License.
 
-      6.3 Derivative Works.
-
+6.3 Derivative Works.
 If You create or use a modified version of this License (which you may only
 do in order to apply it to code which is not already Covered Code governed
-by this License), You must (a) rename Your license so that the phrases "Socialtext",
-"CPAL" or any confusingly similar phrase do not appear in your license (except
+by this License), You must (a) rename Your license so that the phrases “Socialtext”,
+“CPAL” or any confusingly similar phrase do not appear in your license (except
 to note that your license differs from this License) and (b) otherwise make
 it clear that Your version of the license contains terms which differ from
 the CPAL. (Filling in the name of the Initial Developer, Original Developer,
 Original Code or Contributor in the notice described in Exhibit A shall not
 of themselves be deemed to be modifications of this License.)
 
-   7. DISCLAIMER OF WARRANTY.
-
-COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTY
+7. DISCLAIMER OF WARRANTY.
+COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN “AS IS” BASIS, WITHOUT WARRANTY
 OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES
 THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR
 PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE
@@ -288,7 +274,7 @@ CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION.
 THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE.
 NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
 
-   8. TERMINATION.
+8. TERMINATION.
 
 8.1 This License and the rights granted hereunder will terminate automatically
 if You fail to comply with terms herein and fail to cure such breach within
@@ -300,10 +286,10 @@ of this License shall survive.
 8.2 If You initiate litigation by asserting a patent infringement claim (excluding
 declatory judgment actions) against Initial Developer, Original Developer
 or a Contributor (the Initial Developer, Original Developer or Contributor
-against whom You file such action is referred to as "Participant") alleging
+against whom You file such action is referred to as “Participant”) alleging
 that:
 
-(a) such Participant's Contributor Version directly or indirectly infringes
+(a) such Participant’s Contributor Version directly or indirectly infringes
 any patent, then any and all rights granted by such Participant to You under
 Sections 2.1 and/or 2.2 of this License shall, upon 60 days notice from Participant
 terminate prospectively, unless if within 60 days after receipt of notice
@@ -316,14 +302,14 @@ or the litigation claim is not withdrawn, the rights granted by Participant
 to You under Sections 2.1 and/or 2.2 automatically terminate at the expiration
 of the 60 day notice period specified above.
 
-(b) any software, hardware, or device, other than such Participant's Contributor
+(b) any software, hardware, or device, other than such Participant’s Contributor
 Version, directly or indirectly infringes any patent, then any rights granted
 to You by such Participant under Sections 2.1(b) and 2.2(b) are revoked effective
 as of the date You first made, used, sold, distributed, or had made, Modifications
 made by that Participant.
 
 8.3 If You assert a patent infringement claim against Participant alleging
-that such Participant's Contributor Version directly or indirectly infringes
+that such Participant’s Contributor Version directly or indirectly infringes
 any patent where such claim is resolved (such as by license or settlement)
 prior to the initiation of patent infringement litigation, then the reasonable
 value of the licenses granted by such Participant under Sections 2.1 or 2.2
@@ -335,8 +321,7 @@ license agreements (excluding distributors and resellers) which have been
 validly granted by You or any distributor hereunder prior to termination shall
 survive termination.
 
-   9. LIMITATION OF LIABILITY.
-
+9. LIMITATION OF LIABILITY.
 UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING
 NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER, ORIGINAL
 DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE, OR ANY
@@ -346,22 +331,20 @@ WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER
 FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES,
 EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES.
 THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL
-INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW
+INJURY RESULTING FROM SUCH PARTY’S 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.
 
-   10. U.S. GOVERNMENT END USERS.
-
-The Covered Code is a "commercial item," as that term is defined in 48 C.F.R.
-2.101 (Oct. 1995), consisting of "commercial computer software" and "commercial
-computer software documentation," as such terms are used in 48 C.F.R. 12.212
+10. U.S. GOVERNMENT END USERS.
+The Covered Code is a “commercial item,” as that term is defined in 48 C.F.R.
+2.101 (Oct. 1995), consisting of “commercial computer software” and “commercial
+computer software documentation,” as such terms are used in 48 C.F.R. 12.212
 (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through
 227.7202-4 (June 1995), all U.S. Government End Users acquire Covered Code
 with only those rights set forth herein.
 
-   11. MISCELLANEOUS.
-
+11. MISCELLANEOUS.
 This License represents the complete agreement concerning 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. This
@@ -373,13 +356,12 @@ of America, any litigation relating to this License shall be subject to the
 jurisdiction of the Federal Courts of the Northern District of California,
 with venue lying in Santa Clara County, California, with the losing party
 responsible for costs, including without limitation, court costs and reasonable
-attorneys' fees and expenses. The application of the United Nations Convention
+attorneys’ fees and expenses. The application of the United Nations Convention
 on Contracts for the International Sale of Goods is expressly excluded. Any
 law or regulation which provides that the language of a contract shall be
 construed against the drafter shall not apply to this License.
 
-   12. RESPONSIBILITY FOR CLAIMS.
-
+12. RESPONSIBILITY FOR CLAIMS.
 As between Initial Developer, Original Developer and the Contributors, each
 party is responsible for claims and damages arising, directly or indirectly,
 out of its utilization of rights under this License and You agree to work
@@ -387,23 +369,22 @@ with Initial Developer, Original Developer and Contributors to distribute
 such responsibility on an equitable basis. Nothing herein is intended or shall
 be deemed to constitute any admission of liability.
 
-   13. MULTIPLE-LICENSED CODE.
-
+13. MULTIPLE-LICENSED CODE.
 Initial Developer may designate portions of the Covered Code as Multiple-Licensed.
 Multiple-Licensed means that the Initial Developer permits you to utilize
 portions of the Covered Code under Your choice of the CPAL or the alternative
 licenses, if any, specified by the Initial Developer in the file described
 in Exhibit A.
 
-   14. ADDITIONAL TERM: ATTRIBUTION
+14. ADDITIONAL TERM: ATTRIBUTION
 
 (a) As a modest attribution to the organizer of the development of the Original
-Code ("Original Developer"), in the hope that its promotional value may help
+Code (“Original Developer”), in the hope that its promotional value may help
 justify the time, money and effort invested in writing the Original Code,
-the Original Developer may include in Exhibit B ("Attribution Information")
+the Original Developer may include in Exhibit B (“Attribution Information”)
 a requirement that each time an Executable and Source Code or a Larger Work
 is launched or initially run (which includes initiating a session), a prominent
-display of the Original Developer's Attribution Information (as defined below)
+display of the Original Developer’s Attribution Information (as defined below)
 must occur on the graphic user interface employed by the end user to access
 such Covered Code (which may include display on a splash screen), if any.
 The size of the graphic image should be consistent with the size of the other
@@ -411,12 +392,12 @@ elements of the Attribution Information. If the access by the end user to
 the Executable and Source Code does not create a graphic user interface for
 access to the Covered Code, this obligation shall not apply. If the Original
 Code displays such Attribution Information in a particular form (such as in
-the form of a splash screen, notice at login, an "about" display, or dedicated
+the form of a splash screen, notice at login, an “about” display, or dedicated
 attribution area on user interface screens), continued use of such form for
 that Attribution Information is one way of meeting this requirement for notice.
 
 (b) Attribution information may only include a copyright notice, a brief phrase,
-graphic image and a URL ("Attribution Information") and is subject to the
+graphic image and a URL (“Attribution Information”) and is subject to the
 Attribution Limits as defined below. For these purposes, prominent shall mean
 display for sufficient duration to give reasonable notice to the user of the
 identity of the Original Developer and that if You include Attribution Information
@@ -431,7 +412,7 @@ the Original Developer cannot require that You display, at any time, more
 than the following information as Attribution Information: (a) a copyright
 notice including the name of the Original Developer; (b) a word or one phrase
 (not exceeding 10 words); (c) one graphic image provided by the Original Developer;
-and (d) a URL (collectively, the "Attribution Limits").
+and (d) a URL (collectively, the “Attribution Limits”).
 
 (c) If Exhibit B does not include any Attribution Information, then there
 are no requirements for You to display any Attribution Information of the
@@ -443,50 +424,43 @@ Code are the exclusive property of their owners and may only be used with
 the permission of their owners, or under circumstances otherwise permitted
 by law or as expressly set out in this License.
 
-   15. ADDITIONAL TERM: NETWORK USE.
-
-The term "External Deployment" means the use, distribution, or communication
+15. ADDITIONAL TERM: NETWORK USE.
+The term “External Deployment” means the use, distribution, or communication
 of the Original Code or Modifications in any way such that the Original Code
 or Modifications may be used by anyone other than You, whether those works
 are distributed or communicated to those persons or made available as an application
 intended for use over a network. As an express condition for the grants of
 license hereunder, You must treat any External Deployment by You of the Original
 Code or Modifications as a distribution under section 3.1 and make Source
-Code available under Section 3.2. EXHIBIT A. Common Public Attribution License
-Version 1.0.
+Code available under Section 3.2.
 
-"The contents of this file are subject to the Common Public Attribution License
-Version 1.0 (the "License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at _____________ .
-The License is based on the Mozilla Public License Version 1.1 but Sections
-14 and 15 have been added to cover use of software over a computer network
-and provide for limited attribution for the Original Developer. In addition,
-Exhibit A has been modified to be consistent with Exhibit B.
+EXHIBIT A. Common Public Attribution License Version 1.0.
 
-Software distributed under the License is distributed on an "AS IS" basis,
+“The contents of this file are subject to the Common Public Attribution License
+Version 1.0 (the “License”); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at _____________. The
+License is based on the Mozilla Public License Version 1.1 but Sections 14
+and 15 have been added to cover use of software over a computer network and
+provide for limited attribution for the Original Developer. In addition, Exhibit
+A has been modified to be consistent with Exhibit B.
+Software distributed under the License is distributed on an “AS IS” basis,
 WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
 the specific language governing rights and limitations under the License.
-
-The Original Code is ______________________ .
-
-The Original Developer is not the Initial Developer and is __________ . If
+The Original Code is______________________.
+The Original Developer is not the Initial Developer and is __________. If
 left blank, the Original Developer is the Initial Developer.
-
-The Initial Developer of the Original Code is ____________ . All portions
-of the code written by ___________ are Copyright (c) _____ . All Rights Reserved.
-
-Contributor ______________________ .
-
+The Initial Developer of the Original Code is ____________. All portions of
+the code written by ___________ are Copyright (c) _____. All Rights Reserved.
+Contributor ______________________.
 Alternatively, the contents of this file may be used under the terms of the
 _____ license (the [___] License), in which case the provisions of [______]
 License are applicable instead of those above.
-
 If you wish to allow use of your version of this file only under the terms
 of the [____] License and not to allow others to use your version of this
 file under the CPAL, indicate your decision by deleting the provisions above
 and replace them with the notice and other provisions required by the [___]
 License. If you do not delete the provisions above, a recipient may use your
-version of this file under either the CPAL or the [___] License."
+version of this file under either the CPAL or the [___] License.”
 
 [NOTE: The text of this Exhibit A may differ slightly from the text of the
 notices in the Source Code files of the Original Code. You should use the
@@ -496,13 +470,9 @@ Code for Your Modifications.]
 EXHIBIT B. Attribution Information
 
 Attribution Copyright Notice: _______________________
-
 Attribution Phrase (not exceeding 10 words): _______________________
-
 Attribution URL: _______________________
-
 Graphic Image as provided in the Covered Code, if any.
-
 Display of Attribution Information is [required/not required] in Larger Works
 which are defined in the CPAL as a work which combines Covered Code or portions
 thereof with code not governed by the terms of the CPAL.
diff --git a/options/license/CPL-1.0 b/options/license/CPL-1.0
index e0cbd94c74..8eb77f1b27 100644
--- a/options/license/CPL-1.0
+++ b/options/license/CPL-1.0
@@ -2,20 +2,20 @@ Common Public License Version 1.0
 
 THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON PUBLIC
 LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM
-CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. 1.
+CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
 
-DEFINITIONS
+1. DEFINITIONS
 
 "Contribution" means:
 
 a) in the case of the initial Contributor, the initial code and documentation
 distributed under this Agreement, and
 
-   b) in the case of each subsequent Contributor:
+     b) in the case of each subsequent Contributor:
 
-      i) changes to the Program, and
+          i) changes to the Program, and
 
-      ii) additions to the Program;
+          ii) additions to the Program;
 
 where such changes and/or additions to the Program originate from and are
 distributed by that particular Contributor. A Contribution 'originates' from
@@ -34,9 +34,9 @@ combined with the Program.
 "Program" means the Contributions distributed in accordance with this Agreement.
 
 "Recipient" means anyone who receives the Program under this Agreement, including
-all Contributors. 2.
+all Contributors.
 
-GRANT OF RIGHTS
+2. GRANT OF RIGHTS
 
 a) Subject to the terms of this Agreement, each Contributor hereby grants
 Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce,
@@ -68,16 +68,16 @@ distributing the Program.
 
 d) Each Contributor represents that to its knowledge it has sufficient copyright
 rights in its Contribution, if any, to grant the copyright license set forth
-in this Agreement. 3.
+in this Agreement.
 
-REQUIREMENTS
+3. REQUIREMENTS
 
 A Contributor may choose to distribute the Program in object code form under
 its own license agreement, provided that:
 
-   a) it complies with the terms and conditions of this Agreement; and
+     a) it complies with the terms and conditions of this Agreement; and
 
-   b) its license agreement:
+     b) its license agreement:
 
 i) effectively disclaims on behalf of all Contributors all warranties and
 conditions, express and implied, including warranties or conditions of title
@@ -97,18 +97,18 @@ a medium customarily used for software exchange.
 
 When the Program is made available in source code form:
 
-   a) it must be made available under this Agreement; and
+     a) it must be made available under this Agreement; and
 
-   b) a copy of this Agreement must be included with each copy of the Program.
+b) a copy of this Agreement must be included with each copy of the Program.
 
 Contributors may not remove or alter any copyright notices contained within
 the Program.
 
 Each Contributor must identify itself as the originator of its Contribution,
 if any, in a manner that reasonably allows subsequent Recipients to identify
-the originator of the Contribution. 4.
+the originator of the Contribution.
 
-COMMERCIAL DISTRIBUTION
+4. COMMERCIAL DISTRIBUTION
 
 Commercial distributors of software may accept certain responsibilities with
 respect to end users, business partners and the like. While this license is
@@ -138,9 +138,9 @@ Contributor's responsibility alone. Under this section, the Commercial Contribut
 would have to defend claims against the other Contributors related to those
 performance claims and warranties, and if a court requires any other Contributor
 to pay any damages as a result, the Commercial Contributor must pay those
-damages. 5.
+damages.
 
-NO WARRANTY
+5. NO WARRANTY
 
 EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON
 AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS
@@ -151,9 +151,9 @@ using and distributing the Program and assumes all risks associated with its
 exercise of rights under this Agreement, including but not limited to the
 risks and costs of program errors, compliance with applicable laws, damage
 to or loss of data, programs or equipment, and unavailability or interruption
-of operations. 6.
+of operations.
 
-DISCLAIMER OF LIABILITY
+6. DISCLAIMER OF LIABILITY
 
 EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY
 CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL,
@@ -161,9 +161,9 @@ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION
 LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
 STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
 WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS
-GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. 7.
+GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
 
-GENERAL
+7. GENERAL
 
 If any provision of this Agreement is invalid or unenforceable under applicable
 law, it shall not affect the validity or enforceability of the remainder of
diff --git a/options/license/CPOL-1.02 b/options/license/CPOL-1.02
index 1dd2554ace..371f466e57 100644
--- a/options/license/CPOL-1.02
+++ b/options/license/CPOL-1.02
@@ -7,16 +7,11 @@ developers to use the Source Code and Executable Files provided as part of
 the Work in any application in any form.
 
 The main points subject to the terms of the License are:
-
-   - Source Code and Executable Files can be used in commercial applications;
-
-   - Source Code and Executable Files can be redistributed; and
-
-   - Source Code can be modified to create derivative works.
-
+- Source Code and Executable Files can be used in commercial applications;
+- Source Code and Executable Files can be redistributed; and
+- Source Code can be modified to create derivative works.
 - No claim of suitability, guarantee, or any warranty whatsoever is provided.
 The software is provided "as-is".
-
 - The Article accompanying the Work may not be distributed or republished
 without the Author's consent
 
@@ -38,7 +33,7 @@ CONTAINED HEREIN IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITION
 IF YOU DO NOT AGREE TO ACCEPT AND BE BOUND BY THE TERMS OF THIS LICENSE, YOU
 CANNOT MAKE ANY USE OF THE WORK.
 
-   1. Definitions.
+1. Definitions.
 
 a. "Articles" means, collectively, all articles written by Author which describes
 how the Source Code and Executable Files for the Work may be used by a user.
@@ -168,7 +163,7 @@ THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES
 ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK OR OTHERWISE, EVEN IF THE
 AUTHOR OR THE PUBLISHER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
 
-   9. Termination.
+9. Termination.
 
 a. This License and the rights granted hereunder will terminate automatically
 upon any breach by You of any term of this License. Individuals or entities
@@ -199,7 +194,7 @@ any general, special, incidental or consequential damages arising in connection
 to this license. The Publisher reserves the right to cease making the Work
 available to You at any time without notice
 
-   11. Miscellaneous
+11. Miscellaneous
 
 a. This License shall be governed by the laws of the location of the head
 office of the Author or if the Author is an individual, the laws of location
diff --git a/options/license/CUA-OPL-1.0 b/options/license/CUA-OPL-1.0
index 3c46119b11..8026e578ee 100644
--- a/options/license/CUA-OPL-1.0
+++ b/options/license/CUA-OPL-1.0
@@ -1,6 +1,6 @@
 CUA Office Public License Version 1.0
 
-   1. Definitions.
+1. Definitions.
 
 1.0.1. "Commercial Use" means distribution or otherwise making the Covered
 Code available to a third party.
@@ -18,7 +18,7 @@ of the Original Code and Modifications, in each case including portions thereof.
 1.4. "Electronic Distribution Mechanism" means a mechanism generally accepted
 in the software development community for the electronic transfer of data.
 
-      1.5. "Executable" means Covered Code in any form other than Source Code.
+1.5. "Executable" means Covered Code in any form other than Source Code.
 
 1.6. "Initial Developer" means the individual or entity identified as the
 Initial Developer in the Source Code notice required by Exhibit A.
@@ -26,7 +26,7 @@ Initial Developer in the Source Code notice required by Exhibit A.
 1.7. "Larger Work" means a work which combines Covered Code or portions thereof
 with code not governed by the terms of this License.
 
-      1.8. "License" means this document.
+1.8. "License" means this document.
 
 1.8.1. "Licensable" means having the right to grant, to the maximum extent
 possible, whether at the time of the initial grant or subsequently acquired,
@@ -68,7 +68,7 @@ or indirect, to cause the direction or management of such entity, whether
 by contract or otherwise, or (b) ownership of more than fifty percent (50%)
 of the outstanding shares or beneficial ownership of such entity.
 
-   2. Source Code License.
+2. Source Code License.
 
 2.1. The Initial Developer Grant. The Initial Developer hereby grants You
 a world-wide, royalty-free, non-exclusive license, subject to third party
@@ -120,7 +120,7 @@ Modifications made by that Contributor with other software (except as part
 of the Contributor Version) or other devices; or 4) under Patent Claims infringed
 by Covered Code in the absence of Modifications made by that Contributor.
 
-   3. Distribution Obligations.
+3. Distribution Obligations.
 
 3.1. Application of License. The Modifications which You create or to which
 You contribute are governed by the terms of this License, including without
@@ -153,7 +153,7 @@ Developer in (a) the Source Code, and (b) in any notice in an Executable version
 or related documentation in which You describe the origin or ownership of
 the Covered Code.
 
-      3.4. Intellectual Property Matters
+3.4. Intellectual Property Matters
 
 (a) Third Party Claims. If Contributor has knowledge that a license under
 a third party's intellectual property rights is required to exercise the rights
@@ -219,8 +219,7 @@ with other code not governed by the terms of this License and distribute the
 Larger Work as a single product. In such a case, You must make sure the requirements
 of this License are fulfilled for the Covered Code.
 
-   4. Inability to Comply Due to Statute or Regulation.
-
+4. Inability to Comply Due to Statute or Regulation.
 If it is impossible for You to comply with any of the terms of this License
 with respect to some or all of the Covered Code due to statute, judicial order,
 or regulation then You must: (a) comply with the terms of this License to
@@ -231,12 +230,11 @@ Except to the extent prohibited by statute or regulation, such description
 must be sufficiently detailed for a recipient of ordinary skill to be able
 to understand it.
 
-   5. Application of this License.
-
+5. Application of this License.
 This License applies to code to which the Initial Developer has attached the
 notice in Exhibit A and to related Covered Code.
 
-   6. Versions of the License.
+6. Versions of the License.
 
 6.1. New Versions. CUA Office Project may publish revised and/or new versions
 of the License from time to time. Each version will be given a distinguishing
@@ -260,8 +258,7 @@ the name of the Initial Developer, Original Code or Contributor in the notice
 described in Exhibit A shall not of themselves be deemed to be modifications
 of this License.)
 
-   7. DISCLAIMER OF WARRANTY.
-
+7. DISCLAIMER OF WARRANTY.
 COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTY
 OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES
 THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR
@@ -272,7 +269,7 @@ THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER
 OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED
 CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
 
-   8. TERMINATION.
+8. TERMINATION.
 
 8.1. This License and the rights granted hereunder will terminate automatically
 if You fail to comply with terms herein and fail to cure such breach within
@@ -318,8 +315,7 @@ user license agreements (excluding distributors and resellers) which have
 been validly granted by You or any distributor hereunder prior to termination
 shall survive termination.
 
-   9. LIMITATION OF LIABILITY.
-
+9. LIMITATION OF LIABILITY.
 UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING
 NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER, ANY
 OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE, OR ANY SUPPLIER OF
@@ -334,8 +330,7 @@ SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL
 OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO
 YOU.
 
-   10. U.S. GOVERNMENT END USERS.
-
+10. U.S. GOVERNMENT END USERS.
 The Covered Code is a "commercial item," as that term is defined in 48 C.F.R.
 2.101 (Oct. 1995), consisting of "commercial computer software" and "commercial
 computer software documentation," as such terms are used in 48 C.F.R. 12.212
@@ -343,8 +338,7 @@ computer software documentation," as such terms are used in 48 C.F.R. 12.212
 227.7202-4 (June 1995), all U.S. Government End Users acquire Covered Code
 with only those rights set forth herein.
 
-   11. MISCELLANEOUS.
-
+11. MISCELLANEOUS.
 This License represents the complete agreement concerning 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. This
@@ -361,8 +355,7 @@ on Contracts for the International Sale of Goods is expressly excluded. Any
 law or regulation which provides that the language of a contract shall be
 construed against the drafter shall not apply to this License.
 
-   12. RESPONSIBILITY FOR CLAIMS.
-
+12. RESPONSIBILITY FOR CLAIMS.
 As between Initial Developer and the Contributors, each party is responsible
 for claims and damages arising, directly or indirectly, out of its utilization
 of rights under this License and You agree to work with Initial Developer
@@ -370,13 +363,14 @@ and Contributors to distribute such responsibility on an equitable basis.
 Nothing herein is intended or shall be deemed to constitute any admission
 of liability.
 
-   13. MULTIPLE-LICENSED CODE.
-
+13. MULTIPLE-LICENSED CODE.
 Initial Developer may designate portions of the Covered Code as "Multiple-Licensed".
 "Multiple-Licensed" means that the Initial Developer permits you to utilize
 portions of the Covered Code under Your choice of the NPL or the alternative
 licenses, if any, specified by the Initial Developer in the file described
-in Exhibit A. EXHIBIT A - CUA Office Public License.
+in Exhibit A.
+
+EXHIBIT A - CUA Office Public License.
 
 "The contents of this file are subject to the CUA Office Public License Version
 1.0 (the "License"); you may not use this file except in compliance with the
@@ -386,16 +380,16 @@ Software distributed under the License is distributed on an "AS IS" basis,
 WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
 the specific language governing rights and limitations under the License.
 
-The Original Code is ______________________________________ .
+The Original Code is ______________________________________.
 
-The Initial Developer of the Original Code is ________________________ . Portions
-created by ______________________ are Copyright (C) ______ _______________________
-. All Rights Reserved.
+The Initial Developer of the Original Code is ________________________. Portions
+created by ______________________ are Copyright (C) ______ _______________________.
+All Rights Reserved.
 
-Contributor(s): ______________________________________ .
+Contributor(s): ______________________________________.
 
 Alternatively, the contents of this file may be used under the terms of the
-_____ license (the " [___] License"), in which case the provisions of [______]
+_____ license (the "[___] License"), in which case the provisions of [______]
 License are applicable instead of those above. If you wish to allow use of
 your version of this file only under the terms of the [____] License and not
 to allow others to use your version of this file under the CUAPL, indicate
diff --git a/options/license/Caldera b/options/license/Caldera
index 6ef053c6cc..747d393503 100644
--- a/options/license/Caldera
+++ b/options/license/Caldera
@@ -6,12 +6,12 @@ UNIX Operating Systems that operate on the 16-Bit PDP-11 CPU and early versions
 of the 32-Bit UNIX Operating System, with specific exclusion of UNIX System
 III and UNIX System V and successor operating systems:
 
-32-bit 32V UNIX
-
-16 bit UNIX Versions 1, 2, 3, 4, 5, 6, 7
+     32-bit 32V UNIX
+     16 bit UNIX Versions 1, 2, 3, 4, 5, 6, 7
 
 Caldera International, Inc. makes no guarantees or commitments that any source
-code is available from Caldera International, Inc.
+code is available from Caldera
+International, Inc.
 
 The following copyright notice applies to the source code files for which
 this license is granted.
@@ -30,9 +30,6 @@ and/or other materials provided with the distribution.
 
 All advertising materials mentioning features or use of this software must
 display the following acknowledgement:
-
-   
-
 This product includes software developed or owned by Caldera International,
 Inc.
 
@@ -43,11 +40,11 @@ specific prior written permission.
 USE OF THE SOFTWARE PROVIDED FOR UNDER THIS LICENSE BY CALDERA INTERNATIONAL,
 INC. AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
 BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL CALDERA INTERNATIONAL,
-INC. BE LIABLE FOR ANY DIRECT, INDIRECT INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
+FOR A PARTICULAR
+PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL CALDERA INTERNATIONAL, INC. BE LIABLE
+FOR ANY DIRECT, INDIRECT INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/options/license/ClArtistic b/options/license/ClArtistic
index 925403f10c..f2077e8695 100644
--- a/options/license/ClArtistic
+++ b/options/license/ClArtistic
@@ -20,7 +20,7 @@ specified below.
 "Copyright Holder" is whoever is named in the copyright or copyrights for
 the package.
 
-"You" is you, if you're thinking about copying or distributing this Package.
+ "You" is you, if you're thinking about copying or distributing this Package.
 
 "Distribution fee" is a fee you charge for providing a copy of this Package
 to another party.
@@ -49,14 +49,14 @@ medium, or placing the modifications on a major network archive site allowing
 unrestricted access to them, or by allowing the Copyright Holder to include
 your modifications in the Standard Version of the Package.
 
-      b) use the modified Package only within your corporation or organization.
+     b) use the modified Package only within your corporation or organization.
 
 c) rename any non-standard executables so the names do not conflict with standard
 executables, which must also be provided, and provide a separate manual page
 for each non-standard executable that clearly documents how it differs from
 the Standard Version.
 
-      d) make other distribution arrangements with the Copyright Holder.
+     d) make other distribution arrangements with the Copyright Holder.
 
 e) permit and encourge anyone who receives a copy of the modified Package
 permission to make your modifications Freely Available in some specific way.
@@ -75,7 +75,7 @@ c) give non-standard executables non-standard names, and clearly document
 the differences in manual pages (or equivalent), together with instructions
 on where to get the Standard Version.
 
-      d) make other distribution arrangements with the Copyright Holder.
+     d) make other distribution arrangements with the Copyright Holder.
 
 e) offer the machine-readable source of the Package, with your modifications,
 by mail order.
@@ -120,4 +120,6 @@ products derived from this software without specific prior written permission.
 
 10. THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES,
 INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
-FITNESS FOR A PARTICULAR PURPOSE. The End
+FITNESS FOR A PARTICULAR PURPOSE.
+
+The End
diff --git a/options/license/Condor-1.1 b/options/license/Condor-1.1
index e857135f63..26528bd810 100644
--- a/options/license/Condor-1.1
+++ b/options/license/Condor-1.1
@@ -1,10 +1,11 @@
 Condor Public License
 
-Version 1.1, October 30, 2003 Copyright © 1990-2006 Condor Team, Computer
-Sciences Department, University of Wisconsin-Madison, Madison, WI. All Rights
-Reserved. For more information contact: Condor Team, Attention: Professor
-Miron Livny, Dept of Computer Sciences, 1210 W. Dayton St., Madison, WI 53706-1685,
-(608) 262-0856 or miron@cs.wisc.edu.
+Version 1.1, October 30, 2003
+
+Copyright © 1990-2006 Condor Team, Computer Sciences Department, University
+of Wisconsin-Madison, Madison, WI. All Rights Reserved. For more information
+contact: Condor Team, Attention: Professor Miron Livny, Dept of Computer Sciences,
+1210 W. Dayton St., Madison, WI 53706-1685, (608) 262-0856 or miron@cs.wisc.edu.
 
 This software referred to as the Condor® Version 6.x software ("Software")
 was developed by the Condor Project, Condor Team, Computer Sciences Department,
@@ -18,31 +19,26 @@ of this Software, with or without modification, in source and binary forms,
 are permitted. Any exercise of rights under this license including sublicenses
 by you is subject to the following conditions:
 
-1. Redistributions of this Software, with or without modification, must reproduce
+1.	Redistributions of this Software, with or without modification, must reproduce
 this Condor Public License in: (1) the Software, and (2) any user documentation
 or other similar material which is provided with the Software.
 
-   
-
-2. Any user documentation included with a redistribution must include the
+2.	Any user documentation included with a redistribution must include the
 following notice:
-
-"This product includes software from the Condor® Project (http://www.condorproject.org/)"
-
+``This product includes software from the Condor® Project (http://www.condorproject.org/)"
 Alternatively, if that is where third-party acknowledgments normally appear,
 this acknowledgment must be reproduced in the Software itself.
-
-3. Any academic report, publication, or other academic disclosure of results
+3.	Any academic report, publication, or other academic disclosure of results
 obtained with this Software will acknowledge this Software's use by an appropriate
 citation.
 
-4. The name Condor® is a registered trademark of the University of Wisconsin-Madison.
+4.	The name Condor® is a registered trademark of the University of Wisconsin-Madison.
 The trademark may not be used to endorse or promote software, or products
 derived therefrom, and, other than as required by section 2 and 3 above, it
 may not be affixed to modified redistributions of this Software without the
 prior written approval, obtainable via email to condor-admin@cs.wisc.edu.
 
-5. To the extent that patent claims licensable by the University of Wisconsin-Madison
+5.	To the extent that patent claims licensable by the University of Wisconsin-Madison
 are necessarily infringed by the use or sale of the Software, you are granted
 a non-exclusive, worldwide, royalty- free perpetual license under such patent
 claims, with the rights for you to make, use, sell, offer to sell, import
@@ -61,8 +57,7 @@ to the Software which have been properly granted prior to termination shall
 survive any termination of said patent license, if not otherwise terminated
 pursuant to this section.
 
-   6. DISCLAIMER
-
+6.	DISCLAIMER
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS AND THE
 UNIVERSITY "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, OF SATISFACTORY QUALITY,
@@ -71,9 +66,7 @@ HOLDERS AND CONTRIBUTORS AND THE UNIVERSITY MAKE NO REPRESENTATION THAT THE
 SOFTWARE, MODIFICATIONS, ENHANCEMENTS OR DERIVATIVE WORKS THEREOF, WILL NOT
 INFRINGE ANY PATENT, COPYRIGHT, TRADEMARK, TRADE SECRET OR OTHER PROPRIETARY
 RIGHT.
-
-   7. LIMITATION OF LIABILITY
-
+7.	LIMITATION OF LIABILITY
 THE COPYRIGHT HOLDERS AND CONTRIBUTORS AND ANY OTHER OFFICER, AGENT, OR EMPLOYEE
 OF THE UNIVERSITY SHALL HAVE NO LIABILITY TO LICENSEE OR OTHER PERSONS FOR
 DIRECT, INDIRECT, SPECIAL, INCIDENTAL, CONSEQUENTIAL, EXEMPLARY, OR PUNITIVE
@@ -82,8 +75,7 @@ GOODS OR SERVICES, LOSS OF USE, DATA OR PROFITS, OR BUSINESS INTERRUPTION,
 HOWEVER CAUSED AND ON ANY THEORY OF CONTRACT, WARRANTY, TORT (INCLUDING NEGLIGENCE),
 PRODUCT LIABILITY OR OTHERWISE, ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-8. Certain uses and transfers of the Software or documentation, and/or items
+8.	Certain uses and transfers of the Software or documentation, and/or items
 or software incorporating the Condor Software or documentation, may require
 a license under U.S. Export Control laws. Licensee represents and warrants
 that all uses and transfers of the Condor Software or documentation and/or
@@ -92,25 +84,21 @@ Export Control laws, and Licensee further understands that failure to comply
 with such export control laws may result in criminal liability to Licensee
 under U.S. laws.
 
-9. The Condor Team may publish revised and/or new versions of this Condor
+9.	The Condor Team may publish revised and/or new versions of this Condor
 Public License (``this License") from time to time. Each version will be given
 a distinguishing version number. Once Software has been published under a
 particular version of this License, you may always continue to use it under
 the terms of that version. You may also choose to use such Software under
 the terms of any subsequent version of this License published by the Condor
 Team. No one other than the Condor Team has the right to modify the terms
-of this License. For more information:
+of this License.
+
+For more information:
 
 Condor Team
-
 Attention: Professor Miron Livny
-
 7367 Computer Sciences
-
 1210 W. Dayton St.
-
 Madison, WI 53706-1685
-
 miron@cs.wisc.edu
-
 http://pages.cs.wisc.edu/~miron/miron.html
diff --git a/options/license/Crossword b/options/license/Crossword
index 45850f4a5c..66216fc58d 100644
--- a/options/license/Crossword
+++ b/options/license/Crossword
@@ -1,11 +1,9 @@
 Copyright (C) 1995-2009 Gerd Neugebauer
 
 cwpuzzle.dtx is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY. No author or distributor accepts responsibility to anyone for
+ANY WARRANTY. No author or distributor  accepts responsibility to anyone for
 the consequences of using it or for whether it serves any particular purpose
 or works at all, unless he says so in writing.
-
 .
-
 Everyone is granted permission to copy, modify and redistribute cwpuzzle.dtx,
 provided this copyright notice is preserved and any modifications are indicated.
diff --git a/options/license/Cube b/options/license/Cube
index 707afcc04c..273e27fd61 100644
--- a/options/license/Cube
+++ b/options/license/Cube
@@ -1,5 +1,6 @@
-Cube game engine source code, 20 dec 2003 release. Copyright (C) 2001-2003
-Wouter van Oortmerssen.
+Cube game engine source code, 20 dec 2003 release.
+
+Copyright (C) 2001-2003 Wouter van Oortmerssen.
 
 This software is provided 'as-is', without any express or implied warranty.
 In no event will the authors be held liable for any damages arising from the
@@ -17,7 +18,7 @@ not required.
 2. Altered source versions must be plainly marked as such, and must not be
 misrepresented as being the original software.
 
-   3. This notice may not be removed or altered from any source distribution.
+     3. This notice may not be removed or altered from any source distribution.
 
 additional clause specific to Cube:
 
diff --git a/options/license/D-FSL-1.0 b/options/license/D-FSL-1.0
index eb0337e901..2ab11404ed 100644
--- a/options/license/D-FSL-1.0
+++ b/options/license/D-FSL-1.0
@@ -1,8 +1,9 @@
 Deutsche Freie Software Lizenz
 
-(c) Ministerium für Wissenschaft und Forschung Nordrhein-Westfalen 2004 Erstellt
-von Axel Metzger und Till Jaeger, Institut für Rechtsfragen der Freien und
-Open Source Software - ( http://www.ifross.de ) .
+(c) Ministerium für Wissenschaft und Forschung Nordrhein-Westfalen 2004
+
+Erstellt von Axel Metzger und Till Jaeger, Institut für Rechtsfragen der Freien
+und Open Source Software - (http://www.ifross.de).
 
 Präambel
 
@@ -32,77 +33,49 @@ Die Deutsche Freie Software Lizenz nimmt auf die besonderen Anforderungen
 des deutschen und europäischen Rechts Rücksicht. Sie ist zweisprachig gestaltet
 und damit auch auf den internationalen Vertrieb ausgerichtet.
 
-   
-
-   § 0 Definitionen
-
-      
+§ 0 Definitionen
 
 Dokumentation: Die Beschreibung des Aufbaus und/oder der Struktur der Programmierung
 und/oder der Funktionalitäten des Programms, unabhängig davon, ob sie im Source
 Code oder gesondert vorgenommen wird.
 
-      
-
 Lizenz: Die zwischen dem Lizenzgeber und Ihnen geschlossene Vereinbarung mit
 dem Inhalt der "Deutschen Freien Software Lizenz" bzw. das Angebot hierzu.
 
-      
-
 Lizenznehmer: Jede natürliche oder juristische Person, die die Lizenz angenommen
 hat.
 
-      
-
 Programm: Jedes Computerprogramm, das von den Rechtsinhabern nach den Bestimmungen
 dieser Lizenz verbreitet oder öffentlich zugänglich gemacht worden ist.
 
-      
-
-      Object Code: Die maschinenlesbare, übersetzte Form des Programms.
-
-      
+Object Code: Die maschinenlesbare, übersetzte Form des Programms.
 
 Öffentlich: Nicht nur an einen bestimmten Personenkreis gerichtet, der persönlich
 oder durch die Zugehörigkeit zu einer juristischen Person oder einem öffentlichen
 Träger miteinander verbunden ist.
 
-      
-
 Öffentlich zugänglich machen: Die öffentliche Weitergabe des Programms in
 unkörperlicher Form, insbesondere das Bereithalten zum Download in Datennetzen.
 
-      
-
 Rechtsinhaber: Der bzw. die Urheber oder sonstigen Inhaber der ausschließlichen
 Nutzungsrechte an dem Programm.
 
-      
-
 Source Code: Die für Menschen lesbare, in Programmiersprache dargestellte
 Form des Programms.
 
-      
-
 Verändern: Jede Erweiterung, Kürzung und Bearbeitung des Programms, insbesondere
 Weiterentwicklungen.
 
-      
-
 Verbreiten: Die öffentliche Weitergabe körperlicher Vervielfältigungsstücke,
 insbesondere auf Datenträgern oder in Verbindung mit Hardware.
 
-      
-
 Vollständiger Source Code: Der Source Code in der für die Erstellung bzw.
 die Bearbeitung benutzten Form zusammen mit den zur Übersetzung und Installation
 erforderlichen Konfigurationsdateien und Software-Werkzeugen, sofern diese
 in der benötigten Form nicht allgemein gebräuchlich (z.B. Standard-Kompiler)
 oder für jedermann lizenzgebührenfrei im Internet abrufbar sind.
 
-   
-
-   § 1 Rechte
+§ 1 Rechte
 
 (1) Sie dürfen das Programm in unveränderter Form vervielfältigen, verbreiten
 und öffentlich zugänglich machen.
@@ -111,38 +84,28 @@ und öffentlich zugänglich machen.
 vervielfältigen, verbreiten und öffentlich zugänglich machen. Gestattet ist
 auch die Kombination des Programms oder Teilen hiervon mit anderen Programmen.
 
-      (3) Sie erhalten die Rechte unentgeltlich.
+(3) Sie erhalten die Rechte unentgeltlich.
 
-   
-
-   § 2 Pflichten beim Vertrieb
+§ 2 Pflichten beim Vertrieb
 
 (1) Wenn Sie das Programm verbreiten oder öffentlich zugänglich machen, sei
 es in unveränderter oder veränderter Form, sei es in einer Kombination mit
 anderen Programmen oder in Verbindung mit Hardware, dann müssen sie mitliefern:
-
 1. alle Vermerke im Source Code und/oder Object Code, die auf diese Lizenz
 hinweisen;
-
 2. alle Vermerke im Source Code und/oder Object Code, die über die Urheber
 des Programms Auskunft geben;
-
 3. einen für den Empfänger deutlich wahrnehmbaren Hinweis auf diese Lizenz
-und die Internetadresse < http://www.d-fsl.de > ;
-
-      4. den vollständigen Text dieser Lizenz in deutlich wahrnehmbarer Weise.
+und die Internetadresse http://www.d-fsl.de;
+4. den vollständigen Text dieser Lizenz in deutlich wahrnehmbarer Weise.
 
 (2) Wenn bei der Installation des Programms und/oder beim Programmstart Lizenz-
 und/oder Vertragsbedingungen angezeigt werden, dann müssen
-
-      1. diese Lizenz,
-
-      2. ein Hinweis auf diese Lizenz und
-
+1. diese Lizenz,
+2. ein Hinweis auf diese Lizenz und
 3. ein Hinweis auf den oder die Rechtsinhaber an den ersten unter dieser Lizenz
 nutzbaren Programmbestandteilen
-
-      ebenfalls angezeigt werden.
+ebenfalls angezeigt werden.
 
 (3) Sie dürfen die Nutzung des Programms nicht von Pflichten oder Bedingungen
 abhängig machen, die nicht in dieser Lizenz vorgesehen sind.
@@ -152,9 +115,7 @@ Dokumentation entsprechend mitgeliefert werden, es sei denn, die freie Mitliefer
 der Dokumentation ist Ihnen aufgrund der Lizenz für die Dokumentation nicht
 gestattet.
 
-   
-
-   § 3 Weitere Pflichten beim Vertrieb veränderter Versionen
+§ 3 Weitere Pflichten beim Vertrieb veränderter Versionen
 
 (1) Veränderte Versionen des Programms dürfen Sie nur unter den Bedingungen
 dieser Lizenz verbreiten oder öffentlich zugänglich machen, so dass Dritte
@@ -165,13 +126,11 @@ gilt auch die Kombination insgesamt als eine veränderte Version des Programms,
 es sei denn, das andere Programm ist formal und inhaltlich eigenständig. Ein
 anderes Programm ist dann als eigenständig anzusehen, wenn es die folgenden
 Voraussetzungen alle erfüllt:
-
 1. Der Source Code der kombinierten Programme muss jeweils in eigenen Dateien
 vorhanden sein, die keine Bestandteile des anderen Teils enthalten, die über
 die zur Programmkombination üblichen und erforderlichen Informationen über
 den anderen Teil hinausgehen, wobei der Source Code des anderen Programms
 nicht mitgeliefert werden muss.
-
 2. Der mit dem Programm kombinierte Teil muss auch dann sinnvoll nutzbar sein,
 wenn er nicht mit dem Programm kombiniert wird, und zwar entweder alleine
 oder mit sonstigen Programmen. Was als "sinnvoll nutzbar" anzusehen ist, richtet
@@ -211,17 +170,13 @@ lizenzieren Sie dieses Schutzrecht für veränderte und unveränderte Versionen
 des Programms in dem Umfang, der erforderlich ist, um die Rechte aus dieser
 Lizenz wahrnehmen zu können.
 
-   
-
-   § 4 Weitere Pflichten beim Vertrieb im Object Code
+§ 4 Weitere Pflichten beim Vertrieb im Object Code
 
 (1) Wenn Sie das Programm nur im Object Code verbreiten, dann müssen Sie zusätzlich
 zu den in § 2 und § 3 geregelten Pflichten entweder
-
 1. den vollständigen Source Code im Internet öffentlich zugänglich machen
 und bei der Verbreitung des Object Codes deutlich auf die vollständige Internetadresse
 hinweisen, unter der der Source Code abgerufen werden kann oder
-
 2. den vollständigen Source Code auf einem hierfür üblichen Datenträger unter
 Beachtung der §§ 2 und 3 mitverbreiten.
 
@@ -235,9 +190,7 @@ Dokumentation entsprechend der Absätze 1 und 2 mitgeliefert werden, es sei
 denn, die freie Mitlieferung der Dokumentation ist Ihnen aufgrund der Lizenz
 für die Dokumentation nicht gestattet.
 
-   
-
-   § 5 Vertragsschluss
+§ 5 Vertragsschluss
 
 (1) Mit dieser Lizenz wird Ihnen und jeder anderen Person ein Angebot auf
 Abschluss eines Vertrages über die Nutzung des Programms unter den Bedingungen
@@ -247,14 +200,10 @@ der Deutschen Freien Softwarelizenz unterbreitet.
 bestimmungsgemäß benutzen, ohne dass es der Annahme dieser Lizenz bedarf.
 Dieses Recht umfasst in der Europäischen Union und in den meisten anderen
 Rechtsordnungen insbesondere die folgenden Befugnisse:
-
 1. das Programm ablaufen zu lassen sowie die Erstellung von hierfür erforderlichen
 Vervielfältigungen im Haupt- und Arbeitsspeicher;
-
-         2. das Erstellen einer Sicherungskopie;
-
-         3. die Fehlerberichtigung;
-
+2. das Erstellen einer Sicherungskopie;
+3. die Fehlerberichtigung;
 4. die Weitergabe einer rechtmäßig erworbenen körperlichen Kopie des Programms.
 
 (3) Sie erklären Ihre Zustimmung zum Abschluss dieser Lizenz, indem Sie das
@@ -268,9 +217,7 @@ Zugangs der Annahmeerklärung bei den Rechtsinhabern bedarf.
 direkt von den Rechtsinhabern. Eine Unterlizenzierung oder Übertragung der
 Rechte ist nicht gestattet.
 
-   
-
-   § 6 Beendigung der Rechte bei Zuwiderhandlung
+§ 6 Beendigung der Rechte bei Zuwiderhandlung
 
 (1) Jede Verletzung Ihrer Verpflichtungen aus dieser Lizenz führt zu einer
 automatischen Beendigung Ihrer Rechte aus dieser Lizenz.
@@ -278,9 +225,7 @@ automatischen Beendigung Ihrer Rechte aus dieser Lizenz.
 (2) Die Rechte Dritter, die das Programm oder Rechte an dem Programm von Ihnen
 erhalten haben, bleiben hiervon unberührt.
 
-   
-
-   § 7 Haftung und Gewährleistung
+§ 7 Haftung und Gewährleistung
 
 (1) Für entgegenstehende Rechte Dritter haften die Rechtsinhaber nur, sofern
 sie Kenntnis von diesen Rechten hatten, ohne Sie zu informieren.
@@ -290,9 +235,7 @@ nach den außerhalb dieser Lizenz getroffenen Vereinbarungen zwischen Ihnen
 und den Rechtsinhabern oder, wenn eine solche Vereinbarung nicht existiert,
 nach den gesetzlichen Regelungen.
 
-   
-
-   § 8 Verträge mit Dritten
+§ 8 Verträge mit Dritten
 
 (1) Diese Lizenz regelt nur die Beziehung zwischen Ihnen und den Rechtsinhabern.
 Sie ist nicht Bestandteil der Verträge zwischen Ihnen und Dritten.
@@ -313,9 +256,7 @@ jeglicher Art, verhindern oder erschweren. Eine passwortgeschützte Zugangsbesch
 oder die Nutzung in einem Intranet wird nicht als technische Schutzmaßnahme
 angesehen.
 
-   
-
-   § 9 Text der Lizenz
+§ 9 Text der Lizenz
 
 (1) Diese Lizenz ist in deutscher und englischer Sprache abgefasst. Beide
 Fassungen sind gleich verbindlich. Es wird unterstellt, dass die in der Lizenz
@@ -335,20 +276,18 @@ Lizenz werden durch die vorstehenden Bestimmungen nicht beschränkt.
 (3) Sie dürfen diese Lizenz in unveränderter Form vervielfältigen, verbreiten
 und öffentlich zugänglich machen.
 
-   
+§ 10 Anwendbares Recht
 
-   § 10 Anwendbares Recht
+Auf diese Lizenz findet deutsches Recht Anwendung.
 
-   Auf diese Lizenz findet deutsches Recht Anwendung.
 
 Anhang: Wie unterstellen Sie ein Programm der Deutschen Freien Software Lizenz?
-
 Um jedermann den Abschluss dieser Lizenz zu ermöglichen, wird empfohlen, das
 Programm mit folgendem Hinweis auf die Lizenz zu versehen:
 
-   "Copyright (C) 20[jj] [Name des Rechtsinhabers].
+"Copyright (C) 20[jj] [Name des Rechtsinhabers].
 
 Dieses Programm kann durch jedermann gemäß den Bestimmungen der Deutschen
 Freien Software Lizenz genutzt werden.
 
-   Die Lizenz kann unter http://www.d-fsl.de abgerufen werden."
+Die Lizenz kann unter http://www.d-fsl.de abgerufen werden."
diff --git a/options/license/DSDP b/options/license/DSDP
index e790666828..56b859e4e9 100644
--- a/options/license/DSDP
+++ b/options/license/DSDP
@@ -1,4 +1,6 @@
-COPYRIGHT NOTIFICATION (C) COPYRIGHT 2004 UNIVERSITY OF CHICAGO
+COPYRIGHT NOTIFICATION
+
+(C) COPYRIGHT 2004 UNIVERSITY OF CHICAGO
 
 This program discloses material protectable under copyright laws of the United
 States. Permission to copy and modify this software and its documentation
@@ -10,7 +12,7 @@ granted to use, reproduce, prepare derivative works, and to redistribute to
 others, so long as this original copyright notice is retained. Any publication
 resulting from research that made use of this software should cite this document.
 
-This software was authored by:
+     This software was authored by:
 
 Steven J. Benson Mathematics and Computer Science Division Argonne National
 Laboratory Argonne IL 60439
@@ -26,7 +28,6 @@ Idaho, is owned by The United States Government, and operated by the University
 of Chicago under provision of a contract with the Department of Energy.
 
 DISCLAIMER
-
 THIS PROGRAM WAS PREPARED AS AN ACCOUNT OF WORK SPONSORED BY AN AGENCY OF
 THE UNITED STATES GOVERNMENT. NEITHER THE UNITED STATES GOVERNMENT NOR ANY
 AGENCY THEREOF, NOR THE UNIVERSITY OF CHICAGO, NOR ANY OF THEIR EMPLOYEES
diff --git a/options/license/DigiRule-FOSS-exception b/options/license/DigiRule-FOSS-exception
index 892c237155..2fa106b38e 100644
--- a/options/license/DigiRule-FOSS-exception
+++ b/options/license/DigiRule-FOSS-exception
@@ -1,79 +1,54 @@
-DigiRule Solutions's FOSS License Exception Terms and Conditions
+DigiRule Solutions’s FOSS License Exception Terms and Conditions
 
-   1. Definitions.
+1. Definitions.
 
-   "Derivative Work" means a derivative work, as defined under applicable copyright law, formed entirely from the Program and one or more FOSS Applications.
+“Derivative Work” means a derivative work, as defined under applicable copyright law, formed entirely from the Program and one or more FOSS Applications.
 
-   "FOSS Application" means a free and open source software application distributed subject to a license listed in the section below titled "FOSS License List."
+“FOSS Application” means a free and open source software application distributed subject to a license listed in the section below titled “FOSS License List.”
 
-   "FOSS Notice" means a notice placed by DigiRule Solutions in a copy of the Client Libraries stating that such copy of the Client Libraries may be distributed under DigiRule Solutions's or FOSS License Exception.
+“FOSS Notice” means a notice placed by DigiRule Solutions in a copy of the Client Libraries stating that such copy of the Client Libraries may be distributed under DigiRule Solutions's or FOSS License Exception.
 
-   "Independent Work" means portions of the Derivative Work that are not derived from the Program and can reasonably be considered independent and separate works.
+“Independent Work” means portions of the Derivative Work that are not derived from the Program and can reasonably be considered independent and separate works.
 
-   "Program" means a copy of DigiRule Solutions's Client Libraries that contain a FOSS Notice.
+“Program” means a copy of DigiRule Solutions’s Client Libraries that contain a FOSS Notice.
 
-   2. A FOSS application developer ("you" or "your") may distribute a Derivative Work provided that you and the Derivative Work meet all of the following conditions:
+2. A FOSS application developer (“you” or “your”) may distribute a Derivative Work provided that you and the Derivative Work meet all of the following conditions:
 
-      1. You obey the GPL in all respects for the Program and all portions (including modifications) of the Program included in the Derivative Work (provided that this condition does not apply to Independent Works);
+     1. You obey the GPL in all respects for the Program and all portions (including modifications) of the Program included in the Derivative Work (provided that this condition does not apply to Independent Works);
 
-      2. The Derivative Work does not include any work licensed under the GPL other than the Program;
+     2. The Derivative Work does not include any work licensed under the GPL other than the Program;
 
-      3. You distribute Independent Works subject to a license listed in the section below titled "FOSS License List";
+     3. You distribute Independent Works subject to a license listed in the section below titled “FOSS License List”;
 
-      4. You distribute Independent Works in object code or executable form with the complete corresponding machine-readable source code on the same medium and under the same FOSS license applying to the object code or executable forms;
+     4. You distribute Independent Works in object code or executable form with the complete corresponding machine-readable source code on the same medium and under the same FOSS license applying to the object code or executable forms;
 
-      5. All works that are aggregated with the Program or the Derivative Work on a medium or volume of storage are not derivative works of the Program, Derivative Work or FOSS Application, and must reasonably be considered independent and separate works.
+     5. All works that are aggregated with the Program or the Derivative Work on a medium or volume of storage are not derivative works of the Program, Derivative Work or FOSS Application, and must reasonably be considered independent and separate works.
 
-   3. DigiRule Solutions reserves all rights not expressly granted in these terms and conditions. If all of the above conditions are not met, then this FOSS License Exception does not apply to you or your Derivative Work.
+3. DigiRule Solutions reserves all rights not expressly granted in these terms and conditions. If all of the above conditions are not met, then this FOSS License Exception does not apply to you or your Derivative Work.
 
 FOSS License List
-
 License Name Version(s)/Copyright Date
-
 Release Early Certified Software
-
 Academic Free License 2.0
-
 Apache Software License 1.0/1.1/2.0
-
 Apple Public Source License 2.0
-
 Artistic license From Perl 5.8.0
-
-BSD license "July 22 1999"
-
+BSD license “July 22 1999”
 Common Development and Distribution License (CDDL) 1.0
-
 Common Public License 1.0
-
 Eclipse Public License 1.0
-
-GNU Library or "Lesser" General Public License (LGPL) 2.0/2.1/3.0
-
+GNU Library or “Lesser” General Public License (LGPL) 2.0/2.1/3.0
 Jabber Open Source License 1.0
-
 MIT License (As listed in file MIT-License.txt) -
-
 Mozilla Public License (MPL) 1.0/1.1
-
 Open Software License 2.0
-
-OpenSSL license (with original SSLeay license) "2003" ("1998")
-
+OpenSSL license (with original SSLeay license) “2003” (“1998”)
 PHP License 3.0/3.01
-
 Python license (CNRI Python License) -
-
 Python Software Foundation License 2.1.1
-
-Sleepycat License "1999"
-
+Sleepycat License “1999”
 University of Illinois/NCSA Open Source License -
-
-W3C License "2001"
-
-X11 License "2001"
-
+W3C License “2001”
+X11 License “2001”
 Zlib/libpng License -
-
 Zope Public License 2.0
diff --git a/options/license/ECL-1.0 b/options/license/ECL-1.0
index ed19a9bfb0..77194ef4f8 100644
--- a/options/license/ECL-1.0
+++ b/options/license/ECL-1.0
@@ -5,9 +5,9 @@ work of authorship (the "Original Work") whose owner (the "Licensor") has
 placed the following notice immediately following the copyright notice for
 the Original Work:
 
-Copyright (c) <year> <copyright holders>
+     Copyright (c) <year> <copyright holders>
 
-Licensed under the Educational Community License version 1.0
+     Licensed under the Educational Community License version 1.0
 
 This Original Work, including software, source code, documents, or other related
 items, is being provided by the copyright holder(s) subject to the terms of
diff --git a/options/license/ECL-2.0 b/options/license/ECL-2.0
index c001fdad32..af2bd35f90 100644
--- a/options/license/ECL-2.0
+++ b/options/license/ECL-2.0
@@ -1,6 +1,7 @@
 Educational Community License
+Version 2.0, April 2007
 
-Version 2.0, April 2007 http://www.osedu.org/licenses/
+http://www.osedu.org/licenses/
 
 The Educational Community License version 2.0 ("ECL") consists of the Apache
 2.0 license, modified to change the scope of the patent grant in section 3
@@ -9,20 +10,14 @@ The original Apache 2.0 license can be found at: http://www.apache.org/licenses/
 
 TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
-   1. Definitions.
-
-      
+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
@@ -30,32 +25,22 @@ 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
@@ -63,8 +48,6 @@ 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
@@ -78,13 +61,11 @@ for the purpose of discussing and improving the Work, but excluding communicatio
 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.
+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,
@@ -92,7 +73,7 @@ irrevocable copyright license to reproduce, prepare Derivative Works of, publicl
 display, publicly perform, sublicense, and distribute the Work and such Derivative
 Works in Source or Object form.
 
-   3. Grant of Patent License.
+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,
@@ -113,7 +94,7 @@ where the organization or institution has the right to grant such license
 under applicable grant and research funding agreements. No other express or
 implied licenses are granted.
 
-   4. Redistribution.
+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,
@@ -150,7 +131,7 @@ 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.
+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
@@ -159,14 +140,14 @@ 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.
+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.
+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,
@@ -176,7 +157,7 @@ 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.
+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
@@ -188,7 +169,7 @@ 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.
+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,
@@ -197,43 +178,30 @@ 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
+by reason of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
 
 APPENDIX: How to apply the Educational Community License to your work
 
 To apply the Educational Community 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
+  Copyright [yyyy] [name of copyright owner] Licensed under the
+  Educational Community 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
 
-Educational Community License, Version 2.0 (the "License"); you may
+  http://www.osedu.org/licenses/ECL-2.0
 
-not use this file except in compliance with the License. You may
-
-obtain a copy of the License at
-
-http://www.osedu.org/licenses/ECL-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.
+  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/options/license/EFL-1.0 b/options/license/EFL-1.0
index 60da9c02fd..2a3b04483d 100644
--- a/options/license/EFL-1.0
+++ b/options/license/EFL-1.0
@@ -3,7 +3,7 @@ Eiffel Forum License, version 1
 Permission is hereby granted to use, copy, modify and/or distribute this package,
 provided that:
 
-   - copyright notices are retained unchanged
+     - copyright notices are retained unchanged
 
 - any distribution of this package, whether modified or not, includes this
 file
diff --git a/options/license/EFL-2.0 b/options/license/EFL-2.0
index 71ba626222..7d0c5a5a4d 100644
--- a/options/license/EFL-2.0
+++ b/options/license/EFL-2.0
@@ -2,9 +2,7 @@ Eiffel Forum License, version 2
 
 1. Permission is hereby granted to use, copy, modify and/or distribute this
 package, provided that:
-
-      - copyright notices are retained unchanged,
-
+     - copyright notices are retained unchanged,
 - any distribution of this package, whether modified or not, includes this
 license text.
 
diff --git a/options/license/EPICS b/options/license/EPICS
index 4a12fba43c..a6ec51ede4 100644
--- a/options/license/EPICS
+++ b/options/license/EPICS
@@ -2,7 +2,9 @@ EPICS Open License Terms
 
 The following is the text of the EPICS Open software license agreement which
 now applies to EPICS Base and many of the unbundled EPICS extensions and support
-modules. Copyright © <YEAR> <HOLDERS>. All rights reserved.
+modules.
+
+Copyright © <YEAR> <HOLDERS>. All rights reserved.
 
 <PRODUCT> is distributed subject to the following license conditions:
 
@@ -23,7 +25,6 @@ your organization, if you meet the following conditions:
 
 a. Copies in source code must include the copyright notice and this Software
 License Agreement.
-
 b. Copies in binary form must include the copyright notice and this Software
 License Agreement in the documentation and/or other materials provided with
 the copy.
@@ -34,11 +35,9 @@ your organization, if you meet all of the following conditions:
 
 a. Copies in source code must include the copyright notice and this Software
 License Agreement;
-
 b. Copies in binary form must include the copyright notice and this Software
 License Agreement in the documentation and/or other materials provided with
 the copy;
-
 c. Modified copies and works based on the Software must carry prominent notices
 stating that you changed specified portions of the Software.
 
diff --git a/options/license/EPL-1.0 b/options/license/EPL-1.0
index 6a200a1a17..74898a4afb 100644
--- a/options/license/EPL-1.0
+++ b/options/license/EPL-1.0
@@ -4,18 +4,14 @@ THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
 LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM
 CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
 
-   1. DEFINITIONS
-
-   "Contribution" means:
+1. DEFINITIONS
 
+"Contribution" means:
 a) in the case of the initial Contributor, the initial code and documentation
 distributed under this Agreement, and
-
-      b) in the case of each subsequent Contributor:
-
-         i) changes to the Program, and
-
-         ii) additions to the Program;
+     b) in the case of each subsequent Contributor:
+          i) changes to the Program, and
+          ii) additions to the Program;
 
 where such changes and/or additions to the Program originate from and are
 distributed by that particular Contributor. A Contribution 'originates' from
@@ -24,8 +20,7 @@ anyone acting on such Contributor's behalf. Contributions do not include additio
 to the Program which: (i) are separate modules of software distributed in
 conjunction with the Program under their own license agreement, and (ii) are
 not derivative works of the Program.
-
-   "Contributor" means any person or entity that distributes the Program.
+"Contributor" means any person or entity that distributes the Program.
 
 "Licensed Patents" mean patent claims licensable by a Contributor which are
 necessarily infringed by the use or sale of its Contribution alone or when
@@ -36,7 +31,7 @@ combined with the Program.
 "Recipient" means anyone who receives the Program under this Agreement, including
 all Contributors.
 
-   2. GRANT OF RIGHTS
+2. GRANT OF RIGHTS
 
 a) Subject to the terms of this Agreement, each Contributor hereby grants
 Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce,
@@ -70,37 +65,31 @@ d) Each Contributor represents that to its knowledge it has sufficient copyright
 rights in its Contribution, if any, to grant the copyright license set forth
 in this Agreement.
 
-   3. REQUIREMENTS
-
+3. REQUIREMENTS
 A Contributor may choose to distribute the Program in object code form under
 its own license agreement, provided that:
 
-      a) it complies with the terms and conditions of this Agreement; and
-
-      b) its license agreement:
+     a) it complies with the terms and conditions of this Agreement; and
 
+     b) its license agreement:
 i) effectively disclaims on behalf of all Contributors all warranties and
 conditions, express and implied, including warranties or conditions of title
 and non-infringement, and implied warranties or conditions of merchantability
 and fitness for a particular purpose;
-
 ii) effectively excludes on behalf of all Contributors all liability for damages,
 including direct, indirect, special, incidental and consequential damages,
 such as lost profits;
-
 iii) states that any provisions which differ from this Agreement are offered
 by that Contributor alone and not by any other party; and
-
 iv) states that source code for the Program is available from such Contributor,
 and informs licensees how to obtain it in a reasonable manner on or through
 a medium customarily used for software exchange.
 
-   When the Program is made available in source code form:
+When the Program is made available in source code form:
 
-      a) it must be made available under this Agreement; and
+     a) it must be made available under this Agreement; and
 
 b) a copy of this Agreement must be included with each copy of the Program.
-
 Contributors may not remove or alter any copyright notices contained within
 the Program.
 
@@ -108,8 +97,7 @@ Each Contributor must identify itself as the originator of its Contribution,
 if any, in a manner that reasonably allows subsequent Recipients to identify
 the originator of the Contribution.
 
-   4. COMMERCIAL DISTRIBUTION
-
+4. COMMERCIAL DISTRIBUTION
 Commercial distributors of software may accept certain responsibilities with
 respect to end users, business partners and the like. While this license is
 intended to facilitate the commercial use of the Program, the Contributor
@@ -140,21 +128,19 @@ performance claims and warranties, and if a court requires any other Contributor
 to pay any damages as a result, the Commercial Contributor must pay those
 damages.
 
-   5. NO WARRANTY
-
+5. NO WARRANTY
 EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED 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.
 Each Recipient is solely responsible for determining the appropriateness of
 using and distributing the Program and assumes all risks associated with its
-exercise of rights under this Agreement, including but not limited to the
+exercise of rights under this Agreement , including but not limited to the
 risks and costs of program errors, compliance with applicable laws, damage
 to or loss of data, programs or equipment, and unavailability or interruption
 of operations.
 
-   6. DISCLAIMER OF LIABILITY
-
+6. DISCLAIMER OF LIABILITY
 EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY
 CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION
@@ -163,7 +149,7 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
 WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS
 GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
 
-   7. GENERAL
+7. GENERAL
 
 If any provision of this Agreement is invalid or unenforceable under applicable
 law, it shall not affect the validity or enforceability of the remainder of
diff --git a/options/license/EPL-2.0 b/options/license/EPL-2.0
index 795092b079..a8d4b62e40 100644
--- a/options/license/EPL-2.0
+++ b/options/license/EPL-2.0
@@ -1,45 +1,38 @@
 Eclipse Public License - v 2.0
-
 THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
-LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM
+LICENSE (“AGREEMENT”). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM
 CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
 
-   1. DEFINITIONS
-
-   "Contribution" means:
+1. DEFINITIONS
+“Contribution” means:
 
 a) in the case of the initial Contributor, the initial content Distributed
 under this Agreement, and
-
-      b) in the case of each subsequent Contributor:
-
-         i) changes to the Program, and
-
-         ii) additions to the Program;
-
+b) in the case of each subsequent Contributor:
+i) changes to the Program, and
+ii) additions to the Program;
 where such changes and/or additions to the Program originate from and are
-Distributed by that particular Contributor. A Contribution "originates" from
+Distributed by that particular Contributor. A Contribution “originates” from
 a Contributor if it was added to the Program by such Contributor itself or
 anyone acting on such Contributor's behalf. Contributions do not include changes
 or additions to the Program that are not Modified Works.
+“Contributor” means any person or entity that Distributes the Program.
 
-   "Contributor" means any person or entity that Distributes the Program.
-
-"Licensed Patents" mean patent claims licensable by a Contributor which are
+“Licensed Patents” mean patent claims licensable by a Contributor which are
 necessarily infringed by the use or sale of its Contribution alone or when
 combined with the Program.
 
-"Program" means the Contributions Distributed in accordance with this Agreement.
+“Program” means the Contributions Distributed in accordance with this Agreement.
 
-"Recipient" means anyone who receives the Program under this Agreement or
+“Recipient” means anyone who receives the Program under this Agreement or
 any Secondary License (as applicable), including Contributors.
 
-"Derivative Works" shall mean any work, whether in Source Code or other form,
+“Derivative Works” shall mean any work, whether in Source Code or other form,
 that is based on (or derived from) the Program and for which the editorial
 revisions, annotations, elaborations, or other modifications represent, as
 a whole, an original work of authorship.
 
-"Modified Works" shall mean any work in Source Code or other form that results
+“Modified Works” shall mean any work in Source Code or other form that results
 from an addition to, deletion from, or modification of the contents of the
 Program, including, for purposes of clarity any new file in Source Code form
 that contains any contents of the Program. Modified Works shall not include
@@ -47,25 +40,23 @@ works that contain only declarations, interfaces, types, classes, structures,
 or files of the Program solely in each case in order to link to, bind by name,
 or subclass the Program or Modified Works thereof.
 
-"Distribute" means the acts of a) distributing or b) making available in any
+“Distribute” means the acts of a) distributing or b) making available in any
 manner that enables the transfer of a copy.
 
-"Source Code" means the form of a Program preferred for making modifications,
+“Source Code” means the form of a Program preferred for making modifications,
 including but not limited to software source code, documentation source, and
 configuration files.
 
-"Secondary License" means either the GNU General Public License, Version 2.0,
+“Secondary License” means either the GNU General Public License, Version 2.0,
 or any later versions of that license, including any exceptions or additional
 permissions as identified by the initial Contributor.
 
-   2. GRANT OF RIGHTS
-
+2. GRANT OF RIGHTS
 a) Subject to the terms of this Agreement, each Contributor hereby grants
 Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce,
 prepare Derivative Works of, publicly display, publicly perform, Distribute
 and sublicense the Contribution of such Contributor, if any, and such Derivative
 Works.
-
 b) Subject to the terms of this Agreement, each Contributor hereby grants
 Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed
 Patents to make, use, sell, offer to sell, import and otherwise transfer the
@@ -75,7 +66,6 @@ Program if, at the time the Contribution is added by the Contributor, such
 addition of the Contribution causes such combination to be covered by the
 Licensed Patents. The patent license shall not apply to any other combinations
 which include the Contribution. No hardware per se is licensed hereunder.
-
 c) Recipient understands that although each Contributor grants the licenses
 to its Contributions set forth herein, no assurances are provided by any Contributor
 that the Program does not infringe the patent or other intellectual property
@@ -87,71 +77,58 @@ to secure any other intellectual property rights needed, if any. For example,
 if a third party patent license is required to allow Recipient to Distribute
 the Program, it is Recipient's responsibility to acquire that license before
 distributing the Program.
-
 d) Each Contributor represents that to its knowledge it has sufficient copyright
 rights in its Contribution, if any, to grant the copyright license set forth
 in this Agreement.
-
 e) Notwithstanding the terms of any Secondary License, no Contributor makes
 additional grants to any Recipient (other than those set forth in this Agreement)
 as a result of such Recipient's receipt of the Program under the terms of
 a Secondary License (if permitted under the terms of Section 3).
-
-   3. REQUIREMENTS
-
-      3.1 If a Contributor Distributes the Program in any form, then:
+3. REQUIREMENTS
+3.1 If a Contributor Distributes the Program in any form, then:
 
 a) the Program must also be made available as Source Code, in accordance with
 section 3.2, and the Contributor must accompany the Program with a statement
 that the Source Code for the Program is available under this Agreement, and
 informs Recipients how to obtain it in a reasonable manner on or through a
 medium customarily used for software exchange; and
-
 b) the Contributor may Distribute the Program under a license different than
 this Agreement, provided that such license:
-
 i) effectively disclaims on behalf of all other Contributors all warranties
 and conditions, express and implied, including warranties or conditions of
 title and non-infringement, and implied warranties or conditions of merchantability
 and fitness for a particular purpose;
-
 ii) effectively excludes on behalf of all other Contributors all liability
 for damages, including direct, indirect, special, incidental and consequential
 damages, such as lost profits;
-
 iii) does not attempt to limit or alter the recipients' rights in the Source
 Code under section 3.2; and
-
 iv) requires any subsequent distribution of the Program by any party to be
 under a license that satisfies the requirements of this section 3.
-
-      3.2 When the Program is Distributed as Source Code:
+3.2 When the Program is Distributed as Source Code:
 
 a) it must be made available under this Agreement, or if the Program (i) is
 combined with other material in a separate file or files made available under
 a Secondary License, and (ii) the initial Contributor attached to the Source
 Code the notice described in Exhibit A of this Agreement, then the Program
 may be made available under the terms of such Secondary Licenses, and
-
 b) a copy of this Agreement must be included with each copy of the Program.
-
 3.3 Contributors may not remove or alter any copyright, patent, trademark,
 attribution notices, disclaimers of warranty, or limitations of liability
-("notices") contained within the Program from any copy of the Program which
+(‘notices’) contained within the Program from any copy of the Program which
 they Distribute, provided that Contributors may add their own appropriate
 notices.
 
-   4. COMMERCIAL DISTRIBUTION
-
+4. COMMERCIAL DISTRIBUTION
 Commercial distributors of software may accept certain responsibilities with
 respect to end users, business partners and the like. While this license is
 intended to facilitate the commercial use of the Program, the Contributor
 who includes the Program in a commercial product offering should do so in
 a manner which does not create potential liability for other Contributors.
 Therefore, if a Contributor includes the Program in a commercial product offering,
-such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify
-every other Contributor ("Indemnified Contributor") against any losses, damages
-and costs (collectively "Losses") arising from claims, lawsuits and other
+such Contributor (“Commercial Contributor”) hereby agrees to defend and indemnify
+every other Contributor (“Indemnified Contributor”) against any losses, damages
+and costs (collectively “Losses”) arising from claims, lawsuits and other
 legal actions brought by a third party against the Indemnified Contributor
 to the extent caused by the acts or omissions of such Commercial Contributor
 in connection with its distribution of the Program in a commercial product
@@ -173,10 +150,9 @@ performance claims and warranties, and if a court requires any other Contributor
 to pay any damages as a result, the Commercial Contributor must pay those
 damages.
 
-   5. NO WARRANTY
-
+5. NO WARRANTY
 EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED
-BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES
+BY APPLICABLE LAW, THE PROGRAM IS PROVIDED 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. Each Recipient is solely responsible for
@@ -186,8 +162,7 @@ including but not limited to the risks and costs of program errors, compliance
 with applicable laws, damage to or loss of data, programs or equipment, and
 unavailability or interruption of operations.
 
-   6. DISCLAIMER OF LIABILITY
-
+6. DISCLAIMER OF LIABILITY
 EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED
 BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY
 FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
@@ -197,8 +172,7 @@ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION
 OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED
 OF THE POSSIBILITY OF SUCH DAMAGES.
 
-   7. GENERAL
-
+7. GENERAL
 If any provision of this Agreement is invalid or unenforceable under applicable
 law, it shall not affect the validity or enforceability of the remainder of
 the terms of this Agreement, and without further action by the parties hereto,
@@ -241,12 +215,11 @@ Nothing in this Agreement is intended to be enforceable by any entity that
 is not a Contributor or Recipient. No third-party beneficiary rights are created
 under this Agreement.
 
-   Exhibit A - Form of Secondary Licenses Notice
-
-"This Source Code may also be made available under the following Secondary
+Exhibit A – Form of Secondary Licenses Notice
+“This Source Code may also be made available under the following Secondary
 Licenses when the conditions for such availability set forth in the Eclipse
 Public License, v. 2.0 are satisfied: {name license(s), version(s), and exceptions
-or additional permissions here}."
+or additional permissions here}.”
 
 Simply including a copy of this Agreement, including this Exhibit A is not
 sufficient to license the Source Code under Secondary Licenses.
@@ -255,4 +228,4 @@ If it is not possible or desirable to put the notice in a particular file,
 then You may include the notice in a location (such as a LICENSE file in a
 relevant directory) where a recipient would be likely to look for such a notice.
 
-   You may add additional accurate notices of copyright ownership.
+You may add additional accurate notices of copyright ownership.
diff --git a/options/license/EUDatagrid b/options/license/EUDatagrid
index f9edeac751..a34643a635 100644
--- a/options/license/EUDatagrid
+++ b/options/license/EUDatagrid
@@ -1,4 +1,6 @@
-EU DataGrid Software License Copyright (c) 2001 EU DataGrid. All rights reserved.
+EU DataGrid Software License
+
+Copyright (c) 2001 EU DataGrid. All rights reserved.
 
 This software includes voluntary contributions made to the EU DataGrid. For
 more information on the EU DataGrid, please see http://www.eu-datagrid.org/.
@@ -15,29 +17,27 @@ materials provided with the software.
 
 2. The user documentation, if any, included with a redistribution, must include
 the following notice:
-
 "This product includes software developed by the EU DataGrid (http://www.eu-datagrid.org/)."
 
 Alternatively, if that is where third-party acknowledgments normally appear,
 this acknowledgment must be reproduced in the software itself.
 
-3. The names "EDG", "EDG Toolkit", "EU DataGrid" and "EU DataGrid Project"
+3. The names "EDG", "EDG Toolkit", “EU DataGrid” and "EU DataGrid Project"
 may not be used to endorse or promote software, or products derived therefrom,
 except with prior written permission by hep-project-grid-edg-license@cern.ch.
 
 4. You are under no obligation to provide anyone with any bug fixes, patches,
-upgrades or other modifications, enhancements or derivatives of the features,
-functionality or performance of this software that you may develop. However,
-if you publish or distribute your modifications, enhancements or derivative
-works without contemporaneously requiring users to enter into a separate written
-license agreement, then you are deemed to have granted participants in the
-EU DataGrid a worldwide, non-exclusive, royalty-free, perpetual license to
-install, use, reproduce, display, modify, redistribute and sub-license your
-modifications, enhancements or derivative works, whether in binary or source
-code form, under the license conditions stated in this list of conditions.
-
-   5. DISCLAIMER
+upgrades or other modifications, enhancements or derivatives of the features,functionality
+or performance of this software that you may develop. However, if you publish
+or distribute your modifications, enhancements or derivative works without
+contemporaneously requiring users to enter into a separate written license
+agreement, then you are deemed to have granted participants in the EU DataGrid
+a worldwide, non-exclusive, royalty-free, perpetual license to install, use,
+reproduce, display, modify, redistribute and sub-license your modifications,
+enhancements or derivative works, whether in binary or source code form, under
+the license conditions stated in this list of conditions.
 
+5. DISCLAIMER
 THIS SOFTWARE IS PROVIDED BY THE EU DATAGRID AND CONTRIBUTORS "AS IS" AND
 ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 WARRANTIES OF MERCHANTABILITY, OF SATISFACTORY QUALITY, AND FITNESS FOR A
@@ -46,8 +46,7 @@ MAKE NO REPRESENTATION THAT THE SOFTWARE, MODIFICATIONS, ENHANCEMENTS OR DERIVAT
 WORKS THEREOF, WILL NOT INFRINGE ANY PATENT, COPYRIGHT, TRADE SECRET OR OTHER
 PROPRIETARY RIGHT.
 
-   6. LIMITATION OF LIABILITY
-
+6. LIMITATION OF LIABILITY
 THE EU DATAGRID AND CONTRIBUTORS SHALL HAVE NO LIABILITY TO LICENSEE OR OTHER
 PERSONS FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, CONSEQUENTIAL, EXEMPLARY,
 OR PUNITIVE DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, PROCUREMENT
diff --git a/options/license/EUPL-1.0 b/options/license/EUPL-1.0
index 3fdb93ab42..40b17de8ef 100644
--- a/options/license/EUPL-1.0
+++ b/options/license/EUPL-1.0
@@ -1,5 +1,8 @@
-European Union Public Licence V.1.0 EUPL (c) the European Community 2007 This
-European Union Public Licence (the "EUPL") applies to the Work or Software
+European Union Public Licence V.1.0
+
+EUPL (c) the European Community 2007
+
+This European Union Public Licence (the “EUPL”) applies to the Work or Software
 (as defined below) which is provided under the terms of this Licence. Any
 use of the Work, other than as authorised under this Licence is prohibited
 (to the extent such use is covered by a right of the copyright holder of the
@@ -9,15 +12,15 @@ The Original Work is provided under the terms of this Licence when the Licensor
 (as defined below) has placed the following notice immediately following the
 copyright notice for the Original Work:
 
-Licensed under the EUPL V.1.0
+     Licensed under the EUPL V.1.0
 
 or has expressed by any other mean his willingness to license under the EUPL.
 
-   1. Definitions
+1. Definitions
 
-   In this Licence, the following terms have the following meaning:
+In this Licence, the following terms have the following meaning:
 
-      − The Licence: this Licence.
+     − The Licence: this Licence.
 
 − The Original Work or the Software: the software distributed and/or communicated
 by the Licensor under this Licence, available as Source Code and also as Executable
@@ -29,7 +32,7 @@ define the extent of modification or dependence on the Original Work required
 in order to classify a work as a Derivative Work; this extent is determined
 by copyright law applicable in the country mentioned in Article 15.
 
-      − The Work: the Original Work and/or its Derivative Works.
+     − The Work: the Original Work and/or its Derivative Works.
 
 − The Source Code: the human-readable form of the Work which is the most convenient
 for people to study and modify.
@@ -43,35 +46,33 @@ the Work under the Licence.
 − Contributor(s): any natural or legal person who modifies the Work under
 the Licence, or otherwise contributes to the creation of a Derivative Work.
 
-− The Licensee or "You": any natural or legal person who makes any usage of
-the Software under the terms of the Licence.
+− The Licensee or “You”: any natural or legal person who makes any usage of
+the Software under the terms of the Licence. − Distribution and/or Communication:
+any act of selling, giving, lending, renting, distributing, communicating,
+transmitting, or otherwise making available, on-line or off-line, copies of
+the Work at the disposal of any other natural or legal person.
 
-− Distribution and/or Communication: any act of selling, giving, lending,
-renting, distributing, communicating, transmitting, or otherwise making available,
-on-line or off-line, copies of the Work at the disposal of any other natural
-or legal person.
-
-   2. Scope of the rights granted by the Licence
+2. Scope of the rights granted by the Licence
 
 The Licensor hereby grants You a world-wide, royalty-free, non-exclusive,
 sub-licensable licence to do the following, for the duration of copyright
 vested in the Original Work:
 
-      − use the Work in any circumstance and for all usage,
+     − use the Work in any circumstance and for all usage,
 
-      − reproduce the Work,
+     − reproduce the Work,
 
-− modify the Original Work, and make Derivative Works based upon the Work,
+     − modify the Original Work, and make Derivative Works based upon the Work,
 
 − communicate to the public, including the right to make available or display
 the Work or copies thereof to the public and perform publicly, as the case
 may be, the Work,
 
-      − distribute the Work or copies thereof,
+     − distribute the Work or copies thereof,
 
-      − lend and rent the Work or copies thereof,
+     − lend and rent the Work or copies thereof,
 
-      − sub-license rights in the Work or copies thereof.
+     − sub-license rights in the Work or copies thereof.
 
 Those rights can be exercised on any media, supports and formats, whether
 now known or later invented, as far as the applicable law permits so.
@@ -84,7 +85,7 @@ The Licensor grants to the Licensee royalty-free, non exclusive usage rights
 to any patents held by the Licensor, to the extent necessary to make use of
 the rights granted on the Work under this Licence.
 
-   3. Communication of the Source Code
+3. Communication of the Source Code
 
 The Licensor may provide the Work either in its Source Code form, or as Executable
 Code. If the Work is provided as Executable Code, the Licensor provides in
@@ -94,14 +95,14 @@ following the copyright notice attached to the Work, a repository where the
 Source Code is easily and freely accessible for as long as the Licensor continues
 to distribute and/or communicate the Work.
 
-   4. Limitations on copyright
+4. Limitations on copyright
 
 Nothing in this Licence is intended to deprive the Licensee of the benefits
 from any exception or limitation to the exclusive rights of the rights owners
 in the Original Work or Software, of the exhaustion of those rights or of
 other applicable limitations thereto.
 
-   5. Obligations of the Licensee
+5. Obligations of the Licensee
 
 The grant of the rights mentioned above is subject to some restrictions and
 obligations imposed on the Licensee. Those obligations are the following:
@@ -124,8 +125,8 @@ Compatibility clause: If the Licensee Distributes and/or Communicates Derivative
 Works or copies thereof based upon both the Original Work and another work
 licensed under a Compatible Licence, this Distribution and/or Communication
 can be done under the terms of this Compatible Licence. For the sake of this
-clause, "Compatible Licence" refers to the licences listed in the appendix
-attached to this Licence. Should the Licensee's obligations under the Compatible
+clause, “Compatible Licence” refers to the licences listed in the appendix
+attached to this Licence. Should the Licensee’s obligations under the Compatible
 Licence conflict with his/her obligations under this Licence, the obligations
 of the Compatible Licence shall prevail.
 
@@ -140,7 +141,7 @@ names, trademarks, service marks, or 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 copyright notice.
 
-   6. Chain of Authorship
+6. Chain of Authorship
 
 The original Licensor warrants that the copyright in the Original Work granted
 hereunder is owned by him/her or licensed to him/her and that he/she has the
@@ -154,13 +155,13 @@ Each time You, as a Licensee, receive the Work, the original Licensor and
 subsequent Contributors grant You a licence to their contributions to the
 Work, under the terms of this Licence.
 
-   7. Disclaimer of Warranty
+7. Disclaimer of Warranty
 
 The Work is a work in progress, which is continuously improved by numerous
 contributors. It is not a finished work and may therefore contain defects
-or "bugs" inherent to this type of software development.
+or “bugs” inherent to this type of software development.
 
-For the above reason, the Work is provided under the Licence on an "as is"
+For the above reason, the Work is provided under the Licence on an “as is”
 basis and without warranties of any kind concerning the Work, including without
 limitation merchantability, fitness for a particular purpose, absence of defects
 or errors, accuracy, non-infringement of intellectual property rights other
@@ -169,7 +170,7 @@ than copyright as stated in Article 6 of this Licence.
 This disclaimer of warranty is an essential part of the Licence and a condition
 for the grant of any rights to the Work.
 
-   8. Disclaimer of Liability
+8. Disclaimer of Liability
 
 Except in the cases of wilful misconduct or damages directly caused to natural
 persons, the Licensor will in no event be liable for any direct or indirect,
@@ -180,7 +181,7 @@ damage, even if the Licensor has been advised of the possibility of such damage.
 However, the Licensor will be liable under statutory product liability laws
 as far such laws apply to the Work.
 
-   9. Additional agreements
+9. Additional agreements
 
 While distributing the Original Work or Derivative Works, You may choose to
 conclude an additional agreement to offer, and charge a fee for, acceptance
@@ -192,9 +193,9 @@ indemnify, defend, and hold each Contributor harmless for any liability incurred
 by, or claims asserted against such Contributor by the fact You have accepted
 any such warranty or additional liability.
 
-   10. Acceptance of the Licence
+10. Acceptance of the Licence
 
-The provisions of this Licence can be accepted by clicking on an icon "I agree"
+The provisions of this Licence can be accepted by clicking on an icon “I agree”
 placed under the bottom of a window displaying the text of this Licence or
 by affirming consent in any other similar way, in accordance with the rules
 of applicable law. Clicking on that icon indicates your clear and irrevocable
@@ -205,7 +206,7 @@ by exercising any rights granted to You by Article 2 of this Licence, such
 as the use of the Work, the creation by You of a Derivative Work or the Distribution
 and/or Communication by You of the Work or copies thereof.
 
-   11. Information to the public
+11. Information to the public
 
 In case of any Distribution and/or Communication of the Work by means of electronic
 communication by You (for example, by offering to download the Work from a
@@ -215,7 +216,7 @@ law regarding the identification and address of the Licensor, the Licence
 and the way it may be accessible, concluded, stored and reproduced by the
 Licensee.
 
-   12. Termination of the Licence
+12. Termination of the Licence
 
 The Licence and the rights granted hereunder will terminate automatically
 upon any breach by the Licensee of the terms of the Licence.
@@ -224,7 +225,7 @@ Such a termination will not terminate the licences of any person who has receive
 the Work from the Licensee under the Licence, provided such persons remain
 in full compliance with the Licence.
 
-   13. Miscellaneous
+13. Miscellaneous
 
 Without prejudice of Article 9 above, the Licence represents the complete
 agreement between the Parties as to the Work licensed hereunder.
@@ -240,7 +241,7 @@ of the Licence will be published with a unique version number. The new version
 of the Licence becomes binding for You as soon as You become aware of its
 publication.
 
-   14. Jurisdiction
+14. Jurisdiction
 
 Any litigation resulting from the interpretation of this License, arising
 between the European Commission, as a Licensor, and any Licensee, will be
@@ -252,12 +253,12 @@ and resulting from the interpretation of this License, will be subject to
 the exclusive jurisdiction of the competent court where the Licensor resides
 or conducts its primary business.
 
-   15. Applicable Law
+15. Applicable Law
 
 This Licence shall be governed by the law of the European Union country where
 the Licensor resides or has his registered office.
 
-   This licence shall be governed by the Belgian law if:
+This licence shall be governed by the Belgian law if:
 
 − a litigation arises between the European Commission, as a Licensor, and
 any Licensee;
@@ -265,16 +266,13 @@ any Licensee;
 − the Licensor, other than the European Commission, has no residence or registered
 office inside a European Union country.
 
+
 Appendix
 
-"Compatible Licences" according to article 5 EUPL are:
+“Compatible Licences” according to article 5 EUPL are:
 
-   − General Public License (GPL) v. 2
-
-   − Open Software License (OSL) v. 2.1, v. 3.0
-
-   − Common Public License v. 1.0
-
-   − Eclipse Public License v. 1.0
-
-   − Cecill v. 2.0
+− General Public License (GPL) v. 2
+− Open Software License (OSL) v. 2.1, v. 3.0
+− Common Public License v. 1.0
+− Eclipse Public License v. 1.0
+− Cecill v. 2.0
diff --git a/options/license/EUPL-1.1 b/options/license/EUPL-1.1
index 86c834ae5b..7af3f5cf1f 100644
--- a/options/license/EUPL-1.1
+++ b/options/license/EUPL-1.1
@@ -1,4 +1,6 @@
-European Union Public Licence V. 1.1 EUPL (c) the European Community 2007
+European Union Public Licence V. 1.1
+
+EUPL (c) the European Community 2007
 
 This European Union Public Licence (the "EUPL") applies to the Work or Software
 (as defined below) which is provided under the terms of this Licence. Any
@@ -10,19 +12,15 @@ The Original Work is provided under the terms of this Licence when the Licensor
 (as defined below) has placed the following notice immediately following the
 copyright notice for the Original Work:
 
-   
-
-   Licensed under the EUPL V.1.1
-
-   
+     Licensed under the EUPL V.1.1
 
 or has expressed by any other mean his willingness to license under the EUPL.
 
-   1. Definitions
+1. Definitions
 
-   In this Licence, the following terms have the following meaning:
+In this Licence, the following terms have the following meaning:
 
-      - The Licence: this Licence.
+     - The Licence: this Licence.
 
 - The Original Work or the Software: the software distributed and/or communicated
 by the Licensor under this Licence, available as Source Code and also as Executable
@@ -34,7 +32,7 @@ define the extent of modification or dependence on the Original Work required
 in order to classify a work as a Derivative Work; this extent is determined
 by copyright law applicable in the country mentioned in Article 15.
 
-      - The Work: the Original Work and/or its Derivative Works.
+     - The Work: the Original Work and/or its Derivative Works.
 
 - The Source Code: the human-readable form of the Work which is the most convenient
 for people to study and modify.
@@ -56,27 +54,27 @@ renting, distributing, communicating, transmitting, or otherwise making availabl
 on-line or off-line, copies of the Work or providing access to its essential
 functionalities at the disposal of any other natural or legal person.
 
-   2. Scope of the rights granted by the Licence
+2. Scope of the rights granted by the Licence
 
 The Licensor hereby grants You a world-wide, royalty-free, non-exclusive,
 sublicensable licence to do the following, for the duration of copyright vested
 in the Original Work:
 
-      - use the Work in any circumstance and for all usage,
+     - use the Work in any circumstance and for all usage,
 
-      - reproduce the Work,
+     - reproduce the Work,
 
-- modify the Original Work, and make Derivative Works based upon the Work,
+     - modify the Original Work, and make Derivative Works based upon the Work,
 
 - communicate to the public, including the right to make available or display
 the Work or copies thereof to the public and perform publicly, as the case
 may be, the Work,
 
-      - distribute the Work or copies thereof,
+     - distribute the Work or copies thereof,
 
-      - lend and rent the Work or copies thereof,
+     - lend and rent the Work or copies thereof,
 
-      - sub-license rights in the Work or copies thereof.
+     - sub-license rights in the Work or copies thereof.
 
 Those rights can be exercised on any media, supports and formats, whether
 now known or later invented, as far as the applicable law permits so.
@@ -89,7 +87,7 @@ The Licensor grants to the Licensee royalty-free, non exclusive usage rights
 to any patents held by the Licensor, to the extent necessary to make use of
 the rights granted on the Work under this Licence.
 
-   3. Communication of the Source Code
+3. Communication of the Source Code
 
 The Licensor may provide the Work either in its Source Code form, or as Executable
 Code. If the Work is provided as Executable Code, the Licensor provides in
@@ -99,14 +97,14 @@ following the copyright notice attached to the Work, a repository where the
 Source Code is easily and freely accessible for as long as the Licensor continues
 to distribute and/or communicate the Work.
 
-   4. Limitations on copyright
+4. Limitations on copyright
 
 Nothing in this Licence is intended to deprive the Licensee of the benefits
 from any exception or limitation to the exclusive rights of the rights owners
 in the Original Work or Software, of the exhaustion of those rights or of
 other applicable limitations thereto.
 
-   5. Obligations of the Licensee
+5. Obligations of the Licensee
 
 The grant of the rights mentioned above is subject to some restrictions and
 obligations imposed on the Licensee. Those obligations are the following:
@@ -146,7 +144,7 @@ names, trademarks, service marks, or 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 copyright notice.
 
-   6. Chain of Authorship
+6. Chain of Authorship
 
 The original Licensor warrants that the copyright in the Original Work granted
 hereunder is owned by him/her or licensed to him/her and that he/she has the
@@ -160,7 +158,7 @@ Each time You accept the Licence, the original Licensor and subsequent Contribut
 grant You a licence to their contributions to the Work, under the terms of
 this Licence.
 
-   7. Disclaimer of Warranty
+7. Disclaimer of Warranty
 
 The Work is a work in progress, which is continuously improved by numerous
 contributors. It is not a finished work and may therefore contain defects
@@ -175,7 +173,7 @@ than copyright as stated in Article 6 of this Licence.
 This disclaimer of warranty is an essential part of the Licence and a condition
 for the grant of any rights to the Work.
 
-   8. Disclaimer of Liability
+8. Disclaimer of Liability
 
 Except in the cases of wilful misconduct or damages directly caused to natural
 persons, the Licensor will in no event be liable for any direct or indirect,
@@ -186,7 +184,7 @@ damage, even if the Licensor has been advised of the possibility of such damage.
 However, the Licensor will be liable under statutory product liability laws
 as far such laws apply to the Work.
 
-   9. Additional agreements
+9. Additional agreements
 
 While distributing the Original Work or Derivative Works, You may choose to
 conclude an additional agreement to offer, and charge a fee for, acceptance
@@ -198,7 +196,7 @@ indemnify, defend, and hold each Contributor harmless for any liability incurred
 by, or claims asserted against such Contributor by the fact You have accepted
 any such warranty or additional liability.
 
-   10. Acceptance of the Licence
+10. Acceptance of the Licence
 
 The provisions of this Licence can be accepted by clicking on an icon "I agree"
 placed under the bottom of a window displaying the text of this Licence or
@@ -211,7 +209,7 @@ by exercising any rights granted to You by Article 2 of this Licence, such
 as the use of the Work, the creation by You of a Derivative Work or the Distribution
 and/or Communication by You of the Work or copies thereof.
 
-   11. Information to the public
+11. Information to the public
 
 In case of any Distribution and/or Communication of the Work by means of electronic
 communication by You (for example, by offering to download the Work from a
@@ -220,7 +218,7 @@ must at least provide to the public the information requested by the applicable
 law regarding the Licensor, the Licence and the way it may be accessible,
 concluded, stored and reproduced by the Licensee.
 
-   12. Termination of the Licence
+12. Termination of the Licence
 
 The Licence and the rights granted hereunder will terminate automatically
 upon any breach by the Licensee of the terms of the Licence. Such a termination
@@ -228,7 +226,7 @@ will not terminate the licences of any person who has received the Work from
 the Licensee under the Licence, provided such persons remain in full compliance
 with the Licence.
 
-   13. Miscellaneous
+13. Miscellaneous
 
 Without prejudice of Article 9 above, the Licence represents the complete
 agreement between the Parties as to the Work licensed hereunder.
@@ -247,7 +245,7 @@ All linguistic versions of this Licence, approved by the European Commission,
 have identical value. Parties can take advantage of the linguistic version
 of their choice.
 
-   14. Jurisdiction
+14. Jurisdiction
 
 Any litigation resulting from the interpretation of this License, arising
 between the European Commission, as a Licensor, and any Licensee, will be
@@ -259,12 +257,12 @@ and resulting from the interpretation of this License, will be subject to
 the exclusive jurisdiction of the competent court where the Licensor resides
 or conducts its primary business.
 
-   15. Applicable Law
+15. Applicable Law
 
 This Licence shall be governed by the law of the European Union country where
 the Licensor resides or has his registered office.
 
-   This licence shall be governed by the Belgian law if:
+This licence shall be governed by the Belgian law if:
 
 - a litigation arises between the European Commission, as a Licensor, and
 any Licensee;
@@ -272,16 +270,14 @@ any Licensee;
 - the Licensor, other than the European Commission, has no residence or registered
 office inside a European Union country.
 
+
+
 Appendix
 
 "Compatible Licences" according to article 5 EUPL are:
 
-   - GNU General Public License (GNU GPL) v. 2
-
-   - Open Software License (OSL) v. 2.1, v. 3.0
-
-   - Common Public License v. 1.0
-
-   - Eclipse Public License v. 1.0
-
-   - Cecill v. 2.0
+     - GNU General Public License (GNU GPL) v. 2
+     - Open Software License (OSL) v. 2.1, v. 3.0
+     - Common Public License v. 1.0
+     - Eclipse Public License v. 1.0
+     - Cecill v. 2.0
diff --git a/options/license/EUPL-1.2 b/options/license/EUPL-1.2
index c108cad9b8..aa2302f809 100644
--- a/options/license/EUPL-1.2
+++ b/options/license/EUPL-1.2
@@ -1,305 +1,283 @@
-European Union Public Licence v. 1.2
-
+EUROPEAN UNION PUBLIC LICENCE v. 1.2
 EUPL © the European Union 2007, 2016
 
-This European Union Public Licence (the 'EUPL') applies to the Work (as defined
-below) which is provided under the terms of this Licence. Any use of the Work,
-other than as authorised under this Licence is prohibited (to the extent such
+This European Union Public Licence (the ‘EUPL’) applies to the Work (as defined
+below) which is provided under the
+terms of this Licence. Any use of the Work, other than as authorised under
+this Licence is prohibited (to the extent such
 use is covered by a right of the copyright holder of the Work).
-
 The Work is provided under the terms of this Licence when the Licensor (as
-defined below) has placed the following notice immediately following the copyright
-notice for the Work:
-
-   
-
-   Licensed under the EUPL
-
-   
-
+defined below) has placed the following
+notice immediately following the copyright notice for the Work:
+                          Licensed under the EUPL
 or has expressed by any other means his willingness to license under the EUPL.
 
-   1. Definitions
-
-   In this Licence, the following terms have the following meaning:
-
-      — 'The Licence': this Licence.
-
-— 'The Original Work': the work or software distributed or communicated by
-the Licensor under this Licence, available as Source Code and also as Executable
-Code as the case may be.
-
-— 'Derivative Works': the works or software that could be created by the Licensee,
-based upon the Original Work or modifications thereof. This Licence does not
-define the extent of modification or dependence on the Original Work required
-in order to classify a work as a Derivative Work; this extent is determined
-by copyright law applicable in the country mentioned in Article 15.
-
-      — 'The Work': the Original Work or its Derivative Works.
-
-— 'The Source Code': the human-readable form of the Work which is the most
-convenient for people to study and modify.
-
-— 'The Executable Code': any code which has generally been compiled and which
-is meant to be interpreted by a computer as a program.
-
-— 'The Licensor': the natural or legal person that distributes or communicates
+1.Definitions
+In this Licence, the following terms have the following meaning:
+— ‘The Licence’:this Licence.
+— ‘The Original Work’:the work or software distributed or communicated by
+the Licensor under this Licence, available
+as Source Code and also as Executable Code as the case may be.
+— ‘Derivative Works’:the works or software that could be created by the Licensee,
+based upon the Original Work or
+modifications thereof. This Licence does not define the extent of modification
+or dependence on the Original Work
+required in order to classify a work as a Derivative Work; this extent is
+determined by copyright law applicable in
+the country mentioned in Article 15.
+— ‘The Work’:the Original Work or its Derivative Works.
+— ‘The Source Code’:the human-readable form of the Work which is the most
+convenient for people to study and
+modify.
+— ‘The Executable Code’:any code which has generally been compiled and which
+is meant to be interpreted by
+a computer as a program.
+— ‘The Licensor’:the natural or legal person that distributes or communicates
 the Work under the Licence.
-
-— 'Contributor(s)': any natural or legal person who modifies the Work under
-the Licence, or otherwise contributes to the creation of a Derivative Work.
-
-— 'The Licensee' or 'You': any natural or legal person who makes any usage
-of the Work under the terms of the Licence.
-
-— 'Distribution' or 'Communication': any act of selling, giving, lending,
-renting, distributing, communicating, transmitting, or otherwise making available,
-online or offline, copies of the Work or providing access to its essential
+— ‘Contributor(s)’:any natural or legal person who modifies the Work under
+the Licence, or otherwise contributes to
+the creation of a Derivative Work.
+— ‘The Licensee’ or ‘You’:any natural or legal person who makes any usage
+of the Work under the terms of the
+Licence.
+— ‘Distribution’ or ‘Communication’:any act of selling, giving, lending, renting,
+distributing, communicating,
+transmitting, or otherwise making available, online or offline, copies of
+the Work or providing access to its essential
 functionalities at the disposal of any other natural or legal person.
 
-   2. Scope of the rights granted by the Licence
-
+2.Scope of the rights granted by the Licence
 The Licensor hereby grants You a worldwide, royalty-free, non-exclusive, sublicensable
-licence to do the following, for the duration of copyright vested in the Original
-Work:
-
-      — use the Work in any circumstance and for all usage,
-
-      — reproduce the Work,
-
-      — modify the Work, and make Derivative Works based upon the Work,
-
+licence to do the following, for
+the duration of copyright vested in the Original Work:
+— use the Work in any circumstance and for all usage,
+— reproduce the Work,
+— modify the Work, and make Derivative Works based upon the Work,
 — communicate to the public, including the right to make available or display
-the Work or copies thereof to the public and perform publicly, as the case
-may be, the Work,
-
-      — distribute the Work or copies thereof,
-
-      — lend and rent the Work or copies thereof,
-
-      — sublicense rights in the Work or copies thereof.
-
+the Work or copies thereof to the public
+and perform publicly, as the case may be, the Work,
+— distribute the Work or copies thereof,
+— lend and rent the Work or copies thereof,
+— sublicense rights in the Work or copies thereof.
 Those rights can be exercised on any media, supports and formats, whether
-now known or later invented, as far as the applicable law permits so.
-
+now known or later invented, as far as the
+applicable law permits so.
 In the countries where moral rights apply, the Licensor waives his right to
-exercise his moral right to the extent allowed by law in order to make effective
-the licence of the economic rights here above listed.
-
+exercise his moral right to the extent allowed
+by law in order to make effective the licence of the economic rights here
+above listed.
 The Licensor grants to the Licensee royalty-free, non-exclusive usage rights
-to any patents held by the Licensor, to the extent necessary to make use of
-the rights granted on the Work under this Licence.
-
-   3. Communication of the Source Code
+to any patents held by the Licensor, to the
+extent necessary to make use of the rights granted on the Work under this
+Licence.
 
+3.Communication of the Source Code
 The Licensor may provide the Work either in its Source Code form, or as Executable
-Code. If the Work is provided as Executable Code, the Licensor provides in
-addition a machine-readable copy of the Source Code of the Work along with
+Code. If the Work is provided as
+Executable Code, the Licensor provides in addition a machine-readable copy
+of the Source Code of the Work along with
 each copy of the Work that the Licensor distributes or indicates, in a notice
-following the copyright notice attached to the Work, a repository where the
-Source Code is easily and freely accessible for as long as the Licensor continues
-to distribute or communicate the Work.
-
-   4. Limitations on copyright
+following the copyright notice attached to
+the Work, a repository where the Source Code is easily and freely accessible
+for as long as the Licensor continues to
+distribute or communicate the Work.
 
+4.Limitations on copyright
 Nothing in this Licence is intended to deprive the Licensee of the benefits
-from any exception or limitation to the exclusive rights of the rights owners
-in the Work, of the exhaustion of those rights or of other applicable limitations
+from any exception or limitation to the
+exclusive rights of the rights owners in the Work, of the exhaustion of those
+rights or of other applicable limitations
 thereto.
 
-   5. Obligations of the Licensee
-
+5.Obligations of the Licensee
 The grant of the rights mentioned above is subject to some restrictions and
-obligations imposed on the Licensee. Those obligations are the following:
+obligations imposed on the Licensee. Those
+obligations are the following:
 
 Attribution right: The Licensee shall keep intact all copyright, patent or
-trademarks notices and all notices that refer to the Licence and to the disclaimer
-of warranties. The Licensee must include a copy of such notices and a copy
-of the Licence with every copy of the Work he/she distributes or communicates.
-The Licensee must cause any Derivative Work to carry prominent notices stating
-that the Work has been modified and the date of modification.
+trademarks notices and all notices that refer to
+the Licence and to the disclaimer of warranties. The Licensee must include
+a copy of such notices and a copy of the
+Licence with every copy of the Work he/she distributes or communicates. The
+Licensee must cause any Derivative Work
+to carry prominent notices stating that the Work has been modified and the
+date of modification.
 
 Copyleft clause: If the Licensee distributes or communicates copies of the
-Original Works or Derivative Works, this Distribution or Communication will
-be done under the terms of this Licence or of a later version of this Licence
-unless the Original Work is expressly distributed only under this version
-of the Licence — for example by communicating 'EUPL v. 1.2 only'. The Licensee
-(becoming Licensor) cannot offer or impose any additional terms or conditions
-on the Work or Derivative Work that alter or restrict the terms of the Licence.
+Original Works or Derivative Works, this
+Distribution or Communication will be done under the terms of this Licence
+or of a later version of this Licence unless
+the Original Work is expressly distributed only under this version of the
+Licence — for example by communicating
+‘EUPL v. 1.2 only’. The Licensee (becoming Licensor) cannot offer or impose
+any additional terms or conditions on the
+Work or Derivative Work that alter or restrict the terms of the Licence.
 
 Compatibility clause: If the Licensee Distributes or Communicates Derivative
-Works or copies thereof based upon both the Work and another work licensed
-under a Compatible Licence, this Distribution or Communication can be done
-under the terms of this Compatible Licence. For the sake of this clause, 'Compatible
-Licence' refers to the licences listed in the appendix attached to this Licence.
-Should the Licensee's obligations under the Compatible Licence conflict with
+Works or copies thereof based upon both
+the Work and another work licensed under a Compatible Licence, this Distribution
+or Communication can be done
+under the terms of this Compatible Licence. For the sake of this clause, ‘Compatible
+Licence’ refers to the licences listed
+in the appendix attached to this Licence. Should the Licensee's obligations
+under the Compatible Licence conflict with
 his/her obligations under this Licence, the obligations of the Compatible
 Licence shall prevail.
 
 Provision of Source Code: When distributing or communicating copies of the
-Work, the Licensee will provide a machine-readable copy of the Source Code
-or indicate a repository where this Source will be easily and freely available
+Work, the Licensee will provide
+a machine-readable copy of the Source Code or indicate a repository where
+this Source will be easily and freely available
 for as long as the Licensee continues to distribute or communicate the Work.
-
 Legal Protection: This Licence does not grant permission to use the trade
-names, trademarks, service marks, or names of the Licensor, except as required
-for reasonable and customary use in describing the origin of the Work and
+names, trademarks, service marks, or 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 copyright notice.
 
-   6. Chain of Authorship
-
+6.Chain of Authorship
 The original Licensor warrants that the copyright in the Original Work granted
-hereunder is owned by him/her or licensed to him/her and that he/she has the
-power and authority to grant the Licence.
-
+hereunder is owned by him/her or
+licensed to him/her and that he/she has the power and authority to grant the
+Licence.
 Each Contributor warrants that the copyright in the modifications he/she brings
-to the Work are owned by him/her or licensed to him/her and that he/she has
-the power and authority to grant the Licence.
-
+to the Work are owned by him/her or
+licensed to him/her and that he/she has the power and authority to grant the
+Licence.
 Each time You accept the Licence, the original Licensor and subsequent Contributors
-grant You a licence to their contributions to the Work, under the terms of
-this Licence.
-
-   7. Disclaimer of Warranty
+grant You a licence to their contributions
+to the Work, under the terms of this Licence.
 
+7.Disclaimer of Warranty
 The Work is a work in progress, which is continuously improved by numerous
-Contributors. It is not a finished work and may therefore contain defects
-or 'bugs' inherent to this type of development.
-
-For the above reason, the Work is provided under the Licence on an 'as is'
-basis and without warranties of any kind concerning the Work, including without
-limitation merchantability, fitness for a particular purpose, absence of defects
-or errors, accuracy, non-infringement of intellectual property rights other
-than copyright as stated in Article 6 of this Licence.
-
+Contributors. It is not a finished work
+and may therefore contain defects or ‘bugs’ inherent to this type of development.
+For the above reason, the Work is provided under the Licence on an ‘as is’
+basis and without warranties of any kind
+concerning the Work, including without limitation merchantability, fitness
+for a particular purpose, absence of defects or
+errors, accuracy, non-infringement of intellectual property rights other than
+copyright as stated in Article 6 of this
+Licence.
 This disclaimer of warranty is an essential part of the Licence and a condition
 for the grant of any rights to the Work.
 
-   8. Disclaimer of Liability
-
+8.Disclaimer of Liability
 Except in the cases of wilful misconduct or damages directly caused to natural
-persons, the Licensor will in no event be liable for any direct or indirect,
-material or moral, damages of any kind, arising out of the Licence or of the
-use of the Work, including without limitation, damages for loss of goodwill,
-work stoppage, computer failure or malfunction, loss of data or any commercial
-damage, even if the Licensor has been advised of the possibility of such damage.
-However, the Licensor will be liable under statutory product liability laws
-as far such laws apply to the Work.
-
-   9. Additional agreements
+persons, the Licensor will in no event be
+liable for any direct or indirect, material or moral, damages of any kind,
+arising out of the Licence or of the use of the
+Work, including without limitation, damages for loss of goodwill, work stoppage,
+computer failure or malfunction, loss
+of data or any commercial damage, even if the Licensor has been advised of
+the possibility of such damage. However,
+the Licensor will be liable under statutory product liability laws as far
+such laws apply to the Work.
 
+9.Additional agreements
 While distributing the Work, You may choose to conclude an additional agreement,
-defining obligations or services consistent with this Licence. However, if
-accepting obligations, You may act only on your own behalf and on your sole
+defining obligations or services
+consistent with this Licence. However, if accepting obligations, You may act
+only on your own behalf and on your sole
 responsibility, not on behalf of the original Licensor or 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 the fact You have accepted any warranty or additional liability.
-
-   10. Acceptance of the Licence
-
-The provisions of this Licence can be accepted by clicking on an icon 'I agree'
-placed under the bottom of a window displaying the text of this Licence or
-by affirming consent in any other similar way, in accordance with the rules
-of applicable law. Clicking on that icon indicates your clear and irrevocable
-acceptance of this Licence and all of its terms and conditions.
+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
+the fact You have accepted any warranty or additional liability.
 
+10.Acceptance of the Licence
+The provisions of this Licence can be accepted by clicking on an icon ‘I agree’
+placed under the bottom of a window
+displaying the text of this Licence or by affirming consent in any other similar
+way, in accordance with the rules of
+applicable law. Clicking on that icon indicates your clear and irrevocable
+acceptance of this Licence and all of its terms
+and conditions.
 Similarly, you irrevocably accept this Licence and all of its terms and conditions
-by exercising any rights granted to You by Article 2 of this Licence, such
-as the use of the Work, the creation by You of a Derivative Work or the Distribution
+by exercising any rights granted to You
+by Article 2 of this Licence, such as the use of the Work, the creation by
+You of a Derivative Work or the Distribution
 or Communication by You of the Work or copies thereof.
 
-   11. Information to the public
-
+11.Information to the public
 In case of any Distribution or Communication of the Work by means of electronic
-communication by You (for example, by offering to download the Work from a
-remote location) the distribution channel or media (for example, a website)
+communication by You (for example,
+by offering to download the Work from a remote location) the distribution
+channel or media (for example, a website)
 must at least provide to the public the information requested by the applicable
-law regarding the Licensor, the Licence and the way it may be accessible,
-concluded, stored and reproduced by the Licensee.
-
-   12. Termination of the Licence
+law regarding the Licensor, the Licence
+and the way it may be accessible, concluded, stored and reproduced by the
+Licensee.
 
+12.Termination of the Licence
 The Licence and the rights granted hereunder will terminate automatically
-upon any breach by the Licensee of the terms of the Licence.
-
+upon any breach by the Licensee of the terms
+of the Licence.
 Such a termination will not terminate the licences of any person who has received
-the Work from the Licensee under the Licence, provided such persons remain
-in full compliance with the Licence.
-
-   13. Miscellaneous
+the Work from the Licensee under
+the Licence, provided such persons remain in full compliance with the Licence.
 
+13.Miscellaneous
 Without prejudice of Article 9 above, the Licence represents the complete
-agreement between the Parties as to the Work.
-
+agreement between the Parties as to the
+Work.
 If any provision of the Licence is invalid or unenforceable under applicable
-law, this will not affect the validity or enforceability of the Licence as
-a whole. Such provision will be construed or reformed so as necessary to make
-it valid and enforceable.
-
+law, this will not affect the validity or
+enforceability of the Licence as a whole. Such provision will be construed
+or reformed so as necessary to make it valid
+and enforceable.
 The European Commission may publish other linguistic versions or new versions
-of this Licence or updated versions of the Appendix, so far this is required
-and reasonable, without reducing the scope of the rights granted by the Licence.
+of this Licence or updated versions of
+the Appendix, so far this is required and reasonable, without reducing the
+scope of the rights granted by the Licence.
 New versions of the Licence will be published with a unique version number.
-
 All linguistic versions of this Licence, approved by the European Commission,
-have identical value. Parties can take advantage of the linguistic version
-of their choice.
-
-   14. Jurisdiction
-
-   Without prejudice to specific agreement between parties,
+have identical value. Parties can take
+advantage of the linguistic version of their choice.
 
+14.Jurisdiction
+Without prejudice to specific agreement between parties,
 — any litigation resulting from the interpretation of this License, arising
-between the European Union institutions, bodies, offices or agencies, as a
-Licensor, and any Licensee, will be subject to the jurisdiction of the Court
-of Justice of the European Union, as laid down in article 272 of the Treaty
-on the Functioning of the European Union,
-
+between the European Union institutions,
+bodies, offices or agencies, as a Licensor, and any Licensee, will be subject
+to the jurisdiction of the Court of Justice
+of the European Union, as laid down in article 272 of the Treaty on the Functioning
+of the European Union,
 — any litigation arising between other parties and resulting from the interpretation
-of this License, will be subject to the exclusive jurisdiction of the competent
-court where the Licensor resides or conducts its primary business.
-
-   15. Applicable Law
-
-   Without prejudice to specific agreement between parties,
+of this License, will be subject to
+the exclusive jurisdiction of the competent court where the Licensor resides
+or conducts its primary business.
 
+15.Applicable Law
+Without prejudice to specific agreement between parties,
 — this Licence shall be governed by the law of the European Union Member State
-where the Licensor has his seat, resides or has his registered office,
-
+where the Licensor has his seat,
+resides or has his registered office,
 — this licence shall be governed by Belgian law if the Licensor has no seat,
-residence or registered office inside a European Union Member State.
+residence or registered office inside
+a European Union Member State.
 
-Appendix
 
-'Compatible Licences' according to Article 5 EUPL are:
-
-   — GNU General Public License (GPL) v. 2, v. 3
-
-   — GNU Affero General Public License (AGPL) v. 3
-
-   — Open Software License (OSL) v. 2.1, v. 3.0
-
-   — Eclipse Public License (EPL) v. 1.0
-
-   — CeCILL v. 2.0, v. 2.1
-
-   — Mozilla Public Licence (MPL) v. 2
-
-   — GNU Lesser General Public Licence (LGPL) v. 2.1, v. 3
+                                                         Appendix
 
+‘Compatible Licences’ according to Article 5 EUPL are:
+— GNU General Public License (GPL) v. 2, v. 3
+— GNU Affero General Public License (AGPL) v. 3
+— Open Software License (OSL) v. 2.1, v. 3.0
+— Eclipse Public License (EPL) v. 1.0
+— CeCILL v. 2.0, v. 2.1
+— Mozilla Public Licence (MPL) v. 2
+— GNU Lesser General Public Licence (LGPL) v. 2.1, v. 3
 — Creative Commons Attribution-ShareAlike v. 3.0 Unported (CC BY-SA 3.0) for
 works other than software
-
-   — European Union Public Licence (EUPL) v. 1.1, v. 1.2
-
+— European Union Public Licence (EUPL) v. 1.1, v. 1.2
 — Québec Free and Open-Source Licence — Reciprocity (LiLiQ-R) or Strong Reciprocity
 (LiLiQ-R+).
 
 The European Commission may update this Appendix to later versions of the
-above licences without producing a new version of the EUPL, as long as they
-provide the rights granted in Article 2 of this Licence and protect the covered
-Source Code from exclusive appropriation.
-
+above licences without producing
+a new version of the EUPL, as long as they provide the rights granted in Article
+2 of this Licence and protect the
+covered Source Code from exclusive appropriation.
 All other changes or additions to this Appendix require the production of
 a new EUPL version.
diff --git a/options/license/Entessa b/options/license/Entessa
index a41b7a39c2..0dd970d5a6 100644
--- a/options/license/Entessa
+++ b/options/license/Entessa
@@ -1,17 +1,17 @@
-Entessa Public License Version. 1.0 Copyright (c) 2003 Entessa, LLC. All rights
-reserved.
+Entessa Public License Version. 1.0
+Copyright (c) 2003 Entessa, LLC. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
 are permitted provided that the following conditions are met:
 
-1. Redistributions of source code must retain the above copyright notice,
+1.  Redistributions of source code must retain the above copyright notice,
 this list of conditions and the following disclaimer.
 
-2. Redistributions in binary form must reproduce the above copyright notice,
+2.  Redistributions in binary form must reproduce the above copyright notice,
 this list of conditions and the following disclaimer in the documentation
 and/or other materials provided with the distribution.
 
-3. The end-user documentation included with the redistribution, if any, must
+3.  The end-user documentation included with the redistribution, if any, must
 include the following acknowledgment:
 
 "This product includes open source software developed by openSEAL (http://www.openseal.org/)."
@@ -19,12 +19,12 @@ include the following acknowledgment:
 Alternately, this acknowledgment may appear in the software itself, if and
 wherever such third-party acknowledgments normally appear.
 
-4. The names "openSEAL" and "Entessa" must not be used to endorse or promote
+4.  The names "openSEAL" and "Entessa" must not be used to endorse or promote
 products derived from this software without prior written permission. For
 written permission, please contact epl@entessa.com.
 
-5. Products derived from this software may not be called "openSEAL", nor may
-"openSEAL" appear in their name, without prior written permission of Entessa.
+5.  Products derived from this software may not be called "openSEAL", nor
+may "openSEAL" appear in their name, without prior written permission of Entessa.
 
 THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
 INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
diff --git a/options/license/ErlPL-1.1 b/options/license/ErlPL-1.1
index 6cdb9bc977..5c23b04426 100644
--- a/options/license/ErlPL-1.1
+++ b/options/license/ErlPL-1.1
@@ -1,6 +1,6 @@
 ERLANG PUBLIC LICENSE Version 1.1
 
-   1. Definitions.
+1. Definitions.
 
 1.1. ``Contributor'' means each entity that creates or contributes to the
 creation of Modifications.
@@ -23,7 +23,7 @@ Initial Developer in the Source Code notice required by Exhibit A.
 1.7. ``Larger Work'' means a work which combines Covered Code or portions
 thereof with code not governed by the terms of this License.
 
-      1.8. ``License'' means this document.
+1.8. ``License'' means this document.
 
 1.9. ``Modifications'' means any addition to or deletion from the substance
 or structure of either the Original Code or any previous Modifications. When
@@ -49,14 +49,14 @@ form, provided the appropriate decompression or de-archiving software is widely
 available for no charge.
 
 1.12. ``You'' means an individual or a legal entity exercising rights under,
-and complying with all of the terms of, this License. For legal entities,
-``You'' includes any entity which controls, is controlled by, or is under
-common control with You. For purposes of this definition, ``control'' means
-(a) the power, direct or indirect, to cause the direction or management of
-such entity, whether by contract or otherwise, or (b) ownership of fifty percent
-(50%) or more of the outstanding shares or beneficial ownership of such entity.
+and complying with all of the terms of, this License. For legal entities,``You''
+includes any entity which controls, is controlled by, or is under common control
+with You. For purposes of this definition, ``control'' means (a) the power,
+direct or indirect, to cause the direction or management of such entity, whether
+by contract or otherwise, or (b) ownership of fifty percent (50%) or more
+of the outstanding shares or beneficial ownership of such entity.
 
-   2. Source Code License.
+2. Source Code License.
 
 2.1. The Initial Developer Grant. The Initial Developer hereby grants You
 a world-wide, royalty-free, non-exclusive license, subject to third party
@@ -87,7 +87,7 @@ that any such patent is reasonably necessary to enable You to Utilize the
 Contributor Version (or portions thereof), and not to any greater extent that
 may be necessary to Utilize further Modifications or combinations.
 
-   3. Distribution Obligations.
+3. Distribution Obligations.
 
 3.1. Application of License. The Modifications which You contribute are governed
 by the terms of this License, including without limitation Section 2.2. The
@@ -119,7 +119,7 @@ Developer in (a) the Source Code, and (b) in any notice in an Executable version
 or related documentation in which You describe the origin or ownership of
 the Covered Code.
 
-      3.4. Intellectual Property Matters
+3.4. Intellectual Property Matters
 
 (a) Third Party Claims. If You have knowledge that a party claims an intellectual
 property right in particular functionality or code (or its utilization under
@@ -187,19 +187,16 @@ of the Source Code. Except to the extent prohibited by statute or regulation,
 such description must be sufficiently detailed for a recipient of ordinary
 skill to be able to understand it.
 
-   5. Application of this License.
-
+5. Application of this License.
 This License applies to code to which the Initial Developer has attached the
 notice in Exhibit A, and to related Covered Code.
 
-   6. CONNECTION TO MOZILLA PUBLIC LICENSE
-
+6. CONNECTION TO MOZILLA PUBLIC LICENSE
 This Erlang License is a derivative work of the Mozilla Public License, Version
 1.0. It contains terms which differ from the Mozilla Public License, Version
 1.0.
 
-   7. DISCLAIMER OF WARRANTY.
-
+7. DISCLAIMER OF WARRANTY.
 COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN ``AS IS'' BASIS, WITHOUT
 WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION,
 WARRANTIES THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR
@@ -210,8 +207,7 @@ ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIME
 OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED
 CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
 
-   8. TERMINATION.
-
+8. TERMINATION.
 This License and the rights granted hereunder will terminate automatically
 if You fail to comply with terms herein and fail to cure such breach within
 30 days of becoming aware of the breach. All sublicenses to the Covered Code
@@ -219,13 +215,11 @@ which are properly granted shall survive any termination of this License.
 Provisions which, by their nature, must remain in effect beyond the termination
 of this License shall survive.
 
-   9. DISCLAIMER OF LIABILITY
-
+9. DISCLAIMER OF LIABILITY
 Any utilization of Covered Code shall not cause the Initial Developer or any
 Contributor to be liable for any damages (neither direct nor indirect).
 
-   10. MISCELLANEOUS
-
+10. MISCELLANEOUS
 This License represents the complete agreement concerning the subject matter
 hereof. If any provision is held to be unenforceable, such provision shall
 be reformed only to the extent necessary to make it enforceable. This License
diff --git a/options/license/Eurosym b/options/license/Eurosym
index 23b2b6a794..57af509b73 100644
--- a/options/license/Eurosym
+++ b/options/license/Eurosym
@@ -1,9 +1,6 @@
-Copyright (c) 1999-2002 Henrik Theiling 
-
+Copyright (c) 1999-2002 Henrik Theiling
 Licence Version 2
 
-
-
 This software is provided 'as-is', without warranty of any kind, express or
 implied. In no event will the authors or copyright holders be held liable
 for any damages arising from the use of this software.
@@ -27,7 +24,7 @@ without specific, written prior permission.
 form, you must make the source code of the altered version of this software
 available.
 
-   5. This notice may not be removed or altered from any source distribution.
+     5. This notice may not be removed or altered from any source distribution.
 
 This licence is governed by the Laws of Germany. Disputes shall be settled
 by Saarbruecken City Court.
diff --git a/options/license/FSFAP b/options/license/FSFAP
index 622a276846..c96c65ebad 100644
--- a/options/license/FSFAP
+++ b/options/license/FSFAP
@@ -1,3 +1,3 @@
 Copying and distribution of this file, with or without modification, are permitted
 in any medium without royalty provided the copyright notice and this notice
-are preserved. This file is offered as-is, without any warranty.
+are preserved.  This file is offered as-is, without any warranty.
diff --git a/options/license/FTL b/options/license/FTL
index fa5f98d6a6..4b6557af25 100644
--- a/options/license/FTL
+++ b/options/license/FTL
@@ -1,7 +1,8 @@
 The FreeType Project LICENSE
 
-2006-Jan-27 Copyright 1996-2002, 2006 by David Turner, Robert Wilhelm, and
-Werner Lemberg
+2006-Jan-27
+
+Copyright 1996-2002, 2006 by David Turner, Robert Wilhelm, and Werner Lemberg
 
 Introduction
 
@@ -45,7 +46,7 @@ use.
 
 Legal Terms
 
-   0. Definitions
+0. Definitions
 
 Throughout this license, the terms `package', `FreeType Project', and `FreeType
 archive' refer to the set of files originally distributed by the authors (David
@@ -66,7 +67,7 @@ this license, you must contact us to verify this.
 The FreeType Project is copyright (C) 1996-2000 by David Turner, Robert Wilhelm,
 and Werner Lemberg. All rights reserved except as specified below.
 
-   1. No Warranty
+1. No Warranty
 
 THE FREETYPE PROJECT IS PROVIDED `AS IS' WITHOUT WARRANTY OF ANY KIND, EITHER
 EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY
@@ -74,7 +75,7 @@ AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT WILL ANY OF THE AUTHORS
 OR COPYRIGHT HOLDERS BE LIABLE FOR ANY DAMAGES CAUSED BY THE USE OR THE INABILITY
 TO USE, OF THE FREETYPE PROJECT.
 
-   2. Redistribution
+2. Redistribution
 
 This license grants a worldwide, royalty-free, perpetual and irrevocable right
 and license to use, execute, perform, compile, display, copy, create derivative
@@ -98,7 +99,7 @@ These conditions apply to any software derived from or based on the FreeType
 Project, not just the unmodified files. If you use our work, you must acknowledge
 us. However, no fee need be paid to us.
 
-   3. Advertising
+3. Advertising
 
 Neither the FreeType authors and contributors nor you shall use the name of
 the other for commercial, advertising, or promotional purposes without specific
@@ -115,21 +116,23 @@ and modify it. Therefore, by using, distributing, or modifying the FreeType
 Project, you indicate that you understand and accept all the terms of this
 license.
 
-   4. Contacts
+4. Contacts
 
-   There are two mailing lists related to FreeType:
+There are two mailing lists related to FreeType:
 
-      o freetype@nongnu.org
+     o freetype@nongnu.org
 
 Discusses general use and applications of FreeType, as well as future and
 wanted additions to the library and distribution. If you are looking for support,
 start in this list if you haven't found anything to help you in the documentation.
 
-      o freetype-devel@nongnu.org
+     o freetype-devel@nongnu.org
 
 Discusses bugs, as well as engine internals, design issues, specific licenses,
 porting, etc.
 
-   Our home page can be found at
+Our home page can be found at
 
-   http://www.freetype.org --- end of FTL.TXT ---
+ http://www.freetype.org
+
+--- end of FTL.TXT ---
diff --git a/options/license/Fair b/options/license/Fair
index 9642931122..d8a67c37cf 100644
--- a/options/license/Fair
+++ b/options/license/Fair
@@ -1,7 +1,11 @@
-Fair License <Copyright Information>
+Fair License
+
+<Copyright Information>
 
 Usage of the works is permitted provided that this instrument is retained
 with the works, so that any entity that uses the works is notified of this
 instrument.
 
 DISCLAIMER: THE WORKS ARE WITHOUT WARRANTY.
+
+[2004, Fair License: rhid.com/fair (this URL no longer works)]
diff --git a/options/license/Frameworx-1.0 b/options/license/Frameworx-1.0
index de123890ac..2b596ae3df 100644
--- a/options/license/Frameworx-1.0
+++ b/options/license/Frameworx-1.0
@@ -6,7 +6,6 @@ of Your acceptance of the Frameworx Code Base or an Downstream Distribution
 (each as defined below).
 
 AGREEMENT BACKGROUND
-
 The Frameworx Company is committed to the belief that open source software
 results in better quality, greater technical and product innovation in the
 market place and a more empowered and productive developer and end-user community.
@@ -17,10 +16,9 @@ Base, without royalties and in source code form, to the community pursuant
 to this License Agreement.
 
 AGREEMENT TERMS
-
 The Frameworx Company and You have agreed as follows:
 
-   1. Definitions.The following terms have the following respective meanings:
+1.Definitions.The following terms have the following respective meanings:
 
 (a) Frameworx Code Base means the software developed by The Frameworx Company
 and made available under this License Agreement
@@ -66,7 +64,7 @@ your exercise of all rights in connection with this License Agreement, will
 remain subject to the following terms and conditions, as well as to the other
 provisions hereof:
 
-(a) Complete Source Code for any Downstream Distribution directly or indirectly
+(a)     Complete Source Code for any Downstream Distribution directly or indirectly
 made by You that contains, or depends for its intended functionality on, the
 Frameworx Code Base, or any portion or element thereof, shall be made freely
 available to all users thereof on terms and conditions no more restrictive,
@@ -74,14 +72,14 @@ and no less favorable for any user (including, without limitation, with regard
 to Source Code availability and royalty-free use) than those terms and conditions
 provided in this License Agreement.
 
-(b) Any Value-Added Services that you offer or provide, directly or indirectly,
+(b)     Any Value-Added Services that you offer or provide, directly or indirectly,
 in relation to any Downstream Distribution shall be offered and provided on
 commercial terms that are reasonably commensurate to the fair market value
 of such Value-Added Services. In addition, the terms and conditions on which
 any such Value Added Services are so offered or provided shall be consistent
 with, and shall fully support, the intent and purpose of this License Agreement.
 
-      (c) All Downstream Distributions shall:
+     (c)     All Downstream Distributions shall:
 
 (i) include all portions and elements of the Frameworx Code Base required
 to build the Source Code of such Downstream Distribution into a fully functional
@@ -169,5 +167,6 @@ violation. This License Agreement shall be binding on the legal successors
 and assigns of the parties hereto.
 
 Your agreement to the foregoing as of the date hereof has been evidenced by
-your acceptance of the relevant software distribution hereunder. (C) THE FRAMEWORX
-COMPANY 2003
+your acceptance of the relevant software distribution hereunder.
+
+(C) THE FRAMEWORX COMPANY 2003
diff --git a/options/license/FreeImage b/options/license/FreeImage
index 4f7a4b4725..6b86603038 100644
--- a/options/license/FreeImage
+++ b/options/license/FreeImage
@@ -1,6 +1,6 @@
 FreeImage Public License - Version 1.0
 
-   1. Definitions.
+1. Definitions.
 
 1.1. "Contributor" means each entity that creates or contributes to the creation
 of Modifications.
@@ -15,7 +15,7 @@ of the Original Code and Modifications, in each case including portions thereof.
 1.4. "Electronic Distribution Mechanism" means a mechanism generally accepted
 in the software development community for the electronic transfer of data.
 
-      1.5. "Executable" means Covered Code in any form other than Source Code.
+     1.5. "Executable" means Covered Code in any form other than Source Code.
 
 1.6. "Initial Developer" means the individual or entity identified as the
 Initial Developer in the Source Code notice required by Exhibit A.
@@ -23,17 +23,15 @@ Initial Developer in the Source Code notice required by Exhibit A.
 1.7. "Larger Work" means a work which combines Covered Code or portions thereof
 with code not governed by the terms of this License.
 
-      1.8. "License" means this document.
+     1.8. "License" means this document.
 
 1.9. "Modifications" means any addition to or deletion from the substance
 or structure of either the Original Code or any previous Modifications. When
 Covered Code is released as a series of files, a
-
-      Modification is:
+Modification is:
 
 A. Any addition to or deletion from the contents of a file containing Original
 Code or previous Modifications.
-
 B. Any new file that contains any part of the Original Code or previous Modifications.
 
 1.10. "Original Code" means Source Code of computer software code which is
@@ -59,10 +57,9 @@ or indirect, to cause the direction or management of such entity, whether
 by contract or otherwise, or (b) ownership of fifty percent (50%) or more
 of the outstanding shares or beneficial ownership of such entity.
 
-   2. Source Code License.
-
-      2.1. The Initial Developer Grant.
+2. Source Code License.
 
+     2.1. The Initial Developer Grant.
 The Initial Developer hereby grants You a world-wide, royalty-free, non-exclusive
 license, subject to third party intellectual property claims:
 
@@ -77,8 +74,7 @@ to enable You to Utilize the Original Code (or portions thereof) and not to
 any greater extent that may be necessary to Utilize further Modifications
 or combinations.
 
-      2.2. Contributor Grant.
-
+     2.2. Contributor Grant.
 Each Contributor hereby grants You a world-wide, royalty-free, non-exclusive
 license, subject to third party intellectual property claims:
 
@@ -93,10 +89,9 @@ that any such patent is reasonably necessary to enable You to Utilize the
 Contributor Version (or portions thereof), and not to any greater extent that
 may be necessary to Utilize further Modifications or combinations.
 
-   3. Distribution Obligations.
-
-      3.1. Application of License.
+3. Distribution Obligations.
 
+     3.1. Application of License.
 The Modifications which You create or to which You contribute are governed
 by the terms of this License, including without limitation Section 2.2. The
 Source Code version of Covered Code may be distributed only under the terms
@@ -107,8 +102,7 @@ version that alters or restricts the applicable version of this License or
 the recipients' rights hereunder. However, You may include an additional document
 offering the additional rights described in Section 3.5.
 
-      3.2. Availability of Source Code.
-
+     3.2. Availability of Source Code.
 Any Modification which You create or to which You contribute must be made
 available in Source Code form under the terms of this License either on the
 same media as an Executable version or via an accepted Electronic Distribution
@@ -120,8 +114,7 @@ has been made available to such recipients. You are responsible for ensuring
 that the Source Code version remains available even if the Electronic Distribution
 Mechanism is maintained by a third party.
 
-      3.3. Description of Modifications.
-
+     3.3. Description of Modifications.
 You must cause all Covered Code to which you contribute to contain a file
 documenting the changes You made to create that Covered Code and the date
 of any change. You must include a prominent statement that the Modification
@@ -130,10 +123,9 @@ Developer and including the name of the Initial Developer in (a) the Source
 Code, and (b) in any notice in an Executable version or related documentation
 in which You describe the origin or ownership of the Covered Code.
 
-      3.4. Intellectual Property Matters
-
-         (a) Third Party Claims.
+     3.4. Intellectual Property Matters
 
+          (a) Third Party Claims.
 If You have knowledge that a party claims an intellectual property right in
 particular functionality or code (or its utilization under this License),
 you must include a text file with the source code distribution titled "LEGAL"
@@ -145,14 +137,12 @@ and shall take other steps (such as notifying appropriate mailing lists or
 newsgroups) reasonably calculated to inform those who received the Covered
 Code that new knowledge has been obtained.
 
-         (b) Contributor APIs.
-
+          (b) Contributor APIs.
 If Your Modification is an application programming interface and You own or
 control patents which are reasonably necessary to implement that API, you
 must also include this information in the LEGAL file.
 
-      3.5. Required Notices.
-
+     3.5. Required Notices.
 You must duplicate the notice in Exhibit A in each file of the Source Code,
 and this License in any documentation for the Source Code, where You describe
 recipients' rights relating to Covered Code. If You created one or more Modification(s),
@@ -169,8 +159,7 @@ and You hereby agree to indemnify the Initial Developer and every Contributor
 for any liability incurred by the Initial Developer or such Contributor as
 a result of warranty, support, indemnity or liability terms You offer.
 
-      3.6. Distribution of Executable Versions.
-
+     3.6. Distribution of Executable Versions.
 You may distribute Covered Code in Executable form only if the requirements
 of Section 3.1-3.5 have been met for that Covered Code, and if You include
 a notice stating that the Source Code version of the Covered Code is available
@@ -179,7 +168,7 @@ You have fulfilled the obligations of Section 3.2. The notice must be conspicuou
 included in any notice in an Executable version, related documentation or
 collateral in which You descr ibe recipients' rights relating to the Covered
 Code. You may distribute the Executable version of Covered Code under a license
-of Your choice, which may contain terms different from this License, provided
+of Your choice, which may contain terms different from this License,provided
 that You are in compliance with the terms of this License and that the license
 for the Executable version does not attempt to limit or alter the recipient's
 rights in the Source Code version from the rights set forth in this License.
@@ -190,15 +179,13 @@ hereby agree to indemnify the Initial Developer and every Contributor for
 any liability incurred by the Initial Developer or such Contributor as a result
 of any such terms You offer.
 
-      3.7. Larger Works.
-
+     3.7. Larger Works.
 You may create a Larger Work by combining Covered Code with other code not
 governed by the terms of this License and distribute the Larger Work as a
 single product. In such a case, You must make sure the requirements of this
 License are fulfilled for the Covered Code.
 
-   4. Inability to Comply Due to Statute or Regulation.
-
+4. Inability to Comply Due to Statute or Regulation.
 If it is impossible for You to comply with any of the terms of this License
 with respect to some or all of the Covered Code due to statute or regulation
 then You must: (a) comply with the terms of this License to the maximum extent
@@ -208,30 +195,25 @@ must be included with all distributions of the Source Code. Except to the
 extent prohibited by statute or regulation, such description must be sufficiently
 detailed for a recipient of ordinary skill to be able to understand it.
 
-   5. Application of this License.
-
+5. Application of this License.
 This License applies to code to which the Initial Developer has attached the
 notice in Exhibit A, and to related Covered Code.
 
-   6. Versions of the License.
-
-      6.1. New Versions.
+6. Versions of the License.
 
+     6.1. New Versions.
 Floris van den Berg may publish revised and/or new versions of the License
 from time to time. Each version will be given a distinguishing version number.
 
-      6.2. Effect of New Versions.
-
+     6.2. Effect of New Versions.
 Once Covered Code has been published under a particular version of the License,
 You may always continue to use it under the terms of that version. You may
 also choose to use such Covered Code under the terms of any subsequent version
 of the License published by Floris van den Berg
-
 No one other than Floris van den Berg has the right to modify the terms applicable
 to Covered Code created under this License.
 
-      6.3. Derivative Works.
-
+     6.3. Derivative Works.
 If you create or use a modified version of this License (which you may only
 do in order to apply it to code which is not already Covered Code governed
 by this License), you must (a) rename Your license so that the phrases "FreeImage",
@@ -242,8 +224,7 @@ License. (Filling in the name of the Initial Developer, Original Code or Contrib
 in the notice described in Exhibit A shall not of themselves be deemed to
 be modifications of this License.)
 
-   7. DISCLAIMER OF WARRANTY.
-
+7. DISCLAIMER OF WARRANTY.
 COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTY
 OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES
 THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR
@@ -254,8 +235,7 @@ THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER
 OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED
 CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
 
-   8. TERMINATION.
-
+8. TERMINATION.
 This License and the rights granted hereunder will terminate automatically
 if You fail to comply with terms herein and fail to cure such breach within
 30 days of becoming aware of the breach. All sublicenses to the Covered Code
@@ -263,8 +243,7 @@ which are properly granted shall survive any termination of this License.
 Provisions which, by their nature, must remain in effect beyond the termination
 of this License shall survive.
 
-   9. LIMITATION OF LIABILITY.
-
+9. LIMITATION OF LIABILITY.
 UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING
 NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE INITIAL DEVELOPER, ANY OTHER
 CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE, OR ANY SUPPLIER OF ANY OF
@@ -279,8 +258,7 @@ SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL
 OR CONSEQUENTIAL DAMAGES, SO THAT EXCLUSION AND LIMITATION MAY NOT APPLY TO
 YOU.
 
-   10. U.S. GOVERNMENT END USERS.
-
+10. U.S. GOVERNMENT END USERS.
 The Covered Code is a "commercial item," as that term is defined in 48 C.F.R.
 2.101 (Oct. 1995), consisting of "commercial computer software" and "commercial
 computer software documentation," as such terms are used in 48 C.F.R. 12.212
@@ -288,8 +266,7 @@ computer software documentation," as such terms are used in 48 C.F.R. 12.212
 227.7202-4 (June 1995), all U.S. Government End Users acquire Covered Code
 with only those rights set forth herein.
 
-   11. MISCELLANEOUS.
-
+11. MISCELLANEOUS.
 This License represents the complete agreement concerning 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. This
@@ -308,14 +285,15 @@ limitation, court costs and reasonable attorneys fees and expenses. Any law
 or regulation which provides that the language of a contract shall be construed
 against the drafter shall not apply to this License.
 
-   12. RESPONSIBILITY FOR CLAIMS.
-
+12. RESPONSIBILITY FOR CLAIMS.
 Except in cases where another Contributor has failed to comply with Section
 3.4, You are responsible for damages arising, directly or indirectly, out
 of Your utilization of rights under this License, based on the number of copies
 of Covered Code you made available, the revenues you received from utilizing
 such rights, and other relevant factors. You agree to work with affected parties
-to distribute responsibility on an equitable basis. EXHIBIT A.
+to distribute responsibility on an equitable basis.
+
+EXHIBIT A.
 
 "The contents of this file are subject to the FreeImage Public License Version
 1.0 (the "License"); you may not use this file except in compliance with the
diff --git a/options/license/GCC-exception-2.0 b/options/license/GCC-exception-2.0
index 1a8c3bddfc..642ecdd736 100644
--- a/options/license/GCC-exception-2.0
+++ b/options/license/GCC-exception-2.0
@@ -1 +1 @@
-In addition to the permissions in the GNU Library General Public License, the Free Software Foundation gives you unlimited permission to link the compiled version of this file into combinations with other programs, and to distribute those programs without any restriction coming from the use of this file. (The General Public License restrictions do apply in other respects; for example, they cover modification of the file, and distribution when not linked into another program .)
+In addition to the permissions in the GNU General Public License, the Free Software Foundation gives you unlimited permission to link the compiled version of this file into combinations with other programs, and to distribute those combinations without any restriction coming from the use of this file. (The General Public License restrictions do apply in other respects; for example, they cover modification of the file, and distribution when not linked into a combine executable.)
diff --git a/options/license/GCC-exception-3.1 b/options/license/GCC-exception-3.1
index 2172f86fb8..3d8345bec5 100644
--- a/options/license/GCC-exception-3.1
+++ b/options/license/GCC-exception-3.1
@@ -3,33 +3,31 @@ GCC RUNTIME LIBRARY EXCEPTION
 Version 3.1, 31 March 2009
 
 General information: http://www.gnu.org/licenses/gcc-exception.html
-
 Copyright (C) 2009 Free Software Foundation, Inc. <http://fsf.org/>
 
 Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.
-
 This GCC Runtime Library Exception ("Exception") is an additional permission under section 7 of the GNU General Public License, version 3 ("GPLv3"). It applies to a given file (the "Runtime Library") that bears a notice placed by the copyright holder of the file stating that the file is governed by GPLv3 along with this Exception.
 
 When you use GCC to compile a program, GCC may combine portions of certain GCC header files and runtime libraries with the compiled program. The purpose of this Exception is to allow compilation of non-GPL (including proprietary) programs to use, in this way, the header files and runtime libraries covered by this Exception.
 
-   0. Definitions.
+0. Definitions.
 
-   A file is an "Independent Module" if it either requires the Runtime Library for execution after a Compilation Process, or makes use of an interface provided by the Runtime Library, but is not otherwise based on the Runtime Library.
+A file is an "Independent Module" if it either requires the Runtime Library for execution after a Compilation Process, or makes use of an interface provided by the Runtime Library, but is not otherwise based on the Runtime Library.
 
-   "GCC" means a version of the GNU Compiler Collection, with or without modifications, governed by version 3 (or a specified later version) of the GNU General Public License (GPL) with the option of using any subsequent versions published by the FSF.
+"GCC" means a version of the GNU Compiler Collection, with or without modifications, governed by version 3 (or a specified later version) of the GNU General Public License (GPL) with the option of using any subsequent versions published by the FSF.
 
-   "GPL-compatible Software" is software whose conditions of propagation, modification and use would permit combination with GCC in accord with the license of GCC.
+"GPL-compatible Software" is software whose conditions of propagation, modification and use would permit combination with GCC in accord with the license of GCC.
 
-   "Target Code" refers to output from any compiler for a real or virtual target processor architecture, in executable form or suitable for input to an assembler, loader, linker and/or execution phase. Notwithstanding that, Target Code does not include data in any format that is used as a compiler intermediate representation, or used for producing a compiler intermediate representation.
+"Target Code" refers to output from any compiler for a real or virtual target processor architecture, in executable form or suitable for input to an assembler, loader, linker and/or execution phase. Notwithstanding that, Target Code does not include data in any format that is used as a compiler intermediate representation, or used for producing a compiler intermediate representation.
 
-   The "Compilation Process" transforms code entirely represented in non-intermediate languages designed for human-written code, and/or in Java Virtual Machine byte code, into Target Code. Thus, for example, use of source code generators and preprocessors need not be considered part of the Compilation Process, since the Compilation Process can be understood as starting with the output of the generators or preprocessors.
+The "Compilation Process" transforms code entirely represented in non-intermediate languages designed for human-written code, and/or in Java Virtual Machine byte code, into Target Code. Thus, for example, use of source code generators and preprocessors need not be considered part of the Compilation Process, since the Compilation Process can be understood as starting with the output of the generators or preprocessors.
 
-   A Compilation Process is "Eligible" if it is done using GCC, alone or with other GPL-compatible software, or if it is done without using any work based on GCC. For example, using non-GPL-compatible Software to optimize any GCC intermediate representations would not qualify as an Eligible Compilation Process.
+A Compilation Process is "Eligible" if it is done using GCC, alone or with other GPL-compatible software, or if it is done without using any work based on GCC. For example, using non-GPL-compatible Software to optimize any GCC intermediate representations would not qualify as an Eligible Compilation Process.
 
-   1. Grant of Additional Permission.
+1. Grant of Additional Permission.
 
-   You have permission to propagate a work of Target Code formed by combining the Runtime Library with Independent Modules, even if such propagation would otherwise violate the terms of GPLv3, provided that all Target Code was generated by Eligible Compilation Processes. You may then convey such a combination under terms of your choice, consistent with the licensing of the Independent Modules.
+You have permission to propagate a work of Target Code formed by combining the Runtime Library with Independent Modules, even if such propagation would otherwise violate the terms of GPLv3, provided that all Target Code was generated by Eligible Compilation Processes. You may then convey such a combination under terms of your choice, consistent with the licensing of the Independent Modules.
 
-   2. No Weakening of GCC Copyleft.
+2. No Weakening of GCC Copyleft.
 
 The availability of this Exception does not imply any general presumption that third-party software is unaffected by the copyleft requirements of the license of GCC.
diff --git a/options/license/GFDL-1.1-invariants-only b/options/license/GFDL-1.1-invariants-only
index d63c80021c..309d87fff0 100644
--- a/options/license/GFDL-1.1-invariants-only
+++ b/options/license/GFDL-1.1-invariants-only
@@ -1,5 +1,4 @@
 GNU Free Documentation License
-
 Version 1.1, March 2000
 
 Copyright (C) 2000 Free Software Foundation, Inc. 51 Franklin St, Fifth Floor,
@@ -8,7 +7,7 @@ Boston, MA 02110-1301 USA
 Everyone is permitted to copy and distribute verbatim copies of this license
 document, but changing it is not allowed.
 
-   0. PREAMBLE
+0. PREAMBLE
 
 The purpose of this License is to make a manual, textbook, or other written
 document "free" in the sense of freedom: to assure everyone the effective
@@ -30,7 +29,7 @@ work, regardless of subject matter or whether it is published as a printed
 book. We recommend this License principally for works whose purpose is instruction
 or reference.
 
-   1. APPLICABILITY AND DEFINITIONS
+1. APPLICABILITY AND DEFINITIONS
 
 This License applies to any manual or other work that contains a notice placed
 by the copyright holder saying it can be distributed under the terms of this
@@ -84,7 +83,7 @@ any title page as such, "Title Page" means the text near the most prominent
 appearance of the work's title, preceding the beginning of the body of the
 text.
 
-   2. VERBATIM COPYING
+2. VERBATIM COPYING
 
 You may copy and distribute the Document in any medium, either commercially
 or noncommercially, provided that this License, the copyright notices, and
@@ -98,7 +97,7 @@ enough number of copies you must also follow the conditions in section 3.
 You may also lend copies, under the same conditions stated above, and you
 may publicly display copies.
 
-   3. COPYING IN QUANTITY
+3. COPYING IN QUANTITY
 
 If you publish printed copies of the Document numbering more than 100, and
 the Document's license notice requires Cover Texts, you must enclose the copies
@@ -131,7 +130,7 @@ It is requested, but not required, that you contact the authors of the Document
 well before redistributing any large number of copies, to give them a chance
 to provide you with an updated version of the Document.
 
-   4. MODIFICATIONS
+4. MODIFICATIONS
 
 You may copy and distribute a Modified Version of the Document under the conditions
 of sections 2 and 3 above, provided that you release the Modified Version
@@ -145,54 +144,41 @@ that of the Document, and from those of previous versions (which should, if
 there were any, be listed in the History section of the Document). You may
 use the same title as a previous version if the original publisher of that
 version gives permission.
-
 B. List on the Title Page, as authors, one or more persons or entities responsible
 for authorship of the modifications in the Modified Version, together with
 at least five of the principal authors of the Document (all of its principal
 authors, if it has less than five).
-
 C. State on the Title page the name of the publisher of the Modified Version,
 as the publisher.
-
-      D. Preserve all the copyright notices of the Document.
-
+     D. Preserve all the copyright notices of the Document.
 E. Add an appropriate copyright notice for your modifications adjacent to
 the other copyright notices.
-
 F. Include, immediately after the copyright notices, a license notice giving
 the public permission to use the Modified Version under the terms of this
 License, in the form shown in the Addendum below.
-
 G. Preserve in that license notice the full lists of Invariant Sections and
 required Cover Texts given in the Document's license notice.
-
-      H. Include an unaltered copy of this License.
-
+     H. Include an unaltered copy of this License.
 I. Preserve the section entitled "History", and its title, and add to it an
 item stating at least the title, year, new authors, and publisher of the Modified
 Version as given on the Title Page. If there is no section entitled "History"
 in the Document, create one stating the title, year, authors, and publisher
 of the Document as given on its Title Page, then add an item describing the
 Modified Version as stated in the previous sentence.
-
 J. Preserve the network location, if any, given in the Document for public
 access to a Transparent copy of the Document, and likewise the network locations
 given in the Document for previous versions it was based on. These may be
 placed in the "History" section. You may omit a network location for a work
 that was published at least four years before the Document itself, or if the
 original publisher of the version it refers to gives permission.
-
 K. In any section entitled "Acknowledgements" or "Dedications", preserve the
 section's title, and preserve in the section all the substance and tone of
 each of the contributor acknowledgements and/or dedications given therein.
-
 L. Preserve all the Invariant Sections of the Document, unaltered in their
 text and in their titles. Section numbers or the equivalent are not considered
 part of the section titles.
-
 M. Delete any section entitled "Endorsements". Such a section may not be included
 in the Modified Version.
-
 N. Do not retitle any existing section as "Endorsements" or to conflict in
 title with any Invariant Section.
 
@@ -221,7 +207,7 @@ The author(s) and publisher(s) of the Document do not by this License give
 permission to use their names for publicity for or to assert or imply endorsement
 of any Modified Version.
 
-   5. COMBINING DOCUMENTS
+5. COMBINING DOCUMENTS
 
 You may combine the Document with other documents released under this License,
 under the terms defined in section 4 above for modified versions, provided
@@ -243,7 +229,7 @@ various original documents, forming one section entitled "History"; likewise
 combine any sections entitled "Acknowledgements", and any sections entitled
 "Dedications". You must delete all sections entitled "Endorsements."
 
-   6. COLLECTIONS OF DOCUMENTS
+6. COLLECTIONS OF DOCUMENTS
 
 You may make a collection consisting of the Document and other documents released
 under this License, and replace the individual copies of this License in the
@@ -256,7 +242,7 @@ individually under this License, provided you insert a copy of this License
 into the extracted document, and follow this License in all other respects
 regarding verbatim copying of that document.
 
-   7. AGGREGATION WITH INDEPENDENT WORKS
+7. AGGREGATION WITH INDEPENDENT WORKS
 
 A compilation of the Document or its derivatives with other separate and independent
 documents or works, in or on a volume of a storage or distribution medium,
@@ -272,7 +258,7 @@ aggregate, the Document's Cover Texts may be placed on covers that surround
 only the Document within the aggregate. Otherwise they must appear on covers
 around the whole aggregate.
 
-   8. TRANSLATION
+8. TRANSLATION
 
 Translation is considered a kind of modification, so you may distribute translations
 of the Document under the terms of section 4. Replacing Invariant Sections
@@ -284,7 +270,7 @@ of this License. In case of a disagreement between the translation and the
 original English version of this License, the original English version will
 prevail.
 
-   9. TERMINATION
+9. TERMINATION
 
 You may not copy, modify, sublicense, or distribute the Document except as
 expressly provided for under this License. Any other attempt to copy, modify,
@@ -293,7 +279,7 @@ your rights under this License. However, parties who have received copies,
 or rights, from you under this License will not have their licenses terminated
 so long as such parties remain in full compliance.
 
-   10. FUTURE REVISIONS OF THIS LICENSE
+10. FUTURE REVISIONS OF THIS LICENSE
 
 The Free Software Foundation may publish new, revised versions of the GNU
 Free Documentation License from time to time. Such new versions will be similar
@@ -307,6 +293,7 @@ and conditions either of that specified version or of any later version that
 has been published (not as a draft) by the Free Software Foundation. If the
 Document does not specify a version number of this License, you may choose
 any version ever published (not as a draft) by the Free Software Foundation.
+
 ADDENDUM: How to use this License for your documents
 
 To use this License in a document you have written, include a copy of the
diff --git a/options/license/GFDL-1.1-invariants-or-later b/options/license/GFDL-1.1-invariants-or-later
index 3a6519b4ca..309d87fff0 100644
--- a/options/license/GFDL-1.1-invariants-or-later
+++ b/options/license/GFDL-1.1-invariants-or-later
@@ -1,5 +1,4 @@
 GNU Free Documentation License
-
 Version 1.1, March 2000
 
 Copyright (C) 2000 Free Software Foundation, Inc. 51 Franklin St, Fifth Floor,
@@ -8,7 +7,7 @@ Boston, MA 02110-1301 USA
 Everyone is permitted to copy and distribute verbatim copies of this license
 document, but changing it is not allowed.
 
-   0. PREAMBLE
+0. PREAMBLE
 
 The purpose of this License is to make a manual, textbook, or other written
 document "free" in the sense of freedom: to assure everyone the effective
@@ -30,7 +29,7 @@ work, regardless of subject matter or whether it is published as a printed
 book. We recommend this License principally for works whose purpose is instruction
 or reference.
 
-   1. APPLICABILITY AND DEFINITIONS
+1. APPLICABILITY AND DEFINITIONS
 
 This License applies to any manual or other work that contains a notice placed
 by the copyright holder saying it can be distributed under the terms of this
@@ -84,7 +83,7 @@ any title page as such, "Title Page" means the text near the most prominent
 appearance of the work's title, preceding the beginning of the body of the
 text.
 
-   2. VERBATIM COPYING
+2. VERBATIM COPYING
 
 You may copy and distribute the Document in any medium, either commercially
 or noncommercially, provided that this License, the copyright notices, and
@@ -98,7 +97,7 @@ enough number of copies you must also follow the conditions in section 3.
 You may also lend copies, under the same conditions stated above, and you
 may publicly display copies.
 
-   3. COPYING IN QUANTITY
+3. COPYING IN QUANTITY
 
 If you publish printed copies of the Document numbering more than 100, and
 the Document's license notice requires Cover Texts, you must enclose the copies
@@ -131,7 +130,7 @@ It is requested, but not required, that you contact the authors of the Document
 well before redistributing any large number of copies, to give them a chance
 to provide you with an updated version of the Document.
 
-   4. MODIFICATIONS
+4. MODIFICATIONS
 
 You may copy and distribute a Modified Version of the Document under the conditions
 of sections 2 and 3 above, provided that you release the Modified Version
@@ -145,54 +144,41 @@ that of the Document, and from those of previous versions (which should, if
 there were any, be listed in the History section of the Document). You may
 use the same title as a previous version if the original publisher of that
 version gives permission.
-
 B. List on the Title Page, as authors, one or more persons or entities responsible
 for authorship of the modifications in the Modified Version, together with
 at least five of the principal authors of the Document (all of its principal
 authors, if it has less than five).
-
 C. State on the Title page the name of the publisher of the Modified Version,
 as the publisher.
-
-      D. Preserve all the copyright notices of the Document.
-
+     D. Preserve all the copyright notices of the Document.
 E. Add an appropriate copyright notice for your modifications adjacent to
 the other copyright notices.
-
 F. Include, immediately after the copyright notices, a license notice giving
 the public permission to use the Modified Version under the terms of this
 License, in the form shown in the Addendum below.
-
 G. Preserve in that license notice the full lists of Invariant Sections and
 required Cover Texts given in the Document's license notice.
-
-      H. Include an unaltered copy of this License.
-
+     H. Include an unaltered copy of this License.
 I. Preserve the section entitled "History", and its title, and add to it an
 item stating at least the title, year, new authors, and publisher of the Modified
 Version as given on the Title Page. If there is no section entitled "History"
 in the Document, create one stating the title, year, authors, and publisher
 of the Document as given on its Title Page, then add an item describing the
 Modified Version as stated in the previous sentence.
-
 J. Preserve the network location, if any, given in the Document for public
 access to a Transparent copy of the Document, and likewise the network locations
 given in the Document for previous versions it was based on. These may be
 placed in the "History" section. You may omit a network location for a work
 that was published at least four years before the Document itself, or if the
 original publisher of the version it refers to gives permission.
-
 K. In any section entitled "Acknowledgements" or "Dedications", preserve the
 section's title, and preserve in the section all the substance and tone of
 each of the contributor acknowledgements and/or dedications given therein.
-
 L. Preserve all the Invariant Sections of the Document, unaltered in their
 text and in their titles. Section numbers or the equivalent are not considered
 part of the section titles.
-
 M. Delete any section entitled "Endorsements". Such a section may not be included
 in the Modified Version.
-
 N. Do not retitle any existing section as "Endorsements" or to conflict in
 title with any Invariant Section.
 
@@ -221,7 +207,7 @@ The author(s) and publisher(s) of the Document do not by this License give
 permission to use their names for publicity for or to assert or imply endorsement
 of any Modified Version.
 
-   5. COMBINING DOCUMENTS
+5. COMBINING DOCUMENTS
 
 You may combine the Document with other documents released under this License,
 under the terms defined in section 4 above for modified versions, provided
@@ -243,7 +229,7 @@ various original documents, forming one section entitled "History"; likewise
 combine any sections entitled "Acknowledgements", and any sections entitled
 "Dedications". You must delete all sections entitled "Endorsements."
 
-   6. COLLECTIONS OF DOCUMENTS
+6. COLLECTIONS OF DOCUMENTS
 
 You may make a collection consisting of the Document and other documents released
 under this License, and replace the individual copies of this License in the
@@ -256,7 +242,7 @@ individually under this License, provided you insert a copy of this License
 into the extracted document, and follow this License in all other respects
 regarding verbatim copying of that document.
 
-   7. AGGREGATION WITH INDEPENDENT WORKS
+7. AGGREGATION WITH INDEPENDENT WORKS
 
 A compilation of the Document or its derivatives with other separate and independent
 documents or works, in or on a volume of a storage or distribution medium,
@@ -272,7 +258,7 @@ aggregate, the Document's Cover Texts may be placed on covers that surround
 only the Document within the aggregate. Otherwise they must appear on covers
 around the whole aggregate.
 
-   8. TRANSLATION
+8. TRANSLATION
 
 Translation is considered a kind of modification, so you may distribute translations
 of the Document under the terms of section 4. Replacing Invariant Sections
@@ -284,7 +270,7 @@ of this License. In case of a disagreement between the translation and the
 original English version of this License, the original English version will
 prevail.
 
-   9. TERMINATION
+9. TERMINATION
 
 You may not copy, modify, sublicense, or distribute the Document except as
 expressly provided for under this License. Any other attempt to copy, modify,
@@ -293,7 +279,7 @@ your rights under this License. However, parties who have received copies,
 or rights, from you under this License will not have their licenses terminated
 so long as such parties remain in full compliance.
 
-   10. FUTURE REVISIONS OF THIS LICENSE
+10. FUTURE REVISIONS OF THIS LICENSE
 
 The Free Software Foundation may publish new, revised versions of the GNU
 Free Documentation License from time to time. Such new versions will be similar
@@ -307,6 +293,7 @@ and conditions either of that specified version or of any later version that
 has been published (not as a draft) by the Free Software Foundation. If the
 Document does not specify a version number of this License, you may choose
 any version ever published (not as a draft) by the Free Software Foundation.
+
 ADDENDUM: How to use this License for your documents
 
 To use this License in a document you have written, include a copy of the
@@ -316,8 +303,8 @@ just after the title page:
 Copyright (c) YEAR YOUR NAME. Permission is granted to copy, distribute and/or
 modify this document under the terms of the GNU Free Documentation License,
 Version 1.1 or any later version published by the Free Software Foundation;
-with the Invariant Sections being LIST THEIR TITLES , with the Front-Cover
-Texts being LIST , and with the Back-Cover Texts being LIST . A copy of the
+with the Invariant Sections being LIST THEIR TITLES, with the Front-Cover
+Texts being LIST, and with the Back-Cover Texts being LIST. A copy of the
 license is included in the section entitled "GNU Free Documentation License".
 
 If you have no Invariant Sections, write "with no Invariant Sections" instead
diff --git a/options/license/GFDL-1.1-no-invariants-only b/options/license/GFDL-1.1-no-invariants-only
index d63c80021c..309d87fff0 100644
--- a/options/license/GFDL-1.1-no-invariants-only
+++ b/options/license/GFDL-1.1-no-invariants-only
@@ -1,5 +1,4 @@
 GNU Free Documentation License
-
 Version 1.1, March 2000
 
 Copyright (C) 2000 Free Software Foundation, Inc. 51 Franklin St, Fifth Floor,
@@ -8,7 +7,7 @@ Boston, MA 02110-1301 USA
 Everyone is permitted to copy and distribute verbatim copies of this license
 document, but changing it is not allowed.
 
-   0. PREAMBLE
+0. PREAMBLE
 
 The purpose of this License is to make a manual, textbook, or other written
 document "free" in the sense of freedom: to assure everyone the effective
@@ -30,7 +29,7 @@ work, regardless of subject matter or whether it is published as a printed
 book. We recommend this License principally for works whose purpose is instruction
 or reference.
 
-   1. APPLICABILITY AND DEFINITIONS
+1. APPLICABILITY AND DEFINITIONS
 
 This License applies to any manual or other work that contains a notice placed
 by the copyright holder saying it can be distributed under the terms of this
@@ -84,7 +83,7 @@ any title page as such, "Title Page" means the text near the most prominent
 appearance of the work's title, preceding the beginning of the body of the
 text.
 
-   2. VERBATIM COPYING
+2. VERBATIM COPYING
 
 You may copy and distribute the Document in any medium, either commercially
 or noncommercially, provided that this License, the copyright notices, and
@@ -98,7 +97,7 @@ enough number of copies you must also follow the conditions in section 3.
 You may also lend copies, under the same conditions stated above, and you
 may publicly display copies.
 
-   3. COPYING IN QUANTITY
+3. COPYING IN QUANTITY
 
 If you publish printed copies of the Document numbering more than 100, and
 the Document's license notice requires Cover Texts, you must enclose the copies
@@ -131,7 +130,7 @@ It is requested, but not required, that you contact the authors of the Document
 well before redistributing any large number of copies, to give them a chance
 to provide you with an updated version of the Document.
 
-   4. MODIFICATIONS
+4. MODIFICATIONS
 
 You may copy and distribute a Modified Version of the Document under the conditions
 of sections 2 and 3 above, provided that you release the Modified Version
@@ -145,54 +144,41 @@ that of the Document, and from those of previous versions (which should, if
 there were any, be listed in the History section of the Document). You may
 use the same title as a previous version if the original publisher of that
 version gives permission.
-
 B. List on the Title Page, as authors, one or more persons or entities responsible
 for authorship of the modifications in the Modified Version, together with
 at least five of the principal authors of the Document (all of its principal
 authors, if it has less than five).
-
 C. State on the Title page the name of the publisher of the Modified Version,
 as the publisher.
-
-      D. Preserve all the copyright notices of the Document.
-
+     D. Preserve all the copyright notices of the Document.
 E. Add an appropriate copyright notice for your modifications adjacent to
 the other copyright notices.
-
 F. Include, immediately after the copyright notices, a license notice giving
 the public permission to use the Modified Version under the terms of this
 License, in the form shown in the Addendum below.
-
 G. Preserve in that license notice the full lists of Invariant Sections and
 required Cover Texts given in the Document's license notice.
-
-      H. Include an unaltered copy of this License.
-
+     H. Include an unaltered copy of this License.
 I. Preserve the section entitled "History", and its title, and add to it an
 item stating at least the title, year, new authors, and publisher of the Modified
 Version as given on the Title Page. If there is no section entitled "History"
 in the Document, create one stating the title, year, authors, and publisher
 of the Document as given on its Title Page, then add an item describing the
 Modified Version as stated in the previous sentence.
-
 J. Preserve the network location, if any, given in the Document for public
 access to a Transparent copy of the Document, and likewise the network locations
 given in the Document for previous versions it was based on. These may be
 placed in the "History" section. You may omit a network location for a work
 that was published at least four years before the Document itself, or if the
 original publisher of the version it refers to gives permission.
-
 K. In any section entitled "Acknowledgements" or "Dedications", preserve the
 section's title, and preserve in the section all the substance and tone of
 each of the contributor acknowledgements and/or dedications given therein.
-
 L. Preserve all the Invariant Sections of the Document, unaltered in their
 text and in their titles. Section numbers or the equivalent are not considered
 part of the section titles.
-
 M. Delete any section entitled "Endorsements". Such a section may not be included
 in the Modified Version.
-
 N. Do not retitle any existing section as "Endorsements" or to conflict in
 title with any Invariant Section.
 
@@ -221,7 +207,7 @@ The author(s) and publisher(s) of the Document do not by this License give
 permission to use their names for publicity for or to assert or imply endorsement
 of any Modified Version.
 
-   5. COMBINING DOCUMENTS
+5. COMBINING DOCUMENTS
 
 You may combine the Document with other documents released under this License,
 under the terms defined in section 4 above for modified versions, provided
@@ -243,7 +229,7 @@ various original documents, forming one section entitled "History"; likewise
 combine any sections entitled "Acknowledgements", and any sections entitled
 "Dedications". You must delete all sections entitled "Endorsements."
 
-   6. COLLECTIONS OF DOCUMENTS
+6. COLLECTIONS OF DOCUMENTS
 
 You may make a collection consisting of the Document and other documents released
 under this License, and replace the individual copies of this License in the
@@ -256,7 +242,7 @@ individually under this License, provided you insert a copy of this License
 into the extracted document, and follow this License in all other respects
 regarding verbatim copying of that document.
 
-   7. AGGREGATION WITH INDEPENDENT WORKS
+7. AGGREGATION WITH INDEPENDENT WORKS
 
 A compilation of the Document or its derivatives with other separate and independent
 documents or works, in or on a volume of a storage or distribution medium,
@@ -272,7 +258,7 @@ aggregate, the Document's Cover Texts may be placed on covers that surround
 only the Document within the aggregate. Otherwise they must appear on covers
 around the whole aggregate.
 
-   8. TRANSLATION
+8. TRANSLATION
 
 Translation is considered a kind of modification, so you may distribute translations
 of the Document under the terms of section 4. Replacing Invariant Sections
@@ -284,7 +270,7 @@ of this License. In case of a disagreement between the translation and the
 original English version of this License, the original English version will
 prevail.
 
-   9. TERMINATION
+9. TERMINATION
 
 You may not copy, modify, sublicense, or distribute the Document except as
 expressly provided for under this License. Any other attempt to copy, modify,
@@ -293,7 +279,7 @@ your rights under this License. However, parties who have received copies,
 or rights, from you under this License will not have their licenses terminated
 so long as such parties remain in full compliance.
 
-   10. FUTURE REVISIONS OF THIS LICENSE
+10. FUTURE REVISIONS OF THIS LICENSE
 
 The Free Software Foundation may publish new, revised versions of the GNU
 Free Documentation License from time to time. Such new versions will be similar
@@ -307,6 +293,7 @@ and conditions either of that specified version or of any later version that
 has been published (not as a draft) by the Free Software Foundation. If the
 Document does not specify a version number of this License, you may choose
 any version ever published (not as a draft) by the Free Software Foundation.
+
 ADDENDUM: How to use this License for your documents
 
 To use this License in a document you have written, include a copy of the
diff --git a/options/license/GFDL-1.1-no-invariants-or-later b/options/license/GFDL-1.1-no-invariants-or-later
index d63c80021c..309d87fff0 100644
--- a/options/license/GFDL-1.1-no-invariants-or-later
+++ b/options/license/GFDL-1.1-no-invariants-or-later
@@ -1,5 +1,4 @@
 GNU Free Documentation License
-
 Version 1.1, March 2000
 
 Copyright (C) 2000 Free Software Foundation, Inc. 51 Franklin St, Fifth Floor,
@@ -8,7 +7,7 @@ Boston, MA 02110-1301 USA
 Everyone is permitted to copy and distribute verbatim copies of this license
 document, but changing it is not allowed.
 
-   0. PREAMBLE
+0. PREAMBLE
 
 The purpose of this License is to make a manual, textbook, or other written
 document "free" in the sense of freedom: to assure everyone the effective
@@ -30,7 +29,7 @@ work, regardless of subject matter or whether it is published as a printed
 book. We recommend this License principally for works whose purpose is instruction
 or reference.
 
-   1. APPLICABILITY AND DEFINITIONS
+1. APPLICABILITY AND DEFINITIONS
 
 This License applies to any manual or other work that contains a notice placed
 by the copyright holder saying it can be distributed under the terms of this
@@ -84,7 +83,7 @@ any title page as such, "Title Page" means the text near the most prominent
 appearance of the work's title, preceding the beginning of the body of the
 text.
 
-   2. VERBATIM COPYING
+2. VERBATIM COPYING
 
 You may copy and distribute the Document in any medium, either commercially
 or noncommercially, provided that this License, the copyright notices, and
@@ -98,7 +97,7 @@ enough number of copies you must also follow the conditions in section 3.
 You may also lend copies, under the same conditions stated above, and you
 may publicly display copies.
 
-   3. COPYING IN QUANTITY
+3. COPYING IN QUANTITY
 
 If you publish printed copies of the Document numbering more than 100, and
 the Document's license notice requires Cover Texts, you must enclose the copies
@@ -131,7 +130,7 @@ It is requested, but not required, that you contact the authors of the Document
 well before redistributing any large number of copies, to give them a chance
 to provide you with an updated version of the Document.
 
-   4. MODIFICATIONS
+4. MODIFICATIONS
 
 You may copy and distribute a Modified Version of the Document under the conditions
 of sections 2 and 3 above, provided that you release the Modified Version
@@ -145,54 +144,41 @@ that of the Document, and from those of previous versions (which should, if
 there were any, be listed in the History section of the Document). You may
 use the same title as a previous version if the original publisher of that
 version gives permission.
-
 B. List on the Title Page, as authors, one or more persons or entities responsible
 for authorship of the modifications in the Modified Version, together with
 at least five of the principal authors of the Document (all of its principal
 authors, if it has less than five).
-
 C. State on the Title page the name of the publisher of the Modified Version,
 as the publisher.
-
-      D. Preserve all the copyright notices of the Document.
-
+     D. Preserve all the copyright notices of the Document.
 E. Add an appropriate copyright notice for your modifications adjacent to
 the other copyright notices.
-
 F. Include, immediately after the copyright notices, a license notice giving
 the public permission to use the Modified Version under the terms of this
 License, in the form shown in the Addendum below.
-
 G. Preserve in that license notice the full lists of Invariant Sections and
 required Cover Texts given in the Document's license notice.
-
-      H. Include an unaltered copy of this License.
-
+     H. Include an unaltered copy of this License.
 I. Preserve the section entitled "History", and its title, and add to it an
 item stating at least the title, year, new authors, and publisher of the Modified
 Version as given on the Title Page. If there is no section entitled "History"
 in the Document, create one stating the title, year, authors, and publisher
 of the Document as given on its Title Page, then add an item describing the
 Modified Version as stated in the previous sentence.
-
 J. Preserve the network location, if any, given in the Document for public
 access to a Transparent copy of the Document, and likewise the network locations
 given in the Document for previous versions it was based on. These may be
 placed in the "History" section. You may omit a network location for a work
 that was published at least four years before the Document itself, or if the
 original publisher of the version it refers to gives permission.
-
 K. In any section entitled "Acknowledgements" or "Dedications", preserve the
 section's title, and preserve in the section all the substance and tone of
 each of the contributor acknowledgements and/or dedications given therein.
-
 L. Preserve all the Invariant Sections of the Document, unaltered in their
 text and in their titles. Section numbers or the equivalent are not considered
 part of the section titles.
-
 M. Delete any section entitled "Endorsements". Such a section may not be included
 in the Modified Version.
-
 N. Do not retitle any existing section as "Endorsements" or to conflict in
 title with any Invariant Section.
 
@@ -221,7 +207,7 @@ The author(s) and publisher(s) of the Document do not by this License give
 permission to use their names for publicity for or to assert or imply endorsement
 of any Modified Version.
 
-   5. COMBINING DOCUMENTS
+5. COMBINING DOCUMENTS
 
 You may combine the Document with other documents released under this License,
 under the terms defined in section 4 above for modified versions, provided
@@ -243,7 +229,7 @@ various original documents, forming one section entitled "History"; likewise
 combine any sections entitled "Acknowledgements", and any sections entitled
 "Dedications". You must delete all sections entitled "Endorsements."
 
-   6. COLLECTIONS OF DOCUMENTS
+6. COLLECTIONS OF DOCUMENTS
 
 You may make a collection consisting of the Document and other documents released
 under this License, and replace the individual copies of this License in the
@@ -256,7 +242,7 @@ individually under this License, provided you insert a copy of this License
 into the extracted document, and follow this License in all other respects
 regarding verbatim copying of that document.
 
-   7. AGGREGATION WITH INDEPENDENT WORKS
+7. AGGREGATION WITH INDEPENDENT WORKS
 
 A compilation of the Document or its derivatives with other separate and independent
 documents or works, in or on a volume of a storage or distribution medium,
@@ -272,7 +258,7 @@ aggregate, the Document's Cover Texts may be placed on covers that surround
 only the Document within the aggregate. Otherwise they must appear on covers
 around the whole aggregate.
 
-   8. TRANSLATION
+8. TRANSLATION
 
 Translation is considered a kind of modification, so you may distribute translations
 of the Document under the terms of section 4. Replacing Invariant Sections
@@ -284,7 +270,7 @@ of this License. In case of a disagreement between the translation and the
 original English version of this License, the original English version will
 prevail.
 
-   9. TERMINATION
+9. TERMINATION
 
 You may not copy, modify, sublicense, or distribute the Document except as
 expressly provided for under this License. Any other attempt to copy, modify,
@@ -293,7 +279,7 @@ your rights under this License. However, parties who have received copies,
 or rights, from you under this License will not have their licenses terminated
 so long as such parties remain in full compliance.
 
-   10. FUTURE REVISIONS OF THIS LICENSE
+10. FUTURE REVISIONS OF THIS LICENSE
 
 The Free Software Foundation may publish new, revised versions of the GNU
 Free Documentation License from time to time. Such new versions will be similar
@@ -307,6 +293,7 @@ and conditions either of that specified version or of any later version that
 has been published (not as a draft) by the Free Software Foundation. If the
 Document does not specify a version number of this License, you may choose
 any version ever published (not as a draft) by the Free Software Foundation.
+
 ADDENDUM: How to use this License for your documents
 
 To use this License in a document you have written, include a copy of the
diff --git a/options/license/GFDL-1.1-only b/options/license/GFDL-1.1-only
index d63c80021c..309d87fff0 100644
--- a/options/license/GFDL-1.1-only
+++ b/options/license/GFDL-1.1-only
@@ -1,5 +1,4 @@
 GNU Free Documentation License
-
 Version 1.1, March 2000
 
 Copyright (C) 2000 Free Software Foundation, Inc. 51 Franklin St, Fifth Floor,
@@ -8,7 +7,7 @@ Boston, MA 02110-1301 USA
 Everyone is permitted to copy and distribute verbatim copies of this license
 document, but changing it is not allowed.
 
-   0. PREAMBLE
+0. PREAMBLE
 
 The purpose of this License is to make a manual, textbook, or other written
 document "free" in the sense of freedom: to assure everyone the effective
@@ -30,7 +29,7 @@ work, regardless of subject matter or whether it is published as a printed
 book. We recommend this License principally for works whose purpose is instruction
 or reference.
 
-   1. APPLICABILITY AND DEFINITIONS
+1. APPLICABILITY AND DEFINITIONS
 
 This License applies to any manual or other work that contains a notice placed
 by the copyright holder saying it can be distributed under the terms of this
@@ -84,7 +83,7 @@ any title page as such, "Title Page" means the text near the most prominent
 appearance of the work's title, preceding the beginning of the body of the
 text.
 
-   2. VERBATIM COPYING
+2. VERBATIM COPYING
 
 You may copy and distribute the Document in any medium, either commercially
 or noncommercially, provided that this License, the copyright notices, and
@@ -98,7 +97,7 @@ enough number of copies you must also follow the conditions in section 3.
 You may also lend copies, under the same conditions stated above, and you
 may publicly display copies.
 
-   3. COPYING IN QUANTITY
+3. COPYING IN QUANTITY
 
 If you publish printed copies of the Document numbering more than 100, and
 the Document's license notice requires Cover Texts, you must enclose the copies
@@ -131,7 +130,7 @@ It is requested, but not required, that you contact the authors of the Document
 well before redistributing any large number of copies, to give them a chance
 to provide you with an updated version of the Document.
 
-   4. MODIFICATIONS
+4. MODIFICATIONS
 
 You may copy and distribute a Modified Version of the Document under the conditions
 of sections 2 and 3 above, provided that you release the Modified Version
@@ -145,54 +144,41 @@ that of the Document, and from those of previous versions (which should, if
 there were any, be listed in the History section of the Document). You may
 use the same title as a previous version if the original publisher of that
 version gives permission.
-
 B. List on the Title Page, as authors, one or more persons or entities responsible
 for authorship of the modifications in the Modified Version, together with
 at least five of the principal authors of the Document (all of its principal
 authors, if it has less than five).
-
 C. State on the Title page the name of the publisher of the Modified Version,
 as the publisher.
-
-      D. Preserve all the copyright notices of the Document.
-
+     D. Preserve all the copyright notices of the Document.
 E. Add an appropriate copyright notice for your modifications adjacent to
 the other copyright notices.
-
 F. Include, immediately after the copyright notices, a license notice giving
 the public permission to use the Modified Version under the terms of this
 License, in the form shown in the Addendum below.
-
 G. Preserve in that license notice the full lists of Invariant Sections and
 required Cover Texts given in the Document's license notice.
-
-      H. Include an unaltered copy of this License.
-
+     H. Include an unaltered copy of this License.
 I. Preserve the section entitled "History", and its title, and add to it an
 item stating at least the title, year, new authors, and publisher of the Modified
 Version as given on the Title Page. If there is no section entitled "History"
 in the Document, create one stating the title, year, authors, and publisher
 of the Document as given on its Title Page, then add an item describing the
 Modified Version as stated in the previous sentence.
-
 J. Preserve the network location, if any, given in the Document for public
 access to a Transparent copy of the Document, and likewise the network locations
 given in the Document for previous versions it was based on. These may be
 placed in the "History" section. You may omit a network location for a work
 that was published at least four years before the Document itself, or if the
 original publisher of the version it refers to gives permission.
-
 K. In any section entitled "Acknowledgements" or "Dedications", preserve the
 section's title, and preserve in the section all the substance and tone of
 each of the contributor acknowledgements and/or dedications given therein.
-
 L. Preserve all the Invariant Sections of the Document, unaltered in their
 text and in their titles. Section numbers or the equivalent are not considered
 part of the section titles.
-
 M. Delete any section entitled "Endorsements". Such a section may not be included
 in the Modified Version.
-
 N. Do not retitle any existing section as "Endorsements" or to conflict in
 title with any Invariant Section.
 
@@ -221,7 +207,7 @@ The author(s) and publisher(s) of the Document do not by this License give
 permission to use their names for publicity for or to assert or imply endorsement
 of any Modified Version.
 
-   5. COMBINING DOCUMENTS
+5. COMBINING DOCUMENTS
 
 You may combine the Document with other documents released under this License,
 under the terms defined in section 4 above for modified versions, provided
@@ -243,7 +229,7 @@ various original documents, forming one section entitled "History"; likewise
 combine any sections entitled "Acknowledgements", and any sections entitled
 "Dedications". You must delete all sections entitled "Endorsements."
 
-   6. COLLECTIONS OF DOCUMENTS
+6. COLLECTIONS OF DOCUMENTS
 
 You may make a collection consisting of the Document and other documents released
 under this License, and replace the individual copies of this License in the
@@ -256,7 +242,7 @@ individually under this License, provided you insert a copy of this License
 into the extracted document, and follow this License in all other respects
 regarding verbatim copying of that document.
 
-   7. AGGREGATION WITH INDEPENDENT WORKS
+7. AGGREGATION WITH INDEPENDENT WORKS
 
 A compilation of the Document or its derivatives with other separate and independent
 documents or works, in or on a volume of a storage or distribution medium,
@@ -272,7 +258,7 @@ aggregate, the Document's Cover Texts may be placed on covers that surround
 only the Document within the aggregate. Otherwise they must appear on covers
 around the whole aggregate.
 
-   8. TRANSLATION
+8. TRANSLATION
 
 Translation is considered a kind of modification, so you may distribute translations
 of the Document under the terms of section 4. Replacing Invariant Sections
@@ -284,7 +270,7 @@ of this License. In case of a disagreement between the translation and the
 original English version of this License, the original English version will
 prevail.
 
-   9. TERMINATION
+9. TERMINATION
 
 You may not copy, modify, sublicense, or distribute the Document except as
 expressly provided for under this License. Any other attempt to copy, modify,
@@ -293,7 +279,7 @@ your rights under this License. However, parties who have received copies,
 or rights, from you under this License will not have their licenses terminated
 so long as such parties remain in full compliance.
 
-   10. FUTURE REVISIONS OF THIS LICENSE
+10. FUTURE REVISIONS OF THIS LICENSE
 
 The Free Software Foundation may publish new, revised versions of the GNU
 Free Documentation License from time to time. Such new versions will be similar
@@ -307,6 +293,7 @@ and conditions either of that specified version or of any later version that
 has been published (not as a draft) by the Free Software Foundation. If the
 Document does not specify a version number of this License, you may choose
 any version ever published (not as a draft) by the Free Software Foundation.
+
 ADDENDUM: How to use this License for your documents
 
 To use this License in a document you have written, include a copy of the
diff --git a/options/license/GFDL-1.1-or-later b/options/license/GFDL-1.1-or-later
index d63c80021c..309d87fff0 100644
--- a/options/license/GFDL-1.1-or-later
+++ b/options/license/GFDL-1.1-or-later
@@ -1,5 +1,4 @@
 GNU Free Documentation License
-
 Version 1.1, March 2000
 
 Copyright (C) 2000 Free Software Foundation, Inc. 51 Franklin St, Fifth Floor,
@@ -8,7 +7,7 @@ Boston, MA 02110-1301 USA
 Everyone is permitted to copy and distribute verbatim copies of this license
 document, but changing it is not allowed.
 
-   0. PREAMBLE
+0. PREAMBLE
 
 The purpose of this License is to make a manual, textbook, or other written
 document "free" in the sense of freedom: to assure everyone the effective
@@ -30,7 +29,7 @@ work, regardless of subject matter or whether it is published as a printed
 book. We recommend this License principally for works whose purpose is instruction
 or reference.
 
-   1. APPLICABILITY AND DEFINITIONS
+1. APPLICABILITY AND DEFINITIONS
 
 This License applies to any manual or other work that contains a notice placed
 by the copyright holder saying it can be distributed under the terms of this
@@ -84,7 +83,7 @@ any title page as such, "Title Page" means the text near the most prominent
 appearance of the work's title, preceding the beginning of the body of the
 text.
 
-   2. VERBATIM COPYING
+2. VERBATIM COPYING
 
 You may copy and distribute the Document in any medium, either commercially
 or noncommercially, provided that this License, the copyright notices, and
@@ -98,7 +97,7 @@ enough number of copies you must also follow the conditions in section 3.
 You may also lend copies, under the same conditions stated above, and you
 may publicly display copies.
 
-   3. COPYING IN QUANTITY
+3. COPYING IN QUANTITY
 
 If you publish printed copies of the Document numbering more than 100, and
 the Document's license notice requires Cover Texts, you must enclose the copies
@@ -131,7 +130,7 @@ It is requested, but not required, that you contact the authors of the Document
 well before redistributing any large number of copies, to give them a chance
 to provide you with an updated version of the Document.
 
-   4. MODIFICATIONS
+4. MODIFICATIONS
 
 You may copy and distribute a Modified Version of the Document under the conditions
 of sections 2 and 3 above, provided that you release the Modified Version
@@ -145,54 +144,41 @@ that of the Document, and from those of previous versions (which should, if
 there were any, be listed in the History section of the Document). You may
 use the same title as a previous version if the original publisher of that
 version gives permission.
-
 B. List on the Title Page, as authors, one or more persons or entities responsible
 for authorship of the modifications in the Modified Version, together with
 at least five of the principal authors of the Document (all of its principal
 authors, if it has less than five).
-
 C. State on the Title page the name of the publisher of the Modified Version,
 as the publisher.
-
-      D. Preserve all the copyright notices of the Document.
-
+     D. Preserve all the copyright notices of the Document.
 E. Add an appropriate copyright notice for your modifications adjacent to
 the other copyright notices.
-
 F. Include, immediately after the copyright notices, a license notice giving
 the public permission to use the Modified Version under the terms of this
 License, in the form shown in the Addendum below.
-
 G. Preserve in that license notice the full lists of Invariant Sections and
 required Cover Texts given in the Document's license notice.
-
-      H. Include an unaltered copy of this License.
-
+     H. Include an unaltered copy of this License.
 I. Preserve the section entitled "History", and its title, and add to it an
 item stating at least the title, year, new authors, and publisher of the Modified
 Version as given on the Title Page. If there is no section entitled "History"
 in the Document, create one stating the title, year, authors, and publisher
 of the Document as given on its Title Page, then add an item describing the
 Modified Version as stated in the previous sentence.
-
 J. Preserve the network location, if any, given in the Document for public
 access to a Transparent copy of the Document, and likewise the network locations
 given in the Document for previous versions it was based on. These may be
 placed in the "History" section. You may omit a network location for a work
 that was published at least four years before the Document itself, or if the
 original publisher of the version it refers to gives permission.
-
 K. In any section entitled "Acknowledgements" or "Dedications", preserve the
 section's title, and preserve in the section all the substance and tone of
 each of the contributor acknowledgements and/or dedications given therein.
-
 L. Preserve all the Invariant Sections of the Document, unaltered in their
 text and in their titles. Section numbers or the equivalent are not considered
 part of the section titles.
-
 M. Delete any section entitled "Endorsements". Such a section may not be included
 in the Modified Version.
-
 N. Do not retitle any existing section as "Endorsements" or to conflict in
 title with any Invariant Section.
 
@@ -221,7 +207,7 @@ The author(s) and publisher(s) of the Document do not by this License give
 permission to use their names for publicity for or to assert or imply endorsement
 of any Modified Version.
 
-   5. COMBINING DOCUMENTS
+5. COMBINING DOCUMENTS
 
 You may combine the Document with other documents released under this License,
 under the terms defined in section 4 above for modified versions, provided
@@ -243,7 +229,7 @@ various original documents, forming one section entitled "History"; likewise
 combine any sections entitled "Acknowledgements", and any sections entitled
 "Dedications". You must delete all sections entitled "Endorsements."
 
-   6. COLLECTIONS OF DOCUMENTS
+6. COLLECTIONS OF DOCUMENTS
 
 You may make a collection consisting of the Document and other documents released
 under this License, and replace the individual copies of this License in the
@@ -256,7 +242,7 @@ individually under this License, provided you insert a copy of this License
 into the extracted document, and follow this License in all other respects
 regarding verbatim copying of that document.
 
-   7. AGGREGATION WITH INDEPENDENT WORKS
+7. AGGREGATION WITH INDEPENDENT WORKS
 
 A compilation of the Document or its derivatives with other separate and independent
 documents or works, in or on a volume of a storage or distribution medium,
@@ -272,7 +258,7 @@ aggregate, the Document's Cover Texts may be placed on covers that surround
 only the Document within the aggregate. Otherwise they must appear on covers
 around the whole aggregate.
 
-   8. TRANSLATION
+8. TRANSLATION
 
 Translation is considered a kind of modification, so you may distribute translations
 of the Document under the terms of section 4. Replacing Invariant Sections
@@ -284,7 +270,7 @@ of this License. In case of a disagreement between the translation and the
 original English version of this License, the original English version will
 prevail.
 
-   9. TERMINATION
+9. TERMINATION
 
 You may not copy, modify, sublicense, or distribute the Document except as
 expressly provided for under this License. Any other attempt to copy, modify,
@@ -293,7 +279,7 @@ your rights under this License. However, parties who have received copies,
 or rights, from you under this License will not have their licenses terminated
 so long as such parties remain in full compliance.
 
-   10. FUTURE REVISIONS OF THIS LICENSE
+10. FUTURE REVISIONS OF THIS LICENSE
 
 The Free Software Foundation may publish new, revised versions of the GNU
 Free Documentation License from time to time. Such new versions will be similar
@@ -307,6 +293,7 @@ and conditions either of that specified version or of any later version that
 has been published (not as a draft) by the Free Software Foundation. If the
 Document does not specify a version number of this License, you may choose
 any version ever published (not as a draft) by the Free Software Foundation.
+
 ADDENDUM: How to use this License for your documents
 
 To use this License in a document you have written, include a copy of the
diff --git a/options/license/GFDL-1.2-invariants-only b/options/license/GFDL-1.2-invariants-only
index 6bfe9f5593..06a6e53d22 100644
--- a/options/license/GFDL-1.2-invariants-only
+++ b/options/license/GFDL-1.2-invariants-only
@@ -1,5 +1,4 @@
 GNU Free Documentation License
-
 Version 1.2, November 2002
 
 Copyright (C) 2000,2001,2002 Free Software Foundation, Inc. 51 Franklin St,
@@ -8,7 +7,7 @@ Fifth Floor, Boston, MA 02110-1301 USA
 Everyone is permitted to copy and distribute verbatim copies of this license
 document, but changing it is not allowed.
 
-   0. PREAMBLE
+0. PREAMBLE
 
 The purpose of this License is to make a manual, textbook, or other functional
 and useful document "free" in the sense of freedom: to assure everyone the
@@ -30,7 +29,7 @@ work, regardless of subject matter or whether it is published as a printed
 book. We recommend this License principally for works whose purpose is instruction
 or reference.
 
-   1. APPLICABILITY AND DEFINITIONS
+1. APPLICABILITY AND DEFINITIONS
 
 This License applies to any manual or other work, in any medium, that contains
 a notice placed by the copyright holder saying it can be distributed under
@@ -109,7 +108,7 @@ considered to be included by reference in this License, but only as regards
 disclaiming warranties: any other implication that these Warranty Disclaimers
 may have is void and has no effect on the meaning of this License.
 
-   2. VERBATIM COPYING
+2. VERBATIM COPYING
 
 You may copy and distribute the Document in any medium, either commercially
 or noncommercially, provided that this License, the copyright notices, and
@@ -123,7 +122,7 @@ enough number of copies you must also follow the conditions in section 3.
 You may also lend copies, under the same conditions stated above, and you
 may publicly display copies.
 
-   3. COPYING IN QUANTITY
+3. COPYING IN QUANTITY
 
 If you publish printed copies (or copies in media that commonly have printed
 covers) of the Document, numbering more than 100, and the Document's license
@@ -157,7 +156,7 @@ It is requested, but not required, that you contact the authors of the Document
 well before redistributing any large number of copies, to give them a chance
 to provide you with an updated version of the Document.
 
-   4. MODIFICATIONS
+4. MODIFICATIONS
 
 You may copy and distribute a Modified Version of the Document under the conditions
 of sections 2 and 3 above, provided that you release the Modified Version
@@ -171,59 +170,45 @@ that of the Document, and from those of previous versions (which should, if
 there were any, be listed in the History section of the Document). You may
 use the same title as a previous version if the original publisher of that
 version gives permission.
-
 B. List on the Title Page, as authors, one or more persons or entities responsible
 for authorship of the modifications in the Modified Version, together with
 at least five of the principal authors of the Document (all of its principal
 authors, if it has fewer than five), unless they release you from this requirement.
-
 C. State on the Title page the name of the publisher of the Modified Version,
 as the publisher.
-
-      D. Preserve all the copyright notices of the Document.
-
+     D. Preserve all the copyright notices of the Document.
 E. Add an appropriate copyright notice for your modifications adjacent to
 the other copyright notices.
-
 F. Include, immediately after the copyright notices, a license notice giving
 the public permission to use the Modified Version under the terms of this
 License, in the form shown in the Addendum below.
-
 G. Preserve in that license notice the full lists of Invariant Sections and
 required Cover Texts given in the Document's license notice.
-
-      H. Include an unaltered copy of this License.
-
+     H. Include an unaltered copy of this License.
 I. Preserve the section Entitled "History", Preserve its Title, and add to
 it an item stating at least the title, year, new authors, and publisher of
 the Modified Version as given on the Title Page. If there is no section Entitled
 "History" in the Document, create one stating the title, year, authors, and
 publisher of the Document as given on its Title Page, then add an item describing
 the Modified Version as stated in the previous sentence.
-
 J. Preserve the network location, if any, given in the Document for public
 access to a Transparent copy of the Document, and likewise the network locations
 given in the Document for previous versions it was based on. These may be
 placed in the "History" section. You may omit a network location for a work
 that was published at least four years before the Document itself, or if the
 original publisher of the version it refers to gives permission.
-
 K. For any section Entitled "Acknowledgements" or "Dedications", Preserve
 the Title of the section, and preserve in the section all the substance and
 tone of each of the contributor acknowledgements and/or dedications given
 therein.
-
 L. Preserve all the Invariant Sections of the Document, unaltered in their
 text and in their titles. Section numbers or the equivalent are not considered
 part of the section titles.
-
 M. Delete any section Entitled "Endorsements". Such a section may not be included
 in the Modified Version.
-
 N. Do not retitle any existing section to be Entitled "Endorsements" or to
 conflict in title with any Invariant Section.
-
-      O. Preserve any Warranty Disclaimers.
+     O. Preserve any Warranty Disclaimers.
 
 If the Modified Version includes new front-matter sections or appendices that
 qualify as Secondary Sections and contain no material copied from the Document,
@@ -250,7 +235,7 @@ The author(s) and publisher(s) of the Document do not by this License give
 permission to use their names for publicity for or to assert or imply endorsement
 of any Modified Version.
 
-   5. COMBINING DOCUMENTS
+5. COMBINING DOCUMENTS
 
 You may combine the Document with other documents released under this License,
 under the terms defined in section 4 above for modified versions, provided
@@ -273,7 +258,7 @@ various original documents, forming one section Entitled "History"; likewise
 combine any sections Entitled "Acknowledgements", and any sections Entitled
 "Dedications". You must delete all sections Entitled "Endorsements".
 
-   6. COLLECTIONS OF DOCUMENTS
+6. COLLECTIONS OF DOCUMENTS
 
 You may make a collection consisting of the Document and other documents released
 under this License, and replace the individual copies of this License in the
@@ -286,7 +271,7 @@ individually under this License, provided you insert a copy of this License
 into the extracted document, and follow this License in all other respects
 regarding verbatim copying of that document.
 
-   7. AGGREGATION WITH INDEPENDENT WORKS
+7. AGGREGATION WITH INDEPENDENT WORKS
 
 A compilation of the Document or its derivatives with other separate and independent
 documents or works, in or on a volume of a storage or distribution medium,
@@ -303,7 +288,7 @@ within the aggregate, or the electronic equivalent of covers if the Document
 is in electronic form. Otherwise they must appear on printed covers that bracket
 the whole aggregate.
 
-   8. TRANSLATION
+8. TRANSLATION
 
 Translation is considered a kind of modification, so you may distribute translations
 of the Document under the terms of section 4. Replacing Invariant Sections
@@ -320,7 +305,7 @@ If a section in the Document is Entitled "Acknowledgements", "Dedications",
 or "History", the requirement (section 4) to Preserve its Title (section 1)
 will typically require changing the actual title.
 
-   9. TERMINATION
+9. TERMINATION
 
 You may not copy, modify, sublicense, or distribute the Document except as
 expressly provided for under this License. Any other attempt to copy, modify,
@@ -329,7 +314,7 @@ your rights under this License. However, parties who have received copies,
 or rights, from you under this License will not have their licenses terminated
 so long as such parties remain in full compliance.
 
-   10. FUTURE REVISIONS OF THIS LICENSE
+10. FUTURE REVISIONS OF THIS LICENSE
 
 The Free Software Foundation may publish new, revised versions of the GNU
 Free Documentation License from time to time. Such new versions will be similar
@@ -343,6 +328,7 @@ and conditions either of that specified version or of any later version that
 has been published (not as a draft) by the Free Software Foundation. If the
 Document does not specify a version number of this License, you may choose
 any version ever published (not as a draft) by the Free Software Foundation.
+
 ADDENDUM: How to use this License for your documents
 
 To use this License in a document you have written, include a copy of the
diff --git a/options/license/GFDL-1.2-invariants-or-later b/options/license/GFDL-1.2-invariants-or-later
index 99499f9217..06a6e53d22 100644
--- a/options/license/GFDL-1.2-invariants-or-later
+++ b/options/license/GFDL-1.2-invariants-or-later
@@ -1,5 +1,4 @@
 GNU Free Documentation License
-
 Version 1.2, November 2002
 
 Copyright (C) 2000,2001,2002 Free Software Foundation, Inc. 51 Franklin St,
@@ -8,7 +7,7 @@ Fifth Floor, Boston, MA 02110-1301 USA
 Everyone is permitted to copy and distribute verbatim copies of this license
 document, but changing it is not allowed.
 
-   0. PREAMBLE
+0. PREAMBLE
 
 The purpose of this License is to make a manual, textbook, or other functional
 and useful document "free" in the sense of freedom: to assure everyone the
@@ -30,7 +29,7 @@ work, regardless of subject matter or whether it is published as a printed
 book. We recommend this License principally for works whose purpose is instruction
 or reference.
 
-   1. APPLICABILITY AND DEFINITIONS
+1. APPLICABILITY AND DEFINITIONS
 
 This License applies to any manual or other work, in any medium, that contains
 a notice placed by the copyright holder saying it can be distributed under
@@ -109,7 +108,7 @@ considered to be included by reference in this License, but only as regards
 disclaiming warranties: any other implication that these Warranty Disclaimers
 may have is void and has no effect on the meaning of this License.
 
-   2. VERBATIM COPYING
+2. VERBATIM COPYING
 
 You may copy and distribute the Document in any medium, either commercially
 or noncommercially, provided that this License, the copyright notices, and
@@ -123,7 +122,7 @@ enough number of copies you must also follow the conditions in section 3.
 You may also lend copies, under the same conditions stated above, and you
 may publicly display copies.
 
-   3. COPYING IN QUANTITY
+3. COPYING IN QUANTITY
 
 If you publish printed copies (or copies in media that commonly have printed
 covers) of the Document, numbering more than 100, and the Document's license
@@ -157,7 +156,7 @@ It is requested, but not required, that you contact the authors of the Document
 well before redistributing any large number of copies, to give them a chance
 to provide you with an updated version of the Document.
 
-   4. MODIFICATIONS
+4. MODIFICATIONS
 
 You may copy and distribute a Modified Version of the Document under the conditions
 of sections 2 and 3 above, provided that you release the Modified Version
@@ -171,59 +170,45 @@ that of the Document, and from those of previous versions (which should, if
 there were any, be listed in the History section of the Document). You may
 use the same title as a previous version if the original publisher of that
 version gives permission.
-
 B. List on the Title Page, as authors, one or more persons or entities responsible
 for authorship of the modifications in the Modified Version, together with
 at least five of the principal authors of the Document (all of its principal
 authors, if it has fewer than five), unless they release you from this requirement.
-
 C. State on the Title page the name of the publisher of the Modified Version,
 as the publisher.
-
-      D. Preserve all the copyright notices of the Document.
-
+     D. Preserve all the copyright notices of the Document.
 E. Add an appropriate copyright notice for your modifications adjacent to
 the other copyright notices.
-
 F. Include, immediately after the copyright notices, a license notice giving
 the public permission to use the Modified Version under the terms of this
 License, in the form shown in the Addendum below.
-
 G. Preserve in that license notice the full lists of Invariant Sections and
 required Cover Texts given in the Document's license notice.
-
-      H. Include an unaltered copy of this License.
-
+     H. Include an unaltered copy of this License.
 I. Preserve the section Entitled "History", Preserve its Title, and add to
 it an item stating at least the title, year, new authors, and publisher of
 the Modified Version as given on the Title Page. If there is no section Entitled
 "History" in the Document, create one stating the title, year, authors, and
 publisher of the Document as given on its Title Page, then add an item describing
 the Modified Version as stated in the previous sentence.
-
 J. Preserve the network location, if any, given in the Document for public
 access to a Transparent copy of the Document, and likewise the network locations
 given in the Document for previous versions it was based on. These may be
 placed in the "History" section. You may omit a network location for a work
 that was published at least four years before the Document itself, or if the
 original publisher of the version it refers to gives permission.
-
 K. For any section Entitled "Acknowledgements" or "Dedications", Preserve
 the Title of the section, and preserve in the section all the substance and
 tone of each of the contributor acknowledgements and/or dedications given
 therein.
-
 L. Preserve all the Invariant Sections of the Document, unaltered in their
 text and in their titles. Section numbers or the equivalent are not considered
 part of the section titles.
-
 M. Delete any section Entitled "Endorsements". Such a section may not be included
 in the Modified Version.
-
 N. Do not retitle any existing section to be Entitled "Endorsements" or to
 conflict in title with any Invariant Section.
-
-      O. Preserve any Warranty Disclaimers.
+     O. Preserve any Warranty Disclaimers.
 
 If the Modified Version includes new front-matter sections or appendices that
 qualify as Secondary Sections and contain no material copied from the Document,
@@ -250,7 +235,7 @@ The author(s) and publisher(s) of the Document do not by this License give
 permission to use their names for publicity for or to assert or imply endorsement
 of any Modified Version.
 
-   5. COMBINING DOCUMENTS
+5. COMBINING DOCUMENTS
 
 You may combine the Document with other documents released under this License,
 under the terms defined in section 4 above for modified versions, provided
@@ -273,7 +258,7 @@ various original documents, forming one section Entitled "History"; likewise
 combine any sections Entitled "Acknowledgements", and any sections Entitled
 "Dedications". You must delete all sections Entitled "Endorsements".
 
-   6. COLLECTIONS OF DOCUMENTS
+6. COLLECTIONS OF DOCUMENTS
 
 You may make a collection consisting of the Document and other documents released
 under this License, and replace the individual copies of this License in the
@@ -286,7 +271,7 @@ individually under this License, provided you insert a copy of this License
 into the extracted document, and follow this License in all other respects
 regarding verbatim copying of that document.
 
-   7. AGGREGATION WITH INDEPENDENT WORKS
+7. AGGREGATION WITH INDEPENDENT WORKS
 
 A compilation of the Document or its derivatives with other separate and independent
 documents or works, in or on a volume of a storage or distribution medium,
@@ -303,7 +288,7 @@ within the aggregate, or the electronic equivalent of covers if the Document
 is in electronic form. Otherwise they must appear on printed covers that bracket
 the whole aggregate.
 
-   8. TRANSLATION
+8. TRANSLATION
 
 Translation is considered a kind of modification, so you may distribute translations
 of the Document under the terms of section 4. Replacing Invariant Sections
@@ -320,7 +305,7 @@ If a section in the Document is Entitled "Acknowledgements", "Dedications",
 or "History", the requirement (section 4) to Preserve its Title (section 1)
 will typically require changing the actual title.
 
-   9. TERMINATION
+9. TERMINATION
 
 You may not copy, modify, sublicense, or distribute the Document except as
 expressly provided for under this License. Any other attempt to copy, modify,
@@ -329,7 +314,7 @@ your rights under this License. However, parties who have received copies,
 or rights, from you under this License will not have their licenses terminated
 so long as such parties remain in full compliance.
 
-   10. FUTURE REVISIONS OF THIS LICENSE
+10. FUTURE REVISIONS OF THIS LICENSE
 
 The Free Software Foundation may publish new, revised versions of the GNU
 Free Documentation License from time to time. Such new versions will be similar
@@ -343,6 +328,7 @@ and conditions either of that specified version or of any later version that
 has been published (not as a draft) by the Free Software Foundation. If the
 Document does not specify a version number of this License, you may choose
 any version ever published (not as a draft) by the Free Software Foundation.
+
 ADDENDUM: How to use this License for your documents
 
 To use this License in a document you have written, include a copy of the
@@ -352,7 +338,7 @@ just after the title page:
 Copyright (c) YEAR YOUR NAME. Permission is granted to copy, distribute and/or
 modify this document under the terms of the GNU Free Documentation License,
 Version 1.2 or any later version published by the Free Software Foundation;
-with no Invariant Sections, no Front-Cover Texts,and no Back-Cover Texts.
+with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
 A copy of the license is included in the section entitled "GNU Free Documentation
 License".
 
diff --git a/options/license/GFDL-1.2-no-invariants-only b/options/license/GFDL-1.2-no-invariants-only
index 6bfe9f5593..06a6e53d22 100644
--- a/options/license/GFDL-1.2-no-invariants-only
+++ b/options/license/GFDL-1.2-no-invariants-only
@@ -1,5 +1,4 @@
 GNU Free Documentation License
-
 Version 1.2, November 2002
 
 Copyright (C) 2000,2001,2002 Free Software Foundation, Inc. 51 Franklin St,
@@ -8,7 +7,7 @@ Fifth Floor, Boston, MA 02110-1301 USA
 Everyone is permitted to copy and distribute verbatim copies of this license
 document, but changing it is not allowed.
 
-   0. PREAMBLE
+0. PREAMBLE
 
 The purpose of this License is to make a manual, textbook, or other functional
 and useful document "free" in the sense of freedom: to assure everyone the
@@ -30,7 +29,7 @@ work, regardless of subject matter or whether it is published as a printed
 book. We recommend this License principally for works whose purpose is instruction
 or reference.
 
-   1. APPLICABILITY AND DEFINITIONS
+1. APPLICABILITY AND DEFINITIONS
 
 This License applies to any manual or other work, in any medium, that contains
 a notice placed by the copyright holder saying it can be distributed under
@@ -109,7 +108,7 @@ considered to be included by reference in this License, but only as regards
 disclaiming warranties: any other implication that these Warranty Disclaimers
 may have is void and has no effect on the meaning of this License.
 
-   2. VERBATIM COPYING
+2. VERBATIM COPYING
 
 You may copy and distribute the Document in any medium, either commercially
 or noncommercially, provided that this License, the copyright notices, and
@@ -123,7 +122,7 @@ enough number of copies you must also follow the conditions in section 3.
 You may also lend copies, under the same conditions stated above, and you
 may publicly display copies.
 
-   3. COPYING IN QUANTITY
+3. COPYING IN QUANTITY
 
 If you publish printed copies (or copies in media that commonly have printed
 covers) of the Document, numbering more than 100, and the Document's license
@@ -157,7 +156,7 @@ It is requested, but not required, that you contact the authors of the Document
 well before redistributing any large number of copies, to give them a chance
 to provide you with an updated version of the Document.
 
-   4. MODIFICATIONS
+4. MODIFICATIONS
 
 You may copy and distribute a Modified Version of the Document under the conditions
 of sections 2 and 3 above, provided that you release the Modified Version
@@ -171,59 +170,45 @@ that of the Document, and from those of previous versions (which should, if
 there were any, be listed in the History section of the Document). You may
 use the same title as a previous version if the original publisher of that
 version gives permission.
-
 B. List on the Title Page, as authors, one or more persons or entities responsible
 for authorship of the modifications in the Modified Version, together with
 at least five of the principal authors of the Document (all of its principal
 authors, if it has fewer than five), unless they release you from this requirement.
-
 C. State on the Title page the name of the publisher of the Modified Version,
 as the publisher.
-
-      D. Preserve all the copyright notices of the Document.
-
+     D. Preserve all the copyright notices of the Document.
 E. Add an appropriate copyright notice for your modifications adjacent to
 the other copyright notices.
-
 F. Include, immediately after the copyright notices, a license notice giving
 the public permission to use the Modified Version under the terms of this
 License, in the form shown in the Addendum below.
-
 G. Preserve in that license notice the full lists of Invariant Sections and
 required Cover Texts given in the Document's license notice.
-
-      H. Include an unaltered copy of this License.
-
+     H. Include an unaltered copy of this License.
 I. Preserve the section Entitled "History", Preserve its Title, and add to
 it an item stating at least the title, year, new authors, and publisher of
 the Modified Version as given on the Title Page. If there is no section Entitled
 "History" in the Document, create one stating the title, year, authors, and
 publisher of the Document as given on its Title Page, then add an item describing
 the Modified Version as stated in the previous sentence.
-
 J. Preserve the network location, if any, given in the Document for public
 access to a Transparent copy of the Document, and likewise the network locations
 given in the Document for previous versions it was based on. These may be
 placed in the "History" section. You may omit a network location for a work
 that was published at least four years before the Document itself, or if the
 original publisher of the version it refers to gives permission.
-
 K. For any section Entitled "Acknowledgements" or "Dedications", Preserve
 the Title of the section, and preserve in the section all the substance and
 tone of each of the contributor acknowledgements and/or dedications given
 therein.
-
 L. Preserve all the Invariant Sections of the Document, unaltered in their
 text and in their titles. Section numbers or the equivalent are not considered
 part of the section titles.
-
 M. Delete any section Entitled "Endorsements". Such a section may not be included
 in the Modified Version.
-
 N. Do not retitle any existing section to be Entitled "Endorsements" or to
 conflict in title with any Invariant Section.
-
-      O. Preserve any Warranty Disclaimers.
+     O. Preserve any Warranty Disclaimers.
 
 If the Modified Version includes new front-matter sections or appendices that
 qualify as Secondary Sections and contain no material copied from the Document,
@@ -250,7 +235,7 @@ The author(s) and publisher(s) of the Document do not by this License give
 permission to use their names for publicity for or to assert or imply endorsement
 of any Modified Version.
 
-   5. COMBINING DOCUMENTS
+5. COMBINING DOCUMENTS
 
 You may combine the Document with other documents released under this License,
 under the terms defined in section 4 above for modified versions, provided
@@ -273,7 +258,7 @@ various original documents, forming one section Entitled "History"; likewise
 combine any sections Entitled "Acknowledgements", and any sections Entitled
 "Dedications". You must delete all sections Entitled "Endorsements".
 
-   6. COLLECTIONS OF DOCUMENTS
+6. COLLECTIONS OF DOCUMENTS
 
 You may make a collection consisting of the Document and other documents released
 under this License, and replace the individual copies of this License in the
@@ -286,7 +271,7 @@ individually under this License, provided you insert a copy of this License
 into the extracted document, and follow this License in all other respects
 regarding verbatim copying of that document.
 
-   7. AGGREGATION WITH INDEPENDENT WORKS
+7. AGGREGATION WITH INDEPENDENT WORKS
 
 A compilation of the Document or its derivatives with other separate and independent
 documents or works, in or on a volume of a storage or distribution medium,
@@ -303,7 +288,7 @@ within the aggregate, or the electronic equivalent of covers if the Document
 is in electronic form. Otherwise they must appear on printed covers that bracket
 the whole aggregate.
 
-   8. TRANSLATION
+8. TRANSLATION
 
 Translation is considered a kind of modification, so you may distribute translations
 of the Document under the terms of section 4. Replacing Invariant Sections
@@ -320,7 +305,7 @@ If a section in the Document is Entitled "Acknowledgements", "Dedications",
 or "History", the requirement (section 4) to Preserve its Title (section 1)
 will typically require changing the actual title.
 
-   9. TERMINATION
+9. TERMINATION
 
 You may not copy, modify, sublicense, or distribute the Document except as
 expressly provided for under this License. Any other attempt to copy, modify,
@@ -329,7 +314,7 @@ your rights under this License. However, parties who have received copies,
 or rights, from you under this License will not have their licenses terminated
 so long as such parties remain in full compliance.
 
-   10. FUTURE REVISIONS OF THIS LICENSE
+10. FUTURE REVISIONS OF THIS LICENSE
 
 The Free Software Foundation may publish new, revised versions of the GNU
 Free Documentation License from time to time. Such new versions will be similar
@@ -343,6 +328,7 @@ and conditions either of that specified version or of any later version that
 has been published (not as a draft) by the Free Software Foundation. If the
 Document does not specify a version number of this License, you may choose
 any version ever published (not as a draft) by the Free Software Foundation.
+
 ADDENDUM: How to use this License for your documents
 
 To use this License in a document you have written, include a copy of the
diff --git a/options/license/GFDL-1.2-no-invariants-or-later b/options/license/GFDL-1.2-no-invariants-or-later
index 6bfe9f5593..06a6e53d22 100644
--- a/options/license/GFDL-1.2-no-invariants-or-later
+++ b/options/license/GFDL-1.2-no-invariants-or-later
@@ -1,5 +1,4 @@
 GNU Free Documentation License
-
 Version 1.2, November 2002
 
 Copyright (C) 2000,2001,2002 Free Software Foundation, Inc. 51 Franklin St,
@@ -8,7 +7,7 @@ Fifth Floor, Boston, MA 02110-1301 USA
 Everyone is permitted to copy and distribute verbatim copies of this license
 document, but changing it is not allowed.
 
-   0. PREAMBLE
+0. PREAMBLE
 
 The purpose of this License is to make a manual, textbook, or other functional
 and useful document "free" in the sense of freedom: to assure everyone the
@@ -30,7 +29,7 @@ work, regardless of subject matter or whether it is published as a printed
 book. We recommend this License principally for works whose purpose is instruction
 or reference.
 
-   1. APPLICABILITY AND DEFINITIONS
+1. APPLICABILITY AND DEFINITIONS
 
 This License applies to any manual or other work, in any medium, that contains
 a notice placed by the copyright holder saying it can be distributed under
@@ -109,7 +108,7 @@ considered to be included by reference in this License, but only as regards
 disclaiming warranties: any other implication that these Warranty Disclaimers
 may have is void and has no effect on the meaning of this License.
 
-   2. VERBATIM COPYING
+2. VERBATIM COPYING
 
 You may copy and distribute the Document in any medium, either commercially
 or noncommercially, provided that this License, the copyright notices, and
@@ -123,7 +122,7 @@ enough number of copies you must also follow the conditions in section 3.
 You may also lend copies, under the same conditions stated above, and you
 may publicly display copies.
 
-   3. COPYING IN QUANTITY
+3. COPYING IN QUANTITY
 
 If you publish printed copies (or copies in media that commonly have printed
 covers) of the Document, numbering more than 100, and the Document's license
@@ -157,7 +156,7 @@ It is requested, but not required, that you contact the authors of the Document
 well before redistributing any large number of copies, to give them a chance
 to provide you with an updated version of the Document.
 
-   4. MODIFICATIONS
+4. MODIFICATIONS
 
 You may copy and distribute a Modified Version of the Document under the conditions
 of sections 2 and 3 above, provided that you release the Modified Version
@@ -171,59 +170,45 @@ that of the Document, and from those of previous versions (which should, if
 there were any, be listed in the History section of the Document). You may
 use the same title as a previous version if the original publisher of that
 version gives permission.
-
 B. List on the Title Page, as authors, one or more persons or entities responsible
 for authorship of the modifications in the Modified Version, together with
 at least five of the principal authors of the Document (all of its principal
 authors, if it has fewer than five), unless they release you from this requirement.
-
 C. State on the Title page the name of the publisher of the Modified Version,
 as the publisher.
-
-      D. Preserve all the copyright notices of the Document.
-
+     D. Preserve all the copyright notices of the Document.
 E. Add an appropriate copyright notice for your modifications adjacent to
 the other copyright notices.
-
 F. Include, immediately after the copyright notices, a license notice giving
 the public permission to use the Modified Version under the terms of this
 License, in the form shown in the Addendum below.
-
 G. Preserve in that license notice the full lists of Invariant Sections and
 required Cover Texts given in the Document's license notice.
-
-      H. Include an unaltered copy of this License.
-
+     H. Include an unaltered copy of this License.
 I. Preserve the section Entitled "History", Preserve its Title, and add to
 it an item stating at least the title, year, new authors, and publisher of
 the Modified Version as given on the Title Page. If there is no section Entitled
 "History" in the Document, create one stating the title, year, authors, and
 publisher of the Document as given on its Title Page, then add an item describing
 the Modified Version as stated in the previous sentence.
-
 J. Preserve the network location, if any, given in the Document for public
 access to a Transparent copy of the Document, and likewise the network locations
 given in the Document for previous versions it was based on. These may be
 placed in the "History" section. You may omit a network location for a work
 that was published at least four years before the Document itself, or if the
 original publisher of the version it refers to gives permission.
-
 K. For any section Entitled "Acknowledgements" or "Dedications", Preserve
 the Title of the section, and preserve in the section all the substance and
 tone of each of the contributor acknowledgements and/or dedications given
 therein.
-
 L. Preserve all the Invariant Sections of the Document, unaltered in their
 text and in their titles. Section numbers or the equivalent are not considered
 part of the section titles.
-
 M. Delete any section Entitled "Endorsements". Such a section may not be included
 in the Modified Version.
-
 N. Do not retitle any existing section to be Entitled "Endorsements" or to
 conflict in title with any Invariant Section.
-
-      O. Preserve any Warranty Disclaimers.
+     O. Preserve any Warranty Disclaimers.
 
 If the Modified Version includes new front-matter sections or appendices that
 qualify as Secondary Sections and contain no material copied from the Document,
@@ -250,7 +235,7 @@ The author(s) and publisher(s) of the Document do not by this License give
 permission to use their names for publicity for or to assert or imply endorsement
 of any Modified Version.
 
-   5. COMBINING DOCUMENTS
+5. COMBINING DOCUMENTS
 
 You may combine the Document with other documents released under this License,
 under the terms defined in section 4 above for modified versions, provided
@@ -273,7 +258,7 @@ various original documents, forming one section Entitled "History"; likewise
 combine any sections Entitled "Acknowledgements", and any sections Entitled
 "Dedications". You must delete all sections Entitled "Endorsements".
 
-   6. COLLECTIONS OF DOCUMENTS
+6. COLLECTIONS OF DOCUMENTS
 
 You may make a collection consisting of the Document and other documents released
 under this License, and replace the individual copies of this License in the
@@ -286,7 +271,7 @@ individually under this License, provided you insert a copy of this License
 into the extracted document, and follow this License in all other respects
 regarding verbatim copying of that document.
 
-   7. AGGREGATION WITH INDEPENDENT WORKS
+7. AGGREGATION WITH INDEPENDENT WORKS
 
 A compilation of the Document or its derivatives with other separate and independent
 documents or works, in or on a volume of a storage or distribution medium,
@@ -303,7 +288,7 @@ within the aggregate, or the electronic equivalent of covers if the Document
 is in electronic form. Otherwise they must appear on printed covers that bracket
 the whole aggregate.
 
-   8. TRANSLATION
+8. TRANSLATION
 
 Translation is considered a kind of modification, so you may distribute translations
 of the Document under the terms of section 4. Replacing Invariant Sections
@@ -320,7 +305,7 @@ If a section in the Document is Entitled "Acknowledgements", "Dedications",
 or "History", the requirement (section 4) to Preserve its Title (section 1)
 will typically require changing the actual title.
 
-   9. TERMINATION
+9. TERMINATION
 
 You may not copy, modify, sublicense, or distribute the Document except as
 expressly provided for under this License. Any other attempt to copy, modify,
@@ -329,7 +314,7 @@ your rights under this License. However, parties who have received copies,
 or rights, from you under this License will not have their licenses terminated
 so long as such parties remain in full compliance.
 
-   10. FUTURE REVISIONS OF THIS LICENSE
+10. FUTURE REVISIONS OF THIS LICENSE
 
 The Free Software Foundation may publish new, revised versions of the GNU
 Free Documentation License from time to time. Such new versions will be similar
@@ -343,6 +328,7 @@ and conditions either of that specified version or of any later version that
 has been published (not as a draft) by the Free Software Foundation. If the
 Document does not specify a version number of this License, you may choose
 any version ever published (not as a draft) by the Free Software Foundation.
+
 ADDENDUM: How to use this License for your documents
 
 To use this License in a document you have written, include a copy of the
diff --git a/options/license/GFDL-1.2-only b/options/license/GFDL-1.2-only
index 6bfe9f5593..06a6e53d22 100644
--- a/options/license/GFDL-1.2-only
+++ b/options/license/GFDL-1.2-only
@@ -1,5 +1,4 @@
 GNU Free Documentation License
-
 Version 1.2, November 2002
 
 Copyright (C) 2000,2001,2002 Free Software Foundation, Inc. 51 Franklin St,
@@ -8,7 +7,7 @@ Fifth Floor, Boston, MA 02110-1301 USA
 Everyone is permitted to copy and distribute verbatim copies of this license
 document, but changing it is not allowed.
 
-   0. PREAMBLE
+0. PREAMBLE
 
 The purpose of this License is to make a manual, textbook, or other functional
 and useful document "free" in the sense of freedom: to assure everyone the
@@ -30,7 +29,7 @@ work, regardless of subject matter or whether it is published as a printed
 book. We recommend this License principally for works whose purpose is instruction
 or reference.
 
-   1. APPLICABILITY AND DEFINITIONS
+1. APPLICABILITY AND DEFINITIONS
 
 This License applies to any manual or other work, in any medium, that contains
 a notice placed by the copyright holder saying it can be distributed under
@@ -109,7 +108,7 @@ considered to be included by reference in this License, but only as regards
 disclaiming warranties: any other implication that these Warranty Disclaimers
 may have is void and has no effect on the meaning of this License.
 
-   2. VERBATIM COPYING
+2. VERBATIM COPYING
 
 You may copy and distribute the Document in any medium, either commercially
 or noncommercially, provided that this License, the copyright notices, and
@@ -123,7 +122,7 @@ enough number of copies you must also follow the conditions in section 3.
 You may also lend copies, under the same conditions stated above, and you
 may publicly display copies.
 
-   3. COPYING IN QUANTITY
+3. COPYING IN QUANTITY
 
 If you publish printed copies (or copies in media that commonly have printed
 covers) of the Document, numbering more than 100, and the Document's license
@@ -157,7 +156,7 @@ It is requested, but not required, that you contact the authors of the Document
 well before redistributing any large number of copies, to give them a chance
 to provide you with an updated version of the Document.
 
-   4. MODIFICATIONS
+4. MODIFICATIONS
 
 You may copy and distribute a Modified Version of the Document under the conditions
 of sections 2 and 3 above, provided that you release the Modified Version
@@ -171,59 +170,45 @@ that of the Document, and from those of previous versions (which should, if
 there were any, be listed in the History section of the Document). You may
 use the same title as a previous version if the original publisher of that
 version gives permission.
-
 B. List on the Title Page, as authors, one or more persons or entities responsible
 for authorship of the modifications in the Modified Version, together with
 at least five of the principal authors of the Document (all of its principal
 authors, if it has fewer than five), unless they release you from this requirement.
-
 C. State on the Title page the name of the publisher of the Modified Version,
 as the publisher.
-
-      D. Preserve all the copyright notices of the Document.
-
+     D. Preserve all the copyright notices of the Document.
 E. Add an appropriate copyright notice for your modifications adjacent to
 the other copyright notices.
-
 F. Include, immediately after the copyright notices, a license notice giving
 the public permission to use the Modified Version under the terms of this
 License, in the form shown in the Addendum below.
-
 G. Preserve in that license notice the full lists of Invariant Sections and
 required Cover Texts given in the Document's license notice.
-
-      H. Include an unaltered copy of this License.
-
+     H. Include an unaltered copy of this License.
 I. Preserve the section Entitled "History", Preserve its Title, and add to
 it an item stating at least the title, year, new authors, and publisher of
 the Modified Version as given on the Title Page. If there is no section Entitled
 "History" in the Document, create one stating the title, year, authors, and
 publisher of the Document as given on its Title Page, then add an item describing
 the Modified Version as stated in the previous sentence.
-
 J. Preserve the network location, if any, given in the Document for public
 access to a Transparent copy of the Document, and likewise the network locations
 given in the Document for previous versions it was based on. These may be
 placed in the "History" section. You may omit a network location for a work
 that was published at least four years before the Document itself, or if the
 original publisher of the version it refers to gives permission.
-
 K. For any section Entitled "Acknowledgements" or "Dedications", Preserve
 the Title of the section, and preserve in the section all the substance and
 tone of each of the contributor acknowledgements and/or dedications given
 therein.
-
 L. Preserve all the Invariant Sections of the Document, unaltered in their
 text and in their titles. Section numbers or the equivalent are not considered
 part of the section titles.
-
 M. Delete any section Entitled "Endorsements". Such a section may not be included
 in the Modified Version.
-
 N. Do not retitle any existing section to be Entitled "Endorsements" or to
 conflict in title with any Invariant Section.
-
-      O. Preserve any Warranty Disclaimers.
+     O. Preserve any Warranty Disclaimers.
 
 If the Modified Version includes new front-matter sections or appendices that
 qualify as Secondary Sections and contain no material copied from the Document,
@@ -250,7 +235,7 @@ The author(s) and publisher(s) of the Document do not by this License give
 permission to use their names for publicity for or to assert or imply endorsement
 of any Modified Version.
 
-   5. COMBINING DOCUMENTS
+5. COMBINING DOCUMENTS
 
 You may combine the Document with other documents released under this License,
 under the terms defined in section 4 above for modified versions, provided
@@ -273,7 +258,7 @@ various original documents, forming one section Entitled "History"; likewise
 combine any sections Entitled "Acknowledgements", and any sections Entitled
 "Dedications". You must delete all sections Entitled "Endorsements".
 
-   6. COLLECTIONS OF DOCUMENTS
+6. COLLECTIONS OF DOCUMENTS
 
 You may make a collection consisting of the Document and other documents released
 under this License, and replace the individual copies of this License in the
@@ -286,7 +271,7 @@ individually under this License, provided you insert a copy of this License
 into the extracted document, and follow this License in all other respects
 regarding verbatim copying of that document.
 
-   7. AGGREGATION WITH INDEPENDENT WORKS
+7. AGGREGATION WITH INDEPENDENT WORKS
 
 A compilation of the Document or its derivatives with other separate and independent
 documents or works, in or on a volume of a storage or distribution medium,
@@ -303,7 +288,7 @@ within the aggregate, or the electronic equivalent of covers if the Document
 is in electronic form. Otherwise they must appear on printed covers that bracket
 the whole aggregate.
 
-   8. TRANSLATION
+8. TRANSLATION
 
 Translation is considered a kind of modification, so you may distribute translations
 of the Document under the terms of section 4. Replacing Invariant Sections
@@ -320,7 +305,7 @@ If a section in the Document is Entitled "Acknowledgements", "Dedications",
 or "History", the requirement (section 4) to Preserve its Title (section 1)
 will typically require changing the actual title.
 
-   9. TERMINATION
+9. TERMINATION
 
 You may not copy, modify, sublicense, or distribute the Document except as
 expressly provided for under this License. Any other attempt to copy, modify,
@@ -329,7 +314,7 @@ your rights under this License. However, parties who have received copies,
 or rights, from you under this License will not have their licenses terminated
 so long as such parties remain in full compliance.
 
-   10. FUTURE REVISIONS OF THIS LICENSE
+10. FUTURE REVISIONS OF THIS LICENSE
 
 The Free Software Foundation may publish new, revised versions of the GNU
 Free Documentation License from time to time. Such new versions will be similar
@@ -343,6 +328,7 @@ and conditions either of that specified version or of any later version that
 has been published (not as a draft) by the Free Software Foundation. If the
 Document does not specify a version number of this License, you may choose
 any version ever published (not as a draft) by the Free Software Foundation.
+
 ADDENDUM: How to use this License for your documents
 
 To use this License in a document you have written, include a copy of the
diff --git a/options/license/GFDL-1.2-or-later b/options/license/GFDL-1.2-or-later
index 6bfe9f5593..06a6e53d22 100644
--- a/options/license/GFDL-1.2-or-later
+++ b/options/license/GFDL-1.2-or-later
@@ -1,5 +1,4 @@
 GNU Free Documentation License
-
 Version 1.2, November 2002
 
 Copyright (C) 2000,2001,2002 Free Software Foundation, Inc. 51 Franklin St,
@@ -8,7 +7,7 @@ Fifth Floor, Boston, MA 02110-1301 USA
 Everyone is permitted to copy and distribute verbatim copies of this license
 document, but changing it is not allowed.
 
-   0. PREAMBLE
+0. PREAMBLE
 
 The purpose of this License is to make a manual, textbook, or other functional
 and useful document "free" in the sense of freedom: to assure everyone the
@@ -30,7 +29,7 @@ work, regardless of subject matter or whether it is published as a printed
 book. We recommend this License principally for works whose purpose is instruction
 or reference.
 
-   1. APPLICABILITY AND DEFINITIONS
+1. APPLICABILITY AND DEFINITIONS
 
 This License applies to any manual or other work, in any medium, that contains
 a notice placed by the copyright holder saying it can be distributed under
@@ -109,7 +108,7 @@ considered to be included by reference in this License, but only as regards
 disclaiming warranties: any other implication that these Warranty Disclaimers
 may have is void and has no effect on the meaning of this License.
 
-   2. VERBATIM COPYING
+2. VERBATIM COPYING
 
 You may copy and distribute the Document in any medium, either commercially
 or noncommercially, provided that this License, the copyright notices, and
@@ -123,7 +122,7 @@ enough number of copies you must also follow the conditions in section 3.
 You may also lend copies, under the same conditions stated above, and you
 may publicly display copies.
 
-   3. COPYING IN QUANTITY
+3. COPYING IN QUANTITY
 
 If you publish printed copies (or copies in media that commonly have printed
 covers) of the Document, numbering more than 100, and the Document's license
@@ -157,7 +156,7 @@ It is requested, but not required, that you contact the authors of the Document
 well before redistributing any large number of copies, to give them a chance
 to provide you with an updated version of the Document.
 
-   4. MODIFICATIONS
+4. MODIFICATIONS
 
 You may copy and distribute a Modified Version of the Document under the conditions
 of sections 2 and 3 above, provided that you release the Modified Version
@@ -171,59 +170,45 @@ that of the Document, and from those of previous versions (which should, if
 there were any, be listed in the History section of the Document). You may
 use the same title as a previous version if the original publisher of that
 version gives permission.
-
 B. List on the Title Page, as authors, one or more persons or entities responsible
 for authorship of the modifications in the Modified Version, together with
 at least five of the principal authors of the Document (all of its principal
 authors, if it has fewer than five), unless they release you from this requirement.
-
 C. State on the Title page the name of the publisher of the Modified Version,
 as the publisher.
-
-      D. Preserve all the copyright notices of the Document.
-
+     D. Preserve all the copyright notices of the Document.
 E. Add an appropriate copyright notice for your modifications adjacent to
 the other copyright notices.
-
 F. Include, immediately after the copyright notices, a license notice giving
 the public permission to use the Modified Version under the terms of this
 License, in the form shown in the Addendum below.
-
 G. Preserve in that license notice the full lists of Invariant Sections and
 required Cover Texts given in the Document's license notice.
-
-      H. Include an unaltered copy of this License.
-
+     H. Include an unaltered copy of this License.
 I. Preserve the section Entitled "History", Preserve its Title, and add to
 it an item stating at least the title, year, new authors, and publisher of
 the Modified Version as given on the Title Page. If there is no section Entitled
 "History" in the Document, create one stating the title, year, authors, and
 publisher of the Document as given on its Title Page, then add an item describing
 the Modified Version as stated in the previous sentence.
-
 J. Preserve the network location, if any, given in the Document for public
 access to a Transparent copy of the Document, and likewise the network locations
 given in the Document for previous versions it was based on. These may be
 placed in the "History" section. You may omit a network location for a work
 that was published at least four years before the Document itself, or if the
 original publisher of the version it refers to gives permission.
-
 K. For any section Entitled "Acknowledgements" or "Dedications", Preserve
 the Title of the section, and preserve in the section all the substance and
 tone of each of the contributor acknowledgements and/or dedications given
 therein.
-
 L. Preserve all the Invariant Sections of the Document, unaltered in their
 text and in their titles. Section numbers or the equivalent are not considered
 part of the section titles.
-
 M. Delete any section Entitled "Endorsements". Such a section may not be included
 in the Modified Version.
-
 N. Do not retitle any existing section to be Entitled "Endorsements" or to
 conflict in title with any Invariant Section.
-
-      O. Preserve any Warranty Disclaimers.
+     O. Preserve any Warranty Disclaimers.
 
 If the Modified Version includes new front-matter sections or appendices that
 qualify as Secondary Sections and contain no material copied from the Document,
@@ -250,7 +235,7 @@ The author(s) and publisher(s) of the Document do not by this License give
 permission to use their names for publicity for or to assert or imply endorsement
 of any Modified Version.
 
-   5. COMBINING DOCUMENTS
+5. COMBINING DOCUMENTS
 
 You may combine the Document with other documents released under this License,
 under the terms defined in section 4 above for modified versions, provided
@@ -273,7 +258,7 @@ various original documents, forming one section Entitled "History"; likewise
 combine any sections Entitled "Acknowledgements", and any sections Entitled
 "Dedications". You must delete all sections Entitled "Endorsements".
 
-   6. COLLECTIONS OF DOCUMENTS
+6. COLLECTIONS OF DOCUMENTS
 
 You may make a collection consisting of the Document and other documents released
 under this License, and replace the individual copies of this License in the
@@ -286,7 +271,7 @@ individually under this License, provided you insert a copy of this License
 into the extracted document, and follow this License in all other respects
 regarding verbatim copying of that document.
 
-   7. AGGREGATION WITH INDEPENDENT WORKS
+7. AGGREGATION WITH INDEPENDENT WORKS
 
 A compilation of the Document or its derivatives with other separate and independent
 documents or works, in or on a volume of a storage or distribution medium,
@@ -303,7 +288,7 @@ within the aggregate, or the electronic equivalent of covers if the Document
 is in electronic form. Otherwise they must appear on printed covers that bracket
 the whole aggregate.
 
-   8. TRANSLATION
+8. TRANSLATION
 
 Translation is considered a kind of modification, so you may distribute translations
 of the Document under the terms of section 4. Replacing Invariant Sections
@@ -320,7 +305,7 @@ If a section in the Document is Entitled "Acknowledgements", "Dedications",
 or "History", the requirement (section 4) to Preserve its Title (section 1)
 will typically require changing the actual title.
 
-   9. TERMINATION
+9. TERMINATION
 
 You may not copy, modify, sublicense, or distribute the Document except as
 expressly provided for under this License. Any other attempt to copy, modify,
@@ -329,7 +314,7 @@ your rights under this License. However, parties who have received copies,
 or rights, from you under this License will not have their licenses terminated
 so long as such parties remain in full compliance.
 
-   10. FUTURE REVISIONS OF THIS LICENSE
+10. FUTURE REVISIONS OF THIS LICENSE
 
 The Free Software Foundation may publish new, revised versions of the GNU
 Free Documentation License from time to time. Such new versions will be similar
@@ -343,6 +328,7 @@ and conditions either of that specified version or of any later version that
 has been published (not as a draft) by the Free Software Foundation. If the
 Document does not specify a version number of this License, you may choose
 any version ever published (not as a draft) by the Free Software Foundation.
+
 ADDENDUM: How to use this License for your documents
 
 To use this License in a document you have written, include a copy of the
diff --git a/options/license/GFDL-1.3-invariants-only b/options/license/GFDL-1.3-invariants-only
index 90f814dea7..f184688f8a 100644
--- a/options/license/GFDL-1.3-invariants-only
+++ b/options/license/GFDL-1.3-invariants-only
@@ -1,12 +1,13 @@
 GNU Free Documentation License
+Version 1.3, 3 November 2008
 
-Version 1.3, 3 November 2008 Copyright (C) 2000, 2001, 2002, 2007, 2008 Free
-Software Foundation, Inc. <http://fsf.org/>
+Copyright (C) 2000, 2001, 2002, 2007, 2008 Free Software Foundation, Inc.
+<http://fsf.org/>
 
 Everyone is permitted to copy and distribute verbatim copies of this license
 document, but changing it is not allowed.
 
-   0. PREAMBLE
+0. PREAMBLE
 
 The purpose of this License is to make a manual, textbook, or other functional
 and useful document "free" in the sense of freedom: to assure everyone the
@@ -28,7 +29,7 @@ work, regardless of subject matter or whether it is published as a printed
 book. We recommend this License principally for works whose purpose is instruction
 or reference.
 
-   1. APPLICABILITY AND DEFINITIONS
+1. APPLICABILITY AND DEFINITIONS
 
 This License applies to any manual or other work, in any medium, that contains
 a notice placed by the copyright holder saying it can be distributed under
@@ -110,7 +111,7 @@ considered to be included by reference in this License, but only as regards
 disclaiming warranties: any other implication that these Warranty Disclaimers
 may have is void and has no effect on the meaning of this License.
 
-   2. VERBATIM COPYING
+2. VERBATIM COPYING
 
 You may copy and distribute the Document in any medium, either commercially
 or noncommercially, provided that this License, the copyright notices, and
@@ -124,7 +125,7 @@ enough number of copies you must also follow the conditions in section 3.
 You may also lend copies, under the same conditions stated above, and you
 may publicly display copies.
 
-   3. COPYING IN QUANTITY
+3. COPYING IN QUANTITY
 
 If you publish printed copies (or copies in media that commonly have printed
 covers) of the Document, numbering more than 100, and the Document's license
@@ -158,7 +159,7 @@ It is requested, but not required, that you contact the authors of the Document
 well before redistributing any large number of copies, to give them a chance
 to provide you with an updated version of the Document.
 
-   4. MODIFICATIONS
+4. MODIFICATIONS
 
 You may copy and distribute a Modified Version of the Document under the conditions
 of sections 2 and 3 above, provided that you release the Modified Version
@@ -172,58 +173,45 @@ that of the Document, and from those of previous versions (which should, if
 there were any, be listed in the History section of the Document). You may
 use the same title as a previous version if the original publisher of that
 version gives permission.
-
 B. List on the Title Page, as authors, one or more persons or entities responsible
 for authorship of the modifications in the Modified Version, together with
 at least five of the principal authors of the Document (all of its principal
 authors, if it has fewer than five), unless they release you from this requirement.
-
 C. State on the Title page the name of the publisher of the Modified Version,
 as the publisher.
-
-      D. Preserve all the copyright notices of the Document.
-
+     D. Preserve all the copyright notices of the Document.
 E. Add an appropriate copyright notice for your modifications adjacent to
 the other copyright notices.
-
 F. Include, immediately after the copyright notices, a license notice giving
 the public permission to use the Modified Version under the terms of this
 License, in the form shown in the Addendum below.
-
 G. Preserve in that license notice the full lists of Invariant Sections and
 required Cover Texts given in the Document's license notice. H. Include an
 unaltered copy of this License.
-
 I. Preserve the section Entitled "History", Preserve its Title, and add to
 it an item stating at least the title, year, new authors, and publisher of
 the Modified Version as given on the Title Page. If there is no section Entitled
 "History" in the Document, create one stating the title, year, authors, and
 publisher of the Document as given on its Title Page, then add an item describing
 the Modified Version as stated in the previous sentence.
-
 J. Preserve the network location, if any, given in the Document for public
 access to a Transparent copy of the Document, and likewise the network locations
 given in the Document for previous versions it was based on. These may be
 placed in the "History" section. You may omit a network location for a work
 that was published at least four years before the Document itself, or if the
 original publisher of the version it refers to gives permission.
-
 K. For any section Entitled "Acknowledgements" or "Dedications", Preserve
 the Title of the section, and preserve in the section all the substance and
 tone of each of the contributor acknowledgements and/or dedications given
 therein.
-
 L. Preserve all the Invariant Sections of the Document, unaltered in their
 text and in their titles. Section numbers or the equivalent are not considered
 part of the section titles.
-
 M. Delete any section Entitled "Endorsements". Such a section may not be included
 in the Modified Version.
-
 N. Do not retitle any existing section to be Entitled "Endorsements" or to
 conflict in title with any Invariant Section.
-
-      O. Preserve any Warranty Disclaimers.
+     O. Preserve any Warranty Disclaimers.
 
 If the Modified Version includes new front-matter sections or appendices that
 qualify as Secondary Sections and contain no material copied from the Document,
@@ -250,7 +238,7 @@ The author(s) and publisher(s) of the Document do not by this License give
 permission to use their names for publicity for or to assert or imply endorsement
 of any Modified Version.
 
-   5. COMBINING DOCUMENTS
+5. COMBINING DOCUMENTS
 
 You may combine the Document with other documents released under this License,
 under the terms defined in section 4 above for modified versions, provided
@@ -273,7 +261,7 @@ various original documents, forming one section Entitled "History"; likewise
 combine any sections Entitled "Acknowledgements", and any sections Entitled
 "Dedications". You must delete all sections Entitled "Endorsements".
 
-   6. COLLECTIONS OF DOCUMENTS
+6. COLLECTIONS OF DOCUMENTS
 
 You may make a collection consisting of the Document and other documents released
 under this License, and replace the individual copies of this License in the
@@ -286,7 +274,7 @@ individually under this License, provided you insert a copy of this License
 into the extracted document, and follow this License in all other respects
 regarding verbatim copying of that document.
 
-   7. AGGREGATION WITH INDEPENDENT WORKS
+7. AGGREGATION WITH INDEPENDENT WORKS
 
 A compilation of the Document or its derivatives with other separate and independent
 documents or works, in or on a volume of a storage or distribution medium,
@@ -303,7 +291,7 @@ within the aggregate, or the electronic equivalent of covers if the Document
 is in electronic form. Otherwise they must appear on printed covers that bracket
 the whole aggregate.
 
-   8. TRANSLATION
+8. TRANSLATION
 
 Translation is considered a kind of modification, so you may distribute translations
 of the Document under the terms of section 4. Replacing Invariant Sections
@@ -320,7 +308,7 @@ If a section in the Document is Entitled "Acknowledgements", "Dedications",
 or "History", the requirement (section 4) to Preserve its Title (section 1)
 will typically require changing the actual title.
 
-   9. TERMINATION
+9. TERMINATION
 
 You may not copy, modify, sublicense, or distribute the Document except as
 expressly provided under this License. Any attempt otherwise to copy, modify,
@@ -345,7 +333,7 @@ If your rights have been terminated and not permanently reinstated, receipt
 of a copy of some or all of the same material does not give you any rights
 to use it.
 
-   10. FUTURE REVISIONS OF THIS LICENSE
+10. FUTURE REVISIONS OF THIS LICENSE
 
 The Free Software Foundation may publish new, revised versions of the GNU
 Free Documentation License from time to time. Such new versions will be similar
@@ -363,7 +351,7 @@ If the Document specifies that a proxy can decide which future versions of
 this License can be used, that proxy's public statement of acceptance of a
 version permanently authorizes you to choose that version for the Document.
 
-   11. RELICENSING
+11. RELICENSING
 
 "Massive Multiauthor Collaboration Site" (or "MMC Site") means any World Wide
 Web server that publishes copyrightable works and also provides prominent
@@ -388,8 +376,9 @@ prior to November 1, 2008.
 
 The operator of an MMC Site may republish an MMC contained in the site under
 CC-BY-SA on the same site at any time before August 1, 2009, provided the
-MMC is eligible for relicensing. ADDENDUM: How to use this License for your
-documents
+MMC is eligible for relicensing.
+
+ADDENDUM: How to use this License for your documents
 
 To use this License in a document you have written, include a copy of the
 License in the document and put the following copyright and license notices
diff --git a/options/license/GFDL-1.3-invariants-or-later b/options/license/GFDL-1.3-invariants-or-later
index 90f814dea7..f184688f8a 100644
--- a/options/license/GFDL-1.3-invariants-or-later
+++ b/options/license/GFDL-1.3-invariants-or-later
@@ -1,12 +1,13 @@
 GNU Free Documentation License
+Version 1.3, 3 November 2008
 
-Version 1.3, 3 November 2008 Copyright (C) 2000, 2001, 2002, 2007, 2008 Free
-Software Foundation, Inc. <http://fsf.org/>
+Copyright (C) 2000, 2001, 2002, 2007, 2008 Free Software Foundation, Inc.
+<http://fsf.org/>
 
 Everyone is permitted to copy and distribute verbatim copies of this license
 document, but changing it is not allowed.
 
-   0. PREAMBLE
+0. PREAMBLE
 
 The purpose of this License is to make a manual, textbook, or other functional
 and useful document "free" in the sense of freedom: to assure everyone the
@@ -28,7 +29,7 @@ work, regardless of subject matter or whether it is published as a printed
 book. We recommend this License principally for works whose purpose is instruction
 or reference.
 
-   1. APPLICABILITY AND DEFINITIONS
+1. APPLICABILITY AND DEFINITIONS
 
 This License applies to any manual or other work, in any medium, that contains
 a notice placed by the copyright holder saying it can be distributed under
@@ -110,7 +111,7 @@ considered to be included by reference in this License, but only as regards
 disclaiming warranties: any other implication that these Warranty Disclaimers
 may have is void and has no effect on the meaning of this License.
 
-   2. VERBATIM COPYING
+2. VERBATIM COPYING
 
 You may copy and distribute the Document in any medium, either commercially
 or noncommercially, provided that this License, the copyright notices, and
@@ -124,7 +125,7 @@ enough number of copies you must also follow the conditions in section 3.
 You may also lend copies, under the same conditions stated above, and you
 may publicly display copies.
 
-   3. COPYING IN QUANTITY
+3. COPYING IN QUANTITY
 
 If you publish printed copies (or copies in media that commonly have printed
 covers) of the Document, numbering more than 100, and the Document's license
@@ -158,7 +159,7 @@ It is requested, but not required, that you contact the authors of the Document
 well before redistributing any large number of copies, to give them a chance
 to provide you with an updated version of the Document.
 
-   4. MODIFICATIONS
+4. MODIFICATIONS
 
 You may copy and distribute a Modified Version of the Document under the conditions
 of sections 2 and 3 above, provided that you release the Modified Version
@@ -172,58 +173,45 @@ that of the Document, and from those of previous versions (which should, if
 there were any, be listed in the History section of the Document). You may
 use the same title as a previous version if the original publisher of that
 version gives permission.
-
 B. List on the Title Page, as authors, one or more persons or entities responsible
 for authorship of the modifications in the Modified Version, together with
 at least five of the principal authors of the Document (all of its principal
 authors, if it has fewer than five), unless they release you from this requirement.
-
 C. State on the Title page the name of the publisher of the Modified Version,
 as the publisher.
-
-      D. Preserve all the copyright notices of the Document.
-
+     D. Preserve all the copyright notices of the Document.
 E. Add an appropriate copyright notice for your modifications adjacent to
 the other copyright notices.
-
 F. Include, immediately after the copyright notices, a license notice giving
 the public permission to use the Modified Version under the terms of this
 License, in the form shown in the Addendum below.
-
 G. Preserve in that license notice the full lists of Invariant Sections and
 required Cover Texts given in the Document's license notice. H. Include an
 unaltered copy of this License.
-
 I. Preserve the section Entitled "History", Preserve its Title, and add to
 it an item stating at least the title, year, new authors, and publisher of
 the Modified Version as given on the Title Page. If there is no section Entitled
 "History" in the Document, create one stating the title, year, authors, and
 publisher of the Document as given on its Title Page, then add an item describing
 the Modified Version as stated in the previous sentence.
-
 J. Preserve the network location, if any, given in the Document for public
 access to a Transparent copy of the Document, and likewise the network locations
 given in the Document for previous versions it was based on. These may be
 placed in the "History" section. You may omit a network location for a work
 that was published at least four years before the Document itself, or if the
 original publisher of the version it refers to gives permission.
-
 K. For any section Entitled "Acknowledgements" or "Dedications", Preserve
 the Title of the section, and preserve in the section all the substance and
 tone of each of the contributor acknowledgements and/or dedications given
 therein.
-
 L. Preserve all the Invariant Sections of the Document, unaltered in their
 text and in their titles. Section numbers or the equivalent are not considered
 part of the section titles.
-
 M. Delete any section Entitled "Endorsements". Such a section may not be included
 in the Modified Version.
-
 N. Do not retitle any existing section to be Entitled "Endorsements" or to
 conflict in title with any Invariant Section.
-
-      O. Preserve any Warranty Disclaimers.
+     O. Preserve any Warranty Disclaimers.
 
 If the Modified Version includes new front-matter sections or appendices that
 qualify as Secondary Sections and contain no material copied from the Document,
@@ -250,7 +238,7 @@ The author(s) and publisher(s) of the Document do not by this License give
 permission to use their names for publicity for or to assert or imply endorsement
 of any Modified Version.
 
-   5. COMBINING DOCUMENTS
+5. COMBINING DOCUMENTS
 
 You may combine the Document with other documents released under this License,
 under the terms defined in section 4 above for modified versions, provided
@@ -273,7 +261,7 @@ various original documents, forming one section Entitled "History"; likewise
 combine any sections Entitled "Acknowledgements", and any sections Entitled
 "Dedications". You must delete all sections Entitled "Endorsements".
 
-   6. COLLECTIONS OF DOCUMENTS
+6. COLLECTIONS OF DOCUMENTS
 
 You may make a collection consisting of the Document and other documents released
 under this License, and replace the individual copies of this License in the
@@ -286,7 +274,7 @@ individually under this License, provided you insert a copy of this License
 into the extracted document, and follow this License in all other respects
 regarding verbatim copying of that document.
 
-   7. AGGREGATION WITH INDEPENDENT WORKS
+7. AGGREGATION WITH INDEPENDENT WORKS
 
 A compilation of the Document or its derivatives with other separate and independent
 documents or works, in or on a volume of a storage or distribution medium,
@@ -303,7 +291,7 @@ within the aggregate, or the electronic equivalent of covers if the Document
 is in electronic form. Otherwise they must appear on printed covers that bracket
 the whole aggregate.
 
-   8. TRANSLATION
+8. TRANSLATION
 
 Translation is considered a kind of modification, so you may distribute translations
 of the Document under the terms of section 4. Replacing Invariant Sections
@@ -320,7 +308,7 @@ If a section in the Document is Entitled "Acknowledgements", "Dedications",
 or "History", the requirement (section 4) to Preserve its Title (section 1)
 will typically require changing the actual title.
 
-   9. TERMINATION
+9. TERMINATION
 
 You may not copy, modify, sublicense, or distribute the Document except as
 expressly provided under this License. Any attempt otherwise to copy, modify,
@@ -345,7 +333,7 @@ If your rights have been terminated and not permanently reinstated, receipt
 of a copy of some or all of the same material does not give you any rights
 to use it.
 
-   10. FUTURE REVISIONS OF THIS LICENSE
+10. FUTURE REVISIONS OF THIS LICENSE
 
 The Free Software Foundation may publish new, revised versions of the GNU
 Free Documentation License from time to time. Such new versions will be similar
@@ -363,7 +351,7 @@ If the Document specifies that a proxy can decide which future versions of
 this License can be used, that proxy's public statement of acceptance of a
 version permanently authorizes you to choose that version for the Document.
 
-   11. RELICENSING
+11. RELICENSING
 
 "Massive Multiauthor Collaboration Site" (or "MMC Site") means any World Wide
 Web server that publishes copyrightable works and also provides prominent
@@ -388,8 +376,9 @@ prior to November 1, 2008.
 
 The operator of an MMC Site may republish an MMC contained in the site under
 CC-BY-SA on the same site at any time before August 1, 2009, provided the
-MMC is eligible for relicensing. ADDENDUM: How to use this License for your
-documents
+MMC is eligible for relicensing.
+
+ADDENDUM: How to use this License for your documents
 
 To use this License in a document you have written, include a copy of the
 License in the document and put the following copyright and license notices
diff --git a/options/license/GFDL-1.3-no-invariants-only b/options/license/GFDL-1.3-no-invariants-only
index 90f814dea7..f184688f8a 100644
--- a/options/license/GFDL-1.3-no-invariants-only
+++ b/options/license/GFDL-1.3-no-invariants-only
@@ -1,12 +1,13 @@
 GNU Free Documentation License
+Version 1.3, 3 November 2008
 
-Version 1.3, 3 November 2008 Copyright (C) 2000, 2001, 2002, 2007, 2008 Free
-Software Foundation, Inc. <http://fsf.org/>
+Copyright (C) 2000, 2001, 2002, 2007, 2008 Free Software Foundation, Inc.
+<http://fsf.org/>
 
 Everyone is permitted to copy and distribute verbatim copies of this license
 document, but changing it is not allowed.
 
-   0. PREAMBLE
+0. PREAMBLE
 
 The purpose of this License is to make a manual, textbook, or other functional
 and useful document "free" in the sense of freedom: to assure everyone the
@@ -28,7 +29,7 @@ work, regardless of subject matter or whether it is published as a printed
 book. We recommend this License principally for works whose purpose is instruction
 or reference.
 
-   1. APPLICABILITY AND DEFINITIONS
+1. APPLICABILITY AND DEFINITIONS
 
 This License applies to any manual or other work, in any medium, that contains
 a notice placed by the copyright holder saying it can be distributed under
@@ -110,7 +111,7 @@ considered to be included by reference in this License, but only as regards
 disclaiming warranties: any other implication that these Warranty Disclaimers
 may have is void and has no effect on the meaning of this License.
 
-   2. VERBATIM COPYING
+2. VERBATIM COPYING
 
 You may copy and distribute the Document in any medium, either commercially
 or noncommercially, provided that this License, the copyright notices, and
@@ -124,7 +125,7 @@ enough number of copies you must also follow the conditions in section 3.
 You may also lend copies, under the same conditions stated above, and you
 may publicly display copies.
 
-   3. COPYING IN QUANTITY
+3. COPYING IN QUANTITY
 
 If you publish printed copies (or copies in media that commonly have printed
 covers) of the Document, numbering more than 100, and the Document's license
@@ -158,7 +159,7 @@ It is requested, but not required, that you contact the authors of the Document
 well before redistributing any large number of copies, to give them a chance
 to provide you with an updated version of the Document.
 
-   4. MODIFICATIONS
+4. MODIFICATIONS
 
 You may copy and distribute a Modified Version of the Document under the conditions
 of sections 2 and 3 above, provided that you release the Modified Version
@@ -172,58 +173,45 @@ that of the Document, and from those of previous versions (which should, if
 there were any, be listed in the History section of the Document). You may
 use the same title as a previous version if the original publisher of that
 version gives permission.
-
 B. List on the Title Page, as authors, one or more persons or entities responsible
 for authorship of the modifications in the Modified Version, together with
 at least five of the principal authors of the Document (all of its principal
 authors, if it has fewer than five), unless they release you from this requirement.
-
 C. State on the Title page the name of the publisher of the Modified Version,
 as the publisher.
-
-      D. Preserve all the copyright notices of the Document.
-
+     D. Preserve all the copyright notices of the Document.
 E. Add an appropriate copyright notice for your modifications adjacent to
 the other copyright notices.
-
 F. Include, immediately after the copyright notices, a license notice giving
 the public permission to use the Modified Version under the terms of this
 License, in the form shown in the Addendum below.
-
 G. Preserve in that license notice the full lists of Invariant Sections and
 required Cover Texts given in the Document's license notice. H. Include an
 unaltered copy of this License.
-
 I. Preserve the section Entitled "History", Preserve its Title, and add to
 it an item stating at least the title, year, new authors, and publisher of
 the Modified Version as given on the Title Page. If there is no section Entitled
 "History" in the Document, create one stating the title, year, authors, and
 publisher of the Document as given on its Title Page, then add an item describing
 the Modified Version as stated in the previous sentence.
-
 J. Preserve the network location, if any, given in the Document for public
 access to a Transparent copy of the Document, and likewise the network locations
 given in the Document for previous versions it was based on. These may be
 placed in the "History" section. You may omit a network location for a work
 that was published at least four years before the Document itself, or if the
 original publisher of the version it refers to gives permission.
-
 K. For any section Entitled "Acknowledgements" or "Dedications", Preserve
 the Title of the section, and preserve in the section all the substance and
 tone of each of the contributor acknowledgements and/or dedications given
 therein.
-
 L. Preserve all the Invariant Sections of the Document, unaltered in their
 text and in their titles. Section numbers or the equivalent are not considered
 part of the section titles.
-
 M. Delete any section Entitled "Endorsements". Such a section may not be included
 in the Modified Version.
-
 N. Do not retitle any existing section to be Entitled "Endorsements" or to
 conflict in title with any Invariant Section.
-
-      O. Preserve any Warranty Disclaimers.
+     O. Preserve any Warranty Disclaimers.
 
 If the Modified Version includes new front-matter sections or appendices that
 qualify as Secondary Sections and contain no material copied from the Document,
@@ -250,7 +238,7 @@ The author(s) and publisher(s) of the Document do not by this License give
 permission to use their names for publicity for or to assert or imply endorsement
 of any Modified Version.
 
-   5. COMBINING DOCUMENTS
+5. COMBINING DOCUMENTS
 
 You may combine the Document with other documents released under this License,
 under the terms defined in section 4 above for modified versions, provided
@@ -273,7 +261,7 @@ various original documents, forming one section Entitled "History"; likewise
 combine any sections Entitled "Acknowledgements", and any sections Entitled
 "Dedications". You must delete all sections Entitled "Endorsements".
 
-   6. COLLECTIONS OF DOCUMENTS
+6. COLLECTIONS OF DOCUMENTS
 
 You may make a collection consisting of the Document and other documents released
 under this License, and replace the individual copies of this License in the
@@ -286,7 +274,7 @@ individually under this License, provided you insert a copy of this License
 into the extracted document, and follow this License in all other respects
 regarding verbatim copying of that document.
 
-   7. AGGREGATION WITH INDEPENDENT WORKS
+7. AGGREGATION WITH INDEPENDENT WORKS
 
 A compilation of the Document or its derivatives with other separate and independent
 documents or works, in or on a volume of a storage or distribution medium,
@@ -303,7 +291,7 @@ within the aggregate, or the electronic equivalent of covers if the Document
 is in electronic form. Otherwise they must appear on printed covers that bracket
 the whole aggregate.
 
-   8. TRANSLATION
+8. TRANSLATION
 
 Translation is considered a kind of modification, so you may distribute translations
 of the Document under the terms of section 4. Replacing Invariant Sections
@@ -320,7 +308,7 @@ If a section in the Document is Entitled "Acknowledgements", "Dedications",
 or "History", the requirement (section 4) to Preserve its Title (section 1)
 will typically require changing the actual title.
 
-   9. TERMINATION
+9. TERMINATION
 
 You may not copy, modify, sublicense, or distribute the Document except as
 expressly provided under this License. Any attempt otherwise to copy, modify,
@@ -345,7 +333,7 @@ If your rights have been terminated and not permanently reinstated, receipt
 of a copy of some or all of the same material does not give you any rights
 to use it.
 
-   10. FUTURE REVISIONS OF THIS LICENSE
+10. FUTURE REVISIONS OF THIS LICENSE
 
 The Free Software Foundation may publish new, revised versions of the GNU
 Free Documentation License from time to time. Such new versions will be similar
@@ -363,7 +351,7 @@ If the Document specifies that a proxy can decide which future versions of
 this License can be used, that proxy's public statement of acceptance of a
 version permanently authorizes you to choose that version for the Document.
 
-   11. RELICENSING
+11. RELICENSING
 
 "Massive Multiauthor Collaboration Site" (or "MMC Site") means any World Wide
 Web server that publishes copyrightable works and also provides prominent
@@ -388,8 +376,9 @@ prior to November 1, 2008.
 
 The operator of an MMC Site may republish an MMC contained in the site under
 CC-BY-SA on the same site at any time before August 1, 2009, provided the
-MMC is eligible for relicensing. ADDENDUM: How to use this License for your
-documents
+MMC is eligible for relicensing.
+
+ADDENDUM: How to use this License for your documents
 
 To use this License in a document you have written, include a copy of the
 License in the document and put the following copyright and license notices
diff --git a/options/license/GFDL-1.3-no-invariants-or-later b/options/license/GFDL-1.3-no-invariants-or-later
index 90f814dea7..f184688f8a 100644
--- a/options/license/GFDL-1.3-no-invariants-or-later
+++ b/options/license/GFDL-1.3-no-invariants-or-later
@@ -1,12 +1,13 @@
 GNU Free Documentation License
+Version 1.3, 3 November 2008
 
-Version 1.3, 3 November 2008 Copyright (C) 2000, 2001, 2002, 2007, 2008 Free
-Software Foundation, Inc. <http://fsf.org/>
+Copyright (C) 2000, 2001, 2002, 2007, 2008 Free Software Foundation, Inc.
+<http://fsf.org/>
 
 Everyone is permitted to copy and distribute verbatim copies of this license
 document, but changing it is not allowed.
 
-   0. PREAMBLE
+0. PREAMBLE
 
 The purpose of this License is to make a manual, textbook, or other functional
 and useful document "free" in the sense of freedom: to assure everyone the
@@ -28,7 +29,7 @@ work, regardless of subject matter or whether it is published as a printed
 book. We recommend this License principally for works whose purpose is instruction
 or reference.
 
-   1. APPLICABILITY AND DEFINITIONS
+1. APPLICABILITY AND DEFINITIONS
 
 This License applies to any manual or other work, in any medium, that contains
 a notice placed by the copyright holder saying it can be distributed under
@@ -110,7 +111,7 @@ considered to be included by reference in this License, but only as regards
 disclaiming warranties: any other implication that these Warranty Disclaimers
 may have is void and has no effect on the meaning of this License.
 
-   2. VERBATIM COPYING
+2. VERBATIM COPYING
 
 You may copy and distribute the Document in any medium, either commercially
 or noncommercially, provided that this License, the copyright notices, and
@@ -124,7 +125,7 @@ enough number of copies you must also follow the conditions in section 3.
 You may also lend copies, under the same conditions stated above, and you
 may publicly display copies.
 
-   3. COPYING IN QUANTITY
+3. COPYING IN QUANTITY
 
 If you publish printed copies (or copies in media that commonly have printed
 covers) of the Document, numbering more than 100, and the Document's license
@@ -158,7 +159,7 @@ It is requested, but not required, that you contact the authors of the Document
 well before redistributing any large number of copies, to give them a chance
 to provide you with an updated version of the Document.
 
-   4. MODIFICATIONS
+4. MODIFICATIONS
 
 You may copy and distribute a Modified Version of the Document under the conditions
 of sections 2 and 3 above, provided that you release the Modified Version
@@ -172,58 +173,45 @@ that of the Document, and from those of previous versions (which should, if
 there were any, be listed in the History section of the Document). You may
 use the same title as a previous version if the original publisher of that
 version gives permission.
-
 B. List on the Title Page, as authors, one or more persons or entities responsible
 for authorship of the modifications in the Modified Version, together with
 at least five of the principal authors of the Document (all of its principal
 authors, if it has fewer than five), unless they release you from this requirement.
-
 C. State on the Title page the name of the publisher of the Modified Version,
 as the publisher.
-
-      D. Preserve all the copyright notices of the Document.
-
+     D. Preserve all the copyright notices of the Document.
 E. Add an appropriate copyright notice for your modifications adjacent to
 the other copyright notices.
-
 F. Include, immediately after the copyright notices, a license notice giving
 the public permission to use the Modified Version under the terms of this
 License, in the form shown in the Addendum below.
-
 G. Preserve in that license notice the full lists of Invariant Sections and
 required Cover Texts given in the Document's license notice. H. Include an
 unaltered copy of this License.
-
 I. Preserve the section Entitled "History", Preserve its Title, and add to
 it an item stating at least the title, year, new authors, and publisher of
 the Modified Version as given on the Title Page. If there is no section Entitled
 "History" in the Document, create one stating the title, year, authors, and
 publisher of the Document as given on its Title Page, then add an item describing
 the Modified Version as stated in the previous sentence.
-
 J. Preserve the network location, if any, given in the Document for public
 access to a Transparent copy of the Document, and likewise the network locations
 given in the Document for previous versions it was based on. These may be
 placed in the "History" section. You may omit a network location for a work
 that was published at least four years before the Document itself, or if the
 original publisher of the version it refers to gives permission.
-
 K. For any section Entitled "Acknowledgements" or "Dedications", Preserve
 the Title of the section, and preserve in the section all the substance and
 tone of each of the contributor acknowledgements and/or dedications given
 therein.
-
 L. Preserve all the Invariant Sections of the Document, unaltered in their
 text and in their titles. Section numbers or the equivalent are not considered
 part of the section titles.
-
 M. Delete any section Entitled "Endorsements". Such a section may not be included
 in the Modified Version.
-
 N. Do not retitle any existing section to be Entitled "Endorsements" or to
 conflict in title with any Invariant Section.
-
-      O. Preserve any Warranty Disclaimers.
+     O. Preserve any Warranty Disclaimers.
 
 If the Modified Version includes new front-matter sections or appendices that
 qualify as Secondary Sections and contain no material copied from the Document,
@@ -250,7 +238,7 @@ The author(s) and publisher(s) of the Document do not by this License give
 permission to use their names for publicity for or to assert or imply endorsement
 of any Modified Version.
 
-   5. COMBINING DOCUMENTS
+5. COMBINING DOCUMENTS
 
 You may combine the Document with other documents released under this License,
 under the terms defined in section 4 above for modified versions, provided
@@ -273,7 +261,7 @@ various original documents, forming one section Entitled "History"; likewise
 combine any sections Entitled "Acknowledgements", and any sections Entitled
 "Dedications". You must delete all sections Entitled "Endorsements".
 
-   6. COLLECTIONS OF DOCUMENTS
+6. COLLECTIONS OF DOCUMENTS
 
 You may make a collection consisting of the Document and other documents released
 under this License, and replace the individual copies of this License in the
@@ -286,7 +274,7 @@ individually under this License, provided you insert a copy of this License
 into the extracted document, and follow this License in all other respects
 regarding verbatim copying of that document.
 
-   7. AGGREGATION WITH INDEPENDENT WORKS
+7. AGGREGATION WITH INDEPENDENT WORKS
 
 A compilation of the Document or its derivatives with other separate and independent
 documents or works, in or on a volume of a storage or distribution medium,
@@ -303,7 +291,7 @@ within the aggregate, or the electronic equivalent of covers if the Document
 is in electronic form. Otherwise they must appear on printed covers that bracket
 the whole aggregate.
 
-   8. TRANSLATION
+8. TRANSLATION
 
 Translation is considered a kind of modification, so you may distribute translations
 of the Document under the terms of section 4. Replacing Invariant Sections
@@ -320,7 +308,7 @@ If a section in the Document is Entitled "Acknowledgements", "Dedications",
 or "History", the requirement (section 4) to Preserve its Title (section 1)
 will typically require changing the actual title.
 
-   9. TERMINATION
+9. TERMINATION
 
 You may not copy, modify, sublicense, or distribute the Document except as
 expressly provided under this License. Any attempt otherwise to copy, modify,
@@ -345,7 +333,7 @@ If your rights have been terminated and not permanently reinstated, receipt
 of a copy of some or all of the same material does not give you any rights
 to use it.
 
-   10. FUTURE REVISIONS OF THIS LICENSE
+10. FUTURE REVISIONS OF THIS LICENSE
 
 The Free Software Foundation may publish new, revised versions of the GNU
 Free Documentation License from time to time. Such new versions will be similar
@@ -363,7 +351,7 @@ If the Document specifies that a proxy can decide which future versions of
 this License can be used, that proxy's public statement of acceptance of a
 version permanently authorizes you to choose that version for the Document.
 
-   11. RELICENSING
+11. RELICENSING
 
 "Massive Multiauthor Collaboration Site" (or "MMC Site") means any World Wide
 Web server that publishes copyrightable works and also provides prominent
@@ -388,8 +376,9 @@ prior to November 1, 2008.
 
 The operator of an MMC Site may republish an MMC contained in the site under
 CC-BY-SA on the same site at any time before August 1, 2009, provided the
-MMC is eligible for relicensing. ADDENDUM: How to use this License for your
-documents
+MMC is eligible for relicensing.
+
+ADDENDUM: How to use this License for your documents
 
 To use this License in a document you have written, include a copy of the
 License in the document and put the following copyright and license notices
diff --git a/options/license/GFDL-1.3-only b/options/license/GFDL-1.3-only
index 90f814dea7..f184688f8a 100644
--- a/options/license/GFDL-1.3-only
+++ b/options/license/GFDL-1.3-only
@@ -1,12 +1,13 @@
 GNU Free Documentation License
+Version 1.3, 3 November 2008
 
-Version 1.3, 3 November 2008 Copyright (C) 2000, 2001, 2002, 2007, 2008 Free
-Software Foundation, Inc. <http://fsf.org/>
+Copyright (C) 2000, 2001, 2002, 2007, 2008 Free Software Foundation, Inc.
+<http://fsf.org/>
 
 Everyone is permitted to copy and distribute verbatim copies of this license
 document, but changing it is not allowed.
 
-   0. PREAMBLE
+0. PREAMBLE
 
 The purpose of this License is to make a manual, textbook, or other functional
 and useful document "free" in the sense of freedom: to assure everyone the
@@ -28,7 +29,7 @@ work, regardless of subject matter or whether it is published as a printed
 book. We recommend this License principally for works whose purpose is instruction
 or reference.
 
-   1. APPLICABILITY AND DEFINITIONS
+1. APPLICABILITY AND DEFINITIONS
 
 This License applies to any manual or other work, in any medium, that contains
 a notice placed by the copyright holder saying it can be distributed under
@@ -110,7 +111,7 @@ considered to be included by reference in this License, but only as regards
 disclaiming warranties: any other implication that these Warranty Disclaimers
 may have is void and has no effect on the meaning of this License.
 
-   2. VERBATIM COPYING
+2. VERBATIM COPYING
 
 You may copy and distribute the Document in any medium, either commercially
 or noncommercially, provided that this License, the copyright notices, and
@@ -124,7 +125,7 @@ enough number of copies you must also follow the conditions in section 3.
 You may also lend copies, under the same conditions stated above, and you
 may publicly display copies.
 
-   3. COPYING IN QUANTITY
+3. COPYING IN QUANTITY
 
 If you publish printed copies (or copies in media that commonly have printed
 covers) of the Document, numbering more than 100, and the Document's license
@@ -158,7 +159,7 @@ It is requested, but not required, that you contact the authors of the Document
 well before redistributing any large number of copies, to give them a chance
 to provide you with an updated version of the Document.
 
-   4. MODIFICATIONS
+4. MODIFICATIONS
 
 You may copy and distribute a Modified Version of the Document under the conditions
 of sections 2 and 3 above, provided that you release the Modified Version
@@ -172,58 +173,45 @@ that of the Document, and from those of previous versions (which should, if
 there were any, be listed in the History section of the Document). You may
 use the same title as a previous version if the original publisher of that
 version gives permission.
-
 B. List on the Title Page, as authors, one or more persons or entities responsible
 for authorship of the modifications in the Modified Version, together with
 at least five of the principal authors of the Document (all of its principal
 authors, if it has fewer than five), unless they release you from this requirement.
-
 C. State on the Title page the name of the publisher of the Modified Version,
 as the publisher.
-
-      D. Preserve all the copyright notices of the Document.
-
+     D. Preserve all the copyright notices of the Document.
 E. Add an appropriate copyright notice for your modifications adjacent to
 the other copyright notices.
-
 F. Include, immediately after the copyright notices, a license notice giving
 the public permission to use the Modified Version under the terms of this
 License, in the form shown in the Addendum below.
-
 G. Preserve in that license notice the full lists of Invariant Sections and
 required Cover Texts given in the Document's license notice. H. Include an
 unaltered copy of this License.
-
 I. Preserve the section Entitled "History", Preserve its Title, and add to
 it an item stating at least the title, year, new authors, and publisher of
 the Modified Version as given on the Title Page. If there is no section Entitled
 "History" in the Document, create one stating the title, year, authors, and
 publisher of the Document as given on its Title Page, then add an item describing
 the Modified Version as stated in the previous sentence.
-
 J. Preserve the network location, if any, given in the Document for public
 access to a Transparent copy of the Document, and likewise the network locations
 given in the Document for previous versions it was based on. These may be
 placed in the "History" section. You may omit a network location for a work
 that was published at least four years before the Document itself, or if the
 original publisher of the version it refers to gives permission.
-
 K. For any section Entitled "Acknowledgements" or "Dedications", Preserve
 the Title of the section, and preserve in the section all the substance and
 tone of each of the contributor acknowledgements and/or dedications given
 therein.
-
 L. Preserve all the Invariant Sections of the Document, unaltered in their
 text and in their titles. Section numbers or the equivalent are not considered
 part of the section titles.
-
 M. Delete any section Entitled "Endorsements". Such a section may not be included
 in the Modified Version.
-
 N. Do not retitle any existing section to be Entitled "Endorsements" or to
 conflict in title with any Invariant Section.
-
-      O. Preserve any Warranty Disclaimers.
+     O. Preserve any Warranty Disclaimers.
 
 If the Modified Version includes new front-matter sections or appendices that
 qualify as Secondary Sections and contain no material copied from the Document,
@@ -250,7 +238,7 @@ The author(s) and publisher(s) of the Document do not by this License give
 permission to use their names for publicity for or to assert or imply endorsement
 of any Modified Version.
 
-   5. COMBINING DOCUMENTS
+5. COMBINING DOCUMENTS
 
 You may combine the Document with other documents released under this License,
 under the terms defined in section 4 above for modified versions, provided
@@ -273,7 +261,7 @@ various original documents, forming one section Entitled "History"; likewise
 combine any sections Entitled "Acknowledgements", and any sections Entitled
 "Dedications". You must delete all sections Entitled "Endorsements".
 
-   6. COLLECTIONS OF DOCUMENTS
+6. COLLECTIONS OF DOCUMENTS
 
 You may make a collection consisting of the Document and other documents released
 under this License, and replace the individual copies of this License in the
@@ -286,7 +274,7 @@ individually under this License, provided you insert a copy of this License
 into the extracted document, and follow this License in all other respects
 regarding verbatim copying of that document.
 
-   7. AGGREGATION WITH INDEPENDENT WORKS
+7. AGGREGATION WITH INDEPENDENT WORKS
 
 A compilation of the Document or its derivatives with other separate and independent
 documents or works, in or on a volume of a storage or distribution medium,
@@ -303,7 +291,7 @@ within the aggregate, or the electronic equivalent of covers if the Document
 is in electronic form. Otherwise they must appear on printed covers that bracket
 the whole aggregate.
 
-   8. TRANSLATION
+8. TRANSLATION
 
 Translation is considered a kind of modification, so you may distribute translations
 of the Document under the terms of section 4. Replacing Invariant Sections
@@ -320,7 +308,7 @@ If a section in the Document is Entitled "Acknowledgements", "Dedications",
 or "History", the requirement (section 4) to Preserve its Title (section 1)
 will typically require changing the actual title.
 
-   9. TERMINATION
+9. TERMINATION
 
 You may not copy, modify, sublicense, or distribute the Document except as
 expressly provided under this License. Any attempt otherwise to copy, modify,
@@ -345,7 +333,7 @@ If your rights have been terminated and not permanently reinstated, receipt
 of a copy of some or all of the same material does not give you any rights
 to use it.
 
-   10. FUTURE REVISIONS OF THIS LICENSE
+10. FUTURE REVISIONS OF THIS LICENSE
 
 The Free Software Foundation may publish new, revised versions of the GNU
 Free Documentation License from time to time. Such new versions will be similar
@@ -363,7 +351,7 @@ If the Document specifies that a proxy can decide which future versions of
 this License can be used, that proxy's public statement of acceptance of a
 version permanently authorizes you to choose that version for the Document.
 
-   11. RELICENSING
+11. RELICENSING
 
 "Massive Multiauthor Collaboration Site" (or "MMC Site") means any World Wide
 Web server that publishes copyrightable works and also provides prominent
@@ -388,8 +376,9 @@ prior to November 1, 2008.
 
 The operator of an MMC Site may republish an MMC contained in the site under
 CC-BY-SA on the same site at any time before August 1, 2009, provided the
-MMC is eligible for relicensing. ADDENDUM: How to use this License for your
-documents
+MMC is eligible for relicensing.
+
+ADDENDUM: How to use this License for your documents
 
 To use this License in a document you have written, include a copy of the
 License in the document and put the following copyright and license notices
diff --git a/options/license/GFDL-1.3-or-later b/options/license/GFDL-1.3-or-later
index 90f814dea7..f184688f8a 100644
--- a/options/license/GFDL-1.3-or-later
+++ b/options/license/GFDL-1.3-or-later
@@ -1,12 +1,13 @@
 GNU Free Documentation License
+Version 1.3, 3 November 2008
 
-Version 1.3, 3 November 2008 Copyright (C) 2000, 2001, 2002, 2007, 2008 Free
-Software Foundation, Inc. <http://fsf.org/>
+Copyright (C) 2000, 2001, 2002, 2007, 2008 Free Software Foundation, Inc.
+<http://fsf.org/>
 
 Everyone is permitted to copy and distribute verbatim copies of this license
 document, but changing it is not allowed.
 
-   0. PREAMBLE
+0. PREAMBLE
 
 The purpose of this License is to make a manual, textbook, or other functional
 and useful document "free" in the sense of freedom: to assure everyone the
@@ -28,7 +29,7 @@ work, regardless of subject matter or whether it is published as a printed
 book. We recommend this License principally for works whose purpose is instruction
 or reference.
 
-   1. APPLICABILITY AND DEFINITIONS
+1. APPLICABILITY AND DEFINITIONS
 
 This License applies to any manual or other work, in any medium, that contains
 a notice placed by the copyright holder saying it can be distributed under
@@ -110,7 +111,7 @@ considered to be included by reference in this License, but only as regards
 disclaiming warranties: any other implication that these Warranty Disclaimers
 may have is void and has no effect on the meaning of this License.
 
-   2. VERBATIM COPYING
+2. VERBATIM COPYING
 
 You may copy and distribute the Document in any medium, either commercially
 or noncommercially, provided that this License, the copyright notices, and
@@ -124,7 +125,7 @@ enough number of copies you must also follow the conditions in section 3.
 You may also lend copies, under the same conditions stated above, and you
 may publicly display copies.
 
-   3. COPYING IN QUANTITY
+3. COPYING IN QUANTITY
 
 If you publish printed copies (or copies in media that commonly have printed
 covers) of the Document, numbering more than 100, and the Document's license
@@ -158,7 +159,7 @@ It is requested, but not required, that you contact the authors of the Document
 well before redistributing any large number of copies, to give them a chance
 to provide you with an updated version of the Document.
 
-   4. MODIFICATIONS
+4. MODIFICATIONS
 
 You may copy and distribute a Modified Version of the Document under the conditions
 of sections 2 and 3 above, provided that you release the Modified Version
@@ -172,58 +173,45 @@ that of the Document, and from those of previous versions (which should, if
 there were any, be listed in the History section of the Document). You may
 use the same title as a previous version if the original publisher of that
 version gives permission.
-
 B. List on the Title Page, as authors, one or more persons or entities responsible
 for authorship of the modifications in the Modified Version, together with
 at least five of the principal authors of the Document (all of its principal
 authors, if it has fewer than five), unless they release you from this requirement.
-
 C. State on the Title page the name of the publisher of the Modified Version,
 as the publisher.
-
-      D. Preserve all the copyright notices of the Document.
-
+     D. Preserve all the copyright notices of the Document.
 E. Add an appropriate copyright notice for your modifications adjacent to
 the other copyright notices.
-
 F. Include, immediately after the copyright notices, a license notice giving
 the public permission to use the Modified Version under the terms of this
 License, in the form shown in the Addendum below.
-
 G. Preserve in that license notice the full lists of Invariant Sections and
 required Cover Texts given in the Document's license notice. H. Include an
 unaltered copy of this License.
-
 I. Preserve the section Entitled "History", Preserve its Title, and add to
 it an item stating at least the title, year, new authors, and publisher of
 the Modified Version as given on the Title Page. If there is no section Entitled
 "History" in the Document, create one stating the title, year, authors, and
 publisher of the Document as given on its Title Page, then add an item describing
 the Modified Version as stated in the previous sentence.
-
 J. Preserve the network location, if any, given in the Document for public
 access to a Transparent copy of the Document, and likewise the network locations
 given in the Document for previous versions it was based on. These may be
 placed in the "History" section. You may omit a network location for a work
 that was published at least four years before the Document itself, or if the
 original publisher of the version it refers to gives permission.
-
 K. For any section Entitled "Acknowledgements" or "Dedications", Preserve
 the Title of the section, and preserve in the section all the substance and
 tone of each of the contributor acknowledgements and/or dedications given
 therein.
-
 L. Preserve all the Invariant Sections of the Document, unaltered in their
 text and in their titles. Section numbers or the equivalent are not considered
 part of the section titles.
-
 M. Delete any section Entitled "Endorsements". Such a section may not be included
 in the Modified Version.
-
 N. Do not retitle any existing section to be Entitled "Endorsements" or to
 conflict in title with any Invariant Section.
-
-      O. Preserve any Warranty Disclaimers.
+     O. Preserve any Warranty Disclaimers.
 
 If the Modified Version includes new front-matter sections or appendices that
 qualify as Secondary Sections and contain no material copied from the Document,
@@ -250,7 +238,7 @@ The author(s) and publisher(s) of the Document do not by this License give
 permission to use their names for publicity for or to assert or imply endorsement
 of any Modified Version.
 
-   5. COMBINING DOCUMENTS
+5. COMBINING DOCUMENTS
 
 You may combine the Document with other documents released under this License,
 under the terms defined in section 4 above for modified versions, provided
@@ -273,7 +261,7 @@ various original documents, forming one section Entitled "History"; likewise
 combine any sections Entitled "Acknowledgements", and any sections Entitled
 "Dedications". You must delete all sections Entitled "Endorsements".
 
-   6. COLLECTIONS OF DOCUMENTS
+6. COLLECTIONS OF DOCUMENTS
 
 You may make a collection consisting of the Document and other documents released
 under this License, and replace the individual copies of this License in the
@@ -286,7 +274,7 @@ individually under this License, provided you insert a copy of this License
 into the extracted document, and follow this License in all other respects
 regarding verbatim copying of that document.
 
-   7. AGGREGATION WITH INDEPENDENT WORKS
+7. AGGREGATION WITH INDEPENDENT WORKS
 
 A compilation of the Document or its derivatives with other separate and independent
 documents or works, in or on a volume of a storage or distribution medium,
@@ -303,7 +291,7 @@ within the aggregate, or the electronic equivalent of covers if the Document
 is in electronic form. Otherwise they must appear on printed covers that bracket
 the whole aggregate.
 
-   8. TRANSLATION
+8. TRANSLATION
 
 Translation is considered a kind of modification, so you may distribute translations
 of the Document under the terms of section 4. Replacing Invariant Sections
@@ -320,7 +308,7 @@ If a section in the Document is Entitled "Acknowledgements", "Dedications",
 or "History", the requirement (section 4) to Preserve its Title (section 1)
 will typically require changing the actual title.
 
-   9. TERMINATION
+9. TERMINATION
 
 You may not copy, modify, sublicense, or distribute the Document except as
 expressly provided under this License. Any attempt otherwise to copy, modify,
@@ -345,7 +333,7 @@ If your rights have been terminated and not permanently reinstated, receipt
 of a copy of some or all of the same material does not give you any rights
 to use it.
 
-   10. FUTURE REVISIONS OF THIS LICENSE
+10. FUTURE REVISIONS OF THIS LICENSE
 
 The Free Software Foundation may publish new, revised versions of the GNU
 Free Documentation License from time to time. Such new versions will be similar
@@ -363,7 +351,7 @@ If the Document specifies that a proxy can decide which future versions of
 this License can be used, that proxy's public statement of acceptance of a
 version permanently authorizes you to choose that version for the Document.
 
-   11. RELICENSING
+11. RELICENSING
 
 "Massive Multiauthor Collaboration Site" (or "MMC Site") means any World Wide
 Web server that publishes copyrightable works and also provides prominent
@@ -388,8 +376,9 @@ prior to November 1, 2008.
 
 The operator of an MMC Site may republish an MMC contained in the site under
 CC-BY-SA on the same site at any time before August 1, 2009, provided the
-MMC is eligible for relicensing. ADDENDUM: How to use this License for your
-documents
+MMC is eligible for relicensing.
+
+ADDENDUM: How to use this License for your documents
 
 To use this License in a document you have written, include a copy of the
 License in the document and put the following copyright and license notices
diff --git a/options/license/GL2PS b/options/license/GL2PS
index 2da34219ce..578093098c 100644
--- a/options/license/GL2PS
+++ b/options/license/GL2PS
@@ -1,4 +1,6 @@
-GL2PS LICENSE Version 2, November 2003 Copyright (C) 2003, Christophe Geuzaine
+GL2PS LICENSE Version 2, November 2003
+
+Copyright (C) 2003, Christophe Geuzaine
 
 Permission to use, copy, and distribute this software and its documentation
 for any purpose with or without fee is hereby granted, provided that the copyright
@@ -8,7 +10,7 @@ notice appear in supporting documentation.
 Permission to modify and distribute modified versions of this software is
 granted, provided that:
 
-   1) the modifications are licensed under the same terms as this software;
+1) the modifications are licensed under the same terms as this software;
 
 2) you make available the source code of any modifications that you distribute,
 either on the same media as you distribute any executable or other form of
diff --git a/options/license/GLWTPL b/options/license/GLWTPL
index e919dca7be..a0f7ec4883 100644
--- a/options/license/GLWTPL
+++ b/options/license/GLWTPL
@@ -1,22 +1,25 @@
-GLWT(Good Luck With That) Public License Copyright (c) Everyone, except Author
+               GLWT(Good Luck With That) Public License
+                 Copyright (c) Everyone, except Author
 
-Everyone is permitted to copy, distribute, modify, merge, sell, publish, sublicense
-or whatever they want with this software but at their OWN RISK.
+Everyone is permitted to copy, distribute, modify, merge, sell, publish,
+sublicense or whatever they want with this software but at their OWN RISK.
 
-Preamble
+                            Preamble
 
-The author has absolutely no clue what the code in this project does. It might
-just work or not, there is no third option.
+The author has absolutely no clue what the code in this project does.
+It might just work or not, there is no third option.
 
-GOOD LUCK WITH THAT PUBLIC LICENSE
 
-TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION, AND MODIFICATION
+                GOOD LUCK WITH THAT PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION, AND MODIFICATION
 
-0. You just DO WHATEVER YOU WANT TO as long as you NEVER LEAVE A TRACE TO
-TRACK THE AUTHOR of the original product to blame for or hold responsible.
+  0. You just DO WHATEVER YOU WANT TO as long as you NEVER LEAVE A
+TRACE TO TRACK THE AUTHOR of the original product to blame for or hold
+responsible.
 
-IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
-OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
 
 Good luck and Godspeed.
diff --git a/options/license/GPL-1.0-only b/options/license/GPL-1.0-only
index fb9886cf8c..8d8c5dfe38 100644
--- a/options/license/GPL-1.0-only
+++ b/options/license/GPL-1.0-only
@@ -1,5 +1,4 @@
 GNU GENERAL PUBLIC LICENSE
-
 Version 1, February 1989
 
 Copyright (C) 1989 Free Software Foundation, Inc. 51 Franklin St, Fifth Floor,
@@ -49,8 +48,6 @@ follow.
 GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION
 AND MODIFICATION
 
-   
-
 0. This License Agreement applies to any program or other work which contains
 a notice placed by the copyright holder saying it may be distributed under
 the terms of this General Public License. The "Program", below, refers to
@@ -58,8 +55,6 @@ any such program or work, and a "work based on the Program" means either the
 Program or any work containing the Program or a portion of it, either verbatim
 or with modifications. Each licensee is addressed as "you".
 
-   
-
 1. You may copy and distribute verbatim copies of the Program's source code
 as you receive it, in any medium, provided that you conspicuously and appropriately
 publish on each copy an appropriate copyright notice and disclaimer of warranty;
@@ -68,8 +63,6 @@ to the absence of any warranty; and give any other recipients of the Program
 a copy of this General Public License along with the Program. You may charge
 a fee for the physical act of transferring a copy.
 
-   
-
 2. You may modify your copy or copies of the Program or any portion of it,
 and copy and distribute such modifications under the terms of Paragraph 1
 above, provided that you also do the following:
@@ -98,8 +91,6 @@ Mere aggregation of another independent work with the Program (or its derivative
 on a volume of a storage or distribution medium does not bring the other work
 under the scope of these terms.
 
-   
-
 3. You may copy and distribute the Program (or a portion or derivative of
 it, under Paragraph 2) in object code or executable form under the terms of
 Paragraphs 1 and 2 above provided that you also do one of the following:
@@ -124,8 +115,6 @@ source code for modules which are standard libraries that accompany the operatin
 system on which the executable file runs, or for standard header files or
 definitions files that accompany that operating system.
 
-   
-
 4. You may not copy, modify, sublicense, distribute or transfer the Program
 except as expressly provided under this General Public License. Any attempt
 otherwise to copy, modify, sublicense, distribute or transfer the Program
@@ -134,22 +123,16 @@ this License. However, parties who have received copies, or rights to use
 copies, from you under this General Public License will not have their licenses
 terminated so long as such parties remain in full compliance.
 
-   
-
 5. By copying, distributing or modifying the Program (or any work based on
 the Program) you indicate your acceptance of this license to do so, and all
 its terms and conditions.
 
-   
-
 6. Each time you redistribute the Program (or any work based on the Program),
 the recipient automatically receives a license from the original licensor
 to copy, distribute or modify the Program subject to these terms and conditions.
 You may not impose any further restrictions on the recipients' exercise of
 the rights granted herein.
 
-   
-
 7. The Free Software Foundation may publish revised and/or new versions of
 the General Public License from time to time. Such new versions will be similar
 in spirit to the present version, but may differ in detail to address new
@@ -162,8 +145,6 @@ or of any later version published by the Free Software Foundation. If the
 Program does not specify a version number of the license, you may choose any
 version ever published by the Free Software Foundation.
 
-   
-
 8. If you wish to incorporate parts of the Program into other free programs
 whose distribution conditions are different, write to the author to ask for
 permission. For software which is copyrighted by the Free Software Foundation,
@@ -172,9 +153,7 @@ Our decision will be guided by the two goals of preserving the free status
 of all derivatives of our free software and of promoting the sharing and reuse
 of software generally.
 
-   
-
-   NO WARRANTY
+NO WARRANTY
 
 9. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR
 THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE
@@ -185,8 +164,6 @@ FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE
 OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME
 THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
 
-   
-
 10. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
 WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE
 THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
@@ -195,6 +172,7 @@ OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA
 OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES
 OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH
 HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
 END OF TERMS AND CONDITIONS
 
 Appendix: How to Apply These Terms to Your New Programs
@@ -246,6 +224,6 @@ Yoyodyne, Inc., hereby disclaims all copyright interest in the program `Gnomovis
 (a program to direct compilers to make passes at assemblers) written by James
 Hacker.
 
-<signature of Ty Coon>, 1 April 1989 Ty Coon, President of Vice
+     <signature of Ty Coon>, 1 April 1989 Ty Coon, President of Vice
 
 That's all there is to it!
diff --git a/options/license/GPL-1.0-or-later b/options/license/GPL-1.0-or-later
index b616110c75..8d8c5dfe38 100644
--- a/options/license/GPL-1.0-or-later
+++ b/options/license/GPL-1.0-or-later
@@ -1,5 +1,4 @@
 GNU GENERAL PUBLIC LICENSE
-
 Version 1, February 1989
 
 Copyright (C) 1989 Free Software Foundation, Inc. 51 Franklin St, Fifth Floor,
@@ -154,12 +153,10 @@ Our decision will be guided by the two goals of preserving the free status
 of all derivatives of our free software and of promoting the sharing and reuse
 of software generally.
 
-   
+NO WARRANTY
 
-   NO WARRANTY 9.
-
-BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE
-PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE
+9. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR
+THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE
 STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM
 "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
 BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
@@ -175,6 +172,7 @@ OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA
 OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES
 OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH
 HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
 END OF TERMS AND CONDITIONS
 
 Appendix: How to Apply These Terms to Your New Programs
@@ -188,9 +186,8 @@ them to the start of each source file to most effectively convey the exclusion
 of warranty; and each file should have at least the "copyright" line and a
 pointer to where the full notice is found.
 
-<one line to give the program's name and a brief idea of what it does.>
-
-Copyright (C) 19yy <name of author>
+<one line to give the program's name and a brief idea of what it does.> Copyright
+(C) 19yy <name of author>
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -227,6 +224,6 @@ Yoyodyne, Inc., hereby disclaims all copyright interest in the program `Gnomovis
 (a program to direct compilers to make passes at assemblers) written by James
 Hacker.
 
-<signature of Ty Coon>, 1 April 1989 Ty Coon, President of Vice
+     <signature of Ty Coon>, 1 April 1989 Ty Coon, President of Vice
 
 That's all there is to it!
diff --git a/options/license/GPL-2.0-only b/options/license/GPL-2.0-only
index 0f3d6411da..3b6070fcd0 100644
--- a/options/license/GPL-2.0-only
+++ b/options/license/GPL-2.0-only
@@ -1,10 +1,8 @@
 GNU GENERAL PUBLIC LICENSE
-
 Version 2, June 1991
 
-Copyright (C) 1989, 1991 Free Software Foundation, Inc. 
-
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 Everyone is permitted to copy and distribute verbatim copies of this license
 document, but changing it is not allowed.
@@ -240,7 +238,7 @@ Our decision will be guided by the two goals of preserving the free status
 of all derivatives of our free software and of promoting the sharing and reuse
 of software generally.
 
-   NO WARRANTY
+NO WARRANTY
 
 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR
 THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE
@@ -259,6 +257,7 @@ OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA
 OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES
 OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH
 HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
 END OF TERMS AND CONDITIONS
 
 How to Apply These Terms to Your New Programs
@@ -272,9 +271,8 @@ them to the start of each source file to most effectively convey the exclusion
 of warranty; and each file should have at least the "copyright" line and a
 pointer to where the full notice is found.
 
-<one line to give the program's name and an idea of what it does.>
-
-Copyright (C)< yyyy> <name of author>
+one line to give the program's name and an idea of what it does. Copyright
+(C) yyyy name of author
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -287,9 +285,8 @@ FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc., 51 Franklin
-Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-Also add information on how to contact you by electronic and paper mail.
+Street, Fifth Floor, Boston, MA 02110-1301, USA. Also add information on how
+to contact you by electronic and paper mail.
 
 If the program is interactive, make it output a short notice like this when
 it starts in an interactive mode:
@@ -311,9 +308,4 @@ is a sample; alter the names:
 Yoyodyne, Inc., hereby disclaims all copyright interest in the program `Gnomovision'
 (which makes passes at compilers) written by James Hacker.
 
-<signature of Ty Coon >, 1 April 1989 Ty Coon, President of Vice This General
-Public License does not permit incorporating your program into proprietary
-programs. If your program is a subroutine library, you may consider it more
-useful to permit linking proprietary applications with the library. If this
-is what you want to do, use the GNU Lesser General Public License instead
-of this License.
+signature of Ty Coon, 1 April 1989 Ty Coon, President of Vice
diff --git a/options/license/GPL-2.0-or-later b/options/license/GPL-2.0-or-later
index 1d80ac3653..3b6070fcd0 100644
--- a/options/license/GPL-2.0-or-later
+++ b/options/license/GPL-2.0-or-later
@@ -1,10 +1,8 @@
 GNU GENERAL PUBLIC LICENSE
-
 Version 2, June 1991
 
-Copyright (C) 1989, 1991 Free Software Foundation, Inc. 
-
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 Everyone is permitted to copy and distribute verbatim copies of this license
 document, but changing it is not allowed.
@@ -240,7 +238,7 @@ Our decision will be guided by the two goals of preserving the free status
 of all derivatives of our free software and of promoting the sharing and reuse
 of software generally.
 
-   NO WARRANTY
+NO WARRANTY
 
 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR
 THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE
@@ -259,6 +257,7 @@ OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA
 OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES
 OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH
 HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
 END OF TERMS AND CONDITIONS
 
 How to Apply These Terms to Your New Programs
@@ -272,9 +271,8 @@ them to the start of each source file to most effectively convey the exclusion
 of warranty; and each file should have at least the "copyright" line and a
 pointer to where the full notice is found.
 
-<one line to give the program's name and an idea of what it does.>
-
-Copyright (C) <yyyy> <name of author>
+one line to give the program's name and an idea of what it does. Copyright
+(C) yyyy name of author
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -287,9 +285,8 @@ FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc., 51 Franklin
-Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-Also add information on how to contact you by electronic and paper mail.
+Street, Fifth Floor, Boston, MA 02110-1301, USA. Also add information on how
+to contact you by electronic and paper mail.
 
 If the program is interactive, make it output a short notice like this when
 it starts in an interactive mode:
@@ -311,9 +308,4 @@ is a sample; alter the names:
 Yoyodyne, Inc., hereby disclaims all copyright interest in the program `Gnomovision'
 (which makes passes at compilers) written by James Hacker.
 
-<signature of Ty Coon>, 1 April 1989 Ty Coon, President of Vice This General
-Public License does not permit incorporating your program into proprietary
-programs. If your program is a subroutine library, you may consider it more
-useful to permit linking proprietary applications with the library. If this
-is what you want to do, use the GNU Lesser General Public License instead
-of this License.
+signature of Ty Coon, 1 April 1989 Ty Coon, President of Vice
diff --git a/options/license/GPL-3.0-linking-exception b/options/license/GPL-3.0-linking-exception
index 76e4173d5e..56096c0706 100644
--- a/options/license/GPL-3.0-linking-exception
+++ b/options/license/GPL-3.0-linking-exception
@@ -1,3 +1,3 @@
 Additional permission under GNU GPL version 3 section 7
 
-If you modify this Program, or any covered work, by linking or combining it with [name of library] (or a modified version of that library), containing parts covered by the terms of [name of library's license] , the licensors of this Program grant you additional permission to convey the resulting work.
+If you modify this Program, or any covered work, by linking or combining it with [name of library] (or a modified version of that library), containing parts covered by the terms of [name of library's license], the licensors of this Program grant you additional permission to convey the resulting work.
diff --git a/options/license/GPL-3.0-linking-source-exception b/options/license/GPL-3.0-linking-source-exception
index 83d5c04537..58a1d1b3a4 100644
--- a/options/license/GPL-3.0-linking-source-exception
+++ b/options/license/GPL-3.0-linking-source-exception
@@ -1,3 +1,3 @@
 Additional permission under GNU GPL version 3 section 7
 
-If you modify this Program, or any covered work, by linking or combining it with [name of library] (or a modified version of that library), containing parts covered by the terms of [name of library's license] , the licensors of this Program grant you additional permission to convey the resulting work. Corresponding Source for a non-source form of such a combination shall include the source code for the parts of [name of library] used as well as that of the covered work.
+If you modify this Program, or any covered work, by linking or combining it with [name of library] (or a modified version of that library), containing parts covered by the terms of [name of library's license], the licensors of this Program grant you additional permission to convey the resulting work. Corresponding Source for a non-source form of such a combination shall include the source code for the parts of [name of library] used as well as that of the covered work.
diff --git a/options/license/GPL-3.0-only b/options/license/GPL-3.0-only
index e142a525bd..599077110a 100644
--- a/options/license/GPL-3.0-only
+++ b/options/license/GPL-3.0-only
@@ -1,8 +1,7 @@
 GNU GENERAL PUBLIC LICENSE
-
 Version 3, 29 June 2007
 
-Copyright © 2007 Free Software Foundation, Inc. <https://fsf.org/>
+Copyright © 2007 Free Software Foundation, Inc. <http://fsf.org/>
 
 Everyone is permitted to copy and distribute verbatim copies of this license
 document, but changing it is not allowed.
@@ -68,37 +67,37 @@ follow.
 
 TERMS AND CONDITIONS
 
-   0. Definitions.
+0. Definitions.
 
-   "This License" refers to version 3 of the GNU General Public License.
+“This License” refers to version 3 of the GNU General Public License.
 
-"Copyright" also means copyright-like laws that apply to other kinds of works,
+“Copyright” also means copyright-like laws that apply to other kinds of works,
 such as semiconductor masks.
 
-"The Program" refers to any copyrightable work licensed under this License.
-Each licensee is addressed as "you". "Licensees" and "recipients" may be individuals
+“The Program” refers to any copyrightable work licensed under this License.
+Each licensee is addressed as “you”. “Licensees” and “recipients” may be individuals
 or organizations.
 
-To "modify" a work means to copy from or adapt all or part of the work in
+To “modify” a work means to copy from or adapt all or part of the work in
 a fashion requiring copyright permission, other than the making of an exact
-copy. The resulting work is called a "modified version" of the earlier work
-or a work "based on" the earlier work.
+copy. The resulting work is called a “modified version” of the earlier work
+or a work “based on” the earlier work.
 
-A "covered work" means either the unmodified Program or a work based on the
+A “covered work” means either the unmodified Program or a work based on the
 Program.
 
-To "propagate" a work means to do anything with it that, without permission,
+To “propagate” a work means to do anything with it that, without permission,
 would make you directly or secondarily liable for infringement under applicable
 copyright law, except executing it on a computer or modifying a private copy.
 Propagation includes copying, distribution (with or without modification),
 making available to the public, and in some countries other activities as
 well.
 
-To "convey" a work means any kind of propagation that enables other parties
+To “convey” a work means any kind of propagation that enables other parties
 to make or receive copies. Mere interaction with a user through a computer
 network, with no transfer of a copy, is not conveying.
 
-An interactive user interface displays "Appropriate Legal Notices" to the
+An interactive user interface displays “Appropriate Legal Notices” to the
 extent that it includes a convenient and prominently visible feature that
 (1) displays an appropriate copyright notice, and (2) tells the user that
 there is no warranty for the work (except to the extent that warranties are
@@ -106,27 +105,26 @@ provided), that licensees may convey the work under this License, and how
 to view a copy of this License. If the interface presents a list of user commands
 or options, such as a menu, a prominent item in the list meets this criterion.
 
-   1. Source Code.
+1. Source Code.
+The “source code” for a work means the preferred form of the work for making
+modifications to it. “Object code” means any non-source form of a work.
 
-The "source code" for a work means the preferred form of the work for making
-modifications to it. "Object code" means any non-source form of a work.
-
-A "Standard Interface" means an interface that either is an official standard
+A “Standard Interface” means an interface that either is an official standard
 defined by a recognized standards body, or, in the case of interfaces specified
 for a particular programming language, one that is widely used among developers
 working in that language.
 
-The "System Libraries" of an executable work include anything, other than
+The “System Libraries” of an executable work include anything, other than
 the work as a whole, that (a) is included in the normal form of packaging
 a Major Component, but which is not part of that Major Component, and (b)
 serves only to enable use of the work with that Major Component, or to implement
 a Standard Interface for which an implementation is available to the public
-in source code form. A "Major Component", in this context, means a major essential
+in source code form. A “Major Component”, in this context, means a major essential
 component (kernel, window system, and so on) of the specific operating system
 (if any) on which the executable work runs, or a compiler used to produce
 the work, or an object code interpreter used to run it.
 
-The "Corresponding Source" for a work in object code form means all the source
+The “Corresponding Source” for a work in object code form means all the source
 code needed to generate, install, and (for an executable work) run the object
 code and to modify the work, including scripts to control those activities.
 However, it does not include the work's System Libraries, or general-purpose
@@ -141,10 +139,9 @@ other parts of the work.
 The Corresponding Source need not include anything that users can regenerate
 automatically from other parts of the Corresponding Source.
 
-   The Corresponding Source for a work in source code form is that same work.
-
-   2. Basic Permissions.
+The Corresponding Source for a work in source code form is that same work.
 
+2. Basic Permissions.
 All rights granted under this License are granted for the term of copyright
 on the Program, and are irrevocable provided the stated conditions are met.
 This License explicitly affirms your unlimited permission to run the unmodified
@@ -166,8 +163,7 @@ material outside their relationship with you.
 Conveying under any other circumstances is permitted solely under the conditions
 stated below. Sublicensing is not allowed; section 10 makes it unnecessary.
 
-   3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
+3. Protecting Users' Legal Rights From Anti-Circumvention Law.
 No covered work shall be deemed part of an effective technological measure
 under any applicable law fulfilling obligations under article 11 of the WIPO
 copyright treaty adopted on 20 December 1996, or similar laws prohibiting
@@ -180,8 +176,7 @@ you disclaim any intention to limit operation or modification of the work
 as a means of enforcing, against the work's users, your or third parties'
 legal rights to forbid circumvention of technological measures.
 
-   4. Conveying Verbatim Copies.
-
+4. Conveying Verbatim Copies.
 You may convey verbatim copies of the Program's source code as you receive
 it, in any medium, provided that you conspicuously and appropriately publish
 on each copy an appropriate copyright notice; keep intact all notices stating
@@ -192,8 +187,7 @@ and give all recipients a copy of this License along with the Program.
 You may charge any price or no price for each copy that you convey, and you
 may offer support or warranty protection for a fee.
 
-   5. Conveying Modified Source Versions.
-
+5. Conveying Modified Source Versions.
 You may convey a work based on the Program, or the modifications to produce
 it from the Program, in the form of source code under the terms of section
 4, provided that you also meet all of these conditions:
@@ -203,7 +197,7 @@ giving a relevant date.
 
 b) The work must carry prominent notices stating that it is released under
 this License and any conditions added under section 7. This requirement modifies
-the requirement in section 4 to "keep intact all notices".
+the requirement in section 4 to “keep intact all notices”.
 
 c) You must license the entire work, as a whole, under this License to anyone
 who comes into possession of a copy. This License will therefore apply, along
@@ -219,14 +213,13 @@ not display Appropriate Legal Notices, your work need not make them do so.
 A compilation of a covered work with other separate and independent works,
 which are not by their nature extensions of the covered work, and which are
 not combined with it such as to form a larger program, in or on a volume of
-a storage or distribution medium, is called an "aggregate" if the compilation
+a storage or distribution medium, is called an “aggregate” if the compilation
 and its resulting copyright are not used to limit the access or legal rights
 of the compilation's users beyond what the individual works permit. Inclusion
 of a covered work in an aggregate does not cause this License to apply to
 the other parts of the aggregate.
 
-   6. Conveying Non-Source Forms.
-
+6. Conveying Non-Source Forms.
 You may convey a covered work in object code form under the terms of sections
 4 and 5, provided that you also convey the machine-readable Corresponding
 Source under the terms of this License, in one of these ways:
@@ -269,19 +262,19 @@ A separable portion of the object code, whose source code is excluded from
 the Corresponding Source as a System Library, need not be included in conveying
 the object code work.
 
-A "User Product" is either (1) a "consumer product", which means any tangible
+A “User Product” is either (1) a “consumer product”, which means any tangible
 personal property which is normally used for personal, family, or household
 purposes, or (2) anything designed or sold for incorporation into a dwelling.
 In determining whether a product is a consumer product, doubtful cases shall
 be resolved in favor of coverage. For a particular product received by a particular
-user, "normally used" refers to a typical or common use of that class of product,
+user, “normally used” refers to a typical or common use of that class of product,
 regardless of the status of the particular user or of the way in which the
 particular user actually uses, or expects or is expected to use, the product.
 A product is a consumer product regardless of whether the product has substantial
 commercial, industrial or non-consumer uses, unless such uses represent the
 only significant mode of use of the product.
 
-"Installation Information" for a User Product means any methods, procedures,
+“Installation Information” for a User Product means any methods, procedures,
 authorization keys, or other information required to install and execute modified
 versions of a covered work in that User Product from a modified version of
 its Corresponding Source. The information must suffice to ensure that the
@@ -311,9 +304,8 @@ with this section must be in a format that is publicly documented (and with
 an implementation available to the public in source code form), and must require
 no special password or key for unpacking, reading or copying.
 
-   7. Additional Terms.
-
-"Additional permissions" are terms that supplement the terms of this License
+7. Additional Terms.
+“Additional permissions” are terms that supplement the terms of this License
 by making exceptions from one or more of its conditions. Additional permissions
 that are applicable to the entire Program shall be treated as though they
 were included in this License, to the extent that they are valid under applicable
@@ -354,7 +346,7 @@ anyone who conveys the material (or modified versions of it) with contractual
 assumptions of liability to the recipient, for any liability that these contractual
 assumptions directly impose on those licensors and authors.
 
-All other non-permissive additional terms are considered "further restrictions"
+All other non-permissive additional terms are considered “further restrictions”
 within the meaning of section 10. If the Program as you received it, or any
 part of it, contains a notice stating that it is governed by this License
 along with a term that is a further restriction, you may remove that term.
@@ -371,8 +363,7 @@ Additional terms, permissive or non-permissive, may be stated in the form
 of a separately written license, or stated as exceptions; the above requirements
 apply either way.
 
-   8. Termination.
-
+8. Termination.
 You may not propagate or modify a covered work except as expressly provided
 under this License. Any attempt otherwise to propagate or modify it is void,
 and will automatically terminate your rights under this License (including
@@ -395,8 +386,7 @@ of parties who have received copies or rights from you under this License.
 If your rights have been terminated and not permanently reinstated, you do
 not qualify to receive new licenses for the same material under section 10.
 
-   9. Acceptance Not Required for Having Copies.
-
+9. Acceptance Not Required for Having Copies.
 You are not required to accept this License in order to receive or run a copy
 of the Program. Ancillary propagation of a covered work occurring solely as
 a consequence of using peer-to-peer transmission to receive a copy likewise
@@ -405,14 +395,13 @@ you permission to propagate or modify any covered work. These actions infringe
 copyright if you do not accept this License. Therefore, by modifying or propagating
 a covered work, you indicate your acceptance of this License to do so.
 
-   10. Automatic Licensing of Downstream Recipients.
-
+10. Automatic Licensing of Downstream Recipients.
 Each time you convey a covered work, the recipient automatically receives
 a license from the original licensors, to run, modify and propagate that work,
 subject to this License. You are not responsible for enforcing compliance
 by third parties with this License.
 
-An "entity transaction" is a transaction transferring control of an organization,
+An “entity transaction” is a transaction transferring control of an organization,
 or substantially all assets of one, or subdividing an organization, or merging
 organizations. If propagation of a covered work results from an entity transaction,
 each party to that transaction who receives a copy of the work also receives
@@ -429,18 +418,17 @@ or counterclaim in a lawsuit) alleging that any patent claim is infringed
 by making, using, selling, offering for sale, or importing the Program or
 any portion of it.
 
-   11. Patents.
-
-A "contributor" is a copyright holder who authorizes use under this License
+11. Patents.
+A “contributor” is a copyright holder who authorizes use under this License
 of the Program or a work on which the Program is based. The work thus licensed
-is called the contributor's "contributor version".
+is called the contributor's “contributor version”.
 
-A contributor's "essential patent claims" are all patent claims owned or controlled
+A contributor's “essential patent claims” are all patent claims owned or controlled
 by the contributor, whether already acquired or hereafter acquired, that would
 be infringed by some manner, permitted by this License, of making, using,
 or selling its contributor version, but do not include claims that would be
 infringed only as a consequence of further modification of the contributor
-version. For purposes of this definition, "control" includes the right to
+version. For purposes of this definition, “control” includes the right to
 grant patent sublicenses in a manner consistent with the requirements of this
 License.
 
@@ -449,10 +437,10 @@ license under the contributor's essential patent claims, to make, use, sell,
 offer for sale, import and otherwise run, modify and propagate the contents
 of its contributor version.
 
-In the following three paragraphs, a "patent license" is any express agreement
+In the following three paragraphs, a “patent license” is any express agreement
 or commitment, however denominated, not to enforce a patent (such as an express
 permission to practice a patent or covenant not to sue for patent infringement).
-To "grant" such a patent license to a party means to make such an agreement
+To “grant” such a patent license to a party means to make such an agreement
 or commitment not to enforce a patent against the party.
 
 If you convey a covered work, knowingly relying on a patent license, and the
@@ -462,7 +450,7 @@ network server or other readily accessible means, then you must either (1)
 cause the Corresponding Source to be so available, or (2) arrange to deprive
 yourself of the benefit of the patent license for this particular work, or
 (3) arrange, in a manner consistent with the requirements of this License,
-to extend the patent license to downstream recipients. "Knowingly relying"
+to extend the patent license to downstream recipients. “Knowingly relying”
 means you have actual knowledge that, but for the patent license, your conveying
 the covered work in a country, or your recipient's use of the covered work
 in a country, would infringe one or more identifiable patents in that country
@@ -475,7 +463,7 @@ them to use, propagate, modify or convey a specific copy of the covered work,
 then the patent license you grant is automatically extended to all recipients
 of the covered work and works based on it.
 
-A patent license is "discriminatory" if it does not include within the scope
+A patent license is “discriminatory” if it does not include within the scope
 of its coverage, prohibits the exercise of, or is conditioned on the non-exercise
 of one or more of the rights that are specifically granted under this License.
 You may not convey a covered work if you are a party to an arrangement with
@@ -493,8 +481,7 @@ Nothing in this License shall be construed as excluding or limiting any implied
 license or other defenses to infringement that may otherwise be available
 to you under applicable patent law.
 
-   12. No Surrender of Others' Freedom.
-
+12. No Surrender of Others' Freedom.
 If conditions are imposed on you (whether by court order, agreement or otherwise)
 that contradict the conditions of this License, they do not excuse you from
 the conditions of this License. If you cannot convey a covered work so as
@@ -505,8 +492,7 @@ for further conveying from those to whom you convey the Program, the only
 way you could satisfy both those terms and this License would be to refrain
 entirely from conveying the Program.
 
-   13. Use with the GNU Affero General Public License.
-
+13. Use with the GNU Affero General Public License.
 Notwithstanding any other provision of this License, you have permission to
 link or combine any covered work with a work licensed under version 3 of the
 GNU Affero General Public License into a single combined work, and to convey
@@ -515,16 +501,15 @@ part which is the covered work, but the special requirements of the GNU Affero
 General Public License, section 13, concerning interaction through a network
 will apply to the combination as such.
 
-   14. Revised Versions of this License.
-
+14. Revised Versions of this License.
 The Free Software Foundation may publish revised and/or new versions of the
 GNU General Public License from time to time. Such new versions will be similar
 in spirit to the present version, but may differ in detail to address new
 problems or concerns.
 
 Each version is given a distinguishing version number. If the Program specifies
-that a certain numbered version of the GNU General Public License "or any
-later version" applies to it, you have the option of following the terms and
+that a certain numbered version of the GNU General Public License “or any
+later version” applies to it, you have the option of following the terms and
 conditions either of that numbered version or of any later version published
 by the Free Software Foundation. If the Program does not specify a version
 number of the GNU General Public License, you may choose any version ever
@@ -539,19 +524,17 @@ Later license versions may give you additional or different permissions. However
 no additional obligations are imposed on any author or copyright holder as
 a result of your choosing to follow a later version.
 
-   15. Disclaimer of Warranty.
-
+15. Disclaimer of Warranty.
 THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE
 LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER
+OTHER PARTIES PROVIDE THE PROGRAM “AS IS” WITHOUT WARRANTY OF ANY KIND, EITHER
 EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
 TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM
 PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR
 CORRECTION.
 
-   16. Limitation of Liability.
-
+16. Limitation of Liability.
 IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL
 ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS THE PROGRAM
 AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL,
@@ -561,14 +544,14 @@ INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE
 PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER
 PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
 
-   17. Interpretation of Sections 15 and 16.
-
+17. Interpretation of Sections 15 and 16.
 If the disclaimer of warranty and limitation of liability provided above cannot
 be given local legal effect according to their terms, reviewing courts shall
 apply local law that most closely approximates an absolute waiver of all civil
 liability in connection with the Program, unless a warranty or assumption
-of liability accompanies a copy of the Program in return for a fee. END OF
-TERMS AND CONDITIONS
+of liability accompanies a copy of the Program in return for a fee.
+
+END OF TERMS AND CONDITIONS
 
 How to Apply These Terms to Your New Programs
 
@@ -578,12 +561,11 @@ which everyone can redistribute and change under these terms.
 
 To do so, attach the following notices to the program. It is safest to attach
 them to the start of each source file to most effectively state the exclusion
-of warranty; and each file should have at least the "copyright" line and a
+of warranty; and each file should have at least the “copyright” line and a
 pointer to where the full notice is found.
 
-<one line to give the program's name and a brief idea of what it does.>
-
-Copyright (C) <year> <name of author>
+     <one line to give the program's name and a brief idea of what it does.>
+     Copyright (C) <year>  <name of author>
 
 This program is free software: you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -592,34 +574,31 @@ version.
 
 This program is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License along with
-this program. If not, see <https://www.gnu.org/licenses/>.
+this program.  If not, see <http://www.gnu.org/licenses/>.
 
 Also add information on how to contact you by electronic and paper mail.
 
 If the program does terminal interaction, make it output a short notice like
 this when it starts in an interactive mode:
 
-<program> Copyright (C) <year> <name of author>
-
-This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-
+     <program>  Copyright (C) <year>  <name of author>
+     This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
 This is free software, and you are welcome to redistribute it under certain
 conditions; type `show c' for details.
 
 The hypothetical commands `show w' and `show c' should show the appropriate
 parts of the General Public License. Of course, your program's commands might
-be different; for a GUI interface, you would use an "about box".
+be different; for a GUI interface, you would use an “about box”.
 
 You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary. For
-more information on this, and how to apply and follow the GNU GPL, see <https://www.gnu.org/licenses/>.
+if any, to sign a “copyright disclaimer” for the program, if necessary. For
+more information on this, and how to apply and follow the GNU GPL, see <http://www.gnu.org/licenses/>.
 
 The GNU General Public License does not permit incorporating your program
 into proprietary programs. If your program is a subroutine library, you may
 consider it more useful to permit linking proprietary applications with the
 library. If this is what you want to do, use the GNU Lesser General Public
-License instead of this License. But first, please read <https://www.gnu.org/
-licenses /why-not-lgpl.html>.
+License instead of this License. But first, please read <http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/options/license/GPL-3.0-or-later b/options/license/GPL-3.0-or-later
index e142a525bd..599077110a 100644
--- a/options/license/GPL-3.0-or-later
+++ b/options/license/GPL-3.0-or-later
@@ -1,8 +1,7 @@
 GNU GENERAL PUBLIC LICENSE
-
 Version 3, 29 June 2007
 
-Copyright © 2007 Free Software Foundation, Inc. <https://fsf.org/>
+Copyright © 2007 Free Software Foundation, Inc. <http://fsf.org/>
 
 Everyone is permitted to copy and distribute verbatim copies of this license
 document, but changing it is not allowed.
@@ -68,37 +67,37 @@ follow.
 
 TERMS AND CONDITIONS
 
-   0. Definitions.
+0. Definitions.
 
-   "This License" refers to version 3 of the GNU General Public License.
+“This License” refers to version 3 of the GNU General Public License.
 
-"Copyright" also means copyright-like laws that apply to other kinds of works,
+“Copyright” also means copyright-like laws that apply to other kinds of works,
 such as semiconductor masks.
 
-"The Program" refers to any copyrightable work licensed under this License.
-Each licensee is addressed as "you". "Licensees" and "recipients" may be individuals
+“The Program” refers to any copyrightable work licensed under this License.
+Each licensee is addressed as “you”. “Licensees” and “recipients” may be individuals
 or organizations.
 
-To "modify" a work means to copy from or adapt all or part of the work in
+To “modify” a work means to copy from or adapt all or part of the work in
 a fashion requiring copyright permission, other than the making of an exact
-copy. The resulting work is called a "modified version" of the earlier work
-or a work "based on" the earlier work.
+copy. The resulting work is called a “modified version” of the earlier work
+or a work “based on” the earlier work.
 
-A "covered work" means either the unmodified Program or a work based on the
+A “covered work” means either the unmodified Program or a work based on the
 Program.
 
-To "propagate" a work means to do anything with it that, without permission,
+To “propagate” a work means to do anything with it that, without permission,
 would make you directly or secondarily liable for infringement under applicable
 copyright law, except executing it on a computer or modifying a private copy.
 Propagation includes copying, distribution (with or without modification),
 making available to the public, and in some countries other activities as
 well.
 
-To "convey" a work means any kind of propagation that enables other parties
+To “convey” a work means any kind of propagation that enables other parties
 to make or receive copies. Mere interaction with a user through a computer
 network, with no transfer of a copy, is not conveying.
 
-An interactive user interface displays "Appropriate Legal Notices" to the
+An interactive user interface displays “Appropriate Legal Notices” to the
 extent that it includes a convenient and prominently visible feature that
 (1) displays an appropriate copyright notice, and (2) tells the user that
 there is no warranty for the work (except to the extent that warranties are
@@ -106,27 +105,26 @@ provided), that licensees may convey the work under this License, and how
 to view a copy of this License. If the interface presents a list of user commands
 or options, such as a menu, a prominent item in the list meets this criterion.
 
-   1. Source Code.
+1. Source Code.
+The “source code” for a work means the preferred form of the work for making
+modifications to it. “Object code” means any non-source form of a work.
 
-The "source code" for a work means the preferred form of the work for making
-modifications to it. "Object code" means any non-source form of a work.
-
-A "Standard Interface" means an interface that either is an official standard
+A “Standard Interface” means an interface that either is an official standard
 defined by a recognized standards body, or, in the case of interfaces specified
 for a particular programming language, one that is widely used among developers
 working in that language.
 
-The "System Libraries" of an executable work include anything, other than
+The “System Libraries” of an executable work include anything, other than
 the work as a whole, that (a) is included in the normal form of packaging
 a Major Component, but which is not part of that Major Component, and (b)
 serves only to enable use of the work with that Major Component, or to implement
 a Standard Interface for which an implementation is available to the public
-in source code form. A "Major Component", in this context, means a major essential
+in source code form. A “Major Component”, in this context, means a major essential
 component (kernel, window system, and so on) of the specific operating system
 (if any) on which the executable work runs, or a compiler used to produce
 the work, or an object code interpreter used to run it.
 
-The "Corresponding Source" for a work in object code form means all the source
+The “Corresponding Source” for a work in object code form means all the source
 code needed to generate, install, and (for an executable work) run the object
 code and to modify the work, including scripts to control those activities.
 However, it does not include the work's System Libraries, or general-purpose
@@ -141,10 +139,9 @@ other parts of the work.
 The Corresponding Source need not include anything that users can regenerate
 automatically from other parts of the Corresponding Source.
 
-   The Corresponding Source for a work in source code form is that same work.
-
-   2. Basic Permissions.
+The Corresponding Source for a work in source code form is that same work.
 
+2. Basic Permissions.
 All rights granted under this License are granted for the term of copyright
 on the Program, and are irrevocable provided the stated conditions are met.
 This License explicitly affirms your unlimited permission to run the unmodified
@@ -166,8 +163,7 @@ material outside their relationship with you.
 Conveying under any other circumstances is permitted solely under the conditions
 stated below. Sublicensing is not allowed; section 10 makes it unnecessary.
 
-   3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
+3. Protecting Users' Legal Rights From Anti-Circumvention Law.
 No covered work shall be deemed part of an effective technological measure
 under any applicable law fulfilling obligations under article 11 of the WIPO
 copyright treaty adopted on 20 December 1996, or similar laws prohibiting
@@ -180,8 +176,7 @@ you disclaim any intention to limit operation or modification of the work
 as a means of enforcing, against the work's users, your or third parties'
 legal rights to forbid circumvention of technological measures.
 
-   4. Conveying Verbatim Copies.
-
+4. Conveying Verbatim Copies.
 You may convey verbatim copies of the Program's source code as you receive
 it, in any medium, provided that you conspicuously and appropriately publish
 on each copy an appropriate copyright notice; keep intact all notices stating
@@ -192,8 +187,7 @@ and give all recipients a copy of this License along with the Program.
 You may charge any price or no price for each copy that you convey, and you
 may offer support or warranty protection for a fee.
 
-   5. Conveying Modified Source Versions.
-
+5. Conveying Modified Source Versions.
 You may convey a work based on the Program, or the modifications to produce
 it from the Program, in the form of source code under the terms of section
 4, provided that you also meet all of these conditions:
@@ -203,7 +197,7 @@ giving a relevant date.
 
 b) The work must carry prominent notices stating that it is released under
 this License and any conditions added under section 7. This requirement modifies
-the requirement in section 4 to "keep intact all notices".
+the requirement in section 4 to “keep intact all notices”.
 
 c) You must license the entire work, as a whole, under this License to anyone
 who comes into possession of a copy. This License will therefore apply, along
@@ -219,14 +213,13 @@ not display Appropriate Legal Notices, your work need not make them do so.
 A compilation of a covered work with other separate and independent works,
 which are not by their nature extensions of the covered work, and which are
 not combined with it such as to form a larger program, in or on a volume of
-a storage or distribution medium, is called an "aggregate" if the compilation
+a storage or distribution medium, is called an “aggregate” if the compilation
 and its resulting copyright are not used to limit the access or legal rights
 of the compilation's users beyond what the individual works permit. Inclusion
 of a covered work in an aggregate does not cause this License to apply to
 the other parts of the aggregate.
 
-   6. Conveying Non-Source Forms.
-
+6. Conveying Non-Source Forms.
 You may convey a covered work in object code form under the terms of sections
 4 and 5, provided that you also convey the machine-readable Corresponding
 Source under the terms of this License, in one of these ways:
@@ -269,19 +262,19 @@ A separable portion of the object code, whose source code is excluded from
 the Corresponding Source as a System Library, need not be included in conveying
 the object code work.
 
-A "User Product" is either (1) a "consumer product", which means any tangible
+A “User Product” is either (1) a “consumer product”, which means any tangible
 personal property which is normally used for personal, family, or household
 purposes, or (2) anything designed or sold for incorporation into a dwelling.
 In determining whether a product is a consumer product, doubtful cases shall
 be resolved in favor of coverage. For a particular product received by a particular
-user, "normally used" refers to a typical or common use of that class of product,
+user, “normally used” refers to a typical or common use of that class of product,
 regardless of the status of the particular user or of the way in which the
 particular user actually uses, or expects or is expected to use, the product.
 A product is a consumer product regardless of whether the product has substantial
 commercial, industrial or non-consumer uses, unless such uses represent the
 only significant mode of use of the product.
 
-"Installation Information" for a User Product means any methods, procedures,
+“Installation Information” for a User Product means any methods, procedures,
 authorization keys, or other information required to install and execute modified
 versions of a covered work in that User Product from a modified version of
 its Corresponding Source. The information must suffice to ensure that the
@@ -311,9 +304,8 @@ with this section must be in a format that is publicly documented (and with
 an implementation available to the public in source code form), and must require
 no special password or key for unpacking, reading or copying.
 
-   7. Additional Terms.
-
-"Additional permissions" are terms that supplement the terms of this License
+7. Additional Terms.
+“Additional permissions” are terms that supplement the terms of this License
 by making exceptions from one or more of its conditions. Additional permissions
 that are applicable to the entire Program shall be treated as though they
 were included in this License, to the extent that they are valid under applicable
@@ -354,7 +346,7 @@ anyone who conveys the material (or modified versions of it) with contractual
 assumptions of liability to the recipient, for any liability that these contractual
 assumptions directly impose on those licensors and authors.
 
-All other non-permissive additional terms are considered "further restrictions"
+All other non-permissive additional terms are considered “further restrictions”
 within the meaning of section 10. If the Program as you received it, or any
 part of it, contains a notice stating that it is governed by this License
 along with a term that is a further restriction, you may remove that term.
@@ -371,8 +363,7 @@ Additional terms, permissive or non-permissive, may be stated in the form
 of a separately written license, or stated as exceptions; the above requirements
 apply either way.
 
-   8. Termination.
-
+8. Termination.
 You may not propagate or modify a covered work except as expressly provided
 under this License. Any attempt otherwise to propagate or modify it is void,
 and will automatically terminate your rights under this License (including
@@ -395,8 +386,7 @@ of parties who have received copies or rights from you under this License.
 If your rights have been terminated and not permanently reinstated, you do
 not qualify to receive new licenses for the same material under section 10.
 
-   9. Acceptance Not Required for Having Copies.
-
+9. Acceptance Not Required for Having Copies.
 You are not required to accept this License in order to receive or run a copy
 of the Program. Ancillary propagation of a covered work occurring solely as
 a consequence of using peer-to-peer transmission to receive a copy likewise
@@ -405,14 +395,13 @@ you permission to propagate or modify any covered work. These actions infringe
 copyright if you do not accept this License. Therefore, by modifying or propagating
 a covered work, you indicate your acceptance of this License to do so.
 
-   10. Automatic Licensing of Downstream Recipients.
-
+10. Automatic Licensing of Downstream Recipients.
 Each time you convey a covered work, the recipient automatically receives
 a license from the original licensors, to run, modify and propagate that work,
 subject to this License. You are not responsible for enforcing compliance
 by third parties with this License.
 
-An "entity transaction" is a transaction transferring control of an organization,
+An “entity transaction” is a transaction transferring control of an organization,
 or substantially all assets of one, or subdividing an organization, or merging
 organizations. If propagation of a covered work results from an entity transaction,
 each party to that transaction who receives a copy of the work also receives
@@ -429,18 +418,17 @@ or counterclaim in a lawsuit) alleging that any patent claim is infringed
 by making, using, selling, offering for sale, or importing the Program or
 any portion of it.
 
-   11. Patents.
-
-A "contributor" is a copyright holder who authorizes use under this License
+11. Patents.
+A “contributor” is a copyright holder who authorizes use under this License
 of the Program or a work on which the Program is based. The work thus licensed
-is called the contributor's "contributor version".
+is called the contributor's “contributor version”.
 
-A contributor's "essential patent claims" are all patent claims owned or controlled
+A contributor's “essential patent claims” are all patent claims owned or controlled
 by the contributor, whether already acquired or hereafter acquired, that would
 be infringed by some manner, permitted by this License, of making, using,
 or selling its contributor version, but do not include claims that would be
 infringed only as a consequence of further modification of the contributor
-version. For purposes of this definition, "control" includes the right to
+version. For purposes of this definition, “control” includes the right to
 grant patent sublicenses in a manner consistent with the requirements of this
 License.
 
@@ -449,10 +437,10 @@ license under the contributor's essential patent claims, to make, use, sell,
 offer for sale, import and otherwise run, modify and propagate the contents
 of its contributor version.
 
-In the following three paragraphs, a "patent license" is any express agreement
+In the following three paragraphs, a “patent license” is any express agreement
 or commitment, however denominated, not to enforce a patent (such as an express
 permission to practice a patent or covenant not to sue for patent infringement).
-To "grant" such a patent license to a party means to make such an agreement
+To “grant” such a patent license to a party means to make such an agreement
 or commitment not to enforce a patent against the party.
 
 If you convey a covered work, knowingly relying on a patent license, and the
@@ -462,7 +450,7 @@ network server or other readily accessible means, then you must either (1)
 cause the Corresponding Source to be so available, or (2) arrange to deprive
 yourself of the benefit of the patent license for this particular work, or
 (3) arrange, in a manner consistent with the requirements of this License,
-to extend the patent license to downstream recipients. "Knowingly relying"
+to extend the patent license to downstream recipients. “Knowingly relying”
 means you have actual knowledge that, but for the patent license, your conveying
 the covered work in a country, or your recipient's use of the covered work
 in a country, would infringe one or more identifiable patents in that country
@@ -475,7 +463,7 @@ them to use, propagate, modify or convey a specific copy of the covered work,
 then the patent license you grant is automatically extended to all recipients
 of the covered work and works based on it.
 
-A patent license is "discriminatory" if it does not include within the scope
+A patent license is “discriminatory” if it does not include within the scope
 of its coverage, prohibits the exercise of, or is conditioned on the non-exercise
 of one or more of the rights that are specifically granted under this License.
 You may not convey a covered work if you are a party to an arrangement with
@@ -493,8 +481,7 @@ Nothing in this License shall be construed as excluding or limiting any implied
 license or other defenses to infringement that may otherwise be available
 to you under applicable patent law.
 
-   12. No Surrender of Others' Freedom.
-
+12. No Surrender of Others' Freedom.
 If conditions are imposed on you (whether by court order, agreement or otherwise)
 that contradict the conditions of this License, they do not excuse you from
 the conditions of this License. If you cannot convey a covered work so as
@@ -505,8 +492,7 @@ for further conveying from those to whom you convey the Program, the only
 way you could satisfy both those terms and this License would be to refrain
 entirely from conveying the Program.
 
-   13. Use with the GNU Affero General Public License.
-
+13. Use with the GNU Affero General Public License.
 Notwithstanding any other provision of this License, you have permission to
 link or combine any covered work with a work licensed under version 3 of the
 GNU Affero General Public License into a single combined work, and to convey
@@ -515,16 +501,15 @@ part which is the covered work, but the special requirements of the GNU Affero
 General Public License, section 13, concerning interaction through a network
 will apply to the combination as such.
 
-   14. Revised Versions of this License.
-
+14. Revised Versions of this License.
 The Free Software Foundation may publish revised and/or new versions of the
 GNU General Public License from time to time. Such new versions will be similar
 in spirit to the present version, but may differ in detail to address new
 problems or concerns.
 
 Each version is given a distinguishing version number. If the Program specifies
-that a certain numbered version of the GNU General Public License "or any
-later version" applies to it, you have the option of following the terms and
+that a certain numbered version of the GNU General Public License “or any
+later version” applies to it, you have the option of following the terms and
 conditions either of that numbered version or of any later version published
 by the Free Software Foundation. If the Program does not specify a version
 number of the GNU General Public License, you may choose any version ever
@@ -539,19 +524,17 @@ Later license versions may give you additional or different permissions. However
 no additional obligations are imposed on any author or copyright holder as
 a result of your choosing to follow a later version.
 
-   15. Disclaimer of Warranty.
-
+15. Disclaimer of Warranty.
 THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE
 LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER
+OTHER PARTIES PROVIDE THE PROGRAM “AS IS” WITHOUT WARRANTY OF ANY KIND, EITHER
 EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
 TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM
 PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR
 CORRECTION.
 
-   16. Limitation of Liability.
-
+16. Limitation of Liability.
 IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL
 ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS THE PROGRAM
 AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL,
@@ -561,14 +544,14 @@ INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE
 PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER
 PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
 
-   17. Interpretation of Sections 15 and 16.
-
+17. Interpretation of Sections 15 and 16.
 If the disclaimer of warranty and limitation of liability provided above cannot
 be given local legal effect according to their terms, reviewing courts shall
 apply local law that most closely approximates an absolute waiver of all civil
 liability in connection with the Program, unless a warranty or assumption
-of liability accompanies a copy of the Program in return for a fee. END OF
-TERMS AND CONDITIONS
+of liability accompanies a copy of the Program in return for a fee.
+
+END OF TERMS AND CONDITIONS
 
 How to Apply These Terms to Your New Programs
 
@@ -578,12 +561,11 @@ which everyone can redistribute and change under these terms.
 
 To do so, attach the following notices to the program. It is safest to attach
 them to the start of each source file to most effectively state the exclusion
-of warranty; and each file should have at least the "copyright" line and a
+of warranty; and each file should have at least the “copyright” line and a
 pointer to where the full notice is found.
 
-<one line to give the program's name and a brief idea of what it does.>
-
-Copyright (C) <year> <name of author>
+     <one line to give the program's name and a brief idea of what it does.>
+     Copyright (C) <year>  <name of author>
 
 This program is free software: you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -592,34 +574,31 @@ version.
 
 This program is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License along with
-this program. If not, see <https://www.gnu.org/licenses/>.
+this program.  If not, see <http://www.gnu.org/licenses/>.
 
 Also add information on how to contact you by electronic and paper mail.
 
 If the program does terminal interaction, make it output a short notice like
 this when it starts in an interactive mode:
 
-<program> Copyright (C) <year> <name of author>
-
-This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-
+     <program>  Copyright (C) <year>  <name of author>
+     This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
 This is free software, and you are welcome to redistribute it under certain
 conditions; type `show c' for details.
 
 The hypothetical commands `show w' and `show c' should show the appropriate
 parts of the General Public License. Of course, your program's commands might
-be different; for a GUI interface, you would use an "about box".
+be different; for a GUI interface, you would use an “about box”.
 
 You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary. For
-more information on this, and how to apply and follow the GNU GPL, see <https://www.gnu.org/licenses/>.
+if any, to sign a “copyright disclaimer” for the program, if necessary. For
+more information on this, and how to apply and follow the GNU GPL, see <http://www.gnu.org/licenses/>.
 
 The GNU General Public License does not permit incorporating your program
 into proprietary programs. If your program is a subroutine library, you may
 consider it more useful to permit linking proprietary applications with the
 library. If this is what you want to do, use the GNU Lesser General Public
-License instead of this License. But first, please read <https://www.gnu.org/
-licenses /why-not-lgpl.html>.
+License instead of this License. But first, please read <http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/options/license/GPL-CC-1.0 b/options/license/GPL-CC-1.0
index a1266b2ded..a687e0ddb6 100644
--- a/options/license/GPL-CC-1.0
+++ b/options/license/GPL-CC-1.0
@@ -1,17 +1,46 @@
-GPL Cooperation Commitment Version 1.0
+GPL Cooperation Commitment
+Version 1.0
 
-Before filing or continuing to prosecute any legal proceeding or claim (other than a Defensive Action) arising from termination of a Covered License, we commit to extend to the person or entity ('you') accused of violating the Covered License the following provisions regarding cure and reinstatement, taken from GPL version 3. As used here, the term 'this License' refers to the specific Covered License being enforced.
+Before filing or continuing to prosecute any legal proceeding or claim
+(other than a Defensive Action) arising from termination of a Covered
+License, we commit to extend to the person or entity ('you') accused
+of violating the Covered License the following provisions regarding
+cure and reinstatement, taken from GPL version 3. As used here, the
+term 'this License' refers to the specific Covered License being
+enforced.
 
-However, if you cease all violation of this License, then your license from a particular copyright holder is reinstated (a) provisionally, unless and until the copyright holder explicitly and finally terminates your license, and (b) permanently, if the copyright holder fails to notify you of the violation by some reasonable means prior to 60 days after the cessation.
+    However, if you cease all violation of this License, then your
+    license from a particular copyright holder is reinstated (a)
+    provisionally, unless and until the copyright holder explicitly
+    and finally terminates your license, and (b) permanently, if the
+    copyright holder fails to notify you of the violation by some
+    reasonable means prior to 60 days after the cessation.
 
-Moreover, your license from a particular copyright holder is reinstated permanently if the copyright holder notifies you of the violation by some reasonable means, this is the first time you have received notice of violation of this License (for any work) from that copyright holder, and you cure the violation prior to 30 days after your receipt of the notice.
+    Moreover, your license from a particular copyright holder is
+    reinstated permanently if the copyright holder notifies you of the
+    violation by some reasonable means, this is the first time you
+    have received notice of violation of this License (for any work)
+    from that copyright holder, and you cure the violation prior to 30
+    days after your receipt of the notice.
 
-We intend this Commitment to be irrevocable, and binding and enforceable against us and assignees of or successors to our copyrights.
+We intend this Commitment to be irrevocable, and binding and
+enforceable against us and assignees of or successors to our
+copyrights.
 
-Definitions:
+Definitions
 
-"Covered License" means the GNU General Public License, version 2 (GPLv2), the GNU Lesser General Public License, version 2.1 (LGPLv2.1), or the GNU Library General Public License, version 2 (LGPLv2), all as published by the Free Software Foundation.
+'Covered License' means the GNU General Public License, version 2
+(GPLv2), the GNU Lesser General Public License, version 2.1
+(LGPLv2.1), or the GNU Library General Public License, version 2
+(LGPLv2), all as published by the Free Software Foundation.
 
-"Defensive Action" means a legal proceeding or claim that We bring against you in response to a prior proceeding or claim initiated by you or your affiliate.
+'Defensive Action' means a legal proceeding or claim that We bring
+against you in response to a prior proceeding or claim initiated by
+you or your affiliate.
 
-"We" means each contributor to this repository as of the date of inclusion of this file, including subsidiaries of a corporate contributor. This work is available under a Creative Commons Attribution-ShareAlike 4.0 International license (https://creativecommons.org/licenses/by-sa/4.0/).
+'We' means each contributor to this repository as of the date of
+inclusion of this file, including subsidiaries of a corporate
+contributor.
+
+This work is available under a Creative Commons Attribution-ShareAlike
+4.0 International license (https://creativecommons.org/licenses/by-sa/4.0/).
diff --git a/options/license/Glide b/options/license/Glide
index 33a0201f7c..ba3c428bed 100644
--- a/options/license/Glide
+++ b/options/license/Glide
@@ -1,6 +1,6 @@
 3DFX GLIDE Source Code General Public License
 
-   1. PREAMBLE
+1. PREAMBLE
 
 This license is for software that provides a 3D graphics application program
 interface (API).The license is intended to offer terms similar to some standard
@@ -21,7 +21,7 @@ Rather, the license is limited to only the identifiable portion of the derivativ
 work that is derived from the licensed software. The precise terms and conditions
 for copying, distribution and modification follow.
 
-   2. DEFINITIONS
+2. DEFINITIONS
 
 2.1 This License applies to any program (or other "work") which contains a
 notice placed by the copyright holder saying it may be distributed under the
@@ -39,7 +39,7 @@ It does not include any other portions of a work.
 2.4 "Modifications of the Program" means any work, which includes a Derivative
 Work, and includes the whole of such work.
 
-      2.5 "License" means this 3dfx GLIDE Source Code General Public License.
+     2.5 "License" means this 3dfx GLIDE Source Code General Public License.
 
 2.6 The "Source Code" for a work means the preferred form of the work for
 making modifications to it. For an executable work, complete source code means
@@ -47,9 +47,9 @@ all the source code for all modules it contains, any associated interface
 definition files, and the scripts used to control compilation and installation
 of the executable work.
 
-      2.7 "3dfx" means 3dfx Interactive, Inc.
+     2.7 "3dfx" means 3dfx Interactive, Inc.
 
-   3. LICENSED ACTIVITIES
+3. LICENSED ACTIVITIES
 
 3.1 COPYING - You may copy and distribute verbatim copies of the Program's
 Source Code as you receive it, in any medium, subject to the provision of
@@ -110,7 +110,7 @@ to claim rights or contest your rights to work written entirely by you; rather,
 the intent is to exercise the right to control the distribution of Derivative
 Works.
 
-      3.3 DISTRIBUTION
+     3.3 DISTRIBUTION
 
 (a) All copies of the Program or Derivative Works which are distributed must
 include in the file headers the following language verbatim:
@@ -129,7 +129,7 @@ COMPUTER SOFTWARE CLAUSE AT DFARS 252.227-7013, AND/OR IN SIMILAR OR SUCCESSOR
 CLAUSES IN THE FAR, DOD OR NASA FAR SUPPLEMENT. UNPUBLISHED RIGHTS RESERVED
 UNDER THE COPYRIGHT LAWS OF THE UNITED STATES.
 
-         COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED"
+          COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED"
 
 (b) You may distribute the Program or a Derivative Work in object code or
 executable form under the terms of Sections 3.1 and 3.2 provided that you
@@ -178,7 +178,7 @@ However, parties who have received copies, or rights, from you under this
 License will not have their licenses terminated so long as such parties remain
 in full compliance.
 
-   4. MISCELLANEOUS
+4. MISCELLANEOUS
 
 4.1 Acceptance of this License is voluntary. By using, modifying or distributing
 the Program or any Derivative Work, you indicate your acceptance of this License
@@ -198,7 +198,7 @@ License incorporates the limitation as if written in the body of this License.
 California and you consent to personal jurisdiction in the State of California
 in the event it is necessary to enforce the provisions of this License.
 
-   5. NO WARRANTIES
+5. NO WARRANTIES
 
 5.1 TO THE EXTENT PERMITTED BY APPLICABLE LAW, THERE IS NO WARRANTY FOR THE
 PROGRAM. OR DERIVATIVE WORKS THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE
diff --git a/options/license/HPND b/options/license/HPND
index 4662ba23b2..6dd9a1b889 100644
--- a/options/license/HPND
+++ b/options/license/HPND
@@ -1,17 +1,20 @@
-Historical Permission Notice and Disclaimer <copyright notice>
+Historical Permission Notice and Disclaimer
+
+<copyright notice>
 
 Permission to use, copy, modify and distribute this software and its documentation
 for any purpose and without fee is hereby granted, provided that the above
 copyright notice appear in all copies, and that both that the copyright notice
-and this permission notice appear in supporting documentation , and that the
-name of <copyright holder> <or related entities> not be used in advertising
+and this permission notice appear in supporting documentation, and that the
+name of <copyright holder> or <related entities> not be used in advertising
 or publicity pertaining to distribution of the software without specific,
-written prior permission . <copyright holder> makes no representations about
+written prior permission. <copyright holder> makes no representations about
 the suitability of this software for any purpose. It is provided "as is" without
-express or implied warranty. <copyright holder> DISCLAIMS ALL WARRANTIES WITH
-REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS . IN NO EVENT SHALL <copyright holder> BE LIABLE FOR ANY SPECIAL,
-INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
-OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
+express or implied warranty.
+
+<copyright holder> DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS,. IN NO EVENT
+SHALL <copyright holder> BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
+DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
diff --git a/options/license/HPND-sell-variant b/options/license/HPND-sell-variant
index f4a470f1f7..cac53b2373 100644
--- a/options/license/HPND-sell-variant
+++ b/options/license/HPND-sell-variant
@@ -1,17 +1,19 @@
-<copyright notice>
+Copyright 1993 by OpenVision Technologies, Inc.
 
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appears in all copies, and that both that the copyright
-notice and this permission notice appear in supporting documentation, and
-that the name of <copyright holder> <or related entities> not be used in advertising
-or publicity pertaining to distribution of the software without specific,
-written prior permission . <copyright holder> makes no representations about
-the suitability of this software for any purpose. It is provided "as is" without
-express or implied warranty. <copyright holder> DISCLAIMS ALL WARRANTIES WITH
-REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS . IN NO EVENT SHALL <copyright holder> BE LIABLE FOR ANY SPECIAL,
-INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
-OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+Permission to use, copy, modify, distribute, and sell this software
+and its documentation for any purpose is hereby granted without fee,
+provided that the above copyright notice appears in all copies and
+that both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of OpenVision not be used
+in advertising or publicity pertaining to distribution of the software
+without specific, written prior permission. OpenVision makes no
+representations about the suitability of this software for any
+purpose.  It is provided "as is" without express or implied warranty.
+
+OPENVISION DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL OPENVISION BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
+USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 PERFORMANCE OF THIS SOFTWARE.
diff --git a/options/license/HTMLTIDY b/options/license/HTMLTIDY
new file mode 100644
index 0000000000..968a2e8735
--- /dev/null
+++ b/options/license/HTMLTIDY
@@ -0,0 +1,28 @@
+HTML Tidy License
+
+This software and documentation is provided "as is," and the copyright holders
+and contributing author(s) make no representations or warranties, express
+or implied, including but not limited to, warranties of merchantability or
+fitness for any particular purpose or that the use of the software or documentation
+will not infringe any third party patents, copyrights, trademarks or other
+rights.
+
+The copyright holders and contributing author(s) will not be held liable for
+any direct, indirect, special or consequential damages arising out of any
+use of the software or documentation, even if advised of the possibility of
+such damage.
+
+Permission is hereby granted to use, copy, modify, and distribute this source
+code, or portions hereof, documentation and executables, for any purpose,
+without fee, subject to the following restrictions:
+
+    1. The origin of this source code must not be misrepresented.
+2. Altered versions must be plainly marked as such and must not be misrepresented
+as being the original source.
+3. This Copyright notice may not be removed or altered from any source or
+altered source distribution.
+
+The copyright holders and contributing author(s) specifically permit, without
+fee, and encourage the use of this source code as a component for supporting
+the Hypertext Markup Language in commercial products. If you use this source
+code in a product, acknowledgement is not required but would be appreciated.
diff --git a/options/license/HaskellReport b/options/license/HaskellReport
index 39f7c09753..8ae751b4fe 100644
--- a/options/license/HaskellReport
+++ b/options/license/HaskellReport
@@ -1,12 +1,11 @@
 Code derived from the document "Report on the Programming Language
-
 Haskell 2010", is distributed under the following license:
 
 Copyright (c) 2010 Simon Marlow
 
 The authors intend this Report to belong to the entire Haskell community,
 and so we grant permission to copy and distribute it for any purpose, provided
-that it is reproduced in its entirety, including this Notice. Modified versions
+that it is reproduced in its entirety, including this Notice.  Modified versions
 of this Report may also be copied and distributed for any purpose, provided
 that the modified version is clearly presented as such, and that it does not
 claim to be a definition of the Haskell 2010 Language.
diff --git a/options/license/Hippocratic-2.1 b/options/license/Hippocratic-2.1
index 302178eb7e..f4d75b0690 100644
--- a/options/license/Hippocratic-2.1
+++ b/options/license/Hippocratic-2.1
@@ -1,18 +1,19 @@
-[SOFTWARE NAME] Copyright (C) (YEAR) (COPYRIGHT HOLDER(S)/AUTHOR(S) ("Licensor")
+[SOFTWARE NAME] Copyright (YEAR) (COPYRIGHT HOLDER(S)/AUTHOR(S))(“Licensor”)
+
 Hippocratic License Version Number: 2.1.
 
 Purpose. The purpose of this License is for the Licensor named above to permit
 the Licensee (as defined below) broad permission, if consistent with Human
 Rights Laws and Human Rights Principles (as each is defined below), to use
-and work with the Software (as defined below) within the full scope of Licensor's
+and work with the Software (as defined below) within the full scope of Licensor’s
 copyright and patent rights, if any, in the Software, while ensuring attribution
 and protecting the Licensor from liability.
 
 Permission and Conditions. The Licensor grants permission by this license
-("License"), free of charge, to the extent of Licensor's rights under applicable
-copyright and patent law, to any person or entity (the "Licensee") obtaining
-a copy of this software and associated documentation files (the "Software"),
-to do everything with the Software that would otherwise infringe (i) the Licensor's
+(“License”), free of charge, to the extent of Licensor’s rights under applicable
+copyright and patent law, to any person or entity (the “Licensee”) obtaining
+a copy of this software and associated documentation files (the “Software”),
+to do everything with the Software that would otherwise infringe (i) the Licensor’s
 copyright in the Software or (ii) any patent claims to the Software that the
 Licensor can license or becomes able to license, subject to all of the following
 terms and conditions:
@@ -33,16 +34,16 @@ or different terms, the portion of the Software not modified must be distributed
 pursuant to this License. If anyone notifies Licensee in writing that Licensee
 has not complied with this Notice section, Licensee can keep this License
 by taking all practical steps to comply within 30 days after the notice. If
-Licensee does not do so, Licensee's License (and all rights licensed hereunder)
+Licensee does not do so, Licensee’s License (and all rights licensed hereunder)
 shall end immediately.
 
-   * Compliance with Human Rights Principles and Human Rights Laws.
+* Compliance with Human Rights Principles and Human Rights Laws.
 
-      1. Human Rights Principles.
+    1. Human Rights Principles.
 
 (a) Licensee is advised to consult the articles of the United Nations Universal
 Declaration of Human Rights and the United Nations Global Compact that define
-recognized principles of international human rights (the "Human Rights Principles").
+recognized principles of international human rights (the “Human Rights Principles”).
 Licensee shall use the Software in a manner consistent with Human Rights Principles.
 
 (b) Unless the Licensor and Licensee agree otherwise, any dispute, controversy,
@@ -52,7 +53,7 @@ for breach of the Human Rights Principles, or invalidity of Section 1(a) or
 (ii) a determination of whether any Law is consistent or in conflict with
 Human Rights Principles pursuant to Section 2, below, shall be settled by
 arbitration in accordance with the Hague Rules on Business and Human Rights
-Arbitration (the "Rules"); provided, however, that Licensee may elect not
+Arbitration (the “Rules”); provided, however, that Licensee may elect not
 to participate in such arbitration, in which event this License (and all rights
 licensed hereunder) shall end immediately. The number of arbitrators shall
 be one unless the Rules require otherwise.
@@ -71,12 +72,12 @@ arbitral process pursuant to Articles 18, 33, 41 and 42 of the Rules; and
 
 2. Human Rights Laws. The Software shall not be used by any person or entity
 for any systems, activities, or other uses that violate any Human Rights Laws.
-"Human Rights Laws" means any applicable laws, regulations, or rules (collectively,
-"Laws") that protect human, civil, labor, privacy, political, environmental,
+“Human Rights Laws” means any applicable laws, regulations, or rules (collectively,
+“Laws”) that protect human, civil, labor, privacy, political, environmental,
 security, economic, due process, or similar rights; provided, however, that
 such Laws are consistent and not in conflict with Human Rights Principles
 (a dispute over the consistency or a conflict between Laws and Human Rights
-Principles shall be determined by arbitration as stated above). Where the
+Principles shall be determined by arbitration as stated above).  Where the
 Human Rights Laws of more than one jurisdiction are applicable or in conflict
 with respect to the use of the Software, the Human Rights Laws that are most
 protective of the individuals or groups harmed shall apply.
@@ -84,8 +85,8 @@ protective of the individuals or groups harmed shall apply.
 3. Indemnity. Licensee shall hold harmless and indemnify Licensor (and any
 other contributor) against all losses, damages, liabilities, deficiencies,
 claims, actions, judgments, settlements, interest, awards, penalties, fines,
-costs, or expenses of whatever kind, including Licensor's reasonable attorneys'
-fees, arising out of or relating to Licensee's use of the Software in violation
+costs, or expenses of whatever kind, including Licensor’s reasonable attorneys’
+fees, arising out of or relating to Licensee’s use of the Software in violation
 of Human Rights Laws or Human Rights Principles.
 
 * Failure to Comply. Any failure of Licensee to act according to the terms
@@ -117,7 +118,7 @@ with Human Rights Principles and Human Rights Laws as closely as possible.
 The language in this License shall be interpreted as to its fair meaning and
 not strictly for or against any party.
 
-* Disclaimer. TO THE FULL EXTENT ALLOWED BY LAW, THIS SOFTWARE COMES "AS IS,"
+* Disclaimer. TO THE FULL EXTENT ALLOWED BY LAW, THIS SOFTWARE COMES “AS IS,”
 WITHOUT ANY WARRANTY, EXPRESS OR IMPLIED, AND LICENSOR AND ANY OTHER CONTRIBUTOR
 SHALL NOT BE LIABLE TO ANYONE FOR ANY DAMAGES OR OTHER LIABILITY ARISING FROM,
 OUT OF, OR IN CONNECTION WITH THE SOFTWARE OR THIS LICENSE, UNDER ANY KIND
@@ -125,5 +126,5 @@ OF LEGAL CLAIM.
 
 This Hippocratic License is an Ethical Source license (https://ethicalsource.dev)
 and is offered for use by licensors and licensees at their own risk, on an
-"AS IS" basis, and with no warranties express or implied, to the maximum extent
+“AS IS” basis, and with no warranties express or implied, to the maximum extent
 permitted by Laws.
diff --git a/options/license/IBM-pibs b/options/license/IBM-pibs
index 775c837a55..9b9ccd45df 100644
--- a/options/license/IBM-pibs
+++ b/options/license/IBM-pibs
@@ -1,7 +1,7 @@
 This source code has been made available to you by IBM on an AS-IS basis.
 Anyone receiving this source is licensed under IBM copyrights to use it in
 any way he or she deems fit, including copying it, modifying it, compiling
-it, and redistributing it either with or without modifications. No license
+it, and redistributing it either with or without modifications.  No license
 under IBM patents or patent applications is to be implied by the copyright
 license.
 
@@ -13,6 +13,5 @@ Any person who transfers this source code or any derivative work must include
 the IBM copyright notice, this paragraph, and the preceding two paragraphs
 in the transferred software.
 
-COPYRIGHT I B M CORPORATION 2002
-
-LICENSED MATERIAL - PROGRAM PROPERTY OF I B M
+COPYRIGHT   I B M   CORPORATION 2002
+LICENSED MATERIAL  -  PROGRAM PROPERTY OF I B M
diff --git a/options/license/ICU b/options/license/ICU
index 33bac34223..fe3dcc22e0 100644
--- a/options/license/ICU
+++ b/options/license/ICU
@@ -1,8 +1,8 @@
 ICU License - ICU 1.8.1 and later
 
-COPYRIGHT AND PERMISSION NOTICE Copyright (c) 1995-2014 International Business
-Machines Corporation and others
+COPYRIGHT AND PERMISSION NOTICE
 
+Copyright (c) 1995-2014 International Business Machines Corporation and others
 All rights reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/options/license/IJG b/options/license/IJG
index a5ab4296ac..130d996e11 100644
--- a/options/license/IJG
+++ b/options/license/IJG
@@ -1,13 +1,12 @@
-Independent JPEG Group License LEGAL ISSUES
+Independent JPEG Group License
+
+LEGAL ISSUES
 
 In plain English:
 
 1. We don't promise that this software works. (But if you find any bugs, please
 let us know!)
-
-2. You can use this software for whatever you want. You don't have to pay
-us.
-
+2. You can use this software for whatever you want. You don't have to pay us.
 3. You may not pretend that you wrote this software. If you use it in a program,
 you must acknowledge somewhere in your documentation that you've used the
 IJG code.
@@ -29,11 +28,9 @@ Permission is hereby granted to use, copy, modify, and distribute this software
 this README file must be included, with this copyright and no-warranty notice
 unaltered; and any additions, deletions, or changes to the original files
 must be clearly indicated in accompanying documentation.
-
 (2) If only executable code is distributed, then the accompanying documentation
 must state that "this software is based in part on the work of the Independent
 JPEG Group".
-
 (3) Permission for use of this software is granted only if the user accepts
 full responsibility for any undesirable consequences; the authors accept NO
 LIABILITY for damages of any kind.
@@ -81,6 +78,5 @@ GIFs". This technique does not use the LZW algorithm; the resulting GIF files
 are larger than usual, but are readable by all standard GIF decoders.
 
 We are required to state that
-
 "The Graphics Interchange Format(c) is the Copyright property of CompuServe
 Incorporated. GIF(sm) is a Service Mark property of CompuServe Incorporated."
diff --git a/options/license/IPA b/options/license/IPA
index c52cbbab26..b7d3665faf 100644
--- a/options/license/IPA
+++ b/options/license/IPA
@@ -1,7 +1,7 @@
 IPA Font License Agreement v1.0
 
 The Licensor provides the Licensed Program (as defined in Article 1 below)
-under the terms of this license agreement ("Agreement"). Any use, reproduction
+under the terms of this license agreement ("Agreement").  Any use, reproduction
 or distribution of the Licensed Program, or any exercise of rights under this
 Agreement by a Recipient (as defined in Article 1 below) constitutes the Recipient's
 acceptance of this Agreement.
@@ -29,12 +29,12 @@ text, pictures, photographic images, graphic symbols and/or the like.
 5. "Digital Document File" shall mean a PDF file or other Digital Content
 created by various software programs in which a part or all of the Licensed
 Program becomes embedded or contained in the file for the display of the font
-("Embedded Fonts"). Embedded Fonts are used only in the display of characters
+("Embedded Fonts").  Embedded Fonts are used only in the display of characters
 in the particular Digital Document File within which they are embedded, and
 shall be distinguished from those in any Digital Font Program, which may be
 used for display of characters outside that particular Digital Document File.
 
-   6. "Computer" shall include a server in this Agreement.
+6. "Computer" shall include a server in this Agreement.
 
 7. "Reproduction and Other Exploitation" shall mean reproduction, transfer,
 distribution, lease, public transmission, presentation, exhibition, adaptation
@@ -99,7 +99,7 @@ or be made available online or by means of mailing mechanisms in exchange
 for a cost which does not exceed the total costs of postage, storage medium
 and handling fees:
 
-         (a) a copy of the Derived Program; and
+          (a) a copy of the Derived Program; and
 
 (b) any additional file created by the font developing program in the course
 of creating the Derived Program that can be used for further modification
@@ -107,7 +107,7 @@ of the Derived Program, if any.
 
 (2) It is required to also Redistribute means to enable recipients of the
 Derived Program to replace the Derived Program with the Licensed Program first
-released under this License (the "Original Program"). Such means may be to
+released under this License (the "Original Program").  Such means may be to
 provide a difference file from the Original Program, or instructions setting
 out a method to replace the Derived Program with the Original Program.
 
@@ -125,16 +125,16 @@ any party wishing to do so.
 6 of the preceding Article, the Recipient shall meet all of the following
 conditions:
 
-      (1) The Recipient may not change the name of the Licensed Program.
+     (1) The Recipient may not change the name of the Licensed Program.
 
-      (2) The Recipient may not alter or otherwise modify the Licensed Program.
+     (2) The Recipient may not alter or otherwise modify the Licensed Program.
 
 (3) The Recipient must attach a copy of this Agreement to the Licensed Program.
 
 3. THIS LICENSED PROGRAM IS PROVIDED BY THE LICENSOR "AS IS" AND ANY EXPRESSED
 OR IMPLIED WARRANTY AS TO THE LICENSED PROGRAM OR ANY DERIVED PROGRAM, INCLUDING,
 BUT NOT LIMITED TO, WARRANTIES OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY,
-OR FITNESS FOR A PARTICULAR PURPOSE, ARE DISCLAIMED. IN NO EVENT SHALL THE
+OR FITNESS FOR A PARTICULAR PURPOSE, ARE DISCLAIMED.  IN NO EVENT SHALL THE
 LICENSOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXTENDED,
 EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO; PROCUREMENT
 OF SUBSTITUTED GOODS OR SERVICE; DAMAGES ARISING FROM SYSTEM FAILURE; LOSS
@@ -167,11 +167,11 @@ who breached this Agreement.
 
 Article 5 (Governing Law)
 
-1. IPA may publish revised and/or new versions of this License. In such an
+1. IPA may publish revised and/or new versions of this License.  In such an
 event, the Recipient may select either this Agreement or any subsequent version
 of the Agreement in using, conducting the Reproduction and Other Exploitation
 of, or Redistributing the Licensed Program or a Derived Program. Other matters
 not specified above shall be subject to the Copyright Law of Japan and other
 related laws and regulations of Japan.
 
-   2. This Agreement shall be construed under the laws of Japan.
+2. This Agreement shall be construed under the laws of Japan.
diff --git a/options/license/IPL-1.0 b/options/license/IPL-1.0
index 6f99632626..23a8bd8f6c 100644
--- a/options/license/IPL-1.0
+++ b/options/license/IPL-1.0
@@ -1,236 +1,218 @@
 IBM Public License Version 1.0
 
 THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS IBM
-
 PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION
-
 OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
 
-   1. DEFINITIONS
+1. DEFINITIONS
+"Contribution" means:
 
-   "Contribution" means:
-
-a. in the case of International Business Machines Corporation ("IBM"), the
+a.  in the case of International Business Machines Corporation ("IBM"), the
 Original Program, and
 
-      b. in the case of each Contributor,
-
-         i. changes to the Program, and
-
-ii. additions to the Program; where such changes and/or additions to the Program
-originate from and are distributed by that particular Contributor. A Contribution
-'originates' from a Contributor if it was added to the Program by such Contributor
-itself or anyone acting on such Contributor's behalf. Contributions do not
-include additions to the Program which:
-
+b.  in the case of each Contributor,
+	i.  changes to the Program, and
+	ii.  additions to the Program;
+where such changes and/or additions to the Program originate from and
+are distributed by that particular Contributor. A Contribution
+'originates' from a Contributor if it was added to the Program by
+such Contributor itself or anyone acting on such Contributor's
+behalf. Contributions do not include additions to the Program which:
 (i) are separate modules of software distributed in conjunction with
+the Program under their own license agreement, and (ii) are not
+derivative works of the Program.
 
-            the Program under their own license agreement, and (ii) are not
+"Contributor" means IBM and any other entity that distributes the Program.
 
-            derivative works of the Program.
+"Licensed Patents " mean patent claims licensable by a
+Contributor which are necessarily infringed by the use or sale of its
+Contribution alone or when combined with the Program.
 
-   "Contributor" means IBM and any other entity that distributes the Program.
+"Original Program" means the original version of the software
+accompanying this Agreement as released by IBM, including source
+code, object code and documentation, if any.
 
-"Licensed Patents " mean patent claims licensable by a Contributor which are
-necessarily infringed by the use or sale of its Contribution alone or when
-combined with the Program.
+"Program" means the Original Program and Contributions.
 
-"Original Program" means the original version of the software accompanying
-this Agreement as released by IBM, including source code, object code and
-documentation, if any.
+"Recipient" means anyone who receives the Program under this
+Agreement, including all Contributors.
 
-   "Program" means the Original Program and Contributions.
+2. GRANT OF RIGHTS
+a.  Subject to the terms of this Agreement, each Contributor hereby
+grants Recipient a non-exclusive, worldwide, royalty-free copyright
+license to reproduce, prepare derivative works of, publicly display,
+publicly perform, distribute and sublicense the Contribution of such
+Contributor, if any, and such derivative works, in source code and
+object code form.
 
-"Recipient" means anyone who receives the Program under this Agreement, including
-all Contributors.
+b.  Subject to the terms of this Agreement, each Contributor hereby
+grants Recipient a non-exclusive, worldwide, royalty-free patent
+license under Licensed Patents to make, use, sell, offer to sell,
+import and otherwise transfer the Contribution of such Contributor,
+if any, in source code and object code form. This patent license
+shall apply to the combination of the Contribution and the Program
+if, at the time the Contribution is added by the Contributor, such
+addition of the Contribution causes such combination to be covered by
+the Licensed Patents. The patent license shall not apply to any
+other combinations which include the Contribution. No hardware per
+se is licensed hereunder.
 
-   2. GRANT OF RIGHTS
+c.  Recipient understands that although each Contributor grants the
+licenses to its Contributions set forth herein, no assurances are
+provided by any Contributor that the Program does not infringe the
+patent or other intellectual property rights of any other entity.
+Each Contributor disclaims any liability to Recipient for claims
+brought by any other entity based on infringement of intellectual
+property rights or otherwise. As a condition to exercising the
+rights and licenses granted hereunder, each Recipient hereby assumes
+sole responsibility to secure any other intellectual property rights
+needed, if any. For example, if a third party patent license is
+required to allow Recipient to distribute the Program, it is
+Recipient's responsibility to acquire that license before
+distributing the Program.
 
-a. Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce,
-prepare derivative works of, publicly display, publicly perform, distribute
-and sublicense the Contribution of such Contributor, if any, and such derivative
-works, in source code and object code form.
+d.  Each Contributor represents that to its knowledge it has
+sufficient copyright rights in its Contribution, if any, to grant the
+copyright license set forth in this Agreement.
 
-b. Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed
-Patents to make, use, sell, offer to sell, import and otherwise transfer the
-Contribution of such Contributor, if any, in source code and object code form.
-This patent license shall apply to the combination of the Contribution and
-the Program if, at the time the Contribution is added by the Contributor,
-such addition of the Contribution causes such combination to be covered by
-the Licensed Patents. The patent license shall not apply to any other combinations
-which include the Contribution. No hardware per se is licensed hereunder.
+3. REQUIREMENTS
+A Contributor may choose to distribute
+the Program in object code form under its own license agreement,
+provided that:
 
-      c. Recipient understands that although each Contributor grants the
+a.  it complies with the terms and conditions of this Agreement; and
+b.  its license agreement:
+	i.  effectively disclaims on behalf of all Contributors all warranties
+	and conditions, express and implied, including warranties or
+	conditions of title and non-infringement, and implied warranties or
+	conditions of merchantability and fitness for a particular purpose;
+	ii.  effectively excludes on behalf of all Contributors all liability
+	for damages, including direct, indirect, special, incidental and
+	consequential damages, such as lost profits;
+	iii.  states that any provisions which differ from this Agreement are
+	offered by that Contributor alone and not by any other party; and
+	iv.  states that source code for the Program is available from such
+	Contributor, and informs licensees how to obtain it in a reasonable
+	manner on or through a medium customarily used for software exchange.
 
-      licenses to its Contributions set forth herein, no assurances are
-
-      provided by any Contributor that the Program does not infringe the
-
-      patent or other intellectual property rights of any other entity.
-
-      Each Contributor disclaims any liability to Recipient for claims
-
-      brought by any other entity based on infringement of intellectual
-
-      property rights or otherwise. As a condition to exercising the
-
-      rights and licenses granted hereunder, each Recipient hereby assumes
-
-      sole responsibility to secure any other intellectual property rights
-
-      needed, if any. For example, if a third party patent license is
-
-      required to allow Recipient to distribute the Program, it is
-
-      Recipient's responsibility to acquire that license before
-
-      distributing the Program.
-
-      d. Each Contributor represents that to its knowledge it has
-
-      sufficient copyright rights in its Contribution, if any, to grant the
-
-      copyright license set forth in this Agreement.
-
-   3. REQUIREMENTS
-
-A Contributor may choose to distribute the Program in object code form under
-its own license agreement, provided that:
-
-      a. it complies with the terms and conditions of this Agreement; and
-
-      b. its license agreement:
-
-i. effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose;
-
-ii. effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages,
-such as lost profits;
-
-iii. states that any provisions which differ from this Agreement are offered
-by that Contributor alone and not by any other party; and
-
-iv. states that source code for the Program is available from such Contributor,
-and informs licensees how to obtain it in a reasonable manner on or through
-a medium customarily used for software exchange.
-
-   When the Program is made available in source code form:
-
-      a. it must be made available under this Agreement; and
-
-b. a copy of this Agreement must be included with each copy of the Program.
+When the Program is made available in source code form:
+a.  it must be made available under this Agreement; and
+b.  a copy of this Agreement must be included with each copy of the
+Program.
 
 Each Contributor must include the following in a conspicuous location in the
 Program:
 
-Copyright (C) 1996, 1999 International Business Machines Corporation and others.
-All Rights Reserved.
+	Copyright (C) 1996, 1999 International Business Machines Corporation and
+others. All Rights Reserved.
 
-In addition, each Contributor must identify itself as the originator of its
-Contribution, if any, in a manner that reasonably allows subsequent Recipients
-to identify the originator of the Contribution.
+In addition, each Contributor must identify itself as the originator
+of its Contribution, if any, in a manner that reasonably allows
+subsequent Recipients to identify the originator of the Contribution.
 
-   4. COMMERCIAL DISTRIBUTION
+4. COMMERCIAL DISTRIBUTION
+Commercial distributors of software may accept certain
+responsibilities with respect to end users, business partners and the
+like. While this license is intended to facilitate the commercial
+use of the Program, the Contributor who includes the Program in a
+commercial product offering should do so in a manner which does not
+create potential liability for other Contributors. Therefore, if a
+Contributor includes the Program in a commercial product offering,
+such Contributor ("Commercial Contributor") hereby agrees to defend
+and indemnify every other Contributor ("Indemnified Contributor")
+against any losses, damages and costs (collectively "Losses") arising
+from claims, lawsuits and other legal actions brought by a third
+party against the Indemnified Contributor to the extent caused by the
+acts or omissions of such Commercial Contributor in connection with
+its distribution of the Program in a commercial product offering.
+The obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement.
+In order to qualify, an Indemnified Contributor must: a) promptly
+notify the Commercial Contributor in writing of such claim, and b)
+allow the Commercial Contributor to control, and cooperate with the
+Commercial Contributor in, the defense and any related settlement
+negotiations. The Indemnified Contributor may participate in any
+such claim at its own expense.
 
-Commercial distributors of software may accept certain responsibilities with
-respect to end users, business partners and the like. While this license is
-intended to facilitate the commercial use of the Program, the Contributor
-who includes the Program in a commercial product offering should do so in
-a manner which does not create potential liability for other Contributors.
-Therefore, if a Contributor includes the Program in a commercial product offering,
-such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify
-every other Contributor ("Indemnified Contributor") against any losses, damages
-and costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor
-to the extent caused by the acts or omissions of such Commercial Contributor
-in connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense
-and any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.
+For example, a Contributor might include the Program in a commercial
+product offering, Product X. That Contributor is then a Commercial
+Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance
+claims and warranties are such Commercial Contributor's
+responsibility alone. Under this section, the Commercial Contributor
+would have to defend claims against the other Contributors related to
+those performance claims and warranties, and if a court requires any
+other Contributor to pay any damages as a result, the Commercial
+Contributor must pay those damages.
 
-For example, a Contributor might include the Program in a commercial product
-offering, Product X. That Contributor is then a Commercial Contributor. If
-that Commercial Contributor then makes performance claims, or offers warranties
-related to Product X, those performance claims and warranties are such Commercial
-Contributor's responsibility alone. Under this section, the Commercial Contributor
-would have to defend claims against the other Contributors related to those
-performance claims and warranties, and if a court requires any other Contributor
-to pay any damages as a result, the Commercial Contributor must pay those
-damages.
+5. NO WARRANTY
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
+PROVIDED 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. Each Recipient is solely
+responsible for determining the appropriateness of using and
+distributing the Program and assumes all risks associated with its
+exercise of rights under this Agreement, including but not limited to
+the risks and costs of program errors, compliance with applicable
+laws, damage to or loss of data, programs or equipment, and
+unavailability or interruption of operations.
 
-   5. NO WARRANTY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED 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.
-Each Recipient is solely responsible for determining the appropriateness of
-using and distributing the Program and assumes all risks associated with its
-exercise of rights under this Agreement, including but not limited to the
-risks and costs of program errors, compliance with applicable laws, damage
-to or loss of data, programs or equipment, and unavailability or interruption
-of operations.
-
-   6. DISCLAIMER OF LIABILITY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY
-CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION
-LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
-WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS
+6. DISCLAIMER OF LIABILITY
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
+NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT,
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS
 GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
 
-   7. GENERAL
+7. GENERAL
+If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this Agreement, and without further
+action by the parties hereto, such provision shall be reformed to the
+minimum extent necessary to make such provision valid and enforceable.
 
-If any provision of this Agreement is invalid or unenforceable under applicable
-law, it shall not affect the validity or enforceability of the remainder of
-the terms of this Agreement, and without further action by the parties hereto,
-such provision shall be reformed to the minimum extent necessary to make such
-provision valid and enforceable.
+If Recipient institutes patent litigation against a Contributor with
+respect to a patent applicable to software (including a cross-claim
+or counterclaim in a lawsuit), then any patent licenses granted by
+that Contributor to such Recipient under this Agreement shall
+terminate as of the date such litigation is filed. In addition, if
+Recipient institutes patent litigation against any entity (including
+a cross-claim or counterclaim in a lawsuit) alleging that the Program
+itself (excluding combinations of the Program with other software or
+hardware) infringes such Recipient's patent(s), then such Recipient's
+rights granted under Section 2(b) shall terminate as of the date such
+litigation is filed.
 
-If Recipient institutes patent litigation against a Contributor with respect
-to a patent applicable to software (including a cross-claim or counterclaim
-in a lawsuit), then any patent licenses granted by that Contributor to such
-Recipient under this Agreement shall terminate as of the date such litigation
-is filed. In addition, if Recipient institutes patent litigation against any
-entity (including a cross-claim or counterclaim in a lawsuit) alleging that
-the Program itself (excluding combinations of the Program with other software
-or hardware) infringes such Recipient's patent(s), then such Recipient's rights
-granted under Section 2(b) shall terminate as of the date such litigation
-is filed.
+All Recipient's rights under this Agreement shall terminate if it
+fails to comply with any of the material terms or conditions of this
+Agreement and does not cure such failure in a reasonable period of
+time after becoming aware of such noncompliance. If all Recipient's
+rights under this Agreement terminate, Recipient agrees to cease use
+and distribution of the Program as soon as reasonably practicable.
+However, Recipient's obligations under this Agreement and any
+licenses granted by Recipient relating to the Program shall continue
+and survive.
 
-All Recipient's rights under this Agreement shall terminate if it fails to
-comply with any of the material terms or conditions of this Agreement and
-does not cure such failure in a reasonable period of time after becoming aware
-of such noncompliance. If all Recipient's rights under this Agreement terminate,
-Recipient agrees to cease use and distribution of the Program as soon as reasonably
-practicable. However, Recipient's obligations under this Agreement and any
-licenses granted by Recipient relating to the Program shall continue and survive.
+IBM may publish new versions (including revisions) of this Agreement
+from time to time. Each new version of the Agreement will be given a
+distinguishing version number. The Program (including Contributions)
+may always be distributed subject to the version of the Agreement
+under which it was received. In addition, after a new version of the
+Agreement is published, Contributor may elect to distribute the
+Program (including its Contributions) under the new version. No one
+other than IBM has the right to modify this Agreement. Except as
+expressly stated in Sections 2(a) and 2(b) above, Recipient receives
+no rights or licenses to the intellectual property of any Contributor
+under this Agreement, whether expressly, by implication, estoppel or
+otherwise. All rights in the Program not expressly granted under
+this Agreement are reserved.
 
-IBM may publish new versions (including revisions) of this Agreement from
-time to time. Each new version of the Agreement will be given a distinguishing
-version number. The Program (including Contributions) may always be distributed
-subject to the version of the Agreement under which it was received. In addition,
-after a new version of the Agreement is published, Contributor may elect to
-distribute the Program (including its Contributions) under the new version.
-No one other than IBM has the right to modify this Agreement. Except as expressly
-stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses
-to the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program
-not expressly granted under this Agreement are reserved.
-
-This Agreement is governed by the laws of the State of New York and the intellectual
-property laws of the United States of America. No party to this Agreement
-will bring a legal action under this Agreement more than one year after the
-cause of action arose. Each party waives its rights to a jury trial in any
-resulting litigation.
+This Agreement is governed by the laws of the State of New York and
+the intellectual property laws of the United States of America. No
+party to this Agreement will bring a legal action under this
+Agreement more than one year after the cause of action arose. Each
+party waives its rights to a jury trial in any resulting litigation.
diff --git a/options/license/ISC b/options/license/ISC
index 412d4e203d..a6d1964fef 100644
--- a/options/license/ISC
+++ b/options/license/ISC
@@ -1,10 +1,11 @@
-ISC License Copyright (c) 2004-2010 by Internet Systems Consortium, Inc. ("ISC")
+ISC License:
 
+Copyright (c) 2004-2010 by Internet Systems Consortium, Inc. ("ISC")
 Copyright (c) 1995-2003 by Internet Software Consortium
 
-Permission to use, copy, modify, and /or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above copyright
-notice and this permission notice appear in all copies.
+Permission to use, copy, modify, and/or distribute this software for any purpose
+with or without fee is hereby granted, provided that the above copyright notice
+and this permission notice appear in all copies.
 
 THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH REGARD
 TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
diff --git a/options/license/ImageMagick b/options/license/ImageMagick
index ea22466116..509789d484 100644
--- a/options/license/ImageMagick
+++ b/options/license/ImageMagick
@@ -5,27 +5,19 @@ It allows you to:
 
 * freely download and use ImageMagick software, in whole or in part, for personal,
 company internal, or commercial purposes;
-
-   * use ImageMagick software in packages or distributions that you create;
-
-   * link against a library under a different license;
-
-   * link code under a different license against a library under this license;
-
-   * merge code into a work under a different license;
-
-   * extend patent grants to any code using code under this license;
-
-   * and extend patent protection.
+     * use ImageMagick software in packages or distributions that you create;
+     * link against a library under a different license;
+* link code under a different license against a library under this license;
+     * merge code into a work under a different license;
+     * extend patent grants to any code using code under this license;
+     * and extend patent protection.
 
 It forbids you to:
 
 * redistribute any piece of ImageMagick-originated software without proper
 attribution;
-
 * use any marks owned by ImageMagick Studio LLC in any way that might state
 or imply that ImageMagick Studio LLC endorses your distribution;
-
 * use any marks owned by ImageMagick Studio LLC in any way that might state
 or imply that you created the ImageMagick software in question.
 
@@ -33,7 +25,6 @@ It requires you to:
 
 * include a copy of the license in any redistribution you may make that includes
 ImageMagick software;
-
 * provide clear attribution to ImageMagick Studio LLC for any distributions
 that include ImageMagick software.
 
@@ -42,33 +33,29 @@ It does not require you to:
 * include the source of the ImageMagick software itself, or of any modifications
 you may have made to it, in any redistribution you may assemble that includes
 it;
-
 * submit changes that you make to the software back to the ImageMagick Studio
 LLC (though such feedback is encouraged).
 
 A few other clarifications include:
 
-   * ImageMagick is freely available without charge;
-
+     * ImageMagick is freely available without charge;
 * you may include ImageMagick on a DVD as long as you comply with the terms
 of the license;
-
 * you can give modified code away for free or sell it under the terms of the
 ImageMagick license or distribute the result under a different license, but
 you need to acknowledge the use of the ImageMagick software;
-
-   * the license is compatible with the GPL V3.
-
-   * when exporting the ImageMagick software, review its export classification.
+     * the license is compatible with the GPL V3.
+* when exporting the ImageMagick software, review its export classification.
 
 Terms and Conditions for Use, Reproduction, and Distribution
 
 The legally binding and authoritative terms and conditions for use, reproduction,
-and distribution of ImageMagick follow: Copyright 1999-2013 ImageMagick Studio
-LLC, a non-profit organization dedicated to making software imaging solutions
-freely available.
+and distribution of ImageMagick follow:
 
-   1. Definitions.
+Copyright 1999-2013 ImageMagick Studio LLC, a non-profit organization dedicated
+to making software imaging solutions freely available.
+
+1. Definitions.
 
 License shall mean the terms and conditions for use, reproduction, and distribution
 as defined by Sections 1 through 9 of this document.
@@ -148,15 +135,12 @@ 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
@@ -217,7 +201,9 @@ 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. How to Apply the License to your Work
+or additional liability.
+
+How to Apply the License to your Work
 
 To apply the ImageMagick License to your work, attach the following boilerplate
 notice, with the fields enclosed by brackets "[]" replaced with your own identifying
@@ -227,13 +213,13 @@ 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]
+     Copyright [yyyy] [name of copyright owner]
 
 Licensed under the ImageMagick License (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.imagemagick.org/script/license.php
+     http://www.imagemagick.org/script/license.php
 
 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
diff --git a/options/license/Info-ZIP b/options/license/Info-ZIP
index 066343e622..9d8644871c 100644
--- a/options/license/Info-ZIP
+++ b/options/license/Info-ZIP
@@ -1,4 +1,6 @@
-Info-ZIP License Copyright (c) 1990-2009 Info-ZIP. All rights reserved.
+Info-ZIP License
+
+Copyright (c) 1990-2009 Info-ZIP. All rights reserved.
 
 For the purposes of this copyright and license, "Info-ZIP" is defined as the
 following set of individuals:
@@ -20,10 +22,9 @@ Permission is granted to anyone to use this software for any purpose, including
 commercial applications, and to alter it and redistribute it freely, subject
 to the above disclaimer and the following restrictions:
 
-* Redistributions of source code (in whole or in part) must retain the above
+*	Redistributions of source code (in whole or in part) must retain the above
 copyright notice, definition, disclaimer, and this list of conditions.
-
-* Redistributions in binary form (compiled executables and libraries) must
+*	Redistributions in binary form (compiled executables and libraries) must
 reproduce the above copyright notice, definition, disclaimer, and this list
 of conditions in documentation and/or other materials provided with the distribution.
 Additional documentation is not needed for executables where a command line
@@ -32,8 +33,7 @@ startup banner. The sole exception to this condition is redistribution of
 a standard UnZipSFX binary (including SFXWiz) as part of a self-extracting
 archive; that is permitted without inclusion of this license, as long as the
 normal SFX banner has not been removed from the binary or disabled.
-
-* Altered versions--including, but not limited to, ports to new operating
+*	Altered versions--including, but not limited to, ports to new operating
 systems, existing ports with new graphical interfaces, versions with modified
 or added functionality, and dynamic, shared, or static library versions not
 from Info-ZIP--must be plainly marked as such and must not be misrepresented
@@ -45,7 +45,6 @@ but not limited to, labeling of the altered versions with the names "Info-ZIP"
 Such altered versions are further prohibited from misrepresentative use of
 the Zip-Bugs or Info-ZIP e-mail addresses or the Info-ZIP URL(s), such as
 to imply Info-ZIP will provide support for the altered versions.
-
-* Info-ZIP retains the right to use the names "Info-ZIP," "Zip," "UnZip,"
+*	Info-ZIP retains the right to use the names "Info-ZIP," "Zip," "UnZip,"
 "UnZipSFX," "WiZ," "Pocket UnZip," "Pocket Zip," and "MacZip" for its own
 source and binary releases.
diff --git a/options/license/Intel b/options/license/Intel
index c719c9bcec..ab24f5ca99 100644
--- a/options/license/Intel
+++ b/options/license/Intel
@@ -1,18 +1,16 @@
-Intel Open Source License Copyright (c) 1996-2000 Intel Corporation
+Intel Open Source License
 
-All rights reserved.
+Copyright (c) 1996-2000 Intel Corporation All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
 are permitted provided that the following conditions are met:
 
-• Redistributions of source code must retain the above copyright notice, this
+•	Redistributions of source code must retain the above copyright notice, this
 list of conditions and the following disclaimer.
-
-• Redistributions in binary form must reproduce the above copyright notice,
+•	Redistributions in binary form must reproduce the above copyright notice,
 this list of conditions and the following disclaimer in the documentation
 and/or other materials provided with the distribution.
-
-• Neither the name of the Intel Corporation nor the names of its contributors
+•	Neither the name of the Intel Corporation nor the names of its contributors
 may be used to endorse or promote products derived from this software without
 specific prior written permission.
 
diff --git a/options/license/Intel-ACPI b/options/license/Intel-ACPI
index 3f4331f130..2686bd3fc2 100644
--- a/options/license/Intel-ACPI
+++ b/options/license/Intel-ACPI
@@ -1,5 +1,4 @@
 ACPI - Software License Agreement
-
 Software License Agreement IMPORTANT - READ BEFORE COPYING, INSTALLING OR
 USING.
 
@@ -11,7 +10,7 @@ If you do not wish to so agree, do not install or use the Software.
 1. COPYRIGHT NOTICE Some or all of this work - Copyright © 1999-2005, Intel
 Corp. All rights reserved.
 
-   2. LICENSE
+2. LICENSE
 
 2.1. This is your license from Intel Corp. under its intellectual property
 rights. You may have additional license terms from the party that provided
@@ -35,7 +34,7 @@ Original Intel Code. No other license or right is granted directly or by implica
 estoppel or otherwise; The above copyright and patent license is granted only
 if the following conditions are met:
 
-   3. CONDITIONS
+3. CONDITIONS
 
 3.1. Redistribution of Source with Rights to Further Distribute Source. Redistribution
 of source code of any substantial portion of the Covered Code or modification
@@ -72,7 +71,7 @@ Intel shall be used in advertising or otherwise to promote the sale, use or
 other dealings in products derived from or relating to the Covered Code without
 prior written authorization from Intel.
 
-   4. DISCLAIMER AND EXPORT COMPLIANCE
+4. DISCLAIMER AND EXPORT COMPLIANCE
 
 4.1. INTEL MAKES NO WARRANTY OF ANY KIND REGARDING ANY SOFTWARE PROVIDED HERE.
 ANY SOFTWARE ORIGINATING FROM INTEL OR DERIVED FROM INTEL SOFTWARE IS PROVIDED
diff --git a/options/license/Interbase-1.0 b/options/license/Interbase-1.0
index 03bdf2ffd5..9a696e6bf0 100644
--- a/options/license/Interbase-1.0
+++ b/options/license/Interbase-1.0
@@ -1,8 +1,7 @@
 INTERBASE PUBLIC LICENSE
-
 Version 1.0
 
-   1. Definitions.
+1. Definitions.
 
 1.0.1. "Commercial Use" means distribution or otherwise making the Covered
 Code available to a third party.
@@ -28,7 +27,7 @@ Initial Developer in the Source Code notice required by Exhibit A.
 1.7. ''Larger Work'' means a work which combines Covered Code or portions
 thereof with code not governed by the terms of this License.
 
-      1.8. ''License'' means this document.
+1.8. ''License'' means this document.
 
 1.8.1. "Licensable" means having the right to grant, to the maximum extent
 possible, whether at the time of the initial grant or subsequently acquired,
@@ -70,9 +69,9 @@ direct or indirect, to cause the direction or management of such entity, whether
 by contract or otherwise, or (b) ownership of more than fifty percent (50%)
 of the outstanding shares or beneficial ownership of such entity.
 
-   2. Source Code License.
+2. Source Code License.
 
-      2.1. The Initial Developer Grant.
+2.1. The Initial Developer Grant.
 
 The Initial Developer hereby grants You a world-wide, royalty-free, non-exclusive
 license, subject to third party intellectual property claims:
@@ -95,7 +94,7 @@ for code that You delete from the Original Code; 2) separate from the Original
 Code; or 3) for infringements caused by: i) the modification of the Original
 Code or ii) the combination of the Original Code with other software or devices.
 
-      2.2. Contributor Grant.
+2.2. Contributor Grant.
 
 Subject to third party intellectual property claims, each Contributor hereby
 grants You a world-wide, royalty-free, non-exclusive license
@@ -124,9 +123,9 @@ Modifications made by that Contributor with other software (except as part
 of the Contributor Version) or other devices; or 4) under Patent Claims infringed
 by Covered Code in the absence of Modifications made by that Contributor.
 
-   3. Distribution Obligations.
+3. Distribution Obligations.
 
-      3.1. Application of License.
+3.1. Application of License.
 
 The Modifications which You create or to which You contribute are governed
 by the terms of this License, including without limitation Section 2.2. The
@@ -138,7 +137,7 @@ version that alters or restricts the applicable version of this License or
 the recipients' rights hereunder. However, You may include an additional document
 offering the additional rights described in Section 3.5.
 
-      3.2. Availability of Source Code.
+3.2. Availability of Source Code.
 
 Any Modification which You create or to which You contribute must be made
 available in Source Code form under the terms of this License either on the
@@ -151,7 +150,7 @@ has been made available to such recipients. You are responsible for ensuring
 that the Source Code version remains available even if the Electronic Distribution
 Mechanism is maintained by a third party.
 
-      3.3. Description of Modifications.
+3.3. Description of Modifications.
 
 You must cause all Covered Code to which You contribute to contain a file
 documenting the changes You made to create that Covered Code and the date
@@ -161,9 +160,9 @@ Developer and including the name of the Initial Developer in (a) the Source
 Code, and (b) in any notice in an Executable version or related documentation
 in which You describe the origin or ownership of the Covered Code.
 
-      3.4. Intellectual Property Matters
+3.4. Intellectual Property Matters
 
-         (a) Third Party Claims.
+     (a) Third Party Claims.
 
 If Contributor has knowledge that a license under a third party's intellectual
 property rights is required to exercise the rights granted by such Contributor
@@ -177,21 +176,21 @@ steps (such as notifying appropriate mailing lists or newsgroups) reasonably
 calculated to inform those who received the Covered Code that new knowledge
 has been obtained.
 
-         (b) Contributor APIs.
+     (b) Contributor APIs.
 
 If Contributor's Modifications include an application programming interface
 and Contributor has knowledge of patent licenses which are reasonably necessary
 to implement that API, Contributor must also include this information in the
 LEGAL file.
 
-         (c) Representations.
+     (c) Representations.
 
 Contributor represents that, except as disclosed pursuant to Section 3.4(a)
 above, Contributor believes that Contributor's Modifications are Contributor's
 original creation(s) and/or Contributor has sufficient rights to grant the
 rights conveyed by this License.
 
-      3.5. Required Notices.
+3.5. Required Notices.
 
 You must duplicate the notice in Exhibit A in each file of the Source Code.
 If it is not possible to put such notice in a particular Source Code file
@@ -210,7 +209,7 @@ the Initial Developer and every Contributor for any liability incurred by
 the Initial Developer or such Contributor as a result of warranty, support,
 indemnity or liability terms You offer.
 
-      3.6. Distribution of Executable Versions.
+3.6. Distribution of Executable Versions.
 
 You may distribute Covered Code in Executable form only if the requirements
 of Section 3.1-3.5 have been met for that Covered Code, and if You include
@@ -231,14 +230,14 @@ or any Contributor. You hereby agree to indemnify the Initial Developer and
 every Contributor for any liability incurred by the Initial Developer or such
 Contributor as a result of any such terms You offer.
 
-      3.7. Larger Works.
+3.7. Larger Works.
 
 You may create a Larger Work by combining Covered Code with other code not
 governed by the terms of this License and distribute the Larger Work as a
 single product. In such a case, You must make sure the requirements of this
 License are fulfilled for the Covered Code.
 
-   4. Inability to Comply Due to Statute or Regulation.
+4. Inability to Comply Due to Statute or Regulation.
 
 If it is impossible for You to comply with any of the terms of this License
 with respect to some or all of the Covered Code due to statute, judicial order,
@@ -250,20 +249,20 @@ Except to the extent prohibited by statute or regulation, such description
 must be sufficiently detailed for a recipient of ordinary skill to be able
 to understand it.
 
-   5. Application of this License.
+5. Application of this License.
 
 This License applies to code to which the Initial Developer has attached the
 notice in Exhibit A and to related Covered Code.
 
-   6. Versions of the License.
+6. Versions of the License.
 
-      6.1. New Versions.
+6.1. New Versions.
 
 Borland Software Corporation (''Interbase'') may publish revised and/or new
 versions of the License from time to time. Each version will be given a distinguishing
 version number.
 
-      6.2. Effect of New Versions.
+6.2. Effect of New Versions.
 
 Once Covered Code has been published under a particular version of the License,
 You may always continue to use it under the terms of that version. You may
@@ -271,7 +270,7 @@ also choose to use such Covered Code under the terms of any subsequent version
 of the License published by Interbase. No one other than Interbase has the
 right to modify the terms applicable to Covered Code created under this License.
 
-      6.3. Derivative Works.
+6.3. Derivative Works.
 
 If You create or use a modified version of this License (which you may only
 do in order to apply it to code which is not already Covered Code governed
@@ -285,31 +284,24 @@ of the Initial Developer, Original Code or Contributor in the notice described
 in Exhibit A shall not of themselves be deemed to be modifications of this
 License.)
 
-      6.4 Origin of the Interbase Public License.
+6.4 Origin of the Interbase Public License.
 
 The Interbase public license is based on the Mozilla Public License V 1.1
 with the following changes:
 
 The license is published by Borland Software Corporation. Only Borland Software
 Corporation can modify the terms applicable to Covered Code.
-
 The license can be modified used for code which is not already governed by
 this license. Modified versions of the license must be renamed to avoid confusion
 with Netscape?s or Interbase Software?s license and must include a description
 of changes from the Interbase Public License.
-
-      The name of the license in Exhibit A is the "Interbase Public License".
-
-      The reference to an alternative license in Exhibit A has been removed.
-
-      Amendments I, II, III, V, and VI have been deleted.
-
-      Exhibit A, Netscape Public License has been deleted
-
+The name of the license in Exhibit A is the "Interbase Public License".
+The reference to an alternative license in Exhibit A has been removed.
+Amendments I, II, III, V, and VI have been deleted.
+Exhibit A, Netscape Public License has been deleted
 A new amendment (II) has been added, describing the required and restricted
 rights to use the trademarks of Borland Software Corporation
-
-   7. DISCLAIMER OF WARRANTY.
+7. DISCLAIMER OF WARRANTY.
 
 COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS'' BASIS, WITHOUT
 WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION,
@@ -321,7 +313,7 @@ ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIME
 OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED
 CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
 
-   8. TERMINATION.
+8. TERMINATION.
 
 8.1. This License and the rights granted hereunder will terminate automatically
 if You fail to comply with terms herein and fail to cure such breach within
@@ -367,7 +359,7 @@ user license agreements (excluding distributors and resellers) which have
 been validly granted by You or any distributor hereunder prior to termination
 shall survive termination.
 
-   9. LIMITATION OF LIABILITY.
+9. LIMITATION OF LIABILITY.
 
 UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING
 NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER, ANY
@@ -383,7 +375,7 @@ SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL
 OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO
 YOU.
 
-   10. U.S. GOVERNMENT END USERS.
+10. U.S. GOVERNMENT END USERS.
 
 The Covered Code is a ''commercial item,'' as that term is defined in 48 C.F.R.
 2.101 (Oct. 1995), consisting of ''commercial computer software'' and ''commercial
@@ -392,7 +384,7 @@ computer software documentation,'' as such terms are used in 48 C.F.R. 12.212
 227.7202-4 (June 1995), all U.S. Government End Users acquire Covered Code
 with only those rights set forth herein.
 
-   11. MISCELLANEOUS.
+11. MISCELLANEOUS.
 
 This License represents the complete agreement concerning subject matter hereof.
 If any provision of this License is held to be unenforceable, such provision
@@ -410,7 +402,7 @@ on Contracts for the International Sale of Goods is expressly excluded. Any
 law or regulation which provides that the language of a contract shall be
 construed against the drafter shall not apply to this License.
 
-   12. RESPONSIBILITY FOR CLAIMS.
+12. RESPONSIBILITY FOR CLAIMS.
 
 As between Initial Developer and the Contributors, each party is responsible
 for claims and damages arising, directly or indirectly, out of its utilization
@@ -419,7 +411,7 @@ and Contributors to distribute such responsibility on an equitable basis.
 Nothing herein is intended or shall be deemed to constitute any admission
 of liability.
 
-   13. MULTIPLE-LICENSED CODE.
+13. MULTIPLE-LICENSED CODE.
 
 Initial Developer may designate portions of the Covered Code as "Multiple-Licensed".
 "Multiple-Licensed" means that the Initial Developer permits you to utilize
@@ -427,9 +419,9 @@ portions of the Covered Code under Your choice of the NPL or the alternative
 licenses, if any, specified by the Initial Developer in the file described
 in Exhibit A.
 
-   EXHIBIT A - InterBase Public License.
+EXHIBIT A - InterBase Public License.
 
-"The contents of this file are subject to the Interbase Public License Version
+``The contents of this file are subject to the Interbase Public License Version
 1.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.Interbase.com/IPL.html
 
@@ -437,12 +429,12 @@ Software distributed under the License is distributed on an "AS IS" basis,
 WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
 the specific language governing rights and limitations under the License.
 
-   The Original Code was created by InterBase Software Corp and its successors.
+The Original Code was created by InterBase Software Corp and its successors.
 
 Portions created by Borland/Inprise are Copyright (C) Borland/Inprise. All
 Rights Reserved.
 
-   Contributor(s): ______________________________________ .
+Contributor(s): ______________________________________.
 
 AMENDMENTS
 
@@ -450,7 +442,7 @@ I. InterBase and logo. This License does not grant any rights to use the tradema
 "Interbase'', "Java" or "JavaScript" even if such marks are included in the
 Original Code or Modifications.
 
-   II. Trademark Usage.
+II. Trademark Usage.
 
 II.1. Advertising Materials. All advertising materials mentioning features
 or use of the covered Code must display the following acknowledgement: "This
diff --git a/options/license/JPNIC b/options/license/JPNIC
index 91b28f2409..6cc1d094c8 100644
--- a/options/license/JPNIC
+++ b/options/license/JPNIC
@@ -1,38 +1,40 @@
-Japan Network Information Center License Copyright (c) 2000-2002 Japan Network
-Information Center. All rights reserved.
+Copyright (c) 2000-2002 Japan Network Information Center.  All rights reserved.
 
-By using this file, you agree to the terms and conditions set forth bellow .
+By using this file, you agree to the terms and conditions set forth bellow.
 
-LICENSE TERMS AND CONDITIONS
+                        LICENSE TERMS AND CONDITIONS
 
-The following License Terms and Conditions apply, unless a different license
-is obtained from Japan Network Information Center (" JPNIC "), a Japanese
-association, Kokusai-Kougyou-Kanda Bldg 6F, 2-3-4 Uchi-Kanda, Chiyoda-ku,
-Tokyo 101-0047, Japan .
+The following License Terms and Conditions apply, unless a different
+license is obtained from Japan Network Information Center ("JPNIC"),
+a Japanese association, Kokusai-Kougyou-Kanda Bldg 6F, 2-3-4 Uchi-Kanda,
+Chiyoda-ku, Tokyo 101-0047, Japan.
 
-1. Use, Modification and Redistribution (including distribution of any modified
-or derived work) in source and/or binary forms is permitted under this License
-Terms and Conditions.
+1. Use, Modification and Redistribution (including distribution of any
+   modified or derived work) in source and/or binary forms is permitted
+   under this License Terms and Conditions.
 
 2. Redistribution of source code must retain the copyright notices as they
-appear in each source code file, this License Terms and Conditions.
+   appear in each source code file, this License Terms and Conditions.
 
-3. Redistribution in binary form must reproduce the Copyright Notice, this
-License Terms and Conditions, in the documentation and/or other materials
-provided with the distribution. For the purposes of binary distribution the
-"Copyright Notice" refers to the following language: "Copyright (c) 2000-2002
-Japan Network Information Center . All rights reserved."
+3. Redistribution in binary form must reproduce the Copyright Notice,
+   this License Terms and Conditions, in the documentation and/or other
+   materials provided with the distribution.  For the purposes of binary
+   distribution the "Copyright Notice" refers to the following language:
+   "Copyright (c) 2000-2002 Japan Network Information Center.  All rights
+   reserved."
 
-4. The name of JPNIC may not be used to endorse or promote products derived
-from this Software without specific prior written approval of JPNIC .
+4. The name of JPNIC may not be used to endorse or promote products
+   derived from this Software without specific prior written approval of
+   JPNIC.
 
 5. Disclaimer/Limitation of Liability: THIS SOFTWARE IS PROVIDED BY JPNIC
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JPNIC BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+   PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL JPNIC BE LIABLE
+   FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+   BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+   OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+   ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
diff --git a/options/license/JSON b/options/license/JSON
index 05a38f55cd..a2f5629de4 100644
--- a/options/license/JSON
+++ b/options/license/JSON
@@ -1,4 +1,6 @@
-JSON License Copyright (c) 2002 JSON.org
+JSON License
+
+Copyright (c) 2002 JSON.org
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/options/license/JasPer-2.0 b/options/license/JasPer-2.0
index f66b353401..6e520ba8dd 100644
--- a/options/license/JasPer-2.0
+++ b/options/license/JasPer-2.0
@@ -1,7 +1,7 @@
-JasPer License Version 2.0 Copyright (c) 2001-2006 Michael David Adams
+JasPer License Version 2.0
 
+Copyright (c) 2001-2006 Michael David Adams
 Copyright (c) 1999-2000 Image Power, Inc.
-
 Copyright (c) 1999-2000 The University of British Columbia
 
 All rights reserved.
@@ -22,24 +22,25 @@ products derived from the Software without specific prior written permission.
 
 THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE.
 NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
-THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS "AS IS", WITHOUT WARRANTY
-OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
-THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR
-ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
-OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. NO ASSURANCES ARE PROVIDED BY
-THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE THE PATENT OR OTHER
-INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY. EACH COPYRIGHT HOLDER DISCLAIMS
-ANY LIABILITY TO THE USER FOR CLAIMS BROUGHT BY ANY OTHER ENTITY BASED ON
-INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS OR OTHERWISE. AS A CONDITION
-TO EXERCISING THE RIGHTS GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE
-RESPONSIBILITY TO SECURE ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF
-ANY. THE SOFTWARE IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
-SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES, AIRCRAFT
-NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL SYSTEMS, DIRECT LIFE
-SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH THE FAILURE OF THE SOFTWARE
-OR SYSTEM COULD LEAD DIRECTLY TO DEATH, PERSONAL INJURY, OR SEVERE PHYSICAL
-OR ENVIRONMENTAL DAMAGE ("HIGH RISK ACTIVITIES"). THE COPYRIGHT HOLDERS SPECIFICALLY
-DISCLAIM ANY EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
+THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
+"AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT
+LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE
+AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
+EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM
+LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE PROVIDED BY THE COPYRIGHT
+HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE THE PATENT OR OTHER INTELLECTUAL
+PROPERTY RIGHTS OF ANY OTHER ENTITY. EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY
+TO THE USER FOR CLAIMS BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF
+INTELLECTUAL PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE
+RIGHTS GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO
+SECURE ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
+IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL SYSTEMS,
+SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES, AIRCRAFT NAVIGATION
+OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL SYSTEMS, DIRECT LIFE SUPPORT
+MACHINES, OR WEAPONS SYSTEMS, IN WHICH THE FAILURE OF THE SOFTWARE OR SYSTEM
+COULD LEAD DIRECTLY TO DEATH, PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL
+DAMAGE ("HIGH RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM
+ANY EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
diff --git a/options/license/LAL-1.2 b/options/license/LAL-1.2
index a5d3772277..f18804c800 100644
--- a/options/license/LAL-1.2
+++ b/options/license/LAL-1.2
@@ -1,168 +1,130 @@
 Licence Art Libre
-
 [ Copyleft Attitude ]
 
 Version 1.2
 
 Préambule :
 
-Avec cette Licence Art Libre, l'autorisation est donnée de copier, de diffuser
-et de transformer librement les oeuvres dans le respect des droits de l'auteur.
+Avec cette Licence Art Libre, l’autorisation est donnée de copier, de diffuser
+et de transformer librement les oeuvres dans le respect des droits de l’auteur.
 
-Loin d'ignorer les droits de l'auteur, cette licence les reconnaît et les
+Loin d’ignorer les droits de l’auteur, cette licence les reconnaît et les
 protège. Elle en reformule le principe en permettant au public de faire un
-usage créatif des oeuvres d'art.
-
-Alors que l'usage fait du droit de la propriété littéraire et artistique conduit
-à restreindre l'accès du public à l'oeuvre, la Licence Art Libre a pour but
+usage créatif des oeuvres d’art.
+Alors que l’usage fait du droit de la propriété littéraire et artistique conduit
+à restreindre l’accès du public à l’oeuvre, la Licence Art Libre a pour but
 de le favoriser.
-
-L'intention est d'ouvrir l'accès et d'autoriser l'utilisation des ressources
-d'une oeuvre par le plus grand nombre. En avoir jouissance pour en multiplier
+L’intention est d’ouvrir l’accès et d’autoriser l’utilisation des ressources
+d’une oeuvre par le plus grand nombre. En avoir jouissance pour en multiplier
 les réjouissances, créer de nouvelles conditions de création pour amplifier
 les possibilités de création. Dans le respect des auteurs avec la reconnaissance
 et la défense de leur droit moral.
 
-En effet, avec la venue du numérique, l'invention de l'internet et des logiciels
+En effet, avec la venue du numérique, l’invention de l’internet et des logiciels
 libres, un nouveau mode de création et de production est apparu. Il est aussi
-l'amplification de ce qui a été expérimenté par nombre d'artistes contemporains.
-
+l’amplification de ce qui a été expérimenté par nombre d’artistes contemporains.
 Le savoir et la création sont des ressources qui doivent demeurer libres pour
-être encore véritablement du savoir et de la création. C'est à dire rester
+être encore véritablement du savoir et de la création. C’est à dire rester
 une recherche fondamentale qui ne soit pas directement liée à une application
-concrète. Créer c'est découvrir l'inconnu, c'est inventer le réel avant tout
+concrète. Créer c’est découvrir l’inconnu, c’est inventer le réel avant tout
 souci de réalisme.
-
-Ainsi, l'objet de l'art n'est pas confondu avec l'objet d'art fini et défini
-comme tel.
-
-C'est la raison essentielle de cette Licence Art Libre : promouvoir et protéger
-des pratiques artistiques libérées des seules règles de l'économie de marché.
+Ainsi, l’objet de l’art n’est pas confondu avec l’objet d’art fini et défini
+comme tel. C’est la raison essentielle de cette Licence Art Libre : promouvoir
+et protéger des pratiques artistiques libérées des seules règles de l’économie
+de marché.
 
 DÉFINITIONS
 
-– L'oeuvre :
+– L’oeuvre :il s’agit d’une oeuvre commune qui comprend l’oeuvre originelle
+ainsi que toutes les contributions postérieures (les originaux conséquents
+et les copies). Elle est créée à l’initiative de l’auteur originel qui par
+cette licence définit les conditions selon lesquelles les contributions sont
+faites.
 
-il s'agit d'une oeuvre commune qui comprend l'oeuvre originelle ainsi que
-toutes les contributions postérieures (les originaux conséquents et les copies).
-Elle est créée à l'initiative de l'auteur originel qui par cette licence définit
-les conditions selon lesquelles les contributions sont faites.
+– L’oeuvre originelle :c’est-à-dire l’oeuvre créée par l’initiateur de l’oeuvre
+commune dont les copies vont être modifiées par qui le souhaite.
 
-– L'oeuvre originelle :
+– Les oeuvres conséquentes :c’est-à-dire les propositions des auteurs qui
+contribuent à la formation de l’oeuvre en faisant usage des droits de reproduction,
+de diffusion et de modification que leur confère la licence.
 
-c'est-à-dire l'oeuvre créée par l'initiateur de l'oeuvre commune dont les
-copies vont être modifiées par qui le souhaite.
+– Original (source ou ressource de l’oeuvre) :exemplaire daté de l’oeuvre,
+de sa définition, de sa partition ou de son programme que l’auteur présente
+comme référence pour toutes actualisations, interprétations, copies ou reproductions
+ultérieures.
 
-– Les oeuvres conséquentes :
+– Copie :toute reproduction d’un original au sens de cette licence.
 
-c'est-à-dire les propositions des auteurs qui contribuent à la formation de
-l'oeuvre en faisant usage des droits de reproduction, de diffusion et de modification
-que leur confère la licence.
+– Auteur de l’oeuvre originelle :c’est la personne qui a créé l’oeuvre à l’origine
+d’une arborescence de cette oeuvre modifiée. Par cette licence, l’auteur détermine
+les conditions dans lesquelles ce travail se fait.
 
-– Original (source ou ressource de l'oeuvre) :
-
-exemplaire daté de l'oeuvre, de sa définition, de sa partition ou de son programme
-que l'auteur présente comme référence pour toutes actualisations, interprétations,
-copies ou reproductions ultérieures.
-
-– Copie :
-
-toute reproduction d'un original au sens de cette licence.
-
-– Auteur de l'oeuvre originelle :
-
-c'est la personne qui a créé l'oeuvre à l'origine d'une arborescence de cette
-oeuvre modifiée. Par cette licence, l'auteur détermine les conditions dans
-lesquelles ce travail se fait.
-
-– Contributeur :
-
-toute personne qui contribue à la création de l'oeuvre. Il est l'auteur d'une
-oeuvre originale résultant de la modification d'une copie de l'oeuvre originelle
-ou de la modification d'une copie d'une oeuvre conséquente.
-
-   1. OBJET
+– Contributeur :toute personne qui contribue à la création de l’oeuvre. Il
+est l’auteur d’une oeuvre originale résultant de la modification d’une copie
+de l’oeuvre originelle ou de la modification d’une copie d’une oeuvre conséquente.
 
+1. OBJET
 Cette licence a pour objet de définir les conditions selon lesquelles vous
 pouvez jouir librement de cette oeuvre.
 
-   2. L'ÉTENDUE DE LA JOUISSANCE
-
-Cette oeuvre est soumise au droit d'auteur, et l'auteur par cette licence
+2. L’ÉTENDUE DE LA JOUISSANCE
+Cette oeuvre est soumise au droit d’auteur, et l’auteur par cette licence
 vous indique quelles sont vos libertés pour la copier, la diffuser et la modifier:
 
-   2.1 LA LIBERTÉ DE COPIER (OU DE REPRODUCTION)
-
+2.1 LA LIBERTÉ DE COPIER (OU DE REPRODUCTION)
 Vous avez la liberté de copier cette oeuvre pour un usage personnel, pour
 vos amis, ou toute autre personne et quelque soit la technique employée.
 
-   2.2 LA LIBERTÉ DE DIFFUSER, D'INTERPRÉTER (OU DE REPRÉSENTATION)
-
+2.2 LA LIBERTÉ DE DIFFUSER, D’INTERPRÉTER (OU DE REPRÉSENTATION)
 Vous pouvez diffuser librement les copies de ces oeuvres, modifiées ou non,
 quel que soit le support, quel que soit le lieu, à titre onéreux ou gratuit
 si vous respectez toutes les conditions suivantes:
+– joindre aux copies, cette licence à l’identique, ou indiquer précisément
+où se trouve la licence,      – indiquer au destinataire le nom de l’auteur
+des originaux,      – indiquer au destinataire où il pourra avoir accès aux
+originaux (originels et/ou conséquents). L’auteur de l’original pourra, s’il
+le souhaite, vous autoriser à diffuser l’original dans les mêmes conditions
+que les copies.
 
-– joindre aux copies, cette licence à l'identique, ou indiquer précisément
-où se trouve la licence,
-
-   – indiquer au destinataire le nom de l'auteur des originaux,
-
-   – indiquer au destinataire où il pourra avoir accès aux originaux
-
-(originels et/ou conséquents). L'auteur de l'original pourra, s'il le souhaite,
-vous autoriser à diffuser l'original dans les mêmes conditions que les copies.
-
-   2.3 LA LIBERTÉ DE MODIFIER
-
+2.3 LA LIBERTÉ DE MODIFIER
 Vous avez la liberté de modifier les copies des originaux (originels et conséquents),
 qui peuvent être partielles ou non, dans le respect des conditions prévues
-à l'article 2.2 en cas de diffusion (ou représentation) de la copie modifiée.
-L'auteur de l'original pourra, s'il le souhaite, vous autoriser à modifier
-l'original dans les mêmes conditions que les copies.
+à l’article 2.2 en cas de diffusion (ou représentation) de la copie modifiée.
+L’auteur de l’original pourra, s’il le souhaite, vous autoriser à modifier
+l’original dans les mêmes conditions que les copies.
 
-   3. L'INCORPORATION DE L'OEUVRE
-
-Tous les éléments de cette oeuvre doivent demeurer libres, c'est pourquoi
-il ne vous est pas permis d'intégrer les originaux (originels et conséquents)
+3. L’INCORPORATION DE L’OEUVRE
+Tous les éléments de cette oeuvre doivent demeurer libres, c’est pourquoi
+il ne vous est pas permis d’intégrer les originaux (originels et conséquents)
 dans une autre oeuvre qui ne serait pas soumise à cette licence.
 
-   4. VOS DROITS D'AUTEUR
-
-Cette licence n'a pas pour objet de nier vos droits d'auteur sur votre contribution.
-En choisissant de contribuer à l'évolution de cette oeuvre, vous acceptez
-seulement d'offrir aux autres les mêmes droits sur votre contribution que
+4. VOS DROITS D’AUTEUR
+Cette licence n’a pas pour objet de nier vos droits d’auteur sur votre contribution.
+En choisissant de contribuer à l’évolution de cette oeuvre, vous acceptez
+seulement d’offrir aux autres les mêmes droits sur votre contribution que
 ceux qui vous ont été accordés par cette licence.
 
-   5. LA DURÉE DE LA LICENCE
-
+5. LA DURÉE DE LA LICENCE
 Cette licence prend effet dès votre acceptation de ses dispositions. Le fait
-de copier, de diffuser, ou de modifier l'oeuvre constitue une acception tacite.
-
-   Cette licence a pour durée la durée des droits d'auteur attachés à l'oeuvre.
-
+de copier, de diffuser, ou de modifier l’oeuvre constitue une acception tacite.
+Cette licence a pour durée la durée des droits d’auteur attachés à l’oeuvre.
 Si vous ne respectez pas les termes de cette licence, vous perdez automatiquement
-les droits qu'elle vous confère.
-
-Si le régime juridique auquel vous êtes soumis ne vous permet pas de respecter
-les termes de cette licence, vous ne pouvez pas vous prévaloir des libertés
-qu'elle confère.
-
-   6. LES DIFFÉRENTES VERSIONS DE LA LICENCE
+les droits qu’elle vous confère. Si le régime juridique auquel vous êtes soumis
+ne vous permet pas de respecter les termes de cette licence, vous ne pouvez
+pas vous prévaloir des libertés qu’elle confère.
 
+6. LES DIFFÉRENTES VERSIONS DE LA LICENCE
 Cette licence pourra être modifiée régulièrement, en vue de son amélioration,
 par ses auteurs (les acteurs du mouvement « copyleft attitude ») sous la forme
 de nouvelles versions numérotées.
-
 Vous avez toujours le choix entre vous contenter des dispositions contenues
 dans la version sous laquelle la copie vous a été communiquée ou alors, vous
-prévaloir des dispositions d'une des versions ultérieures.
-
-   7. LES SOUS-LICENCES
+prévaloir des dispositions d’une des versions ultérieures.
 
+7. LES SOUS-LICENCES
 Les sous licences ne sont pas autorisées par la présente. Toute personne qui
-souhaite bénéficier des libertés qu'elle confère sera liée directement à l'auteur
-de l'oeuvre originelle.
-
-   8. LA LOI APPLICABLE AU CONTRAT
+souhaite bénéficier des libertés qu’elle confère sera liée directement à l’auteur
+de l’oeuvre originelle.
 
+8. LA LOI APPLICABLE AU CONTRAT
 Cette licence est soumise au droit français.
diff --git a/options/license/LAL-1.3 b/options/license/LAL-1.3
index 4dcefed47f..96ce354fc1 100644
--- a/options/license/LAL-1.3
+++ b/options/license/LAL-1.3
@@ -1,183 +1,158 @@
 Licence Art Libre 1.3 (LAL 1.3)
 
-Préambule :
+Préambule :
 
-Avec la Licence Art Libre, l'autorisation est donnée de copier, de diffuser
-et de transformer librement les œuvres dans le respect des droits de l'auteur.
+Avec la Licence Art Libre, l’autorisation est donnée de copier, de diffuser
+et de transformer librement les œuvres dans le respect des droits de l’auteur.
 
-Loin d'ignorer ces droits, la Licence Art Libre les reconnaît et les protège.
-Elle en reformule l'exercice en permettant à tout un chacun de faire un usage
-créatif des productions de l'esprit quels que soient leur genre et leur forme
-d'expression.
+Loin d’ignorer ces droits, la Licence Art Libre les reconnaît et les protège.
+Elle en reformule l’exercice en permettant à tout un chacun de faire un usage
+créatif des productions de l’esprit quels que soient leur genre et leur forme
+d’expression.
 
-Si, en règle générale, l'application du droit d'auteur conduit à restreindre
-l'accès aux œuvres de l'esprit, la Licence Art Libre, au contraire, le favorise.
-L'intention est d'autoriser l'utilisation des ressources d'une œuvre ; créer
+Si, en règle générale, l’application du droit d’auteur conduit à restreindre
+l’accès aux œuvres de l’esprit, la Licence Art Libre, au contraire, le favorise.
+L’intention est d’autoriser l’utilisation des ressources d’une œuvre ; créer
 de nouvelles conditions de création pour amplifier les possibilités de création.
-La Licence Art Libre permet d'avoir jouissance des œuvres tout en reconnaissant
+La Licence Art Libre permet d’avoir jouissance des œuvres tout en reconnaissant
 les droits et les responsabilités de chacun.
 
-Avec le développement du numérique, l'invention d'internet et des logiciels
-libres, les modalités de création ont évolué : les productions de l'esprit
-s'offrent naturellement à la circulation, à l'échange et aux transformations.
-Elles se prêtent favorablement à la réalisation d'œuvres communes que chacun
-peut augmenter pour l'avantage de tous.
+Avec le développement du numérique, l’invention d’internet et des logiciels
+libres, les modalités de création ont évolué : les productions de l’esprit
+s’offrent naturellement à la circulation, à l’échange et aux transformations.
+Elles se prêtent favorablement à la réalisation d’œuvres communes que chacun
+peut augmenter pour l’avantage de tous.
 
-C'est la raison essentielle de la Licence Art Libre : promouvoir et protéger
-ces productions de l'esprit selon les principes du copyleft : liberté d'usage,
-de copie, de diffusion, de transformation et interdiction d'appropriation
+C’est la raison essentielle de la Licence Art Libre : promouvoir et protéger
+ces productions de l’esprit selon les principes du copyleft : liberté d’usage,
+de copie, de diffusion, de transformation et interdiction d’appropriation
 exclusive.
 
-Définitions :
+Définitions :
 
-Nous désignons par « œuvre », autant l'œuvre initiale, les œuvres conséquentes,
-que l'œuvre commune telles que définies ci-après :
+Nous désignons par « œuvre », autant l’œuvre initiale, les œuvres conséquentes,
+que l’œuvre commune telles que définies ci-après :
 
-L'œuvre commune : Il s'agit d'une œuvre qui comprend l'œuvre initiale ainsi
+L’œuvre commune :Il s’agit d’une œuvre qui comprend l’œuvre initiale ainsi
 que toutes les contributions postérieures (les originaux conséquents et les
-copies). Elle est créée à l'initiative de l'auteur initial qui par cette licence
+copies). Elle est créée à l’initiative de l’auteur initial qui par cette licence
 définit les conditions selon lesquelles les contributions sont faites.
 
-L'œuvre initiale : C'est-à-dire l'œuvre créée par l'initiateur de l'œuvre
-commune dont les copies vont être modifiées par qui le souhaite.
+L’œuvre initiale :C’est-à-dire l’œuvre créée par l’initiateur de l’œuvre commune
+dont les copies vont être modifiées par qui le souhaite.
 
-Les œuvres conséquentes : C'est-à-dire les contributions des auteurs qui participent
-à la formation de l'œuvre commune en faisant usage des droits de reproduction,
+Les œuvres conséquentes :C’est-à-dire les contributions des auteurs qui participent
+à la formation de l’œuvre commune en faisant usage des droits de reproduction,
 de diffusion et de modification que leur confère la licence.
 
-Originaux (sources ou ressources de l'œuvre) : Chaque exemplaire daté de l'œuvre
+Originaux (sources ou ressources de l’œuvre) :Chaque exemplaire daté de l’œuvre
 initiale ou conséquente que leurs auteurs présentent comme référence pour
 toutes actualisations, interprétations, copies ou reproductions ultérieures.
 
-Copie : Toute reproduction d'un original au sens de cette licence.
-
-   1- OBJET.
+Copie :Toute reproduction d’un original au sens de cette licence.
 
+1- OBJET.
 Cette licence a pour objet de définir les conditions selon lesquelles vous
-pouvez jouir librement de l'œuvre.
+pouvez jouir librement de l’œuvre.
 
-   2. L'ÉTENDUE DE LA JOUISSANCE.
-
-Cette œuvre est soumise au droit d'auteur, et l'auteur par cette licence vous
+2. L’ÉTENDUE DE LA JOUISSANCE.
+Cette œuvre est soumise au droit d’auteur, et l’auteur par cette licence vous
 indique quelles sont vos libertés pour la copier, la diffuser et la modifier.
 
-      2.1 LA LIBERTÉ DE COPIER (OU DE REPRODUCTION).
-
+2.1 LA LIBERTÉ DE COPIER (OU DE REPRODUCTION).
 Vous avez la liberté de copier cette œuvre pour vous, vos amis ou toute autre
 personne, quelle que soit la technique employée.
 
-      2.2 LA LIBERTÉ DE DIFFUSER (INTERPRÉTER, REPRÉSENTER, DISTRIBUER).
-
+2.2 LA LIBERTÉ DE DIFFUSER (INTERPRÉTER, REPRÉSENTER, DISTRIBUER).
 Vous pouvez diffuser librement les copies de ces œuvres, modifiées ou non,
 quel que soit le support, quel que soit le lieu, à titre onéreux ou gratuit,
-si vous respectez toutes les conditions suivantes :
+si vous respectez toutes les conditions suivantes :
 
-1. joindre aux copies cette licence à l'identique ou indiquer précisément
-où se trouve la licence ;
+1.	joindre aux copies cette licence à l’identique ou indiquer précisément
+où se trouve la licence ;
+2.	indiquer au destinataire le nom de chaque auteur des originaux, y compris
+le vôtre si vous avez modifié l’œuvre ;
+3.	indiquer au destinataire où il pourrait avoir accès aux originaux (initiaux
+et/ou conséquents).
 
-2. indiquer au destinataire le nom de chaque auteur des originaux, y compris
-le vôtre si vous avez modifié l'œuvre ;
-
-3. indiquer au destinataire où il pourrait avoir accès aux originaux (initiaux
-et/ou conséquents). Les auteurs des originaux pourront, s'ils le souhaitent,
-vous autoriser à diffuser l'original dans les mêmes conditions que les copies.
-
-      2.3 LA LIBERTÉ DE MODIFIER.
+Les auteurs des originaux pourront, s’ils le souhaitent, vous autoriser à
+diffuser l’original dans les mêmes conditions que les copies.
 
+2.3 LA LIBERTÉ DE MODIFIER.
 Vous avez la liberté de modifier les copies des originaux (initiaux et conséquents)
-dans le respect des conditions suivantes :
+dans le respect des conditions suivantes :
 
-1. celles prévues à l'article 2.2 en cas de diffusion de la copie modifiée ;
+1.	celles prévues à l’article 2.2 en cas de diffusion de la copie modifiée
+;
+2.	indiquer qu’il s’agit d’une œuvre modifiée et, si possible, la nature de
+la modification ;
+3.	diffuser cette œuvre conséquente avec la même licence ou avec toute licence
+compatible ;
+4.	Les auteurs des originaux pourront, s’ils le souhaitent, vous autoriser
+à modifier l’original dans les mêmes conditions que les copies.
 
-2. indiquer qu'il s'agit d'une œuvre modifiée et, si possible, la nature de
-la modification ;
-
-3. diffuser cette œuvre conséquente avec la même licence ou avec toute licence
-compatible ;
-
-4. Les auteurs des originaux pourront, s'ils le souhaitent, vous autoriser
-à modifier l'original dans les mêmes conditions que les copies.
-
-   3. DROITS CONNEXES.
-
-Les actes donnant lieu à des droits d'auteur ou des droits voisins ne doivent
-pas constituer un obstacle aux libertés conférées par cette licence.
-
-C'est pourquoi, par exemple, les interprétations doivent être soumises à la
-même licence ou une licence compatible. De même, l'intégration de l'œuvre
-à une base de données, une compilation ou une anthologie ne doit pas faire
-obstacle à la jouissance de l'œuvre telle que définie par cette licence.
-
-   4. L' INTÉGRATION DE L'ŒUVRE.
+3. DROITS CONNEXES.
+Les actes donnant lieu à des droits d’auteur ou des droits voisins ne doivent
+pas constituer un obstacle aux libertés conférées par cette licence. C’est
+pourquoi, par exemple, les interprétations doivent être soumises à la même
+licence ou une licence compatible. De même, l’intégration de l’œuvre à une
+base de données, une compilation ou une anthologie ne doit pas faire obstacle
+à la jouissance de l’œuvre telle que définie par cette licence.
 
+4. L’ INTÉGRATION DE L’ŒUVRE.
 Toute intégration de cette œuvre à un ensemble non soumis à la LAL doit assurer
-l'exercice des libertés conférées par cette licence.
-
-Si l'œuvre n'est plus accessible indépendamment de l'ensemble, alors l'intégration
-n'est possible qu'à condition que l'ensemble soit soumis à la LAL ou une licence
+l’exercice des libertés conférées par cette licence.
+Si l’œuvre n’est plus accessible indépendamment de l’ensemble, alors l’intégration
+n’est possible qu’à condition que l’ensemble soit soumis à la LAL ou une licence
 compatible.
 
-   5. CRITÈRES DE COMPATIBILITÉ.
+5. CRITÈRES DE COMPATIBILITÉ.
+Une licence est compatible avec la LAL si et seulement si :
 
-   Une licence est compatible avec la LAL si et seulement si :
-
-1. elle accorde l'autorisation de copier, diffuser et modifier des copies
-de l'œuvre, y compris à des fins lucratives, et sans autres restrictions que
-celles qu'impose le respect des autres critères de compatibilité ;
-
-2. elle garantit la paternité de l'œuvre et l'accès aux versions antérieures
-de l'œuvre quand cet accès est possible ;
-
-      3. elle reconnaît la LAL également compatible (réciprocité) ;
-
-4. elle impose que les modifications faites sur l'œuvre soient soumises à
+1.	elle accorde l’autorisation de copier, diffuser et modifier des copies
+de l’œuvre, y compris à des fins lucratives, et sans autres restrictions que
+celles qu’impose le respect des autres critères de compatibilité ;
+2.	elle garantit la paternité de l’œuvre et l’accès aux versions antérieures
+de l’œuvre quand cet accès est possible ;
+     3.	elle reconnaît la LAL également compatible (réciprocité) ;
+4.	elle impose que les modifications faites sur l’œuvre soient soumises à
 la même licence ou encore à une licence répondant aux critères de compatibilité
 posés par la LAL.
 
-   6. VOS DROITS INTELLECTUELS.
-
-La LAL n'a pas pour objet de nier vos droits d'auteur sur votre contribution
-ni vos droits connexes. En choisissant de contribuer à l'évolution de cette
-œuvre commune, vous acceptez seulement d'offrir aux autres les mêmes autorisations
+6. VOS DROITS INTELLECTUELS.
+La LAL n’a pas pour objet de nier vos droits d’auteur sur votre contribution
+ni vos droits connexes. En choisissant de contribuer à l’évolution de cette
+œuvre commune, vous acceptez seulement d’offrir aux autres les mêmes autorisations
 sur votre contribution que celles qui vous ont été accordées par cette licence.
-Ces autorisations n'entraînent pas un dessaisissement de vos droits intellectuels.
+Ces autorisations n’entraînent pas un dessaisissement de vos droits intellectuels.
 
-   7. VOS RESPONSABILITÉS.
-
-La liberté de jouir de l'œuvre tel que permis par la LAL (liberté de copier,
+7. VOS RESPONSABILITÉS.
+La liberté de jouir de l’œuvre tel que permis par la LAL (liberté de copier,
 diffuser, modifier) implique pour chacun la responsabilité de ses propres
 faits.
 
-   8. LA DURÉE DE LA LICENCE.
-
+8. LA DURÉE DE LA LICENCE.
 Cette licence prend effet dès votre acceptation de ses dispositions. Le fait
-de copier, de diffuser, ou de modifier l'œuvre constitue une acceptation tacite.
-
-Cette licence a pour durée la durée des droits d'auteur attachés à l'œuvre.
+de copier, de diffuser, ou de modifier l’œuvre constitue une acceptation tacite.
+Cette licence a pour durée la durée des droits d’auteur attachés à l’œuvre.
 Si vous ne respectez pas les termes de cette licence, vous perdez automatiquement
-les droits qu'elle vous confère.
-
-Si le régime juridique auquel vous êtes soumis ne vous permet pas de respecter
-les termes de cette licence, vous ne pouvez pas vous prévaloir des libertés
-qu'elle confère.
-
-   9. LES DIFFÉRENTES VERSIONS DE LA LICENCE.
+les droits qu’elle vous confère. Si le régime juridique auquel vous êtes soumis
+ne vous permet pas de respecter les termes de cette licence, vous ne pouvez
+pas vous prévaloir des libertés qu’elle confère.
 
+9. LES DIFFÉRENTES VERSIONS DE LA LICENCE.
 Cette licence pourra être modifiée régulièrement, en vue de son amélioration,
 par ses auteurs (les acteurs du mouvement Copyleft Attitude) sous la forme
 de nouvelles versions numérotées.
-
 Vous avez toujours le choix entre vous contenter des dispositions contenues
 dans la version de la LAL sous laquelle la copie vous a été communiquée ou
-alors, vous prévaloir des dispositions d'une des versions ultérieures.
-
-   10. LES SOUS-LICENCES.
+alors, vous prévaloir des dispositions d’une des versions ultérieures.
 
+10. LES SOUS-LICENCES.
 Les sous-licences ne sont pas autorisées par la présente. Toute personne qui
-souhaite bénéficier des libertés qu'elle confère sera liée directement aux
-auteurs de l'œuvre commune.
-
-   11. LE CONTEXTE JURIDIQUE.
+souhaite bénéficier des libertés qu’elle confère sera liée directement aux
+auteurs de l’œuvre commune.
 
+11. LE CONTEXTE JURIDIQUE.
 Cette licence est rédigée en référence au droit français et à la Convention
-de Berne relative au droit d'auteur.
+de Berne relative au droit d’auteur.
diff --git a/options/license/LGPL-2.0-only b/options/license/LGPL-2.0-only
index 5c96471aaf..ec9eedc542 100644
--- a/options/license/LGPL-2.0-only
+++ b/options/license/LGPL-2.0-only
@@ -1,14 +1,15 @@
 GNU LIBRARY GENERAL PUBLIC LICENSE
 
-Version 2, June 1991 Copyright (C) 1991 Free Software Foundation, Inc.
+Version 2, June 1991
 
-51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+Copyright (C) 1991 Free Software Foundation, Inc.
+51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 
 Everyone is permitted to copy and distribute verbatim copies of this license
 document, but changing it is not allowed.
 
-[This is the first released version of the library GPL. It is numbered 2 because
-it goes with version 2 of the ordinary GPL.]
+[This is the first released version of the library GPL.  It is numbered 2
+because it goes with version 2 of the ordinary GPL.]
 
 Preamble
 
@@ -139,7 +140,7 @@ thus forming a work based on the Library, and copy and distribute such modificat
 or work under the terms of Section 1 above, provided that you also meet all
 of these conditions:
 
-      a) The modified work must itself be a software library.
+     a) The modified work must itself be a software library.
 
 b) You must cause the files modified to carry prominent notices stating that
 you changed the files and the date of any change.
@@ -375,7 +376,7 @@ for this. Our decision will be guided by the two goals of preserving the free
 status of all derivatives of our free software and of promoting the sharing
 and reuse of software generally.
 
-   NO WARRANTY
+NO WARRANTY
 
 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR
 THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE
@@ -394,6 +395,7 @@ OR INABILITY TO USE THE LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA
 OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES
 OR A FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF SUCH
 HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
 END OF TERMS AND CONDITIONS
 
 How to Apply These Terms to Your New Libraries
@@ -409,9 +411,8 @@ to attach them to the start of each source file to most effectively convey
 the exclusion of warranty; and each file should have at least the "copyright"
 line and a pointer to where the full notice is found.
 
-one line to give the library's name and an idea of what it does.
-
-Copyright (C) year name of author
+     one line to give the library's name and an idea of what it does.
+     Copyright (C) year  name of author
 
 This library is free software; you can redistribute it and/or modify it under
 the terms of the GNU Library General Public License as published by the Free
@@ -420,12 +421,12 @@ any later version.
 
 This library is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more
-details.
+FOR A PARTICULAR PURPOSE.  See the GNU Library General Public License for
+more details.
 
 You should have received a copy of the GNU Library General Public License
 along with this library; if not, write to the Free Software Foundation, Inc.,
-51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA.
 
 Also add information on how to contact you by electronic and paper mail.
 
@@ -434,13 +435,10 @@ if any, to sign a "copyright disclaimer" for the library, if necessary. Here
 is a sample; alter the names:
 
 Yoyodyne, Inc., hereby disclaims all copyright interest in
-
 the library `Frob' (a library for tweaking knobs) written
-
 by James Random Hacker.
 
 signature of Ty Coon, 1 April 1990
-
 Ty Coon, President of Vice
 
 That's all there is to it!
diff --git a/options/license/LGPL-2.0-or-later b/options/license/LGPL-2.0-or-later
index 5c96471aaf..ec9eedc542 100644
--- a/options/license/LGPL-2.0-or-later
+++ b/options/license/LGPL-2.0-or-later
@@ -1,14 +1,15 @@
 GNU LIBRARY GENERAL PUBLIC LICENSE
 
-Version 2, June 1991 Copyright (C) 1991 Free Software Foundation, Inc.
+Version 2, June 1991
 
-51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+Copyright (C) 1991 Free Software Foundation, Inc.
+51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 
 Everyone is permitted to copy and distribute verbatim copies of this license
 document, but changing it is not allowed.
 
-[This is the first released version of the library GPL. It is numbered 2 because
-it goes with version 2 of the ordinary GPL.]
+[This is the first released version of the library GPL.  It is numbered 2
+because it goes with version 2 of the ordinary GPL.]
 
 Preamble
 
@@ -139,7 +140,7 @@ thus forming a work based on the Library, and copy and distribute such modificat
 or work under the terms of Section 1 above, provided that you also meet all
 of these conditions:
 
-      a) The modified work must itself be a software library.
+     a) The modified work must itself be a software library.
 
 b) You must cause the files modified to carry prominent notices stating that
 you changed the files and the date of any change.
@@ -375,7 +376,7 @@ for this. Our decision will be guided by the two goals of preserving the free
 status of all derivatives of our free software and of promoting the sharing
 and reuse of software generally.
 
-   NO WARRANTY
+NO WARRANTY
 
 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR
 THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE
@@ -394,6 +395,7 @@ OR INABILITY TO USE THE LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA
 OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES
 OR A FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF SUCH
 HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
 END OF TERMS AND CONDITIONS
 
 How to Apply These Terms to Your New Libraries
@@ -409,9 +411,8 @@ to attach them to the start of each source file to most effectively convey
 the exclusion of warranty; and each file should have at least the "copyright"
 line and a pointer to where the full notice is found.
 
-one line to give the library's name and an idea of what it does.
-
-Copyright (C) year name of author
+     one line to give the library's name and an idea of what it does.
+     Copyright (C) year  name of author
 
 This library is free software; you can redistribute it and/or modify it under
 the terms of the GNU Library General Public License as published by the Free
@@ -420,12 +421,12 @@ any later version.
 
 This library is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more
-details.
+FOR A PARTICULAR PURPOSE.  See the GNU Library General Public License for
+more details.
 
 You should have received a copy of the GNU Library General Public License
 along with this library; if not, write to the Free Software Foundation, Inc.,
-51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA.
 
 Also add information on how to contact you by electronic and paper mail.
 
@@ -434,13 +435,10 @@ if any, to sign a "copyright disclaimer" for the library, if necessary. Here
 is a sample; alter the names:
 
 Yoyodyne, Inc., hereby disclaims all copyright interest in
-
 the library `Frob' (a library for tweaking knobs) written
-
 by James Random Hacker.
 
 signature of Ty Coon, 1 April 1990
-
 Ty Coon, President of Vice
 
 That's all there is to it!
diff --git a/options/license/LGPL-2.1-only b/options/license/LGPL-2.1-only
index 130dffb311..aaaba1688e 100644
--- a/options/license/LGPL-2.1-only
+++ b/options/license/LGPL-2.1-only
@@ -3,14 +3,13 @@ GNU LESSER GENERAL PUBLIC LICENSE
 Version 2.1, February 1999
 
 Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 Everyone is permitted to copy and distribute verbatim copies of this license
 document, but changing it is not allowed.
 
-[This is the first released version of the Lesser GPL. It also counts as the
-successor of the GNU Library Public License, version 2, hence the version
+[This is the first released version of the Lesser GPL.  It also counts as
+the successor of the GNU Library Public License, version 2, hence the version
 number 2.1.]
 
 Preamble
@@ -154,7 +153,7 @@ thus forming a work based on the Library, and copy and distribute such modificat
 or work under the terms of Section 1 above, provided that you also meet all
 of these conditions:
 
-      a) The modified work must itself be a software library.
+     a) The modified work must itself be a software library.
 
 b) You must cause the files modified to carry prominent notices stating that
 you changed the files and the date of any change.
@@ -397,7 +396,7 @@ for this. Our decision will be guided by the two goals of preserving the free
 status of all derivatives of our free software and of promoting the sharing
 and reuse of software generally.
 
-   NO WARRANTY
+NO WARRANTY
 
 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR
 THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE
@@ -416,6 +415,7 @@ OR INABILITY TO USE THE LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA
 OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES
 OR A FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF SUCH
 HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
 END OF TERMS AND CONDITIONS
 
 How to Apply These Terms to Your New Libraries
@@ -431,9 +431,8 @@ to attach them to the start of each source file to most effectively convey
 the exclusion of warranty; and each file should have at least the "copyright"
 line and a pointer to where the full notice is found.
 
-< one line to give the library's name and an idea of what it does. >
-
-Copyright (C) < year > < name of author >
+     one line to give the library's name and an idea of what it does.
+     Copyright (C) year  name of author
 
 This library is free software; you can redistribute it and/or modify it under
 the terms of the GNU Lesser General Public License as published by the Free
@@ -442,12 +441,12 @@ any later version.
 
 This library is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more
 details.
 
 You should have received a copy of the GNU Lesser General Public License along
 with this library; if not, write to the Free Software Foundation, Inc., 51
-Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Also add information
+Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA Also add information
 on how to contact you by electronic and paper mail.
 
 You should also get your employer (if you work as a programmer) or your school,
@@ -455,13 +454,9 @@ if any, to sign a "copyright disclaimer" for the library, if necessary. Here
 is a sample; alter the names:
 
 Yoyodyne, Inc., hereby disclaims all copyright interest in
-
 the library `Frob' (a library for tweaking knobs) written
-
 by James Random Hacker.
 
-< signature of Ty Coon > , 1 April 1990
-
+signature of Ty Coon, 1 April 1990
 Ty Coon, President of Vice
-
 That's all there is to it!
diff --git a/options/license/LGPL-2.1-or-later b/options/license/LGPL-2.1-or-later
index 04bb156e77..aaaba1688e 100644
--- a/options/license/LGPL-2.1-or-later
+++ b/options/license/LGPL-2.1-or-later
@@ -3,14 +3,13 @@ GNU LESSER GENERAL PUBLIC LICENSE
 Version 2.1, February 1999
 
 Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 Everyone is permitted to copy and distribute verbatim copies of this license
 document, but changing it is not allowed.
 
-[This is the first released version of the Lesser GPL. It also counts as the
-successor of the GNU Library Public License, version 2, hence the version
+[This is the first released version of the Lesser GPL.  It also counts as
+the successor of the GNU Library Public License, version 2, hence the version
 number 2.1.]
 
 Preamble
@@ -154,7 +153,7 @@ thus forming a work based on the Library, and copy and distribute such modificat
 or work under the terms of Section 1 above, provided that you also meet all
 of these conditions:
 
-      a) The modified work must itself be a software library.
+     a) The modified work must itself be a software library.
 
 b) You must cause the files modified to carry prominent notices stating that
 you changed the files and the date of any change.
@@ -397,7 +396,7 @@ for this. Our decision will be guided by the two goals of preserving the free
 status of all derivatives of our free software and of promoting the sharing
 and reuse of software generally.
 
-   NO WARRANTY
+NO WARRANTY
 
 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR
 THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE
@@ -416,6 +415,7 @@ OR INABILITY TO USE THE LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA
 OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES
 OR A FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF SUCH
 HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
 END OF TERMS AND CONDITIONS
 
 How to Apply These Terms to Your New Libraries
@@ -431,9 +431,8 @@ to attach them to the start of each source file to most effectively convey
 the exclusion of warranty; and each file should have at least the "copyright"
 line and a pointer to where the full notice is found.
 
-<one line to give the library's name and an idea of what it does.>
-
-Copyright (C) <year> <name of author>
+     one line to give the library's name and an idea of what it does.
+     Copyright (C) year  name of author
 
 This library is free software; you can redistribute it and/or modify it under
 the terms of the GNU Lesser General Public License as published by the Free
@@ -442,27 +441,22 @@ any later version.
 
 This library is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more
 details.
 
 You should have received a copy of the GNU Lesser General Public License along
 with this library; if not, write to the Free Software Foundation, Inc., 51
-Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-Also add information on how to contact you by electronic and paper mail.
+Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA Also add information
+on how to contact you by electronic and paper mail.
 
 You should also get your employer (if you work as a programmer) or your school,
 if any, to sign a "copyright disclaimer" for the library, if necessary. Here
 is a sample; alter the names:
 
 Yoyodyne, Inc., hereby disclaims all copyright interest in
-
 the library `Frob' (a library for tweaking knobs) written
-
 by James Random Hacker.
 
-< signature of Ty Coon > , 1 April 1990
-
+signature of Ty Coon, 1 April 1990
 Ty Coon, President of Vice
-
 That's all there is to it!
diff --git a/options/license/LGPL-3.0-linking-exception b/options/license/LGPL-3.0-linking-exception
index 28149b0b5c..186456fb0e 100644
--- a/options/license/LGPL-3.0-linking-exception
+++ b/options/license/LGPL-3.0-linking-exception
@@ -1,3 +1,16 @@
-As a special exception to the GNU Lesser General Public License version 3 ("LGPL3"), the copyright holders of this Library give you permission to convey to a third party a Combined Work that links statically or dynamically to this Library without providing any Minimal Corresponding Source or Minimal Application Code as set out in 4d or providing the installation information set out in section 4e, provided that you comply with the other provisions of LGPL3 and provided that you meet, for the Application the terms and conditions of the license(s) which apply to the Application.
+As a special exception to the GNU Lesser General Public License version 3
+("LGPL3"), the copyright holders of this Library give you permission to
+convey to a third party a Combined Work that links statically or dynamically
+to this Library without providing any Minimal Corresponding Source or
+Minimal Application Code as set out in 4d or providing the installation
+information set out in section 4e, provided that you comply with the other
+provisions of LGPL3 and provided that you meet, for the Application the
+terms and conditions of the license(s) which apply to the Application.
 
-Except as stated in this special exception, the provisions of LGPL3 will continue to comply in full to this Library. If you modify this Library, you may apply this exception to your version of this Library, but you are not obliged to do so. If you do not wish to do so, delete this exception statement from your version. This exception does not (and cannot) modify any license terms which apply to the Application, with which you must still comply.
+Except as stated in this special exception, the provisions of LGPL3 will
+continue to comply in full to this Library. If you modify this Library, you
+may apply this exception to your version of this Library, but you are not
+obliged to do so. If you do not wish to do so, delete this exception
+statement from your version. This exception does not (and cannot) modify any
+license terms which apply to the Application, with which you must still
+comply.
diff --git a/options/license/LGPL-3.0-only b/options/license/LGPL-3.0-only
index bd405afbef..9e2e9f7831 100644
--- a/options/license/LGPL-3.0-only
+++ b/options/license/LGPL-3.0-only
@@ -1,8 +1,7 @@
 GNU LESSER GENERAL PUBLIC LICENSE
-
 Version 3, 29 June 2007
 
-Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
 
 Everyone is permitted to copy and distribute verbatim copies of this license
 document, but changing it is not allowed.
@@ -11,53 +10,39 @@ This version of the GNU Lesser General Public License incorporates the terms
 and conditions of version 3 of the GNU General Public License, supplemented
 by the additional permissions listed below.
 
-   0. Additional Definitions.
-
-      
+0. Additional Definitions.
 
 As used herein, "this License" refers to version 3 of the GNU Lesser General
 Public License, and the "GNU GPL" refers to version 3 of the GNU General Public
 License.
 
-      
-
 "The Library" refers to a covered work governed by this License, other than
 an Application or a Combined Work as defined below.
 
-      
-
 An "Application" is any work that makes use of an interface provided by the
 Library, but which is not otherwise based on the Library. Defining a subclass
 of a class defined by the Library is deemed a mode of using an interface provided
 by the Library.
 
-      
-
 A "Combined Work" is a work produced by combining or linking an Application
-with the Library. The particular version of the Library with which the Combined
+with the Library.  The particular version of the Library with which the Combined
 Work was made is also called the "Linked Version".
 
-      
-
 The "Minimal Corresponding Source" for a Combined Work means the Corresponding
 Source for the Combined Work, excluding any source code for portions of the
 Combined Work that, considered in isolation, are based on the Application,
 and not on the Linked Version.
 
-      
-
 The "Corresponding Application Code" for a Combined Work means the object
 code and/or source code for the Application, including any data and utility
 programs needed for reproducing the Combined Work from the Application, but
 excluding the System Libraries of the Combined Work.
 
-   1. Exception to Section 3 of the GNU GPL.
-
+1. Exception to Section 3 of the GNU GPL.
 You may convey a covered work under sections 3 and 4 of this License without
 being bound by section 3 of the GNU GPL.
 
-   2. Conveying Modified Versions.
-
+2. Conveying Modified Versions.
 If you modify a copy of the Library, and, in your modifications, a facility
 refers to a function or data to be supplied by an Application that uses the
 facility (other than as an argument passed when the facility is invoked),
@@ -71,10 +56,9 @@ meaningful, or
 b) under the GNU GPL, with none of the additional permissions of this License
 applicable to that copy.
 
-   3. Object Code Incorporating Material from Library Header Files.
-
+3. Object Code Incorporating Material from Library Header Files.
 The object code form of an Application may incorporate material from a header
-file that is part of the Library. You may convey such object code under terms
+file that is part of the Library.  You may convey such object code under terms
 of your choice, provided that, if the incorporated material is not limited
 to numerical parameters, data structure layouts and accessors, or small macros,
 inline functions and templates (ten or fewer lines in length), you do both
@@ -85,8 +69,7 @@ is used in it and that the Library and its use are covered by this License.
 
 b) Accompany the object code with a copy of the GNU GPL and this license document.
 
-   4. Combined Works.
-
+4. Combined Works.
 You may convey a Combined Work under terms of your choice that, taken together,
 effectively do not restrict modification of the portions of the Library contained
 in the Combined Work and reverse engineering for debugging such modifications,
@@ -102,7 +85,7 @@ c) For a Combined Work that displays copyright notices during execution, include
 the copyright notice for the Library among these notices, as well as a reference
 directing the user to the copies of the GNU GPL and this license document.
 
-      d) Do one of the following:
+     d) Do one of the following:
 
 0) Convey the Minimal Corresponding Source under the terms of this License,
 and the Corresponding Application Code in a form suitable for, and under terms
@@ -110,8 +93,8 @@ that permit, the user to recombine or relink the Application with a modified
 version of the Linked Version to produce a modified Combined Work, in the
 manner specified by section 6 of the GNU GPL for conveying Corresponding Source.
 
-1) Use a suitable shared library mechanism for linking with the Library. A
-suitable mechanism is one that (a) uses at run time a copy of the Library
+1) Use a suitable shared library mechanism for linking with the Library. 
+A suitable mechanism is one that (a) uses at run time a copy of the Library
 already present on the user's computer system, and (b) will operate properly
 with a modified version of the Library that is interface-compatible with the
 Linked Version.
@@ -126,8 +109,7 @@ Corresponding Application Code. If you use option 4d1, you must provide the
 Installation Information in the manner specified by section 6 of the GNU GPL
 for conveying Corresponding Source.)
 
-   5. Combined Libraries.
-
+5. Combined Libraries.
 You may place library facilities that are a work based on the Library side
 by side in a single library together with other library facilities that are
 not Applications and are not covered by this License, and convey such a combined
@@ -141,8 +123,7 @@ b) Give prominent notice with the combined library that part of it is a work
 based on the Library, and explaining where to find the accompanying uncombined
 form of the same work.
 
-   6. Revised Versions of the GNU Lesser General Public License.
-
+6. Revised Versions of the GNU Lesser General Public License.
 The Free Software Foundation may publish revised and/or new versions of the
 GNU Lesser General Public License from time to time. Such new versions will
 be similar in spirit to the present version, but may differ in detail to address
@@ -158,6 +139,6 @@ Public License, you may choose any version of the GNU Lesser General Public
 License ever published by the Free Software Foundation.
 
 If the Library as you received it specifies that a proxy can decide whether
-future versions of the GNU Lesser General Public License shall apply, that
-proxy's public statement of acceptance of any version is permanent authorization
-for you to choose that version for the Library.
+future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is permanent
+authorization for you to choose that version for the Library.
diff --git a/options/license/LGPL-3.0-or-later b/options/license/LGPL-3.0-or-later
index bd405afbef..9e2e9f7831 100644
--- a/options/license/LGPL-3.0-or-later
+++ b/options/license/LGPL-3.0-or-later
@@ -1,8 +1,7 @@
 GNU LESSER GENERAL PUBLIC LICENSE
-
 Version 3, 29 June 2007
 
-Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
 
 Everyone is permitted to copy and distribute verbatim copies of this license
 document, but changing it is not allowed.
@@ -11,53 +10,39 @@ This version of the GNU Lesser General Public License incorporates the terms
 and conditions of version 3 of the GNU General Public License, supplemented
 by the additional permissions listed below.
 
-   0. Additional Definitions.
-
-      
+0. Additional Definitions.
 
 As used herein, "this License" refers to version 3 of the GNU Lesser General
 Public License, and the "GNU GPL" refers to version 3 of the GNU General Public
 License.
 
-      
-
 "The Library" refers to a covered work governed by this License, other than
 an Application or a Combined Work as defined below.
 
-      
-
 An "Application" is any work that makes use of an interface provided by the
 Library, but which is not otherwise based on the Library. Defining a subclass
 of a class defined by the Library is deemed a mode of using an interface provided
 by the Library.
 
-      
-
 A "Combined Work" is a work produced by combining or linking an Application
-with the Library. The particular version of the Library with which the Combined
+with the Library.  The particular version of the Library with which the Combined
 Work was made is also called the "Linked Version".
 
-      
-
 The "Minimal Corresponding Source" for a Combined Work means the Corresponding
 Source for the Combined Work, excluding any source code for portions of the
 Combined Work that, considered in isolation, are based on the Application,
 and not on the Linked Version.
 
-      
-
 The "Corresponding Application Code" for a Combined Work means the object
 code and/or source code for the Application, including any data and utility
 programs needed for reproducing the Combined Work from the Application, but
 excluding the System Libraries of the Combined Work.
 
-   1. Exception to Section 3 of the GNU GPL.
-
+1. Exception to Section 3 of the GNU GPL.
 You may convey a covered work under sections 3 and 4 of this License without
 being bound by section 3 of the GNU GPL.
 
-   2. Conveying Modified Versions.
-
+2. Conveying Modified Versions.
 If you modify a copy of the Library, and, in your modifications, a facility
 refers to a function or data to be supplied by an Application that uses the
 facility (other than as an argument passed when the facility is invoked),
@@ -71,10 +56,9 @@ meaningful, or
 b) under the GNU GPL, with none of the additional permissions of this License
 applicable to that copy.
 
-   3. Object Code Incorporating Material from Library Header Files.
-
+3. Object Code Incorporating Material from Library Header Files.
 The object code form of an Application may incorporate material from a header
-file that is part of the Library. You may convey such object code under terms
+file that is part of the Library.  You may convey such object code under terms
 of your choice, provided that, if the incorporated material is not limited
 to numerical parameters, data structure layouts and accessors, or small macros,
 inline functions and templates (ten or fewer lines in length), you do both
@@ -85,8 +69,7 @@ is used in it and that the Library and its use are covered by this License.
 
 b) Accompany the object code with a copy of the GNU GPL and this license document.
 
-   4. Combined Works.
-
+4. Combined Works.
 You may convey a Combined Work under terms of your choice that, taken together,
 effectively do not restrict modification of the portions of the Library contained
 in the Combined Work and reverse engineering for debugging such modifications,
@@ -102,7 +85,7 @@ c) For a Combined Work that displays copyright notices during execution, include
 the copyright notice for the Library among these notices, as well as a reference
 directing the user to the copies of the GNU GPL and this license document.
 
-      d) Do one of the following:
+     d) Do one of the following:
 
 0) Convey the Minimal Corresponding Source under the terms of this License,
 and the Corresponding Application Code in a form suitable for, and under terms
@@ -110,8 +93,8 @@ that permit, the user to recombine or relink the Application with a modified
 version of the Linked Version to produce a modified Combined Work, in the
 manner specified by section 6 of the GNU GPL for conveying Corresponding Source.
 
-1) Use a suitable shared library mechanism for linking with the Library. A
-suitable mechanism is one that (a) uses at run time a copy of the Library
+1) Use a suitable shared library mechanism for linking with the Library. 
+A suitable mechanism is one that (a) uses at run time a copy of the Library
 already present on the user's computer system, and (b) will operate properly
 with a modified version of the Library that is interface-compatible with the
 Linked Version.
@@ -126,8 +109,7 @@ Corresponding Application Code. If you use option 4d1, you must provide the
 Installation Information in the manner specified by section 6 of the GNU GPL
 for conveying Corresponding Source.)
 
-   5. Combined Libraries.
-
+5. Combined Libraries.
 You may place library facilities that are a work based on the Library side
 by side in a single library together with other library facilities that are
 not Applications and are not covered by this License, and convey such a combined
@@ -141,8 +123,7 @@ b) Give prominent notice with the combined library that part of it is a work
 based on the Library, and explaining where to find the accompanying uncombined
 form of the same work.
 
-   6. Revised Versions of the GNU Lesser General Public License.
-
+6. Revised Versions of the GNU Lesser General Public License.
 The Free Software Foundation may publish revised and/or new versions of the
 GNU Lesser General Public License from time to time. Such new versions will
 be similar in spirit to the present version, but may differ in detail to address
@@ -158,6 +139,6 @@ Public License, you may choose any version of the GNU Lesser General Public
 License ever published by the Free Software Foundation.
 
 If the Library as you received it specifies that a proxy can decide whether
-future versions of the GNU Lesser General Public License shall apply, that
-proxy's public statement of acceptance of any version is permanent authorization
-for you to choose that version for the Library.
+future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is permanent
+authorization for you to choose that version for the Library.
diff --git a/options/license/LGPLLR b/options/license/LGPLLR
index fbfbc3e6dc..0bf78b89f8 100644
--- a/options/license/LGPLLR
+++ b/options/license/LGPLLR
@@ -56,7 +56,7 @@ of it, thus forming a work based on the Linguistic Resource, and copy and
 distribute such modifications or work under the terms of Section 1 above,
 provided that you also meet all of these conditions:
 
-      a) The modified work must itself be a linguistic resource.
+     a) The modified work must itself be a linguistic resource.
 
 b) You must cause the files modified to carry prominent notices stating that
 you changed the files and the date of any change.
@@ -229,7 +229,7 @@ may choose any version ever published by the Free Software Foundation.
 free programs whose distribution conditions are incompatible with these, write
 to the author to ask for permission.
 
-   NO WARRANTY
+ NO WARRANTY
 
 12. BECAUSE THE LINGUISTIC RESOURCE IS LICENSED FREE OF CHARGE, THERE IS NO
 WARRANTY FOR THE LINGUISTIC RESOURCE, TO THE EXTENT PERMITTED BY APPLICABLE
@@ -251,4 +251,4 @@ BY YOU OR THIRD PARTIES OR A FAILURE OF THE LINGUISTIC RESOURCE TO OPERATE
 WITH ANY OTHER SOFTWARE), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED
 OF THE POSSIBILITY OF SUCH DAMAGES.
 
-END OF TERMS AND CONDITIONS
+ END OF TERMS AND CONDITIONS
diff --git a/options/license/LLVM-exception b/options/license/LLVM-exception
index 24357eed7c..fa4b725a0e 100644
--- a/options/license/LLVM-exception
+++ b/options/license/LLVM-exception
@@ -1,5 +1,15 @@
-LLVM Exceptions to the Apache 2.0 License 
+---- LLVM Exceptions to the Apache 2.0 License ----
 
-As an exception, if, as a result of your compiling your source code, portions of this Software are embedded into an Object form of such source code, you may redistribute such embedded portions in such Object form without complying with the conditions of Sections 4(a), 4(b) and 4(d) of the License.
+   As an exception, if, as a result of your compiling your source code, portions
+   of this Software are embedded into an Object form of such source code, you
+   may redistribute such embedded portions in such Object form without complying
+   with the conditions of Sections 4(a), 4(b) and 4(d) of the License.
 
-In addition, if you combine or link compiled forms of this Software with software that is licensed under the GPLv2 ("Combined Software") and if a court of competent jurisdiction determines that the patent provision (Section 3), the indemnity provision (Section 9) or other Section of the License conflicts with the conditions of the GPLv2, you may retroactively and prospectively choose to deem waived or otherwise exclude such Section(s) of the License, but only in their entirety and only with respect to the Combined Software.
+   In addition, if you combine or link compiled forms of this Software with
+   software that is licensed under the GPLv2 ("Combined Software") and if a
+   court of competent jurisdiction determines that the patent provision (Section
+   3), the indemnity provision (Section 9) or other Section of the License
+   conflicts with the conditions of the GPLv2, you may retroactively and
+   prospectively choose to deem waived or otherwise exclude such Section(s) of
+   the License, but only in their entirety and only with respect to the Combined
+   Software.
diff --git a/options/license/LPL-1.0 b/options/license/LPL-1.0
index 75aed27e74..06c2172535 100644
--- a/options/license/LPL-1.0
+++ b/options/license/LPL-1.0
@@ -4,18 +4,16 @@ THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS PUBLIC LICENSE
 ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
 RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
 
-   1. DEFINITIONS
+1. DEFINITIONS
 
-   "Contribution" means:
+"Contribution" means:
 
-      a. in the case of <ORGANIZATION> (" <OWNER> "), the Original Program, and
+     a.  in the case of <ORGANIZATION> ("<OWNER>"), the Original Program, and
+     b.  in the case of each Contributor,
 
-      b. in the case of each Contributor,
-
-         i. changes to the Program, and
-
-ii. additions to the Program; where such changes and/or additions to the Program
-originate from and are "Contributed" by that particular Contributor.
+          i.  changes to the Program, and
+ii.  additions to the Program; where such changes and/or additions to the
+Program originate from and are "Contributed" by that particular Contributor.
 
 A Contribution is "Contributed" by a Contributor only (i) if it was added
 to the Program by such Contributor itself or anyone acting on such Contributor's
@@ -36,7 +34,7 @@ necessarily infringed by the use or sale of its Contribution alone or when
 combined with the Program.
 
 "Original Program" means the original version of the software accompanying
-this Agreement as released by <OWNER> , including source code, object code
+this Agreement as released by <OWNER>, including source code, object code
 and documentation, if any.
 
 "Program" means the Original Program and Contributions or any part thereof
@@ -44,7 +42,7 @@ and documentation, if any.
 "Recipient" means anyone who receives the Program under this Agreement, including
 all Contributors.
 
-   2. GRANT OF RIGHTS
+2. GRANT OF RIGHTS
 
 a. Subject to the terms of this Agreement, each Contributor hereby grants
 Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce,
@@ -64,7 +62,7 @@ license granted by a Contributor shall not apply to (i) any other combinations
 which include the Contribution, nor to (ii) Contributions of other Contributors.
 No hardware per se is licensed hereunder.
 
-c. Recipient understands that although each Contributor grants the licenses
+c.  Recipient understands that although each Contributor grants the licenses
 to its Contributions set forth herein, no assurances are provided by any Contributor
 that the Program does not infringe the patent or other intellectual property
 rights of any other entity. Each Contributor disclaims any liability to Recipient
@@ -76,40 +74,36 @@ if a third party patent license is required to allow Recipient to distribute
 the Program, it is Recipient's responsibility to acquire that license before
 distributing the Program.
 
-d. Each Contributor represents that to its knowledge it has sufficient copyright
+d.  Each Contributor represents that to its knowledge it has sufficient copyright
 rights in its Contribution, if any, to grant the copyright license set forth
 in this Agreement.
 
-   3. REQUIREMENTS
+3. REQUIREMENTS
 
 A. Distributor may choose to distribute the Program in any form under this
 Agreement or under its own license agreement, provided that:
 
-         1. it complies with the terms and conditions of this Agreement;
-
-2. if the Program is distributed in source code or other tangible form, a
+          1.  it complies with the terms and conditions of this Agreement;
+2.  if the Program is distributed in source code or other tangible form, a
 copy of this Agreement or Distributor's own license agreement is included
 with each copy of the Program; and
-
-3. if distributed under Distributor's own license agreement, such license
+3.  if distributed under Distributor's own license agreement, such license
 agreement:
 
-a. effectively disclaims on behalf of all Contributors all warranties and
+a.  effectively disclaims on behalf of all Contributors all warranties and
 conditions, express and implied, including warranties or conditions of title
 and non-infringement, and implied warranties or conditions of merchantability
 and fitness for a particular purpose;
-
-b. effectively excludes on behalf of all Contributors all liability for damages,
+b.  effectively excludes on behalf of all Contributors all liability for damages,
 including direct, indirect, special, incidental and consequential damages,
 such as lost profits; and
-
-c. states that any provisions which differ from this Agreement are offered
+c.  states that any provisions which differ from this Agreement are offered
 by that Contributor alone and not by any other party.
 
 B. Each Distributor must include the following in a conspicuous location in
 the Program:
 
-      Copyright (C) <YEAR>, <ORGANIZATION> and others. All Rights Reserved.
+     Copyright (C) <YEAR>, <ORGANIZATION> and others. All Rights Reserved.
 
 C. In addition, each Contributor must identify itself as the originator of
 its Contribution, if any, and indicate its consent to characterization of
@@ -117,7 +111,7 @@ its additions and/or changes as a Contribution, in a manner that reasonably
 allows subsequent Recipients to identify the originator of the Contribution.
 Once consent is granted, it may not thereafter be revoked.
 
-   4. COMMERCIAL DISTRIBUTION
+4. COMMERCIAL DISTRIBUTION
 
 Commercial distributors of software may accept certain responsibilities with
 respect to end users, business partners and the like. While this license is
@@ -148,7 +142,7 @@ would have to defend claims against the Contributors related to those performanc
 claims and warranties, and if a court requires any Contributor to pay any
 damages as a result, the Commercial Distributor must pay those damages.
 
-   5. NO WARRANTY
+5. NO WARRANTY
 
 EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON
 AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS
@@ -161,7 +155,7 @@ risks and costs of program errors, compliance with applicable laws, damage
 to or loss of data, programs or equipment, and unavailability or interruption
 of operations.
 
-   6. DISCLAIMER OF LIABILITY
+6. DISCLAIMER OF LIABILITY
 
 EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY
 CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL,
@@ -171,7 +165,7 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
 WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS
 GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
 
-   7. GENERAL
+7. GENERAL
 
 If any provision of this Agreement is invalid or unenforceable under applicable
 law, it shall not affect the validity or enforceability of the remainder of
diff --git a/options/license/LPL-1.02 b/options/license/LPL-1.02
index 7ba3bc969b..f6aa0d5225 100644
--- a/options/license/LPL-1.02
+++ b/options/license/LPL-1.02
@@ -4,18 +4,16 @@ THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS PUBLIC LICENSE
 ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
 RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
 
-   1. DEFINITIONS
+1. DEFINITIONS
 
-   "Contribution" means:
+"Contribution" means:
 
-a. in the case of Lucent Technologies Inc. ("LUCENT"), the Original Program,
+a.  in the case of Lucent Technologies Inc. ("LUCENT"), the Original Program,
 and
+     b.  in the case of each Contributor,
 
-      b. in the case of each Contributor,
-
-         i. changes to the Program, and
-
-         ii. additions to the Program;
+          i.  changes to the Program, and
+          ii.  additions to the Program;
 
 where such changes and/or additions to the Program were added to the Program
 by such Contributor itself or anyone acting on such Contributor's behalf,
@@ -41,15 +39,15 @@ documentation, if any.
 "Recipient" means anyone who receives the Program under this Agreement, including
 all Contributors.
 
-   2. GRANT OF RIGHTS
+2. GRANT OF RIGHTS
 
-a. Subject to the terms of this Agreement, each Contributor hereby grants
+a.  Subject to the terms of this Agreement, each Contributor hereby grants
 Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce,
 prepare derivative works of, publicly display, publicly perform, distribute
 and sublicense the Contribution of such Contributor, if any, and such derivative
 works, in source code and object code form.
 
-b. Subject to the terms of this Agreement, each Contributor hereby grants
+b.  Subject to the terms of this Agreement, each Contributor hereby grants
 Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed
 Patents to make, use, sell, offer to sell, import and otherwise transfer the
 Contribution of such Contributor, if any, in source code and object code form.
@@ -61,7 +59,7 @@ license granted by a Contributor shall not apply to (i) any other combinations
 which include the Contribution, nor to (ii) Contributions of other Contributors.
 No hardware per se is licensed hereunder.
 
-c. Recipient understands that although each Contributor grants the licenses
+c.  Recipient understands that although each Contributor grants the licenses
 to its Contributions set forth herein, no assurances are provided by any Contributor
 that the Program does not infringe the patent or other intellectual property
 rights of any other entity. Each Contributor disclaims any liability to Recipient
@@ -73,34 +71,30 @@ if a third party patent license is required to allow Recipient to distribute
 the Program, it is Recipient's responsibility to acquire that license before
 distributing the Program.
 
-d. Each Contributor represents that to its knowledge it has sufficient copyright
+d.  Each Contributor represents that to its knowledge it has sufficient copyright
 rights in its Contribution, if any, to grant the copyright license set forth
 in this Agreement.
 
-   3. REQUIREMENTS
+3. REQUIREMENTS
 
 A. Distributor may choose to distribute the Program in any form under this
 Agreement or under its own license agreement, provided that:
 
-         1. it complies with the terms and conditions of this Agreement;
-
-2. if the Program is distributed in source code or other tangible form, a
+          1.  it complies with the terms and conditions of this Agreement;
+2.  if the Program is distributed in source code or other tangible form, a
 copy of this Agreement or Distributor's own license agreement is included
 with each copy of the Program; and
-
-3. if distributed under Distributor's own license agreement, such license
+3.  if distributed under Distributor's own license agreement, such license
 agreement:
 
-a. effectively disclaims on behalf of all Contributors all warranties and
+a.  effectively disclaims on behalf of all Contributors all warranties and
 conditions, express and implied, including warranties or conditions of title
 and non-infringement, and implied warranties or conditions of merchantability
 and fitness for a particular purpose;
-
-b. effectively excludes on behalf of all Contributors all liability for damages,
+b.  effectively excludes on behalf of all Contributors all liability for damages,
 including direct, indirect, special, incidental and consequential damages,
 such as lost profits; and
-
-c. states that any provisions which differ from this Agreement are offered
+c.  states that any provisions which differ from this Agreement are offered
 by that Contributor alone and not by any other party.
 
 B. Each Distributor must include the following in a conspicuous location in
@@ -114,7 +108,7 @@ to identify the originator of the Contribution. Also, each Contributor must
 agree that the additions and/or changes are intended to be a Contribution.
 Once a Contribution is contributed, it may not thereafter be revoked.
 
-   4. COMMERCIAL DISTRIBUTION
+4. COMMERCIAL DISTRIBUTION
 
 Commercial distributors of software may accept certain responsibilities with
 respect to end users, business partners and the like. While this license is
@@ -145,7 +139,7 @@ would have to defend claims against the Contributors related to those performanc
 claims and warranties, and if a court requires any Contributor to pay any
 damages as a result, the Commercial Distributor must pay those damages.
 
-   5. NO WARRANTY
+5. NO WARRANTY
 
 EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON
 AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS
@@ -158,7 +152,7 @@ risks and costs of program errors, compliance with applicable laws, damage
 to or loss of data, programs or equipment, and unavailability or interruption
 of operations.
 
-   6. DISCLAIMER OF LIABILITY
+6. DISCLAIMER OF LIABILITY
 
 EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY
 CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL,
@@ -168,13 +162,13 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
 WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS
 GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
 
-   7. EXPORT CONTROL
+7. EXPORT CONTROL
 
 Recipient agrees that Recipient alone is responsible for compliance with the
 United States export administration regulations (and the export control laws
 and regulation of any other countries).
 
-   8. GENERAL
+8. GENERAL
 
 If any provision of this Agreement is invalid or unenforceable under applicable
 law, it shall not affect the validity or enforceability of the remainder of
diff --git a/options/license/LPPL-1.0 b/options/license/LPPL-1.0
index 458f89e867..e57fc5d02d 100644
--- a/options/license/LPPL-1.0
+++ b/options/license/LPPL-1.0
@@ -1,6 +1,8 @@
 LaTeX Project Public License
 
-LPPL Version 1.0 1999-03-01 Copyright 1999 LaTeX3 Project
+LPPL Version 1.0 1999-03-01
+
+Copyright 1999 LaTeX3 Project
 
 Everyone is permitted to copy and distribute verbatim copies of this license
 document, but modification is not allowed.
@@ -21,17 +23,12 @@ to this license.
 
 A typical example would be
 
-%% pig.sty
+     %% pig.sty %% Copyright 2001 M. Y. Name
 
-%% Copyright 2001 M. Y. Name
-
-% This program can redistributed and/or modified under the terms
-
-% of the LaTeX Project Public License Distributed from CTAN
-
-% archives in directory macros/latex/base/lppl.txt; either
-
-% version 1 of the License, or (at your option) any later version.
+     % This program can redistributed and/or modified under the terms
+     % of the LaTeX Project Public License Distributed from CTAN
+     % archives in directory macros/latex/base/lppl.txt; either
+     % version 1 of the License, or (at your option) any later version.
 
 Given such a notice in the file, the conditions of this document would apply,
 with:
@@ -56,16 +53,13 @@ use the parts of the text of LPPL as a model for your own license, but your
 license should not directly refer to the LPPL or otherwise give the impression
 that The Program is distributed under the LPPL.
 
-The LaTeX Project Public License
-
+ The LaTeX Project Public License
 ================================
-
 Terms And Conditions For Copying, Distribution And Modification
-
 ===============================================================
 
-WARRANTY
 
+WARRANTY
 ========
 
 There is no warranty for The Program, to the extent permitted by applicable
@@ -86,8 +80,8 @@ third parties as a result of a failure of The Program to operate with any
 other programs), even if such holder or other party has been advised of the
 possibility of such damages.
 
-DISTRIBUTION
 
+DISTRIBUTION
 ============
 
 Redistribution of unchanged files is allowed provided that all files that
@@ -157,7 +151,6 @@ the latest version of that file in The Program.
 ========================================================================
 
 NOTES
-
 =====
 
 We believe that these requirements give you the freedom you to make modifications
@@ -177,7 +170,6 @@ to LaTeX, the argument in modguide.tex may still apply, and should be read
 before a modified version of The Program is distributed.
 
 Conditions on individual files
-
 ==============================
 
 The individual files may bear additional conditions which supersede the general
diff --git a/options/license/LPPL-1.1 b/options/license/LPPL-1.1
index 0f408cb958..6d2b7f3aa7 100644
--- a/options/license/LPPL-1.1
+++ b/options/license/LPPL-1.1
@@ -1,14 +1,14 @@
 The LaTeX Project Public License
-
 =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 
-LPPL Version 1.1 1999-07-10 Copyright 1999 LaTeX3 Project
+LPPL Version 1.1 1999-07-10
+
+Copyright 1999 LaTeX3 Project
 
 Everyone is allowed to distribute verbatim copies of this license document,
 but modification of it is not allowed.
 
 PREAMBLE
-
 ========
 
 The LaTeX Project Public License (LPPL) is the license under which the base
@@ -46,7 +46,6 @@ your goal while meeting these conditions, then read the document `cfgguide.tex'
 in the base LaTeX distribution for suggestions.
 
 CONDITIONS ON DISTRIBUTION AND MODIFICATION
-
 ===========================================
 
 You may distribute a complete, unmodified copy of The Program. Distribution
@@ -85,7 +84,7 @@ the maintainers of the modified files.
 both of the modified file and of any files derived from the modified file
 with the filename of the original file.
 
-   8. You must do either (A) or (B):
+     8. You must do either (A) or (B):
 
 (A) distribute a copy of The Program (that is, a complete, unmodified copy
 of The Program) together with the modified file; if your distribution of the
@@ -119,7 +118,6 @@ to, the updating, by any method, of a file so that it becomes identical to
 the latest version of that file of The Program.
 
 A Recommendation on Modification Without Distribution
-
 -----------------------------------------------------
 
 It is wise never to modify a file of The Program, even for your own personal
@@ -134,7 +132,6 @@ ways to control the behavior of that program without altering its licensed
 files.
 
 Additional Conditions on Individual Files of The Program
-
 --------------------------------------------------------
 
 An individual file of The Program may bear additional conditions that supplement
@@ -146,7 +143,6 @@ of those files that is allowed, and with respect to the distribution of modified
 versions of those files.
 
 Additional Conditions on LaTeX Software Files
-
 ---------------------------------------------
 
 If a file of The Program is intended to be used with LaTeX (that is, if it
@@ -162,10 +158,8 @@ they generate.
 (LaTeX font definition files) under the standard conditions of the LPPL as
 described above. You may also distribute such modified LaTeX font definition
 files with their original names provided that:
-
 (1) the only changes to the original files either enable use of available
 fonts or prevent attempts to access unavailable fonts;
-
 (2) you also distribute the original, unmodified files (TeX input paths can
 be used to control which set of LaTeX font definition files is actually used
 by TeX).
@@ -181,7 +175,6 @@ LaTeX or of generally available contributed code for them, but such distribution
 can meet the conditions of this license.
 
 NO WARRANTY
-
 ===========
 
 There is no warranty for The Program. Except when otherwise stated in writing,
@@ -203,7 +196,6 @@ any other programs), even if The Copyright Holder or said author or said other
 party has been advised of the possibility of such damages.
 
 WHETHER AND HOW TO DISTRIBUTE PROGRAMS UNDER THIS LICENSE
-
 =========================================================
 
 This section contains important instructions, examples, and recommendations
@@ -211,7 +203,6 @@ for authors who are considering distributing their programs under this license.
 These authors are addressed as `you' in this section.
 
 Choosing This License or Another License
-
 ----------------------------------------
 
 If for any part of your program you want or need to use *distribution* conditions
@@ -229,7 +220,6 @@ may still be relevant, and authors intending to distribute their programs
 under any license are encouraged to read it.
 
 How to Use This License
-
 -----------------------
 
 To use this license, place in each of the files of your program both an explicit
@@ -239,29 +229,17 @@ in this license.
 
 Here is an example of such a notice and statement:
 
-%% pig.dtx
-
-%% Copyright 2001 M. Y. Name
-
-%
-
-% This program may be distributed and/or modified under the
-
-% conditions of the LaTeX Project Public License, either version 1.1
-
-% of this license or (at your option) any later version.
-
-% The latest version of this license is in
-
-% http://www.latex-project.org/lppl.txt
-
-% and version 1.1 or later is part of all distributions of LaTeX
-
-% version 1999/06/01 or later.
-
-%
-
-% This program consists of the files pig.dtx and pig.ins
+     %% pig.dtx
+     %% Copyright 2001 M. Y. Name
+     %
+     % This program may be distributed and/or modified under the
+     % conditions of the LaTeX Project Public License, either version 1.1
+     % of this license or (at your option) any later version.
+% The latest version of this license is in % http://www.latex-project.org/lppl.txt
+% and version 1.1 or later is part of all distributions of LaTeX % version
+1999/06/01 or later.
+     %
+     % This program consists of the files pig.dtx and pig.ins
 
 Given such a notice and statement in a file, the conditions given in this
 license document would apply, with `The Program' referring to the two files
@@ -269,7 +247,6 @@ license document would apply, with `The Program' referring to the two files
 `M. Y. Name'.
 
 Important Recommendations
-
 -------------------------
 
 Defining What Constitutes The Program
@@ -280,7 +257,7 @@ to determine which files constitute The Program. This could, for example,
 be achieved by explicitly listing all the files of The Program near the copyright
 notice of each file or by using a line like
 
-% This program consists of all files listed in manifest.txt.
+      % This program consists of all files listed in manifest.txt.
 
 in that place. In the absence of an unequivocal list it might be impossible
 for the licensee to determine what is considered by you to comprise The Program.
diff --git a/options/license/LPPL-1.2 b/options/license/LPPL-1.2
index 1bb8d0db47..4ea2857a24 100644
--- a/options/license/LPPL-1.2
+++ b/options/license/LPPL-1.2
@@ -1,14 +1,14 @@
 The LaTeX Project Public License
-
 =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 
-LPPL Version 1.2 1999-09-03 Copyright 1999 LaTeX3 Project
+LPPL Version 1.2 1999-09-03
+
+Copyright 1999 LaTeX3 Project
 
 Everyone is allowed to distribute verbatim copies of this license document,
 but modification of it is not allowed.
 
 PREAMBLE
-
 ========
 
 The LaTeX Project Public License (LPPL) is the license under which the base
@@ -46,7 +46,6 @@ your goal while meeting these conditions, then read the document `cfgguide.tex'
 in the base LaTeX distribution for suggestions.
 
 CONDITIONS ON DISTRIBUTION AND MODIFICATION
-
 ===========================================
 
 You may distribute a complete, unmodified copy of The Program. Distribution
@@ -85,7 +84,7 @@ the maintainers of the modified files.
 both of the modified file and of any files derived from the modified file
 with the filename of the original file.
 
-   8. You must do either (A) or (B):
+     8. You must do either (A) or (B):
 
 (A) distribute a copy of The Program (that is, a complete, unmodified copy
 of The Program) together with the modified file; if your distribution of the
@@ -119,6 +118,7 @@ The conditions above are not intended to prohibit, and hence do not apply
 to, the updating, by any method, of a file so that it becomes identical to
 the latest version of that file of The Program.
 
+
 A Recommendation on Modification Without Distribution -----------------------------------------------------
 
 It is wise never to modify a file of The Program, even for your own personal
@@ -143,7 +143,6 @@ of those files that is allowed, and with respect to the distribution of modified
 versions of those files.
 
 Additional Conditions on LaTeX Software Files
-
 ---------------------------------------------
 
 If a file of The Program is intended to be used with LaTeX (that is, if it
@@ -159,10 +158,8 @@ they generate.
 (LaTeX font definition files) under the standard conditions of the LPPL as
 described above. You may also distribute such modified LaTeX font definition
 files with their original names provided that:
-
 (1) the only changes to the original files either enable use of available
 fonts or prevent attempts to access unavailable fonts;
-
 (2) you also distribute the original, unmodified files (TeX input paths can
 be used to control which set of LaTeX font definition files is actually used
 by TeX).
@@ -178,7 +175,6 @@ LaTeX or of generally available contributed code for them, but such distribution
 can meet the conditions of this license.
 
 NO WARRANTY
-
 ===========
 
 There is no warranty for The Program. Except when otherwise stated in writing,
@@ -206,7 +202,6 @@ for authors who are considering distributing their programs under this license.
 These authors are addressed as `you' in this section.
 
 Choosing This License or Another License
-
 ----------------------------------------
 
 If for any part of your program you want or need to use *distribution* conditions
@@ -224,7 +219,6 @@ may still be relevant, and authors intending to distribute their programs
 under any license are encouraged to read it.
 
 How to Use This License
-
 -----------------------
 
 To use this license, place in each of the files of your program both an explicit
@@ -234,29 +228,18 @@ in this license.
 
 Here is an example of such a notice and statement:
 
-%% pig.dtx
-
-%% Copyright 2001 M. Y. Name
-
-%
-
-% This program may be distributed and/or modified under the
-
-% conditions of the LaTeX Project Public License, either version 1.2
-
-% of this license or (at your option) any later version.
-
-% The latest version of this license is in
-
-% http://www.latex-project.org/lppl.txt
-
-% and version 1.2 or later is part of all distributions of LaTeX
-
-% version 1999/12/01 or later.
-
-%
-
-% This program consists of the files pig.dtx and pig.ins
+     %% pig.dtx
+     %% Copyright 2001 M. Y. Name
+     %
+     % This program may be distributed and/or modified under the
+     % conditions of the LaTeX Project Public License, either version 1.2
+     % of this license or (at your option) any later version.
+     % The latest version of this license is in
+     % http://www.latex-project.org/lppl.txt
+     % and version 1.2 or later is part of all distributions of LaTeX
+     % version 1999/12/01 or later.
+     %
+     % This program consists of the files pig.dtx and pig.ins
 
 Given such a notice and statement in a file, the conditions given in this
 license document would apply, with `The Program' referring to the two files
@@ -264,7 +247,6 @@ license document would apply, with `The Program' referring to the two files
 `M. Y. Name'.
 
 Important Recommendations
-
 -------------------------
 
 Defining What Constitutes The Program
@@ -275,7 +257,7 @@ to determine which files constitute The Program. This could, for example,
 be achieved by explicitly listing all the files of The Program near the copyright
 notice of each file or by using a line like
 
-% This program consists of all files listed in manifest.txt.
+     % This program consists of all files listed in manifest.txt.
 
 in that place. In the absence of an unequivocal list it might be impossible
 for the licensee to determine what is considered by you to comprise The Program.
diff --git a/options/license/LPPL-1.3a b/options/license/LPPL-1.3a
index 2e4e567fcb..9fc8f424f4 100644
--- a/options/license/LPPL-1.3a
+++ b/options/license/LPPL-1.3a
@@ -1,14 +1,13 @@
 The LaTeX Project Public License
-
 =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 
-LPPL Version 1.3a 2004-10-01 Copyright 1999 2002-04 LaTeX3 Project
+LPPL Version 1.3a 2004-10-01
 
-Everyone is allowed to distribute verbatim copies of this license document,
-but modification of it is not allowed.
+Copyright 1999 2002-04 LaTeX3
+Project Everyone is allowed to distribute verbatim copies of this license
+document, but modification of it is not allowed.
 
 PREAMBLE
-
 ========
 
 The LaTeX Project Public License (LPPL) is the primary license under which
@@ -34,7 +33,6 @@ meeting these conditions, then read the document `cfgguide.tex' and `modguide.te
 in the base LaTeX distribution for suggestions.
 
 DEFINITIONS
-
 ===========
 
 In this license document the following terms are used:
@@ -73,7 +71,6 @@ is used interactively. Unless explicitly specified when applying the license
 to the Work, the only applicable Base Interpreter is a "LaTeX-Format".
 
 CONDITIONS ON DISTRIBUTION AND MODIFICATION
-
 ===========================================
 
 1. Activities other than distribution and/or modification of the Work are
@@ -126,7 +123,7 @@ any support, including (but not limited to) the reporting and handling of
 errors, to recipients of the Derived Work unless those persons have stated
 explicitly that they do provide such support for the Derived Work.
 
-      d. You distribute at least one of the following with the Derived Work:
+     d. You distribute at least one of the following with the Derived Work:
 
 1. A complete, unmodified copy of the Work; if your distribution of a modified
 component is made by offering access to copy the modified component from a
@@ -152,8 +149,7 @@ where the Work or that Derived Work (in whole or in part) is then produced
 by applying some process to that format, does not relax or nullify any sections
 of this license as they pertain to the results of applying that process.
 
-   10.
-
+10.
 a. A Derived Work may be distributed under a different license provided that
 license itself honors the conditions listed in Clause 6 above, in regard to
 the Work, though it does not have to honor the rest of the conditions in this
@@ -172,7 +168,6 @@ with the Work by any means.
 compliance by all parties with all applicable laws.
 
 NO WARRANTY
-
 ===========
 
 There is no warranty for the Work. Except when otherwise stated in writing,
@@ -194,7 +189,6 @@ said author or said other party has been advised of the possibility of such
 damages.
 
 MAINTENANCE OF THE WORK
-
 =======================
 
 The Work has the status `author-maintained' if the Copyright Holder explicitly
@@ -258,7 +252,6 @@ Maintainer. You should also announce your new status to the same pertinent
 community as in 2b) above.
 
 WHETHER AND HOW TO DISTRIBUTE WORKS UNDER THIS LICENSE
-
 ======================================================
 
 This section contains important instructions, examples, and recommendations
@@ -266,7 +259,6 @@ for authors who are considering distributing their works under this license.
 These authors are addressed as `you' in this section.
 
 Choosing This License or Another License
-
 ----------------------------------------
 
 If for any part of your work you want or need to use *distribution* conditions
@@ -284,7 +276,6 @@ may still be relevant, and authors intending to distribute their works under
 any license are encouraged to read it.
 
 A Recommendation on Modification Without Distribution
-
 -----------------------------------------------------
 
 It is wise never to modify a component of the Work, even for your own personal
@@ -300,7 +291,6 @@ ways to control the behavior of that work without altering any of its licensed
 components.
 
 How to Use This License
-
 -----------------------
 
 To use this license, place in each of the components of your work both an
@@ -311,39 +301,23 @@ this license.
 
 Here is an example of such a notice and statement:
 
-%% pig.dtx
-
-%% Copyright 2003 M. Y. Name
-
-%
-
-% This work may be distributed and/or modified under the
-
-% conditions of the LaTeX Project Public License, either version 1.3
-
-% of this license or (at your option) any later version.
-
-% The latest version of this license is in
-
-% http://www.latex-project.org/lppl.txt
-
-% and version 1.3 or later is part of all distributions of LaTeX
-
-% version 2003/12/01 or later.
-
-%
-
-% This work has the LPPL maintenance status " maintained ".
-
-%
-
-% This Current Maintainer of this work is M. Y. Name .
-
-%
-
-% This work consists of the files pig.dtx and pig.ins
-
-% and the derived file pig.sty .
+     %% pig.dtx
+     %% Copyright 2003 M. Y. Name
+     %
+     % This work may be distributed and/or modified under the
+     % conditions of the LaTeX Project Public License, either version 1.3
+     % of this license or (at your option) any later version.
+     % The latest version of this license is in
+     % http://www.latex-project.org/lppl.txt
+     % and version 1.3 or later is part of all distributions of LaTeX
+     % version 2003/12/01 or later.
+     %
+     % This work has the LPPL maintenance status "maintained".
+     %
+     % This Current Maintainer of this work is M. Y. Name.
+     %
+% This work consists of the files pig.dtx and pig.ins % and the derived file
+pig.sty.
 
 Given such a notice and statement in a file, the conditions given in this
 license document would apply, with the `Work' referring to the three files
@@ -359,7 +333,6 @@ ensure that your Work remains useful to the community even when you can no
 longer maintain and support it yourself.
 
 Important Recommendations
-
 -------------------------
 
 Defining What Constitutes the Work
@@ -370,7 +343,7 @@ to determine which files constitute the Work. This could, for example, be
 achieved by explicitly listing all the files of the Work near the copyright
 notice of each file or by using a line such as:
 
-% This work consists of all files listed in manifest.txt.
+      % This work consists of all files listed in manifest.txt.
 
 in that place. In the absence of an unequivocal list it might be impossible
 for the licensee to determine what is considered by you to comprise the Work
diff --git a/options/license/LPPL-1.3c b/options/license/LPPL-1.3c
index b62e36895f..63a078e11e 100644
--- a/options/license/LPPL-1.3c
+++ b/options/license/LPPL-1.3c
@@ -1,14 +1,14 @@
 The LaTeX Project Public License
-
 =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 
-LPPL Version 1.3c 2008-05-04 Copyright 1999 2002-2008 LaTeX3 Project
+LPPL Version 1.3c 2008-05-04
+
+Copyright 1999 2002-2008 LaTeX3 Project
 
 Everyone is allowed to distribute verbatim copies of this license document,
 but modification of it is not allowed.
 
 PREAMBLE
-
 ========
 
 The LaTeX Project Public License (LPPL) is the primary license under which
@@ -34,7 +34,6 @@ meeting these conditions, then read the document `cfgguide.tex' and `modguide.te
 in the base LaTeX distribution for suggestions.
 
 DEFINITIONS
-
 ===========
 
 In this license document the following terms are used:
@@ -76,7 +75,6 @@ is a `LaTeX-Format' or in the case of files belonging to the `LaTeX-format'
 a program implementing the `TeX language'.
 
 CONDITIONS ON DISTRIBUTION AND MODIFICATION
-
 ===========================================
 
 1. Activities other than distribution and/or modification of the Work are
@@ -129,7 +127,7 @@ any support, including (but not limited to) the reporting and handling of
 errors, to recipients of the Derived Work unless those persons have stated
 explicitly that they do provide such support for the Derived Work.
 
-      d. You distribute at least one of the following with the Derived Work:
+     d. You distribute at least one of the following with the Derived Work:
 
 1. A complete, unmodified copy of the Work; if your distribution of a modified
 component is made by offering access to copy the modified component from a
@@ -155,8 +153,7 @@ where the Work or that Derived Work (in whole or in part) is then produced
 by applying some process to that format, does not relax or nullify any sections
 of this license as they pertain to the results of applying that process.
 
-   10.
-
+10.
 a. A Derived Work may be distributed under a different license provided that
 license itself honors the conditions listed in Clause 6 above, in regard to
 the Work, though it does not have to honor the rest of the conditions in this
@@ -175,7 +172,6 @@ with the Work by any means.
 compliance by all parties with all applicable laws.
 
 NO WARRANTY
-
 ===========
 
 There is no warranty for the Work. Except when otherwise stated in writing,
@@ -197,7 +193,6 @@ said author or said other party has been advised of the possibility of such
 damages.
 
 MAINTENANCE OF THE WORK
-
 =======================
 
 The Work has the status `author-maintained' if the Copyright Holder explicitly
@@ -261,7 +256,6 @@ Maintainer. You should also announce your new status to the same pertinent
 community as in 2b) above.
 
 WHETHER AND HOW TO DISTRIBUTE WORKS UNDER THIS LICENSE
-
 ======================================================
 
 This section contains important instructions, examples, and recommendations
@@ -269,7 +263,6 @@ for authors who are considering distributing their works under this license.
 These authors are addressed as `you' in this section.
 
 Choosing This License or Another License
-
 ----------------------------------------
 
 If for any part of your work you want or need to use *distribution* conditions
@@ -287,7 +280,6 @@ may still be relevant, and authors intending to distribute their works under
 any license are encouraged to read it.
 
 A Recommendation on Modification Without Distribution
-
 -----------------------------------------------------
 
 It is wise never to modify a component of the Work, even for your own personal
@@ -303,7 +295,6 @@ ways to control the behavior of that work without altering any of its licensed
 components.
 
 How to Use This License
-
 -----------------------
 
 To use this license, place in each of the components of your work both an
@@ -314,39 +305,23 @@ this license.
 
 Here is an example of such a notice and statement:
 
-%% pig.dtx
-
-%% Copyright 2005 M. Y. Name
-
-%
-
-% This work may be distributed and/or modified under the
-
-% conditions of the LaTeX Project Public License, either version 1.3
-
-% of this license or (at your option) any later version.
-
-% The latest version of this license is in
-
-% http://www.latex-project.org/lppl.txt
-
-% and version 1.3 or later is part of all distributions of LaTeX
-
-% version 2005/12/01 or later.
-
-%
-
-% This work has the LPPL maintenance status " maintained ".
-
-%
-
-% The Current Maintainer of this work is M. Y. Name .
-
-%
-
-% This work consists of the files pig.dtx and pig.ins
-
-% and the derived file pig.sty .
+     %% pig.dtx
+     %% Copyright 2005 M. Y. Name
+     %
+     % This work may be distributed and/or modified under the
+     % conditions of the LaTeX Project Public License, either version 1.3
+     % of this license or (at your option) any later version.
+     % The latest version of this license is in
+     % http://www.latex-project.org/lppl.txt
+     % and version 1.3 or later is part of all distributions of LaTeX
+     % version 2005/12/01 or later.
+     %
+     % This work has the LPPL maintenance status `maintained'.
+     %
+     % The Current Maintainer of this work is M. Y. Name.
+     %
+     % This work consists of the files pig.dtx and pig.ins
+     % and the derived file pig.sty.
 
 Given such a notice and statement in a file, the conditions given in this
 license document would apply, with the `Work' referring to the three files
@@ -362,7 +337,6 @@ ensure that your Work remains useful to the community even when you can no
 longer maintain and support it yourself.
 
 Derived Works That Are Not Replacements
-
 ---------------------------------------
 
 Several clauses of the LPPL specify means to provide reliability and stability
@@ -373,7 +347,6 @@ are reused for a completely different task), then clauses 6b and 6d shall
 not apply.
 
 Important Recommendations
-
 -------------------------
 
 Defining What Constitutes the Work
@@ -384,7 +357,7 @@ to determine which files constitute the Work. This could, for example, be
 achieved by explicitly listing all the files of the Work near the copyright
 notice of each file or by using a line such as:
 
-% This work consists of all files listed in manifest.txt.
+     % This work consists of all files listed in manifest.txt.
 
 in that place. In the absence of an unequivocal list it might be impossible
 for the licensee to determine what is considered by you to comprise the Work
diff --git a/options/license/LZMA-exception b/options/license/LZMA-exception
index f92451e599..6fc9c1352b 100644
--- a/options/license/LZMA-exception
+++ b/options/license/LZMA-exception
@@ -1,3 +1,3 @@
-I.6 Special exception for LZMA compression module LZMA exception
+I.6 Special exception for LZMA compression module
 
 Igor Pavlov and Amir Szekely, the authors of the LZMA compression module for NSIS, expressly permit you to statically or dynamically link your code (or bind by name) to the files from the LZMA compression module for NSIS without subjecting your linked code to the terms of the Common Public license version 1.0. Any modifications or additions to files from the LZMA compression module for NSIS, however, are subject to the terms of the Common Public License version 1.0.
diff --git a/options/license/Latex2e b/options/license/Latex2e
index 462bf6f3a9..8f51749c59 100644
--- a/options/license/Latex2e
+++ b/options/license/Latex2e
@@ -1,7 +1,5 @@
 Copyright (C) 2007, 2008, 2009, 2010 Karl Berry.
-
 Copyright (C) 1988, 1994, 2007 Stephen Gilmore.
-
 Copyright (C) 1994, 1995, 1996 Torsten Martinsen.
 
 Permission is granted to make and distribute verbatim copies of this manual
diff --git a/options/license/Leptonica b/options/license/Leptonica
index ccf9fe7401..0792546f13 100644
--- a/options/license/Leptonica
+++ b/options/license/Leptonica
@@ -1,17 +1,15 @@
-Copyright (C) 2001 Leptonica. All rights reserved.
+Copyright (C) 2001 Leptonica.  All rights reserved.
 
 This software is distributed in the hope that it will be useful, but with
 NO WARRANTY OF ANY KIND.
 
 No author or distributor accepts responsibility to anyone for the consequences
 of using this software, or for whether it serves any particular purpose or
-works at all, unless he or she says so in writing. Everyone is granted permission
+works at all, unless he or she says so in writing.  Everyone is granted permission
 to copy, modify and redistribute this source code, for commercial or non-commercial
 purposes, with the following restrictions:
 
-   (1) the origin of this source code must not be misrepresented;
-
-   (2) modified versions must be plainly marked as such; and
-
+(1) the origin of this source code must not be misrepresented;
+(2) modified versions must be plainly marked as such; and
 (3) this notice may not be removed or altered from any source or modified
 source distribution.
diff --git a/options/license/LiLiQ-P-1.1 b/options/license/LiLiQ-P-1.1
index fb29669714..f391f7f13b 100644
--- a/options/license/LiLiQ-P-1.1
+++ b/options/license/LiLiQ-P-1.1
@@ -2,63 +2,48 @@ Licence Libre du Québec – Permissive (LiLiQ-P)
 
 Version 1.1
 
-   1. Préambule
-
+1. Préambule
 Cette licence s'applique à tout logiciel distribué dont le titulaire du droit
 d'auteur précise qu'il est sujet aux termes de la Licence Libre du Québec
 – Permissive (LiLiQ-P) (ci-après appelée la « licence »).
 
-   2. Définitions
-
+2. Définitions
 Dans la présente licence, à moins que le contexte n'indique un sens différent,
 on entend par:
 
 « concédant » : le titulaire du droit d'auteur sur le logiciel, ou toute personne
 dûment autorisée par ce dernier à accorder la présente licence;
-
 « contributeur » : le titulaire du droit d'auteur ou toute personne autorisée
 par ce dernier à soumettre au concédant une contribution. Un contributeur
 dont sa contribution est incorporée au logiciel est considéré comme un concédant
 en regard de sa contribution;
-
 « contribution » : tout logiciel original, ou partie de logiciel original
 soumis et destiné à être incorporé dans le logiciel;
-
-   « distribution » : le fait de délivrer une copie du logiciel;
-
+     « distribution » : le fait de délivrer une copie du logiciel;
 « licencié » : toute personne qui possède une copie du logiciel et qui exerce
 les droits concédés par la licence;
-
 « logiciel » : une œuvre protégée par le droit d'auteur, telle qu'un programme
 d'ordinateur et sa documentation, pour laquelle le titulaire du droit d'auteur
 a précisé qu'elle est sujette aux termes de la présente licence;
-
 « logiciel dérivé » : tout logiciel original réalisé par un licencié, autre
 que le logiciel ou un logiciel modifié, qui produit ou reproduit la totalité
 ou une partie importante du logiciel;
-
 « logiciel modifié » : toute modification par un licencié de l'un des fichiers
 source du logiciel ou encore tout nouveau fichier source qui incorpore le
 logiciel ou une partie importante de ce dernier.
 
-   3. Licence de droit d'auteur
-
+3. Licence de droit d'auteur
 Sous réserve des termes de la licence, le concédant accorde au licencié une
-licence non exclusive et libre de redevances lui permettant d'exercer les
+licence non exclusive et libre de redevances lui permettant d’exercer les
 droits suivants sur le logiciel :
 
-      1  Produire ou reproduire la totalité ou une partie importante;
-
-2  Exécuter ou représenter la totalité ou une partie importante en public;
-
-      3  Publier la totalité ou une partie importante;
-
-4  Sous-licencier sous une autre licence libre, approuvée ou certifiée par
+     1 Produire ou reproduire la totalité ou une partie importante;
+     2 Exécuter ou représenter la totalité ou une partie importante en public;
+     3 Publier la totalité ou une partie importante;
+4 Sous-licencier sous une autre licence libre, approuvée ou certifiée par
 la Free Software Foundation ou l'Open Source Initiative.
 
-   
-
-   Cette licence est accordée sans limite territoriale et sans limite de temps.
+Cette licence est accordée sans limite territoriale et sans limite de temps.
 
 L'exercice complet de ces droits est sujet à la distribution par le concédant
 du code source du logiciel, lequel doit être sous une forme permettant d'y
@@ -67,42 +52,29 @@ accompagné d'une offre de distribuer le code source du logiciel, sans frais
 supplémentaires, autres que ceux raisonnables afin de permettre la livraison
 du code source. Cette offre doit être valide pendant une durée raisonnable.
 
-   4. Distribution
-
+4. Distribution
 Le licencié peut distribuer des copies du logiciel, d'un logiciel modifié
 ou dérivé, sous réserve de respecter les conditions suivantes :
 
-   
-
-      1  Le logiciel doit être accompagné d'un exemplaire de cette licence;
-
-2  Si le logiciel a été modifié, le licencié doit en faire la mention, de
-préférence dans chacun des fichiers modifiés dont la nature permet une telle
-mention;
-
-3  Les étiquettes ou mentions faisant état des droits d'auteur, des marques
+     1 Le logiciel doit être accompagné d'un exemplaire de cette licence;
+2 Si le logiciel a été modifié, le licencié doit en faire la mention, de préférence
+dans chacun des fichiers modifiés dont la nature permet une telle mention;
+3 Les étiquettes ou mentions faisant état des droits d'auteur, des marques
 de commerce, des garanties ou de la paternité concernant le logiciel ne doivent
 pas être modifiées ou supprimées, à moins que ces étiquettes ou mentions ne
 soient inapplicables à un logiciel modifié ou dérivé donné.
 
-   
-
-   5.
-
-   Contributions
-
+5. Contributions
 Sous réserve d'une entente distincte, toute contribution soumise par un contributeur
 au concédant pour inclusion dans le logiciel sera soumise aux termes de cette
 licence.
 
-   6. Marques de commerce
-
+6. Marques de commerce
 La licence n'accorde aucune permission particulière qui permettrait d'utiliser
 les marques de commerce du concédant, autre que celle requise permettant d'identifier
 la provenance du logiciel.
 
-   7. Garanties
-
+7. Garanties
 Sauf mention contraire, le concédant distribue le logiciel sans aucune garantie,
 aux risques et périls de l'acquéreur de la copie du logiciel, et ce, sans
 assurer que le logiciel puisse répondre à un besoin particulier ou puisse
@@ -111,8 +83,7 @@ donner un résultat quelconque.
 Sans lier le concédant d'une quelconque manière, rien n'empêche un licencié
 d'offrir ou d'exclure des garanties ou du support.
 
-   8. Responsabilité
-
+8. Responsabilité
 Le licencié est responsable de tout préjudice résultant de l'exercice des
 droits accordés par la licence.
 
@@ -120,8 +91,7 @@ Le concédant ne saurait être tenu responsable de dommages subis par le licenci
 ou par des tiers, pour quelque cause que ce soit en lien avec la licence et
 les droits qui y sont accordés.
 
-   9. Résiliation
-
+9. Résiliation
 La présente licence est automatiquement résiliée dès que les droits qui y
 sont accordés ne sont pas exercés conformément aux termes qui y sont stipulés.
 
@@ -132,8 +102,7 @@ la licence est accordée de nouveau.
 Pour tout défaut subséquent, le consentement exprès du concédant est nécessaire
 afin que la licence soit accordée de nouveau.
 
-   10. Version de la licence
-
+10. Version de la licence
 Le Centre de services partagés du Québec, ses ayants cause ou toute personne
 qu'il désigne, peuvent diffuser des versions révisées ou modifiées de cette
 licence. Chaque version recevra un numéro unique. Si un logiciel est déjà
@@ -144,8 +113,7 @@ Le concédant peut aussi choisir de concéder la licence sous la version actuell
 ou toute version ultérieure, auquel cas le licencié peut choisir sous quelle
 version la licence lui est accordée.
 
-   11. Divers
-
+11. Divers
 Dans la mesure où le concédant est un ministère, un organisme public ou une
 personne morale de droit public, créés en vertu d'une loi de l'Assemblée nationale
 du Québec, la licence est régie par le droit applicable au Québec et en cas
diff --git a/options/license/LiLiQ-R-1.1 b/options/license/LiLiQ-R-1.1
index 8be42577e6..774cefb215 100644
--- a/options/license/LiLiQ-R-1.1
+++ b/options/license/LiLiQ-R-1.1
@@ -2,60 +2,46 @@ Licence Libre du Québec – Réciprocité (LiLiQ-R)
 
 Version 1.1
 
-   1. Préambule
-
+1. Préambule
 Cette licence s'applique à tout logiciel distribué dont le titulaire du droit
 d'auteur précise qu'il est sujet aux termes de la Licence Libre du Québec
 – Réciprocité (LiLiQ-R) (ci-après appelée la « licence »).
 
-   2. Définitions
-
+2. Définitions
 Dans la présente licence, à moins que le contexte n'indique un sens différent,
 on entend par:
 
 « concédant » : le titulaire du droit d'auteur sur le logiciel, ou toute personne
 dûment autorisée par ce dernier à accorder la présente licence;
-
 « contributeur » : le titulaire du droit d'auteur ou toute personne autorisée
 par ce dernier à soumettre au concédant une contribution. Un contributeur
 dont sa contribution est incorporée au logiciel est considéré comme un concédant
 en regard de sa contribution;
-
 « contribution » : tout logiciel original, ou partie de logiciel original
 soumis et destiné à être incorporé dans le logiciel;
-
-   « distribution » : le fait de délivrer une copie du logiciel;
-
+     « distribution » : le fait de délivrer une copie du logiciel;
 « licencié » : toute personne qui possède une copie du logiciel et qui exerce
 les droits concédés par la licence;
-
 « logiciel » : une œuvre protégée par le droit d'auteur, telle qu'un programme
 d'ordinateur et sa documentation, pour laquelle le titulaire du droit d'auteur
 a précisé qu'elle est sujette aux termes de la présente licence;
-
 « logiciel dérivé » : tout logiciel original réalisé par un licencié, autre
 que le logiciel ou un logiciel modifié, qui produit ou reproduit la totalité
 ou une partie importante du logiciel;
-
 « logiciel modifié » : toute modification par un licencié de l'un des fichiers
 source du logiciel ou encore tout nouveau fichier source qui incorpore le
 logiciel ou une partie importante de ce dernier.
 
-   3. Licence de droit d'auteur
-
+3. Licence de droit d'auteur
 Sous réserve des termes de la licence, le concédant accorde au licencié une
-licence non exclusive et libre de redevances lui permettant d'exercer les
+licence non exclusive et libre de redevances lui permettant d’exercer les
 droits suivants sur le logiciel :
 
-      1  Produire ou reproduire la totalité ou une partie importante;
+     1 Produire ou reproduire la totalité ou une partie importante;
+     2 Exécuter ou représenter la totalité ou une partie importante en public;
+     3 Publier la totalité ou une partie importante.
 
-2  Exécuter ou représenter la totalité ou une partie importante en public;
-
-      3  Publier la totalité ou une partie importante.
-
-   
-
-   Cette licence est accordée sans limite territoriale et sans limite de temps.
+Cette licence est accordée sans limite territoriale et sans limite de temps.
 
 L'exercice complet de ces droits est sujet à la distribution par le concédant
 du code source du logiciel, lequel doit être sous une forme permettant d'y
@@ -64,24 +50,19 @@ accompagné d'une offre de distribuer le code source du logiciel, sans frais
 supplémentaires, autres que ceux raisonnables afin de permettre la livraison
 du code source. Cette offre doit être valide pendant une durée raisonnable.
 
-   4. Distribution
-
+4. Distribution
 Le licencié peut distribuer des copies du logiciel, d'un logiciel modifié
 ou dérivé, sous réserve de respecter les conditions suivantes :
 
-      1  Le logiciel doit être accompagné d'un exemplaire de cette licence;
-
-2  Si le logiciel a été modifié, le licencié doit en faire la mention, de
-préférence dans chacun des fichiers modifiés dont la nature permet une telle
-mention;
-
-3  Les étiquettes ou mentions faisant état des droits d'auteur, des marques
+     1 Le logiciel doit être accompagné d'un exemplaire de cette licence;
+2 Si le logiciel a été modifié, le licencié doit en faire la mention, de préférence
+dans chacun des fichiers modifiés dont la nature permet une telle mention;
+3 Les étiquettes ou mentions faisant état des droits d'auteur, des marques
 de commerce, des garanties ou de la paternité concernant le logiciel ne doivent
 pas être modifiées ou supprimées, à moins que ces étiquettes ou mentions ne
 soient inapplicables à un logiciel modifié ou dérivé donné.
 
-   4.1. Réciprocité
-
+4.1. Réciprocité
 Chaque fois que le licencié distribue le logiciel, le concédant offre au récipiendaire
 une concession sur le logiciel selon les termes de la présente licence. Le
 licencié doit offrir une concession selon les termes de la présente licence
@@ -91,8 +72,7 @@ Chaque fois que le licencié distribue le logiciel ou un logiciel modifié,
 ce dernier doit assumer l'obligation d'en distribuer le code source, de la
 manière prévue au troisième alinéa de l'article 3.
 
-   4.2. Compatibilité
-
+4.2. Compatibilité
 Dans la mesure où le licencié souhaite distribuer un logiciel modifié combiné
 à un logiciel assujetti à une licence compatible, mais dont il ne serait pas
 possible d'en respecter les termes, le concédant offre, en plus de la présente
@@ -109,44 +89,30 @@ ou certifiée par la Free Software Foundation ou l'Open Source Initiative,
 dont le niveau de réciprocité est comparable ou supérieur à celui de la présente
 licence, sans toutefois être moindre, notamment :
 
-      1  Common Development and Distribution License (CDDL-1.0)
-
-      2  Common Public License Version 1.0 (CPL-1.0)
-
-      3  Contrat de licence de logiciel libre CeCILL, version 2.1 (CECILL-2.1)
-
-      4  Contrat de licence de logiciel libre CeCILL-C (CECILL-C)
-
-      5  Eclipse Public License - v 1.0 (EPL-1.0)
-
-      6  European Union Public License, version 1.1 (EUPL v. 1.1)
-
-      7  Licence Libre du Québec – Réciprocité forte version 1.1 (LiLiQ-R+ 1.1)
-
-      8  GNU General Public License Version 2 (GNU GPLv2)
-
-      9  GNU General Public License Version 3 (GNU GPLv3)
-
-      10  GNU Lesser General Public License Version 2.1 (GNU LGPLv2.1)
-
-      11  GNU Lesser General Public License Version 3 (GNU LGPLv3)
-
-      12  Mozilla Public License Version 2.0 (MPL-2.0)
-
-   5. Contributions
+     1 Common Development and Distribution License (CDDL-1.0)
+     2 Common Public License Version 1.0 (CPL-1.0)
+     3 Contrat de licence de logiciel libre CeCILL, version 2.1 (CECILL-2.1)
+     4 Contrat de licence de logiciel libre CeCILL-C (CECILL-C)
+     5 Eclipse Public License - v 1.0 (EPL-1.0)
+     6 European Union Public License, version 1.1 (EUPL v. 1.1)
+     7 Licence Libre du Québec – Réciprocité forte version 1.1 (LiLiQ-R+ 1.1)
+     8 GNU General Public License Version 2 (GNU GPLv2)
+     9 GNU General Public License Version 3 (GNU GPLv3)
+     10 GNU Lesser General Public License Version 2.1 (GNU LGPLv2.1)
+     11 GNU Lesser General Public License Version 3 (GNU LGPLv3)
+     12 Mozilla Public License Version 2.0 (MPL-2.0)
 
+5. Contributions
 Sous réserve d'une entente distincte, toute contribution soumise par un contributeur
 au concédant pour inclusion dans le logiciel sera soumise aux termes de cette
 licence.
 
-   6. Marques de commerce
-
+6. Marques de commerce
 La licence n'accorde aucune permission particulière qui permettrait d'utiliser
 les marques de commerce du concédant, autre que celle requise permettant d'identifier
 la provenance du logiciel.
 
-   7. Garanties
-
+7. Garanties
 Sauf mention contraire, le concédant distribue le logiciel sans aucune garantie,
 aux risques et périls de l'acquéreur de la copie du logiciel, et ce, sans
 assurer que le logiciel puisse répondre à un besoin particulier ou puisse
@@ -155,8 +121,7 @@ donner un résultat quelconque.
 Sans lier le concédant d'une quelconque manière, rien n'empêche un licencié
 d'offrir ou d'exclure des garanties ou du support.
 
-   8. Responsabilité
-
+8. Responsabilité
 Le licencié est responsable de tout préjudice résultant de l'exercice des
 droits accordés par la licence.
 
@@ -164,8 +129,7 @@ Le concédant ne saurait être tenu responsable du préjudice subi par le licenc
 ou par des tiers, pour quelque cause que ce soit en lien avec la licence et
 les droits qui y sont accordés.
 
-   9. Résiliation
-
+9. Résiliation
 La présente licence est résiliée de plein droit dès que les droits qui y sont
 accordés ne sont pas exercés conformément aux termes qui y sont stipulés.
 
@@ -176,8 +140,7 @@ la licence est accordée de nouveau.
 Pour tout défaut subséquent, le consentement exprès du concédant est nécessaire
 afin que la licence soit accordée de nouveau.
 
-   10. Version de la licence
-
+10. Version de la licence
 Le Centre de services partagés du Québec, ses ayants cause ou toute personne
 qu'il désigne, peuvent diffuser des versions révisées ou modifiées de cette
 licence. Chaque version recevra un numéro unique. Si un logiciel est déjà
@@ -188,8 +151,7 @@ Le concédant peut aussi choisir de concéder la licence sous la version actuell
 ou toute version ultérieure, auquel cas le licencié peut choisir sous quelle
 version la licence lui est accordée.
 
-   11. Divers
-
+11. Divers
 Dans la mesure où le concédant est un ministère, un organisme public ou une
 personne morale de droit public, créés en vertu d'une loi de l'Assemblée nationale
 du Québec, la licence est régie par le droit applicable au Québec et en cas
diff --git a/options/license/LiLiQ-Rplus-1.1 b/options/license/LiLiQ-Rplus-1.1
index bf5c04c2a4..7891337fca 100644
--- a/options/license/LiLiQ-Rplus-1.1
+++ b/options/license/LiLiQ-Rplus-1.1
@@ -2,58 +2,46 @@ Licence Libre du Québec – Réciprocité forte (LiLiQ-R+)
 
 Version 1.1
 
-   1. Préambule
-
+1. Préambule
 Cette licence s'applique à tout logiciel distribué dont le titulaire du droit
 d'auteur précise qu'il est sujet aux termes de la Licence Libre du Québec
 – Réciprocité forte (LiLiQ-R+) (ci-après appelée la « licence »).
 
-   2. Définitions
-
+2. Définitions
 Dans la présente licence, à moins que le contexte n'indique un sens différent,
 on entend par:
 
-« concédant » : le titulaire du droit d'auteur sur le logiciel, ou toute personne
+« concédant » : le titulaire du droit d'auteur sur le logiciel, ou toute personne
 dûment autorisée par ce dernier à accorder la présente licence;
-
-« contributeur » : le titulaire du droit d'auteur ou toute personne autorisée
+« contributeur » : le titulaire du droit d'auteur ou toute personne autorisée
 par ce dernier à soumettre au concédant une contribution. Un contributeur
 dont sa contribution est incorporée au logiciel est considéré comme un concédant
 en regard de sa contribution;
-
-« contribution » : tout logiciel original, ou partie de logiciel original
+« contribution » : tout logiciel original, ou partie de logiciel original
 soumis et destiné à être incorporé dans le logiciel;
-
-   « distribution » : le fait de délivrer une copie du logiciel;
-
-« licencié » : toute personne qui possède une copie du logiciel et qui exerce
+     « distribution » : le fait de délivrer une copie du logiciel;
+« licencié » : toute personne qui possède une copie du logiciel et qui exerce
 les droits concédés par la licence;
-
-« logiciel » : une œuvre protégée par le droit d'auteur, telle qu'un programme
+« logiciel » : une œuvre protégée par le droit d'auteur, telle qu'un programme
 d'ordinateur et sa documentation, pour laquelle le titulaire du droit d'auteur
 a précisé qu'elle est sujette aux termes de la présente licence;
-
-« logiciel dérivé » : tout logiciel original réalisé par un licencié, autre
+« logiciel dérivé » : tout logiciel original réalisé par un licencié, autre
 que le logiciel ou un logiciel modifié, qui produit ou reproduit la totalité
 ou une partie importante du logiciel;
-
-« logiciel modifié » : toute modification par un licencié de l'un des fichiers
+« logiciel modifié » : toute modification par un licencié de l'un des fichiers
 source du logiciel ou encore tout nouveau fichier source qui incorpore le
 logiciel ou une partie importante de ce dernier.
 
-   3. Licence de droit d'auteur
-
+3. Licence de droit d'auteur
 Sous réserve des termes de la licence, le concédant accorde au licencié une
-licence non exclusive et libre de redevances lui permettant d'exercer les
-droits suivants sur le logiciel:
+licence non exclusive et libre de redevances lui permettant d’exercer les
+droits suivants sur le logiciel :
 
-      1 Produire ou reproduire la totalité ou une partie importante;
+     1 Produire ou reproduire la totalité ou une partie importante;
+     2 Exécuter ou représenter la totalité ou une partie importante en public;
+     3 Publier la totalité ou une partie importante.
 
-      2 Exécuter ou représenter la totalité ou une partie importante en public;
-
-      3 Publier la totalité ou une partie importante.
-
-   Cette licence est accordée sans limite territoriale et sans limite de temps.
+Cette licence est accordée sans limite territoriale et sans limite de temps.
 
 L'exercice complet de ces droits est sujet à la distribution par le concédant
 du code source du logiciel, lequel doit être sous une forme permettant d'y
@@ -62,23 +50,19 @@ accompagné d'une offre de distribuer le code source du logiciel, sans frais
 supplémentaires, autres que ceux raisonnables afin de permettre la livraison
 du code source. Cette offre doit être valide pendant une durée raisonnable.
 
-   4. Distribution
-
+4. Distribution
 Le licencié peut distribuer des copies du logiciel, d'un logiciel modifié
 ou dérivé, sous réserve de respecter les conditions suivantes :
 
-      1 Le logiciel doit être accompagné d'un exemplaire de cette licence;
-
-2 Si le logiciel a été modifié, le licencié doit en faire la mention, de préférence
+     1 Le logiciel doit être accompagné d'un exemplaire de cette licence;
+2 Si le logiciel a été modifié, le licencié doit en faire la mention, de préférence
 dans chacun des fichiers modifiés dont la nature permet une telle mention;
-
-3 Les étiquettes ou mentions faisant état des droits d'auteur, des marques
+3 Les étiquettes ou mentions faisant état des droits d'auteur, des marques
 de commerce, des garanties ou de la paternité concernant le logiciel ne doivent
 pas être modifiées ou supprimées, à moins que ces étiquettes ou mentions ne
 soient inapplicables à un logiciel modifié ou dérivé donné.
 
-   4.1. Réciprocité
-
+4.1. Réciprocité
 Chaque fois que le licencié distribue le logiciel, le concédant offre au récipiendaire
 une concession sur le logiciel selon les termes de la présente licence. Le
 licencié doit offrir une concession selon les termes de la présente licence
@@ -88,8 +72,7 @@ Chaque fois que le licencié distribue le logiciel, un logiciel modifié, ou
 un logiciel dérivé, ce dernier doit assumer l'obligation d'en distribuer le
 code source, de la manière prévue au troisième alinéa de l'article 3.
 
-   4.2. Compatibilité
-
+4.2. Compatibilité
 Dans la mesure où le licencié souhaite distribuer un logiciel modifié ou dérivé
 combiné à un logiciel assujetti à une licence compatible, mais dont il ne
 serait pas possible d'en respecter les termes, le concédant offre, en plus
@@ -105,34 +88,26 @@ compatible.
 Est considérée comme une licence compatible toute licence libre approuvée
 ou certifiée par la Free Software Foundation ou l'Open Source Initiative,
 dont le niveau de réciprocité est comparable à celui de la présente licence,
-sans toutefois être moindre, notamment:
+sans toutefois être moindre, notamment :
 
-      1 Common Public License Version 1.0 (CPL-1.0)
-
-      2 Contrat de licence de logiciel libre CeCILL, version 2.1 (CECILL-2.1)
-
-      3 Eclipse Public License - v 1.0 (EPL-1.0)
-
-      4 European Union Public License, version 1.1 (EUPL v. 1.1)
-
-      5 GNU General Public License Version 2 (GNU GPLv2)
-
-      6 GNU General Public License Version 3 (GNU GPLv3)
-
-   5. Contributions
+     1 Common Public License Version 1.0 (CPL-1.0)
+     2 Contrat de licence de logiciel libre CeCILL, version 2.1 (CECILL-2.1)
+     3 Eclipse Public License - v 1.0 (EPL-1.0)
+     4 European Union Public License, version 1.1 (EUPL v. 1.1)
+     5 GNU General Public License Version 2 (GNU GPLv2)
+     6 GNU General Public License Version 3 (GNU GPLv3)
 
+5. Contributions
 Sous réserve d'une entente distincte, toute contribution soumise par un contributeur
 au concédant pour inclusion dans le logiciel sera soumise aux termes de cette
 licence.
 
-   6. Marques de commerce
-
+6. Marques de commerce
 La licence n'accorde aucune permission particulière qui permettrait d'utiliser
 les marques de commerce du concédant, autre que celle requise permettant d'identifier
 la provenance du logiciel.
 
-   7. Garanties
-
+7. Garanties
 Sauf mention contraire, le concédant distribue le logiciel sans aucune garantie,
 aux risques et périls de l'acquéreur de la copie du logiciel, et ce, sans
 assurer que le logiciel puisse répondre à un besoin particulier ou puisse
@@ -141,8 +116,7 @@ donner un résultat quelconque.
 Sans lier le concédant d'une quelconque manière, rien n'empêche un licencié
 d'offrir ou d'exclure des garanties ou du support.
 
-   8. Responsabilité
-
+8. Responsabilité
 Le licencié est responsable de tout préjudice résultant de l'exercice des
 droits accordés par la licence.
 
@@ -150,8 +124,7 @@ Le concédant ne saurait être tenu responsable du préjudice subi par le licenc
 ou par des tiers, pour quelque cause que ce soit en lien avec la licence et
 les droits qui y sont accordés.
 
-   9. Résiliation
-
+9. Résiliation
 La présente licence est résiliée de plein droit dès que les droits qui y sont
 accordés ne sont pas exercés conformément aux termes qui y sont stipulés.
 
@@ -162,8 +135,7 @@ la licence est accordée de nouveau.
 Pour tout défaut subséquent, le consentement exprès du concédant est nécessaire
 afin que la licence soit accordée de nouveau.
 
-   10. Version de la licence
-
+10. Version de la licence
 Le Centre de services partagés du Québec, ses ayants cause ou toute personne
 qu'il désigne, peuvent diffuser des versions révisées ou modifiées de cette
 licence. Chaque version recevra un numéro unique. Si un logiciel est déjà
@@ -174,8 +146,7 @@ Le concédant peut aussi choisir de concéder la licence sous la version actuell
 ou toute version ultérieure, auquel cas le licencié peut choisir sous quelle
 version la licence lui est accordée.
 
-   11. Divers
-
+11. Divers
 Dans la mesure où le concédant est un ministère, un organisme public ou une
 personne morale de droit public, créés en vertu d'une loi de l'Assemblée nationale
 du Québec, la licence est régie par le droit applicable au Québec et en cas
diff --git a/options/license/Libpng b/options/license/Libpng
index 4b8f0725aa..47cc86efd3 100644
--- a/options/license/Libpng
+++ b/options/license/Libpng
@@ -1,4 +1,4 @@
-This copy of the libpng notices is provided for your convenience. In case
+This copy of the libpng notices is provided for your convenience.  In case
 of any discrepancy between this copy and the notices in the file png.h that
 is included in the libpng distribution, the latter shall prevail.
 
@@ -14,77 +14,59 @@ Copyright (c) 2004, 2006-2010 Glenn Randers-Pehrson, and are distributed accordi
 to the same disclaimer and license as libpng-1.2.5 with the following individual
 added to the list of Contributing Authors
 
-Cosmin Truta
+     Cosmin Truta
 
 libpng versions 1.0.7, July 1, 2000, through 1.2.5 - October 3, 2002, are
-
 Copyright (c) 2000-2002 Glenn Randers-Pehrson, and are distributed according
 to the same disclaimer and license as libpng-1.0.6 with the following individuals
 added to the list of Contributing Authors
 
-Simon-Pierre Cadieux
-
-Eric S. Raymond
-
-Gilles Vollant
+     Simon-Pierre Cadieux
+     Eric S. Raymond
+     Gilles Vollant
 
 and with the following additions to the disclaimer:
 
 There is no warranty against interference with your enjoyment of the library
-or against infringement. There is no warranty that our efforts or the library
-will fulfill any of your particular purposes or needs. This library is provided
+or against infringement.  There is no warranty that our efforts or the library
+will fulfill any of your particular purposes or needs.  This library is provided
 with all faults, and the entire risk of satisfactory quality, performance,
 accuracy, and effort is with the user.
 
 libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are
-
 Copyright (c) 1998, 1999 Glenn Randers-Pehrson, and are distributed according
 to the same disclaimer and license as libpng-0.96, with the following individuals
 added to the list of Contributing Authors:
 
-Tom Lane
-
-Glenn Randers-Pehrson
-
-Willem van Schaik
+     Tom Lane
+     Glenn Randers-Pehrson
+     Willem van Schaik
 
 libpng versions 0.89, June 1996, through 0.96, May 1997, are
-
 Copyright (c) 1996, 1997 Andreas Digger
-
 Distributed according to the same disclaimer and license as libpng-0.88, with
 the following individuals added to the list of Contributing Authors:
 
-John Bowler
-
-Kevin Bracey
-
-Sam Bushell
-
-Magnus Holmgren
-
-Greg Roelofs
-
-Tom Tanner
+     John Bowler
+     Kevin Bracey
+     Sam Bushell
+     Magnus Holmgren
+     Greg Roelofs
+     Tom Tanner
 
 libpng versions 0.5, May 1995, through 0.88, January 1996, are
-
 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
 
 For the purposes of this copyright and license, "Contributing Authors" is
 defined as the following set of individuals:
 
-Andreas Dilger
+     Andreas Dilger
+     Dave Martindale
+     Guy Eric Schalnat
+     Paul Schmidt
+     Tim Wegner
 
-Dave Martindale
-
-Guy Eric Schalnat
-
-Paul Schmidt
-
-Tim Wegner
-
-The PNG Reference Library is supplied "AS IS". The Contributing Authors and
+The PNG Reference Library is supplied "AS IS".  The Contributing Authors and
 Group 42, Inc. disclaim all warranties, expressed or implied, including, without
 limitation, the warranties of merchantability and of fitness for any purpose.
 The Contributing Authors and Group 42, Inc. assume no liability for direct,
@@ -96,7 +78,7 @@ Permission is hereby granted to use, copy, modify, and distribute this source
 code, or portions hereof, for any purpose, without fee, subject to the following
 restrictions:
 
-   1. The origin of this source code must not be misrepresented.
+1. The origin of this source code must not be misrepresented.
 
 2. Altered versions must be plainly marked as such and must not be misrepresented
 as being the original source.
@@ -106,22 +88,21 @@ altered source distribution.
 
 The Contributing Authors and Group 42, Inc. specifically permit, without fee,
 and encourage the use of this source code as a component to supporting the
-PNG file format in commercial products. If you use this source code in a product,
-acknowledgment is not required but would be appreciated.
+PNG file format in commercial products.  If you use this source code in a
+product, acknowledgment is not required but would be appreciated.
+
 
 A "png_get_copyright" function is available, for convenient use in "about"
 boxes and the like:
 
-printf("%s",png_get_copyright(NULL));
+     printf("%s",png_get_copyright(NULL));
 
 Also, the PNG logo (in PNG format, of course) is supplied in the files "pngbar.png"
 and "pngbar.jpg (88x31) and "pngnow.png" (98x31).
 
-Libpng is OSI Certified Open Source Software. OSI Certified Open Source is
+Libpng is OSI Certified Open Source Software.  OSI Certified Open Source is
 a certification mark of the Open Source Initiative.
 
 Glenn Randers-Pehrson
-
 glennrp at users.sourceforge.net
-
 December 9, 2010
diff --git a/options/license/Linux-OpenIB b/options/license/Linux-OpenIB
index 6e731f9e06..03ccf61ccc 100644
--- a/options/license/Linux-OpenIB
+++ b/options/license/Linux-OpenIB
@@ -1,5 +1,6 @@
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
+Redistribution and use in source and binary forms, with or
+without modification, are permitted provided that the following
+conditions are met:
 
 - Redistributions of source code must retain the above copyright notice, this
 list of conditions and the following disclaimer.
@@ -9,8 +10,9 @@ this list of conditions and the following disclaimer in the documentation
 and/or other materials provided with the distribution.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS
-OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
-OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/options/license/Linux-syscall-note b/options/license/Linux-syscall-note
index 82054e6695..fcd056364e 100644
--- a/options/license/Linux-syscall-note
+++ b/options/license/Linux-syscall-note
@@ -1,5 +1,12 @@
-NOTE! This copyright does *not* cover user programs that use kernel services by normal system calls - this is merely considered normal use of the kernel, and does *not* fall under the heading of "derived work". Also note that the GPL below is copyrighted by the Free Software Foundation, but the instance of code that it refers to (the Linux kernel) is copyrighted by me and others who actually wrote it.
+   NOTE! This copyright does *not* cover user programs that use kernel
+ services by normal system calls - this is merely considered normal use
+ of the kernel, and does *not* fall under the heading of "derived work".
+ Also note that the GPL below is copyrighted by the Free Software
+ Foundation, but the instance of code that it refers to (the Linux
+ kernel) is copyrighted by me and others who actually wrote it.
 
-Also note that the only valid version of the GPL as far as the kernel is concerned is _this_ particular version of the license (ie v2, not v2.2 or v3.x or whatever), unless explicitly otherwise stated.
+ Also note that the only valid version of the GPL as far as the kernel
+ is concerned is _this_ particular version of the license (ie v2, not
+ v2.2 or v3.x or whatever), unless explicitly otherwise stated.
 
-Linus Torvalds
+			Linus Torvalds
diff --git a/options/license/MIT b/options/license/MIT
index 204b93da48..f0fd20ab68 100644
--- a/options/license/MIT
+++ b/options/license/MIT
@@ -1,4 +1,6 @@
-MIT License Copyright (c) <year> <copyright holders>
+MIT License
+
+Copyright (c) <year> <copyright holders>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -7,9 +9,8 @@ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 copies of the Software, and to permit persons to whom the Software is furnished
 to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice (including the next
-paragraph) shall be included in all copies or substantial portions of the
-Software.
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
diff --git a/options/license/MIT-0 b/options/license/MIT-0
index 973413d0f6..380be49f32 100644
--- a/options/license/MIT-0
+++ b/options/license/MIT-0
@@ -1,15 +1,22 @@
-MIT No Attribution Copyright <YEARr> <COPYRIGHT HOLDER>
+MIT No Attribution
+
+Copyright <YEAR> <COPYRIGHT HOLDER>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is furnished
-to do so.
+of this
+software and associated documentation files (the "Software"), to deal in the
+Software
+without restriction, including without limitation the rights to use, copy,
+modify,
+merge, publish, distribute, sublicense, and/or sell copies of the Software,
+and to
+permit persons to whom the Software is furnished to do so.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS
-OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
-OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+IMPLIED,
+INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/options/license/MIT-CMU b/options/license/MIT-CMU
index 81c351b2ef..19beaf8020 100644
--- a/options/license/MIT-CMU
+++ b/options/license/MIT-CMU
@@ -1,6 +1,8 @@
-<copyright notice> By obtaining, using, and/or copying this software and/or
-its associated documentation, you agree that you have read, understood, and
-will comply with the following terms and conditions:
+<copyright notice>
+
+By obtaining, using, and/or copying this software and/or its associated documentation,
+you agree that you have read, understood, and will comply with the following
+terms and conditions:
 
 Permission to use, copy, modify, and distribute this software and its associated
 documentation for any purpose and without fee is hereby granted, provided
diff --git a/options/license/MIT-open-group b/options/license/MIT-open-group
new file mode 100644
index 0000000000..ff185d30ed
--- /dev/null
+++ b/options/license/MIT-open-group
@@ -0,0 +1,23 @@
+Copyright <yyyy, yyyy> The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and
+its documentation for any purpose is hereby granted without fee,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation.
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL BE LIABLE FOR ANY CLAIM, DAMAGES
+OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
+THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of The Open Group
+shall not be used in advertising or otherwise to promote the sale, use
+or other dealings in this Software without prior written authorization
+from The Open Group.
diff --git a/options/license/MPL-1.0 b/options/license/MPL-1.0
index 965a50b512..66d1580941 100644
--- a/options/license/MPL-1.0
+++ b/options/license/MPL-1.0
@@ -1,33 +1,32 @@
 MOZILLA PUBLIC LICENSE
-
 Version 1.0
 
-   1. Definitions.
+1. Definitions.
 
-1.1. "Contributor" means each entity that creates or contributes to the creation
-of Modifications.
+1.1. ``Contributor'' means each entity that creates or contributes to the
+creation of Modifications.
 
-1.2. "Contributor Version" means the combination of the Original Code, prior
+1.2. ``Contributor Version'' means the combination of the Original Code, prior
 Modifications used by a Contributor, and the Modifications made by that particular
 Contributor.
 
-1.3. "Covered Code" means the Original Code or Modifications or the combination
+1.3. ``Covered Code'' means the Original Code or Modifications or the combination
 of the Original Code and Modifications, in each case including portions thereof.
 
-1.4. "Electronic Distribution Mechanism" means a mechanism generally accepted
+1.4. ``Electronic Distribution Mechanism'' means a mechanism generally accepted
 in the software development community for the electronic transfer of data.
 
-      1.5. "Executable" means Covered Code in any form other than Source Code.
+     1.5. ``Executable'' means Covered Code in any form other than Source Code.
 
-1.6. "Initial Developer" means the individual or entity identified as the
+1.6. ``Initial Developer'' means the individual or entity identified as the
 Initial Developer in the Source Code notice required by Exhibit A.
 
-1.7. "Larger Work" means a work which combines Covered Code or portions thereof
-with code not governed by the terms of this License.
+1.7. ``Larger Work'' means a work which combines Covered Code or portions
+thereof with code not governed by the terms of this License.
 
-      1.8. "License" means this document.
+     1.8. ``License'' means this document.
 
-1.9. "Modifications" means any addition to or deletion from the substance
+1.9. ``Modifications'' means any addition to or deletion from the substance
 or structure of either the Original Code or any previous Modifications. When
 Covered Code is released as a series of files, a Modification is:
 
@@ -36,12 +35,12 @@ Code or previous Modifications.
 
 B. Any new file that contains any part of the Original Code or previous Modifications.
 
-1.10. "Original Code" means Source Code of computer software code which is
-described in the Source Code notice required by Exhibit A as Original Code,
+1.10. ``Original Code'' means Source Code of computer software code which
+is described in the Source Code notice required by Exhibit A as Original Code,
 and which, at the time of its release under this License is not already Covered
 Code governed by this License.
 
-1.11. "Source Code" means the preferred form of the Covered Code for making
+1.11. ``Source Code'' means the preferred form of the Covered Code for making
 modifications to it, including all modules it contains, plus any associated
 interface definition files, scripts used to control compilation and installation
 of an Executable, or a list of source code differential comparisons against
@@ -50,19 +49,18 @@ the Contributor's choice. The Source Code can be in a compressed or archival
 form, provided the appropriate decompression or de-archiving software is widely
 available for no charge.
 
-1.12. "You" means an individual or a legal entity exercising rights under,
+1.12. ``You'' means an individual or a legal entity exercising rights under,
 and complying with all of the terms of, this License or a future version of
-this License issued under Section 6.1. For legal entities, "You" includes
+this License issued under Section 6.1. For legal entities, ``You'' includes
 any entity which controls, is controlled by, or is under common control with
-You. For purposes of this definition, "control" means (a) the power, direct
+You. For purposes of this definition, ``control'' means (a) the power, direct
 or indirect, to cause the direction or management of such entity, whether
 by contract or otherwise, or (b) ownership of fifty percent (50%) or more
 of the outstanding shares or beneficial ownership of such entity.
 
-   2. Source Code License.
-
-      2.1. The Initial Developer Grant.
+2. Source Code License.
 
+     2.1. The Initial Developer Grant.
 The Initial Developer hereby grants You a world-wide, royalty-free, non-exclusive
 license, subject to third party intellectual property claims:
 
@@ -71,14 +69,13 @@ the Original Code (or portions thereof) with or without Modifications, or
 as part of a Larger Work; and
 
 (b) under patents now or hereafter owned or controlled by Initial Developer,
-to make, have made, use and sell ("Utilize") the Original Code (or portions
+to make, have made, use and sell (``Utilize'') the Original Code (or portions
 thereof), but solely to the extent that any such patent is reasonably necessary
-to enable You to Utilize the Original Code (or portions thereof) and not to
-any greater extent that may be necessary to Utilize further Modifications
+to enable You to Utilize 	the Original Code (or portions thereof) and not
+to any greater extent that may be necessary to Utilize further Modifications
 or combinations.
 
-      2.2. Contributor Grant.
-
+     2.2. Contributor Grant.
 Each Contributor hereby grants You a world-wide, royalty-free, non-exclusive
 license, subject to third party intellectual property claims:
 
@@ -90,13 +87,12 @@ of a Larger Work; and
 (b) under patents now or hereafter owned or controlled by Contributor, to
 Utilize the Contributor Version (or portions thereof), but solely to the extent
 that any such patent is reasonably necessary to enable You to Utilize the
-Contributor Version (or portions thereof), and not to any greater extent that
-may be necessary to Utilize further Modifications or combinations.
+Contributor Version (or portions 	thereof), and not to any greater extent
+that may be necessary to Utilize further Modifications or combinations.
 
-   3. Distribution Obligations.
-
-      3.1. Application of License.
+3. Distribution Obligations.
 
+     3.1. Application of License.
 The Modifications which You create or to which You contribute are governed
 by the terms of this License, including without limitation Section 2.2. The
 Source Code version of Covered Code may be distributed only under the terms
@@ -107,8 +103,7 @@ version that alters or restricts the applicable version of this License or
 the recipients' rights hereunder. However, You may include an additional document
 offering the additional rights described in Section 3.5.
 
-      3.2. Availability of Source Code.
-
+     3.2. Availability of Source Code.
 Any Modification which You create or to which You contribute must be made
 available in Source Code form under the terms of this License either on the
 same media as an Executable version or via an accepted Electronic Distribution
@@ -120,8 +115,7 @@ has been made available to such recipients. You are responsible for ensuring
 that the Source Code version remains available even if the Electronic Distribution
 Mechanism is maintained by a third party.
 
-      3.3. Description of Modifications.
-
+     3.3. Description of Modifications.
 You must cause all Covered Code to which you contribute to contain a file
 documenting the changes You made to create that Covered Code and the date
 of any change. You must include a prominent statement that the Modification
@@ -130,13 +124,12 @@ Developer and including the name of the Initial Developer in (a) the Source
 Code, and (b) in any notice in an Executable version or related documentation
 in which You describe the origin or ownership of the Covered Code.
 
-      3.4. Intellectual Property Matters
-
-         (a) Third Party Claims.
+     3.4. Intellectual Property Matters
 
+          (a) Third Party Claims.
 If You have knowledge that a party claims an intellectual property right in
 particular functionality or code (or its utilization under this License),
-you must include a text file with the source code distribution titled "LEGAL"
+you must include a text file with the source code distribution titled ``LEGAL''
 which describes the claim and the party making the claim in sufficient detail
 that a recipient will know whom to contact. If you obtain such knowledge after
 You make Your Modification available as described in Section 3.2, You shall
@@ -145,14 +138,12 @@ and shall take other steps (such as notifying appropriate mailing lists or
 newsgroups) reasonably calculated to inform those who received the Covered
 Code that new knowledge has been obtained.
 
-         (b) Contributor APIs.
-
+          (b) Contributor APIs.
 If Your Modification is an application programming interface and You own or
 control patents which are reasonably necessary to implement that API, you
 must also include this information in the LEGAL file.
 
-      3.5. Required Notices.
-
+     3.5. Required Notices.
 You must duplicate the notice in Exhibit A in each file of the Source Code,
 and this License in any documentation for the Source Code, where You describe
 recipients' rights relating to Covered Code. If You created one or more Modification(s),
@@ -169,8 +160,7 @@ and You hereby agree to indemnify the Initial Developer and every Contributor
 for any liability incurred by the Initial Developer or such Contributor as
 a result of warranty, support, indemnity or liability terms You offer.
 
-      3.6. Distribution of Executable Versions.
-
+     3.6. Distribution of Executable Versions.
 You may distribute Covered Code in Executable form only if the requirements
 of Section 3.1-3.5 have been met for that Covered Code, and if You include
 a notice stating that the Source Code version of the Covered Code is available
@@ -190,15 +180,13 @@ hereby agree to indemnify the Initial Developer and every Contributor for
 any liability incurred by the Initial Developer or such Contributor as a result
 of any such terms You offer.
 
-      3.7. Larger Works.
-
+     3.7. Larger Works.
 You may create a Larger Work by combining Covered Code with other code not
 governed by the terms of this License and distribute the Larger Work as a
 single product. In such a case, You must make sure the requirements of this
 License are fulfilled for the Covered Code.
 
-   4. Inability to Comply Due to Statute or Regulation.
-
+4. Inability to Comply Due to Statute or Regulation.
 If it is impossible for You to comply with any of the terms of this License
 with respect to some or all of the Covered Code due to statute or regulation
 then You must: (a) comply with the terms of this License to the maximum extent
@@ -208,53 +196,47 @@ must be included with all distributions of the Source Code. Except to the
 extent prohibited by statute or regulation, such description must be sufficiently
 detailed for a recipient of ordinary skill to be able to understand it.
 
-   5. Application of this License.
-
+5. Application of this License.
 This License applies to code to which the Initial Developer has attached the
 notice in Exhibit A, and to related Covered Code.
 
-   6. Versions of the License.
+6. Versions of the License.
 
-      6.1. New Versions.
-
-Netscape Communications Corporation ("Netscape") may publish revised and/or
+     6.1. New Versions.
+Netscape Communications Corporation (``Netscape'') may publish revised and/or
 new versions of the License from time to time. Each version will be given
 a distinguishing version number.
 
-      6.2. Effect of New Versions.
-
+     6.2. Effect of New Versions.
 Once Covered Code has been published under a particular version of the License,
 You may always continue to use it under the terms of that version. You may
 also choose to use such Covered Code under the terms of any subsequent version
 of the License published by Netscape. No one other than Netscape has the right
 to modify the terms applicable to Covered Code created under this License.
 
-      6.3. Derivative Works.
-
+     6.3. Derivative Works.
 If you create or use a modified version of this License (which you may only
 do in order to apply it to code which is not already Covered Code governed
-by this License), you must (a) rename Your license so that the phrases "Mozilla",
-"MOZILLAPL", "MOZPL", "Netscape", "NPL" or any confusingly similar phrase
-do not appear anywhere in your license and (b) otherwise make it clear that
-your version of the license contains terms which differ from the Mozilla Public
-License and Netscape Public License. (Filling in the name of the Initial Developer,
-Original Code or Contributor in the notice described in Exhibit A shall not
-of themselves be deemed to be modifications of this License.)
+by this License), you must (a) rename Your license so that the phrases ``Mozilla'',
+``MOZILLAPL'', ``MOZPL'', ``Netscape'', ``NPL'' or any confusingly similar
+phrase do not appear anywhere in your license and (b) otherwise make it clear
+that your version of the license contains terms which differ from the Mozilla
+Public License and Netscape Public License. (Filling in the name of the Initial
+Developer, Original Code or Contributor in the notice described in Exhibit
+A shall not of themselves be deemed to be modifications of this License.)
 
-   7. DISCLAIMER OF WARRANTY.
-
-COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES
-THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR
-PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE
-OF THE COVERED CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN
-ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME
-THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER
+7. DISCLAIMER OF WARRANTY.
+COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN ``AS IS'' BASIS, WITHOUT
+WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION,
+WARRANTIES THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR
+A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY
+AND PERFORMANCE OF THE COVERED CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE
+DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR)
+ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER
 OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED
 CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
 
-   8. TERMINATION.
-
+8. TERMINATION.
 This License and the rights granted hereunder will terminate automatically
 if You fail to comply with terms herein and fail to cure such breach within
 30 days of becoming aware of the breach. All sublicenses to the Covered Code
@@ -262,8 +244,7 @@ which are properly granted shall survive any termination of this License.
 Provisions which, by their nature, must remain in effect beyond the termination
 of this License shall survive.
 
-   9. LIMITATION OF LIABILITY.
-
+9. LIMITATION OF LIABILITY.
 UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING
 NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE INITIAL DEVELOPER, ANY OTHER
 CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE, OR ANY SUPPLIER OF ANY OF
@@ -278,17 +259,15 @@ SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL
 OR CONSEQUENTIAL DAMAGES, SO THAT EXCLUSION AND LIMITATION MAY NOT APPLY TO
 YOU.
 
-   10. U.S. GOVERNMENT END USERS.
-
-The Covered Code is a "commercial item," as that term is defined in 48 C.F.R.
-2.101 (Oct. 1995), consisting of "commercial computer software" and "commercial
-computer software documentation," as such terms are used in 48 C.F.R. 12.212
+10. U.S. GOVERNMENT END USERS.
+The Covered Code is a ``commercial item,'' as that term is defined in 48 C.F.R.
+2.101 (Oct. 1995), consisting of ``commercial computer software'' and ``commercial
+computer software documentation,'' as such terms are used in 48 C.F.R. 12.212
 (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through
 227.7202-4 (June 1995), all U.S. Government End Users acquire Covered Code
 with only those rights set forth herein.
 
-   11. MISCELLANEOUS.
-
+11. MISCELLANEOUS.
 This License represents the complete agreement concerning 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. This
@@ -310,16 +289,17 @@ on Contracts for the International Sale of Goods is expressly excluded. Any
 law or regulation which provides that the language of a contract shall be
 construed against the drafter shall not apply to this License.
 
-   12. RESPONSIBILITY FOR CLAIMS.
-
+12. RESPONSIBILITY FOR CLAIMS.
 Except in cases where another Contributor has failed to comply with Section
 3.4, You are responsible for damages arising, directly or indirectly, out
 of Your utilization of rights under this License, based on the number of copies
 of Covered Code you made available, the revenues you received from utilizing
 such rights, and other relevant factors. You agree to work with affected parties
-to distribute responsibility on an equitable basis. EXHIBIT A.
+to distribute responsibility on an equitable basis.
 
-"The contents of this file are subject to the Mozilla Public License Version
+EXHIBIT A.
+
+``The contents of this file are subject to the Mozilla Public License Version
 1.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.mozilla.org/MPL/
 
@@ -327,6 +307,10 @@ Software distributed under the License is distributed on an "AS IS" basis,
 WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
 the specific language governing rights and limitations under the License.
 
-The Original Code is _____ . The Initial Developer of the Original Code is
-_____ . Portions created by _____ are Copyright (C) _____ . All Rights Reserved.
-Contributor(s): _____ ."
+The Original Code is ______________________________________.
+
+The Initial Developer of the Original Code is ________________________. Portions
+created by ______________________ are Copyright (C) ______ _______________________.
+All Rights Reserved.
+
+Contributor(s): ______________________________________.''
diff --git a/options/license/MPL-1.1 b/options/license/MPL-1.1
index b45d0e15ff..25d5a85c90 100644
--- a/options/license/MPL-1.1
+++ b/options/license/MPL-1.1
@@ -1,6 +1,6 @@
 Mozilla Public License Version 1.1
 
-   1. Definitions.
+1. Definitions.
 
 1.0.1. "Commercial Use" means distribution or otherwise making the Covered
 Code available to a third party.
@@ -18,7 +18,7 @@ of the Original Code and Modifications, in each case including portions thereof.
 1.4. "Electronic Distribution Mechanism" means a mechanism generally accepted
 in the software development community for the electronic transfer of data.
 
-      1.5. "Executable" means Covered Code in any form other than Source Code.
+     1.5. "Executable" means Covered Code in any form other than Source Code.
 
 1.6. "Initial Developer" means the individual or entity identified as the
 Initial Developer in the Source Code notice required by Exhibit A.
@@ -26,7 +26,7 @@ Initial Developer in the Source Code notice required by Exhibit A.
 1.7. "Larger Work" means a work which combines Covered Code or portions thereof
 with code not governed by the terms of this License.
 
-      1.8. "License" means this document.
+     1.8. "License" means this document.
 
 1.8.1. "Licensable" means having the right to grant, to the maximum extent
 possible, whether at the time of the initial grant or subsequently acquired,
@@ -35,10 +35,8 @@ any and all of the rights conveyed herein.
 1.9. "Modifications" means any addition to or deletion from the substance
 or structure of either the Original Code or any previous Modifications. When
 Covered Code is released as a series of files, a Modification is:
-
 Any addition to or deletion from the contents of a file containing Original
 Code or previous Modifications.
-
 Any new file that contains any part of the Original Code or previous Modifications.
 
 1.10. "Original Code" means Source Code of computer software code which is
@@ -68,7 +66,7 @@ or indirect, to cause the direction or management of such entity, whether
 by contract or otherwise, or (b) ownership of more than fifty percent (50%)
 of the outstanding shares or beneficial ownership of such entity.
 
-   2. Source Code License.
+2. Source Code License.
 
 2.1. The Initial Developer Grant. The Initial Developer hereby grants You
 a world-wide, royalty-free, non-exclusive license, subject to third party
@@ -78,15 +76,12 @@ a. under intellectual property rights (other than patent or trademark) Licensabl
 by Initial Developer to use, reproduce, modify, display, perform, sublicense
 and distribute the Original Code (or portions thereof) with or without Modifications,
 and/or as part of a Larger Work; and
-
 b. under Patents Claims infringed by the making, using or selling of Original
 Code, to make, have made, use, practice, sell, and offer for sale, and/or
 otherwise dispose of the Original Code (or portions thereof).
-
 c. the licenses granted in this Section 2.1 (a) and (b) are effective on the
 date Initial Developer first distributes Original Code under the terms of
 this License.
-
 d. Notwithstanding Section 2.1 (b) above, no patent license is granted: 1)
 for code that You delete from the Original Code; 2) separate from the Original
 Code; or 3) for infringements caused by: i) the modification of the Original
@@ -101,17 +96,14 @@ by Contributor, to use, reproduce, modify, display, perform, sublicense and
 distribute the Modifications created by such Contributor (or portions thereof)
 either on an unmodified basis, with other Modifications, as Covered Code and/or
 as part of a Larger Work; and
-
 b. under Patent Claims infringed by the making, using, or selling of Modifications
 made by that Contributor either alone and/or in combination with its Contributor
 Version (or portions of such combination), to make, use, sell, offer for sale,
 have made, and/or otherwise dispose of: 1) Modifications made by that Contributor
 (or portions thereof); and 2) the combination of Modifications made by that
 Contributor with its Contributor Version (or portions of such combination).
-
 c. the licenses granted in Sections 2.2 (a) and 2.2 (b) are effective on the
 date Contributor first makes Commercial Use of the Covered Code.
-
 d. Notwithstanding Section 2.2 (b) above, no patent license is granted: 1)
 for any code that Contributor has deleted from the Contributor Version; 2)
 separate from the Contributor Version; 3) for infringements caused by: i)
@@ -120,7 +112,7 @@ Modifications made by that Contributor with other software (except as part
 of the Contributor Version) or other devices; or 4) under Patent Claims infringed
 by Covered Code in the absence of Modifications made by that Contributor.
 
-   3. Distribution Obligations.
+3. Distribution Obligations.
 
 3.1. Application of License. The Modifications which You create or to which
 You contribute are governed by the terms of this License, including without
@@ -153,10 +145,9 @@ Developer in (a) the Source Code, and (b) in any notice in an Executable version
 or related documentation in which You describe the origin or ownership of
 the Covered Code.
 
-      3.4. Intellectual Property Matters
-
-         (a) Third Party Claims
+     3.4. Intellectual Property Matters
 
+          (a) Third Party Claims
 If Contributor has knowledge that a license under a third party's intellectual
 property rights is required to exercise the rights granted by such Contributor
 under Sections 2.1 or 2.2, Contributor must include a text file with the Source
@@ -169,15 +160,13 @@ steps (such as notifying appropriate mailing lists or newsgroups) reasonably
 calculated to inform those who received the Covered Code that new knowledge
 has been obtained.
 
-         (b) Contributor APIs
-
+          (b) Contributor APIs
 If Contributor's Modifications include an application programming interface
 and Contributor has knowledge of patent licenses which are reasonably necessary
 to implement that API, Contributor must also include this information in the
 LEGAL file.
 
-         (c) Representations.
-
+          (c) Representations.
 Contributor represents that, except as disclosed pursuant to Section 3.4 (a)
 above, Contributor believes that Contributor's Modifications are Contributor's
 original creation(s) and/or Contributor has sufficient rights to grant the
@@ -225,7 +214,7 @@ with other code not governed by the terms of this License and distribute the
 Larger Work as a single product. In such a case, You must make sure the requirements
 of this License are fulfilled for the Covered Code.
 
-   4. Inability to Comply Due to Statute or Regulation.
+4. Inability to Comply Due to Statute or Regulation.
 
 If it is impossible for You to comply with any of the terms of this License
 with respect to some or all of the Covered Code due to statute, judicial order,
@@ -237,29 +226,25 @@ Except to the extent prohibited by statute or regulation, such description
 must be sufficiently detailed for a recipient of ordinary skill to be able
 to understand it.
 
-   5. Application of this License.
-
+5. Application of this License.
 This License applies to code to which the Initial Developer has attached the
 notice in Exhibit A and to related Covered Code.
 
-   6. Versions of the License.
-
-      6.1. New Versions
+6. Versions of the License.
 
+     6.1. New Versions
 Netscape Communications Corporation ("Netscape") may publish revised and/or
 new versions of the License from time to time. Each version will be given
 a distinguishing version number.
 
-      6.2. Effect of New Versions
-
+     6.2. Effect of New Versions
 Once Covered Code has been published under a particular version of the License,
 You may always continue to use it under the terms of that version. You may
 also choose to use such Covered Code under the terms of any subsequent version
 of the License published by Netscape. No one other than Netscape has the right
 to modify the terms applicable to Covered Code created under this License.
 
-      6.3. Derivative Works
-
+     6.3. Derivative Works
 If You create or use a modified version of this License (which you may only
 do in order to apply it to code which is not already Covered Code governed
 by this License), You must (a) rename Your license so that the phrases "Mozilla",
@@ -271,8 +256,7 @@ Public License. (Filling in the name of the Initial Developer, Original Code
 or Contributor in the notice described in Exhibit A shall not of themselves
 be deemed to be modifications of this License.)
 
-   7. DISCLAIMER OF WARRANTY
-
+7. DISCLAIMER OF WARRANTY
 COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTY
 OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES
 THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR
@@ -283,7 +267,7 @@ THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER
 OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED
 CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
 
-   8. Termination
+8. Termination
 
 8.1. This License and the rights granted hereunder will terminate automatically
 if You fail to comply with terms herein and fail to cure such breach within
@@ -309,7 +293,6 @@ and payment arrangement are not mutually agreed upon in writing by the parties
 or the litigation claim is not withdrawn, the rights granted by Participant
 to You under Sections 2.1 and/or 2.2 automatically terminate at the expiration
 of the 60 day notice period specified above.
-
 b. any software, hardware, or device, other than such Participant's Contributor
 Version, directly or indirectly infringes any patent, then any rights granted
 to You by such Participant under Sections 2.1(b) and 2.2(b) are revoked effective
@@ -329,8 +312,7 @@ user license agreements (excluding distributors and resellers) which have
 been validly granted by You or any distributor hereunder prior to termination
 shall survive termination.
 
-   9. LIMITATION OF LIABILITY
-
+9. LIMITATION OF LIABILITY
 UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING
 NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER, ANY
 OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE, OR ANY SUPPLIER OF
@@ -345,8 +327,7 @@ SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL
 OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO
 YOU.
 
-   10. U.S. government end users
-
+10. U.S. government end users
 The Covered Code is a "commercial item," as that term is defined in 48 C.F.R.
 2.101 (Oct. 1995), consisting of "commercial computer software" and "commercial
 computer software documentation," as such terms are used in 48 C.F.R. 12.212
@@ -354,8 +335,7 @@ computer software documentation," as such terms are used in 48 C.F.R. 12.212
 227.7202-4 (June 1995), all U.S. Government End Users acquire Covered Code
 with only those rights set forth herein.
 
-   11. Miscellaneous
-
+11. Miscellaneous
 This License represents the complete agreement concerning 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. This
@@ -372,8 +352,7 @@ on Contracts for the International Sale of Goods is expressly excluded. Any
 law or regulation which provides that the language of a contract shall be
 construed against the drafter shall not apply to this License.
 
-   12. Responsibility for claims
-
+12. Responsibility for claims
 As between Initial Developer and the Contributors, each party is responsible
 for claims and damages arising, directly or indirectly, out of its utilization
 of rights under this License and You agree to work with Initial Developer
@@ -381,13 +360,14 @@ and Contributors to distribute such responsibility on an equitable basis.
 Nothing herein is intended or shall be deemed to constitute any admission
 of liability.
 
-   13. Multiple-licensed code
-
+13. Multiple-licensed code
 Initial Developer may designate portions of the Covered Code as "Multiple-Licensed".
 "Multiple-Licensed" means that the Initial Developer permits you to utilize
 portions of the Covered Code under Your choice of the MPL or the alternative
 licenses, if any, specified by the Initial Developer in the file described
-in Exhibit A. Exhibit A - Mozilla Public License.
+in Exhibit A.
+
+Exhibit A - Mozilla Public License.
 
 "The contents of this file are subject to the Mozilla Public License Version
 1.1 (the "License"); you may not use this file except in compliance with the
@@ -397,17 +377,16 @@ Software distributed under the License is distributed on an "AS IS" basis,
 WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
 the specific language governing rights and limitations under the License.
 
-The Original Code is ______________________________________ .
+The Original Code is ______________________________________.
 
-The Initial Developer of the Original Code is ________________________ .
+The Initial Developer of the Original Code is ________________________.
+Portions created by ______________________ are Copyright (C) ______
+_______________________. All Rights Reserved.
 
-Portions created by ______________________ are Copyright (C) ______ . All
-Rights Reserved.
-
-Contributor(s): ______________________________________ .
+Contributor(s): ______________________________________.
 
 Alternatively, the contents of this file may be used under the terms of the
-_____ license (the " [___] License"), in which case the provisions of [______]
+_____ license (the  "[___] License"), in which case the provisions of [______]
 License are applicable instead of those above. If you wish to allow use of
 your version of this file only under the terms of the [____] License and not
 to allow others to use your version of this file under the MPL, indicate your
diff --git a/options/license/MPL-2.0 b/options/license/MPL-2.0
index 09f2798a5b..d231cffdcd 100644
--- a/options/license/MPL-2.0
+++ b/options/license/MPL-2.0
@@ -1,6 +1,6 @@
 Mozilla Public License Version 2.0
 
-   1. Definitions
+1. Definitions
 
 1.1. "Contributor" means each individual or legal entity that creates, contributes
 to the creation of, or owns Covered Software.
@@ -8,14 +8,14 @@ to the creation of, or owns Covered Software.
 1.2. "Contributor Version" means the combination of the Contributions of others
 (if any) used by a Contributor and that particular Contributor's Contribution.
 
-      1.3. "Contribution" means Covered Software of a particular Contributor.
+     1.3. "Contribution" means Covered Software of a particular Contributor.
 
 1.4. "Covered Software" means Source Code Form to which the initial Contributor
 has attached the notice in Exhibit A, the Executable Form of such Source Code
 Form, and Modifications of such Source Code Form, in each case including portions
 thereof.
 
-      1.5. "Incompatible With Secondary Licenses" means
+     1.5. "Incompatible With Secondary Licenses" means
 
 (a) that the initial Contributor has attached the notice described in Exhibit
 B to the Covered Software; or
@@ -29,13 +29,13 @@ License.
 1.7. "Larger Work" means a work that combines Covered Software with other
 material, in a separate file or files, that is not Covered Software.
 
-      1.8. "License" means this document.
+     1.8. "License" means this document.
 
 1.9. "Licensable" means having the right to grant, to the maximum extent possible,
 whether at the time of the initial grant or subsequently, any and all of the
 rights conveyed by this License.
 
-      1.10. "Modifications" means any of the following:
+     1.10. "Modifications" means any of the following:
 
 (a) any file in Source Code Form that results from an addition to, deletion
 from, or modification of the contents of Covered Software; or
@@ -62,10 +62,9 @@ direction or management of such entity, whether by contract or otherwise,
 or (b) ownership of more than fifty percent (50%) of the outstanding shares
 or beneficial ownership of such entity.
 
-   2. License Grants and Conditions
-
-      2.1. Grants
+2. License Grants and Conditions
 
+     2.1. Grants
 Each Contributor hereby grants You a world-wide, royalty-free, non-exclusive
 license:
 
@@ -78,14 +77,12 @@ basis, with Modifications, or as part of a Larger Work; and
 sale, have made, import, and otherwise transfer either its Contributions or
 its Contributor Version.
 
-      2.2. Effective Date
-
+     2.2. Effective Date
 The licenses granted in Section 2.1 with respect to any Contribution become
 effective for each Contribution on the date the Contributor first distributes
 such Contribution.
 
-      2.3. Limitations on Grant Scope
-
+     2.3. Limitations on Grant Scope
 The licenses granted in this Section 2 are the only rights granted under this
 License. No additional rights or licenses will be implied from the distribution
 or licensing of Covered Software under this License. Notwithstanding Section
@@ -104,33 +101,28 @@ This License does not grant any rights in the trademarks, service marks, or
 logos of any Contributor (except as may be necessary to comply with the notice
 requirements in Section 3.4).
 
-      2.4. Subsequent Licenses
-
+     2.4. Subsequent Licenses
 No Contributor makes additional grants as a result of Your choice to distribute
 the Covered Software under a subsequent version of this License (see Section
 10.2) or under the terms of a Secondary License (if permitted under the terms
 of Section 3.3).
 
-      2.5. Representation
-
+     2.5. Representation
 Each Contributor represents that the Contributor believes its Contributions
 are its original creation(s) or it has sufficient rights to grant the rights
 to its Contributions conveyed by this License.
 
-      2.6. Fair Use
-
+     2.6. Fair Use
 This License is not intended to limit any rights You have under applicable
 copyright doctrines of fair use, fair dealing, or other equivalents.
 
-      2.7. Conditions
-
+     2.7. Conditions
 Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted in
 Section 2.1.
 
-   3. Responsibilities
-
-      3.1. Distribution of Source Form
+3. Responsibilities
 
+     3.1. Distribution of Source Form
 All distribution of Covered Software in Source Code Form, including any Modifications
 that You create or to which You contribute, must be under the terms of this
 License. You must inform recipients that the Source Code Form of the Covered
@@ -138,9 +130,8 @@ Software is governed by the terms of this License, and how they can obtain
 a copy of this License. You may not attempt to alter or restrict the recipients'
 rights in the Source Code Form.
 
-      3.2. Distribution of Executable Form
-
-      If You distribute Covered Software in Executable Form then:
+     3.2. Distribution of Executable Form
+     If You distribute Covered Software in Executable Form then:
 
 (a) such Covered Software must also be made available in Source Code Form,
 as described in Section 3.1, and You must inform recipients of the Executable
@@ -153,8 +144,7 @@ or sublicense it under different terms, provided that the license for the
 Executable Form does not attempt to limit or alter the recipients' rights
 in the Source Code Form under this License.
 
-      3.3. Distribution of a Larger Work
-
+     3.3. Distribution of a Larger Work
 You may create and distribute a Larger Work under terms of Your choice, provided
 that You also comply with the requirements of this License for the Covered
 Software. If the Larger Work is a combination of Covered Software with a work
@@ -165,16 +155,14 @@ so that the recipient of the Larger Work may, at their option, further distribut
 the Covered Software under the terms of either this License or such Secondary
 License(s).
 
-      3.4. Notices
-
+     3.4. Notices
 You may not remove or alter the substance of any license notices (including
 copyright notices, patent notices, disclaimers of warranty, or limitations
 of liability) contained within the Source Code Form of the Covered Software,
 except that You may alter any license notices to the extent required to remedy
 known factual inaccuracies.
 
-      3.5. Application of Additional Terms
-
+     3.5. Application of Additional Terms
 You may choose to offer, and to charge a fee for, warranty, support, indemnity
 or liability obligations to one or more recipients of Covered Software. However,
 You may do so only on Your own behalf, and not on behalf of any Contributor.
@@ -185,8 +173,7 @@ of warranty, support, indemnity or liability terms You offer. You may include
 additional disclaimers of warranty and limitations of liability specific to
 any jurisdiction.
 
-   4. Inability to Comply Due to Statute or Regulation
-
+4. Inability to Comply Due to Statute or Regulation
 If it is impossible for You to comply with any of the terms of this License
 with respect to some or all of the Covered Software due to statute, judicial
 order, or regulation then You must: (a) comply with the terms of this License
@@ -196,7 +183,7 @@ all distributions of the Covered Software under this License. Except to the
 extent prohibited by statute or regulation, such description must be sufficiently
 detailed for a recipient of ordinary skill to be able to understand it.
 
-   5. Termination
+5. Termination
 
 5.1. The rights granted under this License will terminate automatically if
 You fail to comply with any of its terms. However, if You become compliant,
@@ -222,8 +209,7 @@ user license agreements (excluding distributors and resellers) which have
 been validly granted by You or Your distributors under this License prior
 to termination shall survive termination.
 
-   6. Disclaimer of Warranty
-
+6. Disclaimer of Warranty
 Covered Software is provided under this License on an "as is" basis, without
 warranty of any kind, either expressed, implied, or statutory, including,
 without limitation, warranties that the Covered Software is free of defects,
@@ -234,8 +220,7 @@ assume the cost of any necessary servicing, repair, or correction. This disclaim
 of warranty constitutes an essential part of this License. No use of any Covered
 Software is authorized under this License except under this disclaimer.
 
-   7. Limitation of Liability
-
+7. Limitation of Liability
 Under no circumstances and under no legal theory, whether tort (including
 negligence), contract, or otherwise, shall any Contributor, or anyone who
 distributes Covered Software as permitted above, be liable to You for any
@@ -249,16 +234,14 @@ 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.
 
-   8. Litigation
-
+8. Litigation
 Any litigation relating to this License may be brought only in the courts
 of a jurisdiction where the defendant maintains its principal place of business
 and such litigation shall be governed by laws of that jurisdiction, without
 reference to its conflict-of-law provisions. Nothing in this Section shall
 prevent a party's ability to bring cross-claims or counter-claims.
 
-   9. Miscellaneous
-
+9. Miscellaneous
 This License represents the complete agreement concerning 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.
@@ -266,23 +249,20 @@ Any law or regulation which provides that the language of a contract shall
 be construed against the drafter shall not be used to construe this License
 against a Contributor.
 
-   10. Versions of the License
-
-      10.1. New Versions
+10. Versions of the License
 
+     10.1. New Versions
 Mozilla Foundation is the license steward. Except as provided in Section 10.3,
 no one other than the license steward has the right to modify or publish new
 versions of this License. Each version will be given a distinguishing version
 number.
 
-      10.2. Effect of New Versions
-
+     10.2. Effect of New Versions
 You may distribute the Covered Software under the terms of the version of
 the License under which You originally received the Covered Software, or under
 the terms of any subsequent version published by the license steward.
 
-      10.3. Modified Versions
-
+     10.3. Modified Versions
 If you create software not governed by this License, and you want to create
 a new license for such software, you may create and use a modified version
 of this License if you rename the license and remove any references to the
@@ -290,11 +270,11 @@ name of the license steward (except to note that such modified license differs
 from this License).
 
 10.4. Distributing Source Code Form that is Incompatible With Secondary Licenses
-
 If You choose to distribute Source Code Form that is Incompatible With Secondary
 Licenses under the terms of this version of the License, the notice described
-in Exhibit B of this License must be attached. Exhibit A - Source Code Form
-License Notice
+in Exhibit B of this License must be attached.
+
+Exhibit A - Source Code Form License Notice
 
 This Source Code Form is subject to the terms of the Mozilla Public License,
 v. 2.0. If a copy of the MPL was not distributed with this file, You can obtain
diff --git a/options/license/MPL-2.0-no-copyleft-exception b/options/license/MPL-2.0-no-copyleft-exception
index 09f2798a5b..d231cffdcd 100644
--- a/options/license/MPL-2.0-no-copyleft-exception
+++ b/options/license/MPL-2.0-no-copyleft-exception
@@ -1,6 +1,6 @@
 Mozilla Public License Version 2.0
 
-   1. Definitions
+1. Definitions
 
 1.1. "Contributor" means each individual or legal entity that creates, contributes
 to the creation of, or owns Covered Software.
@@ -8,14 +8,14 @@ to the creation of, or owns Covered Software.
 1.2. "Contributor Version" means the combination of the Contributions of others
 (if any) used by a Contributor and that particular Contributor's Contribution.
 
-      1.3. "Contribution" means Covered Software of a particular Contributor.
+     1.3. "Contribution" means Covered Software of a particular Contributor.
 
 1.4. "Covered Software" means Source Code Form to which the initial Contributor
 has attached the notice in Exhibit A, the Executable Form of such Source Code
 Form, and Modifications of such Source Code Form, in each case including portions
 thereof.
 
-      1.5. "Incompatible With Secondary Licenses" means
+     1.5. "Incompatible With Secondary Licenses" means
 
 (a) that the initial Contributor has attached the notice described in Exhibit
 B to the Covered Software; or
@@ -29,13 +29,13 @@ License.
 1.7. "Larger Work" means a work that combines Covered Software with other
 material, in a separate file or files, that is not Covered Software.
 
-      1.8. "License" means this document.
+     1.8. "License" means this document.
 
 1.9. "Licensable" means having the right to grant, to the maximum extent possible,
 whether at the time of the initial grant or subsequently, any and all of the
 rights conveyed by this License.
 
-      1.10. "Modifications" means any of the following:
+     1.10. "Modifications" means any of the following:
 
 (a) any file in Source Code Form that results from an addition to, deletion
 from, or modification of the contents of Covered Software; or
@@ -62,10 +62,9 @@ direction or management of such entity, whether by contract or otherwise,
 or (b) ownership of more than fifty percent (50%) of the outstanding shares
 or beneficial ownership of such entity.
 
-   2. License Grants and Conditions
-
-      2.1. Grants
+2. License Grants and Conditions
 
+     2.1. Grants
 Each Contributor hereby grants You a world-wide, royalty-free, non-exclusive
 license:
 
@@ -78,14 +77,12 @@ basis, with Modifications, or as part of a Larger Work; and
 sale, have made, import, and otherwise transfer either its Contributions or
 its Contributor Version.
 
-      2.2. Effective Date
-
+     2.2. Effective Date
 The licenses granted in Section 2.1 with respect to any Contribution become
 effective for each Contribution on the date the Contributor first distributes
 such Contribution.
 
-      2.3. Limitations on Grant Scope
-
+     2.3. Limitations on Grant Scope
 The licenses granted in this Section 2 are the only rights granted under this
 License. No additional rights or licenses will be implied from the distribution
 or licensing of Covered Software under this License. Notwithstanding Section
@@ -104,33 +101,28 @@ This License does not grant any rights in the trademarks, service marks, or
 logos of any Contributor (except as may be necessary to comply with the notice
 requirements in Section 3.4).
 
-      2.4. Subsequent Licenses
-
+     2.4. Subsequent Licenses
 No Contributor makes additional grants as a result of Your choice to distribute
 the Covered Software under a subsequent version of this License (see Section
 10.2) or under the terms of a Secondary License (if permitted under the terms
 of Section 3.3).
 
-      2.5. Representation
-
+     2.5. Representation
 Each Contributor represents that the Contributor believes its Contributions
 are its original creation(s) or it has sufficient rights to grant the rights
 to its Contributions conveyed by this License.
 
-      2.6. Fair Use
-
+     2.6. Fair Use
 This License is not intended to limit any rights You have under applicable
 copyright doctrines of fair use, fair dealing, or other equivalents.
 
-      2.7. Conditions
-
+     2.7. Conditions
 Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted in
 Section 2.1.
 
-   3. Responsibilities
-
-      3.1. Distribution of Source Form
+3. Responsibilities
 
+     3.1. Distribution of Source Form
 All distribution of Covered Software in Source Code Form, including any Modifications
 that You create or to which You contribute, must be under the terms of this
 License. You must inform recipients that the Source Code Form of the Covered
@@ -138,9 +130,8 @@ Software is governed by the terms of this License, and how they can obtain
 a copy of this License. You may not attempt to alter or restrict the recipients'
 rights in the Source Code Form.
 
-      3.2. Distribution of Executable Form
-
-      If You distribute Covered Software in Executable Form then:
+     3.2. Distribution of Executable Form
+     If You distribute Covered Software in Executable Form then:
 
 (a) such Covered Software must also be made available in Source Code Form,
 as described in Section 3.1, and You must inform recipients of the Executable
@@ -153,8 +144,7 @@ or sublicense it under different terms, provided that the license for the
 Executable Form does not attempt to limit or alter the recipients' rights
 in the Source Code Form under this License.
 
-      3.3. Distribution of a Larger Work
-
+     3.3. Distribution of a Larger Work
 You may create and distribute a Larger Work under terms of Your choice, provided
 that You also comply with the requirements of this License for the Covered
 Software. If the Larger Work is a combination of Covered Software with a work
@@ -165,16 +155,14 @@ so that the recipient of the Larger Work may, at their option, further distribut
 the Covered Software under the terms of either this License or such Secondary
 License(s).
 
-      3.4. Notices
-
+     3.4. Notices
 You may not remove or alter the substance of any license notices (including
 copyright notices, patent notices, disclaimers of warranty, or limitations
 of liability) contained within the Source Code Form of the Covered Software,
 except that You may alter any license notices to the extent required to remedy
 known factual inaccuracies.
 
-      3.5. Application of Additional Terms
-
+     3.5. Application of Additional Terms
 You may choose to offer, and to charge a fee for, warranty, support, indemnity
 or liability obligations to one or more recipients of Covered Software. However,
 You may do so only on Your own behalf, and not on behalf of any Contributor.
@@ -185,8 +173,7 @@ of warranty, support, indemnity or liability terms You offer. You may include
 additional disclaimers of warranty and limitations of liability specific to
 any jurisdiction.
 
-   4. Inability to Comply Due to Statute or Regulation
-
+4. Inability to Comply Due to Statute or Regulation
 If it is impossible for You to comply with any of the terms of this License
 with respect to some or all of the Covered Software due to statute, judicial
 order, or regulation then You must: (a) comply with the terms of this License
@@ -196,7 +183,7 @@ all distributions of the Covered Software under this License. Except to the
 extent prohibited by statute or regulation, such description must be sufficiently
 detailed for a recipient of ordinary skill to be able to understand it.
 
-   5. Termination
+5. Termination
 
 5.1. The rights granted under this License will terminate automatically if
 You fail to comply with any of its terms. However, if You become compliant,
@@ -222,8 +209,7 @@ user license agreements (excluding distributors and resellers) which have
 been validly granted by You or Your distributors under this License prior
 to termination shall survive termination.
 
-   6. Disclaimer of Warranty
-
+6. Disclaimer of Warranty
 Covered Software is provided under this License on an "as is" basis, without
 warranty of any kind, either expressed, implied, or statutory, including,
 without limitation, warranties that the Covered Software is free of defects,
@@ -234,8 +220,7 @@ assume the cost of any necessary servicing, repair, or correction. This disclaim
 of warranty constitutes an essential part of this License. No use of any Covered
 Software is authorized under this License except under this disclaimer.
 
-   7. Limitation of Liability
-
+7. Limitation of Liability
 Under no circumstances and under no legal theory, whether tort (including
 negligence), contract, or otherwise, shall any Contributor, or anyone who
 distributes Covered Software as permitted above, be liable to You for any
@@ -249,16 +234,14 @@ 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.
 
-   8. Litigation
-
+8. Litigation
 Any litigation relating to this License may be brought only in the courts
 of a jurisdiction where the defendant maintains its principal place of business
 and such litigation shall be governed by laws of that jurisdiction, without
 reference to its conflict-of-law provisions. Nothing in this Section shall
 prevent a party's ability to bring cross-claims or counter-claims.
 
-   9. Miscellaneous
-
+9. Miscellaneous
 This License represents the complete agreement concerning 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.
@@ -266,23 +249,20 @@ Any law or regulation which provides that the language of a contract shall
 be construed against the drafter shall not be used to construe this License
 against a Contributor.
 
-   10. Versions of the License
-
-      10.1. New Versions
+10. Versions of the License
 
+     10.1. New Versions
 Mozilla Foundation is the license steward. Except as provided in Section 10.3,
 no one other than the license steward has the right to modify or publish new
 versions of this License. Each version will be given a distinguishing version
 number.
 
-      10.2. Effect of New Versions
-
+     10.2. Effect of New Versions
 You may distribute the Covered Software under the terms of the version of
 the License under which You originally received the Covered Software, or under
 the terms of any subsequent version published by the license steward.
 
-      10.3. Modified Versions
-
+     10.3. Modified Versions
 If you create software not governed by this License, and you want to create
 a new license for such software, you may create and use a modified version
 of this License if you rename the license and remove any references to the
@@ -290,11 +270,11 @@ name of the license steward (except to note that such modified license differs
 from this License).
 
 10.4. Distributing Source Code Form that is Incompatible With Secondary Licenses
-
 If You choose to distribute Source Code Form that is Incompatible With Secondary
 Licenses under the terms of this version of the License, the notice described
-in Exhibit B of this License must be attached. Exhibit A - Source Code Form
-License Notice
+in Exhibit B of this License must be attached.
+
+Exhibit A - Source Code Form License Notice
 
 This Source Code Form is subject to the terms of the Mozilla Public License,
 v. 2.0. If a copy of the MPL was not distributed with this file, You can obtain
diff --git a/options/license/MS-PL b/options/license/MS-PL
index 5784d46834..73a7312d71 100644
--- a/options/license/MS-PL
+++ b/options/license/MS-PL
@@ -4,16 +4,14 @@ This license governs use of the accompanying software. If you use the software,
 you accept this license. If you do not accept the license, do not use the
 software.
 
-   1. Definitions
-
+1.  Definitions
 The terms "reproduce," "reproduction," "derivative works," and "distribution"
 have the same meaning here as under U.S. copyright law. A "contribution" is
 the original software, or any additions or changes to the software. A "contributor"
 is any person that distributes its contribution under this license. "Licensed
 patents" are a contributor's patent claims that read directly on its contribution.
 
-   2. Grant of Rights
-
+2.  Grant of Rights
 (A) Copyright Grant- Subject to the terms of this license, including the license
 conditions and limitations in section 3, each contributor grants you a non-exclusive,
 worldwide, royalty-free copyright license to reproduce its contribution, prepare
@@ -26,8 +24,7 @@ worldwide, royalty-free license under its licensed patents to make, have made,
 use, sell, offer for sale, import, and/or otherwise dispose of its contribution
 in the software or derivative works of the contribution in the software.
 
-   3. Conditions and Limitations
-
+3.  Conditions and Limitations
 (A) No Trademark License- This license does not grant you rights to use any
 contributors' name, logo, or trademarks.
 
diff --git a/options/license/MS-RL b/options/license/MS-RL
index 1f5d355d9a..ad056e6d7d 100644
--- a/options/license/MS-RL
+++ b/options/license/MS-RL
@@ -4,8 +4,7 @@ This license governs use of the accompanying software. If you use the software,
 you accept this license. If you do not accept the license, do not use the
 software.
 
-   1. Definitions
-
+1.  Definitions
 The terms "reproduce," "reproduction," "derivative works," and "distribution"
 have the same meaning here as under U.S. copyright law.
 
@@ -18,8 +17,7 @@ license.
 "Licensed patents" are a contributor's patent claims that read directly on
 its contribution.
 
-   2. Grant of Rights
-
+2.  Grant of Rights
 (A) Copyright Grant- Subject to the terms of this license, including the license
 conditions and limitations in section 3, each contributor grants you a non-exclusive,
 worldwide, royalty-free copyright license to reproduce its contribution, prepare
@@ -32,8 +30,7 @@ worldwide, royalty-free license under its licensed patents to make, have made,
 use, sell, offer for sale, import, and/or otherwise dispose of its contribution
 in the software or derivative works of the contribution in the software.
 
-   3. Conditions and Limitations
-
+3.  Conditions and Limitations
 (A) Reciprocal Grants- For any file you distribute that contains code from
 the software (in source code or binary format), you must provide recipients
 the source code to that file along with a copy of this license, which license
diff --git a/options/license/MTLL b/options/license/MTLL
index a80e517285..ef844fedbf 100644
--- a/options/license/MTLL
+++ b/options/license/MTLL
@@ -1,11 +1,9 @@
-Software License for MTL Copyright (c) 2007 The Trustees of Indiana University.
+Software License for MTL
 
+Copyright (c) 2007 The Trustees of Indiana University.
 2008 Dresden University of Technology and the Trustees of Indiana University.
-
-2010 SimuNova UG (haftungsbeschränkt), www.simunova.com.
-
+     2010 SimuNova UG (haftungsbeschränkt), www.simunova.com.
 All rights reserved.
-
 Authors: Peter Gottschling and Andrew Lumsdaine
 
 This file is part of the Matrix Template Library
@@ -16,33 +14,26 @@ license.
 
 Redistribution and use in source and binary forms, with or without modification,
 are permitted provided that the following conditions are met:
-
 1. All redistributions of source code must retain the above copyright notice,
 the list of authors in the original source code, this list of conditions and
 the disclaimer listed in this license;
-
 2. All redistributions in binary form must reproduce the above copyright notice,
 this list of conditions and the disclaimer listed in this license in the documentation
 and/or other materials provided with the distribution;
-
 3. Any documentation included with all redistributions must include the following
 acknowledgement:
-
 "This product includes software developed at the University of Notre Dame,
 the Pervasive Technology Labs at Indiana University, and Dresden University
 of Technology. For technical information contact Andrew Lumsdaine at the Pervasive
 Technology Labs at Indiana University. For administrative and license questions
 contact the Advanced Research and Technology Institute at 1100 Waterway Blvd.
 Indianapolis, Indiana 46202, phone 317-274-5905, fax 317-274-5902."
-
 Alternatively, this acknowledgement may appear in the software itself, and
 wherever such third-party acknowledgments normally appear.
-
 4. The name "MTL" shall not be used to endorse or promote products derived
 from this software without prior written permission from IU or TUD. For written
 permission, please contact Indiana University Advanced Research & Technology
 Institute.
-
 5. Products derived from this software may not be called "MTL", nor may "MTL"
 appear in their name, without prior written permission of Indiana University
 Advanced Research & Technology Institute.
diff --git a/options/license/MakeIndex b/options/license/MakeIndex
index e92f97685a..62894881b7 100644
--- a/options/license/MakeIndex
+++ b/options/license/MakeIndex
@@ -1,20 +1,16 @@
 MakeIndex Distribution Notice
 
-11/11/1989 Copyright (C) 1989 by Chen & Harrison International Systems, Inc.
+11/11/1989
 
+Copyright (C) 1989 by Chen & Harrison International Systems, Inc.
 Copyright (C) 1988 by Olivetti Research Center
-
 Copyright (C) 1987 by Regents of the University of California
 
 Author:
-
-Pehong Chen (phc@renoir.berkeley.edu)
-
-Chen & Harrison International Systems, Inc.
-
-Palo Alto, California
-
-USA
+     Pehong Chen (phc@renoir.berkeley.edu)
+     Chen & Harrison International Systems, Inc.
+     Palo Alto, California
+     USA
 
 Permission is hereby granted to make and distribute original copies of this
 program provided that the copyright notice and this permission notice are
@@ -22,7 +18,7 @@ preserved and provided that the recipient is not asked to waive or limit his
 right to redistribute copies as allowed by this permission notice and provided
 that anyone who receives an executable form of this program is granted access
 to a machine-readable form of the source code for this program at a cost not
-greater than reasonable reproduction, shipping, and handling costs. Executable
+greater than reasonable reproduction, shipping, and handling costs.  Executable
 forms of this program distributed without the source code must be accompanied
 by a conspicuous copy of this permission notice and a statement that tells
 the recipient how to obtain the source code.
@@ -33,10 +29,10 @@ entire modified work must be covered by a permission notice identical to this
 permission notice. Anything distributed with and usable only in conjunction
 with something derived from this program, whose useful purpose is to extend
 or adapt or add capabilities to this program, is to be considered a modified
-version of this program under the requirement above. Ports of this program
+version of this program under the requirement above.  Ports of this program
 to other systems not supported in the distribution are also considered modified
-versions. All modified versions should be reported back to the author.
+versions.  All modified versions should be reported back to the author.
 
-This program is distributed with no warranty of any sort. No contributor accepts
-responsibility for the consequences of using this program or for whether it
-serves any particular purpose.
+This program is distributed with no warranty of any sort.  No contributor
+accepts responsibility for the consequences of using this program or for whether
+it serves any particular purpose.
diff --git a/options/license/MirOS b/options/license/MirOS
index 3fbbab0f11..7aeaf80e11 100644
--- a/options/license/MirOS
+++ b/options/license/MirOS
@@ -1,4 +1,6 @@
-The MirOS Licence Copyright [YEAR] [NAME] [EMAIL]
+The MirOS Licence
+
+Copyright [YEAR] [NAME] [EMAIL]
 
 Provided that these terms and disclaimer and all copyright notices are retained
 or reproduced in an accompanying document, permission is granted to deal in
diff --git a/options/license/Motosoto b/options/license/Motosoto
index cb4e3f014d..e1d47e0192 100644
--- a/options/license/Motosoto
+++ b/options/license/Motosoto
@@ -7,7 +7,9 @@ B.V. ("Licensor"). Any Motosoto Product licensed pursuant to this License
 is a "Licensed Product." Licensed Product, in its entirety, is protected by
 Dutch copyright law. This License identifies the terms under which you may
 use, copy, distribute or modify Licensed Product and has been submitted to
-the Open Software Initiative (OSI) for approval. Preamble
+the Open Software Initiative (OSI) for approval.
+
+Preamble
 
 This Preamble is intended to describe, in plain English, the nature and scope
 of this License. However, this Preamble is not a part of this license. The
@@ -70,7 +72,7 @@ at the end of the License.
 
 License Terms
 
-   1. Grant of License From Licensor.
+1. Grant of License From Licensor.
 
 Licensor hereby grants you a world-wide, royalty-free, non-exclusive license,
 subject to third party intellectual property claims, to do the following:
@@ -95,7 +97,7 @@ claim is necessary to enable you to make, use, sell, offer for sale, have
 made, and/or otherwise dispose of Licensed Product or portions thereof or
 Derivative Works thereof.
 
-   2. Grant of License to Modifications From Contributor.
+2. Grant of License to Modifications From Contributor.
 
 "Modifications" means any additions to or deletions from the substance or
 structure of (i) a file containing Licensed Product, or (ii) any new file
@@ -119,7 +121,7 @@ claim is necessary to enable you to make, use, sell, offer for sale, have
 made, and/or otherwise dispose of Modifications or portions thereof or Derivative
 Works thereof.
 
-   3. Exclusions From License Grant.
+3. Exclusions From License Grant.
 
 Nothing in this License shall be deemed to grant any rights to trademarks,
 copyrights, patents, trade secrets or any other intellectual property of Licensor
@@ -132,7 +134,7 @@ in this License shall be interpreted to prohibit Licensor from licensing under
 different terms from this License any code that Licensor otherwise would have
 a right to license.
 
-   4. Your Obligations Regarding Distribution.
+4. Your Obligations Regarding Distribution.
 
 a. Application of This License to Your Modifications. As an express condition
 for your use of the Licensed Product, you hereby agree that any Modifications
@@ -172,8 +174,7 @@ Product you distribute or in related documentation in which you describe the
 origin or ownership of the Licensed Product. You may not modify or delete
 any preexisting copyright notices in the Licensed Product.
 
-      d. Intellectual Property Matters.
-
+     d. Intellectual Property Matters.
 i. Third Party Claims. If you have knowledge that a license to a third party's
 intellectual property right is required to exercise the rights granted by
 this License, you must include a text file with the Source Code distribution
@@ -235,7 +236,7 @@ the proviso that the requirements of this License are fulfilled for those
 portions of the Derivative Works that consist of the Licensed Product or any
 Modifications thereto.
 
-   5. Inability to Comply Due to Statute or Regulation.
+5. Inability to Comply Due to Statute or Regulation.
 
 If it is impossible for you to comply with any of the terms of this License
 with respect to some or all of the Licensed Product due to statute, judicial
@@ -248,12 +249,12 @@ Code. Except to the extent prohibited by statute or regulation, such description
 must be sufficiently detailed for a recipient of ordinary skill at computer
 programming to be able to understand it.
 
-   6. Application of This License.
+6. Application of This License.
 
 This License applies to code to which Licensor or Contributor has attached
 the Notice in Exhibit A, which is incorporated herein by this reference.
 
-   7. Versions of This License.
+7. Versions of This License.
 
 a. Version. The Motosoto Open Source License is derived from the Jabber Open
 Source License. All changes are related to applicable law and the location
@@ -276,7 +277,7 @@ license so that it is not confusingly similar to this License, and must make
 it clear that your license contains terms that differ from this License. In
 so naming your license, you may not use any trademark of Licensor or any Contributor.
 
-   8. Disclaimer of Warranty.
+8. Disclaimer of Warranty.
 
 LICENSED PRODUCT IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT
 WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING, WITHOUT LIMITATION,
@@ -288,7 +289,7 @@ ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIME
 OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF LICENSED
 PRODUCT IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
 
-   9. Termination.
+9. Termination.
 
 a. Automatic Termination Upon Breach. This license and the rights granted
 hereunder will terminate automatically if you fail to comply with the terms
@@ -326,7 +327,7 @@ Sections 9(a) or 9(b) above, all end user license agreements (excluding licenses
 to distributors and reselle rs) that have been validly granted by you or any
 distributor hereunder prior to termination shall survive termination.
 
-   10. Limitation of Liability.
+10. Limitation of Liability.
 
 UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING
 NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE LICENSOR, ANY CONTRIBUTOR,
diff --git a/options/license/MulanPSL-1.0 b/options/license/MulanPSL-1.0
index b72489c67b..a3731d6fd8 100644
--- a/options/license/MulanPSL-1.0
+++ b/options/license/MulanPSL-1.0
@@ -1,40 +1,42 @@
-木兰宽松许可证, 第1版 木兰宽松许可证， 第1版
+木兰宽松许可证, 第1版
+
+木兰宽松许可证， 第1版
 
 2019年8月 http://license.coscl.org.cn/MulanPSL
 
-您对"软件"的复制、使用、修改及分发受木兰宽松许可证，第1版（"本许可证"）的如下条款的约束：
+您对“软件”的复制、使用、修改及分发受木兰宽松许可证，第1版（“本许可证”）的如下条款的约束：
 
-   0. 定义
+0.   定义
 
-   "软件"是指由"贡献"构成的许可在"本许可证"下的程序和相关文档的集合。
+“软件”是指由“贡献”构成的许可在“本许可证”下的程序和相关文档的集合。
 
-   "贡献者"是指将受版权法保护的作品许可在"本许可证"下的自然人或"法人实体"。
+“贡献者”是指将受版权法保护的作品许可在“本许可证”下的自然人或“法人实体”。
 
-   "法人实体"是指提交贡献的机构及其"关联实体"。
+“法人实体”是指提交贡献的机构及其“关联实体”。
 
-"关联实体"是指，对"本许可证"下的一方而言，控制、受控制或与其共同受控制的机构，此处的控制是指有受控方或共同受控方至少50%直接或间接的投票权、资金或其他有价证券。
+“关联实体”是指，对“本许可证”下的一方而言，控制、受控制或与其共同受控制的机构，此处的控制是指有受控方或共同受控方至少50%直接或间接的投票权、资金或其他有价证券。
 
-   "贡献"是指由任一"贡献者"许可在"本许可证"下的受版权法保护的作品。
+“贡献”是指由任一“贡献者”许可在“本许可证”下的受版权法保护的作品。
 
-   1. 授予版权许可
+1.   授予版权许可
 
-   每个"贡献者"根据"本许可证"授予您永久性的、全球性的、免费的、非独占的、不可撤销的版权许可，您可以复制、使用、修改、分发其"贡献"，不论修改与否。
+每个“贡献者”根据“本许可证”授予您永久性的、全球性的、免费的、非独占的、不可撤销的版权许可，您可以复制、使用、修改、分发其“贡献”，不论修改与否。
 
-   2. 授予专利许可
+2.   授予专利许可
 
-每个"贡献者"根据"本许可证"授予您永久性的、全球性的、免费的、非独占的、不可撤销的（根据本条规定撤销除外）专利许可，供您制造、委托制造、使用、许诺销售、销售、进口其"贡献"或以其他方式转移其"贡献"。前述专利许可仅限于"贡献者"现在或将来拥有或控制的其"贡献"本身或其"贡献"与许可"贡献"时的"软件"结合而将必然会侵犯的专利权利要求，不包括仅因您或他人修改"贡献"或其他结合而将必然会侵犯到的专利权利要求。如您或您的"关联实体"直接或间接地（包括通过代理、专利被许可人或受让人），就"软件"或其中的"贡献"对任何人发起专利侵权诉讼（包括反诉或交叉诉讼）或其他专利维权行动，指控其侵犯专利权，则"本许可证"授予您对"软件"的专利许可自您提起诉讼或发起维权行动之日终止。
+每个“贡献者”根据“本许可证”授予您永久性的、全球性的、免费的、非独占的、不可撤销的（根据本条规定撤销除外）专利许可，供您制造、委托制造、使用、许诺销售、销售、进口其“贡献”或以其他方式转移其“贡献”。前述专利许可仅限于“贡献者”现在或将来拥有或控制的其“贡献”本身或其“贡献”与许可“贡献”时的“软件”结合而将必然会侵犯的专利权利要求，不包括仅因您或他人修改“贡献”或其他结合而将必然会侵犯到的专利权利要求。如您或您的“关联实体”直接或间接地（包括通过代理、专利被许可人或受让人），就“软件”或其中的“贡献”对任何人发起专利侵权诉讼（包括反诉或交叉诉讼）或其他专利维权行动，指控其侵犯专利权，则“本许可证”授予您对“软件”的专利许可自您提起诉讼或发起维权行动之日终止。
 
-   3. 无商标许可
+3.   无商标许可
 
-   "本许可证"不提供对"贡献者"的商品名称、商标、服务标志或产品名称的商标许可，但您为满足第4条规定的声明义务而必须使用除外。
+“本许可证”不提供对“贡献者”的商品名称、商标、服务标志或产品名称的商标许可，但您为满足第4条规定的声明义务而必须使用除外。
 
-   4. 分发限制
+4.   分发限制
 
-您可以在任何媒介中将"软件"以源程序形式或可执行形式重新分发，不论修改与否，但您必须向接收者提供"本许可证"的副本，并保留"软件"中的版权、商标、专利及免责声明。
+您可以在任何媒介中将“软件”以源程序形式或可执行形式重新分发，不论修改与否，但您必须向接收者提供“本许可证”的副本，并保留“软件”中的版权、商标、专利及免责声明。
 
-   5. 免责声明与责任限制
+5.   免责声明与责任限制
 
-"软件"及其中的"贡献"在提供时不带任何明示或默示的担保。在任何情况下，"贡献者"或版权所有者不对任何人因使用"软件"或其中的"贡献"而引发的任何直接或间接损失承担责任，不论因何种原因导致或者基于何种法律理论,即使其曾被建议有此种损失的可能性。
+“软件”及其中的“贡献”在提供时不带任何明示或默示的担保。在任何情况下，“贡献者”或版权所有者不对任何人因使用“软件”或其中的“贡献”而引发的任何直接或间接损失承担责任，不论因何种原因导致或者基于何种法律理论,即使其曾被建议有此种损失的可能性。
 
 条款结束
 
@@ -42,36 +44,32 @@
 
 如果您希望将木兰宽松许可证，第1版，应用到您的新软件，为了方便接收者查阅，建议您完成如下三步：
 
-   1， 请您补充如下声明中的空白，包括软件名、软件的首次发表年份以及您作为版权人的名字；
+1， 请您补充如下声明中的空白，包括软件名、软件的首次发表年份以及您作为版权人的名字；
 
-   2， 请您在软件包的一级目录下创建以"LICENSE"为名的文件，将整个许可证文本放入该文件中；
+2， 请您在软件包的一级目录下创建以“LICENSE”为名的文件，将整个许可证文本放入该文件中；
 
-   3， 请将如下声明文本放入每个源文件的头部注释中。
+3， 请将如下声明文本放入每个源文件的头部注释中。
 
 Copyright (c) [2019] [name of copyright holder]
-
 [Software Name] is licensed under the Mulan PSL v1.
-
 You can use this software according to the terms and conditions of the Mulan
 PSL v1.
-
 You may obtain a copy of Mulan PSL v1 at:
-
-http://license.coscl.org.cn/MulanPSL
-
+    http://license.coscl.org.cn/MulanPSL
 THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
 EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
 MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
+See the Mulan PSL v1 for more details.
+Mulan Permissive Software License，Version 1
 
-See the Mulan PSL v1 for more details. Mulan Permissive Software License，Version
-1 Mulan Permissive Software License，Version 1 (Mulan PSL v1)
+Mulan Permissive Software License，Version 1 (Mulan PSL v1)
 
 August 2019 http://license.coscl.org.cn/MulanPSL
 
 Your reproduction, use, modification and distribution of the Software shall
 be subject to Mulan PSL v1 (this License) with following terms and conditions:
 
-   0. Definition
+0. Definition
 
 Software means the program and related documents which are comprised of those
 Contribution and licensed under this License.
@@ -79,24 +77,24 @@ Contribution and licensed under this License.
 Contributor means the Individual or Legal Entity who licenses its copyrightable
 work under this License.
 
-   Legal Entity means the entity making a Contribution and all its Affiliates.
+Legal Entity means the entity making a Contribution and all its Affiliates.
 
 Affiliates means entities that control, or are controlled by, or are under
-common control with a party to this License, 'control' means direct or indirect
+common control with a party to this License, ‘control’ means direct or indirect
 ownership of at least fifty percent (50%) of the voting power, capital or
 other securities of controlled or commonly controlled entity.
 
 Contribution means the copyrightable work licensed by a particular Contributor
 under this License.
 
-   1. Grant of Copyright License
+1. Grant of Copyright License
 
 Subject to the terms and conditions of this License, each Contributor hereby
 grants to you a perpetual, worldwide, royalty-free, non-exclusive, irrevocable
 copyright license to reproduce, use, modify, or distribute its Contribution,
 with modification or not.
 
-   2. Grant of Patent License
+2. Grant of Patent License
 
 Subject to the terms and conditions of this License, each Contributor hereby
 grants to you a perpetual, worldwide, royalty-free, non-exclusive, irrevocable
@@ -106,7 +104,7 @@ such patent license is only limited to the patent claims owned or controlled
 by such Contributor now or in future which will be necessarily infringed by
 its Contribution alone, or by combination of the Contribution with the Software
 to which the Contribution was contributed, excluding of any patent claims
-solely be infringed by your or others' modification or other combinations.
+solely be infringed by your or others’ modification or other combinations.
 If you or your Affiliates directly or indirectly (including through an agent,
 patent licensee or assignee）, institute patent litigation (including a cross
 claim or counterclaim in a litigation) or other patent enforcement activities
@@ -115,27 +113,27 @@ in it infringes patents, then any patent license granted to you under this
 License for the Software shall terminate as of the date such litigation or
 activity is filed or taken.
 
-   3. No Trademark License
+3. No Trademark License
 
 No trademark license is granted to use the trade names, trademarks, service
 marks, or product names of Contributor, except as required to fulfill notice
 requirements in section 4.
 
-   4. Distribution Restriction
+4. Distribution Restriction
 
 You may distribute the Software in any medium with or without modification,
 whether in source or executable forms, provided that you provide recipients
 with a copy of this License and retain copyright, patent, trademark and disclaimer
 statements in the Software.
 
-   5. Disclaimer of Warranty and Limitation of Liability
+5. Disclaimer of Warranty and Limitation of Liability
 
 The Software and Contribution in it are provided without warranties of any
 kind, either express or implied. In no event shall any Contributor or copyright
-holder be liable to you for any damages,including, but not limited to any
+holder be liable to you for any damages, including, but not limited to any
 direct, or indirect, special or consequential damages arising from your use
 or inability to use the Software or the Contribution in it, no matter how
-it's caused or based on which legal theory, even if advised of the possibility
+it’s caused or based on which legal theory, even if advised of the possibility
 of such damages.
 
 End of the Terms and Conditions
@@ -149,26 +147,18 @@ you are suggested to complete following three steps:
 i. Fill in the blanks in following statement, including insert your software
 name, the year of the first publication of your software, and your name identified
 as the copyright owner;
-
-ii. Create a file named "LICENSE" which contains the whole context of this
+ii. Create a file named “LICENSE” which contains the whole context of this
 License in the first directory of your software package;
-
 iii. Attach the statement to the appropriate annotated syntax at the beginning
 of each source file.
 
 Copyright (c) [2019] [name of copyright holder]
-
 [Software Name] is licensed under the Mulan PSL v1.
-
 You can use this software according to the terms and conditions of the Mulan
 PSL v1.
-
 You may obtain a copy of Mulan PSL v1 at:
-
-http://license.coscl.org.cn/MulanPSL
-
+    http://license.coscl.org.cn/MulanPSL
 THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
 EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
 MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
-
 See the Mulan PSL v1 for more details.
diff --git a/options/license/MulanPSL-2.0 b/options/license/MulanPSL-2.0
index df0d9ac151..7cb9327c84 100644
--- a/options/license/MulanPSL-2.0
+++ b/options/license/MulanPSL-2.0
@@ -1,44 +1,47 @@
-木兰宽松许可证, 第2版 木兰宽松许可证， 第2版
+
+木兰宽松许可证, 第2版
+
+木兰宽松许可证， 第2版
 
 2020年1月 http://license.coscl.org.cn/MulanPSL2
 
-您对"软件"的复制、使用、修改及分发受木兰宽松许可证，第2版（"本许可证"）的如下条款的约束：
+您对“软件”的复制、使用、修改及分发受木兰宽松许可证，第2版（“本许可证”）的如下条款的约束：
 
-   0. 定义
+0.   定义
 
-   "软件" 是指由"贡献"构成的许可在"本许可证"下的程序和相关文档的集合。
+“软件” 是指由“贡献”构成的许可在“本许可证”下的程序和相关文档的集合。
 
-   "贡献" 是指由任一"贡献者"许可在"本许可证"下的受版权法保护的作品。
+“贡献” 是指由任一“贡献者”许可在“本许可证”下的受版权法保护的作品。
 
-   "贡献者" 是指将受版权法保护的作品许可在"本许可证"下的自然人或"法人实体"。
+“贡献者” 是指将受版权法保护的作品许可在“本许可证”下的自然人或“法人实体”。
 
-   "法人实体" 是指提交贡献的机构及其"关联实体"。
+“法人实体” 是指提交贡献的机构及其“关联实体”。
 
-"关联实体" 是指，对"本许可证"下的行为方而言，控制、受控制或与其共同受控制的机构，此处的控制是指有受控方或共同受控方至少50%直接或间接的投票权、资金或其他有价证券。
+“关联实体” 是指，对“本许可证”下的行为方而言，控制、受控制或与其共同受控制的机构，此处的控制是指有受控方或共同受控方至少50%直接或间接的投票权、资金或其他有价证券。
 
-   1. 授予版权许可
+1.   授予版权许可
 
-   每个"贡献者"根据"本许可证"授予您永久性的、全球性的、免费的、非独占的、不可撤销的版权许可，您可以复制、使用、修改、分发其"贡献"，不论修改与否。
+每个“贡献者”根据“本许可证”授予您永久性的、全球性的、免费的、非独占的、不可撤销的版权许可，您可以复制、使用、修改、分发其“贡献”，不论修改与否。
 
-   2. 授予专利许可
+2.   授予专利许可
 
-每个"贡献者"根据"本许可证"授予您永久性的、全球性的、免费的、非独占的、不可撤销的（根据本条规定撤销除外）专利许可，供您制造、委托制造、使用、许诺销售、销售、进口其"贡献"或以其他方式转移其"贡献"。前述专利许可仅限于"贡献者"现在或将来拥有或控制的其"贡献"本身或其"贡献"与许可"贡献"时的"软件"结合而将必然会侵犯的专利权利要求，不包括对"贡献"的修改或包含"贡献"的其他结合。如果您或您的"关联实体"直接或间接地，就"软件"或其中的"贡献"对任何人发起专利侵权诉讼（包括反诉或交叉诉讼）或其他专利维权行动，指控其侵犯专利权，则"本许可证"授予您对"软件"的专利许可自您提起诉讼或发起维权行动之日终止。
+每个“贡献者”根据“本许可证”授予您永久性的、全球性的、免费的、非独占的、不可撤销的（根据本条规定撤销除外）专利许可，供您制造、委托制造、使用、许诺销售、销售、进口其“贡献”或以其他方式转移其“贡献”。前述专利许可仅限于“贡献者”现在或将来拥有或控制的其“贡献”本身或其“贡献”与许可“贡献”时的“软件”结合而将必然会侵犯的专利权利要求，不包括对“贡献”的修改或包含“贡献”的其他结合。如果您或您的“关联实体”直接或间接地，就“软件”或其中的“贡献”对任何人发起专利侵权诉讼（包括反诉或交叉诉讼）或其他专利维权行动，指控其侵犯专利权，则“本许可证”授予您对“软件”的专利许可自您提起诉讼或发起维权行动之日终止。
 
-   3. 无商标许可
+3.   无商标许可
 
-   "本许可证"不提供对"贡献者"的商品名称、商标、服务标志或产品名称的商标许可，但您为满足第4条规定的声明义务而必须使用除外。
+“本许可证”不提供对“贡献者”的商品名称、商标、服务标志或产品名称的商标许可，但您为满足第4条规定的声明义务而必须使用除外。
 
-   4. 分发限制
+4.   分发限制
 
-您可以在任何媒介中将"软件"以源程序形式或可执行形式重新分发，不论修改与否，但您必须向接收者提供"本许可证"的副本，并保留"软件"中的版权、商标、专利及免责声明。
+您可以在任何媒介中将“软件”以源程序形式或可执行形式重新分发，不论修改与否，但您必须向接收者提供“本许可证”的副本，并保留“软件”中的版权、商标、专利及免责声明。
 
-   5. 免责声明与责任限制
+5.   免责声明与责任限制
 
-"软件"及其中的"贡献"在提供时不带任何明示或默示的担保。在任何情况下，"贡献者"或版权所有者不对任何人因使用"软件"或其中的"贡献"而引发的任何直接或间接损失承担责任，不论因何种原因导致或者基于何种法律理论，即使其曾被建议有此种损失的可能性。
+“软件”及其中的“贡献”在提供时不带任何明示或默示的担保。在任何情况下，“贡献者”或版权所有者不对任何人因使用“软件”或其中的“贡献”而引发的任何直接或间接损失承担责任，不论因何种原因导致或者基于何种法律理论，即使其曾被建议有此种损失的可能性。
 
-   6. 语言
+6.   语言
 
-   "本许可证"以中英文双语表述，中英文版本具有同等法律效力。如果中英文版本存在任何冲突不一致，以中文版为准。
+“本许可证”以中英文双语表述，中英文版本具有同等法律效力。如果中英文版本存在任何冲突不一致，以中文版为准。
 
 条款结束
 
@@ -46,38 +49,33 @@
 
 如果您希望将木兰宽松许可证，第2版，应用到您的新软件，为了方便接收者查阅，建议您完成如下三步：
 
-   1， 请您补充如下声明中的空白，包括软件名、软件的首次发表年份以及您作为版权人的名字；
+1， 请您补充如下声明中的空白，包括软件名、软件的首次发表年份以及您作为版权人的名字；
 
-   2， 请您在软件包的一级目录下创建以"LICENSE"为名的文件，将整个许可证文本放入该文件中；
+2， 请您在软件包的一级目录下创建以“LICENSE”为名的文件，将整个许可证文本放入该文件中；
 
-   3， 请将如下声明文本放入每个源文件的头部注释中。
+3， 请将如下声明文本放入每个源文件的头部注释中。
 
 Copyright (c) [Year] [name of copyright holder]
-
 [Software Name] is licensed under Mulan PSL v2.
-
 You can use this software according to the terms and conditions of the Mulan
 PSL v2.
-
 You may obtain a copy of Mulan PSL v2 at:
-
-http://license.coscl.org.cn/MulanPSL2
-
+         http://license.coscl.org.cn/MulanPSL2
 THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
-
 EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
-
 MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
+See the Mulan PSL v2 for more details.
 
-See the Mulan PSL v2 for more details. Mulan Permissive Software License，Version
-2 Mulan Permissive Software License，Version 2 (Mulan PSL v2)
+Mulan Permissive Software License，Version 2
+
+Mulan Permissive Software License，Version 2 (Mulan PSL v2)
 
 January 2020 http://license.coscl.org.cn/MulanPSL2
 
 Your reproduction, use, modification and distribution of the Software shall
 be subject to Mulan PSL v2 (this License) with the following terms and conditions:
 
-   0. Definition
+0. Definition
 
 Software means the program and related documents which are licensed under
 this License and comprise all Contribution(s).
@@ -88,21 +86,21 @@ under this License.
 Contributor means the Individual or Legal Entity who licenses its copyrightable
 work under this License.
 
-   Legal Entity means the entity making a Contribution and all its Affiliates.
+Legal Entity means the entity making a Contribution and all its Affiliates.
 
 Affiliates means entities that control, are controlled by, or are under common
-control with the acting entity under this License, 'control' means direct
+control with the acting entity under this License, ‘control’ means direct
 or indirect ownership of at least fifty percent (50%) of the voting power,
 capital or other securities of controlled or commonly controlled entity.
 
-   1. Grant of Copyright License
+1. Grant of Copyright License
 
 Subject to the terms and conditions of this License, each Contributor hereby
 grants to you a perpetual, worldwide, royalty-free, non-exclusive, irrevocable
 copyright license to reproduce, use, modify, or distribute its Contribution,
 with modification or not.
 
-   2. Grant of Patent License
+2. Grant of Patent License
 
 Subject to the terms and conditions of this License, each Contributor hereby
 grants to you a perpetual, worldwide, royalty-free, non-exclusive, irrevocable
@@ -120,30 +118,30 @@ alleging that the Software or any Contribution in it infringes patents, then
 any patent license granted to you under this License for the Software shall
 terminate as of the date such litigation or activity is filed or taken.
 
-   3. No Trademark License
+3. No Trademark License
 
 No trademark license is granted to use the trade names, trademarks, service
 marks, or product names of Contributor, except as required to fulfill notice
 requirements in section 4.
 
-   4. Distribution Restriction
+4. Distribution Restriction
 
 You may distribute the Software in any medium with or without modification,
 whether in source or executable forms, provided that you provide recipients
 with a copy of this License and retain copyright, patent, trademark and disclaimer
 statements in the Software.
 
-   5. Disclaimer of Warranty and Limitation of Liability
+5. Disclaimer of Warranty and Limitation of Liability
 
 THE SOFTWARE AND CONTRIBUTION IN IT ARE PROVIDED WITHOUT WARRANTIES OF ANY
 KIND, EITHER EXPRESS OR IMPLIED. IN NO EVENT SHALL ANY CONTRIBUTOR OR COPYRIGHT
 HOLDER BE LIABLE TO YOU FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO ANY
 DIRECT, OR INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING FROM YOUR USE
 OR INABILITY TO USE THE SOFTWARE OR THE CONTRIBUTION IN IT, NO MATTER HOW
-IT'S CAUSED OR BASED ON WHICH LEGAL THEORY, EVEN IF ADVISED OF THE POSSIBILITY
+IT’S CAUSED OR BASED ON WHICH LEGAL THEORY, EVEN IF ADVISED OF THE POSSIBILITY
 OF SUCH DAMAGES.
 
-   6. Language
+6. Language
 
 THIS LICENSE IS WRITTEN IN BOTH CHINESE AND ENGLISH, AND THE CHINESE VERSION
 AND ENGLISH VERSION SHALL HAVE THE SAME LEGAL EFFECT. IN THE CASE OF DIVERGENCE
@@ -160,28 +158,18 @@ you are suggested to complete following three steps:
 i. Fill in the blanks in following statement, including insert your software
 name, the year of the first publication of your software, and your name identified
 as the copyright owner;
-
 ii. Create a file named "LICENSE" which contains the whole context of this
 License in the first directory of your software package;
-
 iii. Attach the statement to the appropriate annotated syntax at the beginning
 of each source file.
 
 Copyright (c) [Year] [name of copyright holder]
-
 [Software Name] is licensed under Mulan PSL v2.
-
 You can use this software according to the terms and conditions of the Mulan
 PSL v2.
-
 You may obtain a copy of Mulan PSL v2 at:
-
-http://license.coscl.org.cn/MulanPSL2
-
+         http://license.coscl.org.cn/MulanPSL2
 THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
-
 EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
-
 MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
-
 See the Mulan PSL v2 for more details.
diff --git a/options/license/Multics b/options/license/Multics
index 3c99e77813..8d1294ab17 100644
--- a/options/license/Multics
+++ b/options/license/Multics
@@ -1,4 +1,6 @@
-Multics License Historical Background
+Multics License
+
+Historical Background
 
 This edition of the Multics software materials and documentation is provided
 and donated to Massachusetts Institute of Technology by Group BULL including
@@ -13,20 +15,21 @@ Intelligence in the mid 1970s, under the leadership of Professor Fernando
 Jose Corbato. Users consider that Multics provided the best software architecture
 for managing computer hardware properly and for executing programs. Many subsequent
 operating systems incorporated Multics principles. Multics was distributed
-in 1975 to 2000 by Group Bull in Europe, and in the U.S. by Bull HN Information
+in 1975 to 2000 by Group Bull in Europe , and in the U.S. by Bull HN Information
 Systems Inc., as successor in interest by change in name only to Honeywell
-Bull Inc. and Honeywell Information Systems Inc. . -----------------------------------------------------------
+Bull Inc. and Honeywell Information Systems Inc.
+
+-----------------------------------------------------------
 
 Permission to use, copy, modify, and distribute these programs and their documentation
-for any purpose and without fee is hereby granted, provided that the below
+for any purpose and without fee is hereby granted,provided that the below
 copyright notice and historical background appear in all copies and that both
 the copyright notice and historical background and this permission notice
 appear in supporting documentation, and that the names of MIT, HIS, BULL or
 BULL HN not be used in advertising or publicity pertaining to distribution
-of the programs without specific prior written permission. Copyright 1972
-by Massachusetts Institute of Technology and Honeywell Information Systems
-Inc.
+of the programs without specific prior written permission.
 
+Copyright 1972 by Massachusetts Institute of Technology and Honeywell Information
+Systems Inc.
 Copyright 2006 by BULL HN Information Systems Inc.
-
 Copyright 2006 by Bull SAS All Rights Reserved
diff --git a/options/license/NASA-1.3 b/options/license/NASA-1.3
index eed377a61f..2a592add85 100644
--- a/options/license/NASA-1.3
+++ b/options/license/NASA-1.3
@@ -10,86 +10,53 @@ ANYONE WHO USES, REPRODUCES, DISTRIBUTES, MODIFIES OR REDISTRIBUTES THE SUBJECT
 SOFTWARE, AS DEFINED HEREIN, OR ANY PART THEREOF, IS, BY THAT ACTION, ACCEPTING
 IN FULL THE RESPONSIBILITIES AND OBLIGATIONS CONTAINED IN THIS AGREEMENT.
 
-Government Agency: _______________
+Government Agency: _____ Government Agency Original Software Designation:
+__ Government Agency Original Software Title: _____ User Registration Requested.
+Please Visit http://___ Government Agency Point of Contact for Original Software:
+_____
 
-Government Agency Original Software Designation: _______________
-
-Government Agency Original Software Title: _______________
-
-User Registration Requested. Please Visit http://_______________
-
-Government Agency Point of Contact for Original Software: _______________
-
-   
-
-   DEFINITIONS
+DEFINITIONS
 
 A. "Contributor" means Government Agency, as the developer of the Original
-Software, and any entity that makes a Modification.
+Software, and any entity that makes a Modification. B. "Covered Patents" mean
+patent claims licensable by a Contributor that are necessarily infringed by
+the use or sale of its Modification alone or when combined with the Subject
+Software. C. "Display" means the showing of a copy of the Subject Software,
+either directly or by means of an image, or any other device. D. "Distribution"
+means conveyance or transfer of the Subject Software, regardless of means,
+to another. E. "Larger Work" means computer software that combines Subject
+Software, or portions thereof, with software separate from the Subject Software
+that is not governed by the terms of this Agreement. F. "Modification" means
+any alteration of, including addition to or deletion from, the substance or
+structure of either the Original Software or Subject Software, and includes
+derivative works, as that term is defined in the Copyright Statute, 17 USC
+101. However, the act of including Subject Software as part of a Larger Work
+does not in and of itself constitute a Modification. G. "Original Software"
+means the computer software first released under this Agreement by Government
+Agency with Government Agency designation __ and entitled _________, including
+source code, object code and accompanying documentation, if any. H. "Recipient"
+means anyone who acquires the Subject Software under this Agreement, including
+all Contributors. I. "Redistribution" means Distribution of the Subject Software
+after a Modification has been made. J. "Reproduction" means the making of
+a counterpart, image or copy of the Subject Software. K. "Sale" means the
+exchange of the Subject Software for money or equivalent value. L. "Subject
+Software" means the Original Software, Modifications, or any respective parts
+thereof. M. "Use" means the application or employment of the Subject Software
+for any purpose.
 
-B. "Covered Patents" mean patent claims licensable by a Contributor that are
-necessarily infringed by the use or sale of its Modification alone or when
-combined with the Subject Software.
-
-C. "Display" means the showing of a copy of the Subject Software, either directly
-or by means of an image, or any other device.
-
-D. "Distribution" means conveyance or transfer of the Subject Software, regardless
-of means, to another.
-
-E. "Larger Work" means computer software that combines Subject Software, or
-portions thereof, with software separate from the Subject Software that is
-not governed by the terms of this Agreement.
-
-F. "Modification" means any alteration of, including addition to or deletion
-from, the substance or structure of either the Original Software or Subject
-Software, and includes derivative works, as that term is defined in the Copyright
-Statute, 17 USC 101. However, the act of including Subject Software as part
-of a Larger Work does not in and of itself constitute a Modification.
-
-G. "Original Software" means the computer software first released under this
-Agreement by Government Agency with Government Agency designation _______________
-and entitled _______________ , including source code, object code and accompanying
-documentation, if any.
-
-H. "Recipient" means anyone who acquires the Subject Software under this Agreement,
-including all Contributors.
-
-I. "Redistribution" means Distribution of the Subject Software after a Modification
-has been made.
-
-J. "Reproduction" means the making of a counterpart, image or copy of the
-Subject Software.
-
-K. "Sale" means the exchange of the Subject Software for money or equivalent
-value.
-
-L. "Subject Software" means the Original Software, Modifications, or any respective
-parts thereof.
-
-M. "Use" means the application or employment of the Subject Software for any
-purpose.
-
-   
-
-   GRANT OF RIGHTS
+GRANT OF RIGHTS
 
 A. Under Non-Patent Rights: Subject to the terms and conditions of this Agreement,
 each Contributor, with respect to its own contribution to the Subject Software,
 hereby grants to each Recipient a non-exclusive, world-wide, royalty-free
 license to engage in the following activities pertaining to the Subject Software:
 
-         1. Use
-
-         2. Distribution
-
-         3. Reproduction
-
-         4. Modification
-
-         5. Redistribution
-
-         6. Display
+     1. Use
+     2. Distribution
+     3. Reproduction
+     4. Modification
+     5. Redistribution
+     6. Display
 
 B. Under Patent Rights: Subject to the terms and conditions of this Agreement,
 each Contributor, with respect to its own contribution to the Subject Software,
@@ -97,15 +64,11 @@ hereby grants to each Recipient under Covered Patents a non-exclusive, world-wid
 royalty-free license to engage in the following activities pertaining to the
 Subject Software:
 
-         1. Use
-
-         2. Distribution
-
-         3. Reproduction
-
-         4. Sale
-
-         5. Offer for Sale
+     1. Use
+     2. Distribution
+     3. Reproduction
+     4. Sale
+     5. Offer for Sale
 
 C. The rights granted under Paragraph B. also apply to the combination of
 a Contributor's Modification and the Subject Software if, at the time the
@@ -117,9 +80,7 @@ D. The rights granted in Paragraphs A. and B. allow the Recipient to sublicense
 those same rights. Such sublicense must be under the same terms and conditions
 of this Agreement.
 
-   
-
-   OBLIGATIONS OF RECIPIENT
+OBLIGATIONS OF RECIPIENT
 
 A. Distribution or Redistribution of the Subject Software must be made under
 this Agreement except for additions covered under paragraph 3H.
@@ -127,7 +88,6 @@ this Agreement except for additions covered under paragraph 3H.
 1. Whenever a Recipient distributes or redistributes the Subject Software,
 a copy of this Agreement must be included with each copy of the Subject Software;
 and
-
 2. If Recipient distributes or redistributes the Subject Software in any form
 other than source code, Recipient must also make the source code freely available,
 and must provide with each copy of the Subject Software information on how
@@ -145,13 +105,13 @@ bracketed language.]
 to Government Agency contract and rights obtained from creator by assignment.
 Government Agency will insert the year and its Agency designation and remove
 the bracketed language.] Copyright (c) {YEAR} United States Government as
-represented by _______________ . All Rights Reserved.
+represented by ___ ____. All Rights Reserved.
 
 [The following copyright notice will be used if created by civil servants
 only. Government Agency will insert the year and its Agency designation and
 remove the bracketed language.] Copyright (c) {YEAR} United States Government
-as represented by _______________ . No copyright is claimed in the United
-States under Title 17, U.S.Code. All Other Rights Reserved.
+as represented by ____ ____. No copyright is claimed in the United States
+under Title 17, U.S.Code. All Other Rights Reserved.
 
 C. Each Contributor must characterize its alteration of the Subject Software
 as a Modification and must identify itself as the originator of its Modification
@@ -178,22 +138,22 @@ this Agreement.
 
 F. In an effort to track usage and maintain accurate records of the Subject
 Software, each Recipient, upon receipt of the Subject Software, is requested
-to register with Government Agency by visiting the following website: _______________
-. Recipient's name and personal information shall be used for statistical
-purposes only. Once a Recipient makes a Modification available, it is requested
-that the Recipient inform Government Agency at the web site provided above
-how to access the Modification.
+to register with Government Agency by visiting the following website: ______.
+Recipient's name and personal information shall be used for statistical purposes
+only. Once a Recipient makes a Modification available, it is requested that
+the Recipient inform Government Agency at the web site provided above how
+to access the Modification.
 
 [Alternative paragraph for use when a web site for release and monitoring
 of subject software will not be supported by releasing Government Agency]
 In an effort to track usage and maintain accurate records of the Subject Software,
 each Recipient, upon receipt of the Subject Software, is requested to provide
 Government Agency, by e-mail to the Government Agency Point of Contact listed
-in clause 5.F., the following information: _______________ . Recipient's name
-and personal information shall be used for statistical purposes only. Once
-a Recipient makes a Modification available, it is requested that the Recipient
-inform Government Agency, by e-mail to the Government Agency Point of Contact
-listed in clause 5.F., how to access the Modification.
+in clause 5.F., the following information: ______. Recipient's name and personal
+information shall be used for statistical purposes only. Once a Recipient
+makes a Modification available, it is requested that the Recipient inform
+Government Agency, by e-mail to the Government Agency Point of Contact listed
+in clause 5.F., how to access the Modification.
 
 G. Each Contributor represents that that its Modification is believed to be
 Contributor's original creation and does not violate any existing agreements,
@@ -224,9 +184,7 @@ U.S. laws. Government Agency neither represents that a license shall not be
 required nor that, if required, it shall be issued. Nothing granted herein
 provides any such export license.
 
-   
-
-   DISCLAIMER OF WARRANTIES AND LIABILITIES; WAIVER AND INDEMNIFICATION
+DISCLAIMER OF WARRANTIES AND LIABILITIES; WAIVER AND INDEMNIFICATION
 
 A. No Warranty: THE SUBJECT SOFTWARE IS PROVIDED "AS IS" WITHOUT ANY WARRANTY
 OF ANY KIND, EITHER EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED
@@ -251,9 +209,7 @@ UNITED STATES GOVERNMENT, ITS CONTRACTORS AND SUBCONTRACTORS, AS WELL AS ANY
 PRIOR RECIPIENT, TO THE EXTENT PERMITTED BY LAW. RECIPIENT'S SOLE REMEDY FOR
 ANY SUCH MATTER SHALL BE THE IMMEDIATE, UNILATERAL TERMINATION OF THIS AGREEMENT.
 
-   
-
-   GENERAL TERMS
+GENERAL TERMS
 
 A. Termination: This Agreement and the rights granted hereunder will terminate
 automatically if a Recipient fails to comply with these terms and conditions,
@@ -283,4 +239,4 @@ terms and conditions of this Agreement and that that Recipient hereby agrees
 to all terms and conditions herein.
 
 F. Point of Contact: Any Recipient contact with Government Agency is to be
-directed to the designated representative as follows: _______________ .
+directed to the designated representative as follows: ___________.
diff --git a/options/license/NBPL-1.0 b/options/license/NBPL-1.0
index 0f59ea20de..a39b7d476b 100644
--- a/options/license/NBPL-1.0
+++ b/options/license/NBPL-1.0
@@ -1,7 +1,10 @@
-The Net Boolean Public License Version 1, 22 August 1998 Copyright 1998, Net
-Boolean Incorporated, Redwood City, California, USA All Rights Reserved. Note:
-This license is derived from the "Artistic License" as distributed with the
-Perl Programming Language. Its terms are different from those of the "Artistic
+The Net Boolean Public License
+
+Version 1, 22 August 1998 Copyright 1998, Net Boolean Incorporated, Redwood
+City, California, USA All Rights Reserved.
+
+Note: This license is derived from the "Artistic License" as distributed with
+the Perl Programming Language. Its terms are different from those of the "Artistic
 License."
 
 PREAMBLE
@@ -52,14 +55,14 @@ medium, or placing the modifications on a major archive site such as uunet.uu.ne
 or by allowing the Copyright Holder to include your modifications in the Standard
 Version of the Package.
 
-      b) use the modified Package only within your corporation or organization.
+     b) use the modified Package only within your corporation or organization.
 
 c) rename any non-standard executables so the names do not conflict with standard
 executables, which must also be provided, and provide a separate manual page
 for each non-standard executable that clearly documents how it differs from
 the Standard Version.
 
-      d) make other distribution arrangements with the Copyright Holder.
+     d) make other distribution arrangements with the Copyright Holder.
 
 4. You may distribute the programs of this Package in object code or executable
 form, provided that you do at least ONE of the following:
@@ -76,7 +79,7 @@ Version executables, giving the non-standard executables non-standard names,
 and clearly documenting the differences in manual pages (or equivalent), together
 with instructions on where to get the Standard Version.
 
-      d) make other distribution arrangements with the Copyright Holder.
+     d) make other distribution arrangements with the Copyright Holder.
 
 5. You may charge a reasonable copying fee for any distribution of this Package.
 You may charge any fee you choose for support of this Package. You may not
@@ -101,4 +104,6 @@ products derived from this software without specific prior written permission.
 
 9. THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES,
 INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
-FITNESS FOR A PARTICULAR PURPOSE. The End
+FITNESS FOR A PARTICULAR PURPOSE.
+
+The End
diff --git a/options/license/NCGL-UK-2.0 b/options/license/NCGL-UK-2.0
index 44b8c79e3e..298192238b 100644
--- a/options/license/NCGL-UK-2.0
+++ b/options/license/NCGL-UK-2.0
@@ -1,5 +1,4 @@
 Non-Commercial Government Licence
-
 for public sector information
 
 You are encouraged to use and re-use the Information that is available under
@@ -8,7 +7,7 @@ this licence freely and flexibly, with only a few conditions.
 Using information under this licence
 
 Use of copyright and database right material expressly made available under
-this licence (the 'Information') indicates your acceptance of the terms and
+this licence (the ‘Information’) indicates your acceptance of the terms and
 conditions below.
 
 The Licensor grants you a worldwide, royalty-free, perpetual, non-exclusive
@@ -19,29 +18,23 @@ This licence does not affect your freedom under fair dealing or fair use or
 any other copyright or database right exceptions and limitations.
 
 You are free to:
-
-   copy, publish, distribute and transmit the Information;
-
-   adapt the Information;
-
-exploit the Information for Non-Commercial purposes for example, by combining
+		copy, publish, distribute and transmit the Information;
+		adapt the Information;
+		exploit the Information for Non-Commercial purposes for example, by combining
 it with other information in your own product or application.
 
 You are not permitted to:
-
-exercise any of the rights granted to you by this licence in any manner that
-is primarily intended for or directed toward commercial advantage or private
-monetary compensation.
+		exercise any of the rights granted to you by this licence in any manner
+that is primarily intended for or directed toward commercial advantage or
+private monetary compensation.
 
 You must, where you do any of the above:
-
-acknowledge the source of the Information by including any attribution statement
-specified by the Information Provider(s) and, where possible, provide a link
+		acknowledge the source of the Information by including any attribution statement
+specified by the Information Provider(s) and, where possible, provide a link
 to this licence;
 
 If the Information Provider does not provide a specific attribution statement,
 you must use the following:
-
 Contains information licensed under the Non-Commercial Government Licence
 v2.0.
 
@@ -49,8 +42,7 @@ If you are using Information from several Information Providers and listing
 multiple attributions is not practical in your product or application, you
 may include a URI or hyperlink to a resource that contains the required attribution
 statements.
-
-ensure that any onward licensing of the Information – for example when combined
+		ensure that any onward licensing of the Information – for example when combined
 with other information – is for Non-Commercial purposes only.
 
 These are important conditions of this licence and if you fail to comply with
@@ -61,78 +53,66 @@ will end automatically.
 Exemptions
 
 This licence does not cover the use of:
-
-   • personal data in the Information;
-
-• Information that has not been accessed by way of publication or disclosure
+	•	personal data in the Information;
+	•	Information that has not been accessed by way of publication or disclosure
 under information access legislation (including the Freedom of Information
 Acts for the UK and Scotland) by or with the consent of the Information Provider;
-
-• departmental or public sector organisation logos, crests, military insignia
+	•	departmental or public sector organisation logos, crests, military insignia
 and the Royal Arms except where they form an integral part of a document or
 dataset;
-
-   • military insignia
-
-   • third party rights the Information Provider is not authorised to license;
-
-• other intellectual property rights, including patents, trade marks, and
+	•	military insignia
+	•	third party rights the Information Provider is not authorised to license;
+	•	other intellectual property rights, including patents, trade marks, and
 design rights; and
-
-   • identity documents such as the British Passport.
+	•	identity documents such as the British Passport.
 
 Non-endorsement
-
 This licence does not grant you any right to use the Information in a way
 that suggests any official status or that the Information Provider and/or
 Licensor endorse you or your use of the Information.
 
 No warranty
-
-The Information is licensed 'as is' and the Information Provider excludes
+The Information is licensed ‘as is’ and the Information Provider excludes
 all representations, warranties, obligations and liabilities in relation to
 the Information to the maximum extent permitted by law.
-
 The Information Provider is not liable for any errors or omissions in the
 Information and shall not be liable for any loss, injury or damage of any
 kind caused by its use. The Information Provider does not guarantee the continued
 supply of the Information.
 
 Governing Law
-
 This licence is governed by the laws of the jurisdiction in which the Information
 Provider has its principal place of business, unless otherwise specified by
 the Information Provider.
 
 Definitions
-
 In this licence the terms below have the following meanings:
 
-'Information' means information protected by copyright or by database right
+‘Information’ means information protected by copyright or by database right
 (for example, literary and artistic works, content, data and source code)
 offered for use under the terms of this licence.
 
-'Information Provider' means the person or organisation providing the Information
+‘Information Provider’ means the person or organisation providing the Information
 under this licence.
 
-'Licensor' means any Information Provider which has the authority to offer
+‘Licensor’ means any Information Provider which has the authority to offer
 Information under the terms of this licence or the Keeper of the Public Records,
 who has the authority to offer Information subject to Crown copyright and
 Crown database rights and Information subject to copyright and database right
 that has been assigned to or acquired by the Crown, under the terms of this
 licence.
 
-'Non-Commercial purposes' means not intended for or directed toward commercial
+‘Non-Commercial purposes’ means not intended for or directed toward commercial
 advantage or private monetary compensation. For the purposes of this licence,
-'private monetary compensation' does not include the exchange of the Information
+‘private monetary compensation’ does not include the exchange of the Information
 for other copyrighted works by means of digital file-sharing or otherwise
 provided there is no payment of any monetary compensation in connection with
 the exchange of the Information.
 
-'Use' as a verb, means doing any act which is restricted by copyright or database
+‘Use’ as a verb, means doing any act which is restricted by copyright or database
 right, whether in the original medium or in any other medium, and includes
 without limitation distributing, copying, adapting, modifying as may be technically
 necessary to use it in a different mode or format.
 
-'You' means the natural or legal person, or body of persons corporate or incorporate,
+‘You’ means the natural or legal person, or body of persons corporate or incorporate,
 acquiring rights under this licence.
diff --git a/options/license/NCSA b/options/license/NCSA
index 3ed0f0e280..dc891b663e 100644
--- a/options/license/NCSA
+++ b/options/license/NCSA
@@ -1,13 +1,9 @@
-University of Illinois/NCSA Open Source License Copyright (c) <Year> <Owner
-Organization Name>. All rights reserved.
+University of Illinois/NCSA Open Source License
 
-Developed by: 
+Copyright (c) <Year> <Owner Organization Name>. All rights reserved.
 
-<Name of Development Group>
-
-<Name of Institution>
-
-<URL for Development Group/Institution>
+Developed by: <Name of Development Group> <Name of Institution> <URL for Development
+Group/Institution>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -23,9 +19,9 @@ list of conditions and the following disclaimers.
 this list of conditions and the following disclaimers in the documentation
 and/or other materials provided with the distribution.
 
-* Neither the names of <Name of Development Group, Name of Institution> ,
-nor the names of its contributors may be used to endorse or promote products
-derived from this Software without specific prior written permission.
+* Neither the names of <Name of Development Group, Name of Institution>, nor
+the names of its contributors may be used to endorse or promote products derived
+from this Software without specific prior written permission.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
diff --git a/options/license/NGPL b/options/license/NGPL
index 7ff93a0a88..cbd88d678e 100644
--- a/options/license/NGPL
+++ b/options/license/NGPL
@@ -1,79 +1,62 @@
-NETHACK GENERAL PUBLIC LICENSE (Copyright 1989 M. Stephenson)
-
+NETHACK GENERAL PUBLIC LICENSE
+(Copyright 1989 M. Stephenson)
 (Based on the BISON general public license, copyright 1988 Richard M. Stallman)
-
 Everyone is permitted to copy and distribute verbatim copies of this license,
 but changing it is not allowed. You can also use this wording to make the
 terms for other programs.
-
 The license agreements of most software companies keep you at the mercy of
 those companies. By contrast, our general public license is intended to give
 everyone the right to share NetHack. To make sure that you get the rights
 we want you to have, we need to make restrictions that forbid anyone to deny
 you these rights or to ask you to surrender the rights. Hence this license
 agreement.
-
 Specifically, we want to make sure that you have the right to give away copies
 of NetHack, that you receive source code or else can get it if you want it,
 that you can change NetHack or use pieces of it in new free programs, and
 that you know you can do these things.
-
 To make sure that everyone has such rights, we have to forbid you to deprive
 anyone else of these rights. For example, if you distribute copies of NetHack,
 you must give the recipients all the rights that you have. You must make sure
 that they, too, receive or can get the source code. And you must tell them
 their rights.
-
 Also, for our own protection, we must make certain that everyone finds out
 that there is no warranty for NetHack. If NetHack is modified by someone else
 and passed on, we want its recipients to know that what they have is not what
 we distributed.
-
 Therefore we (Mike Stephenson and other holders of NetHack copyrights) make
 the following terms which say what you must do to be allowed to distribute
 or change NetHack.
-
 COPYING POLICIES
-
 1. You may copy and distribute verbatim copies of NetHack source code as you
 receive it, in any medium, provided that you keep intact the notices on all
 files that refer to copyrights, to this License Agreement, and to the absence
 of any warranty; and give any other recipients of the NetHack program a copy
 of this License Agreement along with the program.
-
 2. You may modify your copy or copies of NetHack or any portion of it, and
 copy and distribute such modifications under the terms of Paragraph 1 above
 (including distributing this License Agreement), provided that you also do
 the following:
-
 a) cause the modified files to carry prominent notices stating that you changed
 the files and the date of any change; and
-
 b) cause the whole of any work that you distribute or publish, that in whole
 or in part contains or is a derivative of NetHack or any part thereof, to
 be licensed at no charge to all third parties on terms identical to those
 contained in this License Agreement (except that you may choose to grant more
 extensive warranty protection to some or all third parties, at your option)
-
 c) You may charge a distribution fee for the physical act of transferring
 a copy, and you may at your option offer warranty protection in exchange for
 a fee.
-
 3. You may copy and distribute NetHack (or a portion or derivative of it,
 under Paragraph 2) in object code or executable form under the terms of Paragraphs
 1 and 2 above provided that you also do one of the following:
-
 a) accompany it with the complete machine-readable source code, which must
 be distributed under the terms of Paragraphs 1 and 2 above; or,
-
 b) accompany it with full information as to how to obtain the complete machine-readable
 source code from an appropriate archive site. (This alternative is allowed
 only for noncommercial distribution.)
-
 For these purposes, complete source code means either the full source distribution
 as originally released over Usenet or updated copies of the files in this
 distribution used to create the object code or executable.
-
 4. You may not copy, sublicense, distribute or transfer NetHack except as
 expressly provided under this License Agreement. Any attempt otherwise to
 copy, sublicense, distribute or transfer NetHack is void and your rights to
@@ -81,7 +64,6 @@ use the program under this License agreement shall be automatically terminated.
 However, parties who have received computer software programs from you with
 this License Agreement will not have their licenses terminated so long as
 such parties remain in full compliance.
-
 Stated plainly: You are permitted to modify NetHack, or otherwise use parts
 of NetHack, provided that you comply with the conditions specified above;
 in particular, your modified NetHack or program containing parts of NetHack
diff --git a/options/license/NIST-PD b/options/license/NIST-PD
index 76938cde50..e1a4e65bab 100644
--- a/options/license/NIST-PD
+++ b/options/license/NIST-PD
@@ -2,14 +2,14 @@ Terms Of Use
 
 This software was developed by employees of the National Institute of Standards
 and Technology (NIST), and others. This software has been contributed to the
-public domain. Pursuant to title 15 Untied States Code Section 105, works
-of NIST employees are not subject to copyright protection in the United States
-and are considered to be in the public domain. As a result, a formal license
-is not needed to use this software.
+public domain. Pursuant to title 15 Untied States Code Section 105, works of
+NIST employees are not subject to copyright protection in the United States and
+are considered to be in the public domain. As a result, a formal license is
+not needed to use this software.
 
 This software is provided "AS IS." NIST MAKES NO WARRANTY OF ANY KIND, EXPRESS,
-IMPLIED OR STATUTORY, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTY
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT AND
-DATA ACCURACY. NIST does not warrant or make any representations regarding
-the use of the software or the results thereof, including but not limited
-to the correctness, accuracy, reliability or usefulness of this software.
+IMPLIED OR STATUTORY, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTY OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT AND DATA
+ACCURACY. NIST does not warrant or make any representations regarding the use
+of the software or the results thereof, including but not limited to the
+correctness, accuracy, reliability or usefulness of this software.
diff --git a/options/license/NLOD-1.0 b/options/license/NLOD-1.0
index 9daee7f9ad..524038a72d 100644
--- a/options/license/NLOD-1.0
+++ b/options/license/NLOD-1.0
@@ -16,65 +16,50 @@ or that follow from exemptions or limitations stipulated in the Norwegian
 Copyright Act. Further, the licence shall not impose any limitations on the
 licensee's freedom of expression recognized by law.
 
-   1. Definitions
+1. Definitions
 
 «Database» shall mean a database or similar protected under Section 43 of
 the Norwegian Copyright Act.
-
 «Information» shall mean texts, images, recordings, data sets or other works
 protected under Section 1 of the Norwegian Copyright Act, or which are protected
 under provisions addressing what is referred to as «neighbouring rights» in
 Chapter 5 of the Norwegian Copyright Act (including databases and photographs),
 and which are distributed under this licence.
-
-   «Copy» shall mean reproduction in any form.
-
+     «Copy» shall mean reproduction in any form.
 «Licensee» and «you» shall mean natural or legal persons using information
 under this licence.
-
 «Licensor» shall mean the natural or legal person that makes information available
 under this licence.
-
 «Distribute» shall mean any actions whereby information is made available,
 including to distribute, transfer, communicate, disperse, show, perform, sell,
 lend and rent.
-
 «Use» shall mean one or more actions relevant to copyright law requiring permission
 from the owner of the copyright.
 
-   2. Licence
-
+2. Licence
 The licensee, subject to the limitations that follow from this licence, may
 use the information for any purpose and in all contexts, by:
 
-   * copying the information and distributing the information to others,
-
+     * copying the information and distributing the information to others,
 * modifying the information and/or combining the information with other information,
 and
-
-   * copying and distributing such changed or combined information.
-
+     * copying and distributing such changed or combined information.
 * This is a non-exclusive, free, perpetual and worldwide licence. The information
 may be used in any medium and format known today and/or which will become
 known in the future. The Licensee shall not sub-license or transfer this licence.
 
-   3. Exemptions
-
-   The licence does not apply to and therefore does not grant a right to use:
+3. Exemptions
+The licence does not apply to and therefore does not grant a right to use:
 
 * information which contains personal data covered by the Norwegian Personal
 Data Act unless there is a legitimate basis for the disclosure and further
 processing of the personal data
-
 * information distributed in violation of a statutory obligation to observe
 confidentiality
-
 * information excluded from public disclosure pursuant to law, including information
 deemed sensitive under the Norwegian National Security Act
-
 * information subject to third party rights which the licensor is not authorised
 to license to the licensee
-
 * information protected by intellectual property rights other than copyright
 and neighbouring rights in accordance with Chapter 5 of the Norwegian Copyright
 Act, such as trademarks, patents and design rights, but this does not entail
@@ -88,8 +73,7 @@ under the licence, and erase the information as soon as he or she becomes
 aware of or should have understood that the information is not covered by
 the licence.
 
-   4. Effects of breach of the licence
-
+4. Effects of breach of the licence
 The licence is subject to the licensee's compliance with the terms and conditions
 of this licence. In the event that the licensee commits a breach of this licence,
 this will entail that the licensee's right to use the information will be
@@ -99,8 +83,7 @@ the infringement to end. Because the right to use the information has been
 terminated, the licensee must cease all use of the information by virtue of
 the licence.
 
-   5. Attribution
-
+5. Attribution
 The licensee shall attribute the licensor as specified by the licensor and
 include a reference to this licence. To the extent practically possible, the
 licensee shall provide a link to both this licence and the source of the information.
@@ -116,17 +99,14 @@ also state this.
 If the information has been changed, the licensee must clearly indicate that
 changes have been made by the licensee.
 
-   6. Proper use
-
+6. Proper use
 The licensee shall not use the information in a manner that appears misleading
 nor present the information in a distorted or incorrect manner.
-
 Neither the licensor's nor other contributors' names or trademarks must be
 used to support, recommend or market the licensee or any products or services
 using the information.
 
-   7. Disclaimer of liability
-
+7. Disclaimer of liability
 The information is licensed «as is». The information may contain errors and
 omissions. The licensor provides no warranties, including relating to the
 content and relevance of the information.
@@ -138,8 +118,7 @@ The licensor shall not be liable for direct or indirect losses as a result
 of use of the information or in connection with copying or further distribution
 of the information.
 
-   8. Guarantees regarding data quality and accessibility
-
+8. Guarantees regarding data quality and accessibility
 This licence does not prevent the licensor from issuing supplementary statements
 regarding expected or intended data quality and accessibility. Such statements
 shall be regarded as indicative in nature and not binding on the part of the
@@ -148,29 +127,25 @@ statements. Based on separate agreement, the licensor may provide guarantees
 and distribute the information on terms and conditions different from those
 set forth in this licence.
 
-   9. Licence compatibility
-
+9. Licence compatibility
 If the licensee is to distribute an adapted or combined work based on information
 covered by this licence and some other work licensed under a licence compatible
 by contract, such distribution may be based on an appropriate licence compatible
 by contract, cf. the list below.
 
-   A licence compatible by contract shall mean the following licences:
-
-   * for all information: Open Government Licence (version 1.0),
+A licence compatible by contract shall mean the following licences:
 
+     * for all information: Open Government Licence (version 1.0),
 * for those parts of the information which do not constitute databases: Creative
 Commons Attribution Licence (generic version 1.0, 2.0, 2.5 and unported version
 3.0) and Creative Commons Navngivelse 3.0 Norge,
-
 * for those parts of the information which constitute databases: Open Data
 Commons Attribution License (version 1.0).
 
 This provision does not prevent other licences from being compatible with
 this licence based on their content.
 
-   10. New versions of the licence
-
+10. New versions of the licence
 The licensee may choose to use the information covered by this licence under
 any new versions of the Norwegian licence for Open Government data (NLOD)
 issued by the responsible ministry (currently the Ministry of Government Administration,
@@ -178,8 +153,7 @@ Reform and Church Affairs) when these versions are final and official, unless
 the licensor when making the information available under this licence specifically
 has stated that solely version 1.0 of this licence may be used.
 
-   11. Governing law and legal venue
-
+11. Governing law and legal venue
 This licence, including its formation, and any disputes and claims arising
 in connection with or relating to this licence, shall be regulated by Norwegian
 law. The legal venue shall be the licensor's ordinary legal venue. The licensor
diff --git a/options/license/NLPL b/options/license/NLPL
index 3bbbb2f6ec..79f83af89b 100644
--- a/options/license/NLPL
+++ b/options/license/NLPL
@@ -1,13 +1,14 @@
+NO LIMIT PUBLIC LICENSE
+     Version 0, June 2012
+
+Gilles LAMIRAL
+La Billais
+35580 Baulon
+France
+
 NO LIMIT PUBLIC LICENSE
 
-Version 0, June 2012 Gilles LAMIRAL
+Terms and conditions for copying, distribution, modification
+or anything else.
 
-La Billais
-
-35580 Baulon
-
-France NO LIMIT PUBLIC LICENSE
-
-Terms and conditions for copying, distribution, modification or anything else.
-
-   0. No limit to do anything with this work and this license.
+     0. No limit to do anything with this work and this license.
diff --git a/options/license/NOSL b/options/license/NOSL
index 6c3355a8d1..59567cfc34 100644
--- a/options/license/NOSL
+++ b/options/license/NOSL
@@ -1,8 +1,7 @@
 NETIZEN OPEN SOURCE LICENSE
-
 Version 1.0
 
-   1. Definitions.
+1. Definitions.
 
 1.0.1. "Commercial Use" means distribution or otherwise making the Covered
 Code available to a third party.
@@ -20,7 +19,7 @@ of the Original Code and Modifications, in each case including portions thereof.
 1.4. "Electronic Distribution Mechanism" means a mechanism generally accepted
 in the software development community for the electronic transfer of data.
 
-      1.5. "Executable" means Covered Code in any form other than Source Code.
+     1.5. "Executable" means Covered Code in any form other than Source Code.
 
 1.6. "Initial Developer" means the individual or entity identified as the
 Initial Developer in the Source Code notice required by Exhibit A.
@@ -28,7 +27,7 @@ Initial Developer in the Source Code notice required by Exhibit A.
 1.7. "Larger Work" means a work which combines Covered Code or portions thereof
 with code not governed by the terms of this License.
 
-      1.8. "License" means this document.
+     1.8. "License" means this document.
 
 1.8.1. "Licensable" means having the right to grant, to the maximum extent
 possible, whether at the time of the initial grant or subsequently acquired,
@@ -37,10 +36,8 @@ any and all of the rights conveyed herein.
 1.9. "Modifications" means any addition to or deletion from the substance
 or structure of either the Original Code or any previous Modifications. When
 Covered Code is released as a series of files, a Modification is:
-
 A. Any addition to or deletion from the contents of a file containing Original
 Code or previous Modifications.
-
 B. Any new file that contains any part of the Original Code or previous Modifications.
 
 1.10. "Original Code" means Source Code of computer software code which is
@@ -70,51 +67,42 @@ or indirect, to cause the direction or management of such entity, whether
 by contract or otherwise, or (b) ownership of more than fifty percent (50%)
 of the outstanding shares or beneficial ownership of such entity.
 
-   2. Source Code License.
+2. Source Code License.
 
 2.1. The Initial Developer Grant. The Initial Developer hereby grants You
 a world-wide, royalty-free, non-exclusive license, subject to third party
 intellectual property claims:
-
 (a) under intellectual property rights (other than patent or trademark) Licensable
 by Initial Developer to use, reproduce, modify, display, perform, sublicense
 and distribute the Original Code (or portions thereof) with or without Modifications,
 and/or as part of a Larger Work; and
-
 (b) under Patents Claims infringed by the making, using or selling of Original
 Code, to make, have made, use, practice, sell, and offer for sale, and/or
 otherwise dispose of the Original Code (or portions thereof).
-
 (c) the licenses granted in this Section 2.1(a) and (b) are effective on the
 date Initial Developer first distributes Original Code under the terms of
 this License.
-
 (d) Notwithstanding Section 2.1(b) above, no patent license is granted: 1)
 for code that You delete from the Original Code; 2) separate from the Original
 Code; or 3) for infringements caused by: i) the modification of the Original
 Code or ii) the combination of the Original Code with other software or devices.
 
-      2.2. Contributor Grant.
-
+     2.2. Contributor Grant.
 Subject to third party intellectual property claims, each Contributor hereby
 grants You a world-wide, royalty-free, non-exclusive license
-
 (a) under intellectual property rights (other than patent or trademark) Licensable
 by Contributor, to use, reproduce, modify, display, perform, sublicense and
 distribute the Modifications created by such Contributor (or portions thereof)
 either on an unmodified basis, with other Modifications, as Covered Code and/or
 as part of a Larger Work; and
-
 (b) under Patent Claims infringed by the making, using, or selling of Modifications
 made by that Contributor either alone and/or in combination with its Contributor
 Version (or portions of such combination), to make, use, sell, offer for sale,
 have made, and/or otherwise dispose of: 1) Modifications made by that Contributor
 (or portions thereof); and 2) the combination of Modifications made by that
 Contributor with its Contributor Version (or portions of such combination).
-
 (c) the licenses granted in Sections 2.2(a) and 2.2(b) are effective on the
 date Contributor first makes Commercial Use of the Covered Code.
-
 (d) Notwithstanding Section 2.2(b) above, no patent license is granted: 1)
 for any code that Contributor has deleted from the Contributor Version; 2)
 separate from the Contributor Version; 3) for infringements caused by: i)
@@ -123,7 +111,7 @@ Modifications made by that Contributor with other software (except as part
 of the Contributor Version) or other devices; or 4) under Patent Claims infringed
 by Covered Code in the absence of Modifications made by that Contributor.
 
-   3. Distribution Obligations.
+3. Distribution Obligations.
 
 3.1. Application of License. The Modifications which You create or to which
 You contribute are governed by the terms of this License, including without
@@ -156,10 +144,8 @@ Developer in (a) the Source Code, and (b) in any notice in an Executable version
 or related documentation in which You describe the origin or ownership of
 the Covered Code.
 
-      3.4. Intellectual Property Matters
-
-         (a) Third Party Claims.
-
+     3.4. Intellectual Property Matters
+          (a) Third Party Claims.
 If Contributor has knowledge that a license under a third party's intellectual
 property rights is required to exercise the rights granted by such Contributor
 under Sections 2.1 or 2.2, Contributor must include a text file with the Source
@@ -171,23 +157,18 @@ in all copies Contributor makes available thereafter and shall take other
 steps (such as notifying appropriate mailing lists or newsgroups) reasonably
 calculated to inform those who received the Covered Code that new knowledge
 has been obtained.
-
-         (b) Contributor APIs.
-
+          (b) Contributor APIs.
 If Contributor's Modifications include an application programming interface
 and Contributor has knowledge of patent licenses which are reasonably necessary
 to implement that API, Contributor must also include this information in the
 LEGAL file.
-
-         (c) Representations.
-
+          (c) Representations.
 Contributor represents that, except as disclosed pursuant to Section 3.4(a)
 above, Contributor believes that Contributor's Modifications are Contributor's
 original creation(s) and/or Contributor has sufficient rights to grant the
 rights conveyed by this License.
 
-      3.5. Required Notices.
-
+     3.5. Required Notices.
 You must duplicate the notice in Exhibit A in each file of the Source Code.
 If it is not possible to put such notice in a particular Source Code file
 due to its structure, then You must include such notice in a location (such
@@ -205,8 +186,7 @@ the Initial Developer and every Contributor for any liability incurred by
 the Initial Developer or such Contributor as a result of warranty, support,
 indemnity or liability terms You offer.
 
-      3.6. Distribution of Executable Versions.
-
+     3.6. Distribution of Executable Versions.
 You may distribute Covered Code in Executable form only if the requirements
 of Section 3.1-3.5 have been met for that Covered Code, and if You include
 a notice stating that the Source Code version of the Covered Code is available
@@ -226,14 +206,13 @@ or any Contributor. You hereby agree to indemnify the Initial Developer and
 every Contributor for any liability incurred by the Initial Developer or such
 Contributor as a result of any such terms You offer.
 
-      3.7. Larger Works.
-
+     3.7. Larger Works.
 You may create a Larger Work by combining Covered Code with other code not
 governed by the terms of this License and distribute the Larger Work as a
 single LEDs product. In such a case, You must make sure the requirements of
 this License are fulfilled for the Covered Code.
 
-   4. Inability to Comply Due to Statute or Regulation.
+4. Inability to Comply Due to Statute or Regulation.
 
 If it is impossible for You to comply with any of the terms of this License
 with respect to some or all of the Covered Code due to statute, judicial order,
@@ -245,29 +224,26 @@ Except to the extent prohibited by statute or regulation, such description
 must be sufficiently detailed for a recipient of ordinary skill to be able
 to understand it.
 
-   5. Application of this License.
+5. Application of this License.
 
 This License applies to code to which the Initial Developer has attached the
 notice in Exhibit A and to related Covered Code.
 
-   6. Versions of the License.
-
-      6.1. New Versions.
+6. Versions of the License.
 
+     6.1. New Versions.
 Netizen Pty Ltd ("Netizen ") may publish revised and/or new versions of the
 License from time to time. Each version will be given a distinguishing version
 number.
 
-      6.2. Effect of New Versions.
-
+     6.2. Effect of New Versions.
 Once Covered Code has been published under a particular version of the License,
 You may always continue to use it under the terms of that version. You may
 also choose to use such Covered Code under the terms of any subsequent version
 of the License published by Netizen. No one other than Netizen has the right
 to modify the terms applicable to Covered Code created under this License.
 
-      6.3. Derivative Works.
-
+     6.3. Derivative Works.
 If You create or use a modified version of this License (which you may only
 do in order to apply it to code which is not already Covered Code governed
 by this License), You must (a) rename Your license so that the phrases "Netizen",
@@ -279,7 +255,7 @@ name of the Initial Developer, Original Code or Contributor in the notice
 described in Exhibit A shall not of themselves be deemed to be modifications
 of this License.)
 
-   7. DISCLAIMER OF WARRANTY.
+7. DISCLAIMER OF WARRANTY.
 
 COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTY
 OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES
@@ -307,7 +283,7 @@ of the cost of having the goods repaired; and if the breach relates to services
 the supplying of the services again; or the payment of the cost of having
 the services supplied again.
 
-   8. TERMINATION.
+8. TERMINATION.
 
 8.1. This License and the rights granted hereunder will terminate automatically
 if You fail to comply with terms herein and fail to cure such breach within
@@ -320,7 +296,6 @@ of this License shall survive.
 declatory judgment actions) against Initial Developer or a Contributor (the
 Initial Developer or Contributor against whom You file such action is referred
 to as "Participant") alleging that:
-
 (a) such Participant's Contributor Version directly or indirectly infringes
 any patent, then any and all rights granted by such Participant to You under
 Sections 2.1 and/or 2.2 of this License shall, upon 60 days notice from Participant
@@ -333,7 +308,6 @@ and payment arrangement are not mutually agreed upon in writing by the parties
 or the litigation claim is not withdrawn, the rights granted by Participant
 to You under Sections 2.1 and/or 2.2 automatically terminate at the expiration
 of the 60 day notice period specified above.
-
 (b) any software, hardware, or device, other than such Participant's Contributor
 Version, directly or indirectly infringes any patent, then any rights granted
 to You by such Participant under Sections 2.1(b) and 2.2(b) are revoked effective
@@ -353,8 +327,7 @@ user license agreements (excluding distributors and resellers) which have
 been validly granted by You or any distributor hereunder prior to termination
 shall survive termination.
 
-   9. LIMITATION OF LIABILITY.
-
+9. LIMITATION OF LIABILITY.
 UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING
 NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER, ANY
 OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE, OR ANY SUPPLIER OF
@@ -369,7 +342,7 @@ SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL
 OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO
 YOU.
 
-   10. U.S. GOVERNMENT END USERS.
+10. U.S. GOVERNMENT END USERS.
 
 The Covered Code is a "commercial item," as that term is defined in 48 C.F.R.
 2.101 (Oct. 1995), consisting of "commercial computer software" and "commercial
@@ -378,23 +351,21 @@ computer software documentation," as such terms are used in 48 C.F.R. 12.212
 227.7202-4 (June 1995), all U.S. Government End Users acquire Covered Code
 with only those rights set forth herein.
 
-   11. MISCELLANEOUS.
+11. MISCELLANEOUS.
 
 This License represents the complete agreement concerning 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.
-
 This Agreement shall be governed by and construed according to the law of
 the State of Victoria. The parties irrevocably submit to the exclusive jurisdiction
 of the Courts of Victoria and Australia and any Courts hearing appeals from
 such Courts. This Agreement is deemed to have been made in Victoria.
-
 The application of the United Nations Convention on Contracts for the International
 Sale of Goods is expressly excluded. Any law or regulation which provides
 that the language of a contract shall be construed against the drafter shall
 not apply to this License.
 
-   12. RESPONSIBILITY FOR CLAIMS.
+12. RESPONSIBILITY FOR CLAIMS.
 
 As between Initial Developer and the Contributors, each party is responsible
 for claims and damages arising, directly or indirectly, out of its utilization
@@ -403,13 +374,15 @@ and Contributors to distribute such responsibility on an equitable basis.
 Nothing herein is intended or shall be deemed to constitute any admission
 of liability.
 
-   13. MULTIPLE-LICENSED CODE.
+13. MULTIPLE-LICENSED CODE.
 
 Initial Developer may designate portions of the Covered Code as "Multiple-Licensed".
 "Multiple-Licensed" means that the Initial Developer permits you to utilize
 portions of the Covered Code under Your choice of the NPL or the alternative
 licenses, if any, specified by the Initial Developer in the file described
-in Exhibit A. EXHIBIT A - Netizen Open Source License
+in Exhibit A.
+
+EXHIBIT A - Netizen Open Source License
 
 ``The contents of this file are subject to the Netizen Open Source License
 Version 1.0 (the "License"); you may not use this file except in compliance
@@ -419,13 +392,13 @@ Software distributed under the License is distributed on an "AS IS" basis,
 WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
 the specific language governing rights and limitations under the License.
 
-The Original Code is ______________________________________.
+     The Original Code is ______________________________________.
 
 The Initial Developer of the Original Code is ________________________. Portions
 created by ______________________ are Copyright (C) ______ _______________________.
 All Rights Reserved.
 
-Contributor(s): ______________________________________.
+     Contributor(s): ______________________________________.
 
 Alternatively, the contents of this file may be used under the terms of the
 _____ license (the "[___] License"), in which case the provisions of [______]
diff --git a/options/license/NPL-1.0 b/options/license/NPL-1.0
index 7dbff9977a..344d059220 100644
--- a/options/license/NPL-1.0
+++ b/options/license/NPL-1.0
@@ -1,8 +1,6 @@
-NETSCAPE PUBLIC LICENSE
+NETSCAPE PUBLIC LICENSE Version 1.0
 
-Version 1.0
-
-   1. Definitions.
+1. Definitions.
 
 1.1. ``Contributor'' means each entity that creates or contributes to the
 creation of Modifications.
@@ -10,37 +8,27 @@ creation of Modifications.
 1.2. ``Contributor Version'' means the combination of the Original Code, prior
 Modifications used by a Contributor, and the Modifications made by that particular
 Contributor.
-
 1.3. ``Covered Code'' means the Original Code or Modifications or the combination
 of the Original Code and Modifications, in each case including portions thereof.
-
 1.4. ``Electronic Distribution Mechanism'' means a mechanism generally accepted
 in the software development community for the electronic transfer of data.
-
-1.5. ``Executable'' means Covered Code in any form other than Source Code.
-
+     1.5. ``Executable'' means Covered Code in any form other than Source Code.
 1.6. ``Initial Developer'' means the individual or entity identified as the
 Initial Developer in the Source Code notice required byExhibit A.
-
 1.7. ``Larger Work'' means a work which combines Covered Code or portions
 thereof with code not governed by the terms of this License.
-
-      1.8. ``License'' means this document.
-
+     1.8. ``License'' means this document.
 1.9. ``Modifications'' means any addition to or deletion from the substance
 or structure of either the Original Code or any previous Modifications. When
 Covered Code is released as a series of files, a Modification is:
-
 A. Any addition to or deletion from the contents of a file containing Original
-Code or previous Modifications.
-
-B. Any new file that contains any part of the Original Code or previous Modifications.
+Code or previous Modifications.           B. Any new file that contains any
+part of the Original Code or previous Modifications.
 
 1.10. ``Original Code'' means Source Code of computer software code which
 is described in the Source Code notice required byExhibit A as Original Code,
 and which, at the time of its release under this License is not already Covered
 Code governed by this License.
-
 1.11. ``Source Code'' means the preferred form of the Covered Code for making
 modifications to it, including all modules it contains, plus any associated
 interface definition files, scripts used to control compilation and installation
@@ -49,7 +37,6 @@ either the Original Code or another well known, available Covered Code of
 the Contributor's choice. The Source Code can be in a compressed or archival
 form, provided the appropriate decompression or de-archiving software is widely
 available for no charge.
-
 1.12. ``You'' means an individual or a legal entity exercising rights under,
 and complying with all of the terms of, this License or a future version of
 this License issued under Section 6.1. For legal entities, ``You'' includes
@@ -59,16 +46,14 @@ or indirect, to cause the direction or management of such entity, whether
 by contract or otherwise, or (b) ownership of fifty percent (50%) or more
 of the outstanding shares or beneficial ownership of such entity.
 
-   2. Source Code License.
+2. Source Code License.
 
 2.1. The Initial Developer Grant. The Initial Developer hereby grants You
 a world-wide, royalty-free, non-exclusive license, subject to third party
 intellectual property claims:
-
 a) to use, reproduce, modify, display, perform, sublicense and distribute
 the Original Code (or portions thereof) with or without Modifications, or
 as part of a Larger Work; and
-
 (b) under patents now or hereafter owned or controlled by Initial Developer,
 to make, have made, use and sell (``Utilize'') the Original Code (or portions
 thereof), but solely to the extent that any such patent is reasonably necessary
@@ -76,25 +61,20 @@ to enable You to Utilize the Original Code (or portions thereof) and not to
 any greater extent that may be necessary to Utilize further Modifications
 or combinations.
 
-      
-
-      2.2. Contributor Grant.
-
-Each Contributor hereby grants You a world-wide, royalty-free, non-exclusive
-license, subject to third party intellectual property claims:
-
+2.2. Contributor Grant.  Each Contributor hereby grants You a world-wide,
+royalty-free, non-exclusive license, subject to third party intellectual property
+claims:
 (a) to use, reproduce, modify, display, perform, sublicense and distribute
 the Modifications created by such Contributor (or portions thereof) either
 on an unmodified basis, with other Modifications, as Covered Code or as part
 of a Larger Work; and
+		  (b) under patents now or hereafter owned or controlled by Contributor,
+to Utilize the Contributor Version (or portions thereof), but solely to the
+extent that any such patent is reasonably necessary to enable You to Utilize
+the Contributor Version (or portions thereof), and not to any greater extent
+that may be necessary to Utilize further Modifications or combinations.
 
-(b) under patents now or hereafter owned or controlled by Contributor, to
-Utilize the Contributor Version (or portions thereof), but solely to the extent
-that any such patent is reasonably necessary to enable You to Utilize the
-Contributor Version (or portions thereof), and not to any greater extent that
-may be necessary to Utilize further Modifications or combinations.
-
-   3. Distribution Obligations.
+3. Distribution Obligations.
 
 3.1. Application of License. The Modifications which You create or to which
 You contribute are governed by the terms of this License, including without
@@ -117,7 +97,6 @@ date it initially became available, or at least six (6) months after a subsequen
 version of that particular Modification has been made available to such recipients.
 You are responsible for ensuring that the Source Code version remains available
 even if the Electronic Distribution Mechanism is maintained by a third party.
-
 3.3. Description of Modifications. You must cause all Covered Code to which
 you contribute to contain a file documenting the changes You made to create
 that Covered Code and the date of any change. You must include a prominent
@@ -126,9 +105,7 @@ Code provided by the Initial Developer and including the name of the Initial
 Developer in (a) the Source Code, and (b) in any notice in an Executable version
 or related documentation in which You describe the origin or ownership of
 the Covered Code.
-
-      3.4. Intellectual Property Matters
-
+     3.4. Intellectual Property Matters
 (a) Third Party Claims. If You have knowledge that a party claims an intellectual
 property right in particular functionality or code (or its utilization under
 this License), you must include a text file with the source code distribution
@@ -139,7 +116,6 @@ Section 3.2, You shall promptly modify the LEGAL file in all copies You make
 available thereafter and shall take other steps (such as notifying appropriate
 mailing lists or newsgroups) reasonably calculated to inform those who received
 the Covered Code that new knowledge has been obtained.
-
 (b) Contributor APIs. If Your Modification is an application programming interface
 and You own or control patents which are reasonably necessary to implement
 that API, you must also include this information in the LEGAL file.
@@ -160,7 +136,6 @@ or liability obligation is offered by You alone, and You hereby agree to indemni
 the Initial Developer and every Contributor for any liability incurred by
 the Initial Developer or such Contributor as a result of warranty, support,
 indemnity or liability terms You offer.
-
 3.6. Distribution of Executable Versions. You may distribute Covered Code
 in Executable form only if the requirements of Section 3.1-3.5 have been met
 for that Covered Code, and if You include a notice stating that the Source
@@ -179,14 +154,12 @@ terms which differ from this License are offered by You alone, not by the
 Initial Developer or any Contributor. You hereby agree to indemnify the Initial
 Developer and every Contributor for any liability incurred by the Initial
 Developer or such Contributor as a result of any such terms You offer.
-
 3.7. Larger Works. You may create a Larger Work by combining Covered Code
 with other code not governed by the terms of this License and distribute the
 Larger Work as a single product. In such a case, You must make sure the requirements
 of this License are fulfilled for the Covered Code.
 
-   4. Inability to Comply Due to Statute or Regulation.
-
+4. Inability to Comply Due to Statute or Regulation.
 If it is impossible for You to comply with any of the terms of this License
 with respect to some or all of the Covered Code due to statute or regulation
 then You must: (a) comply with the terms of this License to the maximum extent
@@ -196,13 +169,11 @@ must be included with all distributions of the Source Code. Except to the
 extent prohibited by statute or regulation, such description must be sufficiently
 detailed for a recipient of ordinary skill to be able to understand it.
 
-   5. Application of this License.
-
+5. Application of this License.
 This License applies to code to which the Initial Developer has attached the
 notice in Exhibit A, and to related Covered Code.
 
-   6. Versions of the License.
-
+6. Versions of the License.
 6.1. New Versions. Netscape Communications Corporation (``Netscape'') may
 publish revised and/or new versions of the License from time to time. Each
 version will be given a distinguishing version number.
@@ -213,7 +184,6 @@ the terms of that version. You may also choose to use such Covered Code under
 the terms of any subsequent version of the License published by Netscape.
 No one other than Netscape has the right to modify the terms applicable to
 Covered Code created under this License.
-
 6.3. Derivative Works. If you create or use a modified version of this License
 (which you may only do in order to apply it to code which is not already Covered
 Code governed by this License), you must (a) rename Your license so that the
@@ -225,7 +195,7 @@ in the name of the Initial Developer, Original Code or Contributor in the
 notice described in Exhibit A shall not of themselves be deemed to be modifications
 of this License.)
 
-   7. DISCLAIMER OF WARRANTY.
+7. DISCLAIMER OF WARRANTY.
 
 COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN ``AS IS'' BASIS, WITHOUT
 WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION,
@@ -237,7 +207,7 @@ ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIME
 OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED
 CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
 
-   8. TERMINATION.
+8. TERMINATION.
 
 This License and the rights granted hereunder will terminate automatically
 if You fail to comply with terms herein and fail to cure such breach within
@@ -246,7 +216,7 @@ which are properly granted shall survive any termination of this License.
 Provisions which, by their nature, must remain in effect beyond the termination
 of this License shall survive.
 
-   9. LIMITATION OF LIABILITY.
+9. LIMITATION OF LIABILITY.
 
 UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING
 NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE INITIAL DEVELOPER, ANY OTHER
@@ -262,7 +232,7 @@ SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL
 OR CONSEQUENTIAL DAMAGES, SO THAT EXCLUSION AND LIMITATION MAY NOT APPLY TO
 YOU.
 
-   10. U.S. GOVERNMENT END USERS.
+10. U.S. GOVERNMENT END USERS.
 
 The Covered Code is a ``commercial item,'' as that term is defined in 48 C.F.R.
 2.101 (Oct. 1995), consisting of ``commercial computer software'' and ``commercial
@@ -271,7 +241,7 @@ computer software documentation,'' as such terms are used in 48 C.F.R. 12.212
 227.7202-4 (June 1995), all U.S. Government End Users acquire Covered Code
 with only those rights set forth herein.
 
-   11. MISCELLANEOUS.
+11. MISCELLANEOUS.
 
 This License represents the complete agreement concerning subject matter hereof.
 If any provision of this License is held to be unenforceable, such provision
@@ -294,7 +264,7 @@ on Contracts for the International Sale of Goods is expressly excluded. Any
 law or regulation which provides that the language of a contract shall be
 construed against the drafter shall not apply to this License.
 
-   12. RESPONSIBILITY FOR CLAIMS.
+12. RESPONSIBILITY FOR CLAIMS.
 
 Except in cases where another Contributor has failed to comply with Section
 3.4, You are responsible for damages arising, directly or indirectly, out
@@ -304,42 +274,31 @@ such rights, and other relevant factors. You agree to work with affected parties
 to distribute responsibility on an equitable basis.
 
 AMENDMENTS
-
 Additional Terms applicable to the Netscape Public License.
 
-   I. Effect.
-
-These additional terms described in this Netscape Public License -- Amendments
-shall apply to the Mozilla Communicator client code and to all Covered Code
-under this License.
-
+I. Effect.  These additional terms described in this Netscape Public License
+-- Amendments shall apply to the Mozilla Communicator client code and to all
+Covered Code under this License.
 II. ``Netscape's Branded Code'' means Covered Code that Netscape distributes
 and/or permits others to distribute under one or more trademark(s) which are
 controlled by Netscape but which are not licensed for use under this License.
-
-   III. Netscape and logo.
-
-This License does not grant any rights to use the trademark ``Netscape'',
-the ``Netscape N and horizon'' logo or the Netscape lighthouse logo, even
-if such marks are included in the Original Code.
-
-   IV. Inability to Comply Due to Contractual Obligation.
-
-Prior to licensing the Original Code under this License, Netscape has licensed
-third party code for use in Netscape's Branded Code. To the extent that Netscape
-is limited contractually from making such third party code available under
-this License, Netscape may choose to reintegrate such code into Covered Code
-without being required to distribute such code in Source Code form, even if
-such code would otherwise be considered ``Modifications'' under this License.
-
-   V. Use of Modifications and Covered Code by Initial Developer.
-
+III. Netscape and logo.       This License does not grant any rights to use
+the trademark ``Netscape'', the ``Netscape N and horizon'' logo or the Netscape
+lighthouse logo, even if such marks are included in the Original Code.
+IV. Inability to Comply Due to Contractual Obligation.       Prior to licensing
+the Original Code under this License, Netscape has licensed third party code
+for use in Netscape's Branded Code. To the extent that Netscape is limited
+contractually from making such third party code available under this License,
+Netscape may choose to reintegrate such code into Covered Code without being
+required to distribute such code in
+Source Code form, even if such code would otherwise be considered ``Modifications''
+under this License.
+     V. Use of Modifications and Covered Code by Initial Developer.
 V.1. In General. The obligations of Section 3 apply to Netscape, except to
-the extent specified in this Amendment, Section V.2 and V.3.
-
-V.2. Other Products. Netscape may include Covered Code in products other than
-the Netscape's Branded Code which are released by Netscape during the two
-(2) years following the release date of the Original Code, without such additional
+the extent specified in this Amendment, Section V.2 and V.3.           V.2.
+Other Products. Netscape may include Covered Code in products other than the
+Netscape's Branded Code which are released by Netscape during the two (2)
+years following the release date of the Original Code, without such additional
 products becoming subject to the terms of this License, and may license such
 additional products on different terms from those contained in this License.
 V.3. Alternative Licensing. Netscape may license the Source Code of Netscape's
@@ -347,28 +306,24 @@ Branded Code, including Modifications incorporated therein, without such additio
 products becoming subject to the terms of this License, and may license such
 additional products on different terms from those contained in this License.
 
-   VI. Arbitration and Litigation.
+VI. Arbitration and Litigation.       Notwithstanding the limitations of Section
+11 above, the provisions regarding arbitration and litigation in Section 11(a),
+(b) and (c) of the License shall apply to all disputes relating to this License.
 
-Notwithstanding the limitations of Section 11 above, the provisions regarding
-arbitration and litigation in Section 11(a), (b) and (c) of the License shall
-apply to all disputes relating to this License. EXHIBIT A.
+EXHIBIT A.
 
-"The contents of this file are subject to the Netscape Public License Version
+“The contents of this file are subject to the Netscape Public License Version
 1.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.mozilla.org/NPL/
 
 Software distributed under the License is distributed on an "AS IS" basis,
 WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
 the specific language governing rights and limitations under the License.
-
 The Original Code is Mozilla Communicator client code, released March 31, 1998.
-
 The Initial Developer of the Original Code is Netscape Communications Corporation.
 Portions created by Netscape are Copyright (C) 1998 Netscape Communications
 Corporation. All Rights Reserved.
-
-Contributor(s): ______________________________________."
-
+Contributor(s): ______________________________________.”
 [NOTE: The text of this Exhibit A may differ slightly from the text of the
 notices in the Source Code files of the Original Code. This is due to time
 constraints encountered in simultaneously finalizing the License and in preparing
diff --git a/options/license/NPL-1.1 b/options/license/NPL-1.1
index 0cbb07e322..f7199a0111 100644
--- a/options/license/NPL-1.1
+++ b/options/license/NPL-1.1
@@ -4,13 +4,12 @@ AMENDMENTS
 
 The Netscape Public License Version 1.1 ("NPL") consists of the Mozilla Public
 License Version 1.1 with the following Amendments, including Exhibit A-Netscape
-Public License. Files identified with "Exhibit A-Netscape Public License"
+Public License.  Files identified with "Exhibit A-Netscape Public License"
 are governed by the Netscape Public License Version 1.1.
 
 Additional Terms applicable to the Netscape Public License.
 
-   I. Effect.
-
+     I. Effect.
 These additional terms described in this Netscape Public License -- Amendments
 shall apply to the Mozilla Communicator client code and to all Covered Code
 under this License.
@@ -18,53 +17,43 @@ under this License.
 II. "Netscape's Branded Code" means Covered Code that Netscape distributes
 and/or permits others to distribute under one or more trademark(s) which are
 controlled by Netscape but which are not licensed for use under this License.
-
-   III. Netscape and logo.
-
+     III. Netscape and logo.
 This License does not grant any rights to use the trademarks "Netscape", the
 "Netscape N and horizon" logo or the "Netscape lighthouse" logo, "Netcenter",
 "Gecko", "Java" or "JavaScript", "Smart Browsing" even if such marks are included
 in the Original Code or Modifications.
-
-   IV. Inability to Comply Due to Contractual Obligation.
-
-Prior to licensing the Original Code under this License, Netscape has licensed
+     IV. Inability to Comply Due to Contractual Obligation.
+	 Prior to licensing the Original Code under this License, Netscape has licensed
 third party code for use in Netscape's Branded Code. To the extent that Netscape
 is limited contractually from making such third party code available under
 this License, Netscape may choose to reintegrate such code into Covered Code
 without being required to distribute such code in Source Code form, even if
 such code would otherwise be considered "Modifications" under this License.
-
-   V. Use of Modifications and Covered Code by Initial Developer.
-
-      V.1. In General.
-
+     V. Use of Modifications and Covered Code by Initial Developer.
+          V.1. In General.
 The obligations of Section 3 apply to Netscape, except to the extent specified
 in this Amendment, Section V.2 and V.3.
 
-      V.2. Other Products.
-
-Netscape may include Covered Code in products other than the Netscape's Branded
-Code which are released by Netscape during the two (2) years following the
-release date of the Original Code, without such additional products becoming
+          V.2. Other Products.
+		  Netscape may include Covered Code in products other than the Netscape's
+Branded Code which are released by Netscape during the two (2) years following
+the release date of the Original Code, without such additional products becoming
 subject to the terms of this License, and may license such additional products
 on different terms from those contained in this License.
 
-      V.3. Alternative Licensing.
-
-Netscape may license the Source Code of Netscape's Branded Code, including
+          V.3. Alternative Licensing.
+		  Netscape may license the Source Code of Netscape's Branded Code, including
 Modifications incorporated therein, without such Netscape Branded Code becoming
 subject to the terms of this License, and may license such Netscape Branded
 Code on different terms from those contained in this License.
 
-   VI. Litigation.
-
+     VI. Litigation.
 Notwithstanding the limitations of Section 11 above, the provisions regarding
 litigation in Section 11(a), (b) and (c) of the License shall apply to all
 disputes relating to this License.
 
-   EXHIBIT A-Netscape Public License.
-
+	 EXHIBIT A-Netscape Public License.
+	 
 "The contents of this file are subject to the Netscape Public License Version
 1.1 (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.mozilla.org/NPL/
@@ -78,22 +67,22 @@ The Original Code is Mozilla Communicator client code, released March 31, 1998.
 The Initial Developer of the Original Code is Netscape Communications Corporation.
 Portions created by Netscape are Copyright (C) 1998-1999 Netscape Communications
 Corporation. All Rights Reserved.
-
 Contributor(s): ______________________________________.
-
+	 
 Alternatively, the contents of this file may be used under the terms of the
-_____ license (the "[___] License"), in which case the provisions of [______]
-License are applicable instead of those above. If you wish to allow use of
-your version of this file only under the terms of the [____] License and not
-to allow others to use your version of this file under the NPL, indicate your
-decision by deleting the provisions above and replace them with the notice
-and other provisions required by the [___] License. If you do not delete the
-provisions above, a recipient may use your version of this file under either
-the NPL or the [___] License."
+_____ license (the  "[___] License"), in which case the provisions of [______]
+License are applicable  instead of those above.  If you wish to allow use
+of your version of this file only under the terms of the [____] License and
+not to allow others to use your version of this file under the NPL, indicate
+your decision by deleting  the provisions above and replace  them with the
+notice and other provisions required by the [___] License.  If you do not
+delete the provisions above, a recipient may use your version of this file
+under either the NPL or the [___] License."
+
 
 Mozilla Public License Version 1.1
 
-   1. Definitions.
+1. Definitions.
 
 1.0.1. "Commercial Use" means distribution or otherwise making the Covered
 Code available to a third party.
@@ -111,7 +100,7 @@ of the Original Code and Modifications, in each case including portions thereof.
 1.4. "Electronic Distribution Mechanism" means a mechanism generally accepted
 in the software development community for the electronic transfer of data.
 
-      1.5. "Executable" means Covered Code in any form other than Source Code.
+     1.5. "Executable" means Covered Code in any form other than Source Code.
 
 1.6. "Initial Developer" means the individual or entity identified as the
 Initial Developer in the Source Code notice required by Exhibit A.
@@ -119,7 +108,7 @@ Initial Developer in the Source Code notice required by Exhibit A.
 1.7. "Larger Work" means a work which combines Covered Code or portions thereof
 with code not governed by the terms of this License.
 
-      1.8. "License" means this document.
+     1.8. "License" means this document.
 
 1.8.1. "Licensable" means having the right to grant, to the maximum extent
 possible, whether at the time of the initial grant or subsequently acquired,
@@ -128,10 +117,8 @@ any and all of the rights conveyed herein.
 1.9. "Modifications" means any addition to or deletion from the substance
 or structure of either the Original Code or any previous Modifications. When
 Covered Code is released as a series of files, a Modification is:
-
 Any addition to or deletion from the contents of a file containing Original
 Code or previous Modifications.
-
 Any new file that contains any part of the Original Code or previous Modifications.
 
 1.10. "Original Code" means Source Code of computer software code which is
@@ -161,7 +148,7 @@ or indirect, to cause the direction or management of such entity, whether
 by contract or otherwise, or (b) ownership of more than fifty percent (50%)
 of the outstanding shares or beneficial ownership of such entity.
 
-   2. Source Code License.
+2. Source Code License.
 
 2.1. The Initial Developer Grant. The Initial Developer hereby grants You
 a world-wide, royalty-free, non-exclusive license, subject to third party
@@ -171,15 +158,12 @@ a. under intellectual property rights (other than patent or trademark) Licensabl
 by Initial Developer to use, reproduce, modify, display, perform, sublicense
 and distribute the Original Code (or portions thereof) with or without Modifications,
 and/or as part of a Larger Work; and
-
 b. under Patents Claims infringed by the making, using or selling of Original
 Code, to make, have made, use, practice, sell, and offer for sale, and/or
 otherwise dispose of the Original Code (or portions thereof).
-
 c. the licenses granted in this Section 2.1 (a) and (b) are effective on the
 date Initial Developer first distributes Original Code under the terms of
 this License.
-
 d. Notwithstanding Section 2.1 (b) above, no patent license is granted: 1)
 for code that You delete from the Original Code; 2) separate from the Original
 Code; or 3) for infringements caused by: i) the modification of the Original
@@ -194,17 +178,14 @@ by Contributor, to use, reproduce, modify, display, perform, sublicense and
 distribute the Modifications created by such Contributor (or portions thereof)
 either on an unmodified basis, with other Modifications, as Covered Code and/or
 as part of a Larger Work; and
-
 b. under Patent Claims infringed by the making, using, or selling of Modifications
 made by that Contributor either alone and/or in combination with its Contributor
 Version (or portions of such combination), to make, use, sell, offer for sale,
 have made, and/or otherwise dispose of: 1) Modifications made by that Contributor
 (or portions thereof); and 2) the combination of Modifications made by that
 Contributor with its Contributor Version (or portions of such combination).
-
 c. the licenses granted in Sections 2.2 (a) and 2.2 (b) are effective on the
 date Contributor first makes Commercial Use of the Covered Code.
-
 d. Notwithstanding Section 2.2 (b) above, no patent license is granted: 1)
 for any code that Contributor has deleted from the Contributor Version; 2)
 separate from the Contributor Version; 3) for infringements caused by: i)
@@ -213,7 +194,7 @@ Modifications made by that Contributor with other software (except as part
 of the Contributor Version) or other devices; or 4) under Patent Claims infringed
 by Covered Code in the absence of Modifications made by that Contributor.
 
-   3. Distribution Obligations.
+3. Distribution Obligations.
 
 3.1. Application of License. The Modifications which You create or to which
 You contribute are governed by the terms of this License, including without
@@ -246,10 +227,9 @@ Developer in (a) the Source Code, and (b) in any notice in an Executable version
 or related documentation in which You describe the origin or ownership of
 the Covered Code.
 
-      3.4. Intellectual Property Matters
-
-         (a) Third Party Claims
+     3.4. Intellectual Property Matters
 
+          (a) Third Party Claims
 If Contributor has knowledge that a license under a third party's intellectual
 property rights is required to exercise the rights granted by such Contributor
 under Sections 2.1 or 2.2, Contributor must include a text file with the Source
@@ -262,15 +242,13 @@ steps (such as notifying appropriate mailing lists or newsgroups) reasonably
 calculated to inform those who received the Covered Code that new knowledge
 has been obtained.
 
-         (b) Contributor APIs
-
+          (b) Contributor APIs
 If Contributor's Modifications include an application programming interface
 and Contributor has knowledge of patent licenses which are reasonably necessary
 to implement that API, Contributor must also include this information in the
 LEGAL file.
 
-         (c) Representations.
-
+          (c) Representations.
 Contributor represents that, except as disclosed pursuant to Section 3.4 (a)
 above, Contributor believes that Contributor's Modifications are Contributor's
 original creation(s) and/or Contributor has sufficient rights to grant the
@@ -318,7 +296,7 @@ with other code not governed by the terms of this License and distribute the
 Larger Work as a single product. In such a case, You must make sure the requirements
 of this License are fulfilled for the Covered Code.
 
-   4. Inability to Comply Due to Statute or Regulation.
+4. Inability to Comply Due to Statute or Regulation.
 
 If it is impossible for You to comply with any of the terms of this License
 with respect to some or all of the Covered Code due to statute, judicial order,
@@ -330,29 +308,25 @@ Except to the extent prohibited by statute or regulation, such description
 must be sufficiently detailed for a recipient of ordinary skill to be able
 to understand it.
 
-   5. Application of this License.
-
+5. Application of this License.
 This License applies to code to which the Initial Developer has attached the
 notice in Exhibit A and to related Covered Code.
 
-   6. Versions of the License.
-
-      6.1. New Versions
+6. Versions of the License.
 
+     6.1. New Versions
 Netscape Communications Corporation ("Netscape") may publish revised and/or
 new versions of the License from time to time. Each version will be given
 a distinguishing version number.
 
-      6.2. Effect of New Versions
-
+     6.2. Effect of New Versions
 Once Covered Code has been published under a particular version of the License,
 You may always continue to use it under the terms of that version. You may
 also choose to use such Covered Code under the terms of any subsequent version
 of the License published by Netscape. No one other than Netscape has the right
 to modify the terms applicable to Covered Code created under this License.
 
-      6.3. Derivative Works
-
+     6.3. Derivative Works
 If You create or use a modified version of this License (which you may only
 do in order to apply it to code which is not already Covered Code governed
 by this License), You must (a) rename Your license so that the phrases "Mozilla",
@@ -364,8 +338,7 @@ Public License. (Filling in the name of the Initial Developer, Original Code
 or Contributor in the notice described in Exhibit A shall not of themselves
 be deemed to be modifications of this License.)
 
-   7. DISCLAIMER OF WARRANTY
-
+7. DISCLAIMER OF WARRANTY
 COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTY
 OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES
 THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR
@@ -376,7 +349,7 @@ THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER
 OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED
 CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
 
-   8. Termination
+8. Termination
 
 8.1. This License and the rights granted hereunder will terminate automatically
 if You fail to comply with terms herein and fail to cure such breach within
@@ -402,7 +375,6 @@ and payment arrangement are not mutually agreed upon in writing by the parties
 or the litigation claim is not withdrawn, the rights granted by Participant
 to You under Sections 2.1 and/or 2.2 automatically terminate at the expiration
 of the 60 day notice period specified above.
-
 b. any software, hardware, or device, other than such Participant's Contributor
 Version, directly or indirectly infringes any patent, then any rights granted
 to You by such Participant under Sections 2.1(b) and 2.2(b) are revoked effective
@@ -422,8 +394,7 @@ user license agreements (excluding distributors and resellers) which have
 been validly granted by You or any distributor hereunder prior to termination
 shall survive termination.
 
-   9. LIMITATION OF LIABILITY
-
+9. LIMITATION OF LIABILITY
 UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING
 NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER, ANY
 OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE, OR ANY SUPPLIER OF
@@ -438,8 +409,7 @@ SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL
 OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO
 YOU.
 
-   10. U.S. government end users
-
+10. U.S. government end users
 The Covered Code is a "commercial item," as that term is defined in 48 C.F.R.
 2.101 (Oct. 1995), consisting of "commercial computer software" and "commercial
 computer software documentation," as such terms are used in 48 C.F.R. 12.212
@@ -447,8 +417,7 @@ computer software documentation," as such terms are used in 48 C.F.R. 12.212
 227.7202-4 (June 1995), all U.S. Government End Users acquire Covered Code
 with only those rights set forth herein.
 
-   11. Miscellaneous
-
+11. Miscellaneous
 This License represents the complete agreement concerning 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. This
@@ -465,8 +434,7 @@ on Contracts for the International Sale of Goods is expressly excluded. Any
 law or regulation which provides that the language of a contract shall be
 construed against the drafter shall not apply to this License.
 
-   12. Responsibility for claims
-
+12. Responsibility for claims
 As between Initial Developer and the Contributors, each party is responsible
 for claims and damages arising, directly or indirectly, out of its utilization
 of rights under this License and You agree to work with Initial Developer
@@ -474,13 +442,14 @@ and Contributors to distribute such responsibility on an equitable basis.
 Nothing herein is intended or shall be deemed to constitute any admission
 of liability.
 
-   13. Multiple-licensed code
-
+13. Multiple-licensed code
 Initial Developer may designate portions of the Covered Code as "Multiple-Licensed".
 "Multiple-Licensed" means that the Initial Developer permits you to utilize
 portions of the Covered Code under Your choice of the MPL or the alternative
 licenses, if any, specified by the Initial Developer in the file described
-in Exhibit A. Exhibit A - Mozilla Public License.
+in Exhibit A.
+
+Exhibit A - Mozilla Public License.
 
 "The contents of this file are subject to the Mozilla Public License Version
 1.1 (the "License"); you may not use this file except in compliance with the
@@ -493,15 +462,13 @@ the specific language governing rights and limitations under the License.
 The Original Code is ______________________________________.
 
 The Initial Developer of the Original Code is ________________________.
-
 Portions created by ______________________ are Copyright (C) ______
-
 _______________________. All Rights Reserved.
 
 Contributor(s): ______________________________________.
 
 Alternatively, the contents of this file may be used under the terms of the
-_____ license (the "[___] License"), in which case the provisions of [______]
+_____ license (the  "[___] License"), in which case the provisions of [______]
 License are applicable instead of those above. If you wish to allow use of
 your version of this file only under the terms of the [____] License and not
 to allow others to use your version of this file under the MPL, indicate your
diff --git a/options/license/NPOSL-3.0 b/options/license/NPOSL-3.0
index 55dd11fe2c..bf51b7725e 100644
--- a/options/license/NPOSL-3.0
+++ b/options/license/NPOSL-3.0
@@ -5,7 +5,7 @@ This Non-Profit Open Software License ("Non-Profit OSL") version 3.0 (the
 whose owner (the "Licensor") has placed the following licensing notice adjacent
 to the copyright notice for the Original Work:
 
-Licensed under the Non-Profit Open Software License version 3.0
+     Licensed under the Non-Profit Open Software License version 3.0
 
 1) Grant of Copyright License. Licensor grants You a worldwide, royalty-free,
 non-exclusive, sublicensable license, for the duration of the copyright, to
@@ -23,9 +23,9 @@ Works to the public, with the proviso that copies of Original Work or Derivative
 Works that You distribute or communicate shall be licensed under this Non-Profit
 Open Software License or as provided in section 17(d);
 
-      d) to perform the Original Work publicly; and
+     d) to perform the Original Work publicly; and
 
-      e) to display the Original Work publicly.
+     e) to display the Original Work publicly.
 
 2) Grant of Patent License. Licensor grants You a worldwide, royalty-free,
 non-exclusive, sublicensable license, under patent claims owned or controlled
diff --git a/options/license/NRL b/options/license/NRL
index bdb267870e..7036e97434 100644
--- a/options/license/NRL
+++ b/options/license/NRL
@@ -1,4 +1,6 @@
-NRL License COPYRIGHT NOTICE
+NRL License
+
+COPYRIGHT NOTICE
 
 All of the documentation and software included in this software distribution
 from the US Naval Research Laboratory (NRL) are copyrighted by their respective
@@ -17,31 +19,26 @@ people. Those developers have each copyrighted the portions that they developed
 at NRL and have assigned All Rights for those portions to NRL. Outside the
 USA, NRL has copyright on some of the software developed at NRL. The affected
 files all contain specific copyright notices and those notices must be retained
-in any derived work. NRL LICENSE
+in any derived work.
+
+NRL LICENSE
 
 NRL grants permission for redistribution and use in source and binary forms,
 with or without modification, of the software and documentation created at
 NRL provided that the following conditions are met:
 
-   1. All terms of the UC Berkeley copyright and license must be followed.
-
+     1. All terms of the UC Berkeley copyright and license must be followed.
 2. Redistributions of source code must retain the above copyright notice,
 this list of conditions and the following disclaimer.
-
 3. Redistributions in binary form must reproduce the above copyright notice,
 this list of conditions and the following disclaimer in the documentation
 and/or other materials provided with the distribution.
-
 4. All advertising materials mentioning features or use of this software must
 display the following acknowledgements:
 
-      
-
 This product includes software developed by the University of California,
 Berkeley and its contributors.
 
-      
-
 This product includes software developed at the Information Technology Division,
 US Naval Research Laboratory.
 
diff --git a/options/license/NTP b/options/license/NTP
index 8a3879bb94..8f4a8f0cef 100644
--- a/options/license/NTP
+++ b/options/license/NTP
@@ -1,5 +1,6 @@
-NTP License (NTP) Copyright (c) (CopyrightHoldersName) (From 4-digit-year)-(To
-4-digit-year)
+NTP License (NTP)
+
+Copyright (c) (CopyrightHoldersName) (From 4-digit-year)-(To 4-digit-year)
 
 Permission to use, copy, modify, and distribute this software and its documentation
 for any purpose with or without fee is hereby granted, provided that the above
diff --git a/options/license/NTP-0 b/options/license/NTP-0
index 248aa1a1d0..0f33419fb8 100644
--- a/options/license/NTP-0
+++ b/options/license/NTP-0
@@ -1,8 +1,10 @@
-NTP No Attribution (NTP-0) Copyright (4-digit-year) by (CopyrightHoldersName)
+NTP No Attribution (NTP-0)
+
+Copyright (4-digit-year) by (CopyrightHoldersName)
 
 Permission to use, copy, modify, and distribute this software and its documentation
-for any purpose is hereby granted, provided that the namesof (TrademarkedName)
+for any purpose is hereby granted, provided that the name of (TrademarkedName)
 not be used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission. (TrademarkedName) makesno
-representations about the suitability of this software for any purpose. It
-is provided "as is" without express or implied warranty.
+software without specific, written prior permission. (TrademarkedName) make
+no representations about the suitability of this software for any purpose.
+It is provided "as is" without express or implied warranty.
diff --git a/options/license/Naumen b/options/license/Naumen
index af967ef83d..0a8c6e6b12 100644
--- a/options/license/Naumen
+++ b/options/license/Naumen
@@ -1,5 +1,6 @@
-NAUMEN Public License This software is Copyright (c) NAUMEN (tm) and Contributors.
-All rights reserved.
+NAUMEN Public License
+
+This software is Copyright (c) NAUMEN (tm) and Contributors. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
 are permitted provided that the following conditions are met:
diff --git a/options/license/Net-SNMP b/options/license/Net-SNMP
index f68b3cdf2c..f6d34bc53e 100644
--- a/options/license/Net-SNMP
+++ b/options/license/Net-SNMP
@@ -1,10 +1,11 @@
----- Part 1: CMU/UCD copyright notice: (BSD like) ----- Copyright 1989, 1991,
-1992 by Carnegie Mellon University
+ ---- Part 1: CMU/UCD copyright notice: (BSD like) -----
+
+ Copyright 1989, 1991, 1992 by Carnegie Mellon University
 
 Derivative Work - 1996, 1998-2000 Copyright 1996, 1998-2000 The Regents of
 the University of California
 
-All Rights Reserved
+ All Rights Reserved
 
 Permission to use, copy, modify and distribute this software and its documentation
 for any purpose and without fee is hereby granted, provided that the above
@@ -30,11 +31,9 @@ are permitted provided that the following conditions are met:
 
 * Redistributions of source code must retain the above copyright notice, this
 list of conditions and the following disclaimer.
-
 * Redistributions in binary form must reproduce the above copyright notice,
 this list of conditions and the following disclaimer in the documentation
 and/or other materials provided with the distribution.
-
 * Neither the name of the Networks Associates Technology, Inc nor the names
 of its contributors may be used to endorse or promote products derived from
 this software without specific prior written permission.
@@ -50,7 +49,7 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
 OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
 USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-   ---- Part 3: Cambridge Broadband Ltd. copyright notice (BSD) -----
+---- Part 3: Cambridge Broadband Ltd. copyright notice (BSD) -----
 
 Portions of this code are copyright (c) 2001-2003, Cambridge Broadband Ltd.
 All rights reserved. Redistribution and use in source and binary forms, with
@@ -59,11 +58,9 @@ are met:
 
 * Redistributions of source code must retain the above copyright notice, this
 list of conditions and the following disclaimer.
-
 * Redistributions in binary form must reproduce the above copyright notice,
 this list of conditions and the following disclaimer in the documentation
 and/or other materials provided with the distribution.
-
 * The name of Cambridge Broadband Ltd. may not be used to endorse or promote
 products derived from this software without specific prior written permission.
 
@@ -78,9 +75,10 @@ IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 
----- Part 4: Sun Microsystems, Inc. copyright notice (BSD) ----- Copyright
-© 2003 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, California
-95054, U.S.A. All rights reserved.
+---- Part 4: Sun Microsystems, Inc. copyright notice (BSD) -----
+
+Copyright © 2003 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+California 95054, U.S.A. All rights reserved.
 
 Use is subject to license terms below.
 
@@ -114,7 +112,7 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
 OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
 USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-   ---- Part 5: Sparta, Inc copyright notice (BSD) -----
+---- Part 5: Sparta, Inc copyright notice (BSD) -----
 
 Copyright (c) 2003-2009, Sparta, Inc All rights reserved. Redistribution and
 use in source and binary forms, with or without modification, are permitted
@@ -122,11 +120,9 @@ provided that the following conditions are met:
 
 * Redistributions of source code must retain the above copyright notice, this
 list of conditions and the following disclaimer.
-
 * Redistributions in binary form must reproduce the above copyright notice,
 this list of conditions and the following disclaimer in the documentation
 and/or other materials provided with the distribution.
-
 * Neither the name of Sparta, Inc nor the names of its contributors may be
 used to endorse or promote products derived from this software without specific
 prior written permission.
@@ -142,7 +138,7 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
 OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
 USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-   ---- Part 6: Cisco/BUPTNIC copyright notice (BSD) -----
+---- Part 6: Cisco/BUPTNIC copyright notice (BSD) -----
 
 Copyright (c) 2004, Cisco, Inc and Information Network Center of Beijing University
 of Posts and Telecommunications. All rights reserved. Redistribution and use
@@ -151,11 +147,9 @@ that the following conditions are met:
 
 * Redistributions of source code must retain the above copyright notice, this
 list of conditions and the following disclaimer.
-
 * Redistributions in binary form must reproduce the above copyright notice,
 this list of conditions and the following disclaimer in the documentation
 and/or other materials provided with the distribution.
-
 * Neither the name of Cisco, Inc, Beijing University of Posts and Telecommunications,
 nor the names of their contributors may be used to endorse or promote products
 derived from this software without specific prior written permission.
@@ -172,6 +166,7 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
 USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ---- Part 7: Fabasoft R&D Software GmbH & Co KG copyright notice (BSD) -----
+
 Copyright (c) Fabasoft R&D Software GmbH & Co KG, 2003 oss@fabasoft.com Author:
 Bernhard Penz
 
@@ -200,19 +195,18 @@ IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 
----- Part 8: Apple Inc. copyright notice (BSD) ----- Copyright (c) 2007 Apple
-Inc. All rights reserved.
+---- Part 8: Apple Inc. copyright notice (BSD) -----
+
+Copyright (c) 2007 Apple Inc. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
 are permitted provided that the following conditions are met:
 
 1. Redistributions of source code must retain the above copyright notice,
 this list of conditions and the following disclaimer.
-
 2. Redistributions in binary form must reproduce the above copyright notice,
 this list of conditions and the following disclaimer in the documentation
 and/or other materials provided with the distribution.
-
 3. Neither the name of Apple Inc. ("Apple") nor the names of its contributors
 may be used to endorse or promote products derived from this software without
 specific prior written permission.
@@ -228,7 +222,7 @@ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
 OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-   ---- Part 9: ScienceLogic, LLC copyright notice (BSD) -----
+---- Part 9: ScienceLogic, LLC copyright notice (BSD) -----
 
 Copyright (c) 2009, ScienceLogic, LLC All rights reserved. Redistribution
 and use in source and binary forms, with or without modification, are permitted
@@ -236,11 +230,9 @@ provided that the following conditions are met:
 
 * Redistributions of source code must retain the above copyright notice, this
 list of conditions and the following disclaimer.
-
 * Redistributions in binary form must reproduce the above copyright notice,
 this list of conditions and the following disclaimer in the documentation
 and/or other materials provided with the distribution.
-
 * Neither the name of ScienceLogic, LLC nor the names of its contributors
 may be used to endorse or promote products derived from this software without
 specific prior written permission.
diff --git a/options/license/Newsletr b/options/license/Newsletr
index 78836f0355..7d823c6e90 100644
--- a/options/license/Newsletr
+++ b/options/license/Newsletr
@@ -1,11 +1,12 @@
 Copyright 1989--2004 by Hunter Goatley.
 
-Permission is granted to anyone to use this software for any purpose on any
-computer system, and to redistribute it freely, subject to the following restrictions:
+Permission is granted to anyone to use this software for any purpose  on any
+computer system, and to redistribute it freely, subject to the  following
+restrictions:
 
-1. This software is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+1. This software is distributed in the hope that it will be useful,  but WITHOUT
+ANY WARRANTY; without even the implied warranty of  MERCHANTABILITY or FITNESS
 FOR A PARTICULAR PURPOSE.
 
-2. Altered versions must be plainly marked as such, and must not be misrepresented
+2. Altered versions must be plainly marked as such, and must not be  misrepresented
 as being the original software.
diff --git a/options/license/Nokia b/options/license/Nokia
index 29883d8798..506e093ff8 100644
--- a/options/license/Nokia
+++ b/options/license/Nokia
@@ -1,15 +1,17 @@
 Nokia Open Source License (NOKOS License)
 
-Version 1.0a 1. DEFINITIONS.
+Version 1.0a
+
+1. DEFINITIONS.
 
 "Affiliates" of a party shall mean an entity
 
-   a) which is directly or indirectly controlling such party;
+     a) which is directly or indirectly controlling such party;
 
 b) which is under the same direct or indirect ownership or control as such
 party; or
 
-   c) which is directly or indirectly owned or controlled by such party.
+     c) which is directly or indirectly owned or controlled by such party.
 
 For these purposes, an entity shall be treated as being controlled by another
 if that other entity has fifty percent (50%) or more of the votes in such
@@ -78,10 +80,11 @@ available for no charge.
 "You" (or "Your") shall mean an individual or a legal entity exercising rights
 under, and complying with all of the terms of, this License or a future version
 of this License issued under Section 6.1. For legal entities, "You" includes
-Affiliates of such entity. 2. SOURCE CODE LICENSE.
+Affiliates of such entity.
 
-   2.1 Nokia Grant.
+2. SOURCE CODE LICENSE.
 
+     2.1 Nokia Grant.
 Subject to the terms of this License, Nokia hereby grants You a world-wide,
 royalty-free, non-exclusive license, subject to third party intellectual property
 claims:
@@ -104,8 +107,7 @@ Original Software; or 3) for infringements caused by: i) the modification
 of the Original Software or ii) the combination of the Original Software with
 other software or devices.
 
-   2.2 Contributor Grant.
-
+     2.2 Contributor Grant.
 Subject to the terms of this License and subject to third party intellectual
 property claims, each Contributor hereby grants You a world-wide, royalty-free,
 non-exclusive license
@@ -133,10 +135,10 @@ third party modifications of Contributor Version or ii) the combination of
 Modifications made by that Contributor with other software (except as part
 of the Contributor Version) or other devices; or 4) under Patent Claims infringed
 by Covered Software in the absence of Modifications made by that Contributor.
+
 3. DISTRIBUTION OBLIGATIONS.
 
-   3.1 Application of License.
-
+     3.1 Application of License.
 The Modifications which You create or to which You contribute are governed
 by the terms of this License, including without limitation Section 2.2. The
 Source Code version of Covered Software may be distributed only under the
@@ -147,8 +149,7 @@ version that alters or restricts the applicable version of this License or
 the recipients' rights hereunder. However, You may include an additional document
 offering the additional rights described in Section 3.5.
 
-   3.2 Availability of Source Code.
-
+     3.2 Availability of Source Code.
 Any Modification which You create or to which You contribute must be made
 available in Source Code form under the terms of this License either on the
 same media as an Executable version or via an accepted Electronic Distribution
@@ -160,8 +161,7 @@ has been made available to such recipients. You are responsible for ensuring
 that the Source Code version remains available even if the Electronic Distribution
 Mechanism is maintained by a third party.
 
-   3.3 Description of Modifications.
-
+     3.3 Description of Modifications.
 You must cause all Covered Software to which You contribute to contain a file
 documenting the changes You made to create that Covered Software and the date
 of any change. You must include a prominent statement that the Modification
@@ -170,7 +170,7 @@ and including the name of Nokia in (a) the Source Code, and (b) in any notice
 in an Executable version or related documentation in which You describe the
 origin or ownership of the Covered Software.
 
-   3.4 Intellectual Property Matters
+     3.4 Intellectual Property Matters
 
 (a) Third Party Claims. If Contributor has knowledge that a license under
 a third party's intellectual property rights is required to exercise the rights
@@ -194,8 +194,7 @@ to Section 3.4(a) above, Contributor believes that Contributor's Modifications
 are Contributor's original creation(s) and/or Contributor has sufficient rights
 to grant the rights conveyed by this License.
 
-   3.5 Required Notices.
-
+     3.5 Required Notices.
 You must duplicate the notice in Exhibit A in each file of the Source Code.
 If it is not possible to put such notice in a particular Source Code file
 due to its structure, then You must include such notice in a location (such
@@ -212,8 +211,7 @@ obligation is offered by You alone, and You hereby agree to indemnify Nokia
 and every Contributor for any liability incurred by Nokia or such Contributor
 as a result of warranty, support, indemnity or liability terms You offer.
 
-   3.6 Distribution of Executable Versions.
-
+     3.6 Distribution of Executable Versions.
 You may distribute Covered Software in Executable form only if the requirements
 of Section 3.1-3.5 have been met for that Covered Software, and if You include
 a notice stating that the Source Code version of the Covered Software is available
@@ -233,14 +231,13 @@ Contributor. You hereby agree to indemnify Nokia and every Contributor for
 any liability incurred by Nokia or such Contributor as a result of any such
 terms You offer.
 
-   3.7 Larger Works.
-
+     3.7 Larger Works.
 You may create a Larger Work by combining Covered Software with other software
 not governed by the terms of this License and distribute the Larger Work as
 a single product. In such a case, You must make sure the requirements of this
-License are fulfilled for the Covered Software. 4. INABILITY TO COMPLY DUE
-TO STATUTE OR REGULATION.
+License are fulfilled for the Covered Software.
 
+4. INABILITY TO COMPLY DUE TO STATUTE OR REGULATION.
 If it is impossible for You to comply with any of the terms of this License
 with respect to some or all of the Covered Software due to statute, judicial
 order, or regulation then You must: (a) comply with the terms of this License
@@ -250,25 +247,27 @@ in Section 3.4 and must be included with all distributions of the Source Code.
 
 Except to the extent prohibited by statute or regulation, such description
 must be sufficiently detailed for a recipient of ordinary skill to be able
-to understand it. 5. APPLICATION OF THIS LICENSE.
+to understand it.
 
+5. APPLICATION OF THIS LICENSE.
 This License applies to code to which Nokia has attached the notice in Exhibit
-A and to related Covered Software. 6. VERSIONS OF THE LICENSE.
+A and to related Covered Software.
 
-   6.1 New Versions.
+6. VERSIONS OF THE LICENSE.
 
+     6.1 New Versions.
 Nokia may publish revised and/or new versions of the License from time to
 time. Each version will be given a distinguishing version number.
 
-   6.2 Effect of New Versions.
-
+     6.2 Effect of New Versions.
 Once Covered Software has been published under a particular version of the
 License, You may always continue to use it under the terms of that version.
 You may also choose to use such Covered Software under the terms of any subsequent
 version of the License published by Nokia. No one other than Nokia has the
 right to modify the terms applicable to Covered Software created under this
-License. 7. DISCLAIMER OF WARRANTY.
+License.
 
+7. DISCLAIMER OF WARRANTY.
 COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT
 WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION,
 WARRANTIES THAT THE COVERED SOFTWARE IS FREE OF DEFECTS, MERCHANTABLE, FIT
@@ -278,7 +277,9 @@ PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT NOKIA, ITS LICENSORS OR AFFILIATES
 OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR
 OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF
 THIS LICENSE. NO USE OF ANY COVERED SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT
-UNDER THIS DISCLAIMER. 8. TERMINATION.
+UNDER THIS DISCLAIMER.
+
+8. TERMINATION.
 
 8.1 This License and the rights granted hereunder will terminate automatically
 if You fail to comply with terms herein and fail to cure such breach within
@@ -322,8 +323,9 @@ or license.
 8.4 In the event of termination under Sections 8.1 or 8.2 above, all end user
 license agreements (excluding distributors and resellers) which have been
 validly granted by You or any distributor hereunder prior to termination shall
-survive termination. 9. LIMITATION OF LIABILITY.
+survive termination.
 
+9. LIMITATION OF LIABILITY.
 UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING
 NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, NOKIA, ANY OTHER CONTRIBUTOR,
 OR ANY DISTRIBUTOR OF COVERED SOFTWARE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES,
@@ -338,8 +340,9 @@ DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES,
 BUT MAY ALLOW LIABILITY TO BE LIMITED; IN SUCH CASES, A PARTY's, ITS EMPLOYEES,
 LICENSORS OR AFFILIATES' LIABILITY SHALL BE LIMITED TO U.S. $50. Nothing contained
 in this License shall prejudice the statutory rights of any party dealing
-as a consumer. 10. MISCELLANEOUS.
+as a consumer.
 
+10. MISCELLANEOUS.
 This License represents the complete agreement concerning subject matter hereof.
 All rights in the Covered Software not expressly granted under this License
 are reserved. Nothing in this License shall grant You any rights to use any
@@ -352,14 +355,16 @@ be settled by a single arbitrator appointed by the Central Chamber of Commerce
 of Finland. The arbitration procedure shall take place in Helsinki, Finland
 in the English language. If any part of this Agreement is found void and unenforceable,
 it will not affect the validity of the balance of the Agreement, which shall
-remain valid and enforceable according to its terms. 11. RESPONSIBILITY FOR
-CLAIMS.
+remain valid and enforceable according to its terms.
 
+11. RESPONSIBILITY FOR CLAIMS.
 As between Nokia and the Contributors, each party is responsible for claims
 and damages arising, directly or indirectly, out of its utilization of rights
 under this License and You agree to work with Nokia and Contributors to distribute
 such responsibility on an equitable basis. Nothing herein is intended or shall
-be deemed to constitute any admission of liability. EXHIBIT A
+be deemed to constitute any admission of liability.
+
+EXHIBIT A
 
 The contents of this file are subject to the NOKOS License Version 1.0 (the
 "License"); you may not use this file except in compliance with the License.
diff --git a/options/license/Nokia-Qt-exception-1.1 b/options/license/Nokia-Qt-exception-1.1
index ddaed7b85e..b4ec52b7a1 100644
--- a/options/license/Nokia-Qt-exception-1.1
+++ b/options/license/Nokia-Qt-exception-1.1
@@ -2,20 +2,15 @@ Nokia Qt LGPL Exception version 1.1
 
 As an additional permission to the GNU Lesser General Public License version 2.1, the object code form of a "work that uses the Library" may incorporate material from a header file that is part of the Library. You may distribute such object code under terms of your choice, provided that:
 
-   (i) the header files of the Library have not been modified; and
-
-   (ii) the incorporated material is limited to numerical parameters, data structure layouts, accessors, macros, inline functions and templates; and
-
-   (iii) you comply with the terms of Section 6 of the GNU Lesser General Public License version 2.1.
+     (i) the header files of the Library have not been modified; and
+     (ii) the incorporated material is limited to numerical parameters, data structure layouts, accessors, macros, inline functions and templates; and
+     (iii) you comply with the terms of Section 6 of the GNU Lesser General Public License version 2.1.
 
 Moreover, you may apply this exception to a modified version of the Library, provided that such modification does not involve copying material from the Library into the modified Library's header files unless such material is limited to
 
-   (i) numerical parameters;
-
-   (ii) data structure layouts;
-
-   (iii) accessors; and
-
-   (iv) small macros, templates and inline functions of five lines or less in length.
+     (i) numerical parameters;
+     (ii) data structure layouts;
+     (iii) accessors; and
+     (iv) small macros, templates and inline functions of five lines or less in length.
 
 Furthermore, you are not required to apply this additional permission to a modified version of the Library.
diff --git a/options/license/O-UDA-1.0 b/options/license/O-UDA-1.0
index 5ce017119c..89a4d01eba 100644
--- a/options/license/O-UDA-1.0
+++ b/options/license/O-UDA-1.0
@@ -3,7 +3,7 @@ Open Use of Data Agreement v1.0
 This is the Open Use of Data Agreement, Version 1.0 (the "O-UDA"). Capitalized
 terms are defined in Section 5. Data Provider and you agree as follows:
 
-   1. Provision of the Data
+1. Provision of the Data
 
 1.1. You may use, modify, and distribute the Data made available to you by
 the Data Provider under this O-UDA if you follow the O-UDA's terms.
@@ -12,21 +12,21 @@ the Data Provider under this O-UDA if you follow the O-UDA's terms.
 arising out of the use, modification, or distribution of the Data provided
 you meet the terms of the O-UDA.
 
-1.3. This O-UDA does not restrict your use, modification, or distribution
-of any portions of the Data that are in the public domain or that may be used,
+1.3 This O-UDA does not restrict your use, modification, or distribution of
+any portions of the Data that are in the public domain or that may be used,
 modified, or distributed under any other legal exception or limitation.
 
-   2. No Restrictions on Use or Results
+2. No Restrictions on Use or Results
 
-      2.1. The O-UDA does not impose any restriction with respect to:
+    2.1. The O-UDA does not impose any restriction with respect to:
 
-         2.1.1. the use or modification of Data; or
+      2.1.1. the use or modification of Data; or
 
-         2.1.2. the use, modification, or distribution of Results.
+      2.1.2. the use, modification, or distribution of Results.
 
-   3. Redistribution of Data
+3. Redistribution of Data
 
-3.1. You may redistribute the Data under terms of your choice, so long as:
+    3.1. You may redistribute the Data under terms of your choice, so long as:
 
 3.1.1. You include with any Data you redistribute all credit or attribution
 information that you received with the Data, and your terms require any Downstream
@@ -36,12 +36,12 @@ Recipient to do the same; and
 for Upstream Data Providers at least as broad as those contained in Section
 4.2 and 4.3 of the O-UDA.
 
-   4. No Warranty, Limitation of Liability
+4. No Warranty, Limitation of Liability
 
 4.1. Data Provider does not represent or warrant that it has any rights whatsoever
 in the Data.
 
-4.2. THE DATA IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+4.2. THE DATA IS PROVIDED 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.
@@ -53,7 +53,7 @@ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDI
 NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE DATA OR RESULTS, EVEN
 IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
 
-   5. Definitions
+5. Definitions
 
 5.1. "Data" means the material you receive under the O-UDA in modified or
 unmodified form, but not including Results.
@@ -66,9 +66,9 @@ directly or indirectly from you in accordance with the O-UDA.
 
 5.4. "Result" means anything that you develop or improve from your use of
 Data that does not include more than a de minimis portion of the Data on which
-the use is based. Results may include de minimis portions of the Data necessary
+the use is based.  Results may include de minimis portions of the Data necessary
 to report on or explain use that has been conducted with the Data, such as
-figures in scientific papers, but do not include more. Artificial intelligence
+figures in scientific papers, but do not include more.  Artificial intelligence
 models trained on Data (and which do not include more than a de minimis portion
 of Data) are Results.
 
diff --git a/options/license/OCCT-PL b/options/license/OCCT-PL
index 0217ba589f..81de740f36 100644
--- a/options/license/OCCT-PL
+++ b/options/license/OCCT-PL
@@ -1,5 +1,4 @@
 Open CASCADE Technology Public License
-
 Version 6.6, April 2013
 
 OPEN CASCADE releases and makes publicly available the source code of the
@@ -22,8 +21,8 @@ this software, you indicate your acceptance to be bound by the terms and conditi
 of this license. If you do not want to accept or cannot accept for any reasons
 the terms and conditions of this license, please do not download or use in
 any manner this software.
-
-   1. Definitions
+ 
+1. Definitions
 
 Unless there is something in the subject matter or in the context inconsistent
 therewith, the capitalized terms used in this License shall have the following
@@ -70,24 +69,21 @@ Original Code and any Modifications or any respective portions thereof.
 
 "You" or "Your": means an individual or a legal entity exercising rights under
 this License
-
-   2. Acceptance of license
-
+ 
+2. Acceptance of license
 By using, reproducing, modifying, distributing or sublicensing the Software
 or any portion thereof, You expressly indicate Your acceptance of the terms
 and conditions of this License and undertake to act in accordance with all
 the provisions of this License applicable to You.
-
-   3. Scope and purpose
-
+ 
+3. Scope and purpose
 This License applies to the Software and You may not use, reproduce, modify,
 distribute, sublicense or circulate the Software, or any portion thereof,
 except as expressly provided under this License. Any attempt to otherwise
 use, reproduce, modify, distribute or sublicense the Software is void and
 will automatically terminate Your rights under this License.
-
-   4. Contributor license
-
+ 
+4. Contributor license
 Subject to the terms and conditions of this License, the Initial Developer
 and each of the Contributors hereby grant You a world-wide, royalty-free,
 irrevocable and non-exclusive license under the Applicable Intellectual Property
@@ -121,23 +117,20 @@ and distribute same as a single product. In such case, You must ensure that
 all the requirements of this License are fulfilled for the Software or any
 portion thereof.
 
-   5. Your license
-
+5. Your license
 You hereby grant all Contributors and anyone who becomes a party under this
 License a world-wide, non-exclusive, royalty-free and irrevocable license
 under the Applicable Intellectual Property Rights owned or controlled by You,
 to use, reproduce, modify, distribute and sublicense all Your Modifications
 under the terms and conditions of this License.
 
-   6. Software subject to license
-
+6. Software subject to license
 Your Modifications shall be governed by the terms and conditions of this License.
 You are not authorized to impose any other terms or conditions than those
 prevailing under this License when You distribute and/or sublicense the Software,
 save and except as permitted under Section 7 hereof.
 
-   7. Additional terms
-
+7. Additional terms
 You may choose to offer, on a non-exclusive basis, and to charge a fee for
 any warranty, support, maintenance, liability obligations or other rights
 consistent with the scope of this License with respect to the Software (the
@@ -149,16 +142,14 @@ Initial Developer and any Contributor harmless for any liability incurred
 by or claims asserted against the Initial Developer or any Contributors with
 respect to any such Additional Terms.
 
-   8. Disclaimer of warranty
-
+8. Disclaimer of warranty
 The Software is provided under this License on an "as is" basis, without warranty
 of any kind, including without limitation, warranties that the Software is
 free of defects, merchantable, fit for a particular purpose or non-infringing.
 The entire risk as to the quality and performance of the Software is with
 You.
 
-   9. Liability
-
+9. Liability
 Under no circumstances shall You, the Initial Developer or any Contributor
 be liable to any person for any direct or indirect damages of any kind including,
 without limitation, damages for loss of goodwill, loss of data, work stoppage,
@@ -166,27 +157,23 @@ computer failure or malfunction or any and all other commercial damages or
 losses resulting from or relating to this License or indirectly to the use
 of the Software.
 
-   10. Trademark
-
+10. Trademark
 This License does not grant any rights to use the trademarks, trade names
 and domain names "MATRA", "EADS Matra Datavision", "CAS.CADE", "Open CASCADE",
 "opencascade.com" and "opencascade.org" or any other trademarks, trade names
 or domain names used or owned by the Initial Developer.
 
-   11. Copyright
-
+11. Copyright
 The Initial Developer retains all rights, title and interest in and to the
 Original Code. You may not remove the copyright © notice which appears when
 You download the Software.
 
-   12. Term
-
+12. Term
 This License is granted to You for a term equal to the remaining period of
 protection covered by the intellectual property rights applicable to the Original
 Code.
 
-   13. Termination
-
+13. Termination
 In case of termination, as provided in Section 3 above, You agree to immediately
 stop any further use, reproduction, modification, distribution and sublicensing
 of the Software and to destroy all copies of the Software that are in Your
@@ -196,16 +183,14 @@ In addition, Sections 5, 8 to 11, 13.2 and 15.2 of this License, in reason
 of their nature, shall survive the termination of this License for a period
 of fifteen (15) years.
 
-   14. Versions of the license
-
+14. Versions of the license
 The Initial Developer may publish new versions of this License from time to
 time. Once Original Code has been published under a particular version of
 this License, You may choose to continue to use it under the terms and conditions
 of that version or use the Original Code under the terms of any subsequent
 version of this License published by the Initial Developer.
 
-   15. Miscellaneous
-
+15. Miscellaneous
 15.1 Relationship of the Parties This License will not be construed as creating
 an agency, partnership, joint venture or any other form of legal association
 between You and the Initial Developer, and You will not represent to the contrary,
@@ -221,8 +206,9 @@ technology or products that You may develop, produce, market or distribute.
 any provision of this License, or portion thereof, to be unenforceable, that
 provision of the License will be enforced to the maximum extent permissible
 so as to effect the economic benefits and intent of the parties, and the remainder
-of this License will continue in full force and extent. END OF THE TERMS AND
-CONDITIONS OF THIS LICENSE
+of this License will continue in full force and extent.
+
+END OF THE TERMS AND CONDITIONS OF THIS LICENSE
 
 OPEN CASCADE is a French société par actions simplifiée having its registered
 head office at 1, place des Frères Montgolfier, 78280, Guyancourt, France
@@ -230,7 +216,6 @@ and main offices at 1, place des Frères Montgolfier, 78280, Guyancourt, France.
 Its web site is located at the following address opencascade.com
 
 Open CASCADE Technology Public License
-
 Schedule "A"
 
 The content of this file is subject to the Open CASCADE Technology Public
@@ -248,11 +233,9 @@ of merchantability, fitness for a particular purpose or non-infringement.
 
 Please see the License for the specific terms and conditions governing rights
 and limitations under the License".
-
-End of Schedule "A"
+     End of Schedule "A"
 
 Open CASCADE Technology Public License
-
 Schedule "B"
 
 "The content of this file is subject to the Open CASCADE Technology Public
@@ -275,5 +258,4 @@ purpose or non-infringement.
 
 Please see the License for the specific terms and conditions governing rights
 and limitations under the License"
-
-End of Schedule "B"
+     End of Schedule "B"
diff --git a/options/license/OCLC-2.0 b/options/license/OCLC-2.0
index 09cc2867bd..b5acdf10d7 100644
--- a/options/license/OCLC-2.0
+++ b/options/license/OCLC-2.0
@@ -1,9 +1,7 @@
 OCLC Research Public License 2.0
-
 Terms & Conditions Of Use
-
-May, 2002 Copyright © 2002. OCLC Online Computer Library Center, Inc. All
-Rights Reserved
+May, 2002
+Copyright © 2002. OCLC Online Computer Library Center, Inc. All Rights Reserved
 
 PLEASE READ THIS DOCUMENT CAREFULLY. BY DOWNLOADING OR USING THE CODE BASE
 AND/OR DOCUMENTATION ACCOMPANYING THIS LICENSE (THE "License"), YOU AGREE
@@ -33,11 +31,10 @@ parents or being result of multiple lines of code development.
 
 Section 3. Distribution Licensing Terms
 
-   A. General Requirements
-
+A. General Requirements
 Except as necessary to recognize third-party rights or third-party restriction
 (see below), a distribution of the Program in any of the forms listed below
-must not put any further restrictions on the recipient's exercise of the rights
+must not put any further restrictions on the recipient’s exercise of the rights
 granted herein.
 
 As a Contributor, you represent that your Modification(s) are your original
@@ -71,15 +68,14 @@ OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THE PROGRAM, EVEN IF ADVISED
 OF THE POSSIBILITY OF SUCH DAMAGES. YOU HEREBY WAIVE ANY CLAIMS FOR DAMAGES
 OF ANY KIND AGAINST CONTRIBUTORS WHICH MAY RESULT FROM YOUR USE OF THE PROGRAM.
 
-   B. Requirements for a Distribution of Modifiable Code
-
+B. Requirements for a Distribution of Modifiable Code
 If you distribute the Program in a form to which the recipient can make Modifications
 (e.g. source code), the terms of this license apply to use by recipient. In
 addition, each source and data file of the Program and any Modification you
 distribute must contain the following notice:
 
 "Copyright (c) 2000- (insert then current year) OCLC Online Computer Library
-Center, Inc. and other contributors . All rights reserved. The contents of
+Center, Inc. and other contributors. All rights reserved. The contents of
 this file, as updated from time to time by the OCLC Office of Research, are
 subject to OCLC Research Public License Version 2.0 (the "License"); you may
 not use this file except in compliance with the License. You may obtain a
@@ -89,13 +85,12 @@ WARRANTY OF ANY KIND, either express or implied. See the License for the specifi
 language governing rights and limitations under the License. This software
 consists of voluntary contributions made by many individuals on behalf of
 OCLC Research. For more information on OCLC Research, please see http://www.oclc.org/research/.
-The Original Code is ______________________________ . The Initial Developer
-of the Original Code is ________________________ . Portions created by ______________________
-are Copyright (C) ____________________________ . All Rights Reserved. Contributor(s):
-______________________________________ ."
-
-   C. Requirements for a Distribution of Non-modifiable Code
+The Original Code is ______________________________. The Initial Developer
+of the Original Code is ________________________. Portions created by ______________________
+are Copyright (C) _____ _______________________. All Rights Reserved. Contributor(s):
+______________________________________."
 
+C. Requirements for a Distribution of Non-modifiable Code
 If you distribute the Program in a form to which the recipient cannot make
 Modifications (e.g. object code), the terms of this license apply to use by
 recipient and you must include the following statement in appropriate and
@@ -107,8 +102,7 @@ Center, Inc. and other contributors. All rights reserved."
 In addition, the source code must be included with the object code distribution
 or the distributor must provide the source code to the recipient upon request.
 
-   D. Requirements for a Combined Work Distribution
-
+D. Requirements for a Combined Work Distribution
 Distributions of Combined Works are subject to the terms of this license and
 must be made at no charge to the recipient beyond the costs of physically
 transferring the files to recipient.
@@ -125,7 +119,7 @@ Work. However, the Program contained in an Aggregate Work is subject to this
 License. Also, should the Program be extracted from an Aggregate Work, this
 License applies to any use of the Program apart from the Aggregate Work.
 
-   Section 4. License Grant
+Section 4. License Grant
 
 For purposes of permitting use of your Modifications by OCLC and other licensees
 hereunder, you hereby grant to OCLC and such other licensees the non-exclusive,
diff --git a/options/license/OCaml-LGPL-linking-exception b/options/license/OCaml-LGPL-linking-exception
index cee7a4df49..7fc88d7307 100644
--- a/options/license/OCaml-LGPL-linking-exception
+++ b/options/license/OCaml-LGPL-linking-exception
@@ -1,3 +1 @@
-OCaml LGPL Linking Exception
-
-As a special exception to the GNU Lesser General Public License, you may link, statically or dynamically, a "work that uses the OCaml Core System " with a publicly distributed version of the OCaml Core System to produce an executable file containing portions of the OCaml Core System , and distribute that executable file under terms of your choice, without any of the additional requirements listed in clause 6 of the GNU Lesser General Public License. By "a publicly distributed version of the OCaml Core System ", we mean either the unmodified OCaml Core System as distributed by INRIA , or a modified version of the OCaml Core System that is distributed under the conditions defined in clause 2 of the GNU Lesser General Public License. This exception does not however invalidate any other reasons why the executable file might be covered by the GNU Lesser General Public License.
+As a special exception to the GNU Lesser General Public License, you may link, statically or dynamically, a "work that uses the OCaml Core System" with a publicly distributed version of the OCaml Core System to produce an executable file containing portions of the OCaml Core System, and distribute that executable file under terms of your choice, without any of the additional requirements listed in clause 6 of the GNU Lesser General Public License. By "a publicly distributed version of the OCaml Core System", we mean either the unmodified OCaml Core System as distributed by INRIA, or a modified version of the OCaml Core System that is distributed under the conditions defined in clause 2 of the GNU Lesser General Public License. This exception does not however invalidate any other reasons why the executable file might be covered by the GNU Lesser General Public License.
diff --git a/options/license/ODC-By-1.0 b/options/license/ODC-By-1.0
index 733e5d7edd..2b59cca81f 100644
--- a/options/license/ODC-By-1.0
+++ b/options/license/ODC-By-1.0
@@ -1,8 +1,6 @@
-##
+# ODC Attribution License (ODC-By)
 
-ODC Attribution License (ODC-By) ###
-
-Preamble
+### Preamble
 
 The Open Data Commons Attribution License is a license agreement intended
 to allow users to freely share, modify, and use this Database subject only
@@ -30,97 +28,97 @@ You (as defined below)
 
 agree as follows:
 
-   1.0 Definitions of Capitalised Words
+### 1.0 Definitions of Capitalised Words
 
-"Collective Database" - Means this Database in unmodified form as part of
+"Collective Database" – Means this Database in unmodified form as part of
 a collection of independent databases in themselves that together are assembled
 into a collective whole. A work that constitutes a Collective Database will
 not be considered a Derivative Database.
 
-"Convey" - As a verb, means Using the Database, a Derivative Database, or
+"Convey" – As a verb, means Using the Database, a Derivative Database, or
 the Database as part of a Collective Database in any way that enables a Person
 to make or receive copies of the Database or a Derivative Database. Conveying
 does not include interaction with a user through a computer network, or creating
 and Using a Produced Work, where no transfer of a copy of the Database or
 a Derivative Database occurs.
 
-"Contents" - The contents of this Database, which includes the information,
+"Contents" – The contents of this Database, which includes the information,
 independent works, or other material collected into the Database. For example,
 the contents of the Database could be factual data or works such as images,
 audiovisual material, text, or sounds.
 
-"Database" - A collection of material (the Contents) arranged in a systematic
+"Database" – A collection of material (the Contents) arranged in a systematic
 or methodical way and individually accessible by electronic or other means
 offered under the terms of this License.
 
-"Database Directive" - Means Directive 96/9/EC of the European Parliament
+"Database Directive" – Means Directive 96/9/EC of the European Parliament
 and of the Council of 11 March 1996 on the legal protection of databases,
 as amended or succeeded.
 
-"Database Right" - Means rights resulting from the Chapter III ("sui generis")
+"Database Right" – Means rights resulting from the Chapter III ("sui generis")
 rights in the Database Directive (as amended and as transposed by member states),
 which includes the Extraction and Re-utilisation of the whole or a Substantial
 part of the Contents, as well as any similar rights available in the relevant
 jurisdiction under Section 10.4.
 
-"Derivative Database" - Means a database based upon the Database, and includes
+"Derivative Database" – Means a database based upon the Database, and includes
 any translation, adaptation, arrangement, modification, or any other alteration
 of the Database or of a Substantial part of the Contents. This includes, but
 is not limited to, Extracting or Re-utilising the whole or a Substantial part
 of the Contents in a new Database.
 
-"Extraction" - Means the permanent or temporary transfer of all or a Substantial
+"Extraction" – Means the permanent or temporary transfer of all or a Substantial
 part of the Contents to another medium by any means or in any form.
 
-"License" - Means this license agreement and is both a license of rights such
+"License" – Means this license agreement and is both a license of rights such
 as copyright and Database Rights and an agreement in contract.
 
-"Licensor" - Means the Person that offers the Database under the terms of
+"Licensor" – Means the Person that offers the Database under the terms of
 this License.
 
-"Person" - Means a natural or legal person or a body of persons corporate
+"Person" – Means a natural or legal person or a body of persons corporate
 or incorporate.
 
-"Produced Work" - a work (such as an image, audiovisual material, text, or
+"Produced Work" – a work (such as an image, audiovisual material, text, or
 sounds) resulting from using the whole or a Substantial part of the Contents
 (via a search or other query) from this Database, a Derivative Database, or
 this Database as part of a Collective Database.
 
-"Publicly" - means to Persons other than You or under Your control by either
+"Publicly" – means to Persons other than You or under Your control by either
 more than 50% ownership or by the power to direct their activities (such as
 contracting with an independent consultant).
 
-"Re-utilisation" - means any form of making available to the public all or
+"Re-utilisation" – means any form of making available to the public all or
 a Substantial part of the Contents by the distribution of copies, by renting,
 by online or other forms of transmission.
 
-"Substantial" - Means substantial in terms of quantity or quality or a combination
+"Substantial" – Means substantial in terms of quantity or quality or a combination
 of both. The repeated and systematic Extraction or Re-utilisation of insubstantial
 parts of the Contents may amount to the Extraction or Re-utilisation of a
 Substantial part of the Contents.
 
-"Use" - As a verb, means doing any act that is restricted by copyright or
+"Use" – As a verb, means doing any act that is restricted by copyright or
 Database Rights whether in the original medium or any other; and includes
 without limitation distributing, copying, publicly performing, publicly displaying,
 and preparing derivative works of the Database, as well as modifying the Database
 as may be technically necessary to use it in a different mode or format.
 
-"You" - Means a Person exercising rights under this License who has not previously
+"You" – Means a Person exercising rights under this License who has not previously
 violated the terms of this License with respect to the Database, or who has
 received express permission from the Licensor to exercise rights under this
 License despite a previous violation.
 
-   Words in the singular include the plural and vice versa.
+Words in the singular include the plural and vice versa.
 
-   2.0 What this License covers
+### 2.0 What this License covers
 
-   2.1. Legal effect of this document. This License is:
+2.1. Legal effect of this document. This License is:
 
-      a. A license of applicable copyright and neighbouring rights;
+ a. A license of applicable copyright and neighbouring rights;
 
-      b. A license of the Database Right; and
+ b. A license of the Database Right; and
 
-      c. An agreement in contract between You and the Licensor.
+ c. An agreement in contract between You and the Licensor.
 
 2.2 Legal rights covered. This License covers the legal rights in the Database,
 including:
@@ -144,7 +142,7 @@ c. Contract. This is an agreement between You and the Licensor for access
 to the Database. In return you agree to certain conditions of use on this
 access as outlined in this License.
 
-   2.3 Rights not covered.
+2.3 Rights not covered.
 
 a. This License does not apply to computer programs used in the making or
 operation of the Database;
@@ -152,7 +150,7 @@ operation of the Database;
 b. This License does not cover any patents over the Contents or the Database;
 and
 
-c. This License does not cover any trademarks associated with the Database.
+ c. This License does not cover any trademarks associated with the Database.
 
 2.4 Relationship to Contents in the Database. The individual items of the
 Contents contained in this Database may be covered by other rights, including
@@ -163,7 +161,7 @@ a Database of images (the Contents), this License would not apply to copyright
 over individual images, which could have their own separate licenses, or one
 single license covering all of the rights over the images.
 
-   3.0 Rights granted
+### 3.0 Rights granted
 
 3.1 Subject to the terms and conditions of this License, the Licensor grants
 to You a worldwide, royalty-free, non-exclusive, terminable (but only under
@@ -173,14 +171,14 @@ use, and do not exclude any field of endeavour. To the extent possible in
 the relevant jurisdiction, these rights may be exercised in all media and
 formats whether now known or created in the future.
 
-   The rights granted cover, for example:
+The rights granted cover, for example:
 
 a. Extraction and Re-utilisation of the whole or a Substantial part of the
 Contents;
 
-      b. Creation of Derivative Databases;
+ b. Creation of Derivative Databases;
 
-      c. Creation of Collective Databases;
+ c. Creation of Collective Databases;
 
 d. Creation of temporary or permanent reproductions by any means and in any
 form, in whole or in part, including of any Derivative Databases or as a part
@@ -190,7 +188,7 @@ e. Distribution, communication, display, lending, making available, or performan
 to the public by any means and in any form, in whole or in part, including
 of any Derivative Database or as a part of Collective Databases.
 
-   3.2 Compulsory license schemes. For the avoidance of doubt:
+3.2 Compulsory license schemes. For the avoidance of doubt:
 
 a. Non-waivable compulsory license schemes. In those jurisdictions in which
 the right to collect royalties through any statutory or compulsory licensing
@@ -213,7 +211,7 @@ be multiple-licensed, and so You may have the choice of using alternative
 licenses for this Database. Subject to Section 10.4, all other rights not
 expressly granted by Licensor are reserved.
 
-   4.0 Conditions of Use
+### 4.0 Conditions of Use
 
 4.1 The rights granted in Section 3 above are expressly made subject to Your
 complying with the following conditions of use. These are important conditions
@@ -223,7 +221,7 @@ of its terms.
 4.2 Notices. If You Publicly Convey this Database, any Derivative Database,
 or the Database as part of a Collective Database, then You must:
 
-      a. Do so only under the terms of this License;
+ a. Do so only under the terms of this License;
 
 b. Include a copy of this License or its Uniform Resource Identifier (URI)
 with the Database or Derivative Database, including both in the Database or
@@ -244,7 +242,7 @@ with, or is otherwise exposed to the Produced Work aware that Content was
 obtained from the Database, Derivative Database, or the Database as part of
 a Collective Database, and that it is available under this License.
 
-a. Example notice. The following text will satisfy notice under Section 4.3:
+ a. Example notice. The following text will satisfy notice under Section 4.3:
 
 Contains information from DATABASE NAME which is made available under the
 ODC Attribution License.
@@ -266,7 +264,7 @@ Database made by You or another Person at Your direction. You may not impose
 any further restrictions on the exercise of the rights granted or affirmed
 under this License.
 
-   5.0 Moral rights
+### 5.0 Moral rights
 
 5.1 Moral rights. This section covers moral rights, including any rights to
 be identified as the author of the Database or to object to treatment that
@@ -289,7 +287,7 @@ over certain aspects of the Database.
 Please note that some jurisdictions do not allow for the waiver of moral rights,
 and so moral rights may still subsist over the Database in some jurisdictions.
 
-   6.0 Fair dealing, Database exceptions, and other rights not affected
+### 6.0 Fair dealing, Database exceptions, and other rights not affected
 
 6.1 This License does not affect any rights that You or anyone else may independently
 have under any applicable law to make any use of this Database, including
@@ -311,7 +309,7 @@ repeated and systematic Extraction or Re-utilisation of insubstantial parts
 of the Contents may however amount to the Extraction or Re-utilisation of
 a Substantial part of the Contents.
 
-   7.0 Warranties and Disclaimer
+### 7.0 Warranties and Disclaimer
 
 7.1 The Database is licensed by the Licensor "as is" and without any warranty
 of any kind, either express, implied, or arising by statute, custom, course
@@ -321,7 +319,7 @@ the presence or absence of errors, fitness for a particular purpose, merchantabi
 or otherwise. Some jurisdictions do not allow the exclusion of implied warranties,
 so this exclusion may not apply to You.
 
-   8.0 Limitation of liability
+### 8.0 Limitation of liability
 
 8.1 Subject to any liability that may not be excluded or limited by law, the
 Licensor is not liable for, and expressly excludes, all liability for loss
@@ -337,7 +335,7 @@ of such damages.
 financial loss to the extent it is caused by proved negligence on the part
 of the Licensor.
 
-   9.0 Termination of Your rights under this License
+### 9.0 Termination of Your rights under this License
 
 9.1 Any breach by You of the terms and conditions of this License automatically
 terminates this License with immediate effect and without notice to You. For
@@ -376,7 +374,7 @@ license that has been, or is required to be, granted under the terms of this
 License), and this License will continue in full force and effect unless terminated
 as stated above.
 
-   10.0 General
+### 10.0 General
 
 10.1 If any provision of this License is held to be invalid or unenforceable,
 that must not affect the validity or enforceability of the remainder of the
diff --git a/options/license/ODbL-1.0 b/options/license/ODbL-1.0
index 560147751c..c734a1dd88 100644
--- a/options/license/ODbL-1.0
+++ b/options/license/ODbL-1.0
@@ -1,29 +1,32 @@
-ODC Open Database License (ODbL) Preamble
+## ODC Open Database License (ODbL)
 
-The Open Database License (ODbL) is a license agreement intended to allow
-users to freely share, modify, and use this Database while maintaining this
-same freedom for others. Many databases are covered by copyright, and therefore
-this document licenses these rights. Some jurisdictions, mainly in the European
-Union, have specific rights that cover databases, and so the ODbL addresses
-these rights, too. Finally, the ODbL is also an agreement in contract for
-users of this Database to act in certain ways in return for accessing this
-Database.
+### Preamble
 
-Databases can contain a wide variety of types of content (images, audiovisual
-material, and sounds all in the same database, for example), and so the ODbL
-only governs the rights over the Database, and not the contents of the Database
-individually. Licensors should use the ODbL together with another license
-for the contents, if the contents have a single set of rights that uniformly
-covers all of the contents. If the contents have multiple sets of different
-rights, Licensors should describe what rights govern what contents together
-in the individual record or in some other way that clarifies what rights apply.
+The Open Database License (ODbL) is a license agreement intended to
+allow users to freely share, modify, and use this Database while
+maintaining this same freedom for others. Many databases are covered by
+copyright, and therefore this document licenses these rights. Some
+jurisdictions, mainly in the European Union, have specific rights that
+cover databases, and so the ODbL addresses these rights, too. Finally,
+the ODbL is also an agreement in contract for users of this Database to
+act in certain ways in return for accessing this Database.
 
-Sometimes the contents of a database, or the database itself, can be covered
-by other rights not addressed here (such as private contracts, trade mark
-over the name, or privacy rights / data protection rights over information
-in the contents), and so you are advised that you may have to consult other
-documents or clear other rights before doing activities not covered by this
-License.
+Databases can contain a wide variety of types of content (images,
+audiovisual material, and sounds all in the same database, for example),
+and so the ODbL only governs the rights over the Database, and not the
+contents of the Database individually. Licensors should use the ODbL
+together with another license for the contents, if the contents have a
+single set of rights that uniformly covers all of the contents. If the
+contents have multiple sets of different rights, Licensors should
+describe what rights govern what contents together in the individual
+record or in some other way that clarifies what rights apply.
+
+Sometimes the contents of a database, or the database itself, can be
+covered by other rights not addressed here (such as private contracts,
+trade mark over the name, or privacy rights / data protection rights
+over information in the contents), and so you are advised that you may
+have to consult other documents or clear other rights before doing
+activities not covered by this License.
 
 ------
 
@@ -35,466 +38,503 @@ You (as defined below)
 
 agree as follows:
 
-   1.0 Definitions of Capitalised Words
+### 1.0 Definitions of Capitalised Words
+
+"Collective Database" – Means this Database in unmodified form as part
+of a collection of independent databases in themselves that together are
+assembled into a collective whole. A work that constitutes a Collective
+Database will not be considered a Derivative Database.
+
+"Convey" – As a verb, means Using the Database, a Derivative Database,
+or the Database as part of a Collective Database in any way that enables
+a Person to make or receive copies of the Database or a Derivative
+Database.  Conveying does not include interaction with a user through a
+computer network, or creating and Using a Produced Work, where no
+transfer of a copy of the Database or a Derivative Database occurs.
+"Contents" – The contents of this Database, which includes the
+information, independent works, or other material collected into the
+Database. For example, the contents of the Database could be factual
+data or works such as images, audiovisual material, text, or sounds.
+
+"Database" – A collection of material (the Contents) arranged in a
+systematic or methodical way and individually accessible by electronic
+or other means offered under the terms of this License.
+
+"Database Directive" – Means Directive 96/9/EC of the European
+Parliament and of the Council of 11 March 1996 on the legal protection
+of databases, as amended or succeeded.
+
+"Database Right" – Means rights resulting from the Chapter III ("sui
+generis") rights in the Database Directive (as amended and as transposed
+by member states), which includes the Extraction and Re-utilisation of
+the whole or a Substantial part of the Contents, as well as any similar
+rights available in the relevant jurisdiction under Section 10.4.
+
+"Derivative Database" – Means a database based upon the Database, and
+includes any translation, adaptation, arrangement, modification, or any
+other alteration of the Database or of a Substantial part of the
+Contents. This includes, but is not limited to, Extracting or
+Re-utilising the whole or a Substantial part of the Contents in a new
+Database.
+
+"Extraction" – Means the permanent or temporary transfer of all or a
+Substantial part of the Contents to another medium by any means or in
+any form.
+
+"License" – Means this license agreement and is both a license of rights
+such as copyright and Database Rights and an agreement in contract.
+
+"Licensor" – Means the Person that offers the Database under the terms
+of this License.
+
+"Person" – Means a natural or legal person or a body of persons
+corporate or incorporate.
+
+"Produced Work" –  a work (such as an image, audiovisual material, text,
+or sounds) resulting from using the whole or a Substantial part of the
+Contents (via a search or other query) from this Database, a Derivative
+Database, or this Database as part of a Collective Database.
+
+"Publicly" – means to Persons other than You or under Your control by
+either more than 50% ownership or by the power to direct their
+activities (such as contracting with an independent consultant).
+
+"Re-utilisation" – means any form of making available to the public all
+or a Substantial part of the Contents by the distribution of copies, by
+renting, by online or other forms of transmission.
+
+"Substantial" – Means substantial in terms of quantity or quality or a
+combination of both. The repeated and systematic Extraction or
+Re-utilisation of insubstantial parts of the Contents may amount to the
+Extraction or Re-utilisation of a Substantial part of the Contents.
+
+"Use" – As a verb, means doing any act that is restricted by copyright
+or Database Rights whether in the original medium or any other; and
+includes without limitation distributing, copying, publicly performing,
+publicly displaying, and preparing derivative works of the Database, as
+well as modifying the Database as may be technically necessary to use it
+in a different mode or format.
+
+"You" – Means a Person exercising rights under this License who has not
+previously violated the terms of this License with respect to the
+Database, or who has received express permission from the Licensor to
+exercise rights under this License despite a previous violation.
+
+Words in the singular include the plural and vice versa.
+
+### 2.0 What this License covers
+
+2.1. Legal effect of this document. This License is:
+
+  a. A license of applicable copyright and neighbouring rights;
+
+  b. A license of the Database Right; and
+
+  c. An agreement in contract between You and the Licensor.
+
+2.2 Legal rights covered. This License covers the legal rights in the
+Database, including:
+
+  a. Copyright. Any copyright or neighbouring rights in the Database.
+  The copyright licensed includes any individual elements of the
+  Database, but does not cover the copyright over the Contents
+  independent of this Database. See Section 2.4 for details. Copyright
+  law varies between jurisdictions, but is likely to cover: the Database
+  model or schema, which is the structure, arrangement, and organisation
+  of the Database, and can also include the Database tables and table
+  indexes; the data entry and output sheets; and the Field names of
+  Contents stored in the Database;
+
+  b. Database Rights. Database Rights only extend to the Extraction and
+  Re-utilisation of the whole or a Substantial part of the Contents.
+  Database Rights can apply even when there is no copyright over the
+  Database. Database Rights can also apply when the Contents are removed
+  from the Database and are selected and arranged in a way that would
+  not infringe any applicable copyright; and
+
+  c. Contract. This is an agreement between You and the Licensor for
+  access to the Database. In return you agree to certain conditions of
+  use on this access as outlined in this License.
+
+2.3 Rights not covered.
+
+  a. This License does not apply to computer programs used in the making
+  or operation of the Database;
+
+  b. This License does not cover any patents over the Contents or the
+  Database; and
+
+  c. This License does not cover any trademarks associated with the
+  Database.
+
+2.4 Relationship to Contents in the Database. The individual items of
+the Contents contained in this Database may be covered by other rights,
+including copyright, patent, data protection, privacy, or personality
+rights, and this License does not cover any rights (other than Database
+Rights or in contract) in individual Contents contained in the Database.
+For example, if used on a Database of images (the Contents), this
+License would not apply to copyright over individual images, which could
+have their own separate licenses, or one single license covering all of
+the rights over the images.
+
+### 3.0 Rights granted
+
+3.1 Subject to the terms and conditions of this License, the Licensor
+grants to You a worldwide, royalty-free, non-exclusive, terminable (but
+only under Section 9) license to Use the Database for the duration of
+any applicable copyright and Database Rights. These rights explicitly
+include commercial use, and do not exclude any field of endeavour. To
+the extent possible in the relevant jurisdiction, these rights may be
+exercised in all media and formats whether now known or created in the
+future.
+
+The rights granted cover, for example:
 
-"Collective Database" - Means this Database in unmodified form as part of
-a collection of independent databases in themselves that together are assembled
-into a collective whole. A work that constitutes a Collective Database will
-not be considered a Derivative Database.
+  a. Extraction and Re-utilisation of the whole or a Substantial part of
+  the Contents;
 
-"Convey" - As a verb, means Using the Database, a Derivative Database, or
-the Database as part of a Collective Database in any way that enables a Person
-to make or receive copies of the Database or a Derivative Database. Conveying
-does not include interaction with a user through a computer network, or creating
-and Using a Produced Work, where no transfer of a copy of the Database or
-a Derivative Database occurs.
+  b. Creation of Derivative Databases;
 
-"Contents" - The contents of this Database, which includes the information,
-independent works, or other material collected into the Database. For example,
-the contents of the Database could be factual data or works such as images,
-audiovisual material, text, or sounds.
+  c. Creation of Collective Databases;
 
-"Database" - A collection of material (the Contents) arranged in a systematic
-or methodical way and individually accessible by electronic or other means
-offered under the terms of this License.
+  d. Creation of temporary or permanent reproductions by any means and
+  in any form, in whole or in part, including of any Derivative
+  Databases or as a part of Collective Databases; and
 
-"Database Directive" - Means Directive 96/9/EC of the European Parliament
-and of the Council of 11 March 1996 on the legal protection of databases,
-as amended or succeeded.
+  e. Distribution, communication, display, lending, making available, or
+  performance to the public by any means and in any form, in whole or in
+  part, including of any Derivative Database or as a part of Collective
+  Databases.
 
-"Database Right" - Means rights resulting from the Chapter III ("sui generis")
-rights in the Database Directive (as amended and as transposed by member states),
-which includes the Extraction and Re-utilisation of the whole or a Substantial
-part of the Contents, as well as any similar rights available in the relevant
-jurisdiction under Section 10.4.
+3.2 Compulsory license schemes. For the avoidance of doubt:
 
-"Derivative Database" - Means a database based upon the Database, and includes
-any translation, adaptation, arrangement, modification, or any other alteration
-of the Database or of a Substantial part of the Contents. This includes, but
-is not limited to, Extracting or Re-utilising the whole or a Substantial part
-of the Contents in a new Database.
+  a. Non-waivable compulsory license schemes. In those jurisdictions in
+  which the right to collect royalties through any statutory or
+  compulsory licensing scheme cannot be waived, the Licensor reserves
+  the exclusive right to collect such royalties for any exercise by You
+  of the rights granted under this License;
 
-"Extraction" - Means the permanent or temporary transfer of all or a Substantial
-part of the Contents to another medium by any means or in any form.
-
-"License" - Means this license agreement and is both a license of rights such
-as copyright and Database Rights and an agreement in contract.
+  b. Waivable compulsory license schemes. In those jurisdictions in
+  which the right to collect royalties through any statutory or
+  compulsory licensing scheme can be waived, the Licensor waives the
+  exclusive right to collect such royalties for any exercise by You of
+  the rights granted under this License; and,
 
-"Licensor" - Means the Person that offers the Database under the terms of
-this License.
+  c. Voluntary license schemes. The Licensor waives the right to collect
+  royalties, whether individually or, in the event that the Licensor is
+  a member of a collecting society that administers voluntary licensing
+  schemes, via that society, from any exercise by You of the rights
+  granted under this License.
 
-"Person" - Means a natural or legal person or a body of persons corporate
-or incorporate.
+3.3 The right to release the Database under different terms, or to stop
+distributing or making available the Database, is reserved. Note that
+this Database may be multiple-licensed, and so You may have the choice
+of using alternative licenses for this Database. Subject to Section
+10.4, all other rights not expressly granted by Licensor are reserved.
+
+### 4.0 Conditions of Use
+
+4.1 The rights granted in Section 3 above are expressly made subject to
+Your complying with the following conditions of use. These are important
+conditions of this License, and if You fail to follow them, You will be
+in material breach of its terms.
+
+4.2 Notices. If You Publicly Convey this Database, any Derivative
+Database, or the Database as part of a Collective Database, then You
+must:
 
-"Produced Work" - a work (such as an image, audiovisual material, text, or
-sounds) resulting from using the whole or a Substantial part of the Contents
-(via a search or other query) from this Database, a Derivative Database, or
-this Database as part of a Collective Database.
+  a. Do so only under the terms of this License or another license
+  permitted under Section 4.4;
 
-"Publicly" - means to Persons other than You or under Your control by either
-more than 50% ownership or by the power to direct their activities (such as
-contracting with an independent consultant).
+  b. Include a copy of this License (or, as applicable, a license
+  permitted under Section 4.4) or its Uniform Resource Identifier (URI)
+  with the Database or Derivative Database, including both in the
+  Database or Derivative Database and in any relevant documentation; and
 
-"Re-utilisation" - means any form of making available to the public all or
-a Substantial part of the Contents by the distribution of copies, by renting,
-by online or other forms of transmission.
+  c. Keep intact any copyright or Database Right notices and notices
+  that refer to this License.
 
-"Substantial" - Means substantial in terms of quantity or quality or a combination
-of both. The repeated and systematic Extraction or Re-utilisation of insubstantial
-parts of the Contents may amount to the Extraction or Re-utilisation of a
-Substantial part of the Contents.
+  d. If it is not possible to put the required notices in a particular
+  file due to its structure, then You must include the notices in a
+  location (such as a relevant directory) where users would be likely to
+  look for it.
+
+4.3 Notice for using output (Contents). Creating and Using a Produced
+Work does not require the notice in Section 4.2. However, if you
+Publicly Use a Produced Work, You must include a notice associated with
+the Produced Work reasonably calculated to make any Person that uses,
+views, accesses, interacts with, or is otherwise exposed to the Produced
+Work aware that Content was obtained from the Database, Derivative
+Database, or the Database as part of a Collective Database, and that it
+is available under this License.
+
+  a. Example notice. The following text will satisfy notice under
+  Section 4.3:
+
+        Contains information from DATABASE NAME, which is made available
+        here under the Open Database License (ODbL).
 
-"Use" - As a verb, means doing any act that is restricted by copyright or
-Database Rights whether in the original medium or any other; and includes
-without limitation distributing, copying, publicly performing, publicly displaying,
-and preparing derivative works of the Database, as well as modifying the Database
-as may be technically necessary to use it in a different mode or format.
+DATABASE NAME should be replaced with the name of the Database and a
+hyperlink to the URI of the Database. "Open Database License" should
+contain a hyperlink to the URI of the text of this License. If
+hyperlinks are not possible, You should include the plain text of the
+required URI's with the above notice.
+
+4.4 Share alike.
+
+  a. Any Derivative Database that You Publicly Use must be only under
+  the terms of:
+
+    i. This License;
+
+    ii. A later version of this License similar in spirit to this
+      License; or
+
+    iii. A compatible license.
+
+  If You license the Derivative Database under one of the licenses
+  mentioned in (iii), You must comply with the terms of that license.
+
+  b. For the avoidance of doubt, Extraction or Re-utilisation of the
+  whole or a Substantial part of the Contents into a new database is a
+  Derivative Database and must comply with Section 4.4.
+
+  c. Derivative Databases and Produced Works.  A Derivative Database is
+  Publicly Used and so must comply with Section 4.4. if a Produced Work
+  created from the Derivative Database is Publicly Used.
+
+  d. Share Alike and additional Contents. For the avoidance of doubt,
+  You must not add Contents to Derivative Databases under Section 4.4 a
+  that are incompatible with the rights granted under this License.
+
+  e. Compatible licenses. Licensors may authorise a proxy to determine
+  compatible licenses under Section 4.4 a iii. If they do so, the
+  authorised proxy's public statement of acceptance of a compatible
+  license grants You permission to use the compatible license.
+
+
+4.5 Limits of Share Alike.  The requirements of Section 4.4 do not apply
+in the following:
+
+  a. For the avoidance of doubt, You are not required to license
+  Collective Databases under this License if You incorporate this
+  Database or a Derivative Database in the collection, but this License
+  still applies to this Database or a Derivative Database as a part of
+  the Collective Database;
+
+  b. Using this Database, a Derivative Database, or this Database as
+  part of a Collective Database to create a Produced Work does not
+  create a Derivative Database for purposes of  Section 4.4; and
+
+  c. Use of a Derivative Database internally within an organisation is
+  not to the public and therefore does not fall under the requirements
+  of Section 4.4.
+
+4.6 Access to Derivative Databases. If You Publicly Use a Derivative
+Database or a Produced Work from a Derivative Database, You must also
+offer to recipients of the Derivative Database or Produced Work a copy
+in a machine readable form of:
+
+  a. The entire Derivative Database; or
+
+  b. A file containing all of the alterations made to the Database or
+  the method of making the alterations to the Database (such as an
+  algorithm), including any additional Contents, that make up all the
+  differences between the Database and the Derivative Database.
+
+The Derivative Database (under a.) or alteration file (under b.) must be
+available at no more than a reasonable production cost for physical
+distributions and free of charge if distributed over the internet.
+
+4.7 Technological measures and additional terms
+
+  a. This License does not allow You to impose (except subject to
+  Section 4.7 b.)  any terms or any technological measures on the
+  Database, a Derivative Database, or the whole or a Substantial part of
+  the Contents that alter or restrict the terms of this License, or any
+  rights granted under it, or have the effect or intent of restricting
+  the ability of any person to exercise those rights.
+
+  b. Parallel distribution. You may impose terms or technological
+  measures on the Database, a Derivative Database, or the whole or a
+  Substantial part of the Contents (a "Restricted Database") in
+  contravention of Section 4.74 a. only if You also make a copy of the
+  Database or a Derivative Database available to the recipient of the
+  Restricted Database:
+
+    i. That is available without additional fee;
+
+    ii. That is available in a medium that does not alter or restrict
+    the terms of this License, or any rights granted under it, or have
+    the effect or intent of restricting the ability of any person to
+    exercise those rights (an "Unrestricted Database"); and
+
+    iii. The Unrestricted Database is at least as accessible to the
+    recipient as a practical matter as the Restricted Database.
+
+  c. For the avoidance of doubt, You may place this Database or a
+  Derivative Database in an authenticated environment, behind a
+  password, or within a similar access control scheme provided that You
+  do not alter or restrict the terms of this License or any rights
+  granted under it or have the effect or intent of restricting the
+  ability of any person to exercise those rights.
 
-"You" - Means a Person exercising rights under this License who has not previously
-violated the terms of this License with respect to the Database, or who has
-received express permission from the Licensor to exercise rights under this
-License despite a previous violation.
-
-   Words in the singular include the plural and vice versa.
-
-   2.0 What this License covers
-
-   2.1. Legal effect of this document. This License is:
-
-      a. A license of applicable copyright and neighbouring rights;
-
-      b. A license of the Database Right; and
-
-      c. An agreement in contract between You and the Licensor.
-
-2.2 Legal rights covered. This License covers the legal rights in the Database,
-including:
-
-a. Copyright. Any copyright or neighbouring rights in the Database. The copyright
-licensed includes any individual elements of the Database, but does not cover
-the copyright over the Contents independent of this Database. See Section
-2.4 for details. Copyright law varies between jurisdictions, but is likely
-to cover: the Database model or schema, which is the structure, arrangement,
-and organisation of the Database, and can also include the Database tables
-and table indexes; the data entry and output sheets; and the Field names of
-Contents stored in the Database;
-
-b. Database Rights. Database Rights only extend to the Extraction and Re-utilisation
-of the whole or a Substantial part of the Contents. Database Rights can apply
-even when there is no copyright over the Database. Database Rights can also
-apply when the Contents are removed from the Database and are selected and
-arranged in a way that would not infringe any applicable copyright; and
-
-c. Contract. This is an agreement between You and the Licensor for access
-to the Database. In return you agree to certain conditions of use on this
-access as outlined in this License.
-
-   2.3 Rights not covered.
-
-a. This License does not apply to computer programs used in the making or
-operation of the Database;
-
-b. This License does not cover any patents over the Contents or the Database;
-and
-
-c. This License does not cover any trademarks associated with the Database.
-
-2.4 Relationship to Contents in the Database. The individual items of the
-Contents contained in this Database may be covered by other rights, including
-copyright, patent, data protection, privacy, or personality rights, and this
-License does not cover any rights (other than Database Rights or in contract)
-in individual Contents contained in the Database. For example, if used on
-a Database of images (the Contents), this License would not apply to copyright
-over individual images, which could have their own separate licenses, or one
-single license covering all of the rights over the images.
-
-   3.0 Rights granted
-
-3.1 Subject to the terms and conditions of this License, the Licensor grants
-to You a worldwide, royalty-free, non-exclusive, terminable (but only under
-Section 9) license to Use the Database for the duration of any applicable
-copyright and Database Rights. These rights explicitly include commercial
-use, and do not exclude any field of endeavour. To the extent possible in
-the relevant jurisdiction, these rights may be exercised in all media and
-formats whether now known or created in the future.
-
-   The rights granted cover, for example:
-
-a. Extraction and Re-utilisation of the whole or a Substantial part of the
-Contents;
-
-      b. Creation of Derivative Databases;
-
-      c. Creation of Collective Databases;
-
-d. Creation of temporary or permanent reproductions by any means and in any
-form, in whole or in part, including of any Derivative Databases or as a part
-of Collective Databases; and
-
-e. Distribution, communication, display, lending, making available, or performance
-to the public by any means and in any form, in whole or in part, including
-of any Derivative Database or as a part of Collective Databases.
-
-   3.2 Compulsory license schemes. For the avoidance of doubt:
-
-a. Non-waivable compulsory license schemes. In those jurisdictions in which
-the right to collect royalties through any statutory or compulsory licensing
-scheme cannot be waived, the Licensor reserves the exclusive right to collect
-such royalties for any exercise by You of the rights granted under this License;
-
-b. Waivable compulsory license schemes. In those jurisdictions in which the
-right to collect royalties through any statutory or compulsory licensing scheme
-can be waived, the Licensor waives the exclusive right to collect such royalties
-for any exercise by You of the rights granted under this License; and,
-
-c. Voluntary license schemes. The Licensor waives the right to collect royalties,
-whether individually or, in the event that the Licensor is a member of a collecting
-society that administers voluntary licensing schemes, via that society, from
-any exercise by You of the rights granted under this License.
-
-3.3 The right to release the Database under different terms, or to stop distributing
-or making available the Database, is reserved. Note that this Database may
-be multiple-licensed, and so You may have the choice of using alternative
-licenses for this Database. Subject to Section 10.4, all other rights not
-expressly granted by Licensor are reserved.
-
-   4.0 Conditions of Use
-
-4.1 The rights granted in Section 3 above are expressly made subject to Your
-complying with the following conditions of use. These are important conditions
-of this License, and if You fail to follow them, You will be in material breach
-of its terms.
-
-4.2 Notices. If You Publicly Convey this Database, any Derivative Database,
-or the Database as part of a Collective Database, then You must:
-
-a. Do so only under the terms of this License or another license permitted
-under Section 4.4;
-
-b. Include a copy of this License (or, as applicable, a license permitted
-under Section 4.4) or its Uniform Resource Identifier (URI) with the Database
-or Derivative Database, including both in the Database or Derivative Database
-and in any relevant documentation; and
-
-c. Keep intact any copyright or Database Right notices and notices that refer
-to this License.
-
-d. If it is not possible to put the required notices in a particular file
-due to its structure, then You must include the notices in a location (such
-as a relevant directory) where users would be likely to look for it.
-
-4.3 Notice for using output (Contents). Creating and Using a Produced Work
-does not require the notice in Section 4.2. However, if you Publicly Use a
-Produced Work, You must include a notice associated with the Produced Work
-reasonably calculated to make any Person that uses, views, accesses, interacts
-with, or is otherwise exposed to the Produced Work aware that Content was
-obtained from the Database, Derivative Database, or the Database as part of
-a Collective Database, and that it is available under this License.
-
-a. Example notice. The following text will satisfy notice under Section 4.3:
-
-Contains information from DATABASE NAME, which is made available here under
-the Open Database License (ODbL).
-
-DATABASE NAME should be replaced with the name of the Database and a hyperlink
-to the URI of the Database. "Open Database License" should contain a hyperlink
-to the URI of the text of this License. If hyperlinks are not possible, You
-should include the plain text of the required URI's with the above notice.
-
-   4.4 Share alike.
-
-a. Any Derivative Database that You Publicly Use must be only under the terms
-of:
-
-         i. This License;
-
-ii. A later version of this License similar in spirit to this License; or
-
-         iii. A compatible license.
-
-If You license the Derivative Database under one of the licenses mentioned
-in (iii), You must comply with the terms of that license.
-
-b. For the avoidance of doubt, Extraction or Re-utilisation of the whole or
-a Substantial part of the Contents into a new database is a Derivative Database
-and must comply with Section 4.4.
-
-c. Derivative Databases and Produced Works. A Derivative Database is Publicly
-Used and so must comply with Section 4.4. if a Produced Work created from
-the Derivative Database is Publicly Used.
-
-d. Share Alike and additional Contents. For the avoidance of doubt, You must
-not add Contents to Derivative Databases under Section 4.4 a that are incompatible
-with the rights granted under this License.
-
-e. Compatible licenses. Licensors may authorise a proxy to determine compatible
-licenses under Section 4.4 a iii. If they do so, the authorised proxy's public
-statement of acceptance of a compatible license grants You permission to use
-the compatible license.
-
-4.5 Limits of Share Alike. The requirements of Section 4.4 do not apply in
-the following:
-
-a. For the avoidance of doubt, You are not required to license Collective
-Databases under this License if You incorporate this Database or a Derivative
-Database in the collection, but this License still applies to this Database
-or a Derivative Database as a part of the Collective Database;
-
-b. Using this Database, a Derivative Database, or this Database as part of
-a Collective Database to create a Produced Work does not create a Derivative
-Database for purposes of Section 4.4; and
-
-c. Use of a Derivative Database internally within an organisation is not to
-the public and therefore does not fall under the requirements of Section 4.4.
-
-4.6 Access to Derivative Databases. If You Publicly Use a Derivative Database
-or a Produced Work from a Derivative Database, You must also offer to recipients
-of the Derivative Database or Produced Work a copy in a machine readable form
-of:
-
-      a. The entire Derivative Database; or
-
-b. A file containing all of the alterations made to the Database or the method
-of making the alterations to the Database (such as an algorithm), including
-any additional Contents, that make up all the differences between the Database
-and the Derivative Database.
-
-The Derivative Database (under a.) or alteration file (under b.) must be available
-at no more than a reasonable production cost for physical distributions and
-free of charge if distributed over the internet.
-
-   4.7 Technological measures and additional terms
-
-a. This License does not allow You to impose (except subject to Section 4.7
-b.) any terms or any technological measures on the Database, a Derivative
-Database, or the whole or a Substantial part of the Contents that alter or
-restrict the terms of this License, or any rights granted under it, or have
-the effect or intent of restricting the ability of any person to exercise
-those rights.
-
-b. Parallel distribution. You may impose terms or technological measures on
-the Database, a Derivative Database, or the whole or a Substantial part of
-the Contents (a "Restricted Database") in contravention of Section 4.74 a.
-only if You also make a copy of the Database or a Derivative Database available
-to the recipient of the Restricted Database:
-
-         i. That is available without additional fee;
-
-ii. That is available in a medium that does not alter or restrict the terms
-of this License, or any rights granted under it, or have the effect or intent
-of restricting the ability of any person to exercise those rights (an "Unrestricted
-Database"); and
-
-iii. The Unrestricted Database is at least as accessible to the recipient
-as a practical matter as the Restricted Database.
-
-c. For the avoidance of doubt, You may place this Database or a Derivative
-Database in an authenticated environment, behind a password, or within a similar
-access control scheme provided that You do not alter or restrict the terms
-of this License or any rights granted under it or have the effect or intent
-of restricting the ability of any person to exercise those rights.
-
-4.8 Licensing of others. You may not sublicense the Database. Each time You
-communicate the Database, the whole or Substantial part of the Contents, or
-any Derivative Database to anyone else in any way, the Licensor offers to
-the recipient a license to the Database on the same terms and conditions as
-this License. You are not responsible for enforcing compliance by third parties
-with this License, but You may enforce any rights that You have over a Derivative
-Database. You are solely responsible for any modifications of a Derivative
-Database made by You or another Person at Your direction. You may not impose
-any further restrictions on the exercise of the rights granted or affirmed
+4.8 Licensing of others. You may not sublicense the Database. Each time
+You communicate the Database, the whole or Substantial part of the
+Contents, or any Derivative Database to anyone else in any way, the
+Licensor offers to the recipient a license to the Database on the same
+terms and conditions as this License. You are not responsible for
+enforcing compliance by third parties with this License, but You may
+enforce any rights that You have over a Derivative Database. You are
+solely responsible for any modifications of a Derivative Database made
+by You or another Person at Your direction. You may not impose any
+further restrictions on the exercise of the rights granted or affirmed
 under this License.
 
-   5.0 Moral rights
+### 5.0 Moral rights
 
-5.1 Moral rights. This section covers moral rights, including any rights to
-be identified as the author of the Database or to object to treatment that
-would otherwise prejudice the author's honour and reputation, or any other
-derogatory treatment:
+5.1 Moral rights. This section covers moral rights, including any rights
+to be identified as the author of the Database or to object to treatment
+that would otherwise prejudice the author's honour and reputation, or
+any other derogatory treatment:
 
-a. For jurisdictions allowing waiver of moral rights, Licensor waives all
-moral rights that Licensor may have in the Database to the fullest extent
-possible by the law of the relevant jurisdiction under Section 10.4;
+  a. For jurisdictions allowing waiver of moral rights, Licensor waives
+  all moral rights that Licensor may have in the Database to the fullest
+  extent possible by the law of the relevant jurisdiction under Section
+  10.4;
 
-b. If waiver of moral rights under Section 5.1 a in the relevant jurisdiction
-is not possible, Licensor agrees not to assert any moral rights over the Database
-and waives all claims in moral rights to the fullest extent possible by the
-law of the relevant jurisdiction under Section 10.4; and
+  b. If waiver of moral rights under Section 5.1 a in the relevant
+  jurisdiction is not possible, Licensor agrees not to assert any moral
+  rights over the Database and waives all claims in moral rights to the
+  fullest extent possible by the law of the relevant jurisdiction under
+  Section 10.4; and
 
-c. For jurisdictions not allowing waiver or an agreement not to assert moral
-rights under Section 5.1 a and b, the author may retain their moral rights
-over certain aspects of the Database.
+  c. For jurisdictions not allowing waiver or an agreement not to assert
+  moral rights under Section 5.1 a and b, the author may retain their
+  moral rights over certain aspects of the Database.
 
-Please note that some jurisdictions do not allow for the waiver of moral rights,
-and so moral rights may still subsist over the Database in some jurisdictions.
+Please note that some jurisdictions do not allow for the waiver of moral
+rights, and so moral rights may still subsist over the Database in some
+jurisdictions.
 
-   6.0 Fair dealing, Database exceptions, and other rights not affected
+### 6.0 Fair dealing, Database exceptions, and other rights not affected
 
-6.1 This License does not affect any rights that You or anyone else may independently
-have under any applicable law to make any use of this Database, including
-without limitation:
+6.1 This License does not affect any rights that You or anyone else may
+independently have under any applicable law to make any use of this
+Database, including without limitation:
 
-a. Exceptions to the Database Right including: Extraction of Contents from
-non-electronic Databases for private purposes, Extraction for purposes of
-illustration for teaching or scientific research, and Extraction or Re-utilisation
-for public security or an administrative or judicial procedure.
+  a. Exceptions to the Database Right including: Extraction of Contents
+  from non-electronic Databases for private purposes, Extraction for
+  purposes of illustration for teaching or scientific research, and
+  Extraction or Re-utilisation for public security or an administrative
+  or judicial procedure.
 
-b. Fair dealing, fair use, or any other legally recognised limitation or exception
-to infringement of copyright or other applicable laws.
+  b. Fair dealing, fair use, or any other legally recognised limitation
+  or exception to infringement of copyright or other applicable laws.
 
-6.2 This License does not affect any rights of lawful users to Extract and
-Re-utilise insubstantial parts of the Contents, evaluated quantitatively or
-qualitatively, for any purposes whatsoever, including creating a Derivative
-Database (subject to other rights over the Contents, see Section 2.4). The
-repeated and systematic Extraction or Re-utilisation of insubstantial parts
-of the Contents may however amount to the Extraction or Re-utilisation of
-a Substantial part of the Contents.
+6.2 This License does not affect any rights of lawful users to Extract
+and Re-utilise insubstantial parts of the Contents, evaluated
+quantitatively or qualitatively, for any purposes whatsoever, including
+creating a Derivative Database (subject to other rights over the
+Contents, see Section 2.4). The repeated and systematic Extraction or
+Re-utilisation of insubstantial parts of the Contents may however amount
+to the Extraction or Re-utilisation of a Substantial part of the
+Contents.
 
-   7.0 Warranties and Disclaimer
+### 7.0 Warranties and Disclaimer
 
-7.1 The Database is licensed by the Licensor "as is" and without any warranty
-of any kind, either express, implied, or arising by statute, custom, course
-of dealing, or trade usage. Licensor specifically disclaims any and all implied
-warranties or conditions of title, non-infringement, accuracy or completeness,
-the presence or absence of errors, fitness for a particular purpose, merchantability,
-or otherwise. Some jurisdictions do not allow the exclusion of implied warranties,
-so this exclusion may not apply to You.
+7.1 The Database is licensed by the Licensor "as is" and without any
+warranty of any kind, either express, implied, or arising by statute,
+custom, course of dealing, or trade usage. Licensor specifically
+disclaims any and all implied warranties or conditions of title,
+non-infringement, accuracy or completeness, the presence or absence of
+errors, fitness for a particular purpose, merchantability, or otherwise.
+Some jurisdictions do not allow the exclusion of implied warranties, so
+this exclusion may not apply to You.
 
-   8.0 Limitation of liability
+### 8.0 Limitation of liability
 
-8.1 Subject to any liability that may not be excluded or limited by law, the
-Licensor is not liable for, and expressly excludes, all liability for loss
-or damage however and whenever caused to anyone by any use under this License,
-whether by You or by anyone else, and whether caused by any fault on the part
-of the Licensor or not. This exclusion of liability includes, but is not limited
-to, any special, incidental, consequential, punitive, or exemplary damages
-such as loss of revenue, data, anticipated profits, and lost business. This
-exclusion applies even if the Licensor has been advised of the possibility
-of such damages.
+8.1 Subject to any liability that may not be excluded or limited by law,
+the Licensor is not liable for, and expressly excludes, all liability
+for loss or damage however and whenever caused to anyone by any use
+under this License, whether by You or by anyone else, and whether caused
+by any fault on the part of the Licensor or not. This exclusion of
+liability includes, but is not limited to, any special, incidental,
+consequential, punitive, or exemplary damages such as loss of revenue,
+data, anticipated profits, and lost business. This exclusion applies
+even if the Licensor has been advised of the possibility of such
+damages.
 
-8.2 If liability may not be excluded by law, it is limited to actual and direct
-financial loss to the extent it is caused by proved negligence on the part
-of the Licensor.
+8.2 If liability may not be excluded by law, it is limited to actual and
+direct financial loss to the extent it is caused by proved negligence on
+the part of the Licensor.
 
-   9.0 Termination of Your rights under this License
+### 9.0 Termination of Your rights under this License
 
-9.1 Any breach by You of the terms and conditions of this License automatically
-terminates this License with immediate effect and without notice to You. For
-the avoidance of doubt, Persons who have received the Database, the whole
-or a Substantial part of the Contents, Derivative Databases, or the Database
-as part of a Collective Database from You under this License will not have
-their licenses terminated provided their use is in full compliance with this
-License or a license granted under Section 4.8 of this License. Sections 1,
-2, 7, 8, 9 and 10 will survive any termination of this License.
+9.1 Any breach by You of the terms and conditions of this License
+automatically terminates this License with immediate effect and without
+notice to You. For the avoidance of doubt, Persons who have received the
+Database, the whole or a Substantial part of the Contents, Derivative
+Databases, or the Database as part of a Collective Database from You
+under this License will not have their licenses terminated provided
+their use is in full compliance with this License or a license granted
+under Section 4.8 of this License.  Sections 1, 2, 7, 8, 9 and 10 will
+survive any termination of this License.
 
-9.2 If You are not in breach of the terms of this License, the Licensor will
-not terminate Your rights under it.
+9.2 If You are not in breach of the terms of this License, the Licensor
+will not terminate Your rights under it.
 
-9.3 Unless terminated under Section 9.1, this License is granted to You for
-the duration of applicable rights in the Database.
+9.3 Unless terminated under Section 9.1, this License is granted to You
+for the duration of applicable rights in the Database.
 
-9.4 Reinstatement of rights. If you cease any breach of the terms and conditions
-of this License, then your full rights under this License will be reinstated:
+9.4 Reinstatement of rights. If you cease any breach of the terms and
+conditions of this License, then your full rights under this License
+will be reinstated:
 
-a. Provisionally and subject to permanent termination until the 60th day after
-cessation of breach;
+  a. Provisionally and subject to permanent termination until the 60th
+  day after cessation of breach;
 
-b. Permanently on the 60th day after cessation of breach unless otherwise
-reasonably notified by the Licensor; or
+  b. Permanently on the 60th day after cessation of breach unless
+  otherwise reasonably notified by the Licensor; or
 
-c. Permanently if reasonably notified by the Licensor of the violation, this
-is the first time You have received notice of violation of this License from
-the Licensor, and You cure the violation prior to 30 days after your receipt
-of the notice.
+  c.  Permanently if reasonably notified by the Licensor of the
+  violation, this is the first time You have received notice of
+  violation of this License from  the Licensor, and You cure the
+  violation prior to 30 days after your receipt of the notice.
 
-Persons subject to permanent termination of rights are not eligible to be
-a recipient and receive a license under Section 4.8.
+Persons subject to permanent termination of rights are not eligible to
+be a recipient and receive a license under Section 4.8.
 
-9.5 Notwithstanding the above, Licensor reserves the right to release the
-Database under different license terms or to stop distributing or making available
-the Database. Releasing the Database under different license terms or stopping
-the distribution of the Database will not withdraw this License (or any other
-license that has been, or is required to be, granted under the terms of this
-License), and this License will continue in full force and effect unless terminated
-as stated above.
+9.5 Notwithstanding the above, Licensor reserves the right to release
+the Database under different license terms or to stop distributing or
+making available the Database. Releasing the Database under different
+license terms or stopping the distribution of the Database will not
+withdraw this License (or any other license that has been, or is
+required to be, granted under the terms of this License), and this
+License will continue in full force and effect unless terminated as
+stated above.
 
-   10.0 General
+### 10.0 General
 
-10.1 If any provision of this License is held to be invalid or unenforceable,
-that must not affect the validity or enforceability of the remainder of the
-terms and conditions of this License and each remaining provision of this
-License shall be valid and enforced to the fullest extent permitted by law.
+10.1 If any provision of this License is held to be invalid or
+unenforceable, that must not affect the validity or enforceability of
+the remainder of the terms and conditions of this License and each
+remaining provision of this License shall be valid and enforced to the
+fullest extent permitted by law.
 
-10.2 This License is the entire agreement between the parties with respect
-to the rights granted here over the Database. It replaces any earlier understandings,
-agreements or representations with respect to the Database.
+10.2 This License is the entire agreement between the parties with
+respect to the rights granted here over the Database. It replaces any
+earlier understandings, agreements or representations with respect to
+the Database.
 
-10.3 If You are in breach of the terms of this License, You will not be entitled
-to rely on the terms of this License or to complain of any breach by the Licensor.
+10.3 If You are in breach of the terms of this License, You will not be
+entitled to rely on the terms of this License or to complain of any
+breach by the Licensor.
 
-10.4 Choice of law. This License takes effect in and will be governed by the
-laws of the relevant jurisdiction in which the License terms are sought to
-be enforced. If the standard suite of rights granted under applicable copyright
-law and Database Rights in the relevant jurisdiction includes additional rights
-not granted under this License, these additional rights are granted in this
-License in order to meet the terms of this License.
+10.4 Choice of law. This License takes effect in and will be governed by
+the laws of the relevant jurisdiction in which the License terms are
+sought to be enforced. If the standard suite of rights granted under
+applicable copyright law and Database Rights in the relevant
+jurisdiction includes additional rights not granted under this License,
+these additional rights are granted in this License in order to meet the
+terms of this License.
diff --git a/options/license/OFL-1.0 b/options/license/OFL-1.0
index ad436fd2c8..1ea82a9779 100644
--- a/options/license/OFL-1.0
+++ b/options/license/OFL-1.0
@@ -20,15 +20,11 @@ DEFINITIONS
 
 "Font Software" refers to any and all of the following:
 
-   - font files
-
-   - data files
-
-   - source code
-
-   - build scripts
-
-   - documentation
+     - font files
+     - data files
+     - source code
+     - build scripts
+     - documentation
 
 "Reserved Font Name" refers to the Font Software name as seen by users and
 any other names as specified after the copyright statement.
diff --git a/options/license/OFL-1.0-RFN b/options/license/OFL-1.0-RFN
index ad436fd2c8..1ea82a9779 100644
--- a/options/license/OFL-1.0-RFN
+++ b/options/license/OFL-1.0-RFN
@@ -20,15 +20,11 @@ DEFINITIONS
 
 "Font Software" refers to any and all of the following:
 
-   - font files
-
-   - data files
-
-   - source code
-
-   - build scripts
-
-   - documentation
+     - font files
+     - data files
+     - source code
+     - build scripts
+     - documentation
 
 "Reserved Font Name" refers to the Font Software name as seen by users and
 any other names as specified after the copyright statement.
diff --git a/options/license/OFL-1.0-no-RFN b/options/license/OFL-1.0-no-RFN
index ad436fd2c8..1ea82a9779 100644
--- a/options/license/OFL-1.0-no-RFN
+++ b/options/license/OFL-1.0-no-RFN
@@ -20,15 +20,11 @@ DEFINITIONS
 
 "Font Software" refers to any and all of the following:
 
-   - font files
-
-   - data files
-
-   - source code
-
-   - build scripts
-
-   - documentation
+     - font files
+     - data files
+     - source code
+     - build scripts
+     - documentation
 
 "Reserved Font Name" refers to the Font Software name as seen by users and
 any other names as specified after the copyright statement.
diff --git a/options/license/OFL-1.1 b/options/license/OFL-1.1
index 084c9628a6..0da42f86bb 100644
--- a/options/license/OFL-1.1
+++ b/options/license/OFL-1.1
@@ -1,9 +1,3 @@
-Copyright (c) <dates>, <Copyright Holder> (<URL|email>),
-
-with Reserved Font Name <Reserved Font Name>. This Font Software is licensed
-under the SIL Open Font License, Version 1.1.
-
-This license is copied below, and is also available with a FAQ at: http://scripts.sil.org/OFL
 SIL OPEN FONT LICENSE
 
 Version 1.1 - 26 February 2007
diff --git a/options/license/OFL-1.1-RFN b/options/license/OFL-1.1-RFN
index 084c9628a6..0da42f86bb 100644
--- a/options/license/OFL-1.1-RFN
+++ b/options/license/OFL-1.1-RFN
@@ -1,9 +1,3 @@
-Copyright (c) <dates>, <Copyright Holder> (<URL|email>),
-
-with Reserved Font Name <Reserved Font Name>. This Font Software is licensed
-under the SIL Open Font License, Version 1.1.
-
-This license is copied below, and is also available with a FAQ at: http://scripts.sil.org/OFL
 SIL OPEN FONT LICENSE
 
 Version 1.1 - 26 February 2007
diff --git a/options/license/OFL-1.1-no-RFN b/options/license/OFL-1.1-no-RFN
index 521f99da26..0da42f86bb 100644
--- a/options/license/OFL-1.1-no-RFN
+++ b/options/license/OFL-1.1-no-RFN
@@ -1,7 +1,3 @@
-Copyright (c) <dates>, <Copyright Holder> (<URL|email>). This Font Software
-is licensed under the SIL Open Font License, Version 1.1.
-
-This license is copied below, and is also available with a FAQ at: http://scripts.sil.org/OFL
 SIL OPEN FONT LICENSE
 
 Version 1.1 - 26 February 2007
diff --git a/options/license/OGC-1.0 b/options/license/OGC-1.0
index e7227d0b2a..fba845f948 100644
--- a/options/license/OGC-1.0
+++ b/options/license/OGC-1.0
@@ -17,7 +17,7 @@ or derivative work.
 conditions. If none exist, a short notice of the following form (hypertext
 is preferred, text is permitted) should be used within the body of any redistributed
 or derivative code: "Copyright © [$date-of-document] Open Geospatial Consortium,
-Inc. All Rights Reserved. http://www. ogc .org/ogc/legal (Hypertext is preferred,
+Inc. All Rights Reserved. http://www.ogc.org/ogc/legal (Hypertext is preferred,
 but a textual representation is permitted.)
 
 3. Notice of any changes or modifications to the OGC files, including the
diff --git a/options/license/OGL-Canada-2.0 b/options/license/OGL-Canada-2.0
index 67df0d5282..01c2534fe0 100644
--- a/options/license/OGL-Canada-2.0
+++ b/options/license/OGL-Canada-2.0
@@ -4,58 +4,45 @@ You are encouraged to use the Information that is available under this licence
 with only a few conditions.
 
 Using Information under this licence
-
-   * Use of any Information indicates your acceptance of the terms below.
-
+* Use of any Information indicates your acceptance of the terms below.
 * The Information Provider grants you a worldwide, royalty-free, perpetual,
 non-exclusive licence to use the Information, including for commercial purposes,
 subject to the terms below.
 
 You are free to:
-
 * Copy, modify, publish, translate, adapt, distribute or otherwise use the
 Information in any medium, mode or format for any lawful purpose.
 
 You must, where you do any of the above:
-
 * Acknowledge the source of the Information by including any attribution statement
 specified by the Information Provider(s) and, where possible, provide a link
 to this licence.
-
 * If the Information Provider does not provide a specific attribution statement,
 or if you are using Information from several information providers and multiple
 attributions are not practical for your product or application, you must use
 the following attribution statement:
-
-   Contains information licensed under the Open Government Licence – Canada.
+     Contains information licensed under the Open Government Licence – Canada.
 
 The terms of this licence are important, and if you fail to comply with any
 of them, the rights granted to you under this licence, or any similar licence
 granted by the Information Provider, will end automatically.
 
 Exemptions
-
 This licence does not grant you any right to use:
-
-   * Personal Information;
-
-   * third party rights the Information Provider is not authorized to license;
-
+* Personal Information;
+* third party rights the Information Provider is not authorized to license;
 * the names, crests, logos, or other official symbols of the Information Provider;
 and
-
 * Information subject to other intellectual property rights, including patents,
 trade-marks and official marks.
 
 Non-endorsement
-
 This licence does not grant you any right to use the Information in a way
 that suggests any official status or that the Information Provider endorses
 you or your use of the Information.
 
 No Warranty
-
-The Information is licensed "as is", and the Information Provider excludes
+The Information is licensed “as is”, and the Information Provider excludes
 all representations, warranties, obligations, and liabilities, whether express
 or implied, to the maximum extent permitted by law.
 
@@ -67,7 +54,6 @@ the Information, even if specifically advised of the possibility of such loss,
 injury or damage.
 
 Governing Law
-
 This licence is governed by the laws of the province of Ontario and the applicable
 laws of Canada.
 
@@ -75,30 +61,20 @@ Legal proceedings related to this licence may only be brought in the courts
 of Ontario or the Federal Court of Canada.
 
 Definitions
-
 In this licence, the terms below have the following meanings:
 
-"Information"
+"Information" means information resources protected by copyright or other
+information that is offered for use under the terms of this licence.
 
-means information resources protected by copyright or other information that
-is offered for use under the terms of this licence.
+"Information Provider" means Her Majesty the Queen in right of Canada.
 
-"Information Provider"
+“Personal Information” means “personal information” as defined in section
+3 of the Privacy Act, R.S.C. 1985, c. P-21.
 
-means Her Majesty the Queen in right of Canada.
-
-"Personal Information"
-
-means "personal information" as defined in section 3 of the Privacy Act, R.S.C.
-1985, c. P-21.
-
-"You"
-
-means the natural or legal person, or body of persons corporate or incorporate,
+"You" means the natural or legal person, or body of persons corporate or incorporate,
 acquiring rights under this licence.
 
 Versioning
-
 This is version 2.0 of the Open Government Licence – Canada. The Information
 Provider may make changes to the terms of this licence from time to time and
 issue a new version of the licence. Your use of the Information will be governed
diff --git a/options/license/OGL-UK-1.0 b/options/license/OGL-UK-1.0
index 2faa50c963..ce2481c65c 100644
--- a/options/license/OGL-UK-1.0
+++ b/options/license/OGL-UK-1.0
@@ -3,11 +3,10 @@ Open Government Licence v1.0
 You are encouraged to use and re-use the Information that is available under
 this licence, the Open Government Licence, freely and flexibly, with only
 a few conditions.
-
-Using Information under this licence
+Using information under this licence
 
 Use of copyright and database right material expressly made available under
-this licence (the 'Information') indicates your acceptance of the terms and
+this licence (the ‘Information’) indicates your acceptance of the terms and
 conditions below.
 
 The Licensor grants you a worldwide, royalty-free, perpetual, non-exclusive
@@ -17,35 +16,25 @@ This licence does not affect your freedom under fair dealing or fair use or
 any other copyright or database right exceptions and limitations.
 
 You are free to:
-
-   copy, publish, distribute and transmit the Information;
-
-   adapt the Information;
-
-exploit the Information commercially for example, by combining it with other
+		copy, publish, distribute and transmit the Information;
+		adapt the Information;
+		exploit the Information commercially for example, by combining it with other
 Information, or by including it in your own product or application.
 
 You must, where you do any of the above:
-
-acknowledge the source of the Information by including any attribution statement
-specified by the Information Provider(s) and, where possible, provide a link
+		acknowledge the source of the Information by including any attribution statement
+specified by the Information Provider(s) and, where possible, provide a link
 to this licence;
-
-If the Information Provider does not provide a specific attribution statement,
+		 If the Information Provider does not provide a specific attribution statement,
 or if you are using Information from several Information Providers and multiple
 attributions are not practical in your product or application, you may consider
-using the following:
-
-Contains public sector information licensed under the Open Government Licence
-v1.0.
-
-ensure that you do not use the Information in a way that suggests any official
+using the following:
 Contains public sector information licensed under the
+Open Government Licence v1.0.
+		ensure that you do not use the Information in a way that suggests any official
 status or that the Information Provider endorses you or your use of the Information;
-
-ensure that you do not mislead others or misrepresent the Information or its
-source;
-
-ensure that your use of the Information does not breach the Data Protection
+		ensure that you do not mislead others or misrepresent the Information or
+its source;
+		ensure that your use of the Information does not breach the Data Protection
 Act 1998 or the Privacy and Electronic Communications (EC Directive) Regulations
 2003.
 
@@ -53,31 +42,24 @@ These are important conditions of this licence and if you fail to comply with
 them the rights granted to you under this licence, or any similar licence
 granted by the Licensor, will end automatically.
 
-Exemptions
+ Exemptions
 
 This licence does not cover the use of:
-
-   - personal data in the Information;
-
-- Information that has neither been published nor disclosed under information
+	- personal data in the Information;
+	- Information that has neither been published nor disclosed under information
 access legislation (including the Freedom of Information Acts for the UK and
 Scotland) by or with the consent of the Information Provider;
-
-- departmental or public sector organisation logos, crests and the Royal Arms
-except where they form an integral part of a document or dataset;
-
-   - military insignia;
-
-   - third party rights the Information Provider is not authorised to license;
-
-- Information subject to other intellectual property rights, including patents,
+	- departmental or public sector organisation logos, crests and the Royal
+Arms except where they form an integral part of a document or dataset;
+	- military insignia;
+	- third party rights the Information Provider is not authorised to license;
+	- Information subject to other intellectual property rights, including patents,
 trademarks, and design rights; and
-
-   - identity documents such as the British Passport.
+	- identity documents such as the British Passport.
 
 No warranty
 
-The Information is licensed 'as is' and the Information Provider excludes
+The Information is licensed ‘as is’ and the Information Provider excludes
 all representations, warranties, obligations and liabilities in relation to
 the Information to the maximum extent permitted by law.
 
@@ -96,49 +78,47 @@ Definitions
 
 In this licence, the terms below have the following meanings:
 
-'Information' means information protected by copyright or by database right
+‘Information’
means information protected by copyright or by database right
 (for example, literary and artistic works, content, data and source code)
 offered for use under the terms of this licence.
 
-'Information Provider' means the person or organisation providing the Information
+‘Information Provider’
means the person or organisation providing the Information
 under this licence.
 
-'Licensor' means any Information Provider which has the authority to offer
-Information under the terms of this licence or the Controller of Her Majesty's
+‘Licensor’
means any Information Provider which has the authority to offer
+Information under the terms of this licence or the Controller of Her Majesty’s
 Stationery Office, who has the authority to offer Information subject to Crown
 copyright and Crown database rights and Information subject to copyright and
 database right that has been assigned to or acquired by the Crown, under the
 terms of this licence.
 
-'Use' as a verb, means doing any act which is restricted by copyright or database
+‘Use’
as a verb, means doing any act which is restricted by copyright or database
 right, whether in the original medium or in any other medium, and includes
 without limitation distributing, copying, adapting, modifying as may be technically
 necessary to use it in a different mode or format.
 
-'You' means the natural or legal person, or body of persons corporate or incorporate,
+‘You’
means the natural or legal person, or body of persons corporate or incorporate,
 acquiring rights under this licence.
 
 About the Open Government Licence
-
-The Controller of Her Majesty's Stationery Office (HMSO) has developed this
+The Controller of Her Majesty’s Stationery Office (HMSO) has developed this
 licence as a tool to enable Information Providers in the public sector to
 license the use and re-use of their Information under a common open licence.
 The Controller invites public sector bodies owning their own copyright and
 database rights to permit the use of their Information under this licence.
 
 The Controller of HMSO has authority to license Information subject to copyright
-and database right owned by the Crown. The extent of the Controller's offer
+and database right owned by the Crown. The extent of the Controller’s offer
 to license this Information under the terms of this licence is set out in
-the UK Government Licensing Framework.
+the UK Government Licensing Framework.
 
 This is version 1.0 of the Open Government Licence. The Controller of HMSO
 may, from time to time, issue new versions of the Open Government Licence.
 However, you may continue to use Information licensed under this version should
 you wish to do so.
-
 These terms have been aligned to be interoperable with any Creative Commons
 Attribution Licence, which covers copyright, and Open Data Commons Attribution
 License, which covers database rights and applicable copyrights.
 
-Further context, best practice and guidance can be found in the UK Government
-Licensing Framework section on The National Archives website.
+Further context, best practice and guidance can be found in the UK Government
+Licensing Framework section on The National Archives website.
diff --git a/options/license/OGL-UK-2.0 b/options/license/OGL-UK-2.0
index 5d71a909fb..8cf514a0db 100644
--- a/options/license/OGL-UK-2.0
+++ b/options/license/OGL-UK-2.0
@@ -4,9 +4,8 @@ You are encouraged to use and re-use the Information that is available under
 this licence freely and flexibly, with only a few conditions.
 
 Using Information under this licence
-
 Use of copyright and database right material expressly made available under
-this licence (the 'Information') indicates your acceptance of the terms and
+this licence (the ‘Information’) indicates your acceptance of the terms and
 conditions below.
 
 The Licensor grants you a worldwide, royalty-free, perpetual, non-exclusive
@@ -16,21 +15,15 @@ This licence does not affect your freedom under fair dealing or fair use or
 any other copyright or database right exceptions and limitations.
 
 You are free to:
-
-   copy, publish, distribute and transmit the Information;
-
-   adapt the Information;
-
+copy, publish, distribute and transmit the Information;
+adapt the Information;
 exploit the Information commercially and non-commercially for example, by
 combining it with other Information, or by including it in your own product
 or application.
-
 You must, where you do any of the above:
-
 acknowledge the source of the Information by including any attribution statement
 specified by the Information Provider(s) and, where possible, provide a link
 to this licence;
-
 If the Information Provider does not provide a specific attribution statement,
 or if you are using Information from several Information Providers and multiple
 attributions are not practical in your product or application, you may use
@@ -43,37 +36,27 @@ These are important conditions of this licence and if you fail to comply with
 them the rights granted to you under this licence, or any similar licence
 granted by the Licensor, will end automatically.
 
-Exemptions
-
+ Exemptions
 This licence does not cover:
 
-   personal data in the Information;
-
+personal data in the Information;
 information that has neither been published nor disclosed under information
 access legislation (including the Freedom of Information Acts for the UK and
 Scotland) by or with the consent of the Information Provider;
-
 departmental or public sector organisation logos, crests and the Royal Arms
 except where they form an integral part of a document or dataset;
-
-   military insignia;
-
-   third party rights the Information Provider is not authorised to license;
-
+military insignia;
+third party rights the Information Provider is not authorised to license;
 other intellectual property rights, including patents, trade marks, and design
 rights; and
-
-   identity documents such as the British Passport
-
+identity documents such as the British Passport
 Non-endorsement
-
 This licence does not grant you any right to use the Information in a way
 that suggests any official status or that the Information Provider endorses
 you or your use of the Information.
 
 Non warranty
-
-The Information is licensed 'as is' and the Information Provider excludes
+The Information is licensed ‘as is’ and the Information Provider excludes
 all representations, warranties, obligations and liabilities in relation to
 the Information to the maximum extent permitted by law.
 
@@ -83,47 +66,48 @@ kind caused by its use. The Information Provider does not guarantee the continue
 supply of the Information.
 
 Governing Law
-
 This licence is governed by the laws of the jurisdiction in which the Information
 Provider has its principal place of business, unless otherwise specified by
 the Information Provider.
 
 Definitions
-
 In this licence, the terms below have the following meanings:
 
-'Information' means information protected by copyright or by database right
-(for example, literary and artistic works, content, data and source code)
-offered for use under the terms of this licence.
+‘Information’
+means information protected by copyright or by database right (for example,
+literary and artistic works, content, data and source code) offered for use
+under the terms of this licence.
 
-'Information Provider' means the person or organisation providing the Information
-under this licence.
+‘Information Provider’
+means the person or organisation providing the Information under this licence.
 
-'Licensor' means any Information Provider who has the authority to offer Information
-under the terms of this licence. It includes the Controller of Her Majesty's
+‘Licensor’
+means any Information Provider who has the authority to offer Information
+under the terms of this licence. It includes the Controller of Her Majesty’s
 Stationery Office, who has the authority to offer Information subject to Crown
 copyright and Crown database rights, and Information subject to copyright
 and database rights which have been assigned to or acquired by the Crown,
 under the terms of this licence.
 
-'Use' means doing any act which is restricted by copyright or database right,
-whether in the original medium or in any other medium, and includes without
-limitation distributing, copying, adapting, modifying as may be technically
-necessary to use it in a different mode or format.
+‘Use’
+means doing any act which is restricted by copyright or database right, whether
+in the original medium or in any other medium, and includes without limitation
+distributing, copying, adapting, modifying as may be technically necessary
+to use it in a different mode or format.
 
-'You' means the natural or legal person, or body of persons corporate or incorporate,
+‘You’
+means the natural or legal person, or body of persons corporate or incorporate,
 acquiring rights under this licence.
 
 About the Open Government Licence
-
-The Controller of Her Majesty's Stationery Office (HMSO) has developed this
+The Controller of Her Majesty’s Stationery Office (HMSO) has developed this
 licence as a tool to enable Information Providers in the public sector to
 license the use and re-use of their Information under a common open licence.
 The Controller invites public sector bodies owning their own copyright and
 database rights to permit the use of their Information under this licence.
 
 The Controller of HMSO has authority to license Information subject to copyright
-and database right owned by the Crown. The extent of the Controller's offer
+and database right owned by the Crown. The extent of the Controller’s offer
 to license this Information under the terms of this licence is set out on
 The National Archives website.
 
diff --git a/options/license/OGL-UK-3.0 b/options/license/OGL-UK-3.0
index 86f3c87e2d..c87e69a471 100644
--- a/options/license/OGL-UK-3.0
+++ b/options/license/OGL-UK-3.0
@@ -4,7 +4,6 @@ You are encouraged to use and re-use the Information that is available under
 this licence freely and flexibly, with only a few conditions.
 
 Using Information under this licence
-
 Use of copyright and database right material expressly made available under
 this licence (the 'Information') indicates your acceptance of the terms and
 conditions below.
@@ -16,21 +15,15 @@ This licence does not affect your freedom under fair dealing or fair use or
 any other copyright or database right exceptions and limitations.
 
 You are free to:
-
-   copy, publish, distribute and transmit the Information;
-
-   adapt the Information;
-
+copy, publish, distribute and transmit the Information;
+adapt the Information;
 exploit the Information commercially and non-commercially for example, by
 combining it with other Information, or by including it in your own product
 or application.
-
 You must (where you do any of the above):
-
 acknowledge the source of the Information in your product or application by
 including or linking to any attribution statement specified by the Information
 Provider(s) and, where possible, provide a link to this licence;
-
 If the Information Provider does not provide a specific attribution statement,
 you must use the following:
 
@@ -46,36 +39,26 @@ These are important conditions of this licence and if you fail to comply with
 them the rights granted to you under this licence, or any similar licence
 granted by the Licensor, will end automatically.
 
-Exemptions
-
+ Exemptions
 This licence does not cover:
 
-   personal data in the Information;
-
+personal data in the Information;
 Information that has not been accessed by way of publication or disclosure
 under information access legislation (including the Freedom of Information
 Acts for the UK and Scotland) by or with the consent of the Information Provider;
-
 departmental or public sector organisation logos, crests and the Royal Arms
 except where they form an integral part of a document or dataset;
-
-   military insignia;
-
-   third party rights the Information Provider is not authorised to license;
-
+military insignia;
+third party rights the Information Provider is not authorised to license;
 other intellectual property rights, including patents, trade marks, and design
 rights; and
-
-   identity documents such as the British Passport
-
+identity documents such as the British Passport
 Non-endorsement
-
 This licence does not grant you any right to use the Information in a way
 that suggests any official status or that the Information Provider and/or
 Licensor endorse you or your use of the Information.
 
 No warranty
-
 The Information is licensed 'as is' and the Information Provider and/or Licensor
 excludes all representations, warranties, obligations and liabilities in relation
 to the Information to the maximum extent permitted by law.
@@ -86,13 +69,11 @@ or damage of any kind caused by its use. The Information Provider does not
 guarantee the continued supply of the Information.
 
 Governing Law
-
 This licence is governed by the laws of the jurisdiction in which the Information
 Provider has its principal place of business, unless otherwise specified by
 the Information Provider.
 
 Definitions
-
 In this licence, the terms below have the following meanings:
 
 'Information' means information protected by copyright or by database right
@@ -120,7 +101,6 @@ Information is obtained directly from the Licensor or otherwise) under this
 licence.
 
 About the Open Government Licence
-
 The National Archives has developed this licence as a tool to enable Information
 Providers in the public sector to license the use and re-use of their Information
 under a common open licence. The National Archives invites public sector bodies
diff --git a/options/license/OGTSL b/options/license/OGTSL
index 3160dc4fb8..cdcedaf2d0 100644
--- a/options/license/OGTSL
+++ b/options/license/OGTSL
@@ -1,4 +1,6 @@
-The Open Group Test Suite License Preamble
+The Open Group Test Suite License
+
+Preamble
 
 The intent of this document is to state the conditions under which a Package
 may be copied, such that the Copyright Holder maintains some semblance of
@@ -98,4 +100,6 @@ products derived from this software without specific prior written permission.
 
 9. THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES,
 INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
-FITNESS FOR A PARTICULAR PURPOSE. The End
+FITNESS FOR A PARTICULAR PURPOSE.
+
+The End
diff --git a/options/license/OLDAP-1.1 b/options/license/OLDAP-1.1
index 522a67d775..d96704874b 100644
--- a/options/license/OLDAP-1.1
+++ b/options/license/OLDAP-1.1
@@ -1,9 +1,11 @@
 The OpenLDAP Public License
+Version 1.1, 25 August 1998
 
-Version 1.1, 25 August 1998 Copyright 1998, The OpenLDAP Foundation. All Rights
-Reserved. Note: This license is derived from the "Artistic License" as distributed
-with the Perl Programming Language. Its terms are different from those of
-the "Artistic License."
+Copyright 1998, The OpenLDAP Foundation. All Rights Reserved.
+
+Note: This license is derived from the "Artistic License" as distributed with
+the Perl Programming Language. Its terms are different from those of the "Artistic
+License."
 
 PREAMBLE
 
@@ -53,14 +55,14 @@ medium, or placing the modifications on a major archive site such as uunet.uu.ne
 or by allowing the Copyright Holder to include your modifications in the Standard
 Version of the Package.
 
-      b) use the modified Package only within your corporation or organization.
+     b) use the modified Package only within your corporation or organization.
 
 c) rename any non-standard executables so the names do not conflict with standard
 executables, which must also be provided, and provide a separate manual page
 for each non-standard executable that clearly documents how it differs from
 the Standard Version.
 
-      d) make other distribution arrangements with the Copyright Holder.
+     d) make other distribution arrangements with the Copyright Holder.
 
 4. You may distribute the programs of this Package in object code or executable
 form, provided that you do at least ONE of the following:
@@ -77,7 +79,7 @@ Version executables, giving the non-standard executables non-standard names,
 and clearly documenting the differences in manual pages (or equivalent), together
 with instructions on where to get the Standard Version.
 
-      d) make other distribution arrangements with the Copyright Holder.
+     d) make other distribution arrangements with the Copyright Holder.
 
 5. You may charge a reasonable copying fee for any distribution of this Package.
 You may charge any fee you choose for support of this Package. You may not
@@ -102,4 +104,6 @@ products derived from this software without specific prior written permission.
 
 9. THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES,
 INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
-FITNESS FOR A PARTICULAR PURPOSE. The End
+FITNESS FOR A PARTICULAR PURPOSE.
+
+The End
diff --git a/options/license/OLDAP-1.2 b/options/license/OLDAP-1.2
index a91e91017f..7902acc49a 100644
--- a/options/license/OLDAP-1.2
+++ b/options/license/OLDAP-1.2
@@ -1,9 +1,11 @@
 The OpenLDAP Public License
+Version 1.2, 1 September 1998
 
-Version 1.2, 1 September 1998 Copyright 1998, The OpenLDAP Foundation. All
-Rights Reserved. Note: This license is derived from the "Artistic License"
-as distributed with the Perl Programming Language. As differences may exist,
-the complete license should be read.
+Copyright 1998, The OpenLDAP Foundation. All Rights Reserved.
+
+Note: This license is derived from the "Artistic License" as distributed with
+the Perl Programming Language. As differences may exist, the complete license
+should be read.
 
 PREAMBLE
 
@@ -53,14 +55,14 @@ medium, or placing the modifications on a major archive site such as uunet.uu.ne
 or by allowing the Copyright Holder to include your modifications in the Standard
 Version of the Package.
 
-      b) use the modified Package only within your corporation or organization.
+     b) use the modified Package only within your corporation or organization.
 
 c) rename any non-standard executables so the names do not conflict with standard
 executables, which must also be provided, and provide a separate manual page
 for each non-standard executable that clearly documents how it differs from
 the Standard Version.
 
-      d) make other distribution arrangements with the Copyright Holder.
+     d) make other distribution arrangements with the Copyright Holder.
 
 4. You may distribute the programs of this Package in object code or executable
 form, provided that you do at least ONE of the following:
@@ -77,7 +79,7 @@ Version executables, giving the non-standard executables non-standard names,
 and clearly documenting the differences in manual pages (or equivalent), together
 with instructions on where to get the Standard Version.
 
-      d) make other distribution arrangements with the Copyright Holder.
+     d) make other distribution arrangements with the Copyright Holder.
 
 5. You may charge a reasonable copying fee for any distribution of this Package.
 You may charge any fee you choose for support of this Package. You may not
@@ -102,4 +104,6 @@ products derived from this software without specific prior written permission.
 
 9. THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES,
 INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
-FITNESS FOR A PARTICULAR PURPOSE. The End
+FITNESS FOR A PARTICULAR PURPOSE.
+
+The End
diff --git a/options/license/OLDAP-1.3 b/options/license/OLDAP-1.3
index cf489a9d65..70a18eb23b 100644
--- a/options/license/OLDAP-1.3
+++ b/options/license/OLDAP-1.3
@@ -1,9 +1,11 @@
 The OpenLDAP Public License
+Version 1.3, 17 January 1999
 
-Version 1.3, 17 January 1999 Copyright 1998-1999, The OpenLDAP Foundation.
-All Rights Reserved. Note: This license is derived from the "Artistic License"
-as distributed with the Perl Programming Language. As significant differences
-exist, the complete license should be read.
+Copyright 1998-1999, The OpenLDAP Foundation. All Rights Reserved.
+
+Note: This license is derived from the "Artistic License" as distributed with
+the Perl Programming Language. As significant differences exist, the complete
+license should be read.
 
 PREAMBLE
 
@@ -53,14 +55,14 @@ medium, or placing the modifications on a major archive site such as uunet.uu.ne
 or by allowing the Copyright Holder to include your modifications in the Standard
 Version of the Package.
 
-      b) use the modified Package only within your corporation or organization.
+     b) use the modified Package only within your corporation or organization.
 
 c) rename any non-standard executables so the names do not conflict with standard
 executables, which must also be provided, and provide a separate manual page
 for each non-standard executable that clearly documents how it differs from
 the Standard Version.
 
-      d) make other distribution arrangements with the Copyright Holder.
+     d) make other distribution arrangements with the Copyright Holder.
 
 4. You may distribute the programs of this Package in object code or executable
 form, provided that you do at least ONE of the following:
@@ -77,7 +79,7 @@ Version executables, giving the non-standard executables non-standard names,
 and clearly documenting the differences in manual pages (or equivalent), together
 with instructions on where to get the Standard Version.
 
-      d) make other distribution arrangements with the Copyright Holder.
+     d) make other distribution arrangements with the Copyright Holder.
 
 5. You may charge a reasonable copying fee for any distribution of this Package.
 You may charge any fee you choose for support of this Package. You may not
@@ -108,4 +110,6 @@ products derived from this software without specific prior written permission.
 
 10. THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES,
 INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
-FITNESS FOR A PARTICULAR PURPOSE. The End
+FITNESS FOR A PARTICULAR PURPOSE.
+
+The End
diff --git a/options/license/OLDAP-1.4 b/options/license/OLDAP-1.4
index 74d8ebd902..8b165f6a3c 100644
--- a/options/license/OLDAP-1.4
+++ b/options/license/OLDAP-1.4
@@ -1,9 +1,11 @@
 The OpenLDAP Public License
+Version 1.4, 18 January 1999
 
-Version 1.4, 18 January 1999 Copyright 1998-1999, The OpenLDAP Foundation.
-All Rights Reserved. Note: This license is derived from the "Artistic License"
-as distributed with the Perl Programming Language. As significant differences
-exist, the complete license should be read.
+Copyright 1998-1999, The OpenLDAP Foundation. All Rights Reserved.
+
+Note: This license is derived from the "Artistic License" as distributed with
+the Perl Programming Language. As significant differences exist, the complete
+license should be read.
 
 PREAMBLE
 
@@ -53,14 +55,14 @@ medium, or placing the modifications on a major archive site such as uunet.uu.ne
 or by allowing the Copyright Holder to include your modifications in the Standard
 Version of the Package.
 
-      b) use the modified Package only within your corporation or organization.
+     b) use the modified Package only within your corporation or organization.
 
 c) rename any non-standard executables so the names do not conflict with standard
 executables, which must also be provided, and provide a separate manual page
 for each non-standard executable that clearly documents how it differs from
 the Standard Version.
 
-      d) make other distribution arrangements with the Copyright Holder.
+     d) make other distribution arrangements with the Copyright Holder.
 
 4. You may distribute the programs of this Package in object code or executable
 form, provided that you do at least ONE of the following:
@@ -77,7 +79,7 @@ Version executables, giving the non-standard executables non-standard names,
 and clearly documenting the differences in manual pages (or equivalent), together
 with instructions on where to get the Standard Version.
 
-      d) make other distribution arrangements with the Copyright Holder.
+     d) make other distribution arrangements with the Copyright Holder.
 
 5. You may charge a reasonable copying fee for any distribution of this Package.
 You may charge any fee you choose for support of this Package. You may not
@@ -109,4 +111,6 @@ products derived from this software without specific prior written permission.
 
 10. THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES,
 INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
-FITNESS FOR A PARTICULAR PURPOSE. The End
+FITNESS FOR A PARTICULAR PURPOSE.
+
+The End
diff --git a/options/license/OLDAP-2.0 b/options/license/OLDAP-2.0
index 7dd47ef9cc..afed83d06c 100644
--- a/options/license/OLDAP-2.0
+++ b/options/license/OLDAP-2.0
@@ -1,7 +1,8 @@
 The OpenLDAP Public License
+Version 2.0, 7 June 1999
 
-Version 2.0, 7 June 1999 Copyright 1999, The OpenLDAP Foundation, Redwood
-City, California, USA. All Rights Reserved.
+Copyright 1999, The OpenLDAP Foundation, Redwood City, California, USA. All
+Rights Reserved.
 
 Redistribution and use of this software and associated documentation ("Software"),
 with or without modification, are permitted provided that the following conditions
diff --git a/options/license/OLDAP-2.0.1 b/options/license/OLDAP-2.0.1
index 5547eb18a4..9f68d3e9b7 100644
--- a/options/license/OLDAP-2.0.1
+++ b/options/license/OLDAP-2.0.1
@@ -1,7 +1,8 @@
 The OpenLDAP Public License
+Version 2.0.1, 21 December 1999
 
-Version 2.0.1, 21 December 1999 Copyright 1999, The OpenLDAP Foundation, Redwood
-City, California, USA. All Rights Reserved.
+Copyright 1999, The OpenLDAP Foundation, Redwood City, California, USA. All
+Rights Reserved.
 
 Redistribution and use of this software and associated documentation ("Software"),
 with or without modification, are permitted provided that the following conditions
diff --git a/options/license/OLDAP-2.1 b/options/license/OLDAP-2.1
index 8c832b669d..13a759a02c 100644
--- a/options/license/OLDAP-2.1
+++ b/options/license/OLDAP-2.1
@@ -1,7 +1,8 @@
 The OpenLDAP Public License
+Version 2.1, 29 February 2000
 
-Version 2.1, 29 February 2000 Copyright 1999-2000, The OpenLDAP Foundation,
-Redwood City, California, USA. All Rights Reserved.
+Copyright 1999-2000, The OpenLDAP Foundation, Redwood City, California, USA.
+All Rights Reserved.
 
 Redistribution and use of this software and associated documentation ("Software"),
 with or without modification, are permitted provided that the following conditions
diff --git a/options/license/OLDAP-2.2 b/options/license/OLDAP-2.2
index c184df1209..c2d53baf1e 100644
--- a/options/license/OLDAP-2.2
+++ b/options/license/OLDAP-2.2
@@ -1,5 +1,4 @@
 The OpenLDAP Public License
-
 Version 2.2, 1 March 2000
 
 Redistribution and use of this software and associated documentation ("Software"),
diff --git a/options/license/OLDAP-2.2.1 b/options/license/OLDAP-2.2.1
index fd3b8a0176..ee6734db2e 100644
--- a/options/license/OLDAP-2.2.1
+++ b/options/license/OLDAP-2.2.1
@@ -1,5 +1,4 @@
 The OpenLDAP Public License
-
 Version 2.2.1, 1 March 2000
 
 Redistribution and use of this software and associated documentation ("Software"),
diff --git a/options/license/OLDAP-2.2.2 b/options/license/OLDAP-2.2.2
index 6358ba6386..1d5e96a33b 100644
--- a/options/license/OLDAP-2.2.2
+++ b/options/license/OLDAP-2.2.2
@@ -1,5 +1,4 @@
 The OpenLDAP Public License
-
 Version 2.2.2, 28 July 2000
 
 Redistribution and use of this software and associated documentation ("Software"),
@@ -12,7 +11,7 @@ are met:
 and notices, this list of conditions, and the following disclaimer in the
 documentation and/or other materials provided with the distribution.
 
-   3. Redistributions must contain a verbatim copy of this document.
+3. Redistributions must contain a verbatim copy of this document.
 
 4. The name "OpenLDAP" must not be used to endorse or promote products derived
 from this Software without prior written permission of the OpenLDAP Foundation.
diff --git a/options/license/OLDAP-2.3 b/options/license/OLDAP-2.3
index e7f4cb981d..376326e595 100644
--- a/options/license/OLDAP-2.3
+++ b/options/license/OLDAP-2.3
@@ -1,5 +1,4 @@
 The OpenLDAP Public License
-
 Version 2.3, 28 July 2000
 
 Redistribution and use of this software and associated documentation ("Software"),
@@ -12,7 +11,7 @@ are met:
 and notices, this list of conditions, and the following disclaimer in the
 documentation and/or other materials provided with the distribution.
 
-   3. Redistributions must contain a verbatim copy of this document.
+3. Redistributions must contain a verbatim copy of this document.
 
 4. The name "OpenLDAP" must not be used to endorse or promote products derived
 from this Software without prior written permission of the OpenLDAP Foundation.
diff --git a/options/license/OLDAP-2.4 b/options/license/OLDAP-2.4
index a19aebe90c..755aaad3d7 100644
--- a/options/license/OLDAP-2.4
+++ b/options/license/OLDAP-2.4
@@ -1,5 +1,4 @@
 The OpenLDAP Public License
-
 Version 2.4, 8 December 2000
 
 Redistribution and use of this software and associated documentation ("Software"),
@@ -12,13 +11,13 @@ are met:
 and notices, this list of conditions, and the following disclaimer in the
 documentation and/or other materials provided with the distribution.
 
-   3. Redistributions must contain a verbatim copy of this document.
+3. Redistributions must contain a verbatim copy of this document.
 
 4. The names and trademarks of the authors and copyright holders must not
 be used in advertising or otherwise to promote the sale, use or other dealing
 in this Software without specific, written prior permission.
 
-   5. Due credit should be given to the OpenLDAP Project.
+5. Due credit should be given to the OpenLDAP Project.
 
 6. The OpenLDAP Foundation may revise this license from time to time. Each
 revision is distinguished by a version number. You may use the Software under
diff --git a/options/license/OLDAP-2.7 b/options/license/OLDAP-2.7
index bf856025a1..d8357a442c 100644
--- a/options/license/OLDAP-2.7
+++ b/options/license/OLDAP-2.7
@@ -1,5 +1,4 @@
 The OpenLDAP Public License
-
 Version 2.7, 7 September 2001
 
 Redistribution and use of this software and associated documentation ("Software"),
@@ -12,7 +11,7 @@ are met:
 and notices, this list of conditions, and the following disclaimer in the
 documentation and/or other materials provided with the distribution, and
 
-   3. Redistributions must contain a verbatim copy of this document.
+3. Redistributions must contain a verbatim copy of this document.
 
 The OpenLDAP Foundation may revise this license from time to time. Each revision
 is distinguished by a version number. You may use this Software under terms
diff --git a/options/license/OPL-1.0 b/options/license/OPL-1.0
index 6b8924cd34..e55a5dcc03 100644
--- a/options/license/OPL-1.0
+++ b/options/license/OPL-1.0
@@ -1,8 +1,7 @@
 OPEN PUBLIC LICENSE
-
 Version 1.0
 
-   1. Definitions.
+1. Definitions.
 
 1.1. "Contributor" means each entity that creates or contributes to the creation
 of Modifications.
@@ -17,7 +16,7 @@ of the Original Code and Modifications, in each case including portions thereof.
 1.4. "Electronic Distribution Mechanism" means a mechanism generally accepted
 in the software development community for the electronic transfer of data.
 
-      1.5. "Executable" means Covered Code in any form other than Source Code.
+     1.5. "Executable" means Covered Code in any form other than Source Code.
 
 1.6. "Initial Developer" means the individual or entity identified as the
 Initial Developer in the Source Code notice required by Exhibit A.
@@ -60,9 +59,9 @@ or indirect, to cause the direction or management of such entity, whether
 by contract or otherwise, or (b) ownership of fifty percent (50%) or more
 of the outstanding shares or beneficial ownership of such entity.
 
-      1.13 "License Author" means Lutris Technologies, Inc.
+     1.13 "License Author" means Lutris Technologies, Inc.
 
-   2. Source Code License.
+2. Source Code License.
 
 2.1. The Initial Developer Grant. The Initial Developer hereby grants You
 a worldwide, royalty-free, non-exclusive license, subject to third party intellectual
@@ -96,7 +95,7 @@ is reasonably necessary to enable You to Utilize the Contributor Version (or
 portions thereof), and not to any greater extent that may be necessary to
 Utilize further Modifications or combinations
 
-   3. Distribution Obligations.
+3. Distribution Obligations.
 
 3.1. Application of License. The Modifications which You create or to which
 You contribute are governed by the terms of this License, including without
@@ -133,7 +132,7 @@ Developer in (a) the Source Code, and (b) in any notice in an Executable version
 or related documentation in which You describe the origin or ownership of
 the Covered Code.
 
-      3.4. Intellectual Property Matters
+     3.4. Intellectual Property Matters
 
 (a) Third Party Claims. If You have knowledge that a party claims an intellectual
 property right in particular functionality or code (or its utilization under
@@ -195,7 +194,7 @@ with other code not governed by the terms of this License and distribute the
 Larger Work as a single product. In such a case, You must make sure the requirements
 of this License are fulfilled for the Covered Code.
 
-   4. Inability to Comply Due to Statute or Regulation.
+4. Inability to Comply Due to Statute or Regulation.
 
 If it is impossible for You to comply with any of the terms of this License
 with respect to some or all of the Covered Code due to statute or regulation
@@ -208,12 +207,12 @@ Except to the extent prohibited by statute or regulation, such description
 must be sufficiently detailed for a recipient of ordinary skill to be able
 to understand it.
 
-   5. Application of this License.
+5. Application of this License.
 
 This License applies to code to which the Initial Developer has attached the
 notice in Exhibit A, and to related Covered Code.
 
-   6. Versions of the License.
+6. Versions of the License.
 
 6.1. New Versions. License Author may publish revised and/or new versions
 of the License from time to time. Each version will be given a distinguishing
@@ -237,12 +236,11 @@ the Open Public License. (Filling in the name of the Initial Developer, Original
 Code or Contributor in the notice described in Exhibit A shall not of themselves
 be deemed to be modifications of this License.)
 
-      6.4. Required Additional Developer Specific License
-
+     6.4. Required Additional Developer Specific License
 This license is a union of the following two parts that should be found as
 text files in the same place (directory), in the order of preeminence:
 
-         [1] A Developer specific license.
+          [1] A Developer specific license.
 
 [2] The contents of this file OPL_1_0.TXT, stating the general licensing policy
 of the software.
@@ -251,7 +249,7 @@ In case of conflicting dispositions in the parts of this license, the terms
 of the lower-numbered part will always be superseded by the terms of the higher
 numbered part.
 
-   7. DISCLAIMER OF WARRANTY.
+7. DISCLAIMER OF WARRANTY.
 
 COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTY
 OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES
@@ -263,10 +261,9 @@ THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER
 OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED
 CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
 
-   8. TERMINATION.
-
-      8.1 Termination upon Breach
+8. TERMINATION.
 
+     8.1 Termination upon Breach
 This License and the rights granted hereunder will terminate automatically
 if You fail to comply with terms herein and fail to cure such breach within
 30 days of becoming aware of the breach. All sublicenses to the Covered Code,
@@ -311,7 +308,7 @@ user license agreements (excluding distributors and resellers) which have
 been validly granted by You or any distributor hereunder prior to termination
 shall survive termination.
 
-   9. LIMITATION OF LIABILITY.
+9. LIMITATION OF LIABILITY.
 
 UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING
 NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE INITIAL DEVELOPER, ANY OTHER
@@ -327,7 +324,7 @@ SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL
 OR CONSEQUENTIAL DAMAGES, SO THAT EXCLUSION AND LIMITATION MAY NOT APPLY TO
 YOU.
 
-   10. U.S. GOVERNMENT END USERS.
+10. U.S. GOVERNMENT END USERS.
 
 The Covered Code is a ``commercial item,'' as that term is defined in 48 C.F.R.
 2.101 (Oct. 1995), consisting of ``commercial computer software'' and ``commercial
@@ -336,12 +333,12 @@ computer software documentation,'' as such terms are used in 48 C.F.R. 12.212
 227.7202-4 (June 1995), all U.S. Government End Users acquire Covered Code
 with only those rights set forth herein.
 
-   11. MISCELLANEOUS.
+11. MISCELLANEOUS.
 
 his section was intentionally left blank. The contents of this section are
 found in the corresponding addendum described above.
 
-   12. RESPONSIBILITY FOR CLAIMS.
+12. RESPONSIBILITY FOR CLAIMS.
 
 Except in cases where another Contributor has failed to comply with Section
 3.4, You are responsible for damages arising, directly or indirectly, out
@@ -349,6 +346,7 @@ of Your utilization of rights under this License, based on the number of copies
 of Covered Code you made available, the revenues you received from utilizing
 such rights, and other relevant factors. You agree to work with affected parties
 to distribute with Initial Developer responsibility on an equitable basis.
+
 EXHIBIT A.
 
 Text for this Exhibit A is found in the corresponding addendum, described
diff --git a/options/license/OSET-PL-2.1 b/options/license/OSET-PL-2.1
index fe7dd94376..1b6fb599bf 100644
--- a/options/license/OSET-PL-2.1
+++ b/options/license/OSET-PL-2.1
@@ -1,196 +1,172 @@
-OSET Public License (c) 2015 ALL RIGHTS RESERVED VERSION 2.1 THIS LICENSE
-DEFINES THE RIGHTS OF USE, REPRODUCTION, DISTRIBUTION, MODIFICATION, AND REDISTRIBUTION
-OF CERTAIN COVERED SOFTWARE (AS DEFINED BELOW) ORIGINALLY RELEASED BY THE
-OPEN SOURCE ELECTION TECHNOLOGY FOUNDATION (FORMERLY "THE OSDV FOUNDATION").
+OSET Public License
+(c) 2015 ALL RIGHTS RESERVED VERSION 2.1
 
-ANYONE WHO USES, REPRODUCES, DISTRIBUTES, MODIFIES, OR REDISTRIBUTES THE COVERED
-SOFTWARE, OR ANY PART THEREOF, IS BY THAT ACTION, ACCEPTING IN FULL THE TERMS
-CONTAINED IN THIS AGREEMENT. IF YOU DO NOT AGREE TO SUCH TERMS, YOU ARE NOT
-PERMITTED TO USE THE COVERED SOFTWARE. This license was prepared based on
-the Mozilla Public License ("MPL"), version 2.0. For annotation of the differences
-between this license and MPL 2.0, please see the OSET Foundation web site
-at www.OSETFoundation.org/public-license.
+THIS LICENSE DEFINES THE RIGHTS OF USE, REPRODUCTION, DISTRIBUTION, MODIFICATION,
+AND REDISTRIBUTION OF CERTAIN COVERED SOFTWARE (AS DEFINED BELOW) ORIGINALLY
+RELEASED BY THE OPEN SOURCE ELECTION TECHNOLOGY FOUNDATION (FORMERLY “THE
+OSDV FOUNDATION”).  ANYONE WHO USES, REPRODUCES, DISTRIBUTES, MODIFIES, OR
+REDISTRIBUTES THE COVERED SOFTWARE, OR ANY PART THEREOF, IS BY THAT ACTION,
+ACCEPTING IN FULL THE TERMS CONTAINED IN THIS AGREEMENT. IF YOU DO NOT AGREE
+TO SUCH TERMS, YOU ARE NOT PERMITTED TO USE THE COVERED SOFTWARE.
+
+This license was prepared based on the Mozilla Public License (“MPL”), version
+2.0.  For annotation of the differences between this license and MPL 2.0,
+please see the OSET Foundation web site at www.OSETFoundation.org/public-license.
 
 The text of the license begins here:
 
-   1. Definitions
+1. Definitions
 
-1.1 "Contributor" means each individual or legal entity that creates, contributes
+1.1 “Contributor” means each individual or legal entity that creates, contributes
 to the creation of, or owns Covered Software.
 
-1.2 "Contributor Version" means the combination of the Contributions of others
-(if any) used by a Contributor and that particular Contributor's Contribution.
+1.2 “Contributor Version” means the combination of the Contributions of others
+(if any) used by a Contributor and that particular Contributor’s Contribution.
 
-      1.3 "Contribution" means Covered Software of a particular Contributor.
+     1.3 “Contribution” means Covered Software of a particular Contributor.
 
-1.4 "Covered Software" means Source Code Form to which the initial Contributor
+1.4 “Covered Software” means Source Code Form to which the initial Contributor
 has attached the notice in Exhibit A, the Executable Form of such Source Code
 Form, and Modifications of such Source Code Form, in each case including portions
 thereof.
 
-      1.5 "Incompatible With Secondary Licenses" means:
-
+     1.5 “Incompatible With Secondary Licenses” means:
 a. That the initial Contributor has attached the notice described in Exhibit
 B to the Covered Software; or
-
 b. that the Covered Software was made available under the terms of version
 1.x or earlier of the License, but not also under the terms of a Secondary
 License.
 
-1.6 "Executable Form" means any form of the work other than Source Code Form.
+1.6 “Executable Form” means any form of the work other than Source Code Form.
 
-1.7 "Larger Work" means a work that combines Covered Software with other material,
+1.7 “Larger Work” means a work that combines Covered Software with other material,
 in a separate file (or files) that is not Covered Software.
 
-      1.8 "License" means this document.
+     1.8 “License” means this document.
 
-1.9 "Licensable" means having the right to grant, to the maximum extent possible,
+1.9 “Licensable” means having the right to grant, to the maximum extent possible,
 whether at the time of the initial grant or subsequently, any and all of the
 rights conveyed by this License.
 
-      1.10 "Modifications" means any of the following:
-
+     1.10 “Modifications” means any of the following:
 a. any file in Source Code Form that results from an addition to, deletion
 from, or modification of the contents of Covered Software; or
+		  b. any new file in Source Code Form that contains any Covered Software.
 
-b. any new file in Source Code Form that contains any Covered Software.
-
-1.11 "Patent Claims" of a Contributor means any patent claim(s), including
+1.11 “Patent Claims” of a Contributor means any patent claim(s), including
 without limitation, method, process, and apparatus claims, in any patent Licensable
 by such Contributor that would be infringed, but for the grant of the License,
 by the making, using, selling, offering for sale, having made, import, or
 transfer of either its Contributions or its Contributor Version.
 
-1.12 "Secondary License" means one of: the GNU General Public License, Version
+1.12 “Secondary License” means one of: the GNU General Public License, Version
 2.0, the GNU Lesser General Public License, Version 2.1, the GNU Affero General
 Public License, Version 3.0, or any later versions of those licenses.
 
-1.13 "Source Code Form" means the form of the work preferred for making modifications.
+1.13 “Source Code Form” means the form of the work preferred for making modifications.
 
-1.14 "You" (or "Your") means an individual or a legal entity exercising rights
-under this License. For legal entities, "You" includes any entity that controls,
+1.14 “You” (or “Your”) means an individual or a legal entity exercising rights
+under 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:
+definition, “control” means: (a) the power, direct or indirect, to cause the
+direction or management of such entity, whether by contract or otherwise,
+or (b) ownership of more than fifty percent (50%) of the outstanding shares
+or beneficial ownership of such entity.
 
-(a) the power, direct or indirect, to cause the direction or management of
-such entity, whether by contract or otherwise, or
+2. License Grants and Conditions
 
-(b) ownership of more than fifty percent (50%) of the outstanding shares or
-beneficial ownership of such entity.
-
-   2. License Grants and Conditions
-
-      2.1 Grants
-
-Each Contributor hereby grants You a world-wide, royalty-free, non-exclusive
-license:
-
-a. under intellectual property rights (other than patent or trademark) Licensable
+2.1 Grants Each Contributor hereby grants You a world-wide, royalty-free,
+non-exclusive license:
+	 a. under intellectual property rights (other than patent or trademark) Licensable
 by such Contributor to use, reproduce, make available, modify, display, perform,
 distribute, and otherwise exploit its Contributions, either on an unmodified
 basis, with Modifications, or as part of a Larger Work; and
+	 b. under Patent Claims of such Contributor to make, use, sell, offer for
+sale, have made, import, and otherwise transfer either its Contributions or
+its Contributor Version.
 
-b. under Patent Claims of such Contributor to make, use, sell, offer for sale,
-have made, import, and otherwise transfer either its Contributions or its
-Contributor Version.
-
-      2.2 Effective Date
-
+     2.2 Effective Date
 The licenses granted in Section 2.1 with respect to any Contribution become
 effective for each Contribution on the date the Contributor first distributes
 such Contribution.
 
-      2.3 Limitations on Grant Scope
-
+     2.3 Limitations on Grant Scope
 The licenses granted in this Section 2 are the only rights granted under this
-License. No additional rights or licenses will be implied from the distribution
+License.  No additional rights or licenses will be implied from the distribution
 or licensing of Covered Software under this License. Notwithstanding Section
 2.1(b) above, no patent license is granted by a Contributor:
-
-a. for any code that a Contributor has removed from Covered Software; or
-
-b. for infringements caused by: (i) Your and any other third party's modifications
+	 a. for any code that a Contributor has removed from Covered Software; or
+	 b. for infringements caused by: (i) Your and any other third party’s modifications
 of Covered Software, or (ii) the combination of its Contributions with other
 software (except as part of its Contributor Version); or
-
-c. under Patent Claims infringed by Covered Software in the absence of its
+	 c. under Patent Claims infringed by Covered Software in the absence of its
 Contributions.
+	 This License does not grant any rights in the trademarks, service marks,
+or logos of any Contributor (except as may be necessary to comply with the
+notice requirements in Section 3.4).
 
-This License does not grant any rights in the trademarks, service marks, or
-logos of any Contributor (except as may be necessary to comply with the notice
-requirements in Section 3.4).
-
-      2.4 Subsequent Licenses
-
-No Contributor makes additional grants as a result of Your choice to distribute
+     2.4 Subsequent Licenses
+	 No Contributor makes additional grants as a result of Your choice to distribute
 the Covered Software under a subsequent version of this License (see Section
 10.2) or under the terms of a Secondary License (if permitted under the terms
 of Section 3.3).
 
-      2.5 Representation
-
-Each Contributor represents that the Contributor believes its Contributions
+     2.5 Representation
+	 Each Contributor represents that the Contributor believes its Contributions
 are its original creation(s) or it has sufficient rights to grant the rights
 to its Contributions conveyed by this License.
 
-      2.6 Fair Use
-
-This License is not intended to limit any rights You have under applicable
+     2.6 Fair Use
+	 This License is not intended to limit any rights You have under applicable
 copyright doctrines of fair use, fair dealing, or other equivalents.
 
-      2.7 Conditions
-
-Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted in
+     2.7 Conditions
+	 Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted in
 Section 2.1.
 
-   3. Responsibilities
+3. Responsibilities
 
-      3.1 Distribution of Source Form
+     3.1 Distribution of Source Form
+	 All distribution of Covered Software in Source Code Form, including any
+Modifications that You create or to which You contribute, must be under the
+terms of this License. You must inform recipients that the Source Code Form
+of the Covered Software is governed by the terms of this License, and how
+they can obtain a copy of this License. You must cause any of Your Modifications
+to carry prominent notices stating that You changed the files. You may not
+attempt to alter or restrict the recipients’ rights in the Source Code Form.
 
-All distribution of Covered Software in Source Code Form, including any Modifications
-that You create or to which You contribute, must be under the terms of this
-License. You must inform recipients that the Source Code Form of the Covered
-Software is governed by the terms of this License, and how they can obtain
-a copy of this License. You must cause any of Your Modifications to carry
-prominent notices stating that You changed the files. You may not attempt
-to alter or restrict the recipients' rights in the Source Code Form.
-
-      3.2 Distribution of Executable Form
-
-      If You distribute Covered Software in Executable Form then:
+     3.2 Distribution of Executable Form
+	 If You distribute Covered Software in Executable Form then:
 
 a. such Covered Software must also be made available in Source Code Form,
 as described in Section 3.1, and You must inform recipients of the Executable
 Form how they can obtain a copy of such Source Code Form by reasonable means
 in a timely manner, at a charge no more than the cost of distribution to the
 recipient; and
-
-b. You may distribute such Executable Form under the terms of this License,
+		  b. You may distribute such Executable Form under the terms of this License,
 or sublicense it under different terms, provided that the license for the
-Executable Form does not attempt to limit or alter the recipients' rights
+Executable Form does not attempt to limit or alter the recipients’ rights
 in the Source Code Form under this License.
 
-      3.3 Distribution of a Larger Work
-
-You may create and distribute a Larger Work under terms of Your choice, provided
-that You also comply with the requirements of this License for the Covered
-Software. If the Larger Work is a combination of Covered Software with a work
-governed by one or more Secondary Licenses, and the Covered Software is not
-Incompatible With Secondary Licenses, this License permits You to additionally
+     3.3 Distribution of a Larger Work
+	 You may create and distribute a Larger Work under terms of Your choice,
+provided that You also comply with the requirements of this License for the
+Covered Software. If the Larger Work is a combination of Covered Software
+with a work governed by one or more Secondary Licenses, and the Covered Software
+is not Incompatible With Secondary Licenses, this License permits You to additionally
 distribute such Covered Software under the terms of such Secondary License(s),
 so that the recipient of the Larger Work may, at their option, further distribute
 the Covered Software under the terms of either this License or such Secondary
 License(s).
 
-      3.4 Notices
-
-You may not remove or alter the substance of any license notices (including
+     3.4 Notices
+	 You may not remove or alter the substance of any license notices (including
 copyright notices, patent notices, disclaimers of warranty, or limitations
 of liability) contained within the Source Code Form of the Covered Software,
 except that You may alter any license notices to the extent required to remedy
 known factual inaccuracies.
 
-      3.5 Application of Additional Terms
+     3.5 Application of Additional Terms
 
 3.5.1 You may choose to offer, and to charge a fee for, warranty, support,
 indemnity or liability obligations to one or more recipients of Covered Software.
@@ -206,13 +182,12 @@ any jurisdiction.
 License to the extent necessary due to statute, judicial order, regulation
 (including without limitation state and federal procurement regulation), national
 security, or public interest. Any such additional conditions must be clearly
-described in the notice provisions required under Section 3.4. Any alteration
+described in the notice provisions required under Section 3.4.  Any alteration
 of the terms of this License will apply to all copies of the Covered Software
 distributed by You or by any downstream recipients that receive the Covered
 Software from You.
 
-   4. Inability to Comply Due to Statute or Regulation
-
+4. Inability to Comply Due to Statute or Regulation
 If it is impossible for You to comply with any of the terms of this License
 with respect to some or all of the Covered Software due to statute, judicial
 order, or regulation, then You must: (a) comply with the terms of this License
@@ -222,33 +197,30 @@ Section 3.4. Except to the extent prohibited by statute or regulation, such
 description must be sufficiently detailed for a recipient of ordinary skill
 to be able to understand it.
 
-   5. Termination
+5. Termination
 
-      5.1 Failure to Comply
-
-The rights granted under this License will terminate automatically if You
+     5.1 Failure to Comply
+	 The rights granted under this License will terminate automatically if You
 fail to comply with any of its terms. However, if You become compliant, then
 the rights granted under this License from a particular Contributor are reinstated
 (a) provisionally, unless and until such Contributor explicitly and finally
 terminates Your grants, and (b) on an ongoing basis, if such Contributor fails
 to notify You of the non-compliance by some reasonable means prior to 60-days
-after You have come back into compliance. Moreover, Your grants from a particular
+after You have come back into compliance.  Moreover, Your grants from a particular
 Contributor are reinstated on an ongoing basis if such Contributor notifies
 You of the non-compliance by some reasonable means, this is the first time
 You have received notice of non-compliance with this License from such Contributor,
 and You become compliant prior to 30-days after Your receipt of the notice.
 
-      5.2 Patent Infringement Claims
+5.2 Patent Infringement Claims
     If You initiate litigation against any
+entity by asserting a patent infringement claim (excluding declaratory judgment
+actions, counter-claims, and cross-claims) alleging that a Contributor Version
+directly or indirectly infringes any patent, then the rights granted to You
+by any and all Contributors for the Covered Software under Section 2.1 of
+this License shall terminate.
 
-If You initiate litigation against any entity by asserting a patent infringement
-claim (excluding declaratory judgment actions, counter-claims, and cross-claims
-) alleging that a Contributor Version directly or indirectly infringes any
-patent, then the rights granted to You by any and all Contributors for the
-Covered Software under Section 2.1 of this License shall terminate.
-
-      5.3 Additional Compliance Terms
-
-Notwithstanding the foregoing in this Section 5, for purposes of this Section,
+     5.3 Additional Compliance Terms
+	 Notwithstanding the foregoing in this Section 5, for purposes of this Section,
 if You breach Section 3.1 (Distribution of Source Form), Section 3.2 (Distribution
 of Executable Form), Section 3.3 (Distribution of a Larger Work), or Section
 3.4 (Notices), then becoming compliant as described in Section 5.1 must also
@@ -257,9 +229,8 @@ by a Contributor, making the Covered Software available in Source Code Form
 as required by this License on a publicly available computer network for a
 period of no less than three (3) years.
 
-      5.4 Contributor Remedies
-
-If You fail to comply with the terms of this License and do not thereafter
+     5.4 Contributor Remedies
+	 If You fail to comply with the terms of this License and do not thereafter
 become compliant in accordance with Section 5.1 and, if applicable, Section
 5.3, then each Contributor reserves its right, in addition to any other rights
 it may have in law or in equity, to bring an action seeking injunctive relief,
@@ -268,27 +239,24 @@ limitation damages for unjust enrichment, where available under law), for
 all actions in violation of rights that would otherwise have been granted
 under the terms of this License.
 
-      5.5 End User License Agreements
-
-In the event of termination under this Section 5, all end user license agreements
+     5.5 End User License Agreements
+	 In the event of termination under this Section 5, all end user license agreements
 (excluding distributors and resellers), which have been validly granted by
 You or Your distributors under this License prior to termination shall survive
 termination.
 
-   6. Disclaimer of Warranty
-
-Covered Software is provided under this License on an "as is" basis, without
+6. Disclaimer of Warranty
+Covered Software is provided under this License on an “as is” basis, without
 warranty of any kind, either expressed, implied, or statutory, including,
 without limitation, warranties that the Covered Software is free of defects,
 merchantable, fit for a particular purpose or non-infringing. The entire risk
-as to the quality and performance of the Covered Software is with You. Should
+as to the quality and performance of the Covered Software is with You.  Should
 any Covered Software prove defective in any respect, You (not any Contributor)
 assume the cost of any necessary servicing, repair, or correction. This disclaimer
-of warranty constitutes an essential part of this License. No use of any Covered
-Software is authorized under this License except under this disclaimer.
-
-   7. Limitation of Liability
+of warranty constitutes an essential part of this License.  No use of any
+Covered Software is authorized under this License except under this disclaimer.
 
+7. Limitation of Liability
 Under no circumstances and under no legal theory, whether tort (including
 negligence), contract, or otherwise, shall any Contributor, or anyone who
 distributes Covered Software as permitted above, be liable to You for any
@@ -297,37 +265,34 @@ including, without limitation, damages for lost profits, loss of goodwill,
 work stoppage, computer failure or malfunction, or any and all other commercial
 damages or losses, even if such party shall have been informed of the possibility
 of such damages. This limitation of liability shall not apply to liability
-for death or personal injury resulting from such party's negligence to the
+for death or personal injury resulting from such party’s 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.
 
-   8. Litigation
-
+8. Litigation
 Any litigation relating to this License may be brought only in the courts
 of a jurisdiction where the defendant maintains its principal place of business
 and such litigation shall be governed by laws of that jurisdiction, without
 reference to its conflict-of-law provisions. Nothing in this Section shall
-prevent a party's ability to bring cross-claims or counter-claims.
+prevent a party’s ability to bring cross-claims or counter-claims.
 
-   9. Government Terms
+9. Government Terms
 
-      9.1 Commercial Item
-
-The Covered Software is a "commercial item," as that term is defined in 48
-C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer software" and
-"commercial computer software documentation," as such terms are used in 48
-C.F.R. 12.212 (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R.
+     9.1 Commercial Item
+	 The Covered Software is a “commercial item,” as that term is defined in
+48 C.F.R. 2.101 (Oct. 1995), consisting of “commercial computer software”
+and “commercial computer software documentation,” as such terms are used in
+48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R.
 227.7202-1 through 227.7202-4 (June 1995), all U.S. Government End Users acquire
 Covered Software with only those rights set forth herein.
 
-      9.2 No Sovereign Immunity
-
-The U.S. federal government and states that use or distribute Covered Software
+     9.2 No Sovereign Immunity
+	 The U.S. federal government and states that use or distribute Covered Software
 hereby waive their sovereign immunity with respect to enforcement of the provisions
 of this License.
 
-      9.3 Choice of Law and Venue
+     9.3 Choice of Law and Venue
 
 9.3.1 If You are a government of a state of the United States, or Your use
 of the Covered Software is pursuant to a procurement contract with such a
@@ -335,25 +300,21 @@ state government, this License shall be governed by the law of such state,
 excluding its conflict-of-law provisions, and the adjudication of disputes
 relating to this License will be subject to the exclusive jurisdiction of
 the state and federal courts located in such state.
-
 9.3.2 If You are an agency of the United States federal government, or Your
 use of the Covered Software is pursuant to a procurement contract with such
 an agency, this License shall be governed by federal law for all purposes,
 and the adjudication of disputes relating to this License will be subject
 to the exclusive jurisdiction of the federal courts located in Washington,
 D.C.
-
 9.3.3 You may alter the terms of this Section 9.3 for this License as described
 in Section 3.5.2.
 
-      9.4 Supremacy
-
-This Section 9 is in lieu of, and supersedes, any other Federal Acquisition
+     9.4 Supremacy
+	 This Section 9 is in lieu of, and supersedes, any other Federal Acquisition
 Regulation, Defense Federal Acquisition Regulation, or other clause or provision
 that addresses government rights in computer software under this License.
 
-   10. Miscellaneous
-
+10. Miscellaneous
 This License represents the complete agreement concerning 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.
@@ -361,46 +322,42 @@ Any law or regulation, which provides that the language of a contract shall
 be construed against the drafter, shall not be used to construe this License
 against a Contributor.
 
-   11. Versions of the License
+11. Versions of the License
 
-      11.1 New Versions
+11.1 New Versions The Open Source Election Technology Foundation (“OSET”)
+(formerly known as the Open Source Digital Voting Foundation) is the steward
+of this License. Except as provided in Section 11.3, no one other than the
+license steward has the right to modify or publish new versions of this License.
+Each version will be given a distinguishing version number.
 
-The Open Source Election Technology Foundation ("OSET") (formerly known as
-the Open Source Digital Voting Foundation) is the steward of this License.
-Except as provided in Section 11.3, no one other than the license steward
-has the right to modify or publish new versions of this License. Each version
-will be given a distinguishing version number.
+11.2 Effects of New Versions You may distribute the Covered Software under
+the terms of the version of the License under which You originally received
+the Covered Software, or under the terms of any subsequent version published
+by the license steward.
 
-      11.2 Effects of New Versions
-
-You may distribute the Covered Software under the terms of the version of
-the License under which You originally received the Covered Software, or under
-the terms of any subsequent version published by the license steward.
-
-      11.3 Modified Versions
-
-If You create software not governed by this License, and You want to create
-a new license for such software, You may create and use a modified version
-of this License if You rename the license and remove any references to the
-name of the license steward (except to note that such modified license differs
-from this License).
+11.3 Modified Versions If You create software not governed by this License,
+and You want to create a new license for such software, You may create and
+use a modified version of this License if You rename the license and remove
+any references to the name of the license steward (except to note that such
+modified license differs from this License).
 
 11.4 Distributing Source Code Form That is Incompatible With Secondary Licenses
-
 If You choose to distribute Source Code Form that is Incompatible With Secondary
 Licenses under the terms of this version of the License, the notice described
-in Exhibit B of this License must be attached. EXHIBIT A - Source Code Form
-License Notice
+in Exhibit B of this License must be attached.
+
+EXHIBIT A – Source Code Form License Notice
 
 This Source Code Form is subject to the terms of the OSET Public License,
-v.2.1 ("OPL"). If a copy of the OPL was not distributed with this file, You
-can obtain one at: www.OSETFoundation.org/public-license.
+v.2.1 (“OSET-PL-2.1”).  If a copy of the OPL was not distributed with this
+file, You can obtain one at: www.OSETFoundation.org/public-license.
 
 If it is not possible or desirable to put the Notice in a particular file,
 then You may include the Notice in a location (e.g., such as a LICENSE file
 in a relevant directory) where a recipient would be likely to look for such
 a notice. You may add additional accurate notices of copyright ownership.
-EXHIBIT B - "Incompatible With Secondary License" Notice
 
-This Source Code Form is "Incompatible With Secondary Licenses", as defined
+EXHIBIT B - “Incompatible With Secondary License” Notice
+
+This Source Code Form is “Incompatible With Secondary Licenses”, as defined
 by the OSET Public License, v.2.1.
diff --git a/options/license/OSL-1.0 b/options/license/OSL-1.0
index 0f250090ba..4c018c6d4f 100644
--- a/options/license/OSL-1.0
+++ b/options/license/OSL-1.0
@@ -5,14 +5,14 @@ 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 Open Software License version 1.0"
+     "Licensed under the Open Software License version 1.0"
 
 License Terms
 
 1) Grant of Copyright License. Licensor hereby grants You a world-wide, royalty-free,
 non-exclusive, perpetual, non-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;
@@ -21,9 +21,9 @@ c) to distribute copies of the Original Work and Derivative Works to the public,
 with the proviso that copies of Original Work or Derivative Works that You
 distribute shall be licensed under the Open Software License;
 
-      d) to perform the Original Work publicly; and
+     d) to perform the Original Work publicly; and
 
-      e) to display the Original Work publicly.
+     e) to display the Original Work publicly.
 
 2) Grant of Patent License. Licensor hereby grants You a world-wide, royalty-free,
 non-exclusive, perpetual, non-sublicenseable license, under patent claims
diff --git a/options/license/OSL-1.1 b/options/license/OSL-1.1
index c0718b24cd..ce181f1601 100644
--- a/options/license/OSL-1.1
+++ b/options/license/OSL-1.1
@@ -5,12 +5,12 @@ 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 Open Software License version 1.1
+     Licensed under the Open Software License version 1.1
 
 1) Grant of Copyright License. Licensor hereby grants You a world-wide, royalty-free,
 non-exclusive, perpetual, non-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;
@@ -19,9 +19,9 @@ c) to distribute copies of the Original Work and Derivative Works to the public,
 with the proviso that copies of Original Work or Derivative Works that You
 distribute shall be licensed under the Open Software License;
 
-      d) to perform the Original Work publicly; and
+     d) to perform the Original Work publicly; and
 
-      e) to display the Original Work publicly.
+     e) to display the Original Work publicly.
 
 2) Grant of Patent License. Licensor hereby grants You a world-wide, royalty-free,
 non-exclusive, perpetual, non-sublicenseable license, under patent claims
diff --git a/options/license/OSL-2.0 b/options/license/OSL-2.0
index e648c16428..e38c854cc4 100644
--- a/options/license/OSL-2.0
+++ b/options/license/OSL-2.0
@@ -1,16 +1,16 @@
-The Open Software License v. 2.0
+Open Software License v. 2.0
 
 This Open Software 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 Open Software License version 2.0
+     Licensed under the Open Software 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;
@@ -19,9 +19,9 @@ c) to distribute copies of the Original Work and Derivative Works to the public,
 with the proviso that copies of Original Work or Derivative Works that You
 distribute shall be licensed under the Open Software License;
 
-      d) to perform the Original Work publicly; and
+     d) to perform the Original Work publicly; and
 
-      e) to display the Original Work publicly.
+     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
diff --git a/options/license/OSL-2.1 b/options/license/OSL-2.1
index e7ab471ba7..94b5f38f52 100644
--- a/options/license/OSL-2.1
+++ b/options/license/OSL-2.1
@@ -5,12 +5,12 @@ 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 Open Software License version 2.1
+     Licensed under the Open Software 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;
@@ -19,9 +19,9 @@ c) to distribute copies of the Original Work and Derivative Works to the public,
 with the proviso that copies of Original Work or Derivative Works that You
 distribute shall be licensed under the Open Software License;
 
-      d) to perform the Original Work publicly; and
+     d) to perform the Original Work publicly; and
 
-      e) to display the Original Work publicly.
+     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
diff --git a/options/license/OSL-3.0 b/options/license/OSL-3.0
index d69845ca01..d287c96b05 100644
--- a/options/license/OSL-3.0
+++ b/options/license/OSL-3.0
@@ -5,7 +5,7 @@ authorship (the "Original Work") whose owner (the "Licensor") has placed the
 following licensing notice adjacent to the copyright notice for the Original
 Work:
 
-Licensed under the Open Software License version 3.0
+     Licensed under the Open Software License version 3.0
 
 1) Grant of Copyright License. Licensor grants You a worldwide, royalty-free,
 non-exclusive, sublicensable license, for the duration of the copyright, to
@@ -23,9 +23,9 @@ Works to the public, with the proviso that copies of Original Work or Derivative
 Works that You distribute or communicate shall be licensed under this Open
 Software License;
 
-      d) to perform the Original Work publicly; and
+     d) to perform the Original Work publicly; and
 
-      e) to display the Original Work publicly.
+     e) to display the Original Work publicly.
 
 2) Grant of Patent License. Licensor grants You a worldwide, royalty-free,
 non-exclusive, sublicensable license, under patent claims owned or controlled
@@ -47,7 +47,7 @@ continues to distribute the Original Work.
 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 permission of the Licensor. Except as expressly
-stated herein, nothing in this License grants any license to Licensor's trademarks,
+stated herein, nothing in this License grants any license to Licensor’s trademarks,
 copyrights, patents, trade secrets or any other intellectual property. No
 patent license is granted to make, use, sell, offer for sale, have made, or
 import embodiments of any patent claims other than the licensed claims defined
@@ -106,7 +106,7 @@ to undertake the activities listed in Section 1, including your right to create
 Derivative Works based upon the Original Work, and doing so without honoring
 these terms and conditions is prohibited by copyright law and international
 treaty. Nothing in this License is intended to affect copyright exceptions
-and limitations (including "fair use" or "fair dealing"). This License shall
+and limitations (including “fair use” or “fair dealing”). This License shall
 terminate immediately and You may no longer exercise any of the rights granted
 to You by this License upon your failure to honor the conditions in Section
 1(c).
diff --git a/options/license/OpenJDK-assembly-exception-1.0 b/options/license/OpenJDK-assembly-exception-1.0
index 205b811741..3a35f11ed2 100644
--- a/options/license/OpenJDK-assembly-exception-1.0
+++ b/options/license/OpenJDK-assembly-exception-1.0
@@ -1,7 +1,31 @@
-OpenJDK Assembly Exception The OpenJDK source code made available by Oracle America, Inc. (Oracle) at openjdk.java.net ("OpenJDK Code") is distributed under the terms of the GNU General Public License <http://www.gnu.org/copyleft/gpl.html> version 2 only ("GPL2"), with the following clarification and special exception.
+The OpenJDK source code made available by Oracle America, Inc.
+(Oracle) at openjdk.java.net ("OpenJDK Code") is distributed
+under the terms of the GNU General Public License
+<http://www.gnu.org/copyleft/gpl.html> version 2 only
+("GPL2"), with the following clarification and special
+exception.
 
-   
+Linking this OpenJDK Code statically or dynamically with
+other code is making a combined work based on this
+library. Thus, the terms and conditions of GPL2 cover the
+whole combination.
 
-   Linking this OpenJDK Code statically or dynamically with other code is making a combined work based on this library. Thus, the terms and conditions of GPL2 cover the whole combination.
+As a special exception, Oracle gives you permission to
+link this OpenJDK Code with certain code licensed by
+Oracle as indicated at
+http://openjdk.java.net/legal/exception-modules-2007-05-08.html
+("Designated Exception Modules") to produce an
+executable, regardless of the license terms of the
+Designated Exception Modules, and to copy and distribute
+the resulting executable under GPL2, provided that the
+Designated Exception Modules continue to be governed by
+the licenses under which they were offered by Oracle.
 
-   As a special exception, Oracle gives you permission to link this OpenJDK Code with certain code licensed by Oracle as indicated at http://openjdk.java.net/legal/exception-modules-2007-05-08.html ("Designated Exception Modules") to produce an executable, regardless of the license terms of the Designated Exception Modules, and to copy and distribute the resulting executable under GPL2, provided that the Designated Exception Modules continue to be governed by the licenses under which they were offered by Oracle. As such, it allows licensees and sublicensees of Oracle's GPL2 OpenJDK Code to build an executable that includes those portions of necessary code that Oracle could not provide under GPL2 (or that Oracle has provided under GPL2 with the Classpath exception). If you modify or add to the OpenJDK code, that new GPL2 code may still be combined with Designated Exception Modules if the new code is made subject to this exception by its copyright holder.
+As such, it allows licensees and sublicensees of Oracle's GPL2
+OpenJDK Code to build an executable that includes those
+portions of necessary code that Oracle could not provide under
+GPL2 (or that Oracle has provided under GPL2 with the Classpath
+exception). If you modify or add to the OpenJDK code, that new
+GPL2 code may still be combined with Designated Exception
+Modules if the new code is made subject to this exception by
+its copyright holder.
diff --git a/options/license/OpenSSL b/options/license/OpenSSL
index 75dee7cc28..db93280a46 100644
--- a/options/license/OpenSSL
+++ b/options/license/OpenSSL
@@ -1,4 +1,6 @@
-OpenSSL License Copyright (c) 1998-2008 The OpenSSL Project. All rights reserved.
+OpenSSL License
+
+Copyright (c) 1998-2008 The OpenSSL Project. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
 are permitted provided that the following conditions are met:
@@ -39,9 +41,11 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 This product includes cryptographic software written by Eric Young (eay@cryptsoft.com).
 This product includes software written by Tim Hudson (tjh@cryptsoft.com).
-Original SSLeay License Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
 
-All rights reserved.
+
+Original SSLeay License
+
+Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) All rights reserved.
 
 This package is an SSL implementation written by Eric Young (eay@cryptsoft.com).
 The implementation was written so as to conform with Netscapes SSL.
@@ -71,9 +75,7 @@ and/or other materials provided with the distribution.
 
 3. All advertising materials mentioning features or use of this software must
 display the following acknowledgement:
-
 "This product includes cryptographic software written by Eric Young (eay@cryptsoft.com)"
-
 The word 'cryptographic' can be left out if the rouines from the library being
 used are not cryptographic related :-).
 
diff --git a/options/license/PDDL-1.0 b/options/license/PDDL-1.0
index 9b6fc3c74d..09adbf20c1 100644
--- a/options/license/PDDL-1.0
+++ b/options/license/PDDL-1.0
@@ -1,7 +1,6 @@
 Open Data Commons - Public Domain Dedication & License (PDDL)
 
 Preamble
-
 The Open Data Commons - Public Domain Dedication & Licence is a document intended
 to allow you to freely share, modify, and use this work for any purpose and
 without any restrictions. This licence is intended for use on databases or
@@ -52,7 +51,7 @@ into the public domain. Unlike licences for free and open source software,
 free cultural works, or open content licences, rightsholders will not be able
 to "dual license" their work by releasing the same work under different licences.
 This is because they have allowed anyone to use the work in whatever way they
-choose. Rightsholders therefore can't re-license it under copyright or database
+choose. Rightsholders therefore can’t re-license it under copyright or database
 rights on different terms because they have nothing left to license. Doing
 so creates truly accessible data to build rich applications and advance the
 progress of science and the arts.
@@ -88,7 +87,7 @@ Part I: Introduction
 The Rightsholder (the Person holding rights or claims over the Work) agrees
 as follows:
 
-   1.0 Definitions of Capitalised Words
+1.0 Definitions of Capitalised Words
 
 "Copyright" - Includes rights under copyright and under neighbouring rights
 and similarly related sets of rights under the law of the relevant jurisdiction
@@ -124,11 +123,11 @@ of this Document.
 
 "You" - the Person acquiring rights under the licence elements of this Document.
 
-   Words in the singular include the plural and vice versa.
+Words in the singular include the plural and vice versa.
 
-   2.0 What this document covers
+2.0 What this document covers
 
-   2.1. Legal effect of this Document. This Document is:
+2.1. Legal effect of this Document. This Document is:
 
 a. A dedication to the public domain and waiver of Copyright and Database
 Rights over the Work; and
@@ -136,7 +135,7 @@ Rights over the Work; and
 b. A licence of Copyright and Database Rights over the Work in jurisdictions
 that do not allow for relinquishment or waiver.
 
-   2.2. Legal rights covered.
+2.2. Legal rights covered.
 
 a. Copyright. Any copyright or neighbouring rights in the Work. Copyright
 law varies between jurisdictions, but is likely to cover: the Database model
@@ -151,7 +150,7 @@ even when there is no copyright over the Database. Database Rights can also
 apply when the Data is removed from the Database and is selected and arranged
 in a way that would not infringe any applicable copyright.
 
-   2.2 Rights not covered.
+2.2 Rights not covered.
 
 a. This Document does not apply to computer programs used in the making or
 operation of the Database;
@@ -172,7 +171,7 @@ cover any information protected by Copyright that is contained in the Work.
 
 Part II: Dedication to the public domain
 
-   3.0 Dedication, waiver, and licence of Copyright and Database Rights
+3.0 Dedication, waiver, and licence of Copyright and Database Rights
 
 3.1 Dedication of Copyright and Database Rights to the public domain. The
 Rightsholder by using this Document, dedicates the Work to the public domain
@@ -197,9 +196,9 @@ in the relevant jurisdiction under Section 6.4, the Rightsholder waives any
 rights and claims that the Rightsholder may have or acquire in the future
 over the Work in:
 
-      a. Copyright; and
+     a. Copyright; and
 
-      b. Database Rights.
+     b. Database Rights.
 
 To the extent possible in the relevant jurisdiction, the above waiver of rights
 and claims applies worldwide and includes media and formats now known or created
@@ -220,7 +219,7 @@ created in the future.
 
 3.4 Moral rights. This section covers moral rights, including the right to
 be identified as the author of the Work or to object to treatment that would
-otherwise prejudice the author's honour and reputation, or any other derogatory
+otherwise prejudice the author’s honour and reputation, or any other derogatory
 treatment:
 
 a. For jurisdictions allowing waiver of moral rights, Licensor waives all
@@ -239,7 +238,7 @@ over the copyrighted aspects of the Work.
 Please note that some jurisdictions do not allow for the waiver of moral rights,
 and so moral rights may still subsist over the work in some jurisdictions.
 
-   4.0 Relationship to other rights
+4.0 Relationship to other rights
 
 4.1 No other contractual conditions. The Rightsholder makes this Work available
 to You without any other contractual obligations, either express or implied.
@@ -253,11 +252,10 @@ that they may have to clear other rights or consult other licences.
 4.3 Relationship to trade marks. This Document does not grant You a licence
 for any trade marks that the Rightsholder may own or that the Rightsholder
 may use to cover the Work. Users of this Database are cautioned that they
-may have to clear other rights or consult other licences.
+may have to clear other rights or consult other licences. Part III: General
+provisions
 
-Part III: General provisions
-
-   5.0 Warranties, disclaimer, and limitation of liability
+5.0 Warranties, disclaimer, and limitation of liability
 
 5.1 The Work is provided by the Rightsholder "as is" and without any warranty
 of any kind, either express or implied, whether of title, of accuracy or completeness,
@@ -278,7 +276,7 @@ advised of the possibility of such damages.
 financial loss to the extent it is caused by proved negligence on the part
 of the Rightsholder.
 
-   6.0 General
+6.0 General
 
 6.1 If any provision of this Document is held to be invalid or unenforceable,
 that must not affect the cvalidity or enforceability of the remainder of the
diff --git a/options/license/PHP-3.0 b/options/license/PHP-3.0
index a5d9221eab..bc4fd2e6eb 100644
--- a/options/license/PHP-3.0
+++ b/options/license/PHP-3.0
@@ -1,5 +1,6 @@
-The PHP License, version 3.0 Copyright (c) 1999 - 2006 The PHP Group. All
-rights reserved.
+The PHP License, version 3.0
+
+Copyright (c) 1999 - 2006 The PHP Group. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
 is permitted provided that the following conditions are met:
@@ -43,6 +44,7 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+
 This software consists of voluntary contributions made by many individuals
 on behalf of the PHP Group.
 
diff --git a/options/license/PHP-3.01 b/options/license/PHP-3.01
index a7147cf45c..e272ad7a85 100644
--- a/options/license/PHP-3.01
+++ b/options/license/PHP-3.01
@@ -1,5 +1,6 @@
-The PHP License, version 3.01 Copyright (c) 1999 - 2012 The PHP Group. All
-rights reserved.
+The PHP License, version 3.01
+
+Copyright (c) 1999 - 2012 The PHP Group. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
 is permitted provided that the following conditions are met:
diff --git a/options/license/PS-or-PDF-font-exception-20170817 b/options/license/PS-or-PDF-font-exception-20170817
index 89446f916c..cf22439fff 100644
--- a/options/license/PS-or-PDF-font-exception-20170817
+++ b/options/license/PS-or-PDF-font-exception-20170817
@@ -1,3 +1,8 @@
-The font and related files in this directory are distributed under the GNU AFFERO GENERAL PUBLIC LICENSE Version 3 (see the file COPYING), with the following exemption:
+The font and related files in this directory are distributed under the
+GNU AFFERO GENERAL PUBLIC LICENSE Version 3 (see the file COPYING), with
+the following exemption:
 
-As a special exception, permission is granted to include these font programs in a Postscript or PDF file that consists of a document that contains text to be displayed or printed using this font, regardless of the conditions or license applying to the document itself.
+As a special exception, permission is granted to include these font
+programs in a Postscript or PDF file that consists of a document that
+contains text to be displayed or printed using this font, regardless
+of the conditions or license applying to the document itself.
diff --git a/options/license/PSF-2.0 b/options/license/PSF-2.0
index ff67bea898..c8b1d4e3ca 100644
--- a/options/license/PSF-2.0
+++ b/options/license/PSF-2.0
@@ -1,42 +1,48 @@
 PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
 
-1. This LICENSE AGREEMENT is between the Python Software Foundation ("PSF"),
-and the Individual or Organization ("Licensee") accessing and otherwise using
-this software ("Python") in source or binary form and its associated documentation.
+1. This LICENSE AGREEMENT is between the Python Software Foundation
+("PSF"), and the Individual or Organization ("Licensee") accessing and
+otherwise using this software ("Python") in source or binary form and
+its associated documentation.
 
 2. Subject to the terms and conditions of this License Agreement, PSF hereby
 grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce,
 analyze, test, perform and/or display publicly, prepare derivative works,
-distribute, and otherwise use Python alone or in any derivative version, provided,
-however, that PSF's License Agreement and PSF's notice of copyright, i.e.,
-"Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006 Python Software Foundation;
+distribute, and otherwise use Python alone or in any derivative version,
+provided, however, that PSF's License Agreement and PSF's notice of copyright,
+i.e., "Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+2010,
+2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Python Software Foundation;
 All Rights Reserved" are retained in Python alone or in any derivative version
 prepared by Licensee.
 
-3. In the event Licensee prepares a derivative work that is based on or incorporates
-Python or any part thereof, and wants to make the derivative work available
-to others as provided herein, then Licensee hereby agrees to include in any
-such work a brief summary of the changes made to Python.
+3. In the event Licensee prepares a derivative work that is based on
+or incorporates Python or any part thereof, and wants to make
+the derivative work available to others as provided herein, then
+Licensee hereby agrees to include in any such work a brief summary of
+the changes made to Python.
 
-4. PSF is making Python available to Licensee on an "AS IS" basis. PSF MAKES
-NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED. BY WAY OF EXAMPLE, BUT
-NOT LIMITATION, PSF MAKES NO AND DISCLAIMS ANY REPRESENTATION OR WARRANTY
-OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF
-PYTHON WILL NOT INFRINGE ANY THIRD PARTY RIGHTS.
+4. PSF is making Python available to Licensee on an "AS IS"
+basis.  PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
+IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND
+DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
+FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT
+INFRINGE ANY THIRD PARTY RIGHTS.
 
-5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON FOR ANY
-INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS A RESULT OF MODIFYING,
-DISTRIBUTING, OR OTHERWISE USING PYTHON, OR ANY DERIVATIVE THEREOF, EVEN IF
-ADVISED OF THE POSSIBILITY THEREOF.
+5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
+FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
+A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON,
+OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
 
-6. This License Agreement will automatically terminate upon a material breach
-of its terms and conditions.
+6. This License Agreement will automatically terminate upon a material
+breach of its terms and conditions.
 
-7. Nothing in this License Agreement shall be deemed to create any relationship
-of agency, partnership, or joint venture between PSF and Licensee. This License
-Agreement does not grant permission to use PSF trademarks or trade name in
-a trademark sense to endorse or promote products or services of Licensee,
-or any third party.
+7. Nothing in this License Agreement shall be deemed to create any
+relationship of agency, partnership, or joint venture between PSF and
+Licensee.  This License Agreement does not grant permission to use PSF
+trademarks or trade name in a trademark sense to endorse or promote
+products or services of Licensee, or any third party.
 
-8. By copying, installing or otherwise using Python, Licensee agrees to be
-bound by the terms and conditions of this License Agreement.
+8. By copying, installing or otherwise using Python, Licensee
+agrees to be bound by the terms and conditions of this License
+Agreement.
diff --git a/options/license/Parity-6.0.0 b/options/license/Parity-6.0.0
index 59bac8b74b..a3bb2a623d 100644
--- a/options/license/Parity-6.0.0
+++ b/options/license/Parity-6.0.0
@@ -1,40 +1,44 @@
 The Parity Public License 6.0.0
 
-Contributor: contributor name
+Contributor: Example, Inc.
 
-Source Code: source
+Source Code: https://example.com/sourcecode
 
-This license lets you use and share this software for free, as long as you
-contribute software you make with it. Specifically:
+This license lets you use and share this software for free, as
+long as you contribute software you make with it. Specifically:
 
-If you follow the rules below, you may do everything with this software that
-would otherwise infringe either the contributor's copyright in it, any patent
-claim the contributor can license, or both.
+If you follow the rules below, you may do everything with this
+software that would otherwise infringe either the contributor's
+copyright in it, any patent claim the contributor can license,
+or both.
 
-   1. Contribute changes and additions you make to this software.
+1. Contribute changes and additions you make to this software.
 
-2. If you combine this software with other software, contribute that other
-software.
+2. If you combine this software with other software, contribute
+   that other software.
 
-3. Contribute software you develop, deploy, monitor, or run with this software.
+3. Contribute software you develop, deploy, monitor, or run with
+   this software.
 
-4. Ensure everyone who gets a copy of this software from you, in source code
-or any other form, gets the text of this license and the contributor and source
-code lines above.
+4. Ensure everyone who gets a copy of this software from you, in
+   source code or any other form, gets the text of this license
+   and the contributor and source code lines above.
 
-5. Do not make any legal claim against anyone accusing this software, with
-or without changes, alone or with other software, of infringing any patent
-claim.
+5. Do not make any legal claim against anyone accusing this
+   software, with or without changes, alone or with other
+   software, of infringing any patent claim.
 
-To contribute software, publish all its source code, in the preferred form
-for making changes, through a freely accessible distribution system widely
-used for similar source code, and license contributions not already licensed
-to the public on terms as permissive as this license accordingly.
+To contribute software, publish all its source code, in the
+preferred form for making changes, through a freely accessible
+distribution system widely used for similar source code, and
+license contributions not already licensed to the public on terms
+as permissive as this license accordingly.
 
-You are excused for unknowingly breaking 1, 2, or 3 if you contribute as required,
-or stop doing anything requiring this license, within 30 days of learning
-you broke the rule.
+You are excused for unknowingly breaking 1, 2, or 3 if you
+contribute as required, or stop doing anything requiring this
+license, within 30 days of learning you broke the rule.
 
-**As far as the law allows, this software comes as is, without any warranty,
-and the contributor will not be liable to anyone for any damages related to
-this software or this license, for any kind of legal claim.**
+**As far as the law allows, this software comes as is, without
+any warranty, and the contributor will not be liable to anyone
+for any damages related to this software or this license, for any
+kind of legal claim.**
diff --git a/options/license/Parity-7.0.0 b/options/license/Parity-7.0.0
index 96529f933a..855c648d42 100644
--- a/options/license/Parity-7.0.0
+++ b/options/license/Parity-7.0.0
@@ -1,8 +1,8 @@
 # The Parity Public License 7.0.0
 
-Contributor: name
+Contributor: Artless Devices, LLC [US-CA]
 
-Source Code: address
+Source Code: https://github.com/licensezero/licensezero.com
 
 ## Purpose
 
@@ -11,7 +11,7 @@ to share software that builds on it alike.
 
 ## Agreement
 
-In order to receive this license, you have to agree to its rules. Those rules
+In order to receive this license, you have to agree to its rules.  Those rules
 are both obligations under that agreement and conditions to your license.
 Don't do anything with this software that triggers a rule you can't or won't
 follow.
@@ -25,52 +25,51 @@ and source code lines above.
 ## Copyleft
 
 [Contribute](#contribute) software you develop, operate, or analyze with this
-software, including changes or additions to this software. When in doubt,
-[contribute](#contribute) .
+software, including changes or additions to this software.  When in doubt,
+[contribute](#contribute).
 
 ## Prototypes
 
 You don't have to [contribute](#contribute) any change, addition, or other
 software that meets all these criteria:
 
-   1. You don't use it for more than thirty days.
+1.  You don't use it for more than thirty days.
 
-2. You don't share it outside the team developing it, other than for non-production
+2.  You don't share it outside the team developing it, other than for non-production
 user testing.
 
-3. You don't develop, operate, or analyze other software with it for anyone
+3.  You don't develop, operate, or analyze other software with it for anyone
 outside the team developing it.
 
 ## Reverse Engineering
 
 You may use this software to operate and analyze software you can't [contribute](#contribute)
-in order to develop alternatives you can and do [contribute](#contribute)
-.
+in order to develop alternatives you can and do [contribute](#contribute).
 
 ## Contribute
 
 To [contribute](#contribute) software:
 
-1. Publish all source code for the software in the preferred form for making
+1.  Publish all source code for the software in the preferred form for making
 changes through a freely accessible distribution system widely used for similar
 source code so the contributor and others can find and copy it.
 
-2. Make sure every part of the source code is available under this license
+2.  Make sure every part of the source code is available under this license
 or another license that allows everything this license does, such as [the
 Blue Oak Model License 1.0.0](https://blueoakcouncil.org/license/1.0.0), [the
 Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0.html), [the
 MIT license](https://spdx.org/licenses/MIT.html), or [the two-clause BSD license](https://spdx.org/licenses/BSD-2-Clause.html).
 
-   3. Take these steps within thirty days.
+3.  Take these steps within thirty days.
 
-4. Note that this license does _not_ allow you to change the license terms
-for this software. You must follow [Notices](#notices) .
+4.  Note that this license does _not_ allow you to change the license terms
+for this software.  You must follow [Notices](#notices).
 
 ## Excuse
 
 You're excused for unknowingly breaking [Copyleft](#copyleft) if you [contribute](#contribute)
 as required, or stop doing anything requiring this license, within thirty
-days of learning you broke the rule. You're excused for unknowingly breaking
+days of learning you broke the rule.  You're excused for unknowingly breaking
 [Notices](#notices) if you take all practical steps to comply within thirty
 days of learning you broke the rule.
 
diff --git a/options/license/Plexus b/options/license/Plexus
index 51c41233e2..59e2c0f339 100644
--- a/options/license/Plexus
+++ b/options/license/Plexus
@@ -11,16 +11,15 @@ Redistributions must also contain a copy of this document.
 this list of conditions and the following disclaimer in the documentation
 and/or other materials provided with the distribution.
 
-3. The name "classworlds" must not be used to endorse or promote products
-derived from this Software without prior written permission of The Codehaus
-. For written permission, please contact bob@codehaus.org .
+3. The name "classworlds” must not be used to endorse or promote products
+derived from this Software without prior written permission of The Codehaus.
+For written permission, please contact bob@codehaus.org.
 
-4. Products derived from this Software may not be called "classworlds" nor
-may "classworlds" appear in their names without prior written permission of
-The Codehaus . "classworlds" is a registered trademark of The Codehaus .
+4. Products derived from this Software may not be called "classworlds” nor
+may "classworlds” appear in their names without prior written permission of
+The Codehaus. "classworlds” is a registered trademark of The Codehaus.
 
-5. Due credit should be given to The Codehaus. (http://classworlds.codehaus.org/)
-.
+5. Due credit should be given to The Codehaus. (http://classworlds.codehaus.org/).
 
 THIS SOFTWARE IS PROVIDED BY THE CODEHAUS AND CONTRIBUTORS ``AS IS'' AND ANY
 EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
diff --git a/options/license/PolyForm-Noncommercial-1.0.0 b/options/license/PolyForm-Noncommercial-1.0.0
index f8837ce05e..1a71cb6439 100644
--- a/options/license/PolyForm-Noncommercial-1.0.0
+++ b/options/license/PolyForm-Noncommercial-1.0.0
@@ -4,43 +4,50 @@
 
 ## Acceptance
 
-In order to get any license under these terms, you must agree to them as both
-strict obligations and conditions to all your licenses.
+In order to get any license under these terms, you must agree
+to them as both strict obligations and conditions to all
+your licenses.
 
 ## Copyright License
 
-The licensor grants you a copyright license for the software to do everything
-you might do with the software that would otherwise infringe the licensor's
-copyright in it for any permitted purpose. However, you may only distribute
-the software according to [Distribution License](#distribution-license) and
-make changes or new works based on the software according to [Changes and
-New Works License](#changes-and-new-works-license).
+The licensor grants you a copyright license for the
+software to do everything you might do with the software
+that would otherwise infringe the licensor's copyright
+in it for any permitted purpose.  However, you may
+only distribute the software according to [Distribution
+License](#distribution-license) and make changes or new works
+based on the software according to [Changes and New Works
+License](#changes-and-new-works-license).
 
 ## Distribution License
 
-The licensor grants you an additional copyright license to distribute copies
-of the software. Your license to distribute covers distributing the software
-with changes and new works permitted by [Changes and New Works License](#changes-and-new-works-license).
+The licensor grants you an additional copyright license
+to distribute copies of the software.  Your license
+to distribute covers distributing the software with
+changes and new works permitted by [Changes and New Works
+License](#changes-and-new-works-license).
 
 ## Notices
 
-You must ensure that anyone who gets a copy of any part of the software from
-you also gets a copy of these terms or the URL for them above, as well as
-copies of any plain-text lines beginning with `Required Notice:` that the
-licensor provided with the software. For example:
+You must ensure that anyone who gets a copy of any part of
+the software from you also gets a copy of these terms or the
+URL for them above, as well as copies of any plain-text lines
+beginning with `Required Notice:` that the licensor provided
+with the software.  For example:
 
 > Required Notice: Copyright Yoyodyne, Inc. (http://example.com)
 
 ## Changes and New Works License
 
-The licensor grants you an additional copyright license to make changes and
-new works based on the software for any permitted purpose.
+The licensor grants you an additional copyright license to
+make changes and new works based on the software for any
+permitted purpose.
 
 ## Patent License
 
-The licensor grants you a patent license for the software that covers patent
-claims the licensor can license, or becomes able to license, that you would
-infringe by using the software.
+The licensor grants you a patent license for the software that
+covers patent claims the licensor can license, or becomes able
+to license, that you would infringe by using the software.
 
 ## Noncommercial Purposes
 
@@ -48,66 +55,77 @@ Any noncommercial purpose is a permitted purpose.
 
 ## Personal Uses
 
-Personal use for research, experiment, and testing for the benefit of public
-knowledge, personal study, private entertainment, hobby projects, amateur
-pursuits, or religious observance, without any anticipated commercial application,
+Personal use for research, experiment, and testing for
+the benefit of public knowledge, personal study, private
+entertainment, hobby projects, amateur pursuits, or religious
+observance, without any anticipated commercial application,
 is use for a permitted purpose.
 
 ## Noncommercial Organizations
 
-Use by any charitable organization, educational institution, public research
-organization, public safety or health organization, environmental protection
-organization, or government institution is use for a permitted purpose regardless
-of the source of funding or obligations resulting from the funding.
+Use by any charitable organization, educational institution,
+public research organization, public safety or health
+organization, environmental protection organization,
+or government institution is use for a permitted purpose
+regardless of the source of funding or obligations resulting
+from the funding.
 
 ## Fair Use
 
-You may have "fair use" rights for the software under the law. These terms
-do not limit them.
+You may have "fair use" rights for the software under the
+law. These terms do not limit them.
 
 ## No Other Rights
 
-These terms do not allow you to sublicense or transfer any of your licenses
-to anyone else, or prevent the licensor from granting licenses to anyone else.
-These terms do not imply any other licenses.
+These terms do not allow you to sublicense or transfer any of
+your licenses to anyone else, or prevent the licensor from
+granting licenses to anyone else.  These terms do not imply
+any other licenses.
 
 ## Patent Defense
 
-If you make any written claim that the software infringes or contributes to
-infringement of any patent, your patent license for the software granted under
-these terms ends immediately. If your company makes such a claim, your patent
-license ends immediately for work on behalf of your company.
+If you make any written claim that the software infringes or
+contributes to infringement of any patent, your patent license
+for the software granted under these terms ends immediately. If
+your company makes such a claim, your patent license ends
+immediately for work on behalf of your company.
 
 ## Violations
 
-The first time you are notified in writing that you have violated any of these
-terms, or done anything with the software not covered by your licenses, your
-licenses can nonetheless continue if you come into full compliance with these
-terms, and take practical steps to correct past violations, within 32 days
-of receiving notice. Otherwise, all your licenses end immediately.
+The first time you are notified in writing that you have
+violated any of these terms, or done anything with the software
+not covered by your licenses, your licenses can nonetheless
+continue if you come into full compliance with these terms,
+and take practical steps to correct past violations, within
+32 days of receiving notice.  Otherwise, all your licenses
+end immediately.
 
 ## No Liability
 
-***As far as the law allows, the software comes as is, without any warranty
-or condition, and the licensor will not be liable to you for any damages arising
-out of these terms or the use or nature of the software, under any kind of
-legal claim.***
+***As far as the law allows, the software comes as is, without
+any warranty or condition, and the licensor will not be liable
+to you for any damages arising out of these terms or the use
+or nature of the software, under any kind of legal claim.***
 
 ## Definitions
 
-The **licensor** is the individual or entity offering these terms, and the
-**software** is the software the licensor makes available under these terms.
+The **licensor** is the individual or entity offering these
+terms, and the **software** is the software the licensor makes
+available under these terms.
 
-**You** refers to the individual or entity agreeing to these terms.
+**You** refers to the individual or entity agreeing to these
+terms.
 
-**Your company** is any legal entity, sole proprietorship, or other kind of
-organization that you work for, plus all organizations that have control over,
-are under the control of, or are under common control with that organization.
-**Control** means ownership of substantially all the assets of an entity,
-or the power to direct its management and policies by vote, contract, or otherwise.
-Control can be direct or indirect.
+**Your company** is any legal entity, sole proprietorship,
+or other kind of organization that you work for, plus all
+organizations that have control over, are under the control of,
+or are under common control with that organization.  **Control**
+means ownership of substantially all the assets of an entity,
+or the power to direct its management and policies by vote,
+contract, or otherwise.  Control can be direct or indirect.
 
-**Your licenses** are all the licenses granted to you for the software under
-these terms.
+**Your licenses** are all the licenses granted to you for the
+software under these terms.
 
-**Use** means anything you do with the software requiring one of your licenses.
+**Use** means anything you do with the software requiring one
+of your licenses.
diff --git a/options/license/PolyForm-Small-Business-1.0.0 b/options/license/PolyForm-Small-Business-1.0.0
index 514d1d0ceb..5b5790e04a 100644
--- a/options/license/PolyForm-Small-Business-1.0.0
+++ b/options/license/PolyForm-Small-Business-1.0.0
@@ -4,102 +4,118 @@
 
 ## Acceptance
 
-In order to get any license under these terms, you must agree to them as both
-strict obligations and conditions to all your licenses.
+In order to get any license under these terms, you must agree
+to them as both strict obligations and conditions to all
+your licenses.
 
 ## Copyright License
 
-The licensor grants you a copyright license for the software to do everything
-you might do with the software that would otherwise infringe the licensor's
-copyright in it for any permitted purpose. However, you may only distribute
-the software according to [Distribution License](#distribution-license) and
-make changes or new works based on the software according to [Changes and
-New Works License](#changes-and-new-works-license).
+The licensor grants you a copyright license for the
+software to do everything you might do with the software
+that would otherwise infringe the licensor's copyright
+in it for any permitted purpose.  However, you may
+only distribute the software according to [Distribution
+License](#distribution-license) and make changes or new works
+based on the software according to [Changes and New Works
+License](#changes-and-new-works-license).
 
 ## Distribution License
 
-The licensor grants you an additional copyright license to distribute copies
-of the software. Your license to distribute covers distributing the software
-with changes and new works permitted by [Changes and New Works License](#changes-and-new-works-license).
+The licensor grants you an additional copyright license
+to distribute copies of the software.  Your license
+to distribute covers distributing the software with
+changes and new works permitted by [Changes and New Works
+License](#changes-and-new-works-license).
 
 ## Notices
 
-You must ensure that anyone who gets a copy of any part of the software from
-you also gets a copy of these terms or the URL for them above, as well as
-copies of any plain-text lines beginning with `Required Notice:` that the
-licensor provided with the software. For example:
+You must ensure that anyone who gets a copy of any part of
+the software from you also gets a copy of these terms or the
+URL for them above, as well as copies of any plain-text lines
+beginning with `Required Notice:` that the licensor provided
+with the software.  For example:
 
 > Required Notice: Copyright Yoyodyne, Inc. (http://example.com)
 
 ## Changes and New Works License
 
-The licensor grants you an additional copyright license to make changes and
-new works based on the software for any permitted purpose.
+The licensor grants you an additional copyright license to
+make changes and new works based on the software for any
+permitted purpose.
 
 ## Patent License
 
-The licensor grants you a patent license for the software that covers patent
-claims the licensor can license, or becomes able to license, that you would
-infringe by using the software.
+The licensor grants you a patent license for the software that
+covers patent claims the licensor can license, or becomes able
+to license, that you would infringe by using the software.
 
 ## Fair Use
 
-You may have "fair use" rights for the software under the law. These terms
-do not limit them.
+You may have "fair use" rights for the software under the
+law. These terms do not limit them.
 
 ## Small Business
 
-Use of the software for the benefit of your company is use for a permitted
-purpose if your company has fewer than 100 total individuals working as employees
-and independent contractors, and less than 1,000,000 USD (2019) total revenue
-in the prior tax year. Adjust this revenue threshold for inflation according
-to the United States Bureau of Labor Statistics' consumer price index for
-all urban consumers, U.S. city average, for all items, not seasonally adjusted,
-with 1982–1984=100 reference base.
+Use of the software for the benefit of your company is use for
+a permitted purpose if your company has fewer than 100 total
+individuals working as employees and independent contractors,
+and less than 1,000,000 USD (2019) total revenue in the prior
+tax year.  Adjust this revenue threshold for inflation according
+to the United States Bureau of Labor Statistics' consumer price
+index for all urban consumers, U.S. city average, for all items,
+not seasonally adjusted, with 1982–1984=100 reference base.
 
 ## No Other Rights
 
-These terms do not allow you to sublicense or transfer any of your licenses
-to anyone else, or prevent the licensor from granting licenses to anyone else.
-These terms do not imply any other licenses.
+These terms do not allow you to sublicense or transfer any of
+your licenses to anyone else, or prevent the licensor from
+granting licenses to anyone else.  These terms do not imply
+any other licenses.
 
 ## Patent Defense
 
-If you make any written claim that the software infringes or contributes to
-infringement of any patent, your patent license for the software granted under
-these terms ends immediately. If your company makes such a claim, your patent
-license ends immediately for work on behalf of your company.
+If you make any written claim that the software infringes or
+contributes to infringement of any patent, your patent license
+for the software granted under these terms ends immediately. If
+your company makes such a claim, your patent license ends
+immediately for work on behalf of your company.
 
 ## Violations
 
-The first time you are notified in writing that you have violated any of these
-terms, or done anything with the software not covered by your licenses, your
-licenses can nonetheless continue if you come into full compliance with these
-terms, and take practical steps to correct past violations, within 32 days
-of receiving notice. Otherwise, all your licenses end immediately.
+The first time you are notified in writing that you have
+violated any of these terms, or done anything with the software
+not covered by your licenses, your licenses can nonetheless
+continue if you come into full compliance with these terms,
+and take practical steps to correct past violations, within
+32 days of receiving notice.  Otherwise, all your licenses
+end immediately.
 
 ## No Liability
 
-***As far as the law allows, the software comes as is, without any warranty
-or condition, and the licensor will not be liable to you for any damages arising
-out of these terms or the use or nature of the software, under any kind of
-legal claim.***
+***As far as the law allows, the software comes as is, without
+any warranty or condition, and the licensor will not be liable
+to you for any damages arising out of these terms or the use
+or nature of the software, under any kind of legal claim.***
 
 ## Definitions
 
-The **licensor** is the individual or entity offering these terms, and the
-**software** is the software the licensor makes available under these terms.
+The **licensor** is the individual or entity offering these
+terms, and the **software** is the software the licensor makes
+available under these terms.
 
-**You** refers to the individual or entity agreeing to these terms.
+**You** refers to the individual or entity agreeing to these
+terms.
 
-**Your company** is any legal entity, sole proprietorship, or other kind of
-organization that you work for, plus all organizations that have control over,
-are under the control of, or are under common control with that organization.
-**Control** means ownership of substantially all the assets of an entity,
-or the power to direct its management and policies by vote, contract, or otherwise.
-Control can be direct or indirect.
+**Your company** is any legal entity, sole proprietorship,
+or other kind of organization that you work for, plus all
+organizations that have control over, are under the control of,
+or are under common control with that organization.  **Control**
+means ownership of substantially all the assets of an entity,
+or the power to direct its management and policies by vote,
+contract, or otherwise.  Control can be direct or indirect.
 
-**Your licenses** are all the licenses granted to you for the software under
-these terms.
+**Your licenses** are all the licenses granted to you for the
+software under these terms.
 
-**Use** means anything you do with the software requiring one of your licenses.
+**Use** means anything you do with the software requiring one
+of your licenses.
diff --git a/options/license/PostgreSQL b/options/license/PostgreSQL
index 06ef3c5d29..7fd3907e75 100644
--- a/options/license/PostgreSQL
+++ b/options/license/PostgreSQL
@@ -1,7 +1,7 @@
 PostgreSQL Database Management System
+(formerly known as Postgres, then as Postgres95)
 
-(formerly known as Postgres, then as Postgres95) Portions Copyright (c) 1996-2010,
-The PostgreSQL Global Development Group
+Portions Copyright (c) 1996-2010, The PostgreSQL Global Development Group
 
 Portions Copyright (c) 1994, The Regents of the University of California
 
diff --git a/options/license/Python-2.0 b/options/license/Python-2.0
index 04962c0643..f66eed51aa 100644
--- a/options/license/Python-2.0
+++ b/options/license/Python-2.0
@@ -39,8 +39,10 @@ a trademark sense to endorse or promote products or services of Licensee,
 or any third party.
 
 8. By copying, installing or otherwise using Python, Licensee agrees to be
-bound by the terms and conditions of this License Agreement. BEOPEN.COM LICENSE
-AGREEMENT FOR PYTHON 2.0
+bound by the terms and conditions of this License Agreement.
+
+
+BEOPEN.COM LICENSE AGREEMENT FOR PYTHON 2.0
 
 BEOPEN PYTHON OPEN SOURCE LICENSE AGREEMENT VERSION 1
 
@@ -81,9 +83,12 @@ http://www.pythonlabs.com/logos.html may be used according to the permissions
 granted on that web page.
 
 7. By copying, installing or otherwise using the software, Licensee agrees
-to be bound by the terms and conditions of this License Agreement. CNRI OPEN
-SOURCE LICENSE AGREEMENT (for Python 1.6b1) IMPORTANT: PLEASE READ THE FOLLOWING
-AGREEMENT CAREFULLY.
+to be bound by the terms and conditions of this License Agreement.
+
+
+CNRI OPEN SOURCE LICENSE AGREEMENT (for Python 1.6b1)
+
+IMPORTANT: PLEASE READ THE FOLLOWING AGREEMENT CAREFULLY.
 
 BY CLICKING ON "ACCEPT" WHERE INDICATED BELOW, OR BY COPYING, INSTALLING OR
 OTHERWISE USING PYTHON 1.6, beta 1 SOFTWARE, YOU ARE DEEMED TO HAVE AGREED
@@ -139,9 +144,15 @@ or any third party.
 
 8. By clicking on the "ACCEPT" button where indicated, or by copying, installing
 or otherwise using Python 1.6b1, Licensee agrees to be bound by the terms
-and conditions of this License Agreement. ACCEPT CWI LICENSE AGREEMENT FOR
-PYTHON 0.9.0 THROUGH 1.2 Copyright (c) 1991 - 1995, Stichting Mathematisch
-Centrum Amsterdam, The Netherlands. All rights reserved.
+and conditions of this License Agreement.
+
+ACCEPT
+
+
+CWI LICENSE AGREEMENT FOR PYTHON 0.9.0 THROUGH 1.2
+
+Copyright (c) 1991 - 1995, Stichting Mathematisch Centrum Amsterdam, The Netherlands.
+All rights reserved.
 
 Permission to use, copy, modify, and distribute this software and its documentation
 for any purpose and without fee is hereby granted, provided that the above
diff --git a/options/license/QPL-1.0 b/options/license/QPL-1.0
index 83e9ca42c7..4f5f48b22d 100644
--- a/options/license/QPL-1.0
+++ b/options/license/QPL-1.0
@@ -1,4 +1,6 @@
-THE Q PUBLIC LICENSE version 1.0 Copyright (C) 1999-2005 Trolltech AS, Norway.
+THE Q PUBLIC LICENSE version 1.0
+
+Copyright (C) 1999-2005 Trolltech AS, Norway.
 
 Everyone is permitted to copy and distribute this license document.
 
@@ -29,7 +31,6 @@ in a form that is separate from the Software, such as patches. The following
 restrictions apply to modifications:
 
 a. Modifications must not alter or remove any copyright notices in the Software.
-
 b. When modifications to the Software are released under this license, a non-exclusive
 royalty-free right is granted to the initial developer of the Software to
 distribute your modification in future versions of the Software provided such
@@ -39,7 +40,7 @@ of the initial developer.
 4. You may distribute machine-executable forms of the Software or machine-executable
 forms of modified versions of the Software, provided that you meet these restrictions:
 
-      a. You must include this license document in the distribution.
+     a. You must include this license document in the distribution.
 
 b. You must ensure that all recipients of the machine-executable forms are
 also able to receive the complete machine-readable source code to the distributed
diff --git a/options/license/Qhull b/options/license/Qhull
index 2362fd9608..2272877256 100644
--- a/options/license/Qhull
+++ b/options/license/Qhull
@@ -9,7 +9,7 @@ This software includes Qhull from The Geometry Center. Qhull is copyrighted
 as noted above. Qhull is free software and may be obtained via http from www.qhull.org.
 It may be freely copied, modified, and redistributed under the following conditions:
 
-   1. All copyright notices must remain intact in all files.
+1. All copyright notices must remain intact in all files.
 
 2. A copy of this text file must be distributed along with any copies of Qhull
 that you redistribute; this includes copies that you have modified, or copies
diff --git a/options/license/Qt-GPL-exception-1.0 b/options/license/Qt-GPL-exception-1.0
index bbc1d40eff..761d0327a4 100644
--- a/options/license/Qt-GPL-exception-1.0
+++ b/options/license/Qt-GPL-exception-1.0
@@ -2,8 +2,20 @@ The Qt Company GPL Exception 1.0
 
 Exception 1:
 
-As a special exception, you may create a larger work which contains the output of this application and distribute that work under terms of your choice, so long as the work is not otherwise derived from or based on this application and so long as the work does not in itself generate output that contains the output from this application in its original or modified form.
+As a special exception you may create a larger work which contains the
+output of this application and distribute that work under terms of your
+choice, so long as the work is not otherwise derived from or based on
+this application and so long as the work does not in itself generate
+output that contains the output from this application in its original
+or modified form.
 
 Exception 2:
 
-As a special exception, you have permission to combine this application with Plugins licensed under the terms of your choice, to produce an executable, and to copy and distribute the resulting executable under the terms of your choice. However, the executable must be accompanied by a prominent notice offering all users of the executable the entire source code to this application, excluding the source code of the independent modules, but including any changes you have made to this application, under the terms of this license.
+As a special exception, you have permission to combine this application
+with Plugins licensed under the terms of your choice, to produce an
+executable, and to copy and distribute the resulting executable under
+the terms of your choice. However, the executable must be accompanied
+by a prominent notice offering all users of the executable the entire
+source code to this application, excluding the source code of the
+independent modules, but including any changes you have made to this
+application, under the terms of this license.
diff --git a/options/license/Qt-LGPL-exception-1.1 b/options/license/Qt-LGPL-exception-1.1
index d0f532e9e1..bd94b5538f 100644
--- a/options/license/Qt-LGPL-exception-1.1
+++ b/options/license/Qt-LGPL-exception-1.1
@@ -1,21 +1,22 @@
 The Qt Company Qt LGPL Exception version 1.1
 
-As an additional permission to the GNU Lesser General Public License version 2.1, the object code form of a "work that uses the Library" may incorporate material from a header file that is part of the Library. You may distribute such object code under terms of your choice, provided that:
+As an additional permission to the GNU Lesser General Public License version
+2.1, the object code form of a "work that uses the Library" may incorporate
+material from a header file that is part of the Library.  You may distribute
+such object code under terms of your choice, provided that:
+    (i)   the header files of the Library have not been modified; and
+    (ii)  the incorporated material is limited to numerical parameters, data
+          structure layouts, accessors, macros, inline functions and
+          templates; and
+    (iii) you comply with the terms of Section 6 of the GNU Lesser General
+          Public License version 2.1.
 
-   (i) the header files of the Library have not been modified; and
+Moreover, you may apply this exception to a modified version of the Library,
+provided that such modification does not involve copying material from the
+Library into the modified Library's header files unless such material is
+limited to (i) numerical parameters; (ii) data structure layouts;
+(iii) accessors; and (iv) small macros, templates and inline functions of
+five lines or less in length.
 
-   (ii) the incorporated material is limited to numerical parameters, data structure layouts, accessors, macros, inline functions and templates; and
-
-   (iii) you comply with the terms of Section 6 of the GNU Lesser General Public License version 2.1.
-
-Moreover, you may apply this exception to a modified version of the Library, provided that such modification does not involve copying material from the Library into the modified Library's header files unless such material is limited to
-
-   (i) numerical parameters;
-
-   (ii) data structure layouts;
-
-   (iii) accessors; and
-
-   (iv) small macros, templates and inline functions of five lines or less in length.
-
-Furthermore, you are not required to apply this additional permission to a modified version of the Library.
+Furthermore, you are not required to apply this additional permission to a
+modified version of the Library.
diff --git a/options/license/Qwt-exception-1.0 b/options/license/Qwt-exception-1.0
index 79fb151344..b45cdd0b54 100644
--- a/options/license/Qwt-exception-1.0
+++ b/options/license/Qwt-exception-1.0
@@ -1,13 +1,12 @@
 Qwt License Version 1.0,
-
 January 1, 2003
 
 The Qwt library and included programs are provided under the terms of the GNU LESSER GENERAL PUBLIC LICENSE (LGPL) with the following exceptions:
 
-   1. Widgets that are subclassed from Qwt widgets do not constitute a derivative work.
+1. Widgets that are subclassed from Qwt widgets do not constitute a derivative work.
 
-   2. Static linking of applications and widgets to the Qwt library does not constitute a derivative work and does not require the author to provide source code for the application or widget, use the shared Qwt libraries, or link their applications or widgets against a user-supplied version of Qwt. If you link the application or widget to a modified version of Qwt, then the changes to Qwt must be provided under the terms of the LGPL in sections 1, 2, and 4.
+2. Static linking of applications and widgets to the Qwt library does not constitute a derivative work and does not require the author to provide source code for the application or widget, use the shared Qwt libraries, or link their applications or widgets against a user-supplied version of Qwt. If you link the application or widget to a modified version of Qwt, then the changes to Qwt must be provided under the terms of the LGPL in sections 1, 2, and 4.
 
-   3. You do not have to provide a copy of the Qwt license with programs that are linked to the Qwt library, nor do you have to identify the Qwt license in your program or documentation as required by section 6 of the LGPL.
+3. You do not have to provide a copy of the Qwt license with programs that are linked to the Qwt library, nor do you have to identify the Qwt license in your program or documentation as required by section 6 of the LGPL.
 
 However, programs must still identify their use of Qwt. The following example statement can be included in user documentation to satisfy this requirement: [program/widget] is based in part on the work of the Qwt project (http://qwt.sf.net)."
diff --git a/options/license/RHeCos-1.1 b/options/license/RHeCos-1.1
index 16d33e320c..e85b99caff 100644
--- a/options/license/RHeCos-1.1
+++ b/options/license/RHeCos-1.1
@@ -1,6 +1,6 @@
 Red Hat eCos Public License v1.1
 
-   1. DEFINITIONS
+1. DEFINITIONS
 
 1.1. "Contributor" means each entity that creates or contributes to the creation
 of Modifications.
@@ -15,7 +15,7 @@ of the Original Code and Modifications, in each case including portions thereof.
 1.4. "Electronic Distribution Mechanism" means a mechanism generally accepted
 in the software development community for the electronic transfer of data.
 
-      1.5. "Executable" means Covered Code in any form other than Source Code.
+     1.5. "Executable" means Covered Code in any form other than Source Code.
 
 1.6. "Initial Developer" means the individual or entity identified as the
 Initial Developer in the Source Code notice required by Exhibit A.
@@ -23,7 +23,7 @@ Initial Developer in the Source Code notice required by Exhibit A.
 1.7. "Larger Work" means a work which combines Covered Code or portions thereof
 with code not governed by the terms of this License.
 
-      1.8. "License" means this document.
+     1.8. "License" means this document.
 
 1.9. "Modifications" means any addition to or deletion from the substance
 or structure of either the Original Code or any previous Modifications. When
@@ -61,7 +61,7 @@ of the outstanding shares or beneficial ownership of such entity.
 others to distribute under different terms than the Red Hat eCos Public License.
 Red Hat's Branded Code may contain part or all of the Covered Code.
 
-   2. SOURCE CODE LICENSE
+2. SOURCE CODE LICENSE
 
 2.1. The Initial Developer Grant. The Initial Developer hereby grants You
 a world-wide, royalty-free, non-exclusive license, subject to third party
@@ -92,7 +92,7 @@ that any such patent is reasonably necessary to enable You to Utilize the
 Contributor Version (or portions thereof), and not to any greater extent that
 may be necessary to Utilize further Modifications or combinations.
 
-   3. DISTRIBUTION OBLIGATIONS
+3. DISTRIBUTION OBLIGATIONS
 
 3.1. Application of License. The Modifications which You create or to which
 You contribute are governed by the terms of this License, including without
@@ -130,9 +130,9 @@ Developer in (a) the Source Code, and (b) in any notice in an Executable version
 or related documentation in which You describe the origin or ownership of
 the Covered Code.
 
-      3.4. Intellectual Property Matters
+     3.4. Intellectual Property Matters
 
-(a) Third Party Claims. If You have knowledge that a party claims an intellectual
+(a) Third Party Claims.  If You have knowledge that a party claims an intellectual
 property right in particular functionality or code (or its utilization under
 this License), you must include a text file with the source code distribution
 titled "LEGAL" which describes the claim and the party making the claim in
@@ -193,7 +193,7 @@ with other code not governed by the terms of this License and distribute the
 Larger Work as a single product. In such a case, You must make sure the requirements
 of this License are fulfilled for the Covered Code.
 
-   4. INABILITY TO COMPLY DUE TO STATUTE OR REGULATION
+4. INABILITY TO COMPLY DUE TO STATUTE OR REGULATION
 
 If it is impossible for You to comply with any of the terms of this License
 with respect to some or all of the Covered Code due to statute or regulation
@@ -208,7 +208,7 @@ must submit this LEGAL file to Red Hat for review, and You will not be able
 use the covered code in any means until permission is granted from Red Hat
 to allow for the inability to comply due to statute or regulation.
 
-   5. APPLICATION OF THIS LICENSE
+5. APPLICATION OF THIS LICENSE
 
 This License applies to code to which the Initial Developer has attached the
 notice in Exhibit A, and to related Covered Code.
@@ -222,7 +222,7 @@ Branded Code becoming subject to the terms of this License, and may license
 Red Hat Branded Code on different terms from those contained in this License.
 Contact Red Hat for details of alternate licensing terms available.
 
-   6. VERSIONS OF THE LICENSE
+6. VERSIONS OF THE LICENSE
 
 6.1. New Versions. Red Hat may publish revised and/or new versions of the
 License from time to time. Each version will be given a distinguishing version
@@ -245,7 +245,7 @@ Public License. (Filling in the name of the Initial Developer, Original Code
 or Contributor in the notice described in Exhibit A shall not of themselves
 be deemed to be modifications of this License.)
 
-   7. DISCLAIMER OF WARRANTY
+7. DISCLAIMER OF WARRANTY
 
 COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTY
 OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES
@@ -257,7 +257,7 @@ THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER
 OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED
 CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
 
-   8. TERMINATION
+8. TERMINATION
 
 This License and the rights granted hereunder will terminate automatically
 if You fail to comply with terms herein and fail to cure such breach within
@@ -266,7 +266,7 @@ which are properly granted shall survive any termination of this License.
 Provisions which, by their nature, must remain in effect beyond the termination
 of this License shall survive.
 
-   9. LIMITATION OF LIABILITY
+9. LIMITATION OF LIABILITY
 
 UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING
 NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE INITIAL DEVELOPER, ANY OTHER
@@ -282,7 +282,7 @@ SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL
 OR CONSEQUENTIAL DAMAGES, SO THAT EXCLUSION AND LIMITATION MAY NOT APPLY TO
 YOU.
 
-   10. U.S. GOVERNMENT END USERS
+10. U.S. GOVERNMENT END USERS
 
 The Covered Code is a "commercial item," as that term is defined in 48 C.F.R.
 2.101 (Oct. 1995), consisting of "commercial computer software" and "commercial
@@ -291,7 +291,7 @@ computer software documentation," as such terms are used in 48 C.F.R. 12.212
 227.7202-4 (June 1995), all U.S. Government End Users acquire Covered Code
 with only those rights set forth herein.
 
-   11. MISCELLANEOUS
+11. MISCELLANEOUS
 
 This License represents the complete agreement concerning subject matter hereof.
 If any provision of this License is held to be unenforceable, such provision
@@ -314,7 +314,7 @@ on Contracts for the International Sale of Goods is expressly excluded. Any
 law or regulation which provides that the language of a contract shall be
 construed against the drafter shall not apply to this License.
 
-   12. RESPONSIBILITY FOR CLAIMS
+12. RESPONSIBILITY FOR CLAIMS
 
 Except in cases where another Contributor has failed to comply with Section
 3.4, You are responsible for damages arising, directly or indirectly, out
@@ -323,7 +323,7 @@ of Covered Code you made available, the revenues you received from utilizing
 such rights, and other relevant factors. You agree to work with affected parties
 to distribute responsibility on an equitable basis.
 
-   13. ADDITIONAL TERMS APPLICABLE TO THE RED HAT ECOS PUBLIC LICENSE
+13. ADDITIONAL TERMS APPLICABLE TO THE RED HAT ECOS PUBLIC LICENSE
 
 Nothing in this License shall be interpreted to prohibit Red Hat from licensing
 under different terms than this License any code which Red Hat otherwise would
@@ -340,7 +340,9 @@ Hat is limited contractually from making third party code available under
 this License, Red Hat may choose to integrate such third party code into Covered
 Code without being required to distribute such third party code in Source
 Code form, even if such third party code would otherwise be considered "Modifications"
-under this License. EXHIBIT A
+under this License.
+
+EXHIBIT A
 
 "The contents of this file are subject to the Red Hat eCos Public License
 Version 1.1 (the "License"); you may not use this file except in compliance
diff --git a/options/license/RPL-1.1 b/options/license/RPL-1.1
index c50ff79d9b..ab2e78b88f 100644
--- a/options/license/RPL-1.1
+++ b/options/license/RPL-1.1
@@ -1,5 +1,8 @@
-Reciprocal Public License, version 1.1 Copyright (C) 2001-2002 Technical Pursuit
-Inc., All Rights Reserved. PREAMBLE
+Reciprocal Public License, version 1.1
+
+Copyright (C) 2001-2002 Technical Pursuit Inc., All Rights Reserved.
+
+PREAMBLE
 
 This Preamble is intended to describe, in plain English, the nature, intent,
 and scope of this License. However, this Preamble is not a part of this License.
@@ -107,7 +110,7 @@ accessible.
 1.5 "Extensions" means any Modifications, Derivative Works, or Required Components
 as those terms are defined in this License.
 
-      1.6 "License" means this Reciprocal Public License.
+     1.6 "License" means this Reciprocal Public License.
 
 1.7 "Licensed Software" means any Software licensed pursuant to this License.
 Licensed Software also includes all previous Extensions from any Contributor
@@ -122,7 +125,7 @@ or (ii) any new file or storage that contains any part of Licensed Software,
 or (iii) any file or storage which replaces or otherwise alters the original
 functionality of Licensed Software at runtime.
 
-      1.10 "Notice" means the notice contained in EXHIBIT A.
+     1.10 "Notice" means the notice contained in EXHIBIT A.
 
 1.11 "Personal Use" means use of Licensed Software by an individual solely
 for his or her personal, private and non-commercial purposes. An individual's
@@ -289,7 +292,7 @@ You describe the origin or ownership of the Licensed Software. You may not
 modify or delete any pre-existing copyright notices, change notices or License
 text in the Licensed Software.
 
-      6.3 Intellectual Property Matters.
+     6.3 Intellectual Property Matters.
 
 a. Third Party Claims. If You have knowledge that a license to a third party's
 intellectual property right is required to exercise the rights granted by
@@ -311,7 +314,7 @@ c. Representations. You represent that, except as disclosed pursuant to 6.3(a)
 above, You believe that any Extensions You distribute are Your original creations
 and that You have sufficient rights to grant the rights conveyed by this License.
 
-      6.4 Required Notices.
+     6.4 Required Notices.
 
 a. License Text. You must duplicate this License in any documentation You
 provide along with the Source Code of any Extensions You create or to which
@@ -473,7 +476,7 @@ this Section all end user license agreements (excluding licenses to distributors
 and resellers) that have been validly granted by You or any distributor hereunder
 prior to termination shall survive termination.
 
-   13.0 Miscellaneous.
+13.0 Miscellaneous.
 
 13.1 U.S. Government End Users. The Licensed Software is a "commercial item,"
 as that term is defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial
@@ -534,12 +537,13 @@ of a contract shall be construed against the drafter shall not apply to this
 License.
 
 13.9 Entire Agreement. This License constitutes the entire agreement between
-the parties with respect to the subject matter hereof. EXHIBIT A
+the parties with respect to the subject matter hereof.
+
+EXHIBIT A
 
 The Notice below must appear in each file of the Source Code of any copy You
 distribute of the Licensed Software or any Extensions thereto, except as may
 be modified as allowed under the terms of Section 7.1
-
 Copyright (C) 1999-2002 Technical Pursuit Inc., All Rights Reserved. Patent
 Pending, Technical Pursuit Inc.
 
@@ -549,7 +553,6 @@ are subject to the Reciprocal Public License ("RPL") Version 1.1, or subsequent
 versions as allowed by the RPL, and You may not copy or use this file in either
 source code or executable form, except in compliance with the terms and conditions
 of the RPL.
-
 You may obtain a copy of both the TPL and the RPL (the "Licenses") from Technical
 Pursuit Inc. at http://www.technicalpursuit.com.
 
diff --git a/options/license/RPSL-1.0 b/options/license/RPSL-1.0
index 5318b638a9..9577f6494d 100644
--- a/options/license/RPSL-1.0
+++ b/options/license/RPSL-1.0
@@ -317,7 +317,7 @@ subject to this License. Licensor may, at its sole discretion, choose to license
 such Licensor Modifications under this License, or on different terms from
 those contained in this License or may choose not to license them at all.
 
-   11. Termination.
+11. Termination.
 
 11.1 Term and Termination. The term of this License is perpetual unless terminated
 as provided below. This License and the rights granted hereunder will terminate:
@@ -351,7 +351,7 @@ for compensation, indemnity or damages of any sort solely as a result of termina
 this License in accordance with its terms, and termination of this License
 will be without prejudice to any other right or remedy of any party.
 
-   12. Miscellaneous.
+12. Miscellaneous.
 
 12.1 Government End Users. The Covered Code is a "commercial item" as defined
 in FAR 2.101. Government software and technical data rights in the Covered
@@ -414,6 +414,8 @@ Where You are located in the province of Quebec, Canada, the following clause
 applies: The parties hereby confirm that they have requested that this License
 and all related documents be drafted in English. Les parties ont exigé que
 le présent contrat et tous les documents connexes soient rédigés en anglais.
+
+
 EXHIBIT A.
 
 "Copyright (c) 1995-2002 RealNetworks, Inc. and/or its licensors. All Rights
@@ -442,7 +444,9 @@ PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
 Contributor(s): ____________________________________
 
 Technology Compatibility Kit Test Suite(s) Location (if licensed under the
-RCSL): _____"
+RCSL):
+
+________________________________"
 
 Object Code Notice: Helix DNA Client technology included. Copyright (c) RealNetworks,
 Inc., 1995-2002. All rights reserved.
@@ -454,63 +458,34 @@ following list applies to the most recent version of the license as of October
 25, 2002, unless otherwise indicated.
 
 Academic Free License
-
 Apache Software License
-
 Apple Public Source License
-
 Artistic license
-
 Attribution Assurance Licenses
-
 BSD license
-
 Common Public License1
-
 Eiffel Forum License
-
 GNU General Public License (GPL)1
-
 GNU Library or "Lesser" General Public License (LGPL)1
-
 IBM Public License
-
 Intel Open Source License
-
 Jabber Open Source License
-
 MIT license
-
 MITRE Collaborative Virtual Workspace License (CVW License)
-
 Motosoto License
-
 Mozilla Public License 1.0 (MPL)
-
 Mozilla Public License 1.1 (MPL)
-
 Nokia Open Source License
-
 Open Group Test Suite License
-
 Python Software Foundation License
-
 Ricoh Source Code Public License
-
 Sun Industry Standards Source License (SISSL)
-
 Sun Public License
-
 University of Illinois/NCSA Open Source License
-
 Vovida Software License v. 1.0
-
 W3C License
-
 X.Net License
-
 Zope Public License
-
 zlib/libpng license
 
 1Note: because this license contains certain reciprocal licensing terms that
diff --git a/options/license/RSCPL b/options/license/RSCPL
index dd9d1f0701..5d5867a1bc 100644
--- a/options/license/RSCPL
+++ b/options/license/RSCPL
@@ -1,8 +1,7 @@
 Ricoh Source Code Public License
-
 Version 1.0
 
-   1. Definitions.
+1. Definitions.
 
 1.1. "Contributor" means each entity that creates or contributes to the creation
 of Modifications.
@@ -27,7 +26,7 @@ with code not governed by the terms of this License.
 whether at the time of the initial grant or subsequently acquired, any and
 all of the rights conveyed herein.
 
-      1.8. "License" means this document.
+     1.8. "License" means this document.
 
 1.9. "Modifications" means any addition to or deletion from the substance
 or structure of either the Original Code or any previous Modifications. When
@@ -66,7 +65,7 @@ or indirect, to cause the direction or management of such entity, whether
 by contract or otherwise, or (b) ownership of fifty percent (50%) or more
 of the outstanding shares or beneficial ownership of such entity.
 
-   2. Source Code License.
+2. Source Code License.
 
 2.1. Grant from RSV. RSV hereby grants You a worldwide, royalty-free, non-exclusive
 license, subject to third party intellectual property claims:
@@ -94,7 +93,7 @@ have made, and/or otherwise dispose of: (i) Modifications made by that Contribut
 (or portions thereof); and (ii) the combination of Modifications made by that
 Contributor with its Contributor Version (or portions of such combination).
 
-   3. Distribution Obligations.
+3. Distribution Obligations.
 
 3.1. Application of License. The Modifications which You create or to which
 You contribute are governed by the terms of this License, including without
@@ -127,7 +126,7 @@ Code provided by RSV and including the name of RSV in (a) the Source Code,
 and (b) in any notice in an Executable Code version or related documentation
 in which You describe the origin or ownership of the Governed Code.
 
-      3.4. Intellectual Property Matters.
+     3.4. Intellectual Property Matters.
 
 3.4.1. Third Party Claims. If You have knowledge that a party claims an intellectual
 property right in particular functionality or code (or its utilization under
@@ -190,8 +189,7 @@ with other code not governed by the terms of this License and distribute the
 Larger Work as a single product. In such a case, You must make sure the requirements
 of this License are fulfilled for the Governed Code.
 
-   4. Inability to Comply Due to Statute or Regulation.
-
+4. Inability to Comply Due to Statute or Regulation.
 If it is impossible for You to comply with any of theterms of this License
 with respect to some or all of the Governed Code due to statute or regulation
 then You must: (a) comply with the terms of this License to the maximum extent
@@ -201,7 +199,7 @@ must be included with all distributions of the Source Code. Except to the
 extent prohibited by statute or regulation, such description must be sufficiently
 detailed for a recipient of ordinary skill to be able to understand it.
 
-   5. Trademark Usage.
+5. Trademark Usage.
 
 5.1. Advertising Materials. All advertising materials mentioning features
 or use of the Governed Code must display the following acknowledgement: "This
@@ -215,7 +213,7 @@ the prior written permission of RSV.
 "Ricoh" nor may the word "Ricoh" appear in their names without the prior written
 permission of RSV.
 
-   6. Versions of the License.
+6. Versions of the License.
 
 6.1. New Versions. RSV may publish revised and/or new versions of the License
 from time to time. Each version will be given a distinguishing version number.
@@ -227,8 +225,7 @@ the terms of any subsequent version of the License published by RSV. No one
 other than RSV has the right to modify the terms applicable to Governed Code
 created under this License.
 
-   7. Disclaimer of Warranty.
-
+7. Disclaimer of Warranty.
 GOVERNED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT
 WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION,
 WARRANTIES THAT THE GOVERNED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR
@@ -239,7 +236,7 @@ THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER
 OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY GOVERNED
 CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
 
-   8. Termination.
+8. Termination.
 
 8.1. This License and the rights granted hereunder will terminate automatically
 if You fail to comply with terms herein and fail to cure such breach within
@@ -286,8 +283,7 @@ user license agreements (excluding distributors and resellers) which have
 been validly granted by You or any distributor hereunder prior to termination
 shall survive termination.
 
-   9. Limitation of Liability.
-
+9. Limitation of Liability.
 UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING
 NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL RSV, ANY CONTRIBUTOR, OR ANY DISTRIBUTOR
 OF GOVERNED CODE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO YOU
@@ -301,7 +297,7 @@ NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDIC
 DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES,
 SO THAT EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU. TO THE EXTENT THAT
 ANY EXCLUSION OF DAMAGES ABOVE IS NOT VALID, YOU AGREE THAT IN NO EVENT WILL
-RSV'S LIABILITY UNDER OR RELATED TO THIS AGREEMENT EXCEED FIVE THOUSAND DOLLARS
+RSVS LIABILITY UNDER OR RELATED TO THIS AGREEMENT EXCEED FIVE THOUSAND DOLLARS
 ($5,000). THE GOVERNED CODE IS NOT INTENDED FOR USE IN CONNECTION WITH ANY
 NUCLER, AVIATION, MASS TRANSIT OR MEDICAL APPLICATION OR ANY OTHER INHERENTLY
 DANGEROUS APPLICATION THAT COULD RESULT IN DEATH, PERSONAL INJURY, CATASTROPHIC
@@ -309,8 +305,8 @@ DAMAGE OR MASS DESTRUCTION, AND YOU AGREE THAT NEITHER RSV NOR ANY CONTRIBUTOR
 SHALL HAVE ANY LIABILITY OF ANY NATURE AS A RESULT OF ANY SUCH USE OF THE
 GOVERNED CODE.
 
-   10. U.S. Government End Users.
 
+10. U.S. Government End Users.
 The Governed Code is a "commercial item," as that term is defined in 48 C.F.R.
 2.101 (Oct. 1995), consisting of "commercial computer software" and "commercial
 computer software documentation," as such terms are used in 48 C.F.R. 12.212
@@ -318,8 +314,7 @@ computer software documentation," as such terms are used in 48 C.F.R. 12.212
 227.7202-4 (June 1995), all U.S. Government End Users acquire Governed Code
 with only those rights set forth herein.
 
-   11. Miscellaneous.
-
+11. Miscellaneous.
 This License represents the complete agreement concerning 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. This
@@ -330,21 +325,23 @@ further agree that any cause of action arising under or related to this Agreemen
 shall be brought in the Federal Courts of the Northern District of California,
 with venue lying in Santa Clara County, California. The losing party shall
 be responsible for costs, including without limitation, court costs and reasonable
-attorney's fees and expenses. Notwithstanding anything to the contrary herein,
+attorneys fees and expenses. Notwithstanding anything to the contrary herein,
 RSV may seek injunctive relief related to a breach of this Agreement in any
 court of competent jurisdiction. The application of the United Nations Convention
 on Contracts for the International Sale of Goods is expressly excluded. Any
 law or regulation which provides that the language of a contract shall be
 construed against the drafter shall not apply to this License.
 
-   12. Responsibility for Claims.
-
+12. Responsibility for Claims.
 Except in cases where another Contributor has failed to comply with Section
 3.4, You are responsible for damages arising, directly or indirectly, out
 of Your utilization of rights under this License, based on the number of copies
 of Governed Code you made available, the revenues you received from utilizing
 such rights, and other relevant factors. You agree to work with affected parties
-to distribute responsibility on an equitable basis. EXHIBIT A
+to distribute responsibility on an equitable basis.
+
+
+EXHIBIT A
 
 "The contents of this file are subject to the Ricoh Source Code Public License
 Version 1.0 (the "License"); you may not use this file except in compliance
diff --git a/options/license/Rdisc b/options/license/Rdisc
index ea9be71c60..f073271f2d 100644
--- a/options/license/Rdisc
+++ b/options/license/Rdisc
@@ -1,24 +1,23 @@
-Rdisc (this program) was developed by Sun Microsystems, Inc. and is provided
-for unrestricted use provided that this legend is included on all tape media
-and as a part of the software program in whole or part. Users may copy or
-modify Rdisc without charge, and they may freely distribute it.
+Rdisc (this program) was developed by Sun Microsystems, Inc. and is  provided
+for unrestricted use provided that this legend is included on  all tape media
+and as a part of the software program in whole or part.  Users may copy or
+modify Rdisc without charge, and they may freely  distribute it.
 
-RDISC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE WARRANTIES
-OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE, OR ARISING
+RDISC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE  WARRANTIES
+OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR  PURPOSE, OR ARISING
 FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
 
-Rdisc is provided with no support and without any obligation on the part of
-Sun Microsystems, Inc. to assist in its use, correction, modification or enhancement.
+Rdisc is provided with no support and without any obligation on the  part
+of Sun Microsystems, Inc. to assist in its use, correction,  modification
+or enhancement.
 
-SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE INFRINGEMENT
-OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY RDISC OR ANY PART THEREOF.
+SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE  INFRINGEMENT
+OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY RDISC  OR ANY PART THEREOF.
 
-In no event will Sun Microsystems, Inc. be liable for any lost revenue or
-profits or other special, indirect and consequential damages, even if Sun
+In no event will Sun Microsystems, Inc. be liable for any lost revenue  or
+profits or other special, indirect and consequential damages, even  if Sun
 has been advised of the possibility of such damages.
 
 Sun Microsystems, Inc.
-
 2550 Garcia Avenue
-
 Mountain View, California 94043
diff --git a/options/license/Ruby b/options/license/Ruby
index 26762c610e..79a7435727 100644
--- a/options/license/Ruby
+++ b/options/license/Ruby
@@ -1,5 +1,3 @@
-
-
 1. You may make and give away verbatim copies of the source form of the software
 without restriction, provided that you duplicate all of the original copyright
 notices and associated disclaimers.
@@ -11,12 +9,12 @@ a) place your modifications in the Public Domain or otherwise make them Freely
 Available, such as by posting said modifications to Usenet or an equivalent
 medium, or by allowing the author to include your modifications in the software.
 
-   b) use the modified software only within your corporation or organization.
+     b) use the modified software only within your corporation or organization.
 
 c) give non-standard binaries non-standard names, with instructions on where
 to get the original software distribution.
 
-   d) make other distribution arrangements with the author.
+     d) make other distribution arrangements with the author.
 
 3. You may distribute the software in object code or binary form, provided
 that you do at least ONE of the following:
@@ -30,7 +28,7 @@ b) accompany the distribution with the machine-readable source of the software.
 c) give non-standard binaries non-standard names, with instructions on where
 to get the original software distribution.
 
-   d) make other distribution arrangements with the author.
+     d) make other distribution arrangements with the author.
 
 4. You may modify and include the part of the software into any other software
 (possibly commercial). But some files in the distribution are not written
diff --git a/options/license/SAX-PD b/options/license/SAX-PD
index dbdae27baf..d804ab2c21 100644
--- a/options/license/SAX-PD
+++ b/options/license/SAX-PD
@@ -41,7 +41,6 @@ list the source code in a book, mirror the documentation at your own web site,
 or use it in any other way you see fit.
 
 David Megginson, Megginson Technologies Ltd.
-
 1998-05-11
 
 SAX 2.0
@@ -52,5 +51,4 @@ contained in this distribution into the Public Domain. SAX comes with NO WARRANT
 or guarantee of fitness for any purpose.
 
 David Megginson, Megginson Technologies Ltd.
-
 2000-05-05
diff --git a/options/license/SCEA b/options/license/SCEA
index c676ed5e96..d322751b22 100644
--- a/options/license/SCEA
+++ b/options/license/SCEA
@@ -2,7 +2,7 @@ SCEA Shared Source License 1.0
 
 Terms and Conditions:
 
-   1. Definitions:
+1. Definitions:
 
 "Software" shall mean the software and related documentation, whether in Source
 or Object Form, made available under this SCEA Shared Source license ("License"),
@@ -14,7 +14,6 @@ or attached or accompanying the source files.
 "Object Code" or "Object Form" shall mean any form that results from translation
 or transformation of Source Code, including but not limited to compiled object
 code or conversions to other forms intended for machine execution.
-
 "Source Code" or "Source Form" shall have the plain meaning generally accepted
 in the software industry, including but not limited to software source code,
 documentation source, header and configuration files.
@@ -22,22 +21,21 @@ documentation source, header and configuration files.
 "You" or "Your" shall mean you as an individual or as a company, or whichever
 form under which you are exercising rights under this License.
 
-   2. License Grant.
+2. License Grant.
 
 Licensor hereby grants to You, free of charge subject to the terms and conditions
 of this License, an irrevocable, non-exclusive, worldwide, perpetual, and
 royalty-free license to use, modify, reproduce, distribute, publicly perform
 or display the Software in Object or Source Form .
 
-   3. No Right to File for Patent.
-
+3. No Right to File for Patent.
 In exchange for the rights that are granted to You free of charge under this
 License, You agree that You will not file for any patent application, seek
 copyright protection or take any other action that might otherwise impair
 the ownership rights in and to the Software that may belong to SCEA or any
 of the other contributors/authors of the Software.
 
-   4. Contributions.
+4. Contributions.
 
 SCEA welcomes contributions in form of modifications, optimizations, tools
 or documentation designed to improve or expand the performance and scope of
@@ -62,26 +60,26 @@ Your donated Contributions are integrated into the Software then Sony Computer
 Entertainment, Inc. shall become the copyright owner of the Software now containing
 Your contributions and SCEA would be the Licensor.
 
-   5. Redistribution in Source Form
+5. Redistribution in Source Form
 
 You may redistribute copies of the Software, modifications or derivatives
 thereof in Source Code Form, provided that You:
 
-      a. Include a copy of this License and any copyright notices with source
+     a. Include a copy of this License and any copyright notices with source
 
-      b. Identify modifications if any were made to the Software
+     b. Identify modifications if any were made to the Software
 
 c. Include a copy of all documentation accompanying the Software and modifications
 made by You
 
-   6. Redistribution in Object Form
+6. Redistribution in Object Form
 
 If You redistribute copies of the Software, modifications or derivatives thereof
 in Object Form only (as incorporated into finished goods, i.e. end user applications)
 then You will not have a duty to include any copies of the code, this License,
 copyright notices, other attributions or documentation.
 
-   7. No Warranty
+7. No Warranty
 
 THE SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT ANY REPRESENTATIONS
 OR WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING, WITHOUT LIMITATION,
@@ -90,7 +88,7 @@ A PARTICULAR PURPOSE. YOU ARE SOLELY RESPONSIBLE FOR DETERMINING THE APPROPRIATE
 OF USING, MODIFYING OR REDISTRIBUTING THE SOFTWARE AND ASSUME ANY RISKS ASSOCIATED
 WITH YOUR EXERCISE OF PERMISSIONS UNDER THIS LICENSE.
 
-   8. Limitation of Liability
+8. Limitation of Liability
 
 UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY WILL EITHER PARTY BE LIABLE
 TO THE OTHER PARTY OR ANY THIRD PARTY FOR ANY DIRECT, INDIRECT, CONSEQUENTIAL,
@@ -101,7 +99,7 @@ OF SUCH INJURY, LOSS, OR DAMAGE. THE LIMITATIONS OF LIABILITY SET FORTH IN
 THIS SECTION SHALL APPLY TO THE FULLEST EXTENT PERMISSIBLE AT LAW OR ANY GOVERMENTAL
 REGULATIONS.
 
-   9. Governing Law and Consent to Jurisdiction
+9. Governing Law and Consent to Jurisdiction
 
 This Agreement shall be governed by and interpreted in accordance with the
 laws of the State of California, excluding that body of law related to choice
@@ -114,14 +112,13 @@ jurisdiction and venue of such courts for purposes of any such action. In
 addition, each party hereby waives the right to a jury trial in any action
 or proceeding related to this Agreement.
 
-   10. Copyright Notice for Redistribution of Source Code
+10. Copyright Notice for Redistribution of Source Code
 
 Copyright 2005 Sony Computer Entertainment Inc.
 
 Licensed under the SCEA Shared Source License, Version 1.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://research.scea.com/scea_shared_source_license.html
 
 Unless required by applicable law or agreed to in writing, software distributed
diff --git a/options/license/SGI-B-1.0 b/options/license/SGI-B-1.0
index 2500c0ce9d..846978e6eb 100644
--- a/options/license/SGI-B-1.0
+++ b/options/license/SGI-B-1.0
@@ -1,8 +1,7 @@
 SGI FREE SOFTWARE LICENSE B
-
 (Version 1.0 1/25/2000)
 
-   1. Definitions.
+1. Definitions.
 
 1.1 "Additional Notice Provisions" means such additional provisions as appear
 in the Notice in Original Code under the heading "Additional Notice Provisions."
@@ -23,7 +22,7 @@ with code not governed by the terms of this License.
 whether at the time of the initial grant or subsequently acquired, any and
 all of the rights conveyed herein.
 
-      1.7 "License" means this document.
+     1.7 "License" means this document.
 
 1.8 "Modifications" means any addition to the substance or structure of the
 Original Code and/or any addition to or deletion from previous Modifications.
@@ -50,11 +49,11 @@ the power, direct or indirect, to direct or manage such entity, or (b) ownership
 of fifty percent (50%) or more of the outstanding shares or beneficial ownership
 of such entity.
 
-      1.12 SGI" means Silicon Graphics, Inc.
+     1.12 SGI" means Silicon Graphics, Inc.
 
-   2. License Grant and Restrictions.
+2. License Grant and Restrictions.
 
-2.1 License Grant. Subject to the provisions of this License and any third
+2.1v License Grant. Subject to the provisions of this License and any third
 party intellectual property claims, for the duration of intellectual property
 protections inherent in the Original Code, SGI hereby grants Recipient a worldwide,
 royalty-free, non-exclusive license, to do the following: (i) under copyrights
@@ -80,24 +79,24 @@ under Section 2.1(i) to the extent such Modifications are fully compliant
 with any API as may be identified in Additional Notice Provisions as appear
 in the Original Code.
 
-   3. Redistributions.
+3. Redistributions.
 
-A. Retention of Notice/Copy of License. The Notice set forth in Exhibit A,
+A.	Retention of Notice/Copy of License. The Notice set forth in Exhibit A,
 below, must be conspicuously retained or included in any and all redistributions
 of Covered Code. For distributions of the Covered Code in source code form,
 the Notice must appear in every file that can include a text comments field;
 in executable form, the Notice and a copy of this License must appear in related
-documentation or collateral where the Recipient's rights relating to Covered
+documentation or collateral where the Recipient’s rights relating to Covered
 Code are described. Any Additional Notice Provisions which actually appears
 in the Original Code must also be retained or included in any and all redistributions
 of Covered Code.
 
-B. Alternative License. Provided that Recipient is in compliance with the
+B.	Alternative License. Provided that Recipient is in compliance with the
 terms of this License, Recipient may distribute the source code and/or executable
 version(s) of Covered Code under (1) this License; (2) a license identical
 to this License but for only such changes as are necessary in order to clarify
-Recipient's role as licensor of Modifications, without derogation of any of
-SGI's rights; and/or (3) a license of Recipient's choosing, containing terms
+Recipient’s role as licensor of Modifications, without derogation of any of
+SGI’s rights; and/or (3) a license of Recipient’s choosing, containing terms
 different from this License, provided that the license terms include this
 Section 3 and Sections 4, 6, 7, 10, 12, and 13, which terms may not be modified
 or superseded by any other terms of such license. If Recipient elects to use
@@ -105,7 +104,7 @@ any license other than this License, Recipient must make it absolutely clear
 that any of its terms which differ from this License are offered by Recipient
 alone, and not by SGI.
 
-C. Indemnity. Recipient hereby agrees to indemnify SGI for any liability incurred
+C.	Indemnity. Recipient hereby agrees to indemnify SGI for any liability incurred
 by SGI as a result of any such alternative license terms Recipient offers.
 
 4. Termination. This License and the rights granted hereunder will terminate
@@ -204,7 +203,9 @@ including without limitation, court costs and reasonable attorneys fees and
 expenses. The application of the United Nations Convention on Contracts for
 the International Sale of Goods is expressly excluded. Any law or regulation
 which provides that the language of a contract shall be construed against
-the drafter shall not apply to this License. Exhibit A
+the drafter shall not apply to this License.
+
+Exhibit A
 
 License Applicability. Except to the extent portions of this file are made
 subject to an alternative license as permitted in the SGI Free Software License
@@ -221,11 +222,11 @@ IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS DISCLAIMED,
 INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND CONDITIONS OF MERCHANTABILITY,
 SATISFACTORY QUALITY, FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
 
-Original Code. The Original Code is: [ name of software , version number ,
-and release date], developed by Silicon Graphics, Inc. The Original Code is
-Copyright (c) [ dates of first publication, as appearing in the Notice in
-the Original Code] Silicon Graphics, Inc. Copyright in any portions created
-by third parties is as indicated elsewhere herein. All Rights Reserved.
+Original Code. The Original Code is: [name of software, version number, and
+release date], developed by Silicon Graphics, Inc. The Original Code is Copyright
+(c) [dates of first publication, as appearing in the Notice in the Original
+Code] Silicon Graphics, Inc. Copyright in any portions created by third parties
+is as indicated elsewhere herein. All Rights Reserved.
 
-Additional Notice Provisions: [ such additional provisions, if any, as appear
+Additional Notice Provisions: [such additional provisions, if any, as appear
 in the Notice in the Original Code under the heading "Additional Notice Provisions"]
diff --git a/options/license/SGI-B-1.1 b/options/license/SGI-B-1.1
index 8fc157b57f..c811ea6c1a 100644
--- a/options/license/SGI-B-1.1
+++ b/options/license/SGI-B-1.1
@@ -1,8 +1,7 @@
 SGI FREE SOFTWARE LICENSE B
-
 (Version 1.1 02/22/2000)
 
-   1. Definitions.
+1. Definitions.
 
 1.1 "Additional Notice Provisions" means such additional provisions as appear
 in the Notice in Original Code under the heading "Additional Notice Provisions."
@@ -20,7 +19,7 @@ with code not governed by the terms of this License.
 whether at the time of the initial grant or subsequently acquired, any and
 all of the rights conveyed herein.
 
-      1.6 "License" means this document.
+     1.6 "License" means this document.
 
 1.7 "Licensed Patents" means patent claims Licensable by SGI that are infringed
 by the use or sale of Original Code or any Modifications provided by SGI,
@@ -55,12 +54,12 @@ of such entity.
 are infringed by the use or sale of Original Code or any Modifications provided
 by SGI, or any combination thereof.
 
-      1.13 "SGI" means Silicon Graphics, Inc.
+     1.13 "SGI" means Silicon Graphics, Inc.
 
 1.14 "SGI Patents" means patent claims Licensable by SGI other than the Licensed
 Patents.
 
-   2. License Grant and Restrictions.
+2. License Grant and Restrictions.
 
 2.1 SGI License Grant. Subject to the terms of this License and any third
 party intellectual property claims, for the duration of intellectual property
@@ -92,25 +91,25 @@ by SGI.
 2.1 and 2.2 are not applicable to implementation in Hardware of the algorithms
 embodied in the Original Code or any Modifications provided by SGI .
 
-   3. Redistributions.
+3. Redistributions.
 
 3.1 Retention of Notice/Copy of License. The Notice set forth in Exhibit A,
 below, must be conspicuously retained or included in any and all redistributions
 of Covered Code. For distributions of the Covered Code in source code form,
 the Notice must appear in every file that can include a text comments field;
 in executable form, the Notice and a copy of this License must appear in related
-documentation or collateral where the Recipient's rights relating to Covered
+documentation or collateral where the Recipient’s rights relating to Covered
 Code are described. Any Additional Notice Provisions which actually appears
 in the Original Code must also be retained or included in any and all redistributions
 of Covered Code.
 
 3.2 Alternative License. Provided that Recipient is in compliance with the
 terms of this License, Recipient may, so long as without derogation of any
-of SGI's rights in and to the Original Code, distribute the source code and/or
+of SGI’s rights in and to the Original Code, distribute the source code and/or
 executable version(s) of Covered Code under (1) this License; (2) a license
 identical to this License but for only such changes as are necessary in order
-to clarify Recipient's role as licensor of Modifications; and/or (3) a license
-of Recipient's choosing, containing terms different from this License, provided
+to clarify Recipient’s role as licensor of Modifications; and/or (3) a license
+of Recipient’s choosing, containing terms different from this License, provided
 that the license terms include this Section 3 and Sections 4, 6, 7, 10, 12,
 and 13, which terms may not be modified or superseded by any other terms of
 such license. If Recipient elects to use any license other than this License,
@@ -220,7 +219,9 @@ including without limitation, court costs and reasonable attorneys fees and
 expenses. The application of the United Nations Convention on Contracts for
 the International Sale of Goods is expressly excluded. Any law or regulation
 that provides that the language of a contract shall be construed against the
-drafter shall not apply to this License. Exhibit A
+drafter shall not apply to this License.
+
+Exhibit A
 
 License Applicability. Except to the extent portions of this file are made
 subject to an alternative license as permitted in the SGI Free Software License
@@ -237,10 +238,11 @@ IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS DISCLAIMED,
 INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND CONDITIONS OF MERCHANTABILITY,
 SATISFACTORY QUALITY, FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
 
-Original Code. The Original Code is: [ name of software , version number ,
-and release date] , developed by Silicon Graphics, Inc. The Original Code
-is Copyright (c) [ dates of first publication, as appearing in the Notice
-in the Original Code] Silicon Graphics, Inc. Copyright in any portions created
-by third parties is as indicated elsewhere herein. All Rights Reserved. Additional
-Notice Provisions: [ such additional provisions, if any, as appear in the
-Notice in the Original Code under the heading "Additional Notice Provisions"]
+Original Code. The Original Code is: [name of software, version number, and
+release date], developed by Silicon Graphics, Inc. The Original Code is Copyright
+(c) [dates of first publication, as appearing in the Notice in the Original
+Code] Silicon Graphics, Inc. Copyright in any portions created by third parties
+is as indicated elsewhere herein. All Rights Reserved.
+
+Additional Notice Provisions: [such additional provisions, if any, as appear
+in the Notice in the Original Code under the heading "Additional Notice Provisions"]
diff --git a/options/license/SGI-B-2.0 b/options/license/SGI-B-2.0
index e53cfa5438..db23381c26 100644
--- a/options/license/SGI-B-2.0
+++ b/options/license/SGI-B-2.0
@@ -1,7 +1,8 @@
 SGI FREE SOFTWARE LICENSE B
+(Version 2.0, Sept. 18, 2008)
 
-(Version 2.0, Sept. 18, 2008) Copyright (C) [dates of first publication] Silicon
-Graphics, Inc. All Rights Reserved.
+Copyright (C) [dates of first publication] Silicon Graphics, Inc. All Rights
+Reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/options/license/SHL-0.51 b/options/license/SHL-0.51
index 1f8e3e4ee9..57dce09288 100644
--- a/options/license/SHL-0.51
+++ b/options/license/SHL-0.51
@@ -10,22 +10,17 @@ treated as licensed under the Apache License Version 2.0 (which is so approved).
 
 This License is licensed under the terms of this License and in particular
 clause 7 below (Disclaimer of Warranties) applies in relation to its use.
+
 TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
-   1. Definitions.
-
-      
+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 Rights owner or entity authorized by the Rights
 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
@@ -33,40 +28,28 @@ 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.
 
-      
-
 "Rights" means copyright and any similar right including design right (whether
 registered or unregistered), semiconductor topography (mask) rights and database
 rights (but excluding Patents and Trademarks).
 
-      
-
 "Source" form shall mean the preferred form for making modifications, including
 but not limited to source code, net lists, board layouts, CAD files, 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, the instantiation of a hardware design and
 conversions to other media types, including intermediate forms such as bytecodes,
 FPGA bitstreams, artwork and semiconductor topographies (mask works).
 
-      
-
 "Work" shall mean the work of authorship, whether in Source form or other
 Object form, made available under the License, as indicated by a Rights 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
@@ -75,8 +58,6 @@ Works shall not include works that remain separable from, or merely link (or
 bind by name) or physically connect to or interoperate with the interfaces
 of, the Work and Derivative Works thereof.
 
-      
-
 "Contribution" shall mean any design or 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
@@ -90,8 +71,6 @@ for the purpose of discussing and improving the Work, but excluding communicatio
 that is conspicuously marked or otherwise designated in writing by the Rights
 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.
@@ -190,7 +169,9 @@ 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
+or additional liability.
+
+END OF TERMS AND CONDITIONS
 
 APPENDIX: How to apply this license to your work
 
diff --git a/options/license/SHL-2.0 b/options/license/SHL-2.0
index 663b636f66..e522a396fe 100644
--- a/options/license/SHL-2.0
+++ b/options/license/SHL-2.0
@@ -1,23 +1,22 @@
 # Solderpad Hardware Licence Version 2.0
 
-This licence (the "Licence") operates as a wraparound licence to the Apache License Version 2.0 (the "Apache License") and grants to You the rights, and imposes the obligations, set out in the Apache License (which can be found here: http://apache.org/licenses/LICENSE-2.0), with the following extensions. It must be read in conjunction with the Apache License. Section 1 below modifies definitions in the Apache License, and section 2 below replaces sections 2 of the Apache License. You may, at your option, choose to treat any Work released under this License as released under the Apache License (thus ignoring all sections written below entirely). Words in italics indicate changes rom the Apache License, but are indicative and not to be taken into account in interpretation.
+This licence (the “Licence”) operates as a wraparound licence to the Apache License Version 2.0 (the “Apache License”) and grants to You the rights, and imposes the obligations, set out in the Apache License (which can be found here: http://apache.org/licenses/LICENSE-2.0), with the following extensions. It must be read in conjunction with the Apache License. Section 1 below modifies definitions in the Apache License, and section 2 below replaces sections 2 of the Apache License. You may, at your option, choose to treat any Work released under this License as released under the Apache License (thus ignoring all sections written below entirely). Words in italics indicate changes rom the Apache License, but are indicative and not to be taken into account in interpretation.
 
-   1. The definitions set out in the Apache License are modified as follows:
+1. The definitions set out in the Apache License are modified as follows:
 
-   Copyright any reference to 'copyright' (whether capitalised or not) includes 'Rights' (as defined below).
+Copyright any reference to ‘copyright’ (whether capitalised or not) includes ‘Rights’ (as defined below).
 
-   Contribution also includes any design, as well as any work of authorship.
+Contribution also includes any design, as well as any work of authorship.
 
-   Derivative Works shall not include works that remain reversibly separable from, or merely link (or bind by name) or physically connect to or interoperate with the interfaces of the Work and Derivative Works thereof.
+Derivative Works shall not include works that remain reversibly separable from, or merely link (or bind by name) or physically connect to or interoperate with the interfaces of the Work and Derivative Works thereof.
 
-   Object form shall mean any form resulting from mechanical transformation or translation of a Source form or the application of a Source form to physical material, including but not limited to compiled object code, generated documentation, the instantiation of a hardware design or physical object and conversions to other media types, including intermediate forms such as bytecodes, FPGA bitstreams, moulds, artwork and semiconductor topographies (mask works).
+Object form shall mean any form resulting from mechanical transformation or translation of a Source form or the application of a Source form to physical material, including but not limited to compiled object code, generated documentation, the instantiation of a hardware design or physical object and conversions to other media types, including intermediate forms such as bytecodes, FPGA bitstreams, moulds, artwork and semiconductor topographies (mask works).
 
-   Rights means copyright and any similar right including design right (whether registered or unregistered), semiconductor topography (mask) rights and database rights (but excluding Patents and Trademarks).
+Rights means copyright and any similar right including design right (whether registered or unregistered), semiconductor topography (mask) rights and database rights (but excluding Patents and Trademarks).
 
-   Source form shall mean the preferred form for making modifications, including but not limited to source code, net lists, board layouts, CAD files, documentation source, and configuration files.
+Source form shall mean the preferred form for making modifications, including but not limited to source code, net lists, board layouts, CAD files, documentation source, and configuration files.
+Work also includes a design or work of authorship, whether in Source form or other Object form.
 
-   Work also includes a design or work of authorship, whether in Source form or other Object form.
+2. Grant of Licence
 
-   2. Grant of Licence
-
-      2.1 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 license under the Rights to reproduce, prepare Derivative Works of, make, adapt, repair, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form and do anything in relation to the Work as if the Rights did not exist.
+2.1 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 license under the Rights to reproduce, prepare Derivative Works of, make, adapt, repair, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form and do anything in relation to the Work as if the Rights did not exist.
diff --git a/options/license/SHL-2.1 b/options/license/SHL-2.1
index 9de03f617b..4815a9e5ed 100644
--- a/options/license/SHL-2.1
+++ b/options/license/SHL-2.1
@@ -2,44 +2,44 @@ SOLDERPAD HARDWARE LICENSE VERSION 2.1
 
 This license operates as a wraparound license to the Apache License Version 2.0 (the "Apache License") and incorporates the terms and conditions of the Apache License (which can be found here: http://apache.org/licenses/LICENSE-2.0), with the following additions and modifications. It must be read in conjunction with the Apache License. Section 1 below modifies definitions and terminology in the Apache License and Section 2 below replaces Section 2 of the Apache License. The Appendix replaces the Appendix in the Apache License. You may, at your option, choose to treat any Work released under this license as released under the Apache License (thus ignoring all sections written below entirely).
 
-   1. Terminology in the Apache License is supplemented or modified as follows:
+1.	Terminology in the Apache License is supplemented or modified as follows:
 
-   "Authorship": any reference to 'authorship' shall be taken to read "authorship or design".
+"Authorship": any reference to 'authorship' shall be taken to read "authorship or design".
 
-   "Copyright owner": any reference to 'copyright owner' shall be taken to read "Rights owner".
+"Copyright owner": any reference to 'copyright owner' shall be taken to read "Rights owner".
 
-   "Copyright statement": the reference to 'copyright statement' shall be taken to read 'copyright or other statement pertaining to Rights'
+"Copyright statement": the reference to 'copyright statement' shall be taken to read 'copyright or other statement pertaining to Rights'
 
-   The following new definition shall be added to the Definitions section of the Apache License:
+The following new definition shall be added to the Definitions section of the Apache License:
 
-   "Rights" means copyright and any similar right including design right (whether registered or unregistered), rights in semiconductor topographies (mask works) and database rights (but excluding Patents and Trademarks).
+"Rights" means copyright and any similar right including design right (whether registered or unregistered), rights in semiconductor topographies (mask works) and database rights (but excluding Patents and Trademarks).
 
-   The following definitions shall replace the corresponding definitions in the Apache License:
+The following definitions shall replace the corresponding definitions in the Apache License:
 
-   "License" shall mean this Solderpad Hardware License version 2.1, being the terms and conditions for use, manufacture, instantiation, adaptation, reproduction, and distribution as defined by Sections 1 through 9 of this document.
+"License" shall mean this Solderpad Hardware License version 2.1, being the terms and conditions for use, manufacture, instantiation, adaptation, reproduction, and distribution as defined by Sections 1 through 9 of this document.
 
-   "Licensor" shall mean the Rights owner or entity authorized by the Rights owner that is granting the License.
+"Licensor" shall mean the Rights owner or entity authorized by the Rights owner that is granting the License.
+ 
+"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 or design. For the purposes of this License, Derivative Works shall not include works that remain reversibly separable from, or merely link (or bind by name) or physically connect to or interoperate with the Work and Derivative Works thereof.
 
-   "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 or design. For the purposes of this License, Derivative Works shall not include works that remain reversibly separable from, or merely link (or bind by name) or physically connect to or interoperate with the Work and Derivative Works thereof.
+"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form or the application of a Source form to physical material, including but not limited to compiled object code, generated documentation, the instantiation of a hardware design or physical object or material and conversions to other media types, including intermediate forms such as bytecodes, FPGA bitstreams, moulds, artwork and semiconductor topographies (mask works).
 
-   "Object" form shall mean any form resulting from mechanical transformation or translation of a Source form or the application of a Source form to physical material, including but not limited to compiled object code, generated documentation, the instantiation of a hardware design or physical object or material and conversions to other media types, including intermediate forms such as bytecodes, FPGA bitstreams, moulds, artwork and semiconductor topographies (mask works).
+"Source" form shall mean the preferred form for making modifications, including but not limited to source code, net lists, board layouts, CAD files, documentation source, and configuration files.
 
-   "Source" form shall mean the preferred form for making modifications, including but not limited to source code, net lists, board layouts, CAD files, documentation source, and configuration files.
+"Work" shall mean the work of authorship or design, whether in Source or Object form, made available under the License, as indicated by a notice relating to Rights that is included in or attached to the work (an example is provided in the Appendix below).
 
-   "Work" shall mean the work of authorship or design, whether in Source or Object form, made available under the License, as indicated by a notice relating to Rights that is included in or attached to the work (an example is provided in the Appendix below).
+2.	Grant of 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 license under the Rights to reproduce, prepare Derivative Works of, make, adapt, repair, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form and do anything in relation to the Work as if the Rights did not exist.
 
-   2. Grant of 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 license under the Rights to reproduce, prepare Derivative Works of, make, adapt, repair, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form and do anything in relation to the Work as if the Rights did not exist. APPENDIX
+
+APPENDIX
 
 Copyright [yyyy] [name of copyright owner]
-
 SPDX-License-Identifier: Apache-2.0 WITH SHL-2.1
 
 Licensed under the Solderpad Hardware License v 2.1 (the "License"); you may not use this file except in compliance with the License, or, at your option, the Apache License version 2.0.
-
 You may obtain a copy of the License at
 
 https://solderpad.org/licenses/SHL-2.1/
-
+   
 Unless required by applicable law or agreed to in writing, any work 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/options/license/SISSL b/options/license/SISSL
index 90acef9add..133a599155 100644
--- a/options/license/SISSL
+++ b/options/license/SISSL
@@ -1,6 +1,6 @@
 Sun Industry Standards Source License - Version 1.1
 
-   1.0 DEFINITIONS
+1.0 DEFINITIONS
 
 1.1 "Commercial Use" means distribution or otherwise making the Original Code
 available to a third party.
@@ -11,7 +11,7 @@ the Modifications made by that particular Contributor.
 1.3 "Electronic Distribution Mechanism" means a mechanism generally accepted
 in the software development community for the electronic transfer of data.
 
-      1.4 "Executable" means Original Code in any form other than Source Code.
+     1.4 "Executable" means Original Code in any form other than Source Code.
 
 1.5 "Initial Developer" means the individual or entity identified as the Initial
 Developer in the Source Code notice required by Exhibit A.
@@ -19,7 +19,7 @@ Developer in the Source Code notice required by Exhibit A.
 1.6 "Larger Work" means a work which combines Original Code or portions thereof
 with code not governed by the terms of this License.
 
-      1.7 "License" means this document.
+     1.7 "License" means this document.
 
 1.8 "Licensable" means having the right to grant, to the maximum extent possible,
 whether at the time of the initial grant or subsequently acquired, any and
@@ -46,7 +46,7 @@ modifications to it, including all modules it contains, plus any associated
 interface definition files, or scripts used to control compilation and installation
 of an Executable.
 
-      1.13 "Standards" means the standards identified in Exhibit B.
+     1.13 "Standards" means the standards identified in Exhibit B.
 
 1.14 "You" (or "Your") means an individual or a legal entity exercising rights
 under, and complying with all of the terms of, this License or a future version
@@ -57,11 +57,11 @@ or indirect, to cause the direction or management of such entity, whether
 by contract or otherwise, or (b) ownership of more than fifty percent (50%)
 of the outstanding shares or beneficial ownership of such entity.
 
-   2.0 SOURCE CODE LICENSE
+2.0 SOURCE CODE LICENSE
 
-2.1 The Initial Developer Grant The Initial Developer hereby grants You a
+2.1 The Initial Developer Grant  The Initial Developer hereby grants You a
 world-wide, royalty-free, non-exclusive license, subject to third party intellectual
-property claims:
+property claims: 
 
 (a) under intellectual property rights (other than patent or trademark) Licensable
 by Initial Developer to use, reproduce, modify, display, perform, sublicense
@@ -71,18 +71,16 @@ and/or as part of a Larger Work; and
 (b) under Patents Claims infringed by the making, using or selling of Original
 Code, to make, have made, use, practice, sell, and offer for sale, and/or
 otherwise dispose of the Original Code (or portions thereof).
-
 (c) the licenses granted in this Section 2.1(a) and (b) are effective on the
 date Initial Developer first distributes Original Code under the terms of
 this License.
-
 (d) Notwithstanding Section 2.1(b) above, no patent license is granted: 1)
 for code that You delete from the Original Code; 2) separate from the Original
 Code; or 3) for infringements caused by: i) the modification of the Original
 Code or ii) the combination of the Original Code with other software or devices,
-including but not limited to Modifications.
+including but not limited to Modifications. 
 
-   3.0 DISTRIBUTION OBLIGATIONS
+3.0 DISTRIBUTION OBLIGATIONS
 
 3.1 Application of License. The Source Code version of Original Code may be
 distributed only under the terms of this License or a future version of this
@@ -140,7 +138,7 @@ with other code not governed by the terms of this License and distribute the
 Larger Work as a single product. In such a case, You must make sure the requirements
 of this License are fulfilled for the Original Code.
 
-   4.0 INABILITY TO COMPLY DUE TO STATUTE OR REGULATION
+4.0 INABILITY TO COMPLY DUE TO STATUTE OR REGULATION
 
 If it is impossible for You to comply with any of the terms of this License
 with respect to some or all of the Original Code due to statute, judicial
@@ -152,12 +150,12 @@ Except to the extent prohibited by statute or regulation, such description
 must be sufficiently detailed for a recipient of ordinary skill to be able
 to understand it.
 
-   5.0 APPLICATION OF THIS LICENSE
+5.0 APPLICATION OF THIS LICENSE
 
 This License applies to code to which the Initial Developer has attached the
 notice in Exhibit A and to related Modifications as set out in Section 3.1.
 
-   6.0 VERSIONS OF THE LICENSE
+6.0 VERSIONS OF THE LICENSE
 
 6.1 New Versions. Sun may publish revised and/or new versions of the License
 from time to time. Each version will be given a distinguishing version number.
@@ -168,7 +166,7 @@ the terms of that version. You may also choose to use such Original Code under
 the terms of any subsequent version of the License published by Sun. No one
 other than Sun has the right to modify the terms applicable to Original Code.
 
-   7.0 DISCLAIMER OF WARRANTY
+7.0 DISCLAIMER OF WARRANTY
 
 ORIGINAL CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT
 WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION,
@@ -180,7 +178,7 @@ COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF
 WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY ORIGINAL
 CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
 
-   8.0 TERMINATION
+8.0 TERMINATION
 
 8.1 This License and the rights granted hereunder will terminate automatically
 if You fail to comply with terms herein and fail to cure such breach within
@@ -194,7 +192,7 @@ agreements (excluding distributors and resellers) which have been validly
 granted by You or any distributor hereunder prior to termination shall survive
 termination.
 
-   9.0 LIMIT OF LIABILITY
+9.0 LIMIT OF LIABILITY
 
 UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING
 NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER, ANY
@@ -210,7 +208,7 @@ SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL
 OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO
 YOU.
 
-   10.0 U.S. GOVERNMENT END USERS
+10.0 U.S. GOVERNMENT END USERS
 
 U.S. Government: If this Software is being acquired by or on behalf of the
 U.S. Government or by a U.S. Government prime contractor or subcontractor
@@ -219,7 +217,7 @@ documentation shall be only as set forth in this license; this is in accordance
 with 48 C.F.R. 227.7201 through 227.7202-4 (for Department of Defense (DoD)
 acquisitions) and with 48 C.F.R. 2.101 and 12.212 (for non-DoD acquisitions).
 
-   11.0 MISCELLANEOUS
+11.0 MISCELLANEOUS
 
 This License represents the complete agreement concerning subject matter hereof.
 If any provision of this License is held to be unenforceable, such provision
@@ -235,23 +233,23 @@ responsible for costs, including without limitation, court costs and reasonable
 attorneys' fees and expenses. The application of the United Nations Convention
 on Contracts for the International Sale of Goods is expressly excluded. Any
 law or regulation which provides that the language of a contract shall be
-construed against the drafter shall not apply to this License. EXHIBIT A -
-Sun Standards License
+construed against the drafter shall not apply to this License.
+
+EXHIBIT A - Sun Standards License
 
 "The contents of this file are subject to the Sun Standards License Version
-1.1 (the "License"); You may not use this file except in compliance with the
-License. You may obtain a copy of the License at _______________________________
-.
-
-Software distributed under the License is distributed on an "AS IS" basis,
-WITHOUT WARRANTY OF ANY KIND, either
+1.1 (the "License"); You may not use this file except in compliance with the License.
+You may obtain a copy of the License at _______________________________.
 
+Software distributed under the License is distributed on an "AS IS" basis,
+WITHOUT WARRANTY OF ANY KIND, either 
 express or implied. See the License for the specific language governing rights
 and limitations under the License.
 
-The Original Code is ______________________________________ .
+The Original Code is ______________________________________.
 
-The Initial Developer of the Original Code is: Sun Microsystems, Inc. .
+The Initial Developer of the Original Code is: 
+Sun Microsystems, Inc..
 
 Portions created by: _______________________________________
 
@@ -260,13 +258,9 @@ are Copyright (C): _______________________________________
 All Rights Reserved.
 
 Contributor(s): _______________________________________
-
 EXHIBIT B - Standards
 
 The Standard is defined as the following:
-
 OpenOffice.org XML File Format Specification, located at http://xml.openoffice.org
-
 OpenOffice.org Application Programming Interface Specification, located at
-
 http://api.openoffice.org
diff --git a/options/license/SISSL-1.2 b/options/license/SISSL-1.2
index f08ce325db..6b6ddea917 100644
--- a/options/license/SISSL-1.2
+++ b/options/license/SISSL-1.2
@@ -1,10 +1,6 @@
-
-
 SUN INDUSTRY STANDARDS SOURCE LICENSE
-
 Version 1.2
-
-   1.0 DEFINITIONS
+1.0 DEFINITIONS
 
 1.1 Commercial Use means distribution or otherwise making the Original Code
 available to a third party.
@@ -15,7 +11,7 @@ Modifications made by that particular Contributor.
 1.3 Electronic Distribution Mechanism means a mechanism generally accepted
 in the software development community for the electronic transfer of data.
 
-      1.4 Executable means Original Code in any form other than Source Code.
+     1.4 Executable means Original Code in any form other than Source Code.
 
 1.5 Initial Developer means the individual or entity identified as the Initial
 Developer in the Source Code notice required by Exhibit A.
@@ -23,7 +19,7 @@ Developer in the Source Code notice required by Exhibit A.
 1.6 Larger Work means a work which combines Original Code or portions thereof
 with code not governed by the terms of this License.
 
-      1.7 License means this document.
+     1.7 License means this document.
 
 1.8 Licensable means having the right to grant, to the maximum extent possible,
 whether at the time of the initial grant or subsequently acquired, any and
@@ -50,7 +46,7 @@ modifications to it, including all modules it contains, plus any associated
 interface definition files, or scripts used to control compilation and installation
 of an Executable.
 
-      1.13 Standards means the standards identified in Exhibit B.
+     1.13 Standards means the standards identified in Exhibit B.
 
 1.14 You (or Your) means an individual or a legal entity exercising rights
 under, and complying with all of the terms of, this License or a future version
@@ -61,14 +57,12 @@ or indirect, to cause the direction or management of such entity, whether
 by contract or otherwise, or (b) ownership of more than fifty percent (50%)
 of the outstanding shares or beneficial ownership of such entity.
 
-   2.0 SOURCE CODE LICENSE
+2.0 SOURCE CODE LICENSE
 
 2.1 The Initial Developer Grant The Initial Developer hereby grants You a
 world-wide, royalty-free, non-exclusive license, subject to third party intellectual
 property claims:
 
-         
-
 (a)under intellectual property rights (other than patent or trademark) Licensable
 by Initial Developer to use, reproduce, modify, display, perform, sublicense
 and distribute the Original Code (or portions thereof) with or without Modifications,
@@ -88,7 +82,7 @@ Code; or 3) for infringements caused by: i) the modification of the Original
 Code or ii) the combination of the Original Code with other software or devices,
 including but not limited to Modifications.
 
-   3.0 DISTRIBUTION OBLIGATIONS
+3.0 DISTRIBUTION OBLIGATIONS
 
 3.1 Application of License. The Source Code version of Original Code may be
 distributed only under the terms of this License or a future version of this
@@ -149,7 +143,7 @@ with other code not governed by the terms of this License and distribute the
 Larger Work as a single product. In such a case, You must make sure the requirements
 of this License are fulfilled for the Original Code.
 
-   4.0 INABILITY TO COMPLY DUE TO STATUTE OR REGULATION
+4.0 INABILITY TO COMPLY DUE TO STATUTE OR REGULATION
 
 If it is impossible for You to comply with any of the terms of this License
 with respect to some or all of the Original Code due to statute, judicial
@@ -161,12 +155,12 @@ Except to the extent prohibited by statute or regulation, such description
 must be sufficiently detailed for a recipient of ordinary skill to be able
 to understand it.
 
-   5.0 APPLICATION OF THIS LICENSE
+5.0 APPLICATION OF THIS LICENSE
 
 This License applies to code to which the Initial Developer has attached the
 notice in Exhibit A and to related Modifications as set out in Section 3.1.
 
-   6.0 VERSIONS OF THE LICENSE
+6.0 VERSIONS OF THE LICENSE
 
 6.1 New Versions. Sun may publish revised and/or new versions of the License
 from time to time. Each version will be given a distinguishing version number.
@@ -177,7 +171,7 @@ the terms of that version. You may also choose to use such Original Code under
 the terms of any subsequent version of the License published by Sun. No one
 other than Sun has the right to modify the terms applicable to Original Code.
 
-   7.0 DISCLAIMER OF WARRANTY
+7.0 DISCLAIMER OF WARRANTY
 
 ORIGINAL CODE IS PROVIDED UNDER THIS LICENSE ON AN AS IS BASIS, WITHOUT WARRANTY
 OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES
@@ -189,7 +183,7 @@ SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN
 ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY ORIGINAL CODE IS AUTHORIZED
 HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
 
-   8.0 TERMINATION
+8.0 TERMINATION
 
 8.1 This License and the rights granted hereunder will terminate automatically
 if You fail to comply with terms herein and fail to cure such breach within
@@ -199,26 +193,25 @@ Provisions which, by their nature, must remain in effect beyond the termination
 of this License shall survive. 8.2 In the event of termination under Section
 8.1 above, all end user license agreements (excluding distributors and resellers)
 which have been validly granted by You or any distributor hereunder prior
-to termination shall survive termination. EXHIBIT A - Sun Industry Standards
-Source License
+to termination shall survive termination.
+
+
+EXHIBIT A - Sun Industry Standards Source License
 
 "The contents of this file are subject to the Sun Industry Standards Source
 License Version 1.2 (the License); You
-
 may not use this file except in compliance with the License."
 
 "You may obtain a copy of the License at gridengine.sunsource.net/license.html"
 
 "Software distributed under the License is distributed on an AS IS basis,
 WITHOUT WARRANTY OF ANY KIND, either express or
-
 implied. See the License for the specific language governing rights and limitations
 under the License."
 
 "The Original Code is Grid Engine."
 
 "The Initial Developer of the Original Code is:
-
 Sun Microsystems, Inc."
 
 "Portions created by: Sun Microsystems, Inc. are Copyright (C) 2001 Sun Microsystems,
@@ -226,7 +219,7 @@ Inc."
 
 "All Rights Reserved."
 
-"Contributor(s): __________________________________"
+"Contributor(s):__________________________________"
 
 EXHIBIT B - Standards
 
diff --git a/options/license/SMLNJ b/options/license/SMLNJ
index 307e2cc364..866a77ebb6 100644
--- a/options/license/SMLNJ
+++ b/options/license/SMLNJ
@@ -1,7 +1,7 @@
-STANDARD ML OF NEW JERSEY COPYRIGHT NOTICE, LICENSE AND DISCLAIMER. Copyright
-(c) 2001-2011 by The Fellowship of SML/NJ
+STANDARD ML OF NEW JERSEY COPYRIGHT NOTICE, LICENSE AND DISCLAIMER.
 
-Copyright (c) 1989-2001 by Lucent Technologies
+Copyright (c) 2001-2011 by The Fellowship of SML/NJ Copyright (c) 1989-2001
+by Lucent Technologies
 
 Permission to use, copy, modify, and distribute this software and its documentation
 for any purpose and without fee is hereby granted, provided that the above
diff --git a/options/license/SMPPL b/options/license/SMPPL
index 071d456412..ca1f5cf5cc 100644
--- a/options/license/SMPPL
+++ b/options/license/SMPPL
@@ -50,13 +50,14 @@ The U.S. Government cannot be held liable for any damages either directly
 or indirectly caused by the use of the SMP Software.
 
 It is not permitted to copy, sublicense, distribute or transfer any of the
-SMP Software except as expressly indicated herein. Any attempts to do otherwise
+SMP Software except as expressly indicated herein.  Any attempts to do otherwise
 will be considered a violation of this License and your rights to the SMP
 Software will be voided.
 
 The SMP uses the Enhanced SNACC (eSNACC) Abstract Syntax Notation One (ASN.1)
-C++ Library to ASN.1 encode and decode security-related data objects. The
+C++ Library to ASN.1 encode and decode security-related data objects.  The
 eSNACC ASN.1 C++ Library is covered by the ENHANCED SNACC SOFTWARE PUBLIC
-LICENSE. None of the GNU public licenses apply to the eSNACC ASN.1 C++ Library.
-The eSNACC Compiler is not distributed as part of the SMP. Copyright © 1997-2002
-National Security Agency
+LICENSE.  None of the GNU public licenses apply to the eSNACC ASN.1 C++ Library.
+The eSNACC Compiler is not distributed as part of the SMP.
+
+Copyright © 1997-2002 National Security Agency
diff --git a/options/license/SNIA b/options/license/SNIA
index 227182eee1..914612d2ed 100644
--- a/options/license/SNIA
+++ b/options/license/SNIA
@@ -1,10 +1,8 @@
 STORAGE NETWORKING INDUSTRY ASSOCIATION
-
 PUBLIC LICENSE
-
 Version 1.1
 
-   1. Definitions.
+1. Definitions.
 
 1.1 "Commercial Use" means distribution or otherwise making the Covered Code
 available to a third party.
@@ -22,7 +20,7 @@ of the Original Code and Modifications, in each case including portions thereof.
 1.5 "Electronic Distribution Mechanism" means a mechanism generally accepted
 in the software development community for the electronic transfer of data.
 
-   1.6 "Executable" means Covered Code in any form other than Source Code.
+1.6 "Executable" means Covered Code in any form other than Source Code.
 
 1.7 "Initial Developer" means the individual or entity identified as the Initial
 Developer in the Source Code notice required by Exhibit A.
@@ -30,7 +28,7 @@ Developer in the Source Code notice required by Exhibit A.
 1.8 "Larger Work" means a work which combines Covered Code or portions thereof
 with code not governed by the terms of this License.
 
-   1.9 "License" means this document.
+1.9 "License" means this document.
 
 1.10 "Licensable" means having the right to grant, to the maximum extent possible,
 whether at the time of the initial grant or subsequently acquired, any and
@@ -39,10 +37,8 @@ all of the rights conveyed herein.
 1.11 "Modifications" means any addition to or deletion from the substance
 or structure of either the Original Code or any previous Modifications. When
 Covered Code is released as a series of files, a Modification is:
-
 A. Any addition to or deletion from the contents of a file containing Original
 Code or previous Modifications.
-
 B. Any new file that contains any part of the Original Code or previous Modifications.
 
 1.12 "Original Code" means Source Code of computer software code which is
@@ -72,25 +68,21 @@ or indirect, to cause the direction or management of such entity, whether
 by contract or otherwise, or (b) ownership of more than fifty percent (50%)
 of the outstanding shares or beneficial ownership of such entity
 
-   2. Source Code License.
+2. Source Code License.
 
 2.1 The Initial Developer Grant. The Initial Developer hereby grants You a
 world-wide, royalty-free, non-exclusive license, subject to third party intellectual
 property claims:
-
 (a) under intellectual property rights (other than patent or trademark) Licensable
 by Initial Developer to use, reproduce, modify, display, perform, sublicense
 and distribute the Original Code (or portions thereof) with or without Modifications,
 and/or as part of a Larger Work; and
-
 (b) under Patents Claims infringed by the making, using or selling of Original
 Code, to make, have made, use, practice, sell, and offer for sale, and/or
 otherwise dispose of the Original Code (or portions thereof).
-
 (c) the licenses granted in this Section 2.1(a) and (b) are effective on the
 date Initial Developer first distributes Original Code under the terms of
 this License.
-
 (d) Notwithstanding Section 2.1(b) above, no patent license is granted: 1)
 for code that You delete from the Original Code; 2) separate from the Original
 Code; or 3) for infringements caused by: i) the modification of the Original
@@ -99,23 +91,19 @@ Code or ii) the combination of the Original Code with other software or devices.
 2.2 Contributor Grant. Subject to third party intellectual property claims,
 each Contributor hereby grants You a world-wide, royalty-free, non-exclusive
 license
-
 (a) under intellectual property rights (other than patent or trademark) Licensable
 by Contributor, to use, reproduce, modify, display, perform, sublicense and
 distribute the Modifications created by such Contributor (or portions thereof)
 either on an unmodified basis, with other Modifications, as Covered Code and/or
 as part of a Larger Work; and
-
 (b) under Patent Claims infringed by the making, using, or selling of Modifications
 made by that Contributor either alone and/or in combination with its Contributor
 Version (or portions of such combination), to make, use, sell, offer for sale,
 have made, and/or otherwise dispose of: 1) Modifications made by that Contributor
 (or portions thereof); and 2) the combination of Modifications made by that
 Contributor with its Contributor Version (or portions of such combination).
-
 (c) the licenses granted in Sections 2.2(a) and 2.2(b) are effective on the
 date Contributor first makes Commercial Use of the Covered Code.
-
 (d) Notwithstanding Section 2.2(b) above, no patent license is granted: 1)
 for any code that Contributor has deleted from the Contributor Version; 2)
 separate from the Contributor Version; 3) for infringements caused by: i)
@@ -124,7 +112,7 @@ Modifications made by that Contributor with other software (except as part
 of the Contributor Version) or other devices; or 4) under Patent Claims infringed
 by Covered Code in the absence of Modifications made by that Contributor.
 
-   3. Distribution Obligations.
+3. Distribution Obligations.
 
 3.1 Application of License. The Modifications which You create or to which
 You contribute are governed by the terms of this License, including without
@@ -157,8 +145,7 @@ Developer in (a) the Source Code, and (b) in any notice in an Executable version
 or related documentation in which You describe the origin or ownership of
 the Covered Code.
 
-   3.4 Intellectual Property Matters.
-
+3.4 Intellectual Property Matters.
 (a) Third Party Claims. If Contributor has actual knowledge that a license
 under a third party's intellectual property rights is required to exercise
 the rights granted by such Contributor under Sections 2.1 or 2.2, Contributor
@@ -168,12 +155,10 @@ that a recipient will know whom to contact. If Contributor obtains such knowledg
 after the Modification is made available as described in Section 3.2, Contributor
 shall promptly modify the LEGAL file in all copies Contributor makes available
 thereafter.
-
 (b) Contributor API's. If Contributor's Modifications include an application
 programming interface and Contributor has actual knowledge of patent licenses
 which are reasonably necessary to implement that API, Contributor must also
 include this information in the LEGAL file.
-
 (c) Representations. Contributor represents that, except as disclosed pursuant
 to Section 3.4(a) above, Contributor believes that Contributor's Modifications
 are Contributor's original creation(s) and/or Contributor has sufficient rights
@@ -238,7 +223,7 @@ detailed for a recipient of ordinary skill to be able to understand it.
 Initial Developer has attached the notice in Exhibit A and to related Covered
 Code.
 
-   6. Versions of the License.
+6. Versions of the License.
 
 6.1 New Versions. The Storage Networking Industry Association (the "SNIA")
 may publish revised and/or new versions of the License from time to time.
@@ -273,7 +258,7 @@ SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN
 ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER
 EXCEPT UNDER THIS DISCLAIMER.
 
-   8. TERMINATION.
+8. TERMINATION.
 
 8.1 This License and the rights granted hereunder will terminate automatically
 if You fail to comply with terms herein and fail to cure such breach within
@@ -356,7 +341,9 @@ of this License or the alternative licenses, if any, specified by the Initial
 Developer in the file described in Exhibit A.
 
 14. ACCEPTANCE. This License is accepted by You if You retain, use, or distribute
-the Covered Code for any purpose. EXHIBIT A The SNIA Public License.
+the Covered Code for any purpose.
+
+EXHIBIT A The SNIA Public License.
 
 The contents of this file are subject to the SNIA Public License Version 1.0
 (the "License"); you may not use this file except in compliance with the License.
diff --git a/options/license/SPL-1.0 b/options/license/SPL-1.0
index e5f988dc12..916fe96772 100644
--- a/options/license/SPL-1.0
+++ b/options/license/SPL-1.0
@@ -1,6 +1,6 @@
 SUN PUBLIC LICENSE Version 1.0
 
-   1. Definitions.
+1. Definitions.
 
 1.0.1. "Commercial Use" means distribution or otherwise making the Covered
 Code available to a third party.
@@ -19,7 +19,7 @@ and corresponding documentation released with the source code.
 1.4. "Electronic Distribution Mechanism" means a mechanism generally accepted
 in the software development community for the electronic transfer of data.
 
-      1.5. "Executable" means Covered Code in any form other than Source Code.
+     1.5. "Executable" means Covered Code in any form other than Source Code.
 
 1.6. "Initial Developer" means the individual or entity identified as the
 Initial Developer in the Source Code notice required by Exhibit A.
@@ -27,7 +27,7 @@ Initial Developer in the Source Code notice required by Exhibit A.
 1.7. "Larger Work" means a work which combines Covered Code or portions thereof
 with code not governed by the terms of this License.
 
-      1.8. "License" means this document.
+     1.8. "License" means this document.
 
 1.8.1. "Licensable" means having the right to grant, to the maximum extent
 possible, whether at the time of the initial grant or subsequently acquired,
@@ -69,11 +69,11 @@ or indirect, to cause the direction or management of such entity, whether
 by contract or otherwise, or (b) ownership of more than fifty percent (50%)
 of the outstanding shares or beneficial ownership of such entity.
 
-   2. Source Code License.
+2. Source Code License.
 
-2.1 The Initial Developer Grant. The Initial Developer hereby grants You a
-world-wide, royalty-free, non-exclusive license, subject to third party intellectual
-property claims:
+2.1 The Initial Developer Grant.  The Initial Developer hereby grants You
+a world-wide, royalty-free, non-exclusive license, subject to third party
+intellectual property claims:
 
 (a) under intellectual property rights (other than patent or trademark) Licensable
 by Initial Developer to use, reproduce, modify, display, perform, sublicense
@@ -92,11 +92,11 @@ this License.
 for code that You delete from the Original Code; 2) separate from the Original
 Code; or 3) for infringements caused by:
 
-            i) the modification of the Original Code or
+               i) the modification of the Original Code or
 
 ii) the combination of the Original Code with other software or devices.
 
-2.2. Contributor Grant. Subject to third party intellectual property claims,
+2.2. Contributor Grant.  Subject to third party intellectual property claims,
 each Contributor hereby grants You a world-wide, royalty-free, non-exclusive
 license
 
@@ -124,7 +124,7 @@ Modifications made by that Contributor with other software (except as part
 of the Contributor Version) or other devices; or 4) under Patent Claims infringed
 by Covered Code in the absence of Modifications made by that Contributor.
 
-   3. Distribution Obligations.
+3. Distribution Obligations.
 
 3.1. Application of License. The Modifications which You create or to which
 You contribute are governed by the terms of this License, including without
@@ -157,7 +157,7 @@ Developer in (a) the Source Code, and (b) in any notice in an Executable version
 or related documentation in which You describe the origin or ownership of
 the Covered Code.
 
-      3.4. Intellectual Property Matters.
+     3.4. Intellectual Property Matters.
 
 (a) Third Party Claims. If Contributor has knowledge that a license under
 a third party's intellectual property rights is required to exercise the rights
@@ -223,7 +223,7 @@ with other code not governed by the terms of this License and distribute the
 Larger Work as a single product. In such a case, You must make sure the requirements
 of this License are fulfilled for the Covered Code.
 
-   4. Inability to Comply Due to Statute or Regulation.
+4. Inability to Comply Due to Statute or Regulation.
 
 If it is impossible for You to comply with any of the terms of this License
 with respect to some or all of the Covered Code due to statute, judicial order,
@@ -235,12 +235,12 @@ Except to the extent prohibited by statute or regulation, such description
 must be sufficiently detailed for a recipient of ordinary skill to be able
 to understand it.
 
-   5. Application of this License.
+5. Application of this License.
 
 This License applies to code to which the Initial Developer has attached the
 notice in Exhibit A and to related Covered Code.
 
-   6. Versions of the License.
+6. Versions of the License.
 
 6.1. New Versions. Sun Microsystems, Inc. ("Sun") may publish revised and/or
 new versions of the License from time to time. Each version will be given
@@ -264,7 +264,7 @@ in the name of the Initial Developer, Original Code or Contributor in the
 notice described in Exhibit A shall not of themselves be deemed to be modifications
 of this License.)
 
-   7. DISCLAIMER OF WARRANTY.
+7. DISCLAIMER OF WARRANTY.
 
 COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "../AS IS'' BASIS, WITHOUT
 WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION,
@@ -276,7 +276,7 @@ ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIME
 OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED
 CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
 
-   8. TERMINATION.
+8. TERMINATION.
 
 8.1. This License and the rights granted hereunder will terminate automatically
 if You fail to comply with terms herein and fail to cure such breach within
@@ -322,7 +322,7 @@ user license agreements (excluding distributors and resellers) which have
 been validly granted by You or any distributor hereunder prior to termination
 shall survive termination.
 
-   9. LIMITATION OF LIABILITY.
+9. LIMITATION OF LIABILITY.
 
 UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING
 NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER, ANY
@@ -338,7 +338,7 @@ SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL
 OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO
 YOU.
 
-   10. U.S. GOVERNMENT END USERS.
+10. U.S. GOVERNMENT END USERS.
 
 The Covered Code is a "commercial item," as that term is defined in 48 C.F.R.
 2.101 (Oct. 1995), consisting of "commercial computer software" and "commercial
@@ -347,7 +347,7 @@ computer software documentation,"../ as such terms are used in 48 C.F.R. 12.212
 227.7202-4 (June 1995), all U.S. Government End Users acquire Covered Code
 with only those rights set forth herein.
 
-   11. MISCELLANEOUS.
+11. MISCELLANEOUS.
 
 This License represents the complete agreement concerning subject matter hereof.
 If any provision of this License is held to be unenforceable, such provision
@@ -365,7 +365,7 @@ on Contracts for the International Sale of Goods is expressly excluded. Any
 law or regulation which provides that the language of a contract shall be
 construed against the drafter shall not apply to this License.
 
-   12. RESPONSIBILITY FOR CLAIMS.
+12. RESPONSIBILITY FOR CLAIMS.
 
 As between Initial Developer and the Contributors, each party is responsible
 for claims and damages arising, directly or indirectly, out of its utilization
@@ -374,35 +374,35 @@ and Contributors to distribute such responsibility on an equitable basis.
 Nothing herein is intended or shall be deemed to constitute any admission
 of liability.
 
-   13. MULTIPLE-LICENSED CODE.
+13. MULTIPLE-LICENSED CODE.
 
 Initial Developer may designate portions of the Covered Code as ?Multiple-Licensed?.
 ?Multiple-Licensed? means that the Initial Developer permits you to utilize
 portions of the Covered Code under Your choice of the alternative licenses,
 if any, specified by the Initial Developer in the file described in Exhibit
-A. Exhibit A -Sun Public License Notice.
+A.
+
+Exhibit A -Sun Public License Notice.
 
 The contents of this file are subject to the Sun Public License Version 1.0
 (the License); you may not use this file except in compliance with the License.
 A copy of the License is available at http://www.sun.com/
 
-The Original Code is _________________ . The Initial Developer of the Original
-Code is ___________ . Portions created by ______ are Copyright (C) _________
-. All Rights Reserved.
+The Original Code is _________________. The Initial Developer of the  Original
+Code is ___________. Portions created by ______ are Copyright (C)_________.
+All Rights Reserved.
 
-Contributor(s): ______________________________________ .
+Contributor(s): ______________________________________.
 
 Alternatively, the contents of this file may be used under the terms of the
-_____ license (the ?[___] License? ), in which case the provisions of [______]
+_____ license (the ?[___] License?), in which case the provisions of [______]
 License are applicable instead of those above. If you wish to allow use of
 your version of this file only under the terms of the [____] License and not
 to allow others to use your version of this file under the SPL, indicate your
 decision by deleting the provisions above and replace them with the notice
 and other provisions required by the [___] License. If you do not delete the
 provisions above, a recipient may use your version of this file under either
-the SPL or the [___] License.
-
-[NOTE: The text of this Exhibit A may differ slightly from the text of the
-notices in the Source Code files of the Original Code. You should use the
-text of this Exhibit A rather than the text found in the Original Code Source
-Code for Your Modifications.]
+the SPL or the [___] License. [NOTE: The text of this Exhibit A may differ
+slightly from the text of the notices in the Source Code files of the Original
+Code. You should use the text of this Exhibit A rather than the text found
+in the Original Code Source Code for Your Modifications.]
diff --git a/options/license/SSH-OpenSSH b/options/license/SSH-OpenSSH
index 2d67608ee7..35a5c8c829 100644
--- a/options/license/SSH-OpenSSH
+++ b/options/license/SSH-OpenSSH
@@ -1,73 +1,67 @@
-Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland All rights
-reserved
-
-As far as I am concerned, the code I have written for this software can be
-used freely for any purpose. Any derived versions of this software must be
-clearly marked as such, and if the derived work is incompatible with the protocol
-description in the RFC file, it must be called by a name other than "ssh"
-or "Secure Shell".
+* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
+*                    All rights reserved
+*
+* As far as I am concerned, the code I have written for this software
+* can be used freely for any purpose.  Any derived versions of this
+* software must be clearly marked as such, and if the derived work is
+* incompatible with the protocol description in the RFC file, it must be
+* called by a name other than "ssh" or "Secure Shell".
 
 [Tatu continues]
+*  However, I am not implying to give any licenses to any patents or
+* copyrights held by third parties, and the software includes parts that
+* are not under my direct control.  As far as I know, all included
+* source code is used in accordance with the relevant license agreements
+* and can be used freely for any purpose (the GNU license being the most
+* restrictive); see below for details.
 
-However, I am not implying to give any licenses to any patents or copyrights
-held by third parties, and the software includes parts that are not under
-my direct control. As far as I know, all included source code is used in accordance
-with the relevant license agreements and can be used freely for any purpose
-(the GNU license being the most restrictive); see below for details.
+[However, none of that term is relevant at this point in time.  All of
+these restrictively licenced software components which he talks about
+have been removed from OpenSSH, i.e.,
 
-[However, none of that term is relevant at this point in time. All of these
-restrictively licenced software components which he talks about have been
-removed from OpenSSH, i.e.,
-
-   - RSA is no longer included, found in the OpenSSL library
-
-   - IDEA is no longer included, its use is deprecated
-
-   - DES is now external, in the OpenSSL library
-
-   - GMP is no longer used, and instead we call BN code from OpenSSL
-
-   - Zlib is now external, in a library
-
-   - The make-ssh-known-hosts script is no longer included
-
-   - TSS has been removed
-
-   - MD5 is now external, in the OpenSSL library
-
-   - RC4 support has been replaced with ARC4 support from OpenSSL
-
-   - Blowfish is now external, in the OpenSSL library
+- RSA is no longer included, found in the OpenSSL library
+- IDEA is no longer included, its use is deprecated
+- DES is now external, in the OpenSSL library
+- GMP is no longer used, and instead we call BN code from OpenSSL
+- Zlib is now external, in a library
+- The make-ssh-known-hosts script is no longer included
+- TSS has been removed
+- MD5 is now external, in the OpenSSL library
+- RC4 support has been replaced with ARC4 support from OpenSSL
+- Blowfish is now external, in the OpenSSL library
 
 [The licence continues]
 
-Note that any information and cryptographic algorithms used in this software
-are publicly available on the Internet and at any major bookstore, scientific
-library, and patent office worldwide. More information can be found e.g. at
-"http://www.cs.hut.fi/crypto".
+Note that any information and cryptographic algorithms used in this
+software are publicly available on the Internet and at any major
+bookstore, scientific library, and patent office worldwide.  More
+information can be found e.g. at "http://www.cs.hut.fi/crypto".
 
-The legal status of this program is some combination of all these permissions
-and restrictions. Use only at your own responsibility. You will be responsible
-for any legal consequences yourself; I am not making any claims whether possessing
-or using this is legal or not in your country, and I am not taking any responsibility
-on your behalf.
+The legal status of this program is some combination of all these
+permissions and restrictions.  Use only at your own responsibility.
+You will be responsible for any legal consequences yourself; I am not
+making any claims whether possessing or using this is legal or not in
+your country, and I am not taking any responsibility on your behalf.
 
-NO WARRANTY
 
-BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE
-PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE
-STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM
-"AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE
-OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+        NO WARRANTY
 
-IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL
-ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE
-OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA
-OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES
-OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH
-HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
diff --git a/options/license/SSH-short b/options/license/SSH-short
index 611dc07fca..bf6f8a0e62 100644
--- a/options/license/SSH-short
+++ b/options/license/SSH-short
@@ -1,5 +1,5 @@
-As far as I am concerned, the code I have written for this software can be
-used freely for any purpose. Any derived versions of this software must be
-clearly marked as such, and if the derived work is incompatible with the protocol
-description in the RFC file, it must be called by a name other than "ssh"
-or "Secure Shell".
+As far as I am concerned, the code I have written for this software
+can be used freely for any purpose.  Any derived versions of this
+software must be clearly marked as such, and if the derived work is
+incompatible with the protocol description in the RFC file, it must be
+called by a name other than "ssh" or "Secure Shell".
diff --git a/options/license/SSPL-1.0 b/options/license/SSPL-1.0
index 18f817a89a..9a6e8df221 100644
--- a/options/license/SSPL-1.0
+++ b/options/license/SSPL-1.0
@@ -1,522 +1,558 @@
-Server Side Public License
-
-VERSION 1, OCTOBER 16, 2018
-
-Copyright © 2018 MongoDB, Inc.
-
-Everyone is permitted to copy and distribute verbatim copies of this license
-document, but changing it is not allowed.
-
-TERMS AND CONDITIONS
-
-   0. Definitions.
-
-   "This License" refers to Server Side Public License.
-
-"Copyright" also means copyright-like laws that apply to other kinds of works,
-such as semiconductor masks.
-
-"The Program" refers to any copyrightable work licensed under this License.
-Each licensee is addressed as "you". "Licensees" and "recipients" may be individuals
-or organizations.
-
-To "modify" a work means to copy from or adapt all or part of the work in
-a fashion requiring copyright permission, other than the making of an exact
-copy. The resulting work is called a "modified version" of the earlier work
-or a work "based on" the earlier work.
-
-A "covered work" means either the unmodified Program or a work based on the
-Program.
-
-To "propagate" a work means to do anything with it that, without permission,
-would make you directly or secondarily liable for infringement under applicable
-copyright law, except executing it on a computer or modifying a private copy.
-Propagation includes copying, distribution (with or without modification),
-making available to the public, and in some countries other activities as
-well.
-
-To "convey" a work means any kind of propagation that enables other parties
-to make or receive copies. Mere interaction with a user through a computer
-network, with no transfer of a copy, is not conveying.
-
-An interactive user interface displays "Appropriate Legal Notices" to the
-extent that it includes a convenient and prominently visible feature that
-(1) displays an appropriate copyright notice, and (2) tells the user that
-there is no warranty for the work (except to the extent that warranties are
-provided), that licensees may convey the work under this License, and how
-to view a copy of this License. If the interface presents a list of user commands
-or options, such as a menu, a prominent item in the list meets this criterion.
-
-   1. Source Code.
-
-The "source code" for a work means the preferred form of the work for making
-modifications to it. "Object code" means any non-source form of a work.
-
-A "Standard Interface" means an interface that either is an official standard
-defined by a recognized standards body, or, in the case of interfaces specified
-for a particular programming language, one that is widely used among developers
-working in that language.
-
-The "System Libraries" of an executable work include anything, other than
-the work as a whole, that (a) is included in the normal form of packaging
-a Major Component, but which is not part of that Major Component, and (b)
-serves only to enable use of the work with that Major Component, or to implement
-a Standard Interface for which an implementation is available to the public
-in source code form. A "Major Component", in this context, means a major essential
-component (kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to produce
-the work, or an object code interpreter used to run it.
-
-The "Corresponding Source" for a work in object code form means all the source
-code needed to generate, install, and (for an executable work) run the object
-code and to modify the work, including scripts to control those activities.
-However, it does not include the work's System Libraries, or general-purpose
-tools or generally available free programs which are used unmodified in performing
-those activities but which are not part of the work. For example, Corresponding
-Source includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically linked
-subprograms that the work is specifically designed to require, such as by
-intimate data communication or control flow between those subprograms and
-other parts of the work.
-
-The Corresponding Source need not include anything that users can regenerate
-automatically from other parts of the Corresponding Source.
-
-   The Corresponding Source for a work in source code form is that same work.
-
-   2. Basic Permissions.
-
-All rights granted under this License are granted for the term of copyright
-on the Program, and are irrevocable provided the stated conditions are met.
-This License explicitly affirms your unlimited permission to run the unmodified
-Program, subject to section 13. The output from running a covered work is
-covered by this License only if the output, given its content, constitutes
-a covered work. This License acknowledges your rights of fair use or other
-equivalent, as provided by copyright law.
-
-Subject to section 13, you may make, run and propagate covered works that
-you do not convey, without conditions so long as your license otherwise remains
-in force. You may convey covered works to others for the sole purpose of having
-them make modifications exclusively for you, or provide you with facilities
-for running those works, provided that you comply with the terms of this License
-in conveying all material for which you do not control copyright. Those thus
-making or running the covered works for you must do so exclusively on your
-behalf, under your direction and control, on terms that prohibit them from
-making any copies of your copyrighted material outside their relationship
-with you.
-
-Conveying under any other circumstances is permitted solely under the conditions
-stated below. Sublicensing is not allowed; section 10 makes it unnecessary.
-
-   3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-No covered work shall be deemed part of an effective technological measure
-under any applicable law fulfilling obligations under article 11 of the WIPO
-copyright treaty adopted on 20 December 1996, or similar laws prohibiting
-or restricting circumvention of such measures.
-
-When you convey a covered work, you waive any legal power to forbid circumvention
-of technological measures to the extent such circumvention is effected by
-exercising rights under this License with respect to the covered work, and
-you disclaim any intention to limit operation or modification of the work
-as a means of enforcing, against the work's users, your or third parties'
-legal rights to forbid circumvention of technological measures.
-
-   4. Conveying Verbatim Copies.
-
-You may convey verbatim copies of the Program's source code as you receive
-it, in any medium, provided that you conspicuously and appropriately publish
-on each copy an appropriate copyright notice; keep intact all notices stating
-that this License and any non-permissive terms added in accord with section
-7 apply to the code; keep intact all notices of the absence of any warranty;
-and give all recipients a copy of this License along with the Program.
-
-You may charge any price or no price for each copy that you convey, and you
-may offer support or warranty protection for a fee.
-
-   5. Conveying Modified Source Versions.
-
-You may convey a work based on the Program, or the modifications to produce
-it from the Program, in the form of source code under the terms of section
-4, provided that you also meet all of these conditions:
-
-a) The work must carry prominent notices stating that you modified it, and
-giving a relevant date.
-
-b) The work must carry prominent notices stating that it is released under
-this License and any conditions added under section 7. This requirement modifies
-the requirement in section 4 to "keep intact all notices".
-
-c) You must license the entire work, as a whole, under this License to anyone
-who comes into possession of a copy. This License will therefore apply, along
-with any applicable section 7 additional terms, to the whole of the work,
-and all its parts, regardless of how they are packaged. This License gives
-no permission to license the work in any other way, but it does not invalidate
-such permission if you have separately received it.
-
-d) If the work has interactive user interfaces, each must display Appropriate
-Legal Notices; however, if the Program has interactive interfaces that do
-not display Appropriate Legal Notices, your work need not make them do so.
-
-A compilation of a covered work with other separate and independent works,
-which are not by their nature extensions of the covered work, and which are
-not combined with it such as to form a larger program, in or on a volume of
-a storage or distribution medium, is called an "aggregate" if the compilation
-and its resulting copyright are not used to limit the access or legal rights
-of the compilation's users beyond what the individual works permit. Inclusion
-of a covered work in an aggregate does not cause this License to apply to
-the other parts of the aggregate.
-
-   6. Conveying Non-Source Forms.
-
-You may convey a covered work in object code form under the terms of sections
-4 and 5, provided that you also convey the machine-readable Corresponding
-Source under the terms of this License, in one of these ways:
-
-a) Convey the object code in, or embodied in, a physical product (including
-a physical distribution medium), accompanied by the Corresponding Source fixed
-on a durable physical medium customarily used for software interchange.
-
-b) Convey the object code in, or embodied in, a physical product (including
-a physical distribution medium), accompanied by a written offer, valid for
-at least three years and valid for as long as you offer spare parts or customer
-support for that product model, to give anyone who possesses the object code
-either (1) a copy of the Corresponding Source for all the software in the
-product that is covered by this License, on a durable physical medium customarily
-used for software interchange, for a price no more than your reasonable cost
-of physically performing this conveying of source, or (2) access to copy the
-Corresponding Source from a network server at no charge.
-
-c) Convey individual copies of the object code with a copy of the written
-offer to provide the Corresponding Source. This alternative is allowed only
-occasionally and noncommercially, and only if you received the object code
-with such an offer, in accord with subsection 6b.
-
-d) Convey the object code by offering access from a designated place (gratis
-or for a charge), and offer equivalent access to the Corresponding Source
-in the same way through the same place at no further charge. You need not
-require recipients to copy the Corresponding Source along with the object
-code. If the place to copy the object code is a network server, the Corresponding
-Source may be on a different server (operated by you or a third party) that
-supports equivalent copying facilities, provided you maintain clear directions
-next to the object code saying where to find the Corresponding Source. Regardless
-of what server hosts the Corresponding Source, you remain obligated to ensure
-that it is available for as long as needed to satisfy these requirements.
-
-e) Convey the object code using peer-to-peer transmission, provided you inform
-other peers where the object code and Corresponding Source of the work are
-being offered to the general public at no charge under subsection 6d.
-
-A separable portion of the object code, whose source code is excluded from
-the Corresponding Source as a System Library, need not be included in conveying
-the object code work.
-
-A "User Product" is either (1) a "consumer product", which means any tangible
-personal property which is normally used for personal, family, or household
-purposes, or (2) anything designed or sold for incorporation into a dwelling.
-In determining whether a product is a consumer product, doubtful cases shall
-be resolved in favor of coverage. For a particular product received by a particular
-user, "normally used" refers to a typical or common use of that class of product,
-regardless of the status of the particular user or of the way in which the
-particular user actually uses, or expects or is expected to use, the product.
-A product is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent the
-only significant mode of use of the product.
-
-"Installation Information" for a User Product means any methods, procedures,
-authorization keys, or other information required to install and execute modified
-versions of a covered work in that User Product from a modified version of
-its Corresponding Source. The information must suffice to ensure that the
-continued functioning of the modified object code is in no case prevented
-or interfered with solely because modification has been made.
-
-If you convey an object code work under this section in, or with, or specifically
-for use in, a User Product, and the conveying occurs as part of a transaction
-in which the right of possession and use of the User Product is transferred
-to the recipient in perpetuity or for a fixed term (regardless of how the
-transaction is characterized), the Corresponding Source conveyed under this
-section must be accompanied by the Installation Information. But this requirement
-does not apply if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has been installed
-in ROM).
-
-The requirement to provide Installation Information does not include a requirement
-to continue to provide support service, warranty, or updates for a work that
-has been modified or installed by the recipient, or for the User Product in
-which it has been modified or installed. Access to a network may be denied
-when the modification itself materially and adversely affects the operation
-of the network or violates the rules and protocols for communication across
-the network.
-
-Corresponding Source conveyed, and Installation Information provided, in accord
-with this section must be in a format that is publicly documented (and with
-an implementation available to the public in source code form), and must require
-no special password or key for unpacking, reading or copying.
-
-   7. Additional Terms.
-
-"Additional permissions" are terms that supplement the terms of this License
-by making exceptions from one or more of its conditions. Additional permissions
-that are applicable to the entire Program shall be treated as though they
-were included in this License, to the extent that they are valid under applicable
-law. If additional permissions apply only to part of the Program, that part
-may be used separately under those permissions, but the entire Program remains
-governed by this License without regard to the additional permissions.
-
-When you convey a copy of a covered work, you may at your option remove any
-additional permissions from that copy, or from any part of it. (Additional
-permissions may be written to require their own removal in certain cases when
-you modify the work.) You may place additional permissions on material, added
-by you to a covered work, for which you have or can give appropriate copyright
-permission.
-
-Notwithstanding any other provision of this License, for material you add
-to a covered work, you may (if authorized by the copyright holders of that
-material) supplement the terms of this License with terms:
-
-a) Disclaiming warranty or limiting liability differently from the terms of
-sections 15 and 16 of this License; or
-
-b) Requiring preservation of specified reasonable legal notices or author
-attributions in that material or in the Appropriate Legal Notices displayed
-by works containing it; or
-
-c) Prohibiting misrepresentation of the origin of that material, or requiring
-that modified versions of such material be marked in reasonable ways as different
-from the original version; or
-
-d) Limiting the use for publicity purposes of names of licensors or authors
-of the material; or
-
-e) Declining to grant rights under trademark law for use of some trade names,
-trademarks, or service marks; or
-
-f) Requiring indemnification of licensors and authors of that material by
-anyone who conveys the material (or modified versions of it) with contractual
-assumptions of liability to the recipient, for any liability that these contractual
-assumptions directly impose on those licensors and authors.
-
-All other non-permissive additional terms are considered "further restrictions"
-within the meaning of section 10. If the Program as you received it, or any
-part of it, contains a notice stating that it is governed by this License
-along with a term that is a further restriction, you may remove that term.
-If a license document contains a further restriction but permits relicensing
-or conveying under this License, you may add to a covered work material governed
-by the terms of that license document, provided that the further restriction
-does not survive such relicensing or conveying.
-
-If you add terms to a covered work in accord with this section, you must place,
-in the relevant source files, a statement of the additional terms that apply
-to those files, or a notice indicating where to find the applicable terms.
-
-Additional terms, permissive or non-permissive, may be stated in the form
-of a separately written license, or stated as exceptions; the above requirements
-apply either way.
-
-   8. Termination.
-
-You may not propagate or modify a covered work except as expressly provided
-under this License. Any attempt otherwise to propagate or modify it is void,
-and will automatically terminate your rights under this License (including
-any patent licenses granted under the third paragraph of section 11).
-
-However, if you cease all violation of this License, then your license from
-a particular copyright holder is reinstated (a) provisionally, unless and
-until the copyright holder explicitly and finally terminates your license,
-and (b) permanently, if the copyright holder fails to notify you of the violation
-by some reasonable means prior to 60 days after the cessation.
-
-Moreover, your license from a particular copyright holder is reinstated permanently
-if the copyright holder notifies you of the violation by some reasonable means,
-this is the first time you have received notice of violation of this License
-(for any work) from that copyright holder, and you cure the violation prior
-to 30 days after your receipt of the notice.
-
-Termination of your rights under this section does not terminate the licenses
-of parties who have received copies or rights from you under this License.
-If your rights have been terminated and not permanently reinstated, you do
-not qualify to receive new licenses for the same material under section 10.
-
-   9. Acceptance Not Required for Having Copies.
-
-You are not required to accept this License in order to receive or run a copy
-of the Program. Ancillary propagation of a covered work occurring solely as
-a consequence of using peer-to-peer transmission to receive a copy likewise
-does not require acceptance. However, nothing other than this License grants
-you permission to propagate or modify any covered work. These actions infringe
-copyright if you do not accept this License. Therefore, by modifying or propagating
-a covered work, you indicate your acceptance of this License to do so.
-
-   10. Automatic Licensing of Downstream Recipients.
-
-Each time you convey a covered work, the recipient automatically receives
-a license from the original licensors, to run, modify and propagate that work,
-subject to this License. You are not responsible for enforcing compliance
-by third parties with this License.
-
-An "entity transaction" is a transaction transferring control of an organization,
-or substantially all assets of one, or subdividing an organization, or merging
-organizations. If propagation of a covered work results from an entity transaction,
-each party to that transaction who receives a copy of the work also receives
-whatever licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the Corresponding
-Source of the work from the predecessor in interest, if the predecessor has
-it or can get it with reasonable efforts.
-
-You may not impose any further restrictions on the exercise of the rights
-granted or affirmed under this License. For example, you may not impose a
-license fee, royalty, or other charge for exercise of rights granted under
-this License, and you may not initiate litigation (including a cross-claim
-or counterclaim in a lawsuit) alleging that any patent claim is infringed
-by making, using, selling, offering for sale, or importing the Program or
-any portion of it.
-
-   11. Patents.
-
-A "contributor" is a copyright holder who authorizes use under this License
-of the Program or a work on which the Program is based. The work thus licensed
-is called the contributor's "contributor version".
-
-A contributor's "essential patent claims" are all patent claims owned or controlled
-by the contributor, whether already acquired or hereafter acquired, that would
-be infringed by some manner, permitted by this License, of making, using,
-or selling its contributor version, but do not include claims that would be
-infringed only as a consequence of further modification of the contributor
-version. For purposes of this definition, "control" includes the right to
-grant patent sublicenses in a manner consistent with the requirements of this
-License.
-
-Each contributor grants you a non-exclusive, worldwide, royalty-free patent
-license under the contributor's essential patent claims, to make, use, sell,
-offer for sale, import and otherwise run, modify and propagate the contents
-of its contributor version.
-
-In the following three paragraphs, a "patent license" is any express agreement
-or commitment, however denominated, not to enforce a patent (such as an express
-permission to practice a patent or covenant not to sue for patent infringement).
-To "grant" such a patent license to a party means to make such an agreement
-or commitment not to enforce a patent against the party.
-
-If you convey a covered work, knowingly relying on a patent license, and the
-Corresponding Source of the work is not available for anyone to copy, free
-of charge and under the terms of this License, through a publicly available
-network server or other readily accessible means, then you must either (1)
-cause the Corresponding Source to be so available, or (2) arrange to deprive
-yourself of the benefit of the patent license for this particular work, or
-(3) arrange, in a manner consistent with the requirements of this License,
-to extend the patent license to downstream recipients. "Knowingly relying"
-means you have actual knowledge that, but for the patent license, your conveying
-the covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that country
-that you have reason to believe are valid.
-
-If, pursuant to or in connection with a single transaction or arrangement,
-you convey, or propagate by procuring conveyance of, a covered work, and grant
-a patent license to some of the parties receiving the covered work authorizing
-them to use, propagate, modify or convey a specific copy of the covered work,
-then the patent license you grant is automatically extended to all recipients
-of the covered work and works based on it.
-
-A patent license is "discriminatory" if it does not include within the scope
-of its coverage, prohibits the exercise of, or is conditioned on the non-exercise
-of one or more of the rights that are specifically granted under this License.
-You may not convey a covered work if you are a party to an arrangement with
-a third party that is in the business of distributing software, under which
-you make payment to the third party based on the extent of your activity of
-conveying the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory patent
-license (a) in connection with copies of the covered work conveyed by you
-(or copies made from those copies), or (b) primarily for and in connection
-with specific products or compilations that contain the covered work, unless
-you entered into that arrangement, or that patent license was granted, prior
-to 28 March 2007.
-
-Nothing in this License shall be construed as excluding or limiting any implied
-license or other defenses to infringement that may otherwise be available
-to you under applicable patent law.
-
-   12. No Surrender of Others' Freedom.
-
-If conditions are imposed on you (whether by court order, agreement or otherwise)
-that contradict the conditions of this License, they do not excuse you from
-the conditions of this License. If you cannot use, propagate or convey a covered
-work so as to satisfy simultaneously your obligations under this License and
-any other pertinent obligations, then as a consequence you may not use, propagate
-or convey it at all. For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey the
-Program, the only way you could satisfy both those terms and this License
-would be to refrain entirely from conveying the Program.
-
-   13. Offering the Program as a Service.
-
-If you make the functionality of the Program or a modified version available
-to third parties as a service, you must make the Service Source Code available
-via network download to everyone at no charge, under the terms of this License.
-Making the functionality of the Program or modified version available to third
-parties as a service includes, without limitation, enabling third parties
-to interact with the functionality of the Program or modified version remotely
-through a computer network, offering a service the value of which entirely
-or primarily derives from the value of the Program or modified version, or
-offering a service that accomplishes for users the primary purpose of the
-Program or modified version.
-
-"Service Source Code" means the Corresponding Source for the Program or the
-modified version, and the Corresponding Source for all programs that you use
-to make the Program or modified version available as a service, including,
-without limitation, management software, user interfaces, application program
-interfaces, automation software, monitoring software, backup software, storage
-software and hosting software, all such that a user could run an instance
-of the service using the Service Source Code you make available.
-
-   14. Revised Versions of this License.
-
-MongoDB, Inc. may publish revised and/or new versions of the Server Side Public
-License from time to time. Such new versions will be similar in spirit to
-the present version, but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Program specifies
-that a certain numbered version of the Server Side Public License "or any
-later version" applies to it, you have the option of following the terms and
-conditions either of that numbered version or of any later version published
-by MongoDB, Inc. If the Program does not specify a version number of the Server
-Side Public License, you may choose any version ever published by MongoDB,
-Inc.
-
-If the Program specifies that a proxy can decide which future versions of
-the Server Side Public License can be used, that proxy's public statement
-of acceptance of a version permanently authorizes you to choose that version
-for the Program.
-
-Later license versions may give you additional or different permissions. However,
-no additional obligations are imposed on any author or copyright holder as
-a result of your choosing to follow a later version.
-
-   15. Disclaimer of Warranty.
-
-THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE
-LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER
-EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM
-PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR
-CORRECTION.
-
-   16. Limitation of Liability.
-
-IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL
-ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS THE PROGRAM
-AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL,
-INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO
-USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED
-INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE
-PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER
-PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-   17. Interpretation of Sections 15 and 16.
-
-If the disclaimer of warranty and limitation of liability provided above cannot
-be given local legal effect according to their terms, reviewing courts shall
-apply local law that most closely approximates an absolute waiver of all civil
-liability in connection with the Program, unless a warranty or assumption
-of liability accompanies a copy of the Program in return for a fee.
+                     Server Side Public License
+                     VERSION 1, OCTOBER 16, 2018
+
+                    Copyright © 2018 MongoDB, Inc.
+
+  Everyone is permitted to copy and distribute verbatim copies of this
+  license document, but changing it is not allowed.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+  
+  “This License” refers to Server Side Public License.
+
+  “Copyright” also means copyright-like laws that apply to other kinds of
+  works, such as semiconductor masks.
+
+  “The Program” refers to any copyrightable work licensed under this
+  License.  Each licensee is addressed as “you”. “Licensees” and
+  “recipients” may be individuals or organizations.
+
+  To “modify” a work means to copy from or adapt all or part of the work in
+  a fashion requiring copyright permission, other than the making of an
+  exact copy. The resulting work is called a “modified version” of the
+  earlier work or a work “based on” the earlier work.
+
+  A “covered work” means either the unmodified Program or a work based on
+  the Program.
+
+  To “propagate” a work means to do anything with it that, without
+  permission, would make you directly or secondarily liable for
+  infringement under applicable copyright law, except executing it on a
+  computer or modifying a private copy. Propagation includes copying,
+  distribution (with or without modification), making available to the
+  public, and in some countries other activities as well.
+
+  To “convey” a work means any kind of propagation that enables other
+  parties to make or receive copies. Mere interaction with a user through a
+  computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays “Appropriate Legal Notices” to the
+  extent that it includes a convenient and prominently visible feature that
+  (1) displays an appropriate copyright notice, and (2) tells the user that
+  there is no warranty for the work (except to the extent that warranties
+  are provided), that licensees may convey the work under this License, and
+  how to view a copy of this License. If the interface presents a list of
+  user commands or options, such as a menu, a prominent item in the list
+  meets this criterion.
+
+  1. Source Code.
+
+  The “source code” for a work means the preferred form of the work for
+  making modifications to it. “Object code” means any non-source form of a
+  work.
+
+  A “Standard Interface” means an interface that either is an official
+  standard defined by a recognized standards body, or, in the case of
+  interfaces specified for a particular programming language, one that is
+  widely used among developers working in that language.  The “System
+  Libraries” of an executable work include anything, other than the work as
+  a whole, that (a) is included in the normal form of packaging a Major
+  Component, but which is not part of that Major Component, and (b) serves
+  only to enable use of the work with that Major Component, or to implement
+  a Standard Interface for which an implementation is available to the
+  public in source code form. A “Major Component”, in this context, means a
+  major essential component (kernel, window system, and so on) of the
+  specific operating system (if any) on which the executable work runs, or
+  a compiler used to produce the work, or an object code interpreter used
+  to run it.
+
+  The “Corresponding Source” for a work in object code form means all the
+  source code needed to generate, install, and (for an executable work) run
+  the object code and to modify the work, including scripts to control
+  those activities. However, it does not include the work's System
+  Libraries, or general-purpose tools or generally available free programs
+  which are used unmodified in performing those activities but which are
+  not part of the work. For example, Corresponding Source includes
+  interface definition files associated with source files for the work, and
+  the source code for shared libraries and dynamically linked subprograms
+  that the work is specifically designed to require, such as by intimate
+  data communication or control flow between those subprograms and other
+  parts of the work.
+
+  The Corresponding Source need not include anything that users can
+  regenerate automatically from other parts of the Corresponding Source.
+
+  The Corresponding Source for a work in source code form is that same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+  copyright on the Program, and are irrevocable provided the stated
+  conditions are met. This License explicitly affirms your unlimited
+  permission to run the unmodified Program, subject to section 13. The
+  output from running a covered work is covered by this License only if the
+  output, given its content, constitutes a covered work. This License
+  acknowledges your rights of fair use or other equivalent, as provided by
+  copyright law.  Subject to section 13, you may make, run and propagate
+  covered works that you do not convey, without conditions so long as your
+  license otherwise remains in force. You may convey covered works to
+  others for the sole purpose of having them make modifications exclusively
+  for you, or provide you with facilities for running those works, provided
+  that you comply with the terms of this License in conveying all
+  material for which you do not control copyright. Those thus making or
+  running the covered works for you must do so exclusively on your
+  behalf, under your direction and control, on terms that prohibit them
+  from making any copies of your copyrighted material outside their
+  relationship with you.
+
+  Conveying under any other circumstances is permitted solely under the
+  conditions stated below. Sublicensing is not allowed; section 10 makes it
+  unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+  measure under any applicable law fulfilling obligations under article 11
+  of the WIPO copyright treaty adopted on 20 December 1996, or similar laws
+  prohibiting or restricting circumvention of such measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+  circumvention of technological measures to the extent such circumvention is
+  effected by exercising rights under this License with respect to the
+  covered work, and you disclaim any intention to limit operation or
+  modification of the work as a means of enforcing, against the work's users,
+  your or third parties' legal rights to forbid circumvention of
+  technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+  receive it, in any medium, provided that you conspicuously and
+  appropriately publish on each copy an appropriate copyright notice; keep
+  intact all notices stating that this License and any non-permissive terms
+  added in accord with section 7 apply to the code; keep intact all notices
+  of the absence of any warranty; and give all recipients a copy of this
+  License along with the Program.  You may charge any price or no price for
+  each copy that you convey, and you may offer support or warranty
+  protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+  produce it from the Program, in the form of source code under the terms
+  of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified it,
+    and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is released
+    under this License and any conditions added under section 7. This
+    requirement modifies the requirement in section 4 to “keep intact all
+    notices”.
+
+    c) You must license the entire work, as a whole, under this License to
+    anyone who comes into possession of a copy. This License will therefore
+    apply, along with any applicable section 7 additional terms, to the
+    whole of the work, and all its parts, regardless of how they are
+    packaged. This License gives no permission to license the work in any
+    other way, but it does not invalidate such permission if you have
+    separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your work
+    need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+  works, which are not by their nature extensions of the covered work, and
+  which are not combined with it such as to form a larger program, in or on
+  a volume of a storage or distribution medium, is called an “aggregate” if
+  the compilation and its resulting copyright are not used to limit the
+  access or legal rights of the compilation's users beyond what the
+  individual works permit. Inclusion of a covered work in an aggregate does
+  not cause this License to apply to the other parts of the aggregate.
+  
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms of
+  sections 4 and 5, provided that you also convey the machine-readable
+  Corresponding Source under the terms of this License, in one of these
+  ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium customarily
+    used for software interchange.
+   
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a written
+    offer, valid for at least three years and valid for as long as you
+    offer spare parts or customer support for that product model, to give
+    anyone who possesses the object code either (1) a copy of the
+    Corresponding Source for all the software in the product that is
+    covered by this License, on a durable physical medium customarily used
+    for software interchange, for a price no more than your reasonable cost
+    of physically performing this conveying of source, or (2) access to
+    copy the Corresponding Source from a network server at no charge.
+   
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source. This alternative is
+    allowed only occasionally and noncommercially, and only if you received
+    the object code with such an offer, in accord with subsection 6b.
+   
+    d) Convey the object code by offering access from a designated place
+    (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge. You need not require recipients to copy the
+    Corresponding Source along with the object code. If the place to copy
+    the object code is a network server, the Corresponding Source may be on
+    a different server (operated by you or a third party) that supports
+    equivalent copying facilities, provided you maintain clear directions
+    next to the object code saying where to find the Corresponding Source.
+    Regardless of what server hosts the Corresponding Source, you remain
+    obligated to ensure that it is available for as long as needed to
+    satisfy these requirements.
+   
+    e) Convey the object code using peer-to-peer transmission, provided you
+    inform other peers where the object code and Corresponding Source of
+    the work are being offered to the general public at no charge under
+    subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+  from the Corresponding Source as a System Library, need not be included
+  in conveying the object code work.
+
+  A “User Product” is either (1) a “consumer product”, which means any
+  tangible personal property which is normally used for personal, family,
+  or household purposes, or (2) anything designed or sold for incorporation
+  into a dwelling. In determining whether a product is a consumer product,
+  doubtful cases shall be resolved in favor of coverage. For a particular
+  product received by a particular user, “normally used” refers to a
+  typical or common use of that class of product, regardless of the status
+  of the particular user or of the way in which the particular user
+  actually uses, or expects or is expected to use, the product. A product
+  is a consumer product regardless of whether the product has substantial
+  commercial, industrial or non-consumer uses, unless such uses represent
+  the only significant mode of use of the product.
+
+  “Installation Information” for a User Product means any methods,
+  procedures, authorization keys, or other information required to install
+  and execute modified versions of a covered work in that User Product from
+  a modified version of its Corresponding Source. The information must
+  suffice to ensure that the continued functioning of the modified object
+  code is in no case prevented or interfered with solely because
+  modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+  specifically for use in, a User Product, and the conveying occurs as part
+  of a transaction in which the right of possession and use of the User
+  Product is transferred to the recipient in perpetuity or for a fixed term
+  (regardless of how the transaction is characterized), the Corresponding
+  Source conveyed under this section must be accompanied by the
+  Installation Information. But this requirement does not apply if neither
+  you nor any third party retains the ability to install modified object
+  code on the User Product (for example, the work has been installed in
+  ROM).
+
+  The requirement to provide Installation Information does not include a
+  requirement to continue to provide support service, warranty, or updates
+  for a work that has been modified or installed by the recipient, or for
+  the User Product in which it has been modified or installed. Access
+  to a network may be denied when the modification itself materially
+  and adversely affects the operation of the network or violates the
+  rules and protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided, in
+  accord with this section must be in a format that is publicly documented
+  (and with an implementation available to the public in source code form),
+  and must require no special password or key for unpacking, reading or
+  copying.
+
+  7. Additional Terms.
+
+  “Additional permissions” are terms that supplement the terms of this
+  License by making exceptions from one or more of its conditions.
+  Additional permissions that are applicable to the entire Program shall be
+  treated as though they were included in this License, to the extent that
+  they are valid under applicable law. If additional permissions apply only
+  to part of the Program, that part may be used separately under those
+  permissions, but the entire Program remains governed by this License
+  without regard to the additional permissions.  When you convey a copy of
+  a covered work, you may at your option remove any additional permissions
+  from that copy, or from any part of it. (Additional permissions may be
+  written to require their own removal in certain cases when you modify the
+  work.) You may place additional permissions on material, added by you to
+  a covered work, for which you have or can give appropriate copyright
+  permission.
+
+  Notwithstanding any other provision of this License, for material you add
+  to a covered work, you may (if authorized by the copyright holders of
+  that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some trade
+    names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that material
+    by anyone who conveys the material (or modified versions of it) with
+    contractual assumptions of liability to the recipient, for any
+    liability that these contractual assumptions directly impose on those
+    licensors and authors.
+
+  All other non-permissive additional terms are considered “further
+  restrictions” within the meaning of section 10. If the Program as you
+  received it, or any part of it, contains a notice stating that it is
+  governed by this License along with a term that is a further restriction,
+  you may remove that term. If a license document contains a further
+  restriction but permits relicensing or conveying under this License, you
+  may add to a covered work material governed by the terms of that license
+  document, provided that the further restriction does not survive such
+  relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you must
+  place, in the relevant source files, a statement of the additional terms
+  that apply to those files, or a notice indicating where to find the
+  applicable terms.  Additional terms, permissive or non-permissive, may be
+  stated in the form of a separately written license, or stated as
+  exceptions; the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+  provided under this License. Any attempt otherwise to propagate or modify
+  it is void, and will automatically terminate your rights under this
+  License (including any patent licenses granted under the third paragraph
+  of section 11).
+
+  However, if you cease all violation of this License, then your license
+  from a particular copyright holder is reinstated (a) provisionally,
+  unless and until the copyright holder explicitly and finally terminates
+  your license, and (b) permanently, if the copyright holder fails to
+  notify you of the violation by some reasonable means prior to 60 days
+  after the cessation.
+
+  Moreover, your license from a particular copyright holder is reinstated
+  permanently if the copyright holder notifies you of the violation by some
+  reasonable means, this is the first time you have received notice of
+  violation of this License (for any work) from that copyright holder, and
+  you cure the violation prior to 30 days after your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+  licenses of parties who have received copies or rights from you under
+  this License. If your rights have been terminated and not permanently
+  reinstated, you do not qualify to receive new licenses for the same
+  material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or run a
+  copy of the Program. Ancillary propagation of a covered work occurring
+  solely as a consequence of using peer-to-peer transmission to receive a
+  copy likewise does not require acceptance. However, nothing other than
+  this License grants you permission to propagate or modify any covered
+  work. These actions infringe copyright if you do not accept this License.
+  Therefore, by modifying or propagating a covered work, you indicate your
+  acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically receives
+  a license from the original licensors, to run, modify and propagate that
+  work, subject to this License. You are not responsible for enforcing
+  compliance by third parties with this License.
+
+  An “entity transaction” is a transaction transferring control of an
+  organization, or substantially all assets of one, or subdividing an
+  organization, or merging organizations. If propagation of a covered work
+  results from an entity transaction, each party to that transaction who
+  receives a copy of the work also receives whatever licenses to the work
+  the party's predecessor in interest had or could give under the previous
+  paragraph, plus a right to possession of the Corresponding Source of the
+  work from the predecessor in interest, if the predecessor has it or can
+  get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the rights
+  granted or affirmed under this License. For example, you may not impose a
+  license fee, royalty, or other charge for exercise of rights granted
+  under this License, and you may not initiate litigation (including a
+  cross-claim or counterclaim in a lawsuit) alleging that any patent claim
+  is infringed by making, using, selling, offering for sale, or importing
+  the Program or any portion of it.
+
+  11. Patents.
+
+  A “contributor” is a copyright holder who authorizes use under this
+  License of the Program or a work on which the Program is based. The work
+  thus licensed is called the contributor's “contributor version”.
+
+  A contributor's “essential patent claims” are all patent claims owned or
+  controlled by the contributor, whether already acquired or hereafter
+  acquired, that would be infringed by some manner, permitted by this
+  License, of making, using, or selling its contributor version, but do not
+  include claims that would be infringed only as a consequence of further
+  modification of the contributor version. For purposes of this definition,
+  “control” includes the right to grant patent sublicenses in a manner
+  consistent with the requirements of this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+  patent license under the contributor's essential patent claims, to make,
+  use, sell, offer for sale, import and otherwise run, modify and propagate
+  the contents of its contributor version.
+
+  In the following three paragraphs, a “patent license” is any express
+  agreement or commitment, however denominated, not to enforce a patent
+  (such as an express permission to practice a patent or covenant not to
+  sue for patent infringement). To “grant” such a patent license to a party
+  means to make such an agreement or commitment not to enforce a patent
+  against the party.
+
+  If you convey a covered work, knowingly relying on a patent license, and
+  the Corresponding Source of the work is not available for anyone to copy,
+  free of charge and under the terms of this License, through a publicly
+  available network server or other readily accessible means, then you must
+  either (1) cause the Corresponding Source to be so available, or (2)
+  arrange to deprive yourself of the benefit of the patent license for this
+  particular work, or (3) arrange, in a manner consistent with the
+  requirements of this License, to extend the patent license to downstream
+  recipients. “Knowingly relying” means you have actual knowledge that, but
+  for the patent license, your conveying the covered work in a country, or
+  your recipient's use of the covered work in a country, would infringe
+  one or more identifiable patents in that country that you have reason
+  to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+  arrangement, you convey, or propagate by procuring conveyance of, a
+  covered work, and grant a patent license to some of the parties receiving
+  the covered work authorizing them to use, propagate, modify or convey a
+  specific copy of the covered work, then the patent license you grant is
+  automatically extended to all recipients of the covered work and works
+  based on it.
+
+  A patent license is “discriminatory” if it does not include within the
+  scope of its coverage, prohibits the exercise of, or is conditioned on
+  the non-exercise of one or more of the rights that are specifically
+  granted under this License. You may not convey a covered work if you are
+  a party to an arrangement with a third party that is in the business of
+  distributing software, under which you make payment to the third party
+  based on the extent of your activity of conveying the work, and under
+  which the third party grants, to any of the parties who would receive the
+  covered work from you, a discriminatory patent license (a) in connection
+  with copies of the covered work conveyed by you (or copies made from
+  those copies), or (b) primarily for and in connection with specific
+  products or compilations that contain the covered work, unless you
+  entered into that arrangement, or that patent license was granted, prior
+  to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting any
+  implied license or other defenses to infringement that may otherwise be
+  available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+  otherwise) that contradict the conditions of this License, they do not
+  excuse you from the conditions of this License. If you cannot use,
+  propagate or convey a covered work so as to satisfy simultaneously your
+  obligations under this License and any other pertinent obligations, then
+  as a consequence you may not use, propagate or convey it at all. For
+  example, if you agree to terms that obligate you to collect a royalty for
+  further conveying from those to whom you convey the Program, the only way
+  you could satisfy both those terms and this License would be to refrain
+  entirely from conveying the Program.
+
+  13. Offering the Program as a Service.
+
+  If you make the functionality of the Program or a modified version
+  available to third parties as a service, you must make the Service Source
+  Code available via network download to everyone at no charge, under the
+  terms of this License. Making the functionality of the Program or
+  modified version available to third parties as a service includes,
+  without limitation, enabling third parties to interact with the
+  functionality of the Program or modified version remotely through a
+  computer network, offering a service the value of which entirely or
+  primarily derives from the value of the Program or modified version, or
+  offering a service that accomplishes for users the primary purpose of the
+  Program or modified version.
+
+  “Service Source Code” means the Corresponding Source for the Program or
+  the modified version, and the Corresponding Source for all programs that
+  you use to make the Program or modified version available as a service,
+  including, without limitation, management software, user interfaces,
+  application program interfaces, automation software, monitoring software,
+  backup software, storage software and hosting software, all such that a
+  user could run an instance of the service using the Service Source Code
+  you make available.  
+
+  14. Revised Versions of this License.
+
+  MongoDB, Inc. may publish revised and/or new versions of the Server Side
+  Public License from time to time. Such new versions will be similar in
+  spirit to the present version, but may differ in detail to address new
+  problems or concerns.
+
+  Each version is given a distinguishing version number. If the Program
+  specifies that a certain numbered version of the Server Side Public
+  License “or any later version” applies to it, you have the option of
+  following the terms and conditions either of that numbered version or of
+  any later version published by MongoDB, Inc. If the Program does not
+  specify a version number of the Server Side Public License, you may
+  choose any version ever published by MongoDB, Inc.
+
+  If the Program specifies that a proxy can decide which future versions of
+  the Server Side Public License can be used, that proxy's public statement
+  of acceptance of a version permanently authorizes you to choose that
+  version for the Program.
+
+  Later license versions may give you additional or different permissions.
+However, no additional obligations are imposed on any author or copyright
+holder
+  as a result of your choosing to follow a later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS
+  AND/OR OTHER PARTIES PROVIDE THE PROGRAM “AS IS” WITHOUT WARRANTY
+  OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+  THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+  PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+  IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+  ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+  
+  16. Limitation of Liability.
+  
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+  WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+  THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING
+  ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF
+  THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO
+  LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU
+  OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+  PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+  POSSIBILITY OF SUCH DAMAGES.
+  
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided above
+  cannot be given local legal effect according to their terms, reviewing
+  courts shall apply local law that most closely approximates an absolute
+  waiver of all civil liability in connection with the Program, unless a
+  warranty or assumption of liability accompanies a copy of the Program in
+  return for a fee.
+  
+                        END OF TERMS AND CONDITIONS
diff --git a/options/license/Saxpath b/options/license/Saxpath
index b6d7fc521e..46bdaa8dd2 100644
--- a/options/license/Saxpath
+++ b/options/license/Saxpath
@@ -1,41 +1,39 @@
 Copyright (C) 2000-2002 werken digital.
-
 All rights reserved.
 
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
+Redistribution and use in source and binary forms, with or without  modification,
+are permitted provided that the following conditions  are met:
 
-1. Redistributions of source code must retain the above copyright notice,
+1. Redistributions of source code must retain the above copyright  notice,
 this list of conditions, and the following disclaimer.
 
-2. Redistributions in binary form must reproduce the above copyright notice,
-this list of conditions, and the disclaimer that follows these conditions
-in the documentation and/or other materials provided with the distribution.
+2. Redistributions in binary form must reproduce the above copyright  notice,
+this list of conditions, and the disclaimer that follows  these conditions
+in the documentation and/or other materials  provided with the distribution.
 
-3. The name "SAXPath" must not be used to endorse or promote products derived
-from this software without prior written permission. For written permission,
+3. The name "SAXPath" must not be used to endorse or promote products  derived
+from this software without prior written permission. For  written permission,
 please contact license@saxpath.org.
 
-4. Products derived from this software may not be called "SAXPath", nor may
-"SAXPath" appear in their name, without prior written permission from the
+4. Products derived from this software may not be called "SAXPath", nor  may
+"SAXPath" appear in their name, without prior written permission  from the
 SAXPath Project Management (pm@saxpath.org).
 
-In addition, we request (but do not require) that you include in the end-user
-documentation provided with the redistribution and/or in the software itself
+In addition, we request (but do not require) that you include in the  end-user
+documentation provided with the redistribution and/or in the  software itself
 an acknowledgement equivalent to the following:
+"This product includes software developed by the  SAXPath Project (http://www.saxpath.org/)."
 
-"This product includes software developed by the SAXPath Project (http://www.saxpath.org/)."
-
-Alternatively, the acknowledgment may be graphical using the logos available
+Alternatively, the acknowledgment may be graphical using the logos  available
 at http://www.saxpath.org/
 
-THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE SAXPath
-AUTHORS OR THE PROJECT CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
-IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED  WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES  OF MERCHANTABILITY
+AND FITNESS FOR A PARTICULAR PURPOSE ARE  DISCLAIMED. IN NO EVENT SHALL THE
+SAXPath AUTHORS OR THE PROJECT  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL,  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF  USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND  ON ANY THEORY
+OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,  OR TORT (INCLUDING NEGLIGENCE
+OR OTHERWISE) ARISING IN ANY WAY OUT  OF THE USE OF THIS SOFTWARE, EVEN IF
+ADVISED OF THE POSSIBILITY OF  SUCH DAMAGE.
diff --git a/options/license/Sendmail b/options/license/Sendmail
index 8be73d9c6d..e8879b9150 100644
--- a/options/license/Sendmail
+++ b/options/license/Sendmail
@@ -1,7 +1,8 @@
-SENDMAIL LICENSE The following license terms and conditions apply, unless
-a redistribution agreement or other license is obtained from Sendmail, Inc.,
-6475 Christie Ave, Third Floor, Emeryville, CA 94608, USA, or by electronic
-mail at license@sendmail.com.
+SENDMAIL LICENSE
+
+The following license terms and conditions apply, unless a redistribution
+agreement or other license is obtained from Sendmail, Inc., 6475 Christie
+Ave, Third Floor, Emeryville, CA 94608, USA, or by electronic mail at license@sendmail.com.
 
 License Terms:
 
@@ -32,8 +33,7 @@ license terms, and the disclaimer/limitation of liability set forth as paragraph
 6 below, in the documentation and/or other materials provided with the distribution.
 For the purposes of binary distribution the "Copyright Notice" refers to the
 following language:
-
-   "Copyright (c) 1998-2010 Sendmail, Inc. All rights reserved."
+"Copyright (c) 1998-2010 Sendmail, Inc. All rights reserved."
 
 4. Neither the name of Sendmail, Inc. nor the University of California nor
 names of their contributors may be used to endorse or promote products derived
@@ -71,5 +71,6 @@ ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
 LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
 ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. $Revision: 8.16
-$, Last updated $Date: 2010/10/25 23:11:19 $, Document 139848.1
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+$Revision: 8.16 $, Last updated $Date: 2010/10/25 23:11:19 $, Document 139848.1
diff --git a/options/license/Sendmail-8.23 b/options/license/Sendmail-8.23
index 03dfde9894..910da0b7f4 100644
--- a/options/license/Sendmail-8.23
+++ b/options/license/Sendmail-8.23
@@ -1,6 +1,8 @@
-SENDMAIL LICENSE The following license terms and conditions apply, unless
-a redistribution agreement or other license is obtained from Proofpoint, Inc.,
-892 Ross Street, Sunnyvale, CA, 94089, USA, or by electronic mail at sendmail-license@proofpoint.com.
+SENDMAIL LICENSE
+
+The following license terms and conditions apply, unless a redistribution
+agreement or other license is obtained from Proofpoint, Inc., 892 Ross Street,
+Sunnyvale, CA, 94089, USA, or by electronic mail at sendmail-license@proofpoint.com.
 
 License Terms:
 
@@ -32,8 +34,7 @@ license terms, and the disclaimer/limitation of liability set forth as paragraph
 6 below, in the documentation and/or other materials provided with the distribution.
 For the purposes of binary distribution the "Copyright Notice" refers to the
 following language:
-
-   "Copyright (c) 1998-2014 Proofpoint, Inc. All rights reserved."
+"Copyright (c) 1998-2014 Proofpoint, Inc. All rights reserved."
 
 4. Neither the name of Proofpoint, Inc. nor the University of California nor
 names of their contributors may be used to endorse or promote products derived
@@ -71,5 +72,6 @@ ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
 LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
 ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. $Revision: 8.23
-$, Last updated $Date: 2014-01-26 20:10:01 $, Document 139848.1
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+$Revision: 8.23 $, Last updated $Date: 2014-01-26 20:10:01 $, Document 139848.1
diff --git a/options/license/SimPL-2.0 b/options/license/SimPL-2.0
index 3f5d0a8aec..df84c12d00 100644
--- a/options/license/SimPL-2.0
+++ b/options/license/SimPL-2.0
@@ -1,10 +1,14 @@
-Simple Public License (SimPL) Preamble
+Simple Public License (SimPL)
+
+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
+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
+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
@@ -12,32 +16,25 @@ 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.
+- 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;
-
+- Prominently noting the date of any changes you make;
 - Leaving other people's copyright notices, warranty disclaimers, and license
-terms in place;
-
+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.
+- 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;
-
+- 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
@@ -49,14 +46,13 @@ 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
+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").
diff --git a/options/license/Sleepycat b/options/license/Sleepycat
index bc10a6b606..e8b5054dc2 100644
--- a/options/license/Sleepycat
+++ b/options/license/Sleepycat
@@ -30,8 +30,11 @@ BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
 OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
 OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Copyright (c) 1990, 1993, 1994,
-1995 The Regents of the University of California. All rights reserved.
+ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+Copyright (c) 1990, 1993, 1994, 1995 The Regents of the University of California.
+All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
 are permitted provided that the following conditions are met:
@@ -56,8 +59,11 @@ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
 OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
 LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
 OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Copyright (c) 1995, 1996 The President
-and Fellows of Harvard University. All rights reserved.
+ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+Copyright (c) 1995, 1996 The President and Fellows of Harvard University.
+All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
 are permitted provided that the following conditions are met:
diff --git a/options/license/Spencer-86 b/options/license/Spencer-86
index 779571a687..796831731a 100644
--- a/options/license/Spencer-86
+++ b/options/license/Spencer-86
@@ -12,3 +12,7 @@ claim or by omission.
 
 3. Altered versions must be plainly marked as such, and must not be misrepresented
 as being the original software.
+
+Beware that some of this code is subtly aware of the way operator precedence
+is structured in regular expressions. Serious changes in regular-expression
+syntax might require a total rethink.
diff --git a/options/license/Spencer-94 b/options/license/Spencer-94
index 40733d2e91..7629a691bf 100644
--- a/options/license/Spencer-94
+++ b/options/license/Spencer-94
@@ -1,5 +1,4 @@
-Copyright 1992, 1993, 1994 Henry Spencer. All rights reserved.
-
+Copyright 1992, 1993, 1994 Henry Spencer.  All rights reserved.
 This software is not subject to any license of the American Telephone and
 Telegraph Company or of the Regents of the University of California.
 
@@ -11,11 +10,11 @@ restrictions:
 no matter how awful, even if they arise from flaws in it.
 
 2. The origin of this software must not be misrepresented, either by explicit
-claim or by omission. Since few users ever read sources, credits must appear
+claim or by omission.  Since few users ever read sources, credits must appear
 in the documentation.
 
 3. Altered versions must be plainly marked as such, and must not be misrepresented
-as being the original software. Since few users ever read sources, credits
+as being the original software.  Since few users ever read sources, credits
 must appear in the documentation.
 
-   4. This notice may not be removed or altered.
+4. This notice may not be removed or altered.
diff --git a/options/license/SugarCRM-1.1.3 b/options/license/SugarCRM-1.1.3
index 713c950743..9864670643 100644
--- a/options/license/SugarCRM-1.1.3
+++ b/options/license/SugarCRM-1.1.3
@@ -1,5 +1,7 @@
-SUGARCRM PUBLIC LICENSE Applies to Sugar Open Source Edition v1 through v4.
-Please note that these releases are no longer supported or distributed.
+SUGARCRM PUBLIC LICENSE
+
+Applies to Sugar Open Source Edition v1 through v4. Please note that these
+releases are no longer supported or distributed.
 
 Version 1.1.3
 
@@ -8,7 +10,7 @@ License Version 1.1, modified to be specific to SugarCRM, with the Additional
 Terms in Exhibit B. The original Mozilla Public License 1.1 can be found at:
 http://www.mozilla.org/MPL/MPL-1.1.html
 
-   1. Definitions.
+1. Definitions.
 
 1.1. "Contributor" means each entity that creates or contributes to the creation
 of Modifications.
@@ -23,7 +25,7 @@ of the Original Code and Modifications, in each case including portions thereof.
 1.4. "Electronic Distribution Mechanism" means a mechanism generally accepted
 in the software development community for the electronic transfer of data.
 
-      1.5. "Executable" means Covered Code in any form other than Source Code.
+     1.5. "Executable" means Covered Code in any form other than Source Code.
 
 1.6. "Initial Developer" means the individual or entity identified as the
 Initial Developer in the Source Code notice required by Exhibit A.
@@ -31,7 +33,7 @@ Initial Developer in the Source Code notice required by Exhibit A.
 1.7. "Larger Work" means a work which combines Covered Code or portions thereof
 with code not governed by the terms of this License.
 
-      1.8. "License" means this document.
+     1.8. "License" means this document.
 
 1.8.1. "Licensable" means having the right to grant, to the maximum extent
 possible, whether at the time of the initial grant or subsequently acquired,
@@ -73,10 +75,9 @@ or indirect, to cause the direction or management of such entity, whether
 by contract or otherwise, or (b) ownership of more than fifty percent (50%)
 of the outstanding shares or beneficial ownership of such entity.
 
-   2. Source Code License.
-
-      2.2. Contributor Grant.
+2. Source Code License.
 
+     2.2. Contributor Grant.
 Subject to third party intellectual property claims, each Contributor hereby
 grants You a world-wide, royalty-free, non-exclusive license
 
@@ -104,7 +105,7 @@ distribute the Modifications created by such Contributor (or portions thereof)
 either on an unmodified basis, with other Modifications, as Covered Code and/or
 as part of a Larger Work; and
 
-   3. Distribution Obligations.
+3. Distribution Obligations.
 
 3.2. Availability of Source Code. Any Modification which You create or to
 which You contribute must be made available in Source Code form under the
@@ -126,7 +127,7 @@ Developer in (a) the Source Code, and (b) in any notice in an Executable version
 or related documentation in which You describe the origin or ownership of
 the Covered Code.
 
-      3.4. Intellectual Property Matters
+     3.4. Intellectual Property Matters
 
 (b) Contributor APIs. If Contributor's Modifications include an application
 programming interface and Contributor has knowledge of patent licenses which
@@ -192,7 +193,7 @@ with other code not governed by the terms of this License and distribute the
 Larger Work as a single product. In such a case, You must make sure the requirements
 of this License are fulfilled for the Covered Code.
 
-   4. Inability to Comply Due to Statute or Regulation.
+4. Inability to Comply Due to Statute or Regulation.
 
 If it is impossible for You to comply with any of the terms of this License
 with respect to some or all of the Covered Code due to statute, judicial order,
@@ -204,12 +205,12 @@ Except to the extent prohibited by statute or regulation, such description
 must be sufficiently detailed for a recipient of ordinary skill to be able
 to understand it.
 
-   5. Application of this License.
+5. Application of this License.
 
 This License applies to code to which the Initial Developer has attached the
 notice in Exhibit A and to related Covered Code.
 
-   6. Versions of the License.
+6. Versions of the License.
 
 6.2. Effect of New Versions. Once Covered Code has been published under a
 particular version of the License, You may always continue to use it under
@@ -229,7 +230,7 @@ of the Initial Developer, Original Code or Contributor in the notice described
 in Exhibit A shall not of themselves be deemed to be modifications of this
 License.)
 
-   7. DISCLAIMER OF WARRANTY.
+7. DISCLAIMER OF WARRANTY.
 
 COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTY
 OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES
@@ -241,7 +242,7 @@ THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER
 OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED
 CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
 
-   8. TERMINATION.
+8. TERMINATION.
 
 8.2. If You initiate litigation by asserting a patent infringement claim (excluding
 declatory judgment actions) against Initial Developer or a Contributor (the
@@ -280,7 +281,7 @@ user license agreements (excluding distributors and resellers) which have
 been validly granted by You or any distributor hereunder prior to termination
 shall survive termination.
 
-   9. LIMITATION OF LIABILITY.
+9. LIMITATION OF LIABILITY.
 
 UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING
 NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER, ANY
@@ -296,7 +297,7 @@ SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL
 OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO
 YOU.
 
-   10. U.S. GOVERNMENT END USERS.
+10. U.S. GOVERNMENT END USERS.
 
 The Covered Code is a "commercial item," as that term is defined in 48 C.F.R.
 2.101 (Oct. 1995), consisting of "commercial computer software" and "commercial
@@ -305,7 +306,7 @@ computer software documentation," as such terms are used in 48 C.F.R. 12.212
 227.7202-4 (June 1995), all U.S. Government End Users acquire Covered Code
 with only those rights set forth herein.
 
-   11. MISCELLANEOUS.
+11. MISCELLANEOUS.
 
 This License represents the complete agreement concerning subject matter hereof.
 If any provision of this License is held to be unenforceable, such provision
@@ -323,7 +324,7 @@ on Contracts for the International Sale of Goods is expressly excluded. Any
 law or regulation which provides that the language of a contract shall be
 construed against the drafter shall not apply to this License.
 
-   12. RESPONSIBILITY FOR CLAIMS.
+12. RESPONSIBILITY FOR CLAIMS.
 
 As between Initial Developer and the Contributors, each party is responsible
 for claims and damages arising, directly or indirectly, out of its utilization
@@ -332,13 +333,15 @@ and Contributors to distribute such responsibility on an equitable basis.
 Nothing herein is intended or shall be deemed to constitute any admission
 of liability.
 
-   13. MULTIPLE-LICENSED CODE.
+13. MULTIPLE-LICENSED CODE.
 
 Initial Developer may designate portions of the Covered Code as "Multiple-Licensed".
 "Multiple-Licensed" means that the Initial Developer permits you to utilize
 portions of the Covered Code under Your choice of the SPL or the alternative
 licenses, if any, specified by the Initial Developer in the file described
-in Exhibit A. SugarCRM Public License 1.1.3 - Exhibit A
+in Exhibit A.
+
+SugarCRM Public License 1.1.3 - Exhibit A
 
 The contents of this file are subject to the SugarCRM Public License Version
 1.1.3 ("License"); You may not use this file except in compliance with the
@@ -350,11 +353,8 @@ the specific language governing rights and limitations under the License.
 The Original Code is: SugarCRM Open Source
 
 The Initial Developer of the Original Code is SugarCRM, Inc.
-
 Portions created by SugarCRM are Copyright (C) 2004 SugarCRM, Inc.;
-
 All Rights Reserved.
-
 Contributor(s): ______________________________________.
 
 [NOTE: The text of this Exhibit A may differ slightly from the text of the
@@ -366,13 +366,11 @@ SugarCRM Public License 1.1.3 - Exhibit B
 
 Additional Terms applicable to the SugarCRM Public License.
 
-   I. Effect.,
-
+I. Effect.
 These additional terms described in this SugarCRM Public License - Additional
 Terms shall apply to the Covered Code under this License.
 
-   II. SugarCRM and logo.
-
+II. SugarCRM and logo.
 This License does not grant any rights to use the trademarks "SugarCRM" and
 the "SugarCRM" logos even if such marks are included in the Original Code
 or Modifications.
diff --git a/options/license/Swift-exception b/options/license/Swift-exception
index ed1f1256d0..32b573cea5 100644
--- a/options/license/Swift-exception
+++ b/options/license/Swift-exception
@@ -1,3 +1,6 @@
-Runtime Library Exception to the Apache 2.0 License: 
+### Runtime Library Exception to the Apache 2.0 License: ###
 
-As an exception, if you use this Software to compile your source code and portions of this Software are embedded into the binary product as a result, you may redistribute such product without providing attribution as would otherwise be required by Sections 4(a), 4(b) and 4(d) of the License.
+As an exception, if you use this Software to compile your source code and
+portions of this Software are embedded into the binary product as a result,
+you may redistribute such product without providing attribution as would
+otherwise be required by Sections 4(a), 4(b) and 4(d) of the License.
diff --git a/options/license/TAPR-OHL-1.0 b/options/license/TAPR-OHL-1.0
index 236edaa64e..e20c23663b 100644
--- a/options/license/TAPR-OHL-1.0
+++ b/options/license/TAPR-OHL-1.0
@@ -1,270 +1,266 @@
-The TAPR Open Hardware License Version 1.0 (May 25, 2007) Copyright 2007 TAPR
-- http://www.tapr.org/OHL
+The TAPR Open Hardware License
+Version 1.0 (May 25, 2007)
+Copyright 2007 TAPR - http://www.tapr.org/OHL
 
 PREAMBLE
 
-Open Hardware is a thing - a physical artifact, either electrical or mechanical
-- whose design information is available to, and usable by, the public in a
-way that allows anyone to make, modify, distribute, and use that thing. In
-this preface, design information is called "documentation" and things created
-from it are called "products."
+Open Hardware is a thing - a physical artifact, either electrical or
+mechanical - whose design information is available to, and usable by,
+the public in a way that allows anyone to make, modify, distribute, and
+use that thing.  In this preface, design information is called
+"documentation" and things created from it are called "products."
 
-The TAPR Open Hardware License ("OHL") agreement provides a legal framework
-for Open Hardware projects. It may be used for any kind of product, be it
-a hammer or a computer motherboard, and is TAPR's contribution to the community;
-anyone may use the OHL for their Open Hardware project.
+The TAPR Open Hardware License ("OHL") agreement provides a legal
+framework for Open Hardware projects.  It may be used for any kind of
+product, be it a hammer or a computer motherboard, and is TAPR's
+contribution to the community; anyone may use the OHL for their Open
+Hardware project.
 
-Like the GNU General Public License, the OHL is designed to guarantee your
-freedom to share and to create. It forbids anyone who receives rights under
-the OHL to deny any other licensee those same rights to copy, modify, and
-distribute documentation, and to make, use and distribute products based on
-that documentation.
+Like the GNU General Public License, the OHL is designed to guarantee
+your freedom to share and to create.  It forbids anyone who receives
+rights under the OHL to deny any other licensee those same rights to
+copy, modify, and distribute documentation, and to make, use and
+distribute products based on that documentation.
 
-Unlike the GPL, the OHL is not primarily a copyright license. While copyright
-protects documentation from unauthorized copying, modification, and distribution,
-it has little to do with your right to make, distribute, or use a product
-based on that documentation. For better or worse, patents play a significant
-role in those activities. Although it does not prohibit anyone from patenting
-inventions embodied in an Open Hardware design, and of course cannot prevent
-a third party from enforcing their patent rights, those who benefit from an
-OHL design may not bring lawsuits claiming that design infringes their patents
-or other intellectual property.
+Unlike the GPL, the OHL is not primarily a copyright license.  While
+copyright protects documentation from unauthorized copying, modification,
+and distribution, it has little to do with your right to make, distribute,
+or use a product based on that documentation.  For better or worse, patents
+play a significant role in those activities.  Although it does not prohibit
+anyone from patenting inventions embodied in an Open Hardware design, and
+of course cannot prevent a third party from enforcing their patent rights,
+those who benefit from an OHL design may not bring lawsuits claiming that
+design infringes their patents or other intellectual property.
 
-The OHL addresses unique issues involved in the creation of tangible, physical
-things, but does not cover software, firmware, or code loaded into programmable
-devices. A copyright-oriented license such as the GPL better suits these creations.
+The OHL addresses unique issues involved in the creation of tangible,
+physical things, but does not cover software, firmware, or code loaded
+into programmable devices.  A copyright-oriented license such as the GPL
+better suits these creations.
 
-How can you use the OHL, or a design based upon it? While the terms and conditions
-below take precedence over this preamble, here is a summary:
+How can you use the OHL, or a design based upon it?  While the terms and
+conditions below take precedence over this preamble, here is a summary:
 
-   * You may modify the documentation and make products based upon it.
+*  You may modify the documentation and make products based upon it.
 
-   * You may use products for any legal purpose without limitation.
+*  You may use products for any legal purpose without limitation.
 
-* You may distribute unmodified documentation, but you must include the complete
-package as you received it.
+*  You may distribute unmodified documentation, but you must include the
+complete package as you received it.
 
-* You may distribute products you make to third parties, if you either include
-the documentation on which the product is based, or make it available without
-charge for at least three years to anyone who requests it.
+*  You may distribute products you make to third parties, if you either
+include the documentation on which the product is based, or make it
+available without charge for at least three years to anyone who requests
+it.
 
-   * You may distribute modified documentation or products based on it, if you:
+*  You may distribute modified documentation or products based on it, if
+you:
+    *  License your modifications under the OHL.
+    *  Include those modifications, following the requirements stated
+       below.
+    *  Attempt to send the modified documentation by email to any of the
+       developers who have provided their email address.  This is a good
+       faith obligation - if the email fails, you need do nothing more
+       and may go on with your distribution.
 
-      * License your modifications under the OHL.
+*  If you create a design that you want to license under the OHL, you
+should:
+    *  Include this document in a file named LICENSE (with the appropriate
+       extension) that is included in the documentation package.
+    *  If the file format allows, include a notice like "Licensed under
+       the TAPR Open Hardware License (www.tapr.org/OHL)" in each
+       documentation file.  While not required, you should also include
+       this notice on printed circuit board artwork and the product
+       itself; if space is limited the notice can be shortened or
+       abbreviated.
+    *  Include a copyright notice in each file and on printed circuit
+       board artwork.
+    *  If you wish to be notified of modifications that others may make,
+       include your email address in a file named "CONTRIB.TXT" or
+       something similar.
 
-      * Include those modifications, following the requirements stated below.
-
-* Attempt to send the modified documentation by email to any of the developers
-who have provided their email address. This is a good faith obligation - if
-the email fails, you need do nothing more and may go on with your distribution.
-
-   * If you create a design that you want to license under the OHL, you should:
-
-* Include this document in a file named LICENSE (with the appropriate extension)
-that is included in the documentation package.
-
-* If the file format allows, include a notice like "Licensed under the TAPR
-Open Hardware License (www.tapr.org/OHL)" in each documentation file. While
-not required, you should also include this notice on printed circuit board
-artwork and the product itself; if space is limited the notice can be shortened
-or abbreviated.
-
-* Include a copyright notice in each file and on printed circuit board artwork.
-
-* If you wish to be notified of modifications that others may make, include
-your email address in a file named "CONTRIB.TXT" or something similar.
-
-* Any time the OHL requires you to make documentation available to others,
-you must include all the materials you received from the upstream licensors.
-In addition, if you have modified the documentation:
-
-* You must identify the modifications in a text file (preferably named "CHANGES.TXT")
-that you include with the documentation. That file must also include a statement
-like "These modifications are licensed under the TAPR Open Hardware License."
-
-* You must include any new files you created, including any manufacturing
-files (such as Gerber files) you create in the course of making products.
-
-* You must include both "before" and "after" versions of all files you modified.
-
-* You may include files in proprietary formats, but you must also include
-open format versions (such as Gerber, ASCII, Postscript, or PDF) if your tools
-can create them.
+*  Any time the OHL requires you to make documentation available to
+others, you must include all the materials you received from the
+upstream licensors.  In addition, if you have modified the
+documentation:
+    *  You must identify the modifications in a text file (preferably
+       named "CHANGES.TXT") that you include with the documentation.
+       That file must also include a statement like "These modifications
+       are licensed under the TAPR Open Hardware License."
+    *  You must include any new files you created, including any
+       manufacturing files (such as Gerber files) you create in the
+       course of making products.
+    *  You must include both "before" and "after" versions of all files
+       you modified.
+    *  You may include files in proprietary formats, but you must also
+       include open format versions (such as Gerber, ASCII, Postscript,
+       or PDF) if your tools can create them.
 
 TERMS AND CONDITIONS
 
-1. Introduction
-
-1.1 This Agreement governs how you may use, copy, modify, and distribute Documentation,
-and how you may make, have made, and distribute Products based on that Documentation.
-As used in this Agreement, to "distribute" Documentation means to directly
-or indirectly make copies available to a third party, and to "distribute"
-Products means to directly or indirectly give, loan, sell or otherwise transfer
+1.   Introduction
+1.1  This Agreement governs how you may use, copy, modify, and
+distribute Documentation, and how you may make, have made, and
+distribute Products based on that Documentation.  As used in this
+Agreement, to "distribute" Documentation means to directly or indirectly
+make copies available to a third party, and to "distribute" Products
+means to directly or indirectly give, loan, sell or otherwise transfer
 them to a third party.
 
-   1.2 "Documentation" includes:
+1.2  "Documentation" includes:
+     (a) schematic diagrams;
+     (b) circuit or circuit board layouts, including Gerber and other
+         data files used for manufacture;
+     (c) mechanical drawings, including CAD, CAM, and other data files
+         used for manufacture;
+     (d) flow charts and descriptive text; and
+     (e) other explanatory material.
+Documentation may be in any tangible or intangible form of expression,
+including but not limited to computer files in open or proprietary
+formats and representations on paper, film, or other media.
 
-      (a) schematic diagrams;
-
-(b) circuit or circuit board layouts, including Gerber and other data files
-used for manufacture;
-
-(c) mechanical drawings, including CAD, CAM, and other data files used for
-manufacture;
-
-      (d) flow charts and descriptive text; and
-
-      (e) other explanatory material.
-
-Documentation may be in any tangible or intangible form of expression, including
-but not limited to computer files in open or proprietary formats and representations
-on paper, film, or other media.
-
-   1.3 "Products" include:
-
-(a) circuit boards, mechanical assemblies, and other physical parts and components;
-
-(b) assembled or partially assembled units (including components and subassemblies);
-and
-
-(c) parts and components combined into kits intended for assembly by others;
+1.3  "Products" include:
+     (a) circuit boards, mechanical assemblies, and other physical parts
+         and components;
+     (b) assembled or partially assembled units (including components
+         and subassemblies); and
+     (c) parts and components combined into kits intended for assembly
+         by others;
 which are based in whole or in part on the Documentation.
 
-1.4 This Agreement applies to any Documentation which contains a notice stating
-it is subject to the TAPR Open Hardware License, and to all Products based
-in whole or in part on that Documentation. If Documentation is distributed
-in an archive (such as a "zip" file) which includes this document, all files
-in that archive are subject to this Agreement unless they are specifically
-excluded. Each person who contributes content to the Documentation is referred
-to in this Agreement as a "Licensor."
+1.4  This Agreement applies to any Documentation which contains a
+notice stating it is subject to the TAPR Open Hardware License, and to
+all Products based in whole or in part on that Documentation.  If
+Documentation is distributed in an archive (such as a "zip" file) which
+includes this document, all files in that archive are subject to this
+Agreement unless they are specifically excluded.  Each person who
+contributes content to the Documentation is referred to in this
+Agreement as a "Licensor."
 
-1.5 By (a) using, copying, modifying, or distributing the Documentation, or
-(b) making or having Products made or distributing them, you accept this Agreement,
-agree to comply with its terms, and become a "Licensee." Any activity inconsistent
-with this Agreement will automatically terminate your rights under it (including
-the immunities from suit granted in Section 2), but the rights of others who
-have received Documentation, or have obtained Products, directly or indirectly
-from you will not be affected so long as they fully comply with it themselves.
+1.5  By (a) using, copying, modifying, or distributing the
+Documentation, or (b) making or having Products made or distributing
+them, you accept this Agreement, agree to comply with its terms, and
+become a "Licensee."  Any activity inconsistent with this Agreement will
+automatically terminate your rights under it (including the immunities
+from suit granted in Section 2), but the rights of others who have
+received Documentation, or have obtained Products, directly or
+indirectly from you will not be affected so long as they fully comply
+with it themselves.
 
-1.6 This Agreement does not apply to software, firmware, or code loaded into
-programmable devices which may be used in conjunction with Documentation or
-Products. Such software is subject to the license terms established by its
-copyright holder(s).
+1.6  This Agreement does not apply to software, firmware, or code
+loaded into programmable devices which may be used in conjunction with
+Documentation or Products.  Such software is subject to the license
+terms established by its copyright holder(s).
 
-2. Patents
+2.   Patents
+2.1  Each Licensor grants you, every other Licensee, and every
+possessor or user of Products a perpetual, worldwide, and royalty-free
+immunity from suit under any patent, patent application, or other
+intellectual property right which he or she controls, to the extent
+necessary to make, have made, possess, use, and distribute Products.
+This immunity does not extend to infringement arising from modifications
+subsequently made by others.
 
-2.1 Each Licensor grants you, every other Licensee, and every possessor or
-user of Products a perpetual, worldwide, and royalty-free immunity from suit
-under any patent, patent application, or other intellectual property right
-which he or she controls, to the extent necessary to make, have made, possess,
-use, and distribute Products. This immunity does not extend to infringement
-arising from modifications subsequently made by others.
+2.2  If you make or have Products made, or distribute Documentation
+that you have modified, you grant every Licensor, every other Licensee,
+and every possessor or user of Products a perpetual, worldwide, and
+royalty-free immunity from suit under any patent, patent application, or
+other intellectual property right which you control, to the extent
+necessary to make, have made, possess, use, and distribute Products.
+This immunity does not extend to infringement arising from modifications
+subsequently made by others.
 
-2.2 If you make or have Products made, or distribute Documentation that you
-have modified, you grant every Licensor, every other Licensee, and every possessor
-or user of Products a perpetual, worldwide, and royalty-free immunity from
-suit under any patent, patent application, or other intellectual property
-right which you control, to the extent necessary to make, have made, possess,
-use, and distribute Products. This immunity does not extend to infringement
-arising from modifications subsequently made by others.
+2.3  To avoid doubt, providing Documentation to a third party for the
+sole purpose of having that party make Products on your behalf is not
+considered "distribution,"\" and a third party's act of making Products
+solely on your behalf does not cause that party to grant the immunity
+described in the preceding paragraph.
 
-2.3 To avoid doubt, providing Documentation to a third party for the sole
-purpose of having that party make Products on your behalf is not considered
-"distribution,"\" and a third party's act of making Products solely on your
-behalf does not cause that party to grant the immunity described in the preceding
-paragraph.
+2.4  These grants of immunity are a material part of this Agreement,
+and form a portion of the consideration given by each party to the
+other.  If any court judgment or legal agreement prevents you from
+granting the immunity required by this Section, your rights under this
+Agreement will terminate and you may no longer use, copy, modify or
+distribute the Documentation, or make, have made, or distribute
+Products.
 
-2.4 These grants of immunity are a material part of this Agreement, and form
-a portion of the consideration given by each party to the other. If any court
-judgment or legal agreement prevents you from granting the immunity required
-by this Section, your rights under this Agreement will terminate and you may
-no longer use, copy, modify or distribute the Documentation, or make, have
-made, or distribute Products.
+3.   Modifications
+You may modify the Documentation, and those modifications will become
+part of the Documentation.  They are subject to this Agreement, as are
+Products based in whole or in part on them.  If you distribute the
+modified Documentation, or Products based in whole or in part upon it,
+you must email the modified Documentation in a form compliant with
+Section 4 to each Licensor who has provided an email address with the
+Documentation.  Attempting to send the email completes your obligations
+under this Section and you need take no further action if any address
+fails.
 
-3. Modifications
+4.   Distributing Documentation
+4.1  You may distribute unmodified copies of the Documentation in its
+entirety in any medium, provided that you retain all copyright and other
+notices (including references to this Agreement) included by each
+Licensor, and include an unaltered copy of this Agreement.
+4.2  You may distribute modified copies of the Documentation if you
+comply with all the requirements of the preceding paragraph and:
+     (a) include a prominent notice in an ASCII or other open format
+         file identifying those elements of the Documentation that you
+         changed, and stating that the modifications are licensed under
+         the terms of this Agreement;
+     (b) include all new documentation files that you create, as well as
+         both the original and modified versions of each file you change
+         (files may be in your development tool's native file format,
+         but if reasonably possible, you must also include open format,
+         such as Gerber, ASCII, Postscript, or PDF, versions);
+     (c) do not change the terms of this Agreement with respect to
+         subsequent licensees; and
+     (d) if you make or have Products made, include in the Documentation
+         all elements reasonably required to permit others to make
+         Products, including Gerber, CAD/CAM and other files used for
+         manufacture.
 
-You may modify the Documentation, and those modifications will become part
-of the Documentation. They are subject to this Agreement, as are Products
-based in whole or in part on them. If you distribute the modified Documentation,
-or Products based in whole or in part upon it, you must email the modified
-Documentation in a form compliant with Section 4 to each Licensor who has
-provided an email address with the Documentation. Attempting to send the email
-completes your obligations under this Section and you need take no further
-action if any address fails.
+5.   Making Products
+5.1  You may use the Documentation to make or have Products made,
+provided that each Product retains any notices included by the Licensor
+(including, but not limited to, copyright notices on circuit boards).
+5.2  You may distribute Products you make or have made, provided that
+you include with each unit a copy of the Documentation in a form
+consistent with Section 4.  Alternatively, you may include either (i) an
+offer valid for at least three years to provide that Documentation, at
+no charge other than the reasonable cost of media and postage, to any
+person who requests it; or (ii) a URL where that Documentation may be
+downloaded, available for at least three years after you last distribute
+the Product.
 
-4. Distributing Documentation
+6.   NEW LICENSE VERSIONS
+TAPR may publish updated versions of the OHL which retain the same
+general provisions as the present version, but differ in detail to
+address new problems or concerns, and carry a distinguishing version
+number.  If the Documentation specifies a version number which applies
+to it and "any later version", you may choose either that version or any
+later version published by TAPR.  If the Documentation does not specify
+a version number, you may choose any version ever published by TAPR.
+TAPR owns the copyright to the OHL, but grants permission to any person
+to copy, distribute, and use it in unmodified form.
 
-4.1 You may distribute unmodified copies of the Documentation in its entirety
-in any medium, provided that you retain all copyright and other notices (including
-references to this Agreement) included by each Licensor, and include an unaltered
-copy of this Agreement.
-
-4.2 You may distribute modified copies of the Documentation if you comply
-with all the requirements of the preceding paragraph and:
-
-(a) include a prominent notice in an ASCII or other open format file identifying
-those elements of the Documentation that you changed, and stating that the
-modifications are licensed under the terms of this Agreement;
-
-(b) include all new documentation files that you create, as well as both the
-original and modified versions of each file you change (files may be in your
-development tool's native file format, but if reasonably possible, you must
-also include open format, such as Gerber, ASCII, Postscript, or PDF, versions);
-
-(c) do not change the terms of this Agreement with respect to subsequent licensees;
-and
-
-(d) if you make or have Products made, include in the Documentation all elements
-reasonably required to permit others to make Products, including Gerber, CAD/CAM
-and other files used for manufacture.
-
-5. Making Products
-
-5.1 You may use the Documentation to make or have Products made, provided
-that each Product retains any notices included by the Licensor (including,
-but not limited to, copyright notices on circuit boards).
-
-5.2 You may distribute Products you make or have made, provided that you include
-with each unit a copy of the Documentation in a form consistent with Section
-4. Alternatively, you may include either (i) an offer valid for at least three
-years to provide that Documentation, at no charge other than the reasonable
-cost of media and postage, to any person who requests it; or (ii) a URL where
-that Documentation may be downloaded, available for at least three years after
-you last distribute the Product.
-
-6. NEW LICENSE VERSIONS
-
-TAPR may publish updated versions of the OHL which retain the same general
-provisions as the present version, but differ in detail to address new problems
-or concerns, and carry a distinguishing version number. If the Documentation
-specifies a version number which applies to it and "any later version", you
-may choose either that version or any later version published by TAPR. If
-the Documentation does not specify a version number, you may choose any version
-ever published by TAPR. TAPR owns the copyright to the OHL, but grants permission
-to any person to copy, distribute, and use it in unmodified form.
-
-7. WARRANTY AND LIABILITY LIMITATIONS
-
-7.1 THE DOCUMENTATION IS PROVIDED ON AN"AS-IS" BASIS WITHOUT WARRANTY OF ANY
-KIND, TO THE EXTENT PERMITTED BY APPLICABLE LAW. ALL WARRANTIES, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE, AND TITLE, ARE HEREBY EXPRESSLY DISCLAIMED.
-
-7.2 IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW WILL ANY LICENSOR BE LIABLE
-TO YOU OR ANY THIRD PARTY FOR ANY DIRECT, INDIRECT, INCIDENTAL, CONSEQUENTIAL,
-PUNITIVE, OR EXEMPLARY DAMAGES ARISING OUT OF THE USE OF, OR INABILITY TO
-USE, THE DOCUMENTATION OR PRODUCTS, INCLUDING BUT NOT LIMITED TO CLAIMS OF
-INTELLECTUAL PROPERTY INFRINGEMENT OR LOSS OF DATA, EVEN IF THAT PARTY HAS
-BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7.3 You agree that the foregoing limitations are reasonable due to the non-financial
-nature of the transaction represented by this Agreement, and acknowledge that
-were it not for these limitations, the Licensor(s) would not be willing to
-make the Documentation available to you.
-
-7.4 You agree to defend, indemnify, and hold each Licensor harmless from any
-claim brought by a third party alleging any defect in the design, manufacture,
-or operation of any Product which you make, have made, or distribute pursuant
-to this Agreement.
-
-####
+7.   WARRANTY AND LIABILITY LIMITATIONS
+7.1  THE DOCUMENTATION IS PROVIDED ON AN"AS-IS" BASIS WITHOUT
+WARRANTY OF ANY KIND, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  ALL
+WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND
+TITLE, ARE HEREBY EXPRESSLY DISCLAIMED.
+7.2  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW WILL ANY LICENSOR
+BE LIABLE TO YOU OR ANY THIRD PARTY FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, CONSEQUENTIAL, PUNITIVE, OR EXEMPLARY DAMAGES ARISING OUT OF
+THE USE OF, OR INABILITY TO USE, THE DOCUMENTATION OR PRODUCTS,
+INCLUDING BUT NOT LIMITED TO CLAIMS OF INTELLECTUAL PROPERTY
+INFRINGEMENT OR LOSS OF DATA, EVEN IF THAT PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+7.3  You agree that the foregoing limitations are reasonable due to
+the non-financial nature of the transaction represented by this
+Agreement, and acknowledge that were it not for these limitations, the
+Licensor(s) would not be willing to make the Documentation available to
+you.
+7.4  You agree to defend, indemnify, and hold each Licensor harmless
+from any claim brought by a third party alleging any defect in the
+design, manufacture, or operation of any Product which you make, have
+made, or distribute pursuant to this Agreement.
+                                 ####
diff --git a/options/license/TMate b/options/license/TMate
index 69b0d82677..a390863e26 100644
--- a/options/license/TMate
+++ b/options/license/TMate
@@ -1,10 +1,12 @@
-The TMate Open Source License. This license applies to all portions of TMate
-SVNKit library, which are not externally-maintained libraries (e.g. Ganymed
-SSH library).
+The TMate Open Source License.
+
+This license applies to all portions of TMate SVNKit library, which are not
+externally-maintained libraries (e.g. Ganymed SSH library).
 
 All the source code and compiled classes in package org.tigris.subversion.javahl
-except SvnClient class are covered by the license in JAVAHL-LICENSE file Copyright
-(c) 2004-2012 TMate Software. All rights reserved.
+except SvnClient class are covered by the license in JAVAHL-LICENSE file
+
+Copyright (c) 2004-2012 TMate Software. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
 are permitted provided that the following conditions are met:
diff --git a/options/license/TORQUE-1.1 b/options/license/TORQUE-1.1
index f8084aa60a..6578922ba7 100644
--- a/options/license/TORQUE-1.1
+++ b/options/license/TORQUE-1.1
@@ -1,16 +1,15 @@
-TORQUE v2.5+ Software License v1.1 Copyright (c) 2010-2011 Adaptive Computing
-Enterprises, Inc. All rights reserved. Use this license to use or redistribute
-the TORQUE software v2.5+ and later versions. For free support for TORQUE
-users, questions should be emailed to the community of TORQUE users at torqueusers@supercluster.org.
-Users can also subscribe to the user mailing list at http://www.supercluster.org/mailman/listinfo/torqueusers.
+TORQUE v2.5+ Software License v1.1
+Copyright (c) 2010-2011 Adaptive Computing Enterprises, Inc. All rights reserved.
+
+Use this license to use or redistribute the TORQUE software v2.5+ and later
+versions. For free support for TORQUE users, questions should be emailed to
+the community of TORQUE users at torqueusers@supercluster.org. Users can also
+subscribe to the user mailing list at http://www.supercluster.org/mailman/listinfo/torqueusers.
 Customers using TORQUE that also are licensed users of Moab branded software
 from Adaptive Computing Inc. can get TORQUE support from Adaptive Computing
 via:
-
 Email: torque-support@adaptivecomputing.com.
-
 Phone: (801) 717-3700
-
 Web: www.adaptivecomputing.com www.clusterresources.com
 
 This license covers use of the TORQUE v2.5 software (the "Software") at your
@@ -38,13 +37,12 @@ by any party (including Licensor) without restriction.
 
 4. All advertising materials mentioning features or use of the Software must
 display the following acknowledgment:
-
 "TORQUE is a modification of OpenPBS which was developed by NASA Ames Research
 Center, Lawrence Livermore National Laboratory, and Veridian TORQUE Open Source
 License v1.1. 1 Information Solutions, Inc. Visit www.clusterresources.com/products/
 for more information about TORQUE and to download TORQUE. For information
 about Moab branded products and so receive support from Adaptive Computing
-for TORQUE, see www.adaptivecomputing.com."
+for TORQUE, see www.adaptivecomputing.com.”
 
 5. DISCLAIMER OF WARRANTY THIS SOFTWARE IS PROVIDED "AS IS" WITHOUT WARRANTY
 OF ANY KIND. ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
@@ -60,10 +58,11 @@ OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 This license will be governed by the laws of Utah, without reference to its
-choice of law rules. Note 1: TORQUE is developed from an earlier version v2.3
-of OpenPBS. TORQUE has been developed beyond OpenPBS v2.3. The OpenPBS v2.3
-license and OpenPBS software can be obtained at:
+choice of law rules.
 
+Note 1: TORQUE is developed from an earlier version v2.3 of OpenPBS. TORQUE
+has been developed beyond OpenPBS v2.3. The OpenPBS v2.3 license and OpenPBS
+software can be obtained at:
 http://www.pbsworks.com/ResLibSearchResult.aspx?keywords=openpbs&industry=All&pro
 duct_service=All&category=Free%20Software%20Downloads&order_by=title. Users
 of TORQUE should comply with the TORQUE license as well as the OpenPBS license.
diff --git a/options/license/TOSL b/options/license/TOSL
index c3bfbeacdd..4ec0aeda1e 100644
--- a/options/license/TOSL
+++ b/options/license/TOSL
@@ -6,11 +6,9 @@ are permitted provided that the following conditions are met:
 
 * Redistributions of source code must retain the above copyright notice, this
 list of conditions and the following disclaimer.
-
 * Redistributions in binary form must reproduce the above copyright notice,
 this list of conditions and the following disclaimer in the documentation
 and/or other materials provided with the distribution.
-
 * Redistributions in any form must be accompanied by information on how to
 obtain complete source code for this software and any accompanying software
 that uses this software. The source code must either be included in the distribution
diff --git a/options/license/TU-Berlin-1.0 b/options/license/TU-Berlin-1.0
index d366e06750..3c69a644c3 100644
--- a/options/license/TU-Berlin-1.0
+++ b/options/license/TU-Berlin-1.0
@@ -1,17 +1,16 @@
-Copyright 1992, 1993, 1994 by Jutta Degener and Carsten Bormann,
-
+Copyright 1992 by Jutta Degener and Carsten Bormann,
 Technische Universitaet Berlin
 
 Any use of this software is permitted provided that this notice is not removed
 and that neither the authors nor the Technische Universitaet Berlin are deemed
 to have made any representations as to the suitability of this software for
-any purpose nor are held responsible for any defects of this software. THERE
+any purpose nor are held responsible for any defects of this software.  THERE
 IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
 
 As a matter of courtesy, the authors request to be informed about uses this
 software has found, about bugs in this software, and about any improvements
-that may be of general interest. Berlin, 28.11.1994
+that may be of general interest.
 
+Berlin, 15.09.1992
 Jutta Degener
-
 Carsten Bormann
diff --git a/options/license/TU-Berlin-2.0 b/options/license/TU-Berlin-2.0
index 040154d12a..b7f273fe0d 100644
--- a/options/license/TU-Berlin-2.0
+++ b/options/license/TU-Berlin-2.0
@@ -1,20 +1,21 @@
 Copyright 1992, 1993, 1994 by Jutta Degener and Carsten Bormann,
-
 Technische Universitaet Berlin
 
 Any use of this software is permitted provided that this notice is not removed
 and that neither the authors nor the Technische Universitaet Berlin are deemed
 to have made any representations as to the suitability of this software for
-any purpose nor are held responsible for any defects of this software. THERE
+any purpose nor are held responsible for any defects of this software.  THERE
 IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
 
 As a matter of courtesy, the authors request to be informed about uses this
 software has found, about bugs in this software, and about any improvements
-that may be of general interest. Berlin, 28.11.1994
+that may be of general interest.
 
+Berlin, 28.11.1994
 Jutta Degener
+Carsten Bormann
 
-Carsten Bormann oOo
+oOo
 
 Since the original terms of 15 years ago maybe do not make our intentions
 completely clear given today's refined usage of the legal terms, we append
@@ -24,9 +25,9 @@ Permission to use, copy, modify, and distribute this software for any purpose
 with or without fee is hereby granted, provided that this notice is not removed
 and that neither the authors nor the Technische Universitaet Berlin are deemed
 to have made any representations as to the suitability of this software for
-any purpose nor are held responsible for any defects of this software. THERE
-IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE. Berkeley/Bremen, 05.04.2009
+any purpose nor are held responsible for any defects of this software.  THERE
+IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
 
+Berkeley/Bremen, 05.04.2009
 Jutta Degener
-
 Carsten Bormann
diff --git a/options/license/UCL-1.0 b/options/license/UCL-1.0
index 7c5823aae7..180ef5b050 100644
--- a/options/license/UCL-1.0
+++ b/options/license/UCL-1.0
@@ -5,7 +5,7 @@ work of authorship (the "Original Work") whose owner (the "Licensor") has
 placed the following licensing notice adjacent to the copyright notice for
 the Original Work:
 
-Licensed under the Upstream Compatibility License 1.0
+     Licensed under the Upstream Compatibility License 1.0
 
 1) Grant of Copyright License. Licensor grants You a worldwide, royalty-free,
 non-exclusive, sublicensable license, for the duration of the copyright, to
@@ -21,12 +21,13 @@ Original Work;
 c) to distribute or communicate copies of the Original Work and Derivative
 Works to the public, with the proviso that copies of Original Work You distribute
 or communicate shall be licensed under this Upstream Compatibility License
-and all Derivative Work You distribute or communicate shall be licensed under
-both this Upstream Compatibility License and the Apache License 2.0 or later;
+and all Derivative Work You distribute or communicate
+shall be licensed under both this Upstream Compatibility License and the Apache
+License 2.0 or later;
 
-      d) to perform the Original Work publicly; and
+     d) to perform the Original Work publicly; and
 
-      e) to display the Original Work publicly.
+     e) to display the Original Work publicly.
 
 2) Grant of Patent License. Licensor grants You a worldwide, royalty-free,
 non-exclusive, sublicensable license, under patent claims owned or controlled
@@ -48,7 +49,7 @@ continues to distribute the Original Work.
 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 permission of the Licensor. Except as expressly
-stated herein, nothing in this License grants any license to Licensor's trademarks,
+stated herein, nothing in this License grants any license to Licensor’s trademarks,
 copyrights, patents, trade secrets or any other intellectual property. No
 patent license is granted to make, use, sell, offer for sale, have made, or
 import embodiments of any patent claims other than the licensed claims defined
@@ -107,7 +108,7 @@ to undertake the activities listed in Section 1, including your right to create
 Derivative Works based upon the Original Work, and doing so without honoring
 these terms and conditions is prohibited by copyright law and international
 treaty. Nothing in this License is intended to affect copyright exceptions
-and limitations (including "fair use" or "fair dealing"). This License shall
+and limitations (including “fair use” or “fair dealing”). This License shall
 terminate immediately and You may no longer exercise any of the rights granted
 to You by this License upon your failure to honor the conditions in Section
 1(c).
@@ -164,8 +165,8 @@ to other original works of authorship subject to the following conditions:
 Software License" or "OSL" or the "Upstream Compatibility License" or "UCL"
 and you may not use those names in the name of your Modified License; (ii)
 You must replace the notice specified in the first paragraph above with the
-notice "Licensed under <insert your license name here> " or with a notice
-of your own that is not confusingly similar to the notice in this License;
-and (iii) You may not claim that your original works are open source software
+notice "Licensed under <insert your license name here>" or with a notice of
+your own that is not confusingly similar to the notice in this License; and
+(iii) You may not claim that your original works are open source software
 unless your Modified License has been approved by Open Source Initiative (OSI)
 and You comply with its license review and certification process.
diff --git a/options/license/UPL-1.0 b/options/license/UPL-1.0
index e68fc2fc05..c572156f51 100644
--- a/options/license/UPL-1.0
+++ b/options/license/UPL-1.0
@@ -1,5 +1,6 @@
-Copyright (c) [year] [copyright holders] The Universal Permissive License
-(UPL), Version 1.0
+Copyright (c) [year] [copyright holders]
+
+The Universal Permissive License (UPL), Version 1.0
 
 Subject to the condition set forth below, permission is hereby granted to
 any person obtaining a copy of this software, associated documentation and/or
@@ -9,10 +10,10 @@ by each licensor hereunder covering either (i) the unmodified Software as
 contributed to or provided by such licensor, or (ii) the Larger Works (as
 defined below), to deal in both
 
-   (a) the Software, and
+(a) the Software, and
 
 (b) any piece of software and/or hardware listed in the lrgrwrks.txt file
-if one is included with the Software (each a "Larger Work" to which the Software
+if one is included with the Software (each a “Larger Work” to which the Software
 is contributed by such licensors),
 
 without restriction, including without limitation the rights to copy, create
diff --git a/options/license/Unicode-DFS-2015 b/options/license/Unicode-DFS-2015
index 142f850bf4..febf3fcadc 100644
--- a/options/license/Unicode-DFS-2015
+++ b/options/license/Unicode-DFS-2015
@@ -28,10 +28,8 @@ or Software are furnished to do so, provided that
 
 (a) this copyright and permission notice appear with all copies of the Data
 Files or Software,
-
 (b) this copyright and permission notice appear in associated documentation,
 and
-
 (c) there is clear notice in each modified Data File or in the Software as
 well as in the documentation associated with the Data File(s) or Software
 that the data or software has been modified.
diff --git a/options/license/Unicode-DFS-2016 b/options/license/Unicode-DFS-2016
index 80bd8b3d8e..f83aa4b30c 100644
--- a/options/license/Unicode-DFS-2016
+++ b/options/license/Unicode-DFS-2016
@@ -2,7 +2,7 @@ UNICODE, INC. LICENSE AGREEMENT - DATA FILES AND SOFTWARE
 
 Unicode Data Files include all data files under the directories http://www.unicode.org/Public/,
 http://www.unicode.org/reports/, http://www.unicode.org/cldr/data/, http://source.icu-project.org/repos/icu/,
-http://www.unicode.org/ivd/data/, and http://www.unicode.org/utility/trac/browser/.
+and http://www.unicode.org/utility/trac/browser/.
 
 Unicode Data Files do not include PDF online code charts under the directory
 http://www.unicode.org/Public/.
@@ -18,8 +18,10 @@ AND/OR SOFTWARE ("SOFTWARE"), YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND
 BY, ALL OF THE TERMS AND CONDITIONS OF THIS AGREEMENT. IF YOU DO NOT AGREE,
 DO NOT DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE THE DATA FILES OR SOFTWARE.
 
-COPYRIGHT AND PERMISSION NOTICE Copyright © 1991-2016 Unicode, Inc. All rights
-reserved. Distributed under the Terms of Use in http://www.unicode.org/copyright.html.
+COPYRIGHT AND PERMISSION NOTICE
+
+Copyright © 1991-2016 Unicode, Inc. All rights reserved. Distributed under
+the Terms of Use in http://www.unicode.org/copyright.html.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of the Unicode data files and any associated documentation (the "Data Files")
@@ -31,8 +33,7 @@ or Software are furnished to do so, provided that either
 
 (a) this copyright and permission notice appear with all copies of the Data
 Files or Software, or
-
-   (b) this copyright and permission notice appear in associated Documentation.
+(b) this copyright and permission notice appear in associated Documentation.
 
 THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
 KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
diff --git a/options/license/Unicode-TOU b/options/license/Unicode-TOU
index 0e28dd9a5b..cbfd9da2d8 100644
--- a/options/license/Unicode-TOU
+++ b/options/license/Unicode-TOU
@@ -4,9 +4,9 @@ For the general privacy policy governing access to this site, see the Unicode
 Privacy Policy. For trademark usage, see the Unicode® Consortium Name and
 Trademark Usage Policy.
 
-   A. Unicode Copyright.
+A. Unicode Copyright.
 
-      1. Copyright © 1991-2014 Unicode, Inc. All rights reserved.
+     1. Copyright © 1991-2014 Unicode, Inc. All rights reserved.
 
 2. Certain documents and files on this website contain a legend indicating
 that "Modification is permitted." Any person is hereby authorized, without
@@ -46,7 +46,7 @@ Agreement. For Software, in accordance with FAR 12-212 or DFARS 227-7202,
 as applicable, use, duplication or disclosure by the Government is subject
 to the restrictions set forth in this Agreement.
 
-   C. Warranties and Disclaimers.
+C. Warranties and Disclaimers.
 
 1. This publication and/or website may include technical or typographical
 errors or other inaccuracies . Changes are periodically added to the information
@@ -73,15 +73,15 @@ of the damage, including, without limitation, those resulting from the following
 loss of use, data or profits, in connection with the use, modification or
 distribution of this information or its derivatives.
 
-   E. Trademarks & Logos.
+E. Trademarks & Logos.
 
 1. The Unicode Word Mark and the Unicode Logo are trademarks of Unicode, Inc.
-"The Unicode Consortium" and "Unicode, Inc." are trade names of Unicode, Inc.
+“The Unicode Consortium” and “Unicode, Inc.” are trade names of Unicode, Inc.
 Use of the information and materials found on this website indicates your
-acknowledgement of Unicode, Inc.'s exclusive worldwide rights in the Unicode
+acknowledgement of Unicode, Inc.’s exclusive worldwide rights in the Unicode
 Word Mark, the Unicode Logo, and the Unicode trade names.
 
-2. The Unicode Consortium Name and Trademark Usage Policy ("Trademark Policy")
+2. The Unicode Consortium Name and Trademark Usage Policy (“Trademark Policy”)
 are incorporated herein by reference and you agree to abide by the provisions
 of the Trademark Policy, which may be changed from time to time in the sole
 discretion of Unicode, Inc.
@@ -89,7 +89,7 @@ discretion of Unicode, Inc.
 3. All third party trademarks referenced herein are the property of their
 respective owners.
 
-   F. Miscellaneous.
+F. Miscellaneous.
 
 1. Jurisdiction and Venue. This server is operated from a location in the
 State of California, United States of America. Unicode makes no representation
@@ -105,10 +105,10 @@ to waive any right to transfer the dispute to any other forum.
 
 2. Modification by Unicode Unicode shall have the right to modify this Agreement
 at any time by posting it to this site. The user may not assign any part of
-this Agreement without Unicode's prior written consent.
+this Agreement without Unicode’s prior written consent.
 
 3. Taxes. The user agrees to pay any taxes arising from access to this website
-or use of the information herein, except for those based on Unicode's net
+or use of the information herein, except for those based on Unicode’s net
 income.
 
 4. Severability. If any provision of this Agreement is declared invalid or
diff --git a/options/license/Universal-FOSS-exception-1.0 b/options/license/Universal-FOSS-exception-1.0
index 3d3f030a56..4a79cbdcf6 100644
--- a/options/license/Universal-FOSS-exception-1.0
+++ b/options/license/Universal-FOSS-exception-1.0
@@ -1,11 +1,11 @@
 The Universal FOSS Exception, Version 1.0
-
-In addition to the rights set forth in the other license(s) included in the distribution for this software, data, and/or documentation (collectively the "Software," and such licenses collectively with this additional permission the "Software License"), the copyright holders wish to facilitate interoperability with other software, data, and/or documentation distributed with complete corresponding source under a license that is OSI-approved and/or categorized by the FSF as free (collectively "Other FOSS"). We therefore hereby grant the following additional permission with respect to the use and distribution of the Software with Other FOSS, and the constants, function signatures, data structures and other invocation methods used to run or interact with each of them (as to each, such software's "Interfaces"):
-
-   (i) The Software's Interfaces may, to the extent permitted by the license of the Other FOSS, be copied into, used and distributed in the Other FOSS in order to enable interoperability, without requiring a change to the license of the Other FOSS other than as to any Interfaces of the Software embedded therein. The Software's Interfaces remain at all times under the Software License, including without limitation as used in the Other FOSS (which upon any such use also then contains a portion of the Software under the Software License).
-
-   (ii) The Other FOSS's Interfaces may, to the extent permitted by the license of the Other FOSS, be copied into, used and distributed in the Software in order to enable interoperability, without requiring that such Interfaces be licensed under the terms of the Software License or otherwise altering their original terms, if this does not require any portion of the Software other than such Interfaces to be licensed under the terms other than the Software License.
-
-   (iii) If only Interfaces and no other code is copied between the Software and the Other FOSS in either direction, the use and/or distribution of the Software with the Other FOSS shall not be deemed to require that the Other FOSS be licensed under the license of the Software, other than as to any Interfaces of the Software copied into the Other FOSS. This includes, by way of example and without limitation, statically or dynamically linking the Software together with Other FOSS after enabling interoperability using the Interfaces of one or both, and distributing the resulting combination under different licenses for the respective portions thereof.
-
-For avoidance of doubt, a license which is OSI-approved or categorized by the FSF as free, includes, for the purpose of this permission, such licenses with additional permissions, and any license that has previously been so-approved or categorized as free, even if now deprecated or otherwise no longer recognized as approved or free. Nothing in this additional permission grants any right to distribute any portion of the Software on terms other than those of the Software License or grants any additional permission of any kind for use or distribution of the Software in conjunction with software other than Other FOSS.
+ 
+In addition to the rights set forth in the other license(s) included in the distribution for this software, data, and/or documentation (collectively the "Software," and such licenses collectively with this additional permission the "Software License"), the copyright holders wish to facilitate interoperability with other software, data, and/or documentation distributed with complete corresponding source under a license that is OSI-approved and/or categorized by the FSF as free (collectively "Other FOSS").  We therefore hereby grant the following additional permission with respect to the use and distribution of the Software with Other FOSS, and the constants, function signatures, data structures and other invocation methods used to run or interact with each of them (as to each, such software's "Interfaces"):
+ 
+(i) The Software's Interfaces may, to the extent permitted by the license of the Other FOSS, be copied into, used and distributed in the Other FOSS in order to enable interoperability, without requiring a change to the license of the Other FOSS other than as to any Interfaces of the Software embedded therein.  The Software's Interfaces remain at all times under the Software License, including without limitation as used in the Other FOSS (which upon any such use also then contains a portion of the Software under the Software License).
+ 
+(ii) The Other FOSS's Interfaces may, to the extent permitted by the license of the Other FOSS, be copied into, used and distributed in the Software in order to enable interoperability, without requiring that such Interfaces be licensed under the terms of the Software License or otherwise altering their original terms, if this does not require any portion of the Software other than such Interfaces to be licensed under the terms other than the Software License.
+ 
+(iii) If only Interfaces and no other code is copied between the Software and the Other FOSS in either direction, the use and/or distribution of the Software with the Other FOSS shall not be deemed to require that the Other FOSS be licensed under the license of the Software, other than as to any Interfaces of the Software copied into the Other FOSS.  This includes, by way of example and without limitation, statically or dynamically linking the Software together with Other FOSS after enabling interoperability using the Interfaces of one or both, and distributing the resulting combination under different licenses for the respective portions thereof.
+ 
+For avoidance of doubt, a license which is OSI-approved or categorized by the FSF as free, includes, for the purpose of this permission, such licenses with additional permissions, and any license that has previously been so-approved or categorized as free, even if now deprecated or otherwise no longer recognized as approved or free.  Nothing in this additional permission grants any right to distribute any portion of the Software on terms other than those of the Software License or grants any additional permission of any kind for use or distribution of the Software in conjunction with software other than Other FOSS.
diff --git a/options/license/Unlicense b/options/license/Unlicense
index 24a8f90199..5227a51bde 100644
--- a/options/license/Unlicense
+++ b/options/license/Unlicense
@@ -7,14 +7,16 @@ purpose, commercial or non-commercial, and by any means.
 In jurisdictions that recognize copyright laws, the author or authors of this
 software dedicate any and all copyright interest in the software to the public
 domain. We make this dedication for the benefit of the public at large and
-to the detriment of our heirs and successors. We intend this dedication to
-be an overt act of relinquishment in perpetuity of all present and future
-rights to this software under copyright law.
+to the detriment of our heirs and
+successors. We intend this dedication to be an overt act of relinquishment
+in perpetuity of all present and future rights to this software under copyright
+law.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
 FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS
 BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH
-THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. For more information,
-please refer to <https://unlicense.org/>
+THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+For more information, please refer to <http://unlicense.org/>
diff --git a/options/license/VOSTROM b/options/license/VOSTROM
index 43c1c87d6a..0bf372247c 100644
--- a/options/license/VOSTROM
+++ b/options/license/VOSTROM
@@ -1,5 +1,6 @@
-VOSTROM Public License for Open Source Copyright (c) 2007 VOSTROM Holdings,
-Inc.
+VOSTROM Public License for Open Source
+
+Copyright (c) 2007 VOSTROM Holdings, Inc.
 
 This VOSTROM Holdings, Inc. (VOSTROM) Distribution (code and documentation)
 is made available to the open source community as a public service by VOSTROM.
diff --git a/options/license/VSL-1.0 b/options/license/VSL-1.0
index dd7bb74068..20c48249da 100644
--- a/options/license/VSL-1.0
+++ b/options/license/VSL-1.0
@@ -1,8 +1,11 @@
-Vovida Software License v. 1.0 This license applies to all software incorporated
-in the "Vovida Open Communication Application Library" except for those portions
-incorporating third party software specifically identified as being licensed
-under separate license. The Vovida Software License, Version 1.0 Copyright
-(c) 2000 Vovida Networks, Inc. All rights reserved.
+Vovida Software License v. 1.0
+
+This license applies to all software incorporated in the "Vovida Open Communication
+Application Library" except for those portions incorporating third party software
+specifically identified as being licensed under separate license.
+
+The Vovida Software License, Version 1.0
+Copyright (c) 2000 Vovida Networks, Inc. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
 are permitted provided that the following conditions are met:
diff --git a/options/license/Vim b/options/license/Vim
index 80349f7f1f..05738e69de 100644
--- a/options/license/Vim
+++ b/options/license/Vim
@@ -2,23 +2,22 @@ VIM LICENSE
 
 I) There are no restrictions on distributing unmodified copies of Vim except
 that they must include this license text. You can also distribute unmodified
-parts of Vim , likewise unrestricted except that they must include this license
+parts of Vim, likewise unrestricted except that they must include this license
 text. You are also allowed to include executables that you made from the unmodified
 Vim sources, plus your own usage examples and Vim scripts.
 
-II) It is allowed to distribute a modified (or extended) version of Vim ,
-including executables and/or source code, when the following four conditions
-are met:
+II) It is allowed to distribute a modified (or extended) version of Vim, including
+executables and/or source code, when the following four conditions are met:
 
-      1) This license text must be included unmodified.
+     1) This license text must be included unmodified.
 
-2) The modified Vim must be distributed in one of the following five ways:
+     2) The modified Vim must be distributed in one of the following five ways:
 
 a) If you make changes to Vim yourself, you must clearly describe in the distribution
 how to contact you. When the maintainer asks you (in any way) for a copy of
 the modified Vim you distributed, you must make your changes, including source
 code, available to the maintainer without fee. The maintainer reserves the
-right to include your changes in the official version of Vim . What the maintainer
+right to include your changes in the official version of Vim. What the maintainer
 will do with your changes and under what license they will be distributed
 is negotiable. If there has been no negotiation then this license, or a later
 version, also applies to your changes. The current maintainer is Bram Moolenaar
@@ -36,24 +35,21 @@ c) Provide all the changes, including source code, with every copy of the
 modified Vim you distribute. This may be done in the form of a context diff.
 You can choose what license to use for new code you add. The changes and their
 license must not restrict others from making their own changes to the official
-version of Vim .
+version of Vim.
 
 d) When you have a modified Vim which includes changes as mentioned under
 c), you can distribute it without the source code for the changes if the following
 three conditions are met:
-
 - The license that applies to the changes permits you to distribute the changes
 to the Vim maintainer without fee or restriction, and permits the Vim maintainer
 to include the changes in the official version of Vim without fee or restriction.
-
 - You keep the changes for at least three years after last distributing the
-corresponding modified Vim . When the maintainer or someone who you distributed
+corresponding modified Vim. When the maintainer or someone who you distributed
 the modified Vim to asks you (in any way) for the changes within this period,
 you must make them available to him.
-
 - You clearly describe in the distribution how to contact you. This contact
 information must remain valid for at least three years after last distributing
-the corresponding modified Vim , or as long as possible.
+the corresponding modified Vim, or as long as possible.
 
 e) When the GNU General Public License (GPL) applies to the changes, you can
 distribute the modified Vim under the GNU GPL version 2 or any later version.
@@ -67,7 +63,7 @@ license used for the changes.
 4) The contact information as required under 2)a) and 2)d) must not be removed
 or changed, except that the person himself can make corrections.
 
-III) If you distribute a modified version of Vim , you are encouraged to use
+III) If you distribute a modified version of Vim, you are encouraged to use
 the Vim license for your changes and make them available to the maintainer,
 including the source code. The preferred way to do this is by e-mail or by
 uploading the files to a server and e-mailing the URL. If the number of changes
diff --git a/options/license/W3C b/options/license/W3C
index 0c2f0943f2..095b6e0afb 100644
--- a/options/license/W3C
+++ b/options/license/W3C
@@ -40,7 +40,9 @@ CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENTATION.
 The name and trademarks of copyright holders may NOT be used in advertising
 or publicity pertaining to the software without specific, written prior permission.
 Title to copyright in this software and any associated documentation will
-at all times remain with copyright holders. Notes
+at all times remain with copyright holders.
+
+Notes
 
 This version: http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
 
diff --git a/options/license/W3C-19980720 b/options/license/W3C-19980720
index 3adf89b95f..9fdda10755 100644
--- a/options/license/W3C-19980720
+++ b/options/license/W3C-19980720
@@ -1,6 +1,8 @@
-W3C® SOFTWARE NOTICE AND LICENSE Copyright (c) 1994-2002 World Wide Web Consortium,
-(Massachusetts Institute of Technology, Institut National de Recherche en
-Informatique et en Automatique, Keio University). All Rights Reserved. http://www.w3.org/Consortium/Legal/
+W3C® SOFTWARE NOTICE AND LICENSE
+
+Copyright (c) 1994-2002 World Wide Web Consortium, (Massachusetts Institute
+of Technology, Institut National de Recherche en Informatique et en Automatique,
+Keio University). All Rights Reserved. http://www.w3.org/Consortium/Legal/
 
 This W3C work (including software, documents, or other related items) is being
 provided by the copyright holders under the following license. By obtaining,
@@ -8,15 +10,15 @@ using and/or copying this work, you (the licensee) agree that you have read,
 understood, and will comply with the following terms and conditions:
 
 Permission to use, copy, modify, and distribute this software and its documentation,
-with or without modification, for any purpose and without fee or royalty is
-hereby granted, provided that you include the following on ALL copies of the
-software and documentation or portions thereof, including modifications, that
-you make:
+with or without modification,  for any purpose and without fee or royalty
+is hereby granted, provided that you include the following on ALL copies of
+the software and documentation or portions thereof, including modifications,
+that you make:
 
-1. The full text of this NOTICE in a location viewable to users of the redistributed
+1.	The full text of this NOTICE in a location viewable to users of the redistributed
 or derivative work.
 
-2. Any pre-existing intellectual property disclaimers, notices, or terms and
+2.	Any pre-existing intellectual property disclaimers, notices, or terms and
 conditions. If none exist, a short notice of the following form (hypertext
 is preferred, text is permitted) should be used within the body of any redistributed
 or derivative code: "Copyright © [$date-of-software] World Wide Web Consortium,
@@ -39,7 +41,9 @@ CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENTATION.
 The name and trademarks of copyright holders may NOT be used in advertising
 or publicity pertaining to the software without specific, written prior permission.
 Title to copyright in this software and any associated documentation will
-at all times remain with copyright holders. ____________________________________
+at all times remain with copyright holders.
+
+____________________________________
 
 This formulation of W3C's notice and license became active on August 14 1998
 so as to improve compatibility with GPL. This version ensures that W3C software
diff --git a/options/license/W3C-20150513 b/options/license/W3C-20150513
index 0cd5d718dc..5efb1db6d1 100644
--- a/options/license/W3C-20150513
+++ b/options/license/W3C-20150513
@@ -1,7 +1,6 @@
 This work is being provided by the copyright holders under the following license.
 
 License
-
 By obtaining and/or copying this work, you (the licensee) agree that you have
 read, understood, and will comply with the following terms and conditions.
 
@@ -12,18 +11,15 @@ modifications:
 
 • The full text of this NOTICE in a location viewable to users of the redistributed
 or derivative work.
-
 • Any pre-existing intellectual property disclaimers, notices, or terms and
 conditions. If none exist, the W3C Software and Document Short Notice should
 be included.
-
 • Notice of any changes or modifications, through a copyright statement on
 the new code or document such as "This software or document includes material
 copied from or derived from [title and URI of the W3C document]. Copyright
 (c) [YEAR] W3C® (MIT, ERCIM, Keio, Beihang)."
 
 Disclaimers
-
 THIS WORK IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS
 OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES
 OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF
diff --git a/options/license/WTFPL b/options/license/WTFPL
index 9c31ddad0a..0b6ab02a1a 100644
--- a/options/license/WTFPL
+++ b/options/license/WTFPL
@@ -1,5 +1,4 @@
 DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
-
 Version 2, December 2004
 
 Copyright (C) 2004 Sam Hocevar <sam@hocevar.net>
@@ -8,7 +7,6 @@ Everyone is permitted to copy and distribute verbatim or modified copies of
 this license document, and changing it is allowed as long as the name is changed.
 
 DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
-
 TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
-   0. You just DO WHAT THE FUCK YOU WANT TO.
+  0. You just DO WHAT THE FUCK YOU WANT TO.
diff --git a/options/license/Watcom-1.0 b/options/license/Watcom-1.0
index 79964c4085..7bb2ee164b 100644
--- a/options/license/Watcom-1.0
+++ b/options/license/Watcom-1.0
@@ -239,7 +239,7 @@ to this License. Sybase may, at its sole discretion, choose to license such
 Sybase Modifications under this License, or on different terms from those
 contained in this License or may choose not to license them at all.
 
-   12. Termination.
+12. Termination.
 
 12.1 Termination. This License and the rights granted hereunder will terminate:
 
@@ -266,7 +266,7 @@ for compensation, indemnity or damages of any sort solely as a result of termina
 this License in accordance with its terms, and termination of this License
 will be without prejudice to any other right or remedy of any party.
 
-   13. Miscellaneous.
+13. Miscellaneous.
 
 13.1 Government End Users. The Covered Code is a "commercial item" as defined
 in FAR 2.101. Government software and technical data rights in the Covered
@@ -317,15 +317,15 @@ for the International Sale of Goods is expressly excluded.
 agreement between the parties with respect to the subject matter hereof. This
 License shall be governed by the laws of the United States and the State of
 California, except that body of California law concerning conflicts of law.
-
 Where You are located in the province of Quebec, Canada, the following clause
 applies: The parties hereby confirm that they have requested that this License
 and all related documents be drafted in English. Les parties ont exigè que
 le prèsent contrat et tous les documents connexes soient rèdiès en anglais.
+
+
 EXHIBIT A.
 
 "Portions Copyright (c) 1983-2002 Sybase, Inc. All Rights Reserved.
-
 This file contains Original Code and/or Modifications of Original Code as
 defined in and that are subject to the Sybase Open Watcom Public License version
 1.0 (the 'License'). You may not use this file except in compliance with the
diff --git a/options/license/Wsuipa b/options/license/Wsuipa
index cfbd46f907..f527947022 100644
--- a/options/license/Wsuipa
+++ b/options/license/Wsuipa
@@ -3,6 +3,7 @@ Guenther and pointers to this file were added to all source files.
 
 Unlimited copying and redistribution of each of the files is permitted as
 long as the file is not modified. Modifications, and redistribution of modified
-versions, are also permitted, but only if the resulting file is renamed. The
-copyright holder is Washington State University. The original author of the
-fonts is Janene Winter. The primary contact (as of 2008) is Dean Guenther.
+versions, are also permitted, but only if the resulting file is renamed.
+
+The copyright holder is Washington State University. The original author of
+the fonts is Janene Winter. The primary contact (as of 2008) is Dean Guenther.
diff --git a/options/license/WxWindows-exception-3.1 b/options/license/WxWindows-exception-3.1
index abcbb5a1d2..9e71b0ae3f 100644
--- a/options/license/WxWindows-exception-3.1
+++ b/options/license/WxWindows-exception-3.1
@@ -1,9 +1,9 @@
 EXCEPTION NOTICE
 
-   1. As a special exception, the copyright holders of this library give permission for additional uses of the text contained in this release of the library as licenced under the wxWindows Library Licence, applying either version 3.1 of the Licence, or (at your option) any later version of the Licence as published by the copyright holders of version 3.1 of the Licence document.
+1. As a special exception, the copyright holders of this library give permission for additional uses of the text contained in this release of the library as licenced under the wxWindows Library Licence, applying either version 3.1 of the Licence, or (at your option) any later version of the Licence as published by the copyright holders of version 3.1 of the Licence document.
 
-   2. The exception is that you may use, copy, link, modify and distribute under your own terms, binary object code versions of works based on the Library.
+2. The exception is that you may use, copy, link, modify and distribute under your own terms, binary object code versions of works based on the Library.
 
-   3. If you copy code from files distributed under the terms of the GNU General Public Licence or the GNU Library General Public Licence into a copy of this library, as this licence permits, the exception does not apply to the code that you add in this way. To avoid misleading anyone as to the status of such modified files, you must delete this exception notice from such code and/or adjust the licensing conditions notice accordingly.
+3. If you copy code from files distributed under the terms of the GNU General Public Licence or the GNU Library General Public Licence into a copy of this library, as this licence permits, the exception does not apply to the code that you add in this way. To avoid misleading anyone as to the status of such modified files, you must delete this exception notice from such code and/or adjust the licensing conditions notice accordingly.
 
-   4. If you write modifications of your own for this library, it is your choice whether to permit this exception to apply to your modifications. If you do not wish that, you must delete the exception notice from such code and/or adjust the licensing conditions notice accordingly.
+4. If you write modifications of your own for this library, it is your choice whether to permit this exception to apply to your modifications. If you do not wish that, you must delete the exception notice from such code and/or adjust the licensing conditions notice accordingly.
diff --git a/options/license/X11 b/options/license/X11
index da478eb05a..5994ddf732 100644
--- a/options/license/X11
+++ b/options/license/X11
@@ -1,4 +1,6 @@
-X11 License Copyright (C) 1996 X Consortium
+X11 License
+
+Copyright (C) 1996 X Consortium
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/options/license/XFree86-1.1 b/options/license/XFree86-1.1
index 5ba31cc2f9..0b64beb5dd 100644
--- a/options/license/XFree86-1.1
+++ b/options/license/XFree86-1.1
@@ -1,5 +1,6 @@
-XFree86 License (version 1.1) Copyright (C) 1994-2006 The XFree86 Project, Inc.
+XFree86 License (version 1.1)
 
+Copyright (C) 1994-2006 The XFree86 Project, Inc.
 All rights reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/options/license/XSkat b/options/license/XSkat
index 29586220cf..fd68bf9fe3 100644
--- a/options/license/XSkat
+++ b/options/license/XSkat
@@ -1,16 +1,13 @@
 This program is free software; you can redistribute it freely.
-
 Use it at your own risk; there is NO WARRANTY.
 
 Redistribution of modified versions is permitted provided that the following
 conditions are met:
 
-   1. All copyright & permission notices are preserved.
-
-   2.a) Only changes required for packaging or porting are made.
-
-   or
+1. All copyright & permission notices are preserved.
 
+2.a) Only changes required for packaging or porting are made.
+     or
 2.b) It is clearly stated who last changed the program. The program is renamed
 or the version number is of the form x.y.z, where x.y is the version of the
 original program and z is an arbitrary suffix.
diff --git a/options/license/Xnet b/options/license/Xnet
index dba87b3f80..082ccdf980 100644
--- a/options/license/Xnet
+++ b/options/license/Xnet
@@ -1,5 +1,6 @@
-The X.Net, Inc. License Copyright (c) 2000-2001 X.Net, Inc. Lafayette, California,
-USA
+The X.Net, Inc. License
+
+Copyright (c) 2000-2001 X.Net, Inc. Lafayette, California, USA
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/options/license/YPL-1.0 b/options/license/YPL-1.0
index cd2b511268..fe6d967d8a 100644
--- a/options/license/YPL-1.0
+++ b/options/license/YPL-1.0
@@ -10,7 +10,7 @@ this Agreement.
 In consideration of the mutual promises and upon the terms and conditions
 set forth below, the parties agree as follows:
 
-   1. Grant of Copyright License
+1. Grant of Copyright License
 
 1.1 - Subject to the terms and conditions of this Agreement, Yahoo! hereby
 grants to You, under any and all of its copyright interest in and to the Software,
@@ -55,13 +55,12 @@ source code to any Modification granted by You as described in Section 1.3.
 entirely Your own work (i.e., which do not incorporate any portion of the
 Software and are not Modifications) under any terms You choose.
 
-   2. Support
-
+2. Support
 Yahoo! has no obligation to provide technical support or updates to You. Nothing
 in this Agreement requires Yahoo! to enter into any license with You for any
 other edition of the Software.
 
-   3. Intellectual Property Rights
+3.  Intellectual Property Rights
 
 3.1 - Except for the license expressly granted under copyright in Section
 1.1, no rights, licenses or forbearances are granted or may arise in relation
@@ -79,8 +78,7 @@ Software.
 3.3 - This license does not grant You rights to use any party's name, logo,
 or trademarks, except solely as necessary to comply with Section 3.2.
 
-   4. Disclaimer of Warranties
-
+4.  Disclaimer of Warranties
 THE SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTY OF ANY KIND. YAHOO!
 MAKES NO WARRANTIES, WHETHER EXPRESS, IMPLIED, OR STATUTORY REGARDING OR RELATING
 TO THE SOFTWARE. SPECIFICALLY, YAHOO! DOES NOT WARRANT THAT THE SOFTWARE WILL
@@ -90,8 +88,7 @@ OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE (EVEN IF YAHOO! HAD BEEN
 INFORMED OF SUCH PURPOSE), AND NONINFRINGEMENT WITH RESPECT TO THE SOFTWARE,
 ANY MODIFICATIONS THERETO AND WITH RESPECT TO THE USE OF THE FOREGOING.
 
-   5. Limitation of Liability
-
+5.  Limitation of Liability
 IN NO EVENT WILL YAHOO! BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
 EXEMPLARY, OR CONSEQUENTIAL DAMAGES OF ANY KIND (INCLUDING WITHOUT LIMITATION
 LOSS OF PROFITS, LOSS OF USE, BUSINESS INTERRUPTION, LOSS OF DATA, COST OF
@@ -100,7 +97,7 @@ PERFORMANCE OR USE OF THE SOFTWARE OR ANY OTHER RIGHTS GRANTED HEREUNDER,
 WHETHER ALLEGED AS A BREACH OF CONTRACT OR TORTIOUS CONDUCT, INCLUDING NEGLIGENCE,
 AND EVEN IF YAHOO! HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
 
-   6. Term and Termination
+6.  Term and Termination
 
 6.1 - This Agreement will continue in effect unless and until terminated earlier
 pursuant to this Section 6.
@@ -117,8 +114,7 @@ reservation of rights (Section 3.1), provisions disclaiming or limiting Yahoo!'s
 liability (Sections 4 and 5), Termination (Section 6) or Miscellaneous (Section
 7), which provisions will survive termination of this Agreement.
 
-   7. Miscellaneous
-
+7.  Miscellaneous
 This Agreement contains the entire agreement of the parties with respect to
 the subject matter of this Agreement and supersedes all previous communications,
 representations, understandings and agreements, either oral or written, between
diff --git a/options/license/YPL-1.1 b/options/license/YPL-1.1
index 881dd3b929..c5ad52b51d 100644
--- a/options/license/YPL-1.1
+++ b/options/license/YPL-1.1
@@ -10,7 +10,7 @@ this Agreement.
 In consideration of the mutual promises and upon the terms and conditions
 set forth below, the parties agree as follows:
 
-   1. Grant of Copyright License
+1. Grant of Copyright License
 
 1.1 - Subject to the terms and conditions of this Agreement, Yahoo! hereby
 grants to You, under any and all of its copyright interest in and to the Software,
@@ -55,13 +55,12 @@ source code to any Modification granted by You as described in Section 1.3.
 entirely Your own work (i.e., which do not incorporate any portion of the
 Software and are not Modifications) under any terms You choose.
 
-   2. Support
-
+2. Support
 Yahoo! has no obligation to provide technical support or updates to You. Nothing
 in this Agreement requires Yahoo! to enter into any license with You for any
 other edition of the Software.
 
-   3. Intellectual Property Rights
+3. Intellectual Property Rights
 
 3.1 - Except for the license expressly granted under copyright in Section
 1.1, no rights, licenses or forbearances are granted or may arise in relation
@@ -79,8 +78,7 @@ Software.
 3.3 - This license does not grant You rights to use any party's name, logo,
 or trademarks, except solely as necessary to comply with Section 3.2.
 
-   4. Disclaimer of Warranties
-
+4. Disclaimer of Warranties
 THE SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTY OF ANY KIND. YAHOO!
 MAKES NO WARRANTIES, WHETHER EXPRESS, IMPLIED, OR STATUTORY REGARDING OR RELATING
 TO THE SOFTWARE. SPECIFICALLY, YAHOO! DOES NOT WARRANT THAT THE SOFTWARE WILL
@@ -90,8 +88,7 @@ OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE (EVEN IF YAHOO! HAD BEEN
 INFORMED OF SUCH PURPOSE), AND NONINFRINGEMENT WITH RESPECT TO THE SOFTWARE,
 ANY MODIFICATIONS THERETO AND WITH RESPECT TO THE USE OF THE FOREGOING.
 
-   5. Limitation of Liability
-
+5. Limitation of Liability
 IN NO EVENT WILL YAHOO! BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
 EXEMPLARY, OR CONSEQUENTIAL DAMAGES OF ANY KIND (INCLUDING WITHOUT LIMITATION
 LOSS OF PROFITS, LOSS OF USE, BUSINESS INTERRUPTION, LOSS OF DATA, COST OF
@@ -100,7 +97,7 @@ PERFORMANCE OR USE OF THE SOFTWARE OR ANY OTHER RIGHTS GRANTED HEREUNDER,
 WHETHER ALLEGED AS A BREACH OF CONTRACT OR TORTIOUS CONDUCT, INCLUDING NEGLIGENCE,
 AND EVEN IF YAHOO! HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
 
-   6. Term and Termination
+6. Term and Termination
 
 6.1 - This Agreement will continue in effect unless and until terminated earlier
 pursuant to this Section 6.
@@ -117,8 +114,7 @@ reservation of rights (Section 3.1), provisions disclaiming or limiting Yahoo!'s
 liability (Sections 4 and 5), Termination (Section 6) or Miscellaneous (Section
 7), which provisions will survive termination of this Agreement.
 
-   7. Miscellaneous
-
+7.Miscellaneous
 This Agreement contains the entire agreement of the parties with respect to
 the subject matter of this Agreement and supersedes all previous communications,
 representations, understandings and agreements, either oral or written, between
diff --git a/options/license/ZPL-1.1 b/options/license/ZPL-1.1
index 43ae9e0109..9c86a03827 100644
--- a/options/license/ZPL-1.1
+++ b/options/license/ZPL-1.1
@@ -1,17 +1,20 @@
-Zope Public License (ZPL) Version 1.1 Copyright (c) Zope Corporation. All
-rights reserved. This license has been certified as open source.
+Zope Public License (ZPL) Version 1.1
+
+Copyright (c) Zope Corporation. All rights reserved.
+
+This license has been certified as open source.
 
 Redistribution and use in source and binary forms, with or without modification,
 are permitted provided that the following conditions are met:
 
-1. Redistributions in source code must retain the above copyright notice,
+1.  Redistributions in source code must retain the above copyright notice,
 this list of conditions, and the following disclaimer.
 
-2. Redistributions in binary form must reproduce the above copyright notice,
+2.  Redistributions in binary form must reproduce the above copyright notice,
 this list of conditions, and the following disclaimer in the documentation
 and/or other materials provided with the distribution.
 
-3. All advertising materials and documentation mentioning features derived
+3.  All advertising materials and documentation mentioning features derived
 from or use of this software must display the following acknowledgement:
 
 "This product includes software developed by Zope Corporation for use in the
@@ -20,11 +23,11 @@ Z Object Publishing Environment (http://www.zope.com/)."
 In the event that the product being advertised includes an intact Zope distribution
 (with copyright and license included) then this clause is waived.
 
-4. Names associated with Zope or Zope Corporation must not be used to endorse
+4.  Names associated with Zope or Zope Corporation must not be used to endorse
 or promote products derived from this software without prior written permission
 from Zope Corporation.
 
-5. Modified redistributions of any form whatsoever must retain the following
+5.  Modified redistributions of any form whatsoever must retain the following
 acknowledgment:
 
 "This product includes software developed by Zope Corporation for use in the
@@ -33,7 +36,7 @@ Z Object Publishing Environment (http://www.zope.com/)."
 Intact (re-)distributions of any official Zope release do not require an external
 acknowledgement.
 
-6. Modifications are encouraged but must be packaged separately as patches
+6.  Modifications are encouraged but must be packaged separately as patches
 to official Zope releases. Distributions that do not clearly separate the
 patches from the original work must be clearly labeled as unofficial distributions.
 Modifications which do not carry the name Zope may be packaged in any form,
@@ -50,6 +53,8 @@ BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
 OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
 OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. This software consists of contributions
-made by Zope Corporation and many individuals on behalf of Zope Corporation.
-Specific attributions are listed in the accompanying credits file.
+ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+This software consists of contributions made by Zope Corporation and many
+individuals on behalf of Zope Corporation. Specific attributions are listed
+in the accompanying credits file.
diff --git a/options/license/ZPL-2.0 b/options/license/ZPL-2.0
index 516081c189..dff035e015 100644
--- a/options/license/ZPL-2.0
+++ b/options/license/ZPL-2.0
@@ -1,7 +1,10 @@
-Zope Public License (ZPL) Version 2.0 This software is Copyright (c) Zope
-Corporation (tm) and Contributors. All rights reserved. This license has been
-certified as open source. It has also been designated as GPL compatible by
-the Free Software Foundation (FSF).
+Zope Public License (ZPL) Version 2.0
+
+This software is Copyright (c) Zope Corporation (tm) and Contributors. All
+rights reserved.
+
+This license has been certified as open source. It has also been designated
+as GPL compatible by the Free Software Foundation (FSF).
 
 Redistribution and use in source and binary forms, with or without modification,
 are permitted provided that the following conditions are met:
@@ -27,13 +30,15 @@ Disclaimer
 
 THIS SOFTWARE IS PROVIDED BY ZOPE CORPORATION ``AS IS'' AND ANY EXPRESSED
 OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN
 NO EVENT SHALL ZOPE CORPORATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
 INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
 BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
 OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
 OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. This software consists of contributions
-made by Zope Corporation and many individuals on behalf of Zope Corporation.
-Specific attributions are listed in the accompanying credits file.
+ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+This software consists of contributions made by Zope Corporation and many
+individuals on behalf of Zope Corporation.  Specific attributions are listed
+in the accompanying credits file.
diff --git a/options/license/ZPL-2.1 b/options/license/ZPL-2.1
index 4260feb315..34d4ee0406 100644
--- a/options/license/ZPL-2.1
+++ b/options/license/ZPL-2.1
@@ -1,5 +1,7 @@
-Zope Public License (ZPL) Version 2.1 A copyright notice accompanies this
-license document that identifies the copyright holders.
+Zope Public License (ZPL) Version 2.1
+
+A copyright notice accompanies this license document that identifies the copyright
+holders.
 
 This license has been certified as open source. It has also been designated
 as GPL compatible by the Free Software Foundation (FSF).
@@ -7,24 +9,24 @@ as GPL compatible by the Free Software Foundation (FSF).
 Redistribution and use in source and binary forms, with or without modification,
 are permitted provided that the following conditions are met:
 
-1. Redistributions in source code must retain the accompanying copyright notice,
-this list of conditions, and the following disclaimer.
+1.  Redistributions in source code must retain the accompanying copyright
+notice, this list of conditions, and the following disclaimer.
 
-2. Redistributions in binary form must reproduce the accompanying copyright
+2.  Redistributions in binary form must reproduce the accompanying copyright
 notice, this list of conditions, and the following disclaimer in the documentation
 and/or other materials provided with the distribution.
 
-3. Names of the copyright holders must not be used to endorse or promote products
-derived from this software without prior written permission from the copyright
-holders.
+3.  Names of the copyright holders must not be used to endorse or promote
+products derived from this software without prior written permission from
+the copyright holders.
 
-4. The right to distribute this software or to use it for any purpose does
+4.  The right to distribute this software or to use it for any purpose does
 not give you the right to use Servicemarks (sm) or Trademarks (tm) of the
 copyright holders. Use of them is covered by separate agreement with the copyright
 holders.
 
-5. If any files are modified, you must cause the modified files to carry prominent
-notices stating that you changed the files and the date of any change.
+5.  If any files are modified, you must cause the modified files to carry
+prominent notices stating that you changed the files and the date of any change.
 
 Disclaimer
 
diff --git a/options/license/Zed b/options/license/Zed
index 97ecbbb11d..51563a652c 100644
--- a/options/license/Zed
+++ b/options/license/Zed
@@ -1,7 +1,5 @@
 (c) Jim Davies, January 1995
-
-You may copy and distribute this file freely. Any queries and complaints should
-be forwarded to Jim.Davies@comlab.ox.ac.uk.
-
+You may copy and distribute this file freely.  Any queries and complaints
+should be forwarded to Jim.Davies@comlab.ox.ac.uk.
 If you make any changes to this file, please do not distribute the results
 under the name `zed-csp.sty'.
diff --git a/options/license/Zend-2.0 b/options/license/Zend-2.0
index c6025d22e9..a348953494 100644
--- a/options/license/Zend-2.0
+++ b/options/license/Zend-2.0
@@ -1,7 +1,5 @@
-The Zend Engine License, version 2.00 Copyright (c) 1999-2002 Zend Technologies
-Ltd. All rights reserved.
-
-
+The Zend Engine License, version 2.00
+Copyright (c) 1999-2002 Zend Technologies Ltd. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
 is permitted provided that the following conditions are met:
diff --git a/options/license/Zimbra-1.3 b/options/license/Zimbra-1.3
index 5247dcdf11..6f5c816445 100644
--- a/options/license/Zimbra-1.3
+++ b/options/license/Zimbra-1.3
@@ -10,7 +10,7 @@ this Agreement.
 In consideration of the mutual promises and upon the terms and conditions
 set forth below, the parties agree as follows:
 
-   1. Grant of Copyright License
+1. Grant of Copyright License
 
 1.1 - Subject to the terms and conditions of this Agreement, VMware hereby
 grants to You, under any and all of its copyright interest in and to the Software,
@@ -55,13 +55,12 @@ source code to any Modification granted by You as described in Section 1.3.
 entirely Your own work (i.e., which do not incorporate any portion of the
 Software and are not Modifications) under any terms You choose.
 
-   2. Support
-
+2. Support
 VMware has no obligation to provide technical support or updates to You. Nothing
 in this Agreement requires VMware to enter into any license with You for any
 other edition of the Software.
 
-   3. Intellectual Property Rights
+3. Intellectual Property Rights
 
 3.1 - Except for the license expressly granted under copyright in Section
 1.1, no rights, licenses or forbearances are granted or may arise in relation
@@ -79,8 +78,7 @@ Software.
 3.3 - This license does not grant You rights to use any party's name, logo,
 or trademarks, except solely as necessary to comply with Section 3.2.
 
-   4. Disclaimer of Warranties
-
+4. Disclaimer of Warranties
 THE SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTY OF ANY KIND. VMWARE
 MAKES NO WARRANTIES, WHETHER EXPRESS, IMPLIED, OR STATUTORY REGARDING OR RELATING
 TO THE SOFTWARE. SPECIFICALLY, VMWARE DOES NOT WARRANT THAT THE SOFTWARE WILL
@@ -90,8 +88,7 @@ OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE (EVEN IF VMWARE HAD BEEN
 INFORMED OF SUCH PURPOSE), AND NONINFRINGEMENT WITH RESPECT TO THE SOFTWARE,
 ANY MODIFICATIONS THERETO AND WITH RESPECT TO THE USE OF THE FOREGOING.
 
-   5. Limitation of Liability
-
+5. Limitation of Liability
 IN NO EVENT WILL VMWARE BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
 EXEMPLARY, OR CONSEQUENTIAL DAMAGES OF ANY KIND (INCLUDING WITHOUT LIMITATION
 LOSS OF PROFITS, LOSS OF USE, BUSINESS INTERRUPTION, LOSS OF DATA, COST OF
@@ -100,7 +97,7 @@ PERFORMANCE OR USE OF THE SOFTWARE OR ANY OTHER RIGHTS GRANTED HEREUNDER,
 WHETHER ALLEGED AS A BREACH OF CONTRACT OR TORTIOUS CONDUCT, INCLUDING NEGLIGENCE,
 AND EVEN IF VMWARE HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
 
-   6. Term and Termination
+6. Term and Termination
 
 6.1 - This Agreement will continue in effect unless and until terminated earlier
 pursuant to this Section 6.
@@ -117,8 +114,7 @@ reservation of rights (Section 3.1), provisions disclaiming or limiting VMware's
 liability (Sections 4 and 5), Termination (Section 6) or Miscellaneous (Section
 7), which provisions will survive termination of this Agreement.
 
-   7. Miscellaneous
-
+7. Miscellaneous
 This Agreement contains the entire agreement of the parties with respect to
 the subject matter of this Agreement and supersedes all previous communications,
 representations, understandings and agreements, either oral or written, between
diff --git a/options/license/Zimbra-1.4 b/options/license/Zimbra-1.4
index f6d45292f2..5c6b294874 100644
--- a/options/license/Zimbra-1.4
+++ b/options/license/Zimbra-1.4
@@ -1,22 +1,22 @@
 Zimbra Public License, Version 1.4 (ZPL)
 
-This Zimbra Public License (this "Agreement") is a legal agreement that describes
-the terms under which Zimbra, Inc., a Texas corporation ("Zimbra") will provide
-software to you via download or otherwise ("Software"). By using the Software,
-you, an individual or an entity ("You") agree to the terms of this Agreement.
+This Zimbra Public License (this “Agreement”) is a legal agreement that describes
+the terms under which Zimbra, Inc., a Texas corporation (“Zimbra”) will provide
+software to you via download or otherwise (“Software”). By using the Software,
+you, an individual or an entity (“You”) agree to the terms of this Agreement.
 
 In consideration of the mutual promises and upon the terms and conditions
 set forth below, the parties agree as follows:
 
-   1. Grant of Copyright License
+1. Grant of Copyright License
 
 1.1 - Subject to the terms and conditions of this Agreement, Zimbra hereby
 grants to You, under any and all of its copyright interest in and to the Software,
 a royalty-free, non-exclusive, non-transferable license to copy, modify, compile,
 execute, and distribute the Software and Modifications. For the purposes of
 this Agreement, any change to, addition to, or abridgement of the Software
-made by You is a "Modification;" however, any file You add to the Software
-that does not contain any part of the Software is not a "Modification."
+made by You is a “Modification;” however, any file You add to the Software
+that does not contain any part of the Software is not a “Modification.”
 
 1.2 - If You are an individual acting on behalf of a corporation or other
 entity, Your use of the Software or any Modification is subject to Your having
@@ -30,10 +30,10 @@ a complete copy of this Agreement with Your distribution. With respect to
 any Modification You distribute in source code format, the terms of this Agreement
 will apply to You in the same way those terms apply to Zimbra with respect
 to the Software. In other words, when You are distributing Modifications under
-this Agreement, You "stand in the shoes" of Zimbra in terms of the rights
+this Agreement, You “stand in the shoes” of Zimbra in terms of the rights
 You grant and how the terms and conditions apply to You and the licensees
-of Your Modifications. Notwithstanding the foregoing, when You "stand in the
-shoes" of Zimbra, You are not subject to the jurisdiction provision under
+of Your Modifications. Notwithstanding the foregoing, when You “stand in the
+shoes” of Zimbra, You are not subject to the jurisdiction provision under
 Section 7, which requires all disputes under this Agreement to be subject
 to the jurisdiction of federal or state courts of Northern Texas.
 
@@ -53,13 +53,12 @@ source code to any Modification granted by You as described in Section 1.3.
 entirely Your own work (i.e., which do not incorporate any portion of the
 Software and are not Modifications) under any terms You choose.
 
-   2. Support
-
+2. Support
 Zimbra has no obligation to provide technical support or updates to You. Nothing
 in this Agreement requires Zimbra to enter into any license with You for any
 other edition of the Software.
 
-   3. Intellectual Property Rights
+3. Intellectual Property Rights
 
 3.1 - Except for the license expressly granted under copyright in Section
 1.1, no rights, licenses or forbearances are granted or may arise in relation
@@ -74,12 +73,11 @@ in the Software. This includes the preservation of attribution notices in
 the form of trademarks or logos that exist within a user interface of the
 Software.
 
-3.3 - This license does not grant You rights to use any party's name, logo,
+3.3 - This license does not grant You rights to use any party’s name, logo,
 or trademarks, except solely as necessary to comply with Section 3.2.
 
-   4. Disclaimer of Warranties
-
-THE SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTY OF ANY KIND. ZIMBRA
+4. Disclaimer of Warranties
+THE SOFTWARE IS PROVIDED “AS IS” AND WITHOUT WARRANTY OF ANY KIND. ZIMBRA
 MAKES NO WARRANTIES, WHETHER EXPRESS, IMPLIED, OR STATUTORY, REGARDING OR
 RELATING TO THE SOFTWARE. SPECIFICALLY, ZIMBRA DOES NOT WARRANT THAT THE SOFTWARE
 WILL BE ERROR FREE OR WILL PERFORM IN AN UNINTERRUPTED MANNER. TO THE GREATEST
@@ -88,8 +86,7 @@ OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE (EVEN IF ZIMBRA HAD BEEN
 INFORMED OF SUCH PURPOSE), AND NONINFRINGEMENT WITH RESPECT TO THE SOFTWARE,
 ANY MODIFICATIONS THERETO, AND WITH RESPECT TO THE USE OF THE FOREGOING.
 
-   5. Limitation of Liability
-
+5. Limitation of Liability
 IN NO EVENT WILL ZIMBRA BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
 EXEMPLARY, OR CONSEQUENTIAL DAMAGES OF ANY KIND (INCLUDING WITHOUT LIMITATION
 LOSS OF PROFITS, LOSS OF USE, BUSINESS INTERRUPTION, LOSS OF DATA, AND COST
@@ -98,7 +95,7 @@ PERFORMANCE, OR USE OF THE SOFTWARE OR ANY OTHER RIGHTS GRANTED HEREUNDER,
 WHETHER ALLEGED AS A BREACH OF CONTRACT OR TORTIOUS CONDUCT, INCLUDING NEGLIGENCE,
 AND EVEN IF ZIMBRA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
 
-   6. Term and Termination
+6. Term and Termination
 
 6.1 - This Agreement will continue in effect unless and until terminated earlier
 pursuant to this Section 6.
@@ -111,12 +108,11 @@ of this Agreement. Termination will be in addition to any rights and remedies
 available to Zimbra at law or equity or under this Agreement.
 
 6.4 - Termination of this Agreement will not affect the provisions regarding
-reservation of rights (Section 3.1), provisions disclaiming or limiting Zimbra's
+reservation of rights (Section 3.1), provisions disclaiming or limiting Zimbra’s
 liability (Sections 4 and 5), Termination (Section 6), or Miscellaneous (Section
 7), which provisions will survive termination of this Agreement.
 
-   7. Miscellaneous
-
+7. Miscellaneous
 This Agreement contains the entire agreement of the parties with respect to
 the subject matter of this Agreement and supersedes all previous communications,
 representations, understandings, and agreements, either oral or written, between
@@ -141,10 +137,10 @@ by You, in whole or in part, whether voluntary or by operation of law, including
 by way of sale of assets, merger, or consolidation, without the prior written
 consent of Zimbra, and any purported assignment, delegation, or transfer without
 such consent shall be void ab initio. Any waiver of the provisions of this
-Agreement or of a party's rights or remedies under this Agreement must be
+Agreement or of a party’s rights or remedies under this Agreement must be
 in writing to be effective. Failure, neglect, or delay by a party to enforce
 the provisions of this Agreement or its rights or remedies at any time will
-not be construed or be deemed to be a waiver of such party's rights under
+not be construed or be deemed to be a waiver of such party’s rights under
 this Agreement and will not in any way affect the validity of the whole or
-any part of this Agreement or prejudice such party's right to take subsequent
+any part of this Agreement or prejudice such party’s right to take subsequent
 action.
diff --git a/options/license/Zlib b/options/license/Zlib
index e197a52621..ccd742b5fc 100644
--- a/options/license/Zlib
+++ b/options/license/Zlib
@@ -1,4 +1,4 @@
-zlib License Copyright (c) <year> <copyright holders>
+zlib License
 
 This software is provided 'as-is', without any express or implied warranty.
 In no event will the authors be held liable for any damages arising from the
@@ -16,4 +16,4 @@ not required.
 2. Altered source versions must be plainly marked as such, and must not be
 misrepresented as being the original software.
 
-   3. This notice may not be removed or altered from any source distribution.
+     3. This notice may not be removed or altered from any source distribution.
diff --git a/options/license/blessing b/options/license/blessing
index fb5f182866..580ff49cb6 100644
--- a/options/license/blessing
+++ b/options/license/blessing
@@ -1,14 +1,6 @@
 The author disclaims copyright to this source code. In place of a legal notice,
 here is a blessing:
 
-   
-
-   May you do good and not evil.
-
-   
-
-   May you find forgiveness for yourself and forgive others.
-
-   
-
-   May you share freely, never taking more than you give.
+May you do good and not evil.
+May you find forgiveness for yourself and forgive others.
+May you share freely, never taking more than you give.
diff --git a/options/license/copyleft-next-0.3.0 b/options/license/copyleft-next-0.3.0
index 0cbd533876..a66d5bf5ee 100644
--- a/options/license/copyleft-next-0.3.0
+++ b/options/license/copyleft-next-0.3.0
@@ -1,206 +1,219 @@
-copyleft-next 0.3.0 ("this License")
+                   copyleft-next 0.3.0 ("this License")
+                         Release date: 2013-05-16
 
-Release date: 2013-05-16
-
-   1. License Grants; No Trademark License
+1. License Grants; No Trademark License
 
    Subject to the terms of this License, I grant You:
 
-a) A non-exclusive, worldwide, perpetual, royalty-free, irrevocable copyright
-license, to reproduce, Distribute, prepare derivative works of, publicly perform
-and publicly display My Work.
+   a) A non-exclusive, worldwide, perpetual, royalty-free, irrevocable
+      copyright license, to reproduce, Distribute, prepare derivative works
+      of, publicly perform and publicly display My Work.
 
-b) A non-exclusive, worldwide, perpetual, royalty-free, irrevocable patent
-license under Licensed Patents to make, have made, use, sell, offer for sale,
-and import Covered Works.
+   b) A non-exclusive, worldwide, perpetual, royalty-free, irrevocable
+      patent license under Licensed Patents to make, have made, use, sell,
+      offer for sale, and import Covered Works.
 
-This License does not grant any rights in My name, trademarks, service marks,
-or logos.
+   This License does not grant any rights in My name, trademarks, service
+   marks, or logos.
 
-   2. Distribution: General Conditions
+2. Distribution: General Conditions
 
-You may Distribute Covered Works, provided that You (i) inform recipients
-how they can obtain a copy of this License; (ii) satisfy the applicable conditions
-of sections 3 through 6; and (iii) preserve all Legal Notices contained in
-My Work (to the extent they remain pertinent). "Legal Notices" means copyright
-notices, license notices, license texts, and author attributions, but does
-not include logos, other graphical images, trademarks or trademark legends.
+   You may Distribute Covered Works, provided that You (i) inform
+   recipients how they can obtain a copy of this License; (ii) satisfy the
+   applicable conditions of sections 3 through 6; and (iii) preserve all
+   Legal Notices contained in My Work (to the extent they remain
+   pertinent). "Legal Notices" means copyright notices, license notices,
+   license texts, and author attributions, but does not include logos,
+   other graphical images, trademarks or trademark legends.
 
-   3. Conditions for Distributing Derived Works; Outbound GPL Compatibility
+3. Conditions for Distributing Derived Works; Outbound GPL Compatibility
 
-If You Distribute a Derived Work, You must license the entire Derived Work
-as a whole under this License, with prominent notice of such licensing. This
-condition may not be avoided through such means as separate Distribution of
-portions of the Derived Work. You may additionally license the Derived Work
-under the GPL, so that the recipient may further Distribute the Derived Work
-under either this License or the GPL.
+   If You Distribute a Derived Work, You must license the entire Derived
+   Work as a whole under this License, with prominent notice of such
+   licensing. This condition may not be avoided through such means as
+   separate Distribution of portions of the Derived Work. You may
+   additionally license the Derived Work under the GPL, so that the
+   recipient may further Distribute the Derived Work under either this
+   License or the GPL.
 
-   4. Condition Against Further Restrictions; Inbound License Compatibility
+4. Condition Against Further Restrictions; Inbound License Compatibility
 
-When Distributing a Covered Work, You may not impose further restrictions
-on the exercise of rights in the Covered Work granted under this License.
-This condition is not excused merely because such restrictions result from
-Your compliance with conditions or obligations extrinsic to this License (such
-as a court order or an agreement with a third party).
+   When Distributing a Covered Work, You may not impose further
+   restrictions on the exercise of rights in the Covered Work granted under
+   this License. This condition is not excused merely because such
+   restrictions result from Your compliance with conditions or obligations
+   extrinsic to this License (such as a court order or an agreement with a
+   third party).
 
-However, You may Distribute a Covered Work incorporating material governed
-by a license that is both OSI-Approved and FSF-Free as of the release date
-of this License, provided that Your Distribution complies with such other
-license.
+   However, You may Distribute a Covered Work incorporating material
+   governed by a license that is both OSI-Approved and FSF-Free as of the
+   release date of this License, provided that Your Distribution complies
+   with such other license.
 
-   5. Conditions for Distributing Object Code
+5. Conditions for Distributing Object Code
 
-You may Distribute an Object Code form of a Covered Work, provided that you
-accompany the Object Code with a URL through which the Corresponding Source
-is made available, at no charge, by some standard or customary means of providing
-network access to source code.
+   You may Distribute an Object Code form of a Covered Work, provided that
+   you accompany the Object Code with a URL through which the Corresponding
+   Source is made available, at no charge, by some standard or customary
+   means of providing network access to source code.
 
-If you Distribute the Object Code in a physical product or tangible storage
-medium ("Product"), the Corresponding Source must be available through such
-URL for two years from the date of Your most recent Distribution of the Object
-Code in the Product. However, if the Product itself contains or is accompanied
-by the Corresponding Source (made available in a customarily accessible manner),
-You need not also comply with the first paragraph of this section.
+   If you Distribute the Object Code in a physical product or tangible
+   storage medium ("Product"), the Corresponding Source must be available
+   through such URL for two years from the date of Your most recent
+   Distribution of the Object Code in the Product. However, if the Product
+   itself contains or is accompanied by the Corresponding Source (made
+   available in a customarily accessible manner), You need not also comply
+   with the first paragraph of this section.
 
-Each recipient of the Covered Work from You is an intended third-party beneficiary
-of this License solely as to this section 5, with the right to enforce its
-terms.
+   Each recipient of the Covered Work from You is an intended third-party
+   beneficiary of this License solely as to this section 5, with the right
+   to enforce its terms.
 
-   6. Symmetrical Licensing Condition for Upstream Contributions
+6. Symmetrical Licensing Condition for Upstream Contributions
 
-If You Distribute a work to Me specifically for inclusion in or modification
-of a Covered Work (a "Patch"), and no explicit licensing terms apply to the
-Patch, You license the Patch under this License, to the extent of Your copyright
-in the Patch. This condition does not negate the other conditions of this
-License, if applicable to the Patch.
+   If You Distribute a work to Me specifically for inclusion in or
+   modification of a Covered Work (a "Patch"), and no explicit licensing
+   terms apply to the Patch, You license the Patch under this License, to
+   the extent of Your copyright in the Patch. This condition does not
+   negate the other conditions of this License, if applicable to the Patch.
 
-   7. Nullification of Copyleft/Proprietary Dual Licensing
+7. Nullification of Copyleft/Proprietary Dual Licensing
 
-If I offer to license, for a fee, a Covered Work under terms other than a
-license that is OSI-Approved or FSF-Free as of the release date of this License
-or a numbered version of copyleft-next released by the Copyleft-Next Project,
-then the license I grant You under section 1 is no longer subject to the conditions
-in sections 2 through 5.
+   If I offer to license, for a fee, a Covered Work under terms other than
+   a license that is OSI-Approved or FSF-Free as of the release date of this
+   License or a numbered version of copyleft-next released by the
+   Copyleft-Next Project, then the license I grant You under section 1 is no
+   longer subject to the conditions in sections 2 through 5.
 
-   8. Copyleft Sunset
+8. Copyleft Sunset
 
-The conditions in sections 2 through 5 no longer apply once fifteen years
-have elapsed from the date of My first Distribution of My Work under this
-License.
+   The conditions in sections 2 through 5 no longer apply once fifteen
+   years have elapsed from the date of My first Distribution of My Work
+   under this License.
 
-   9. Pass-Through
+9. Pass-Through
 
-When You Distribute a Covered Work, the recipient automatically receives a
-license to My Work from Me, subject to the terms of this License.
+   When You Distribute a Covered Work, the recipient automatically receives
+   a license to My Work from Me, subject to the terms of this License.
 
-   10. Termination
+10. Termination
 
-   Your license grants under section 1 are automatically terminated if You
+    Your license grants under section 1 are automatically terminated if You
 
-a) fail to comply with the conditions of this License, unless You cure such
-noncompliance within thirty days after becoming aware of it, or
+    a) fail to comply with the conditions of this License, unless You cure
+       such noncompliance within thirty days after becoming aware of it, or
 
-b) initiate a patent infringement litigation claim (excluding declaratory
-judgment actions, counterclaims, and cross-claims) alleging that any part
-of My Work directly or indirectly infringes any patent.
+    b) initiate a patent infringement litigation claim (excluding
+       declaratory judgment actions, counterclaims, and cross-claims)
+       alleging that any part of My Work directly or indirectly infringes
+       any patent.
 
-Termination of Your license grants extends to all copies of Covered Works
-You subsequently obtain. Termination does not terminate the rights of those
-who have received copies or rights from You subject to this License.
+    Termination of Your license grants extends to all copies of Covered
+    Works You subsequently obtain. Termination does not terminate the
+    rights of those who have received copies or rights from You subject to
+    this License.
 
-To the extent permission to make copies of a Covered Work is necessary merely
-for running it, such permission is not terminable.
+    To the extent permission to make copies of a Covered Work is necessary
+    merely for running it, such permission is not terminable.
 
-   11. Later License Versions
+11. Later License Versions
 
-The Copyleft-Next Project may release new versions of copyleft-next, designated
-by a distinguishing version number ("Later Versions"). Unless I explicitly
-remove the option of Distributing Covered Works under Later Versions, You
-may Distribute Covered Works under any Later Version.
+    The Copyleft-Next Project may release new versions of copyleft-next,
+    designated by a distinguishing version number ("Later Versions").
+    Unless I explicitly remove the option of Distributing Covered Works
+    under Later Versions, You may Distribute Covered Works under any Later
+    Version.
 
-   12. No Warranty
+** 12. No Warranty                                                       **
+**                                                                       **
+**     My Work is provided "as-is", without warranty. You bear the risk  **
+**     of using it. To the extent permitted by applicable law, each      **
+**     Distributor of My Work excludes the implied warranties of title,  **
+**     merchantability, fitness for a particular purpose and             **
+**     non-infringement.                                                 **
 
-My Work is provided "as-is", without warranty. You bear the risk of using
-it. To the extent permitted by applicable law, each Distributor of My Work
-excludes the implied warranties of title, merchantability, fitness for a particular
-purpose and non-infringement.
+** 13. Limitation of Liability                                           **
+**                                                                       **
+**     To the extent permitted by applicable law, in no event will any   **
+**     Distributor of My Work be liable to You for any damages           **
+**     whatsoever, whether direct, indirect, special, incidental, or     **
+**     consequential damages, whether arising under contract, tort       **
+**     (including negligence), or otherwise, even where the Distributor  **
+**     knew or should have known about the possibility of such damages.  **
 
-   13. Limitation of Liability
+14. Severability
 
-To the extent permitted by applicable law, in no event will any Distributor
-of My Work be liable to You for any damages whatsoever, whether direct, indirect,
-special, incidental, or consequential damages, whether arising under contract,
-tort (including negligence), or otherwise, even where the Distributor knew
-or should have known about the possibility of such damages.
+    The invalidity or unenforceability of any provision of this License
+    does not affect the validity or enforceability of the remainder of
+    this License. Such provision is to be reformed to the minimum extent
+    necessary to make it valid and enforceable.
 
-   14. Severability
+15. Definitions
 
-The invalidity or unenforceability of any provision of this License does not
-affect the validity or enforceability of the remainder of this License. Such
-provision is to be reformed to the minimum extent necessary to make it valid
-and enforceable.
+    "Copyleft-Next Project" means the project that maintains the source
+    code repository at <https://gitorious.org/copyleft-next/> as of the
+    release date of this License.
 
-   15. Definitions
+    "Corresponding Source" of a Covered Work in Object Code form means (i)
+    the Source Code form of the Covered Work; (ii) all scripts,
+    instructions and similar information that are reasonably necessary for
+    a skilled developer to generate such Object Code from the Source Code
+    provided under (i); and (iii) a list clearly identifying all Separate
+    Works (other than those provided in compliance with (ii)) that were
+    specifically used in building and (if applicable) installing the
+    Covered Work (for example, a specified proprietary compiler including
+    its version number). Corresponding Source must be machine-readable.
 
-"Copyleft-Next Project" means the project that maintains the source code repository
-at <https://gitorious.org/copyleft-next/> as of the release date of this License.
+    "Covered Work" means My Work or a Derived Work.
 
-"Corresponding Source" of a Covered Work in Object Code form means (i) the
-Source Code form of the Covered Work; (ii) all scripts, instructions and similar
-information that are reasonably necessary for a skilled developer to generate
-such Object Code from the Source Code provided under (i); and (iii) a list
-clearly identifying all Separate Works (other than those provided in compliance
-with (ii)) that were specifically used in building and (if applicable) installing
-the Covered Work (for example, a specified proprietary compiler including
-its version number). Corresponding Source must be machine-readable.
+    "Derived Work" means a work of authorship that copies from, modifies,
+    adapts, is based on, is a derivative work of, transforms, translates or
+    contains all or part of My Work, such that copyright permission is
+    required. The following are not Derived Works: (i) Mere Aggregation;
+    (ii) a mere reproduction of My Work; and (iii) if My Work fails to
+    explicitly state an expectation otherwise, a work that merely makes
+    reference to My Work.
 
-   "Covered Work" means My Work or a Derived Work.
+    "Distribute" means to distribute, transfer or make a copy available to
+    someone else, such that copyright permission is required.
 
-"Derived Work" means a work of authorship that copies from, modifies, adapts,
-is based on, is a derivative work of, transforms, translates or contains all
-or part of My Work, such that copyright permission is required. The following
-are not Derived Works: (i) Mere Aggregation; (ii) a mere reproduction of My
-Work; and (iii) if My Work fails to explicitly state an expectation otherwise,
-a work that merely makes reference to My Work.
+    "Distributor" means Me and anyone else who Distributes a Covered Work.
 
-"Distribute" means to distribute, transfer or make a copy available to someone
-else, such that copyright permission is required.
+    "FSF-Free" means classified as 'free' by the Free Software Foundation.
 
-   "Distributor" means Me and anyone else who Distributes a Covered Work.
+    "GPL" means a version of the GNU General Public License or the GNU
+    Affero General Public License.
 
-   "FSF-Free" means classified as 'free' by the Free Software Foundation.
+    "I"/"Me"/"My" refers to the individual or legal entity that places My
+    Work under this License. "You"/"Your" refers to the individual or legal
+    entity exercising rights in My Work under this License. A legal entity
+    includes each entity that controls, is controlled by, or is under
+    common control with such legal entity. "Control" means (a) the power to
+    direct the actions of such legal entity, whether by contract or
+    otherwise, or (b) ownership of more than fifty percent of the
+    outstanding shares or beneficial ownership of such legal entity.
 
-"GPL" means a version of the GNU General Public License or the GNU Affero
-General Public License.
+    "Licensed Patents" means all patent claims licensable royalty-free by
+    Me, now or in the future, that are necessarily infringed by making,
+    using, or selling My Work, and excludes claims that would be infringed
+    only as a consequence of further modification of My Work.
 
-"I"/"Me"/"My" refers to the individual or legal entity that places My Work
-under this License. "You"/"Your" refers to the individual or legal entity
-exercising rights in My Work under this License. A legal entity includes each
-entity that controls, is controlled by, or is under common control with such
-legal entity. "Control" means (a) the power to direct the actions of such
-legal entity, whether by contract or otherwise, or (b) ownership of more than
-fifty percent of the outstanding shares or beneficial ownership of such legal
-entity.
+    "Mere Aggregation" means an aggregation of a Covered Work with a
+    Separate Work.
 
-"Licensed Patents" means all patent claims licensable royalty-free by Me,
-now or in the future, that are necessarily infringed by making, using, or
-selling My Work, and excludes claims that would be infringed only as a consequence
-of further modification of My Work.
+    "My Work" means the particular work of authorship I license to You
+    under this License.
 
-"Mere Aggregation" means an aggregation of a Covered Work with a Separate
-Work.
+    "Object Code" means any form of a work that is not Source Code.
 
-"My Work" means the particular work of authorship I license to You under this
-License.
+    "OSI-Approved" means approved as 'Open Source' by the Open Source
+    Initiative.
 
-   "Object Code" means any form of a work that is not Source Code.
+    "Separate Work" means a work that is separate from and independent of a
+    particular Covered Work and is not by its nature an extension or
+    enhancement of the Covered Work, and/or a runtime library, standard
+    library or similar component that is used to generate an Object Code
+    form of a Covered Work.
 
-"OSI-Approved" means approved as 'Open Source' by the Open Source Initiative.
-
-"Separate Work" means a work that is separate from and independent of a particular
-Covered Work and is not by its nature an extension or enhancement of the Covered
-Work, and/or a runtime library, standard library or similar component that
-is used to generate an Object Code form of a Covered Work.
-
-"Source Code" means the preferred form of a work for making modifications
-to it.
+    "Source Code" means the preferred form of a work for making
+    modifications to it.
diff --git a/options/license/copyleft-next-0.3.1 b/options/license/copyleft-next-0.3.1
index 78502791ce..21c87270fc 100644
--- a/options/license/copyleft-next-0.3.1
+++ b/options/license/copyleft-next-0.3.1
@@ -1,208 +1,220 @@
-copyleft-next 0.3.1 ("this License")
+                      copyleft-next 0.3.1 ("this License")
+                            Release date: 2016-04-29
 
-Release date: 2016-04-29
-
-   1. License Grants; No Trademark License
+1. License Grants; No Trademark License
 
    Subject to the terms of this License, I grant You:
 
-a) A non-exclusive, worldwide, perpetual, royalty-free, irrevocable copyright
-license, to reproduce, Distribute, prepare derivative works of, publicly perform
-and publicly display My Work.
+   a) A non-exclusive, worldwide, perpetual, royalty-free, irrevocable
+      copyright license, to reproduce, Distribute, prepare derivative works
+      of, publicly perform and publicly display My Work.
 
-b) A non-exclusive, worldwide, perpetual, royalty-free, irrevocable patent
-license under Licensed Patents to make, have made, use, sell, offer for sale,
-and import Covered Works.
+   b) A non-exclusive, worldwide, perpetual, royalty-free, irrevocable
+      patent license under Licensed Patents to make, have made, use, sell,
+      offer for sale, and import Covered Works.
 
-This License does not grant any rights in My name, trademarks, service marks,
-or logos.
+   This License does not grant any rights in My name, trademarks, service
+   marks, or logos.
 
-   2. Distribution: General Conditions
+2. Distribution: General Conditions
 
-You may Distribute Covered Works, provided that You (i) inform recipients
-how they can obtain a copy of this License; (ii) satisfy the applicable conditions
-of sections 3 through 6; and (iii) preserve all Legal Notices contained in
-My Work (to the extent they remain pertinent). "Legal Notices" means copyright
-notices, license notices, license texts, and author attributions, but does
-not include logos, other graphical images, trademarks or trademark legends.
+   You may Distribute Covered Works, provided that You (i) inform
+   recipients how they can obtain a copy of this License; (ii) satisfy the
+   applicable conditions of sections 3 through 6; and (iii) preserve all
+   Legal Notices contained in My Work (to the extent they remain
+   pertinent). "Legal Notices" means copyright notices, license notices,
+   license texts, and author attributions, but does not include logos,
+   other graphical images, trademarks or trademark legends.
 
-   3. Conditions for Distributing Derived Works; Outbound GPL Compatibility
+3. Conditions for Distributing Derived Works; Outbound GPL Compatibility
 
-If You Distribute a Derived Work, You must license the entire Derived Work
-as a whole under this License, with prominent notice of such licensing. This
-condition may not be avoided through such means as separate Distribution of
-portions of the Derived Work.
+   If You Distribute a Derived Work, You must license the entire Derived
+   Work as a whole under this License, with prominent notice of such
+   licensing. This condition may not be avoided through such means as
+   separate Distribution of portions of the Derived Work.
 
-If the Derived Work includes material licensed under the GPL, You may instead
-license the Derived Work under the GPL.
+   If the Derived Work includes material licensed under the GPL, You may
+   instead license the Derived Work under the GPL.
 
-   4. Condition Against Further Restrictions; Inbound License Compatibility
+4. Condition Against Further Restrictions; Inbound License Compatibility
 
-When Distributing a Covered Work, You may not impose further restrictions
-on the exercise of rights in the Covered Work granted under this License.
-This condition is not excused merely because such restrictions result from
-Your compliance with conditions or obligations extrinsic to this License (such
-as a court order or an agreement with a third party).
+   When Distributing a Covered Work, You may not impose further
+   restrictions on the exercise of rights in the Covered Work granted under
+   this License. This condition is not excused merely because such
+   restrictions result from Your compliance with conditions or obligations
+   extrinsic to this License (such as a court order or an agreement with a
+   third party).
 
-However, You may Distribute a Covered Work incorporating material governed
-by a license that is both OSI-Approved and FSF-Free as of the release date
-of this License, provided that compliance with such other license would not
-conflict with any conditions stated in other sections of this License.
+   However, You may Distribute a Covered Work incorporating material
+   governed by a license that is both OSI-Approved and FSF-Free as of the
+   release date of this License, provided that compliance with such
+   other license would not conflict with any conditions stated in other
+   sections of this License.
 
-   5. Conditions for Distributing Object Code
+5. Conditions for Distributing Object Code
 
-You may Distribute an Object Code form of a Covered Work, provided that you
-accompany the Object Code with a URL through which the Corresponding Source
-is made available, at no charge, by some standard or customary means of providing
-network access to source code.
+   You may Distribute an Object Code form of a Covered Work, provided that
+   you accompany the Object Code with a URL through which the Corresponding
+   Source is made available, at no charge, by some standard or customary
+   means of providing network access to source code.
 
-If you Distribute the Object Code in a physical product or tangible storage
-medium ("Product"), the Corresponding Source must be available through such
-URL for two years from the date of Your most recent Distribution of the Object
-Code in the Product. However, if the Product itself contains or is accompanied
-by the Corresponding Source (made available in a customarily accessible manner),
-You need not also comply with the first paragraph of this section.
+   If you Distribute the Object Code in a physical product or tangible
+   storage medium ("Product"), the Corresponding Source must be available
+   through such URL for two years from the date of Your most recent
+   Distribution of the Object Code in the Product. However, if the Product
+   itself contains or is accompanied by the Corresponding Source (made
+   available in a customarily accessible manner), You need not also comply
+   with the first paragraph of this section.
 
-Each direct and indirect recipient of the Covered Work from You is an intended
-third-party beneficiary of this License solely as to this section 5, with
-the right to enforce its terms.
+   Each direct and indirect recipient of the Covered Work from You is an
+   intended third-party beneficiary of this License solely as to this
+   section 5, with the right to enforce its terms.
 
-   6. Symmetrical Licensing Condition for Upstream Contributions
+6. Symmetrical Licensing Condition for Upstream Contributions
 
-If You Distribute a work to Me specifically for inclusion in or modification
-of a Covered Work (a "Patch"), and no explicit licensing terms apply to the
-Patch, You license the Patch under this License, to the extent of Your copyright
-in the Patch. This condition does not negate the other conditions of this
-License, if applicable to the Patch.
+   If You Distribute a work to Me specifically for inclusion in or
+   modification of a Covered Work (a "Patch"), and no explicit licensing
+   terms apply to the Patch, You license the Patch under this License, to
+   the extent of Your copyright in the Patch. This condition does not
+   negate the other conditions of this License, if applicable to the Patch.
 
-   7. Nullification of Copyleft/Proprietary Dual Licensing
+7. Nullification of Copyleft/Proprietary Dual Licensing
 
-If I offer to license, for a fee, a Covered Work under terms other than a
-license that is OSI-Approved or FSF-Free as of the release date of this License
-or a numbered version of copyleft-next released by the Copyleft-Next Project,
-then the license I grant You under section 1 is no longer subject to the conditions
-in sections 3 through 5.
+   If I offer to license, for a fee, a Covered Work under terms other than
+   a license that is OSI-Approved or FSF-Free as of the release date of this
+   License or a numbered version of copyleft-next released by the
+   Copyleft-Next Project, then the license I grant You under section 1 is no
+   longer subject to the conditions in sections 3 through 5.
 
-   8. Copyleft Sunset
+8. Copyleft Sunset
 
-The conditions in sections 3 through 5 no longer apply once fifteen years
-have elapsed from the date of My first Distribution of My Work under this
-License.
+   The conditions in sections 3 through 5 no longer apply once fifteen
+   years have elapsed from the date of My first Distribution of My Work
+   under this License.
 
-   9. Pass-Through
+9. Pass-Through
 
-When You Distribute a Covered Work, the recipient automatically receives a
-license to My Work from Me, subject to the terms of this License.
+   When You Distribute a Covered Work, the recipient automatically receives
+   a license to My Work from Me, subject to the terms of this License.
 
-   10. Termination
+10. Termination
 
-   Your license grants under section 1 are automatically terminated if You
+    Your license grants under section 1 are automatically terminated if You
 
-a) fail to comply with the conditions of this License, unless You cure such
-noncompliance within thirty days after becoming aware of it, or
+    a) fail to comply with the conditions of this License, unless You cure
+       such noncompliance within thirty days after becoming aware of it, or
 
-b) initiate a patent infringement litigation claim (excluding declaratory
-judgment actions, counterclaims, and cross-claims) alleging that any part
-of My Work directly or indirectly infringes any patent.
+    b) initiate a patent infringement litigation claim (excluding
+       declaratory judgment actions, counterclaims, and cross-claims)
+       alleging that any part of My Work directly or indirectly infringes
+       any patent.
 
-Termination of Your license grants extends to all copies of Covered Works
-You subsequently obtain. Termination does not terminate the rights of those
-who have received copies or rights from You subject to this License.
+    Termination of Your license grants extends to all copies of Covered
+    Works You subsequently obtain. Termination does not terminate the
+    rights of those who have received copies or rights from You subject to
+    this License.
 
-To the extent permission to make copies of a Covered Work is necessary merely
-for running it, such permission is not terminable.
+    To the extent permission to make copies of a Covered Work is necessary
+    merely for running it, such permission is not terminable.
 
-   11. Later License Versions
+11. Later License Versions
 
-The Copyleft-Next Project may release new versions of copyleft-next, designated
-by a distinguishing version number ("Later Versions"). Unless I explicitly
-remove the option of Distributing Covered Works under Later Versions, You
-may Distribute Covered Works under any Later Version.
+    The Copyleft-Next Project may release new versions of copyleft-next,
+    designated by a distinguishing version number ("Later Versions").
+    Unless I explicitly remove the option of Distributing Covered Works
+    under Later Versions, You may Distribute Covered Works under any Later
+    Version.
 
-   12. No Warranty
+** 12. No Warranty                                                       **
+**                                                                       **
+**     My Work is provided "as-is", without warranty. You bear the risk  **
+**     of using it. To the extent permitted by applicable law, each      **
+**     Distributor of My Work excludes the implied warranties of title,  **
+**     merchantability, fitness for a particular purpose and             **
+**     non-infringement.                                                 **
 
-My Work is provided "as-is", without warranty. You bear the risk of using
-it. To the extent permitted by applicable law, each Distributor of My Work
-excludes the implied warranties of title, merchantability, fitness for a particular
-purpose and non-infringement.
+** 13. Limitation of Liability                                           **
+**                                                                       **
+**     To the extent permitted by applicable law, in no event will any   **
+**     Distributor of My Work be liable to You for any damages           **
+**     whatsoever, whether direct, indirect, special, incidental, or     **
+**     consequential damages, whether arising under contract, tort       **
+**     (including negligence), or otherwise, even where the Distributor  **
+**     knew or should have known about the possibility of such damages.  **
 
-   13. Limitation of Liability
+14. Severability
 
-To the extent permitted by applicable law, in no event will any Distributor
-of My Work be liable to You for any damages whatsoever, whether direct, indirect,
-special, incidental, or consequential damages, whether arising under contract,
-tort (including negligence), or otherwise, even where the Distributor knew
-or should have known about the possibility of such damages.
+    The invalidity or unenforceability of any provision of this License
+    does not affect the validity or enforceability of the remainder of
+    this License. Such provision is to be reformed to the minimum extent
+    necessary to make it valid and enforceable.
 
-   14. Severability
+15. Definitions
 
-The invalidity or unenforceability of any provision of this License does not
-affect the validity or enforceability of the remainder of this License. Such
-provision is to be reformed to the minimum extent necessary to make it valid
-and enforceable.
+    "Copyleft-Next Project" means the project that maintains the source
+    code repository at <https://github.com/copyleft-next/copyleft-next.git/>
+    as of the release date of this License.
 
-   15. Definitions
+    "Corresponding Source" of a Covered Work in Object Code form means (i)
+    the Source Code form of the Covered Work; (ii) all scripts,
+    instructions and similar information that are reasonably necessary for
+    a skilled developer to generate such Object Code from the Source Code
+    provided under (i); and (iii) a list clearly identifying all Separate
+    Works (other than those provided in compliance with (ii)) that were
+    specifically used in building and (if applicable) installing the
+    Covered Work (for example, a specified proprietary compiler including
+    its version number). Corresponding Source must be machine-readable.
 
-"Copyleft-Next Project" means the project that maintains the source code repository
-at <https://github.com/copyleft-next/copyleft-next.git/> as of the release
-date of this License.
+    "Covered Work" means My Work or a Derived Work.
 
-"Corresponding Source" of a Covered Work in Object Code form means (i) the
-Source Code form of the Covered Work; (ii) all scripts, instructions and similar
-information that are reasonably necessary for a skilled developer to generate
-such Object Code from the Source Code provided under (i); and (iii) a list
-clearly identifying all Separate Works (other than those provided in compliance
-with (ii)) that were specifically used in building and (if applicable) installing
-the Covered Work (for example, a specified proprietary compiler including
-its version number). Corresponding Source must be machine-readable.
+    "Derived Work" means a work of authorship that copies from, modifies,
+    adapts, is based on, is a derivative work of, transforms, translates or
+    contains all or part of My Work, such that copyright permission is
+    required. The following are not Derived Works: (i) Mere Aggregation;
+    (ii) a mere reproduction of My Work; and (iii) if My Work fails to
+    explicitly state an expectation otherwise, a work that merely makes
+    reference to My Work.
 
-   "Covered Work" means My Work or a Derived Work.
+    "Distribute" means to distribute, transfer or make a copy available to
+    someone else, such that copyright permission is required.
 
-"Derived Work" means a work of authorship that copies from, modifies, adapts,
-is based on, is a derivative work of, transforms, translates or contains all
-or part of My Work, such that copyright permission is required. The following
-are not Derived Works: (i) Mere Aggregation; (ii) a mere reproduction of My
-Work; and (iii) if My Work fails to explicitly state an expectation otherwise,
-a work that merely makes reference to My Work.
+    "Distributor" means Me and anyone else who Distributes a Covered Work.
 
-"Distribute" means to distribute, transfer or make a copy available to someone
-else, such that copyright permission is required.
+    "FSF-Free" means classified as 'free' by the Free Software Foundation.
 
-   "Distributor" means Me and anyone else who Distributes a Covered Work.
+    "GPL" means a version of the GNU General Public License or the GNU
+    Affero General Public License.
 
-   "FSF-Free" means classified as 'free' by the Free Software Foundation.
+    "I"/"Me"/"My" refers to the individual or legal entity that places My
+    Work under this License. "You"/"Your" refers to the individual or legal
+    entity exercising rights in My Work under this License. A legal entity
+    includes each entity that controls, is controlled by, or is under
+    common control with such legal entity. "Control" means (a) the power to
+    direct the actions of such legal entity, whether by contract or
+    otherwise, or (b) ownership of more than fifty percent of the
+    outstanding shares or beneficial ownership of such legal entity.
 
-"GPL" means a version of the GNU General Public License or the GNU Affero
-General Public License.
+    "Licensed Patents" means all patent claims licensable royalty-free by
+    Me, now or in the future, that are necessarily infringed by making,
+    using, or selling My Work, and excludes claims that would be infringed
+    only as a consequence of further modification of My Work.
 
-"I"/"Me"/"My" refers to the individual or legal entity that places My Work
-under this License. "You"/"Your" refers to the individual or legal entity
-exercising rights in My Work under this License. A legal entity includes each
-entity that controls, is controlled by, or is under common control with such
-legal entity. "Control" means (a) the power to direct the actions of such
-legal entity, whether by contract or otherwise, or (b) ownership of more than
-fifty percent of the outstanding shares or beneficial ownership of such legal
-entity.
+    "Mere Aggregation" means an aggregation of a Covered Work with a
+    Separate Work.
 
-"Licensed Patents" means all patent claims licensable royalty-free by Me,
-now or in the future, that are necessarily infringed by making, using, or
-selling My Work, and excludes claims that would be infringed only as a consequence
-of further modification of My Work.
+    "My Work" means the particular work of authorship I license to You
+    under this License.
 
-"Mere Aggregation" means an aggregation of a Covered Work with a Separate
-Work.
+    "Object Code" means any form of a work that is not Source Code.
 
-"My Work" means the particular work of authorship I license to You under this
-License.
+    "OSI-Approved" means approved as 'Open Source' by the Open Source
+    Initiative.
 
-   "Object Code" means any form of a work that is not Source Code.
+    "Separate Work" means a work that is separate from and independent of a
+    particular Covered Work and is not by its nature an extension or
+    enhancement of the Covered Work, and/or a runtime library, standard
+    library or similar component that is used to generate an Object Code
+    form of a Covered Work.
 
-"OSI-Approved" means approved as 'Open Source' by the Open Source Initiative.
-
-"Separate Work" means a work that is separate from and independent of a particular
-Covered Work and is not by its nature an extension or enhancement of the Covered
-Work, and/or a runtime library, standard library or similar component that
-is used to generate an Object Code form of a Covered Work.
-
-"Source Code" means the preferred form of a work for making modifications
-to it.
+    "Source Code" means the preferred form of a work for making
+    modifications to it.
diff --git a/options/license/curl b/options/license/curl
index c891714b1b..6a26d9af89 100644
--- a/options/license/curl
+++ b/options/license/curl
@@ -1,6 +1,6 @@
-COPYRIGHT AND PERMISSION NOTICE Copyright (c) 1996 - 2015, Daniel Stenberg,
-<daniel@haxx.se>.
+COPYRIGHT AND PERMISSION NOTICE
 
+Copyright (c) 1996 - 2015, Daniel Stenberg, <daniel@haxx.se>.
 All rights reserved.
 
 Permission to use, copy, modify, and distribute this software for any purpose
diff --git a/options/license/diffmark b/options/license/diffmark
index b3fc7fd0a0..02d3b5013d 100644
--- a/options/license/diffmark
+++ b/options/license/diffmark
@@ -1,5 +1,2 @@
-
-
-   1. you can do what you want with it
-
-   2. I refuse any responsibility for the consequences
+1. you can do what you want with it
+2. I refuse any responsibility for the consequences
diff --git a/options/license/eGenix b/options/license/eGenix
index 1b90ef5fee..b6ada06ac0 100644
--- a/options/license/eGenix
+++ b/options/license/eGenix
@@ -1,18 +1,17 @@
 EGENIX.COM PUBLIC LICENSE AGREEMENT
+Version 1.1.0
 
-Version 1.1.0 This license agreement is based on the Python CNRI License Agreement,
-a widely accepted open- source license.
-
-   1. Introduction
+This license agreement is based on the Python CNRI License Agreement, a widely
+accepted open- source license.
 
+1. Introduction
 This "License Agreement" is between eGenix.com Software, Skills and Services
 GmbH ("eGenix.com"), having an office at Pastor-Loeh-Str. 48, D-40764 Langenfeld,
 Germany, and the Individual or Organization ("Licensee") accessing and otherwise
 using this software in source or binary form and its associated documentation
 ("the Software").
 
-   2. License
-
+2. License
 Subject to the terms and conditions of this eGenix.com Public License Agreement,
 eGenix.com hereby grants Licensee a non-exclusive, royalty-free, world-wide
 license to reproduce, analyze, test, perform and/or display publicly, prepare
@@ -21,8 +20,7 @@ derivative version, provided, however, that the eGenix.com Public License
 Agreement is retained in the Software, or in any derivative version of the
 Software prepared by Licensee.
 
-   3. NO WARRANTY
-
+3. NO WARRANTY
 eGenix.com is making the Software available to Licensee on an "AS IS" basis.
 SUBJECT TO ANY STATUTORY WARRANTIES WHICH CAN NOT BE EXCLUDED, EGENIX.COM
 MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED. BY WAY OF EXAMPLE,
@@ -30,8 +28,7 @@ BUT NOT LIMITATION, EGENIX.COM MAKES NO AND DISCLAIMS ANY REPRESENTATION OR
 WARRANTY OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT
 THE USE OF THE SOFTWARE WILL NOT INFRINGE ANY THIRD PARTY RIGHTS.
 
-   4. LIMITATION OF LIABILITY
-
+4. LIMITATION OF LIABILITY
 EGENIX.COM SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF THE SOFTWARE
 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS (INCLUDING,
 WITHOUT LIMITATION, DAMAGES FOR LOSS OF BUSINESS PROFITS, BUSINESS INTERRUPTION,
@@ -41,21 +38,18 @@ ADVISED OF THE POSSIBILITY THEREOF. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSIO
 OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THE ABOVE EXCLUSION
 OR LIMITATION MAY NOT APPLY TO LICENSEE.
 
-   5. Termination
-
+5. Termination
 This License Agreement will automatically terminate upon a material breach
 of its terms and conditions.
 
-   6. Third Party Rights
-
+6. Third Party Rights
 Any software or documentation in source or binary form provided along with
 the Software that is associated with a separate license agreement is licensed
 to Licensee under the terms of that license agreement. This License Agreement
 does not apply to those portions of the Software. Copies of the third party
 licenses are included in the Software Distribution.
 
-   7. General
-
+7. General
 Nothing in this License Agreement affects any statutory rights of consumers
 that cannot be waived or limited by contract.
 
@@ -79,16 +73,11 @@ The controlling language of this License Agreement is English. If Licensee
 has received a translation into another language, it has been provided for
 Licensee's convenience only.
 
-   8. Agreement
-
+8. Agreement
 By downloading, copying, installing or otherwise using the Software, Licensee
 agrees to be bound by the terms and conditions of this License Agreement.
 For question regarding this License Agreement, please write to:
-
-eGenix.com Software, Skills and Services GmbH
-
-Pastor-Loeh-Str. 48
-
-D-40764 Langenfeld
-
-Germany
+     eGenix.com Software, Skills and Services GmbH
+     Pastor-Loeh-Str. 48
+     D-40764 Langenfeld
+     Germany
diff --git a/options/license/etalab-2.0 b/options/license/etalab-2.0
index fcbeec2621..2ba1978351 100644
--- a/options/license/etalab-2.0
+++ b/options/license/etalab-2.0
@@ -1,167 +1,179 @@
-LICENCE OUVERTE / OPEN LICENCE ===================================================================
+LICENCE OUVERTE / OPEN LICENCE
+===================================================================
 
 - Version 2.0
-
 - Avril 2017
 
-« RÉUTILISATION » DE L'« INFORMATION » SOUS CETTE LICENCE -------------------------------------------------------------------
+
+« RÉUTILISATION » DE L’« INFORMATION » SOUS CETTE LICENCE
+-------------------------------------------------------------------
 
 Le « Concédant » concède au « Réutilisateur » un droit non exclusif et gratuit
-de libre « Réutilisation » de l'« Information » objet de la présente licence,
-à des fins commerciales ou non, dans le monde entier et pour une durée illimitée,
-dans les conditions exprimées ci-dessous.
+de libre « Réutilisation » de l’« Information » objet de la présente licence,
+à des fins commerciales ou non, dans le monde entier et pour une durée
+illimitée, dans les conditions exprimées ci-dessous.
 
-Le « Réutilisateur » est libre de réutiliser l'« Information » :
+Le « Réutilisateur » est libre de réutiliser l’« Information » :
 
-   - de la reproduire, la copier,
-
-- de l'adapter, la modifier, l'extraire et la transformer, pour créer des
+- de la reproduire, la copier,
+- de l’adapter, la modifier, l’extraire et la transformer, pour créer des
 « Informations dérivées », des produits ou des services,
-
 - de la communiquer, la diffuser, la redistribuer, la publier et la transmettre,
-
-- de l'exploiter à titre commercial, par exemple en la combinant avec d'autres
-informations, ou en l'incluant dans son propre produit ou application.
+- de l’exploiter à titre commercial, par exemple en la combinant avec d’autres
+informations, ou en l’incluant dans son propre produit ou application.
 
 Sous réserve de :
 
-- mentionner la paternité de l'« Information » : sa source (au moins le nom
-du « Concédant ») et la date de dernière mise à jour de l'« Information »
+- mentionner la paternité de l’« Information » : sa source (au moins le nom du
+« Concédant ») et la date de dernière mise à jour de l’« Information »
 réutilisée.
 
-Le « Réutilisateur » peut notamment s'acquitter de cette condition en renvoyant,
-par un lien hypertexte, vers la source de « l'Information » et assurant une
+Le « Réutilisateur » peut notamment s’acquitter de cette condition en renvoyant,
+par un lien hypertexte, vers la source de « l’Information » et assurant une
 mention effective de sa paternité.
 
 Par exemple :
 
-« Ministère de xxx - Données originales téléchargées sur http://www.data.gouv.fr/fr/datasets/xxx/,
-mise à jour du 14 février 2017 ».
+« Ministère de xxx - Données originales téléchargées sur
+http://www.data.gouv.fr/fr/datasets/xxx/, mise à jour du 14 février 2017 ».
 
-Cette mention de paternité ne confère aucun caractère officiel à la « Réutilisation
-» de l'« Information », et ne doit pas suggérer une quelconque reconnaissance
-ou caution par le « Concédant », ou par toute autre entité publique, du «
-Réutilisateur » ou de sa « Réutilisation ».
+Cette mention de paternité ne confère aucun caractère officiel à la
+« Réutilisation » de l’« Information », et ne doit pas suggérer une quelconque
+reconnaissance ou caution par le « Concédant », ou par toute autre entité
+publique, du « Réutilisateur » ou de sa « Réutilisation ».
 
-« DONNÉES À CARACTÈRE PERSONNEL » -------------------------------------------------------------------
 
-L'« Information » mise à disposition peut contenir des « Données à caractère
-personnel » pouvant faire l'objet d'une « Réutilisation ». Si tel est le cas,
+« DONNÉES À CARACTÈRE PERSONNEL »
+-------------------------------------------------------------------
+
+L’« Information » mise à disposition peut contenir des « Données à caractère
+personnel » pouvant faire l’objet d’une « Réutilisation ». Si tel est le cas,
 le « Concédant » informe le « Réutilisateur » de leur présence.
 
-L'« Information » peut être librement réutilisée, dans le cadre des droits
+L’« Information » peut être librement réutilisée, dans le cadre des droits
 accordés par la présente licence, à condition de respecter le cadre légal
 relatif à la protection des données à caractère personnel.
 
-« DROITS DE PROPRIÉTÉ INTELLECTUELLE » -------------------------------------------------------------------
+
+« DROITS DE PROPRIÉTÉ INTELLECTUELLE »
+-------------------------------------------------------------------
 
 Il est garanti au « Réutilisateur » que les éventuels « Droits de propriété
-intellectuelle » détenus par des tiers ou par le « Concédant » sur l'« Information
-» ne font pas obstacle aux droits accordés par la présente licence.
+intellectuelle » détenus par des tiers ou par le « Concédant » sur
+l’« Information » ne font pas obstacle aux droits accordés par la présente
+licence.
 
-Lorsque le « Concédant » détient des « Droits de propriété intellectuelle
-» cessibles sur l'« Information », il les cède au « Réutilisateur » de façon
-non exclusive, à titre gracieux, pour le monde entier, pour toute la durée
-des « Droits de propriété intellectuelle », et le « Réutilisateur » peut faire
-tout usage de l'« Information » conformément aux libertés et aux conditions
-définies par la présente licence.
+Lorsque le « Concédant » détient des « Droits de propriété intellectuelle »
+cessibles sur l’« Information », il les cède au « Réutilisateur » de façon non
+exclusive, à titre gracieux, pour le monde entier, pour toute la durée des
+« Droits de propriété intellectuelle », et le « Réutilisateur » peut faire tout
+usage de l’« Information » conformément aux libertés et aux conditions définies
+par la présente licence.
 
-RESPONSABILITÉ -------------------------------------------------------------------
 
-L'« Information » est mise à disposition telle que produite ou reçue par le
-« Concédant », sans autre garantie expresse ou tacite que celles prévues par
-la présente licence. L'absence de défauts ou d'erreurs éventuellement contenues
-dans l'« Information », comme la fourniture continue de l'« Information »
-n'est pas garantie par le « Concédant ». Il ne peut être tenu pour responsable
-de toute perte, préjudice ou dommage de quelque sorte causé à des tiers du
-fait de la « Réutilisation ».
+RESPONSABILITÉ
+-------------------------------------------------------------------
 
-Le « Réutilisateur » est seul responsable de la « Réutilisation » de l'« Information
-».
+L’« Information » est mise à disposition telle que produite ou reçue par le
+« Concédant », sans autre garantie expresse ou tacite que celles prévues par la
+présente licence. L’absence de défauts ou d’erreurs éventuellement contenues
+dans l’« Information », comme la fourniture continue de l’« Information » n’est
+pas garantie par le « Concédant ». Il ne peut être tenu pour responsable de
+toute perte, préjudice ou dommage de quelque sorte causé à des tiers du fait de
+la « Réutilisation ».
+
+Le « Réutilisateur » est seul responsable de la « Réutilisation » de
+l’« Information ».
 
 La « Réutilisation » ne doit pas induire en erreur des tiers quant au contenu
-de l'« Information », sa source et sa date de mise à jour.
+de l’« Information », sa source et sa date de mise à jour.
 
-DROIT APPLICABLE -------------------------------------------------------------------
+
+DROIT APPLICABLE
+-------------------------------------------------------------------
 
 La présente licence est régie par le droit français.
 
-COMPATIBILITÉ DE LA PRÉSENTE LICENCE -------------------------------------------------------------------
+
+COMPATIBILITÉ DE LA PRÉSENTE LICENCE
+-------------------------------------------------------------------
 
 La présente licence a été conçue pour être compatible avec toute licence libre
-qui exige au moins la mention de paternité et notamment avec la version antérieure
-de la présente licence ainsi qu'avec les licences :
+qui exige au moins la mention de paternité et notamment avec la version
+antérieure de la présente licence ainsi qu’avec les licences :
 
-   - « Open Government Licence » (OGL) du Royaume-Uni,
+- « Open Government Licence » (OGL) du Royaume-Uni,
+- « Creative Commons Attribution » (CC-BY) de Creative Commons et
+- « Open Data Commons Attribution » (ODC-BY) de l’Open Knowledge Foundation.
 
-   - « Creative Commons Attribution » (CC-BY) de Creative Commons et
 
-   - « Open Data Commons Attribution » (ODC-BY) de l'Open Knowledge Foundation.
-
-DÉFINITIONS -------------------------------------------------------------------
+DÉFINITIONS
+-------------------------------------------------------------------
 
 Sont considérés, au sens de la présente licence comme :
 
-Le « Concédant » : toute personne concédant un droit de « Réutilisation »
-sur l'« Information » dans les libertés et les conditions prévues par la présente
+Le « Concédant » : toute personne concédant un droit de « Réutilisation » sur
+l’« Information » dans les libertés et les conditions prévues par la présente
 licence
 
-L'« Information » :
+L’« Information » :
 
 - toute information publique figurant dans des documents communiqués ou publiés
-par une administration mentionnée au premier alinéa de l'article L.300-2 du
+par une administration mentionnée au premier alinéa de l’article L.300-2 du
 CRPA;
+- toute information mise à disposition par toute personne selon les termes et
+conditions de la présente licence.
 
-- toute information mise à disposition par toute personne selon les termes
-et conditions de la présente licence.
+La « Réutilisation » : l’utilisation de l’« Information » à d’autres fins que
+celles pour lesquelles elle a été produite ou reçue.
 
-La « Réutilisation » : l'utilisation de l'« Information » à d'autres fins
-que celles pour lesquelles elle a été produite ou reçue.
+Le « Réutilisateur »: toute personne qui réutilise les « Informations »
+conformément aux conditions de la présente licence.
 
-Le « Réutilisateur »: toute personne qui réutilise les « Informations » conformément
-aux conditions de la présente licence.
-
-Des « Données à caractère personnel » : toute information se rapportant à
-une personne physique identifiée ou identifiable, pouvant être identifiée
+Des « Données à caractère personnel » : toute information se rapportant à une
+personne physique identifiée ou identifiable, pouvant être identifiée
 directement ou indirectement. Leur « Réutilisation » est subordonnée au respect
 du cadre juridique en vigueur.
 
 Une « Information dérivée » : toute nouvelle donnée ou information créées
-directement à partir de l'« Information » ou à partir d'une combinaison de
-l'« Information » et d'autres données ou informations non soumises à cette
+directement à partir de l’« Information » ou à partir d’une combinaison de
+l’« Information » et d’autres données ou informations non soumises à cette
 licence.
 
-Les « Droits de propriété intellectuelle » : tous droits identifiés comme
-tels par le Code de la propriété intellectuelle (notamment le droit d'auteur,
-droits voisins au droit d'auteur, droit sui generis des producteurs de bases
-de données…).
+Les « Droits de propriété intellectuelle » : tous droits identifiés comme tels
+par le Code de la propriété intellectuelle (notamment le droit d’auteur, droits
+voisins au droit d’auteur, droit sui generis des producteurs de bases de
+données…).
 
-À PROPOS DE CETTE LICENCE -------------------------------------------------------------------
 
-La présente licence a vocation à être utilisée par les administrations pour
-la réutilisation de leurs informations publiques. Elle peut également être
-utilisée par toute personne souhaitant mettre à disposition de l'« Information
-» dans les conditions définies par la présente licence.
+À PROPOS DE CETTE LICENCE
+-------------------------------------------------------------------
 
-La France est dotée d'un cadre juridique global visant à une diffusion spontanée
-par les administrations de leurs informations publiques afin d'en permettre
-la plus large réutilisation.
+La présente licence a vocation à être utilisée par les administrations pour la
+réutilisation de leurs informations publiques. Elle peut également être
+utilisée par toute personne souhaitant mettre à disposition de
+l’« Information » dans les conditions définies par la présente licence.
 
-Le droit de la « Réutilisation » de l'« Information » des administrations
-est régi par le code des relations entre le public et l'administration (CRPA).
+La France est dotée d’un cadre juridique global visant à une diffusion
+spontanée par les administrations de leurs informations publiques afin d’en
+permettre la plus large réutilisation.
+
+Le droit de la « Réutilisation » de l’« Information » des administrations est
+régi par le code des relations entre le public et l’administration (CRPA).
 
 Cette licence facilite la réutilisation libre et gratuite des informations
-publiques et figure parmi les licences qui peuvent être utilisées par l'administration
-en vertu du décret pris en application de l'article L.323-2 du CRPA.
+publiques et figure parmi les licences qui peuvent être utilisées par
+l’administration en vertu du décret pris en application de l’article L.323-2
+du CRPA.
 
-Etalab est la mission chargée, sous l'autorité du Premier ministre, d'ouvrir
-le plus grand nombre de données publiques des administrations de l'Etat et
-de ses établissements publics. Elle a réalisé la Licence Ouverte pour faciliter
-la réutilisation libre et gratuite de ces informations publiques, telles que
-définies par l'article L321-1 du CRPA.
+Etalab est la mission chargée, sous l’autorité du Premier ministre, d’ouvrir le
+plus grand nombre de données publiques des administrations de l’Etat et de ses
+établissements publics. Elle a réalisé la Licence Ouverte pour faciliter la
+réutilisation libre et gratuite de ces informations publiques, telles que
+définies par l’article L321-1 du CRPA.
 
 Cette licence est la version 2.0 de la Licence Ouverte.
 
 Etalab se réserve la faculté de proposer de nouvelles versions de la Licence
-Ouverte. Cependant, les « Réutilisateurs » pourront continuer à réutiliser
-les informations qu'ils ont obtenues sous cette licence s'ils le souhaitent.
+Ouverte. Cependant, les « Réutilisateurs » pourront continuer à réutiliser les
+informations qu’ils ont obtenues sous cette licence s’ils le souhaitent.
diff --git a/options/license/freertos-exception-2.0 b/options/license/freertos-exception-2.0
index d4988d1a61..0105e95971 100644
--- a/options/license/freertos-exception-2.0
+++ b/options/license/freertos-exception-2.0
@@ -2,22 +2,18 @@ Any FreeRTOS source code, whether modified or in its original release form, or w
 
 EXCEPTION TEXT:
 
-   
+Clause 1
 
-   Clause 1
+Linking FreeRTOS statically or dynamically with other modules is making a combined work based on FreeRTOS. Thus, the terms and conditions of the GNU General Public License cover the whole combination.
 
-   Linking FreeRTOS statically or dynamically with other modules is making a combined work based on FreeRTOS. Thus, the terms and conditions of the GNU General Public License cover the whole combination.
+As a special exception, the copyright holder of FreeRTOS gives you permission to link FreeRTOS with independent modules that communicate with FreeRTOS solely through the FreeRTOS API interface, regardless of the license terms of these independent modules, and to copy and distribute the resulting combined work under terms of your choice, provided that
 
-   As a special exception, the copyright holder of FreeRTOS gives you permission to link FreeRTOS with independent modules that communicate with FreeRTOS solely through the FreeRTOS API interface, regardless of the license terms of these independent modules, and to copy and distribute the resulting combined work under terms of your choice, provided that
+Every copy of the combined work is accompanied by a written statement that details to the recipient the version of FreeRTOS used and an offer by yourself to provide the FreeRTOS source code (including any modifications you may have made) should the recipient request it.
 
-      + Every copy of the combined work is accompanied by a written statement that details to the recipient the version of FreeRTOS used and an offer by yourself to provide the FreeRTOS source code (including any modifications you may have made) should the recipient request it.
+The combined work is not itself an RTOS, scheduler, kernel or related product.
 
-      + The combined work is not itself an RTOS, scheduler, kernel or related product.
+The independent modules add significant and primary functionality to FreeRTOS and do not merely extend the existing functionality already present in FreeRTOS.
 
-      + The independent modules add significant and primary functionality to FreeRTOS and do not merely extend the existing functionality already present in FreeRTOS.
+Clause 2
 
-   
-
-   Clause 2
-
-   FreeRTOS may not be used for any competitive or comparative purpose, including the publication of any form of run time or compile time metric, without the express permission of Real Time Engineers Ltd. (this is the norm within the industry and is intended to ensure information accuracy).
+FreeRTOS may not be used for any competitive or comparative purpose, including the publication of any form of run time or compile time metric, without the express permission of Real Time Engineers Ltd. (this is the norm within the industry and is intended to ensure information accuracy).
diff --git a/options/license/gSOAP-1.3b b/options/license/gSOAP-1.3b
index 63bfadabb1..95619c0be2 100644
--- a/options/license/gSOAP-1.3b
+++ b/options/license/gSOAP-1.3b
@@ -1,10 +1,12 @@
 gSOAP Public License
 
-Version 1.3b The gSOAP public license is derived from the Mozilla Public License
-(MPL1.1). The sections that were deleted from the original MPL1.1 text are
-1.0.1, 2.1.(c),(d), 2.2.(c),(d), 8.2.(b), 10, and 11. Section 3.8 was added.
-The modified sections are 2.1.(b), 2.2.(b), 3.2 (simplified), 3.5 (deleted
-the last sentence), and 3.6 (simplified).
+Version 1.3b
+
+The gSOAP public license is derived from the Mozilla Public License (MPL1.1).
+The sections that were deleted from the original MPL1.1 text are 1.0.1, 2.1.(c),(d),
+2.2.(c),(d), 8.2.(b), 10, and 11. Section 3.8 was added. The modified sections
+are 2.1.(b), 2.2.(b), 3.2 (simplified), 3.5 (deleted the last sentence), and
+3.6 (simplified).
 
 This license applies to the gSOAP software package, with the exception of
 the soapcpp2 and wsdl2h source code located in gsoap/src and gsoap/wsdl, all
@@ -13,10 +15,9 @@ the Web server sample source code samples/webserver. To use any of these softwar
 tools and components commercially, a commercial license is required and can
 be obtained from www.genivia.com.
 
-   1 DEFINITIONS.
-
-      1.0.1.
+1  DEFINITIONS.
 
+1.0.1.
 1.1. "Contributor" means each entity that creates or contributes to the creation
 of Modifications.
 
@@ -30,7 +31,7 @@ of the Original Code, and Modifications, in each case including portions thereof
 1.4. "Electronic Distribution Mechanism" means a mechanism generally accepted
 in the software development community for the electronic transfer of data.
 
-      1.5. "Executable" means Covered Code in any form other than Source Code.
+     1.5. "Executable" means Covered Code in any form other than Source Code.
 
 1.6. "Initial Developer" means the individual or entity identified as the
 Initial Developer in the Source Code notice required by Exhibit A.
@@ -38,7 +39,7 @@ Initial Developer in the Source Code notice required by Exhibit A.
 1.7. "Larger Work" means a work which combines Covered Code or portions thereof
 with code not governed by the terms of this License.
 
-      1.8. "License" means this document.
+     1.8. "License" means this document.
 
 1.8.1. "Licensable" means having the right to grant, to the maximum extent
 possible, whether at the time of the initial grant or subsequently acquired,
@@ -47,11 +48,10 @@ any and all of the rights conveyed herein.
 1.9. "Modifications" means any addition to or deletion from the substance
 or structure of either the Original Code or any previous Modifications. When
 Covered Code is released as a series of files, a Modification is:
-
-A. Any addition to or deletion from the contents of a file containing Original
+A.  Any addition to or deletion from the contents of a file containing Original
 Code or previous Modifications.
-
-B. Any new file that contains any part of the Original Code, or previous Modifications.
+B.  Any new file that contains any part of the Original Code, or previous
+Modifications.
 
 1.10. "Original Code" means Source Code of computer software code which is
 described in the Source Code notice required by Exhibit A as Original Code,
@@ -80,54 +80,43 @@ or indirect, to cause the direction or management of such entity, whether
 by contract or otherwise, or (b) ownership of more than fifty percent (50%)
 of the outstanding shares or beneficial ownership of such entity.
 
-   2 SOURCE CODE LICENSE.
-
-      2.1. The Initial Developer Grant.
+2  SOURCE CODE LICENSE.
 
+2.1. The Initial Developer Grant.
 The Initial Developer hereby grants You a world-wide, royalty-free, non-exclusive
 license, subject to third party intellectual property claims:
-
-(a) under intellectual property rights (other than patent or trademark) Licensable
+(a)  under intellectual property rights (other than patent or trademark) Licensable
 by Initial Developer to use, reproduce, modify, display, perform, sublicense
 and distribute the Original Code (or portions thereof) with or without Modifications,
 and/or as part of a Larger Work; and
-
-(b) under patents now or hereafter owned or controlled by Initial Developer,
+(b)  under patents now or hereafter owned or controlled by Initial Developer,
 to make, have made, use and sell ("offer to sell and import") the Original
 Code, Modifications, or portions thereof, but solely to the extent that any
 such patent is reasonably necessary to enable You to utilize, alone or in
 combination with other software, the Original Code, Modifications, or any
 combination or portions thereof.
+     (c)
+     (d)
 
-         (c)
-
-         (d)
-
-      2.2. Contributor Grant.
-
+2.2. Contributor Grant.
 Subject to third party intellectual property claims, each Contributor hereby
 grants You a world-wide, royalty-free, non-exclusive license
-
-(a) under intellectual property rights (other than patent or trademark) Licensable
-by Contributor, to use, reproduce, modify, display, perform, sublicense and
-distribute the Modifications created by such Contributor (or portions thereof)
-either on an unmodified basis, with other Modifications, as Covered Code and/or
-as part of a Larger Work; and
-
-(b) under patents now or hereafter owned or controlled by Contributor, to
+(a)  under intellectual property rights (other than patent or trademark) Licensable
+by Contributor, to use, reproduce, modify, display, perform,   sublicense
+and distribute the Modifications created by such Contributor (or portions
+thereof) either on an unmodified basis, with other Modifications, as Covered
+Code and/or as part of a Larger Work; and
+(b)  under patents now or hereafter owned or controlled by Contributor, to
 make, have made, use and sell ("offer to sell and import") the Contributor
 Version (or portions thereof), but solely to the extent that any such patent
 is reasonably necessary to enable You to utilize, alone or in combination
 with other software, the Contributor Version (or portions thereof).
+     (c)
+     (d)
 
-         (c)
-
-         (d)
-
-   3 DISTRIBUTION OBLIGATIONS.
-
-      3.1. Application of License.
+3  DISTRIBUTION OBLIGATIONS.
 
+3.1. Application of License.
 The Modifications which You create or to which You contribute are governed
 by the terms of this License, including without limitation Section 2.2. The
 Source Code version of Covered Code may be distributed only under the terms
@@ -138,13 +127,11 @@ version that alters or restricts the applicable version of this License or
 the recipients' rights hereunder. However, You may include an additional document
 offering the additional rights described in Section 3.5.
 
-      3.2. Availability of Source Code.
-
-Any Modification created by You shall be provided to the Initial Developer
+3.2. Availability of Source Code.
+Any Modification created by You will be provided to the Initial Developer
 in Source Code form and are subject to the terms of the License.
 
-      3.3. Description of Modifications.
-
+3.3. Description of Modifications.
 You must cause all Covered Code to which You contribute to contain a file
 documenting the changes You made to create that Covered Code and the date
 of any change. You must include a prominent statement that the Modification
@@ -153,8 +140,7 @@ Developer and including the name of the Initial Developer in (a) the Source
 Code, and (b) in any notice in an Executable version or related documentation
 in which You describe the origin or ownership of the Covered Code.
 
-      3.4. Intellectual Property Matters.
-
+3.4. Intellectual Property Matters.
 (a) Third Party Claims. If Contributor has knowledge that a license under
 a third party's intellectual property rights is required to exercise the rights
 granted by such Contributor under Sections 2.1 or 2.2, Contributor must include
@@ -177,8 +163,7 @@ to Section 3.4(a) above, Contributor believes that Contributor's Modifications
 are Contributor's original creation(s) and/or Contributor has sufficient rights
 to grant the rights conveyed by this License.
 
-      3.5. Required Notices.
-
+3.5. Required Notices.
 You must duplicate the notice in Exhibit A in each file of the Source Code.
 If it is not possible to put such notice in a particular Source Code file
 due to its structure, then You must include such notice in a location (such
@@ -191,8 +176,7 @@ to charge a fee for, warranty, support, indemnity or liability obligations
 to one or more recipients of Covered Code. However, You may do so only on
 Your own behalf, and not on behalf of the Initial Developer or any Contributor.
 
-      3.6. Distribution of Executable Versions.
-
+3.6. Distribution of Executable Versions.
 You may distribute Covered Code in Executable form only if the requirements
 of Section 3.1-3.5 have been met for that Covered Code. You may distribute
 the Executable version of Covered Code or ownership rights under a license
@@ -207,19 +191,17 @@ you distribute executable versions containing Covered Code as part of a product,
 you must reproduce the notice in Exhibit B in the documentation and/or other
 materials provided with the product.
 
-      3.7. Larger Works.
-
+3.7. Larger Works.
 You may create a Larger Work by combining Covered Code with other code not
 governed by the terms of this License and distribute the Larger Work as a
 single product. In such a case, You must make sure the requirements of this
 License are fulfilled for the Covered Code.
 
-      3.8. Restrictions.
-
+3.8. Restrictions.
 You may not remove any product identification, copyright, proprietary notices
 or labels from gSOAP.
 
-   4 INABILITY TO COMPLY DUE TO STATUTE OR REGULATION.
+4  INABILITY TO COMPLY DUE TO STATUTE OR REGULATION.
 
 If it is impossible for You to comply with any of the terms of this License
 with respect to some or all of the Covered Code due to statute, judicial order,
@@ -231,27 +213,24 @@ Except to the extent prohibited by statute or regulation, such description
 must be sufficiently detailed for a recipient of ordinary skill to be able
 to understand it.
 
-   5 APPLICATION OF THIS LICENSE.
+5  APPLICATION OF THIS LICENSE.
 
 This License applies to code to which the Initial Developer has attached the
 notice in Exhibit A and to related Covered Code.
 
-   6 VERSIONS OF THE LICENSE.
-
-      6.1. New Versions.
+6  VERSIONS OF THE LICENSE.
 
+6.1. New Versions.
 Grantor may publish revised and/or new versions of the License from time to
 time. Each version will be given a distinguishing version number.
 
-      6.2. Effect of New Versions.
-
+6.2. Effect of New Versions.
 Once Covered Code has been published under a particular version of the License,
 You may always continue to use it under the terms of that version. You may
 also choose to use such Covered Code under the terms of any subsequent version
 of the License.
 
-      6.3. Derivative Works.
-
+6.3. Derivative Works.
 If You create or use a modified version of this License (which you may only
 do in order to apply it to code which is not already Covered Code governed
 by this License), You must (a) rename Your license so that the phrase "gSOAP"
@@ -262,7 +241,7 @@ gSOAP Public License. (Filling in the name of the Initial Developer, Original
 Code or Contributor in the notice described in Exhibit A shall not of themselves
 be deemed to be modifications of this License.)
 
-   7 DISCLAIMER OF WARRANTY.
+7  DISCLAIMER OF WARRANTY.
 
 COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTY
 OF ANY KIND, WHETHER EXPRESS, IMPLIED OR STATUTORY, INCLUDING, WITHOUT LIMITATION,
@@ -296,7 +275,7 @@ IN PHYSICAL INJURY OR LOSS OF HUMAN LIFE. THIS DISCLAIMER OF WARRANTY CONSTITUTE
 AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED
 HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
 
-   8 TERMINATION.
+8  TERMINATION.
 
 8.1. This License and the rights granted hereunder will terminate automatically
 if You fail to comply with terms herein and fail to cure such breach within
@@ -305,7 +284,7 @@ which are properly granted shall survive any termination of this License.
 Provisions which, by their nature, must remain in effect beyond the termination
 of this License shall survive.
 
-      8.2.
+8.2.
 
 8.3. If You assert a patent infringement claim against Participant alleging
 that such Participant's Contributor Version directly or indirectly infringes
@@ -320,7 +299,7 @@ user license agreements (excluding distributors and resellers) which have
 been validly granted by You or any distributor hereunder prior to termination
 shall survive termination.
 
-   9 LIMITATION OF LIABILITY.
+9  LIMITATION OF LIABILITY.
 
 UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING
 NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER, ANY
@@ -336,11 +315,11 @@ SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL
 OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO
 YOU.
 
-   10 U.S. GOVERNMENT END USERS.
+10  U.S. GOVERNMENT END USERS.
 
-   11 MISCELLANEOUS.
+11  MISCELLANEOUS.
 
-   12 RESPONSIBILITY FOR CLAIMS.
+12  RESPONSIBILITY FOR CLAIMS.
 
 As between Initial Developer and the Contributors, each party is responsible
 for claims and damages arising, directly or indirectly, out of its utilization
@@ -349,48 +328,35 @@ and Contributors to distribute such responsibility on an equitable basis.
 Nothing herein is intended or shall be deemed to constitute any admission
 of liability.
 
-   
-
-   EXHIBIT A.
+EXHIBIT A.
 
 "The contents of this file are subject to the gSOAP Public License Version
 1.3 (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.cs.fsu.edu/ engelen/soaplicense.html
-
+http://www.cs.fsu.edu/ engelen/soaplicense.html
 Software distributed under the License is distributed on an "AS IS" basis,
 WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
 the specific language governing rights and limitations under the License.
-
 The Original Code of the gSOAP Software is: stdsoap.h, stdsoap2.h, stdsoap.c,
 stdsoap2.c, stdsoap.cpp, stdsoap2.cpp, soapcpp2.h, soapcpp2.c, soapcpp2_lex.l,
 soapcpp2_yacc.y, error2.h, error2.c, symbol2.c, init2.c, soapdoc2.html, and
 soapdoc2.pdf, httpget.h, httpget.c, stl.h, stldeque.h, stllist.h, stlvector.h,
 stlset.h.
-
 The Initial Developer of the Original Code is Robert A. van Engelen. Portions
 created by Robert A. van Engelen are Copyright (C) 2001-2004 Robert A. van
 Engelen, Genivia inc. All Rights Reserved.
-
-   Contributor(s):
-
-   "________________________."
-
+Contributor(s):
+"________________________."
 [Note: The text of this Exhibit A may differ slightly form the text of the
 notices in the Source Code files of the Original code. You should use the
 text of this Exhibit A rather than the text found in the Original Code Source
 Code for Your Modifications.]
 
-   
-
-   EXHIBIT B.
-
-   "Part of the software embedded in this product is gSOAP software.
+EXHIBIT B.
 
+"Part of the software embedded in this product is gSOAP software.
 Portions created by gSOAP are Copyright (C) 2001-2009 Robert A. van Engelen,
 Genivia inc. All Rights Reserved.
-
 THE SOFTWARE IN THIS PRODUCT WAS IN PART PROVIDED BY GENIVIA INC AND ANY EXPRESS
 OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
diff --git a/options/license/gnu-javamail-exception b/options/license/gnu-javamail-exception
index 8f3b9ab0d0..6b24ec821a 100644
--- a/options/license/gnu-javamail-exception
+++ b/options/license/gnu-javamail-exception
@@ -1 +1 @@
-As a special exception, if you link this library with other files to produce an executable, this library does not by itself cause the resulting executable to be covered by the GNU General Public License. This exception does not however invalidate any other reasons why the executable file might be covered by the GNU General Public License.
+As a special exception, if you link this library with other files to produce an executable, this library does not by itself cause the resulting executable to be covered by the GNU General Public License. This exception does not however invalidate any other reasons why the executable file might be covered by the GNU General Public License."
diff --git a/options/license/gnuplot b/options/license/gnuplot
index 3fa5aa513f..2c1001bc55 100644
--- a/options/license/gnuplot
+++ b/options/license/gnuplot
@@ -12,14 +12,11 @@ by compiling modified sources is granted, provided you
 
 1. distribute the corresponding source modifications from the released version
 in the form of a patch file along with the binaries,
-
 2. add special version identification to distinguish your version in addition
 to the base release version number,
-
 3. provide your name and address as the primary contact for the support of
 your modified version, and
-
-   4. retain our contact information in regard to use of the base software.
+     4. retain our contact information in regard to use of the base software.
 
 Permission to distribute the released version of the source code along with
 corresponding source modifications in the form of a patch file is granted
diff --git a/options/license/i2p-gpl-java-exception b/options/license/i2p-gpl-java-exception
index 63ddd4a6f9..2b7277d778 100644
--- a/options/license/i2p-gpl-java-exception
+++ b/options/license/i2p-gpl-java-exception
@@ -1 +1 @@
-In addition, as a special exception, XXXX gives permission to link the code of this program with the proprietary Java implementation provided by Sun (or other vendors as well), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than the proprietary Java implementation. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version.
+In addition, as a special exception, <<var;name=licensor;original=XXXX;match=.+>> gives permission to link the code of this program with the proprietary Java implementation provided by Sun (or other vendors as well), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than the proprietary Java implementation. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version.
diff --git a/options/license/iMatix b/options/license/iMatix
index baea402394..85aa3e283e 100644
--- a/options/license/iMatix
+++ b/options/license/iMatix
@@ -21,12 +21,10 @@ You do not need to provide the source code for the Product as part of your
 product. However, you must do one of these things to comply with the Product
 License Agreement:
 
-      1. Provide the source code for Product modules that you use, or
-
-2. Make your product freely available according to a license similar to the
+     1.	Provide the source code for Product modules that you use, or
+2.	Make your product freely available according to a license similar to the
 GNU General Public License, or the Perl Artistic License, or
-
-3. Add this phrase to the documentation for your product: "This product uses
+3.	Add this phrase to the documentation for your product: "This product uses
 parts of the iMatix SFL, Copyright © 1991-2000 iMatix Corporation <http://www.imatix.com>".
 
 Rights Of Usage
@@ -44,15 +42,12 @@ You must clearly indicate any modifications at the start of each source file.
 The user of any modified Product code must know that the source file is not
 original.
 
-   
-
 At your discretion, you may rewrite or reuse any part of the Product so that
 your derived code is not obviously part of the Product. This derived code
 does not fall under the Product License Agreement directly, but you must include
 a credit at the start of each source file indicating the original authorship
-and source of the code, and a statement of copyright as follows:
-
-   "Parts copyright (c) 1991-2000 iMatix Corporation."
+and source of the code, and a statement of copyright as follows:"Parts copyright
+(c) 1991-2000 iMatix Corporation."
 
 Rights Of Distribution
 
diff --git a/options/license/libpng-2.0 b/options/license/libpng-2.0
index 6ccca8b798..1cc8b0deb3 100644
--- a/options/license/libpng-2.0
+++ b/options/license/libpng-2.0
@@ -1,34 +1,33 @@
-PNG Reference Library License version 2 ---------------------------------------
+PNG Reference Library License version 2
+---------------------------------------
 
-   * Copyright (c) 1995-2018 The PNG Reference Library Authors.
+ * Copyright (c) 1995-2018 The PNG Reference Library Authors.
+ * Copyright (c) 2018 Cosmin Truta.
+ * Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson.
+ * Copyright (c) 1996-1997 Andreas Dilger.
+ * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
 
-   * Copyright (c) 2018 Cosmin Truta.
+The software is supplied "as is", without warranty of any kind,
+express or implied, including, without limitation, the warranties
+of merchantability, fitness for a particular purpose, title, and
+non-infringement.  In no even shall the Copyright owners, or
+anyone distributing the software, be liable for any damages or
+other liability, whether in contract, tort or otherwise, arising
+from, out of, or in connection with the software, or the use or
+other dealings in the software, even if advised of the possibility
+of such damage.
 
-   * Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson.
+Permission is hereby granted to use, copy, modify, and distribute
+this software, or portions hereof, for any purpose, without fee,
+subject to the following restrictions:
 
-   * Copyright (c) 1996-1997 Andreas Dilger.
+ 1. The origin of this software must not be misrepresented; you
+    must not claim that you wrote the original software.  If you
+    use this software in a product, an acknowledgment in the product
+    documentation would be appreciated, but is not required.
 
-   * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
+ 2. Altered source versions must be plainly marked as such, and must
+    not be misrepresented as being the original software.
 
-The software is supplied "as is", without warranty of any kind, express or
-implied, including, without limitation, the warranties of merchantability,
-fitness for a particular purpose, title, and non-infringement. In no even
-shall the Copyright owners, or anyone distributing the software, be liable
-for any damages or other liability, whether in contract, tort or otherwise,
-arising from, out of, or in connection with the software, or the use or other
-dealings in the software, even if advised of the possibility of such damage.
-
-Permission is hereby granted to use, copy, modify, and distribute this software,
-or portions hereof, for any purpose, without fee, subject to the following
-restrictions:
-
-1. The origin of this software must not be misrepresented; you must not claim
-that you wrote the original software. If you use this software in a product,
-an acknowledgment in the product documentation would be appreciated, but is
-not required.
-
-2. Altered source versions must be plainly marked as such, and must not be
-misrepresented as being the original software.
-
-3. This Copyright notice may not be removed or altered from any source or
-altered source distribution.
+ 3. This Copyright notice may not be removed or altered from any
+    source or altered source distribution.
diff --git a/options/license/libselinux-1.0 b/options/license/libselinux-1.0
index da106afd98..d386268911 100644
--- a/options/license/libselinux-1.0
+++ b/options/license/libselinux-1.0
@@ -1,19 +1,21 @@
 This library (libselinux) is public domain software, i.e. not copyrighted.
 
-Warranty Exclusion ------------------
+Warranty Exclusion
+------------------
+You agree that this software is a
+non-commercially developed program that may contain "bugs" (as that
+term is used in the industry) and that it may not function as intended.
+The software is licensed "as is". NSA makes no, and hereby expressly
+disclaims all, warranties, express, implied, statutory, or otherwise
+with respect to the software, including noninfringement and the implied
+warranties of merchantability and fitness for a particular purpose.
 
-You agree that this software is a non-commercially developed program that
-may contain "bugs" (as that term is used in the industry) and that it may
-not function as intended. The software is licensed "as is". NSA makes no,
-and hereby expressly disclaims all, warranties, express, implied, statutory,
-or otherwise with respect to the software, including noninfringement and the
-implied warranties of merchantability and fitness for a particular purpose.
-
-Limitation of Liability -----------------------
-
-In no event will NSA be liable for any damages, including loss of data, lost
-profits, cost of cover, or other special, incidental, consequential, direct
-or indirect damages arising from the software or the use thereof, however
-caused and on any theory of liability. This limitation will apply even if
-NSA has been advised of the possibility of such damage. You acknowledge that
-this is a reasonable allocation of risk.
+Limitation of Liability
+-----------------------
+In no event will NSA be liable for any damages, including loss of data,
+lost profits, cost of cover, or other special, incidental,
+consequential, direct or indirect damages arising from the software or
+the use thereof, however caused and on any theory of liability. This
+limitation will apply even if NSA has been advised of the possibility
+of such damage. You acknowledge that this is a reasonable allocation of
+risk.
diff --git a/options/license/libtiff b/options/license/libtiff
index 39bba26bba..5003cd5545 100644
--- a/options/license/libtiff
+++ b/options/license/libtiff
@@ -1,5 +1,4 @@
 Copyright (c) 1988-1997 Sam Leffler
-
 Copyright (c) 1991-1997 Silicon Graphics, Inc.
 
 Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/options/license/mpich2 b/options/license/mpich2
index 3bd57ab673..7676ef3487 100644
--- a/options/license/mpich2
+++ b/options/license/mpich2
@@ -5,7 +5,6 @@ which must be included in the prologue of the code and in all source listings
 of the code.
 
 Copyright Notice
-
 + 2002 University of Chicago
 
 Permission is hereby granted to use, reproduce, prepare derivative works,
diff --git a/options/license/psfrag b/options/license/psfrag
index a6f0926629..b40ae68056 100644
--- a/options/license/psfrag
+++ b/options/license/psfrag
@@ -1,9 +1,9 @@
-psfrag.dtx Copyright (C) 1996 Craig Barratt, Michael C. Grant, and David Carlisle.
-
+psfrag.dtx
+Copyright (C) 1996 Craig Barratt, Michael C. Grant, and David Carlisle.
 All rights are reserved.
 
-This system is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+This system is distributed in the hope that it will be  useful, but WITHOUT
+ANY WARRANTY; without even the  implied warranty of MERCHANTABILITY or FITNESS
 FOR A PARTICULAR PURPOSE. Don't come complaining to us if you modify this
 file and it doesn't work! If this file is modified by anyone but the authors,
 those changes and their authors must be explicitly stated HERE.
diff --git a/options/license/psutils b/options/license/psutils
index ed031859ba..6a492f91f2 100644
--- a/options/license/psutils
+++ b/options/license/psutils
@@ -1,34 +1,22 @@
-PS Utilities Package The constituent files of this package listed below are
-copyright (C) 1991-1995 Angus J. C. Duggan.
+PS Utilities Package
 
-LICENSE Makefile.msc Makefile.nt Makefile.os2
-
-Makefile.unix README config.h descrip.mms
-
-epsffit.c epsffit.man extractres.man extractres.pl
-
-fixdlsrps.man fixdlsrps.pl fixfmps.man fixfmps.pl
-
-fixmacps.man fixmacps.pl fixpsditps.man fixpsditps.pl
-
-fixpspps.man fixpspps.pl fixscribeps.man fixscribeps.pl
-
-fixtpps.man fixtpps.pl fixwfwps.man fixwfwps.pl
-
-fixwpps.man fixwpps.pl fixwwps.man fixwwps.pl
-
-getafm getafm.man includeres.man includeres.pl
-
-maketext patchlev.h psbook.c psbook.man
-
-pserror.c pserror.h psmerge.man psmerge.pl
-
-psnup.c psnup.man psresize.c psresize.man
-
-psselect.c psselect.man psspec.c psspec.h
-
-pstops.c pstops.man psutil.c psutil.h
+The constituent files of this package listed below are copyright (C) 1991-1995
+Angus J. C. Duggan.
 
+LICENSE          Makefile.msc     Makefile.nt	   Makefile.os2
+Makefile.unix    README           config.h         descrip.mms
+epsffit.c        epsffit.man	  extractres.man   extractres.pl
+fixdlsrps.man    fixdlsrps.pl     fixfmps.man	   fixfmps.pl
+fixmacps.man     fixmacps.pl	  fixpsditps.man   fixpsditps.pl
+fixpspps.man     fixpspps.pl	  fixscribeps.man  fixscribeps.pl
+fixtpps.man	 fixtpps.pl	  fixwfwps.man     fixwfwps.pl
+fixwpps.man	 fixwpps.pl	  fixwwps.man	   fixwwps.pl
+getafm           getafm.man	  includeres.man   includeres.pl
+maketext         patchlev.h	  psbook.c         psbook.man
+pserror.c        pserror.h        psmerge.man	   psmerge.pl
+psnup.c          psnup.man        psresize.c	   psresize.man
+psselect.c	 psselect.man     psspec.c         psspec.h
+pstops.c         pstops.man	  psutil.c         psutil.h
 showchar
 
 They may be copied and used for any purpose (including distribution as part
diff --git a/options/license/u-boot-exception-2.0 b/options/license/u-boot-exception-2.0
index 70dbb23ec8..3158dade32 100644
--- a/options/license/u-boot-exception-2.0
+++ b/options/license/u-boot-exception-2.0
@@ -1,7 +1,6 @@
-GPL License Exception:
+The U-Boot License Exception:
 
 Even though U-Boot in general is covered by the GPL-2.0/GPL-2.0+, this does *not* cover the so-called "standalone" applications that use U-Boot services by means of the jump table provided by U-Boot exactly for this purpose - this is merely considered normal use of U-Boot, and does *not* fall under the heading of "derived work".
 
 The header files "include/image.h" and "arch/*/include/asm/u-boot.h" define interfaces to U-Boot. Including these (unmodified) header files in another file is considered normal use of U-Boot, and does *not* fall under the heading of "derived work".
-
 -- Wolfgang Denk
diff --git a/options/license/xinetd b/options/license/xinetd
index 70c0bb8e7a..4140ed19b3 100644
--- a/options/license/xinetd
+++ b/options/license/xinetd
@@ -1,4 +1,6 @@
-ORIGINAL LICENSE: This software is (c) Copyright 1992 by Panagiotis Tsirigotis
+ORIGINAL LICENSE: This software is
+
+(c) Copyright 1992 by Panagiotis Tsirigotis
 
 The author (Panagiotis Tsirigotis) grants permission to use, copy, and distribute
 this software and its documentation for any purpose and without fee, provided
@@ -10,11 +12,9 @@ Modifications to this software may be distributed, either by distributing
 the modified software or by distributing patches to the original software,
 under the following additional terms:
 
-   1. The version number will be modified as follows:
-
+1. The version number will be modified as follows:
 a. The first 3 components of the version number (i.e <number>.<number>.<number>)
 will remain unchanged.
-
 b. A new component will be appended to the version number to indicate the
 modification level. The form of this component is up to the author of the
 modifications.
diff --git a/options/license/xpp b/options/license/xpp
index c906815603..c059c56234 100644
--- a/options/license/xpp
+++ b/options/license/xpp
@@ -1,5 +1,6 @@
-LICENSE FOR THE Extreme! Lab PullParser Copyright (c) 2002 The Trustees of
-Indiana University. All rights reserved.
+LICENSE FOR THE Extreme! Lab PullParser
+
+Copyright (c) 2002 The Trustees of Indiana University. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
 are permitted provided that the following conditions are met:
diff --git a/options/license/zlib-acknowledgement b/options/license/zlib-acknowledgement
index fa01c04158..c35623f011 100644
--- a/options/license/zlib-acknowledgement
+++ b/options/license/zlib-acknowledgement
@@ -1,7 +1,5 @@
 Copyright (c) 2002-2007 Charlie Poole
-
 Copyright (c) 2002-2004 James W. Newkirk, Michael C. Two, Alexei A. Vorontsov
-
 Copyright (c) 2000-2002 Philip A. Craig
 
 This software is provided 'as-is', without any express or implied warranty.
@@ -23,4 +21,4 @@ Philip A. Craig
 2. Altered source versions must be plainly marked as such, and must not be
 misrepresented as being the original software.
 
-   3. This notice may not be removed or altered from any source distribution.
+3. This notice may not be removed or altered from any source distribution.