diff --git a/options/license/AAL b/options/license/AAL
index c0612cc6e7..781ca0e7a3 100644
--- a/options/license/AAL
+++ b/options/license/AAL
@@ -1,7 +1,5 @@
-Attribution Assurance License
-
-Copyright (c) 2002 by AUTHOR PROFESSIONAL IDENTIFICATION * URL "PROMOTIONAL
-SLOGAN FOR AUTHOR'S PROFESSIONAL PRACTICE"
+Attribution Assurance 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)
diff --git a/options/license/ADSL b/options/license/ADSL
index d3017689d5..aef03b73bc 100644
--- a/options/license/ADSL
+++ b/options/license/ADSL
@@ -1,6 +1,6 @@
This software code is made available "AS IS" without warranties of any kind.
You may copy, display, modify and redistribute the software code either by
-itself or as incorporated into your code; provided that > you do not remove
+itself or as incorporated into your code; provided that you do not remove
any proprietary notices. Your use of this software code is at your own risk
and you waive any claim against Amazon Digital Services, Inc. or its affiliates
with respect to your use of this software code. (c) 2006 Amazon Digital Services,
diff --git a/options/license/AFL-1.1 b/options/license/AFL-1.1
index 0b74d59e17..a505d889c3 100644
--- a/options/license/AFL-1.1
+++ b/options/license/AFL-1.1
@@ -4,7 +4,7 @@ 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:
-" 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,
diff --git a/options/license/AGPL-3.0-only b/options/license/AGPL-3.0-only
index 82b56508cc..e37e32e4e8 100644
--- a/options/license/AGPL-3.0-only
+++ b/options/license/AGPL-3.0-only
@@ -2,7 +2,7 @@ GNU AFFERO GENERAL PUBLIC LICENSE
Version 3, 19 November 2007
-Copyright (C) 2007 Free Software Foundation, Inc.
+Copyright (C) 2007 Free Software Foundation, Inc.
Everyone is permitted to copy and distribute verbatim copies of this license
document, but changing it is not allowed.
@@ -597,7 +597,7 @@ 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 .
+with this program. If not, see .
Also add information on how to contact you by electronic and paper mail.
@@ -610,5 +610,4 @@ 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 .
+more information on this, and how to apply and follow the GNU AGPL, see .
diff --git a/options/license/AGPL-3.0-or-later b/options/license/AGPL-3.0-or-later
index 82b56508cc..e37e32e4e8 100644
--- a/options/license/AGPL-3.0-or-later
+++ b/options/license/AGPL-3.0-or-later
@@ -2,7 +2,7 @@ GNU AFFERO GENERAL PUBLIC LICENSE
Version 3, 19 November 2007
-Copyright (C) 2007 Free Software Foundation, Inc.
+Copyright (C) 2007 Free Software Foundation, Inc.
Everyone is permitted to copy and distribute verbatim copies of this license
document, but changing it is not allowed.
@@ -597,7 +597,7 @@ 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 .
+with this program. If not, see .
Also add information on how to contact you by electronic and paper mail.
@@ -610,5 +610,4 @@ 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 .
+more information on this, and how to apply and follow the GNU AGPL, see .
diff --git a/options/license/Adobe-2006 b/options/license/Adobe-2006
index 553d247990..9e3828254b 100644
--- a/options/license/Adobe-2006
+++ b/options/license/Adobe-2006
@@ -1,6 +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/Aladdin b/options/license/Aladdin
index f93c7e85f0..204cb1f3d7 100644
--- a/options/license/Aladdin
+++ b/options/license/Aladdin
@@ -1,8 +1,7 @@
Aladdin Free Public License
-(Version 8, November 18, 1999)
-
-Copyright (C) 1994, 1995, 1997, 1998, 1999 Aladdin Enterprises,
+(Version 8, November 18, 1999) Copyright (C) 1994, 1995, 1997, 1998, 1999
+Aladdin Enterprises,
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.
diff --git a/options/license/Apache-1.1 b/options/license/Apache-1.1
index b2f7de6b3c..62c4061a31 100644
--- a/options/license/Apache-1.1
+++ b/options/license/Apache-1.1
@@ -1,6 +1,5 @@
-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:
diff --git a/options/license/Autoconf-exception-3.0 b/options/license/Autoconf-exception-3.0
index 439da3cc5f..346c459f80 100644
--- a/options/license/Autoconf-exception-3.0
+++ b/options/license/Autoconf-exception-3.0
@@ -1,8 +1,6 @@
AUTOCONF CONFIGURE SCRIPT EXCEPTION
-Version 3.0, 18 August 2009
-
-Copyright © 2009 Free Software Foundation, Inc.
+Version 3.0, 18 August 2009 Copyright © 2009 Free Software Foundation, Inc.
Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.
diff --git a/options/license/BSD-2-Clause b/options/license/BSD-2-Clause
index c2e480ee4f..2d2bab1127 100644
--- a/options/license/BSD-2-Clause
+++ b/options/license/BSD-2-Clause
@@ -1,4 +1,4 @@
-Copyright (c) . All rights reserved.
+Copyright (c) . 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-2-Clause-FreeBSD b/options/license/BSD-2-Clause-FreeBSD
index aadf852dfb..004ec94575 100644
--- a/options/license/BSD-2-Clause-FreeBSD
+++ b/options/license/BSD-2-Clause-FreeBSD
@@ -1,6 +1,5 @@
-The FreeBSD Copyright
-
-Copyright 1992-2012 The FreeBSD Project. All rights reserved.
+The FreeBSD Copyright Copyright 1992-2012 The FreeBSD 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:
diff --git a/options/license/BSD-3-Clause b/options/license/BSD-3-Clause
index b2a9c51f55..0741db789e 100644
--- a/options/license/BSD-3-Clause
+++ b/options/license/BSD-3-Clause
@@ -1,4 +1,4 @@
-Copyright (c) . All rights reserved.
+Copyright (c) . 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 8f9a4937a7..40066db07d 100644
--- a/options/license/BSD-3-Clause-Clear
+++ b/options/license/BSD-3-Clause-Clear
@@ -1,6 +1,4 @@
-The Clear BSD License
-
-Copyright (c) [xxxx]-[xxxx] [Owner Organization]
+The Clear BSD License Copyright (c) [xxxx]-[xxxx] [Owner Organization]
All rights reserved.
diff --git a/options/license/BSD-4-Clause b/options/license/BSD-4-Clause
index 09c07fb1d2..34b7498064 100644
--- a/options/license/BSD-4-Clause
+++ b/options/license/BSD-4-Clause
@@ -1,4 +1,4 @@
-Copyright (c) . All rights reserved.
+Copyright (c) . 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/CC-BY-ND-2.0 b/options/license/CC-BY-ND-2.0
index 30ef1cb4ec..1a41ece832 100644
--- a/options/license/CC-BY-ND-2.0
+++ b/options/license/CC-BY-ND-2.0
@@ -202,4 +202,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 http s ://creativecommons.org/.
+Creative Commons may be contacted at https://creativecommons.org/.
diff --git a/options/license/CUA-OPL-1.0 b/options/license/CUA-OPL-1.0
index 9ce67d9a9c..3c46119b11 100644
--- a/options/license/CUA-OPL-1.0
+++ b/options/license/CUA-OPL-1.0
@@ -378,7 +378,7 @@ 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.
-" The contents of this file are subject to the CUA Office Public License Version
+"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
License. You may obtain a copy of the License at http://cuaoffice.sourceforge.net/
@@ -402,7 +402,7 @@ to allow others to use your version of this file under the CUAPL, 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 CUAPL or the [___] License. "
+the CUAPL 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
diff --git a/options/license/Condor-1.1 b/options/license/Condor-1.1
index 44961c85a3..e857135f63 100644
--- a/options/license/Condor-1.1
+++ b/options/license/Condor-1.1
@@ -1,11 +1,10 @@
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,
diff --git a/options/license/Cube b/options/license/Cube
index 21ba979c6e..707afcc04c 100644
--- a/options/license/Cube
+++ b/options/license/Cube
@@ -1,6 +1,5 @@
-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
diff --git a/options/license/DSDP b/options/license/DSDP
index f98358f04b..e790666828 100644
--- a/options/license/DSDP
+++ b/options/license/DSDP
@@ -1,6 +1,4 @@
-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
diff --git a/options/license/EUDatagrid b/options/license/EUDatagrid
index b523c5afca..f9edeac751 100644
--- a/options/license/EUDatagrid
+++ b/options/license/EUDatagrid
@@ -1,6 +1,4 @@
-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/.
diff --git a/options/license/EUPL-1.0 b/options/license/EUPL-1.0
index 5fc85d56c4..09d08e3f03 100644
--- a/options/license/EUPL-1.0
+++ b/options/license/EUPL-1.0
@@ -1,10 +1,9 @@
-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 Work).
+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
+Work).
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
diff --git a/options/license/EUPL-1.1 b/options/license/EUPL-1.1
index 8232c91cbc..86c834ae5b 100644
--- a/options/license/EUPL-1.1
+++ b/options/license/EUPL-1.1
@@ -1,6 +1,4 @@
-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
diff --git a/options/license/Entessa b/options/license/Entessa
index ab7172b452..a41b7a39c2 100644
--- a/options/license/Entessa
+++ b/options/license/Entessa
@@ -1,6 +1,5 @@
-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:
diff --git a/options/license/Fair b/options/license/Fair
index 0bcc8c7828..9642931122 100644
--- a/options/license/Fair
+++ b/options/license/Fair
@@ -1,6 +1,4 @@
-Fair License
-
-
+Fair License
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
diff --git a/options/license/GFDL-1.3-only b/options/license/GFDL-1.3-only
index 506b043ecf..90f814dea7 100644
--- a/options/license/GFDL-1.3-only
+++ b/options/license/GFDL-1.3-only
@@ -1,9 +1,7 @@
GNU Free Documentation License
-Version 1.3, 3 November 2008
-
-Copyright (C) 2000, 2001, 2002, 2007, 2008 Free Software Foundation, Inc.
-
+Version 1.3, 3 November 2008 Copyright (C) 2000, 2001, 2002, 2007, 2008 Free
+Software Foundation, Inc.
Everyone is permitted to copy and distribute verbatim copies of this license
document, but changing it is not allowed.
diff --git a/options/license/GFDL-1.3-or-later b/options/license/GFDL-1.3-or-later
index 8de52f8d94..1edf769ac0 100644
--- a/options/license/GFDL-1.3-or-later
+++ b/options/license/GFDL-1.3-or-later
@@ -1,9 +1,7 @@
GNU Free Documentation License
-Version 1.3, 3 November 2008
-
-Copyright (C) 2000, 2001, 2002, 2007, 2008 Free Software Foundation, Inc.
-
+Version 1.3, 3 November 2008 Copyright (C) 2000, 2001, 2002, 2007, 2008 Free
+Software Foundation, Inc.
Everyone is permitted to copy and distribute verbatim copies of this license
document, but changing it is not allowed.
diff --git a/options/license/GL2PS b/options/license/GL2PS
index 617531b1b8..2da34219ce 100644
--- a/options/license/GL2PS
+++ b/options/license/GL2PS
@@ -1,6 +1,4 @@
-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
diff --git a/options/license/GPL-2.0-only b/options/license/GPL-2.0-only
index 4f27167ff9..0f3d6411da 100644
--- a/options/license/GPL-2.0-only
+++ b/options/license/GPL-2.0-only
@@ -4,7 +4,7 @@ Version 2, June 1991
Copyright (C) 1989, 1991 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.
@@ -272,9 +272,9 @@ 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 >
+Copyright (C)< yyyy>
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,7 +287,7 @@ 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.
+Street, Fifth Floor, Boston, MA 02110-1301, USA.
Also add information on how to contact you by electronic and paper mail.
@@ -311,7 +311,7 @@ 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
+, 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
diff --git a/options/license/GPL-2.0-or-later b/options/license/GPL-2.0-or-later
index ff0839844a..1d80ac3653 100644
--- a/options/license/GPL-2.0-or-later
+++ b/options/license/GPL-2.0-or-later
@@ -4,7 +4,7 @@ Version 2, June 1991
Copyright (C) 1989, 1991 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.
@@ -287,7 +287,7 @@ 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.
+Street, Fifth Floor, Boston, MA 02110-1301, USA.
Also add information on how to contact you by electronic and paper mail.
@@ -311,7 +311,7 @@ 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
+, 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
diff --git a/options/license/GPL-3.0-only b/options/license/GPL-3.0-only
index 80150269e6..e142a525bd 100644
--- a/options/license/GPL-3.0-only
+++ b/options/license/GPL-3.0-only
@@ -2,7 +2,7 @@ GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
-Copyright © 2007 Free Software Foundation, Inc.
+Copyright © 2007 Free Software Foundation, Inc.
Everyone is permitted to copy and distribute verbatim copies of this license
document, but changing it is not allowed.
@@ -595,7 +595,7 @@ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
You should have received a copy of the GNU General Public License along with
-this program. If not, see .
+this program. If not, see .
Also add information on how to contact you by electronic and paper mail.
@@ -615,12 +615,11 @@ 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 .
+more information on this, and how to apply and follow the GNU GPL, see .
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 .
diff --git a/options/license/GPL-3.0-or-later b/options/license/GPL-3.0-or-later
index 80150269e6..e142a525bd 100644
--- a/options/license/GPL-3.0-or-later
+++ b/options/license/GPL-3.0-or-later
@@ -2,7 +2,7 @@ GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
-Copyright © 2007 Free Software Foundation, Inc.
+Copyright © 2007 Free Software Foundation, Inc.
Everyone is permitted to copy and distribute verbatim copies of this license
document, but changing it is not allowed.
@@ -595,7 +595,7 @@ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
You should have received a copy of the GNU General Public License along with
-this program. If not, see .
+this program. If not, see .
Also add information on how to contact you by electronic and paper mail.
@@ -615,12 +615,11 @@ 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 .
+more information on this, and how to apply and follow the GNU GPL, see .
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 .
diff --git a/options/license/HPND b/options/license/HPND
index d4842684d4..4662ba23b2 100644
--- a/options/license/HPND
+++ b/options/license/HPND
@@ -1,10 +1,8 @@
-Historical Permission Notice and Disclaimer
-
-
+Historical Permission Notice and Disclaimer
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
+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 not be used in advertising
or publicity pertaining to distribution of the software without specific,
diff --git a/options/license/ICU b/options/license/ICU
index fabfb63664..33bac34223 100644
--- a/options/license/ICU
+++ b/options/license/ICU
@@ -1,8 +1,7 @@
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.
diff --git a/options/license/ISC b/options/license/ISC
index 5129d95123..412d4e203d 100644
--- a/options/license/ISC
+++ b/options/license/ISC
@@ -1,6 +1,4 @@
-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
diff --git a/options/license/ImageMagick b/options/license/ImageMagick
index e924232f61..ea22466116 100644
--- a/options/license/ImageMagick
+++ b/options/license/ImageMagick
@@ -64,10 +64,9 @@ you need to acknowledge the use of the ImageMagick software;
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: Copyright 1999-2013 ImageMagick Studio
+LLC, a non-profit organization dedicated to making software imaging solutions
+freely available.
1. Definitions.
diff --git a/options/license/Info-ZIP b/options/license/Info-ZIP
index f71109fc7a..066343e622 100644
--- a/options/license/Info-ZIP
+++ b/options/license/Info-ZIP
@@ -1,6 +1,4 @@
-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:
diff --git a/options/license/Intel b/options/license/Intel
index 16e8341896..c719c9bcec 100644
--- a/options/license/Intel
+++ b/options/license/Intel
@@ -1,6 +1,4 @@
-Intel Open Source License
-
-Copyright (c) 1996-2000 Intel Corporation
+Intel Open Source License Copyright (c) 1996-2000 Intel Corporation
All rights reserved.
diff --git a/options/license/Interbase-1.0 b/options/license/Interbase-1.0
index e3f76e33e8..03bdf2ffd5 100644
--- a/options/license/Interbase-1.0
+++ b/options/license/Interbase-1.0
@@ -429,7 +429,7 @@ in Exhibit A.
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
diff --git a/options/license/JSON b/options/license/JSON
index a2f5629de4..05a38f55cd 100644
--- a/options/license/JSON
+++ b/options/license/JSON
@@ -1,6 +1,4 @@
-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 db2a440462..f66b353401 100644
--- a/options/license/JasPer-2.0
+++ b/options/license/JasPer-2.0
@@ -1,6 +1,4 @@
-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.
diff --git a/options/license/LAL-1.3 b/options/license/LAL-1.3
index 57a6d46964..4dcefed47f 100644
--- a/options/license/LAL-1.3
+++ b/options/license/LAL-1.3
@@ -1,6 +1,6 @@
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.
@@ -12,44 +12,44 @@ 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
+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
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
+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,
+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
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
+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
+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.
+Copie : Toute reproduction d'un original au sens de cette licence.
1- OBJET.
@@ -70,33 +70,30 @@ personne, quelle que soit la technique employée.
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 ;
+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 ;
+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.
+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.
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 ;
+la modification ;
3. diffuser cette œuvre conséquente avec la même licence ou avec toute licence
-compatible ;
+compatible ;
4. Les auteurs des originaux pourront, s'ils le souhaitent, vous autoriser
à modifier l'original dans les mêmes conditions que les copies.
@@ -104,11 +101,12 @@ compatible ;
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.
+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.
@@ -121,16 +119,16 @@ compatible.
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é ;
+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 ;
+de l'œuvre quand cet accès est possible ;
- 3. elle reconnaît la LAL également compatible (réciprocité) ;
+ 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é
diff --git a/options/license/LGPL-2.0-only b/options/license/LGPL-2.0-only
index e0419f241d..5c96471aaf 100644
--- a/options/license/LGPL-2.0-only
+++ b/options/license/LGPL-2.0-only
@@ -1,8 +1,6 @@
GNU LIBRARY GENERAL PUBLIC LICENSE
-Version 2, June 1991
-
-Copyright (C) 1991 Free Software Foundation, Inc.
+Version 2, June 1991 Copyright (C) 1991 Free Software Foundation, Inc.
51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
diff --git a/options/license/LGPL-2.0-or-later b/options/license/LGPL-2.0-or-later
index e0419f241d..5c96471aaf 100644
--- a/options/license/LGPL-2.0-or-later
+++ b/options/license/LGPL-2.0-or-later
@@ -1,8 +1,6 @@
GNU LIBRARY GENERAL PUBLIC LICENSE
-Version 2, June 1991
-
-Copyright (C) 1991 Free Software Foundation, Inc.
+Version 2, June 1991 Copyright (C) 1991 Free Software Foundation, Inc.
51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
diff --git a/options/license/LGPL-3.0-only b/options/license/LGPL-3.0-only
index 1344add25d..bd405afbef 100644
--- a/options/license/LGPL-3.0-only
+++ b/options/license/LGPL-3.0-only
@@ -2,7 +2,7 @@ GNU LESSER GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
-Copyright (C) 2007 Free Software Foundation, Inc.
+Copyright (C) 2007 Free Software Foundation, Inc.
Everyone is permitted to copy and distribute verbatim copies of this license
document, but changing it is not allowed.
diff --git a/options/license/LGPL-3.0-or-later b/options/license/LGPL-3.0-or-later
index 1344add25d..bd405afbef 100644
--- a/options/license/LGPL-3.0-or-later
+++ b/options/license/LGPL-3.0-or-later
@@ -2,7 +2,7 @@ GNU LESSER GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
-Copyright (C) 2007 Free Software Foundation, Inc.
+Copyright (C) 2007 Free Software Foundation, Inc.
Everyone is permitted to copy and distribute verbatim copies of this license
document, but changing it is not allowed.
diff --git a/options/license/LPPL-1.0 b/options/license/LPPL-1.0
index 548004d7f8..458f89e867 100644
--- a/options/license/LPPL-1.0
+++ b/options/license/LPPL-1.0
@@ -1,8 +1,6 @@
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.
diff --git a/options/license/LPPL-1.1 b/options/license/LPPL-1.1
index 07c59e515d..0f408cb958 100644
--- a/options/license/LPPL-1.1
+++ b/options/license/LPPL-1.1
@@ -2,9 +2,7 @@ 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.
diff --git a/options/license/LPPL-1.2 b/options/license/LPPL-1.2
index 69dbd010ab..1bb8d0db47 100644
--- a/options/license/LPPL-1.2
+++ b/options/license/LPPL-1.2
@@ -2,9 +2,7 @@ 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.
diff --git a/options/license/LPPL-1.3a b/options/license/LPPL-1.3a
index c1da143b81..2e4e567fcb 100644
--- a/options/license/LPPL-1.3a
+++ b/options/license/LPPL-1.3a
@@ -2,9 +2,7 @@ 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 Copyright 1999 2002-04 LaTeX3 Project
Everyone is allowed to distribute verbatim copies of this license document,
but modification of it is not allowed.
diff --git a/options/license/LPPL-1.3c b/options/license/LPPL-1.3c
index f05aedf9fb..b62e36895f 100644
--- a/options/license/LPPL-1.3c
+++ b/options/license/LPPL-1.3c
@@ -2,9 +2,7 @@ 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.
diff --git a/options/license/MIT b/options/license/MIT
index d449d3e548..204b93da48 100644
--- a/options/license/MIT
+++ b/options/license/MIT
@@ -1,6 +1,4 @@
-MIT License
-
-Copyright (c)
+MIT License Copyright (c)
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/MIT-CMU b/options/license/MIT-CMU
index 87cc4395fa..81c351b2ef 100644
--- a/options/license/MIT-CMU
+++ b/options/license/MIT-CMU
@@ -1,22 +1,17 @@
-Copyright 1989, 1991, 1992 by Carnegie Mellon University
+ 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:
-Derivative Work - 1996, 1998-2000 Copyright 1996, 1998-2000 The Regents of
-the University of California
+Permission to use, copy, modify, and distribute this software and its associated
+documentation for any purpose and without fee is hereby granted, 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 the copyright holder not be used in advertising or publicity
+pertaining to distribution of the software without specific, written permission.
-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
-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 CMU and The Regents of the University of California not be used in
-advertising or publicity pertaining to distribution of the software without
-specific written permission.
-
-CMU AND THE REGENTS OF THE UNIVERSITY OF CALIFORNIA DISCLAIM ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS. IN NO EVENT SHALL CMU OR THE REGENTS OF THE UNIVERSITY OF CALIFORNIA
-BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM THE 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.
+THE COPYRIGHT HOLDER DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT
+SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
+DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM THE 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/MPL-1.0 b/options/license/MPL-1.0
index 0ebc564552..965a50b512 100644
--- a/options/license/MPL-1.0
+++ b/options/license/MPL-1.0
@@ -319,7 +319,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. EXHIBIT A.
-" The contents of this file are subject to the Mozilla Public License Version
+"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/
@@ -329,4 +329,4 @@ 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): _____ . "
+Contributor(s): _____ ."
diff --git a/options/license/MPL-1.1 b/options/license/MPL-1.1
index 35f0951b9d..b45d0e15ff 100644
--- a/options/license/MPL-1.1
+++ b/options/license/MPL-1.1
@@ -389,7 +389,7 @@ 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.
-" The contents of this file are subject to the Mozilla Public License Version
+"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
License. You may obtain a copy of the License at http://www.mozilla.org/MPL/
@@ -414,7 +414,7 @@ to allow others to use your version of this file under the MPL, 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 MPL or the [___] License. "
+the MPL 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
diff --git a/options/license/MTLL b/options/license/MTLL
index 90bc71ed29..a80e517285 100644
--- a/options/license/MTLL
+++ b/options/license/MTLL
@@ -1,6 +1,4 @@
-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.
diff --git a/options/license/MakeIndex b/options/license/MakeIndex
index 52e1572813..e92f97685a 100644
--- a/options/license/MakeIndex
+++ b/options/license/MakeIndex
@@ -1,8 +1,6 @@
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
diff --git a/options/license/MirOS b/options/license/MirOS
index dbb77b8a35..3fbbab0f11 100644
--- a/options/license/MirOS
+++ b/options/license/MirOS
@@ -1,8 +1,4 @@
-MirOS License
-
-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
@@ -15,50 +11,4 @@ intent or gross negligence. In no event may a licensor, author or contributor
be held liable for indirect, direct, other damage, loss, or other issues arising
in any way out of dealing in the work, even if advised of the possibility
of such damage or existence of a defect, except proven that it results out
-of said person's immediate fault when using the work as intended. I_N_S_T_R_U_C_T_I_O_N_S_:_
-
-To apply the template(1) specify the years of copyright (separated by comma,
-not as a range), the legal names of the copyright holders, and the real names
-of the authors if different. Avoid adding text.
-
-R_A_T_I_O_N_A_L_E_:_
-
-This licence is apt for any kind of work (such as source code, fonts, documentation,
-graphics, sound etc.) and the preferred terms for work added to MirBSD. It
-has been drafted as universally usable equivalent of the "historic permission
-notice"(2) adapted to Europen law because in some (droit d'auteur) countries
-authors cannot disclaim all liabi‐ lities. Compliance to DFSG(3) 1.1 is ensured,
-and GPLv2 compatibility is asserted unless advertising clauses are used. The
-MirOS Licence is certified to conform to OKD(4) 1.0 and OSD(5) 1.9, and qualifies
-as a Free Software(6) and also Free Documentation(7) licence and is included
-in some relevant lists(8)(9)(10).
-
-We believe you are not liable for work inserted which is intellectual property
-of third parties, if you were not aware of the fact, act appropriately as
-soon as you become aware of that problem, seek an amicable solution for all
-parties, and never knowingly distribute a work without being authorised to
-do so by its licensors.
-
-R_E_F_E_R_E_N_C_E_S_:_
-
-
-
- (1) also at http://mirbsd.de/MirOS-Licence
-
- (2) http://www.opensource.org/licenses/historical.php
-
- (3) http://www.debian.org/social_contract#guidelines
-
- (4) http://www.opendefinition.org/1.0
-
- (5) http://www.opensource.org/docs/osd
-
- (6) http://www.gnu.org/philosophy/free-sw.html
-
- (7) http://www.gnu.org/philosophy/free-doc.html
-
- (8) http://www.ifross.de/ifross_html/lizenzcenter.html
-
- (9) http://www.opendefinition.org/licenses
-
- (10) http://opensource.org/licenses/miros.html
+of said person's immediate fault when using the work as intended.
diff --git a/options/license/Multics b/options/license/Multics
index 1aafc27e3b..3c99e77813 100644
--- a/options/license/Multics
+++ b/options/license/Multics
@@ -23,10 +23,9 @@ 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.
diff --git a/options/license/NBPL-1.0 b/options/license/NBPL-1.0
index 1a0e965f48..0f59ea20de 100644
--- a/options/license/NBPL-1.0
+++ b/options/license/NBPL-1.0
@@ -1,9 +1,8 @@
-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."
+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
diff --git a/options/license/NCSA b/options/license/NCSA
index 13109f547d..3ed0f0e280 100644
--- a/options/license/NCSA
+++ b/options/license/NCSA
@@ -1,6 +1,5 @@
-University of Illinois/NCSA Open Source License
-
-Copyright (c) . All rights reserved.
+University of Illinois/NCSA Open Source License Copyright (c) . All rights reserved.
Developed by:
diff --git a/options/license/NGPL b/options/license/NGPL
index 369781ae88..7ff93a0a88 100644
--- a/options/license/NGPL
+++ b/options/license/NGPL
@@ -1,6 +1,4 @@
-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)
diff --git a/options/license/NTP b/options/license/NTP
index 8f4a8f0cef..8a3879bb94 100644
--- a/options/license/NTP
+++ b/options/license/NTP
@@ -1,6 +1,5 @@
-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/Naumen b/options/license/Naumen
index 0a8c6e6b12..af967ef83d 100644
--- a/options/license/Naumen
+++ b/options/license/Naumen
@@ -1,6 +1,5 @@
-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 971630832f..f68b3cdf2c 100644
--- a/options/license/Net-SNMP
+++ b/options/license/Net-SNMP
@@ -1,6 +1,5 @@
----- 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
@@ -79,10 +78,9 @@ 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.
@@ -174,7 +172,6 @@ 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
@@ -203,9 +200,8 @@ 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:
diff --git a/options/license/OCLC-2.0 b/options/license/OCLC-2.0
index e4b6235d41..09cc2867bd 100644
--- a/options/license/OCLC-2.0
+++ b/options/license/OCLC-2.0
@@ -2,9 +2,8 @@ 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
@@ -79,7 +78,7 @@ If you distribute the Program in a form to which the recipient can make Modifica
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
+"Copyright (c) 2000- (insert then current year) OCLC Online Computer Library
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
@@ -93,7 +92,7 @@ OCLC Research. For more information on OCLC Research, please see http://www.oclc
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
diff --git a/options/license/OLDAP-1.1 b/options/license/OLDAP-1.1
index c8a97ebeaa..522a67d775 100644
--- a/options/license/OLDAP-1.1
+++ b/options/license/OLDAP-1.1
@@ -1,10 +1,9 @@
The OpenLDAP Public License
-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."
+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."
PREAMBLE
diff --git a/options/license/OLDAP-1.2 b/options/license/OLDAP-1.2
index c520e91cf0..a91e91017f 100644
--- a/options/license/OLDAP-1.2
+++ b/options/license/OLDAP-1.2
@@ -1,10 +1,9 @@
The OpenLDAP Public License
-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.
+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.
PREAMBLE
diff --git a/options/license/OLDAP-1.3 b/options/license/OLDAP-1.3
index edcb2ac500..cf489a9d65 100644
--- a/options/license/OLDAP-1.3
+++ b/options/license/OLDAP-1.3
@@ -1,11 +1,9 @@
The OpenLDAP Public License
-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.
+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.
PREAMBLE
diff --git a/options/license/OLDAP-1.4 b/options/license/OLDAP-1.4
index beb9b992e9..74d8ebd902 100644
--- a/options/license/OLDAP-1.4
+++ b/options/license/OLDAP-1.4
@@ -1,11 +1,9 @@
The OpenLDAP Public License
-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.
+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.
PREAMBLE
diff --git a/options/license/OLDAP-2.0 b/options/license/OLDAP-2.0
index 1076e3eeea..7dd47ef9cc 100644
--- a/options/license/OLDAP-2.0
+++ b/options/license/OLDAP-2.0
@@ -1,9 +1,7 @@
The OpenLDAP Public License
-Version 2.0, 7 June 1999
-
-Copyright 1999, The OpenLDAP Foundation, Redwood City, California, USA. All
-Rights Reserved.
+Version 2.0, 7 June 1999 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 f535ee22fb..5547eb18a4 100644
--- a/options/license/OLDAP-2.0.1
+++ b/options/license/OLDAP-2.0.1
@@ -1,9 +1,7 @@
The OpenLDAP Public License
-Version 2.0.1, 21 December 1999
-
-Copyright 1999, The OpenLDAP Foundation, Redwood City, California, USA. All
-Rights Reserved.
+Version 2.0.1, 21 December 1999 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 73beac1299..8c832b669d 100644
--- a/options/license/OLDAP-2.1
+++ b/options/license/OLDAP-2.1
@@ -1,9 +1,7 @@
The OpenLDAP Public License
-Version 2.1, 29 February 2000
-
-Copyright 1999-2000, The OpenLDAP Foundation, Redwood City, California, USA.
-All Rights Reserved.
+Version 2.1, 29 February 2000 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/OSET-PL-2.1 b/options/license/OSET-PL-2.1
index 3f2e24aca2..fe7dd94376 100644
--- a/options/license/OSET-PL-2.1
+++ b/options/license/OSET-PL-2.1
@@ -1,9 +1,7 @@
-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 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
diff --git a/options/license/OSL-1.0 b/options/license/OSL-1.0
index 855ec6948b..0f250090ba 100644
--- a/options/license/OSL-1.0
+++ b/options/license/OSL-1.0
@@ -5,7 +5,7 @@ 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
diff --git a/options/license/OpenSSL b/options/license/OpenSSL
index abf6ab2960..75dee7cc28 100644
--- a/options/license/OpenSSL
+++ b/options/license/OpenSSL
@@ -1,6 +1,4 @@
-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:
@@ -41,9 +39,7 @@ 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)
+Original SSLeay License Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
All rights reserved.
diff --git a/options/license/PHP-3.0 b/options/license/PHP-3.0
index 4089bd5e54..a5d9221eab 100644
--- a/options/license/PHP-3.0
+++ b/options/license/PHP-3.0
@@ -1,6 +1,5 @@
-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:
diff --git a/options/license/PHP-3.01 b/options/license/PHP-3.01
index e272ad7a85..a7147cf45c 100644
--- a/options/license/PHP-3.01
+++ b/options/license/PHP-3.01
@@ -1,6 +1,5 @@
-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/Plexus b/options/license/Plexus
index b92da8329b..51c41233e2 100644
--- a/options/license/Plexus
+++ b/options/license/Plexus
@@ -1,4 +1,4 @@
-Copyright 2002 (C) The Codehaus . All Rights Reserved.
+Copyright 2002 (C) The Codehaus. 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/PostgreSQL b/options/license/PostgreSQL
index 942cf0803d..06ef3c5d29 100644
--- a/options/license/PostgreSQL
+++ b/options/license/PostgreSQL
@@ -1,8 +1,7 @@
PostgreSQL Database Management System
-(formerly known as Postgres, then as Postgres95)
-
-Portions Copyright (c) 1996-2010, The PostgreSQL Global Development Group
+(formerly known as Postgres, then as Postgres95) 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 1b738a6157..04962c0643 100644
--- a/options/license/Python-2.0
+++ b/options/license/Python-2.0
@@ -140,10 +140,8 @@ 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.
+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 c9d1f95fe0..83e9ca42c7 100644
--- a/options/license/QPL-1.0
+++ b/options/license/QPL-1.0
@@ -1,6 +1,4 @@
-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.
diff --git a/options/license/RPL-1.1 b/options/license/RPL-1.1
index 63c22fa1bb..c50ff79d9b 100644
--- a/options/license/RPL-1.1
+++ b/options/license/RPL-1.1
@@ -1,6 +1,5 @@
-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.
diff --git a/options/license/RPSL-1.0 b/options/license/RPSL-1.0
index ad4adba76a..5318b638a9 100644
--- a/options/license/RPSL-1.0
+++ b/options/license/RPSL-1.0
@@ -416,7 +416,7 @@ 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
+"Copyright (c) 1995-2002 RealNetworks, Inc. and/or its licensors. All Rights
Reserved.
The contents of this file, and the files included with this file, are subject
@@ -442,7 +442,7 @@ 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.
diff --git a/options/license/RSCPL b/options/license/RSCPL
index 53df1bffae..dd9d1f0701 100644
--- a/options/license/RSCPL
+++ b/options/license/RSCPL
@@ -301,13 +301,13 @@ 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 ($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 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.
+RSV'S 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
+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.
@@ -330,7 +330,7 @@ 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,
+attorney's 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
diff --git a/options/license/SGI-B-1.0 b/options/license/SGI-B-1.0
index 9226eeb60b..2500c0ce9d 100644
--- a/options/license/SGI-B-1.0
+++ b/options/license/SGI-B-1.0
@@ -222,11 +222,10 @@ INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND CONDITIONS OF MERCHANT
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
+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"
-]
+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 81f5770b00..8fc157b57f 100644
--- a/options/license/SGI-B-1.1
+++ b/options/license/SGI-B-1.1
@@ -238,10 +238,9 @@ INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND CONDITIONS OF MERCHANT
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
+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
+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"
-]
+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 a568416505..e53cfa5438 100644
--- a/options/license/SGI-B-2.0
+++ b/options/license/SGI-B-2.0
@@ -1,9 +1,7 @@
SGI FREE SOFTWARE LICENSE B
-(Version 2.0, Sept. 18, 2008)
-
-Copyright (C) [dates of first publication] Silicon Graphics, Inc. All Rights
-Reserved.
+(Version 2.0, Sept. 18, 2008) 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/SISSL b/options/license/SISSL
index 1889ac0bb8..90acef9add 100644
--- a/options/license/SISSL
+++ b/options/license/SISSL
@@ -238,7 +238,7 @@ 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
-" The contents of this file are subject to the Sun Standards License Version
+"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 _______________________________
.
diff --git a/options/license/SISSL-1.2 b/options/license/SISSL-1.2
index f1e79aa013..f08ce325db 100644
--- a/options/license/SISSL-1.2
+++ b/options/license/SISSL-1.2
@@ -202,32 +202,31 @@ which have been validly granted by You or any distributor hereunder prior
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
+"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. "
+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
-"
+"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,
+"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. "
+under the License."
-" The Original Code is Grid Engine. "
+"The Original Code is Grid Engine."
-" The Initial Developer of the Original Code is:
+"The Initial Developer of the Original Code is:
-Sun Microsystems, Inc. "
+Sun Microsystems, Inc."
-" Portions created by: Sun Microsystems, Inc. are Copyright (C) 2001 Sun Microsystems,
-Inc. "
+"Portions created by: Sun Microsystems, Inc. are Copyright (C) 2001 Sun Microsystems,
+Inc."
-" All Rights Reserved. "
+"All Rights Reserved."
-" Contributor(s): __________________________________"
+"Contributor(s): __________________________________"
EXHIBIT B - Standards
diff --git a/options/license/SMLNJ b/options/license/SMLNJ
index 5f45eb822e..307e2cc364 100644
--- a/options/license/SMLNJ
+++ b/options/license/SMLNJ
@@ -1,6 +1,5 @@
-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) 2001-2011 by The Fellowship of SML/NJ
Copyright (c) 1989-2001 by Lucent Technologies
diff --git a/options/license/SMPPL b/options/license/SMPPL
index c54a4ae86e..071d456412 100644
--- a/options/license/SMPPL
+++ b/options/license/SMPPL
@@ -58,6 +58,5 @@ 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
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
+The eSNACC Compiler is not distributed as part of the SMP. Copyright © 1997-2002
+National Security Agency
diff --git a/options/license/Sleepycat b/options/license/Sleepycat
index 7c942ad81b..bc10a6b606 100644
--- a/options/license/Sleepycat
+++ b/options/license/Sleepycat
@@ -30,10 +30,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.
-
-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:
@@ -58,10 +56,8 @@ 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/TMate b/options/license/TMate
index 7a7cacd8e0..69b0d82677 100644
--- a/options/license/TMate
+++ b/options/license/TMate
@@ -3,9 +3,8 @@ 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 a4b7e0c182..f8084aa60a 100644
--- a/options/license/TORQUE-1.1
+++ b/options/license/TORQUE-1.1
@@ -1,10 +1,8 @@
-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:
diff --git a/options/license/Unicode-DFS-2016 b/options/license/Unicode-DFS-2016
index 9cdadd9b8b..80bd8b3d8e 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/,
-and http://www.unicode.org/utility/trac/browser/.
+http://www.unicode.org/ivd/data/, 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,10 +18,8 @@ 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")
diff --git a/options/license/Unlicense b/options/license/Unlicense
index 383d61812d..24a8f90199 100644
--- a/options/license/Unlicense
+++ b/options/license/Unlicense
@@ -7,17 +7,14 @@ 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
+THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. For more information,
+please refer to
diff --git a/options/license/VOSTROM b/options/license/VOSTROM
index 0bf372247c..43c1c87d6a 100644
--- a/options/license/VOSTROM
+++ b/options/license/VOSTROM
@@ -1,6 +1,5 @@
-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 c0edfffe44..dd7bb74068 100644
--- a/options/license/VSL-1.0
+++ b/options/license/VSL-1.0
@@ -1,9 +1,8 @@
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.
+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 b3f8d0ec0f..80349f7f1f 100644
--- a/options/license/Vim
+++ b/options/license/Vim
@@ -2,12 +2,13 @@ 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.
@@ -17,7 +18,7 @@ a) If you make changes to Vim yourself, you must clearly describe in the distrib
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
@@ -35,7 +36,7 @@ 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
@@ -46,13 +47,13 @@ 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.
@@ -66,7 +67,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-19980720 b/options/license/W3C-19980720
index 05d9b38cf0..3adf89b95f 100644
--- a/options/license/W3C-19980720
+++ b/options/license/W3C-19980720
@@ -1,8 +1,6 @@
-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,
diff --git a/options/license/Wsuipa b/options/license/Wsuipa
index f527947022..cfbd46f907 100644
--- a/options/license/Wsuipa
+++ b/options/license/Wsuipa
@@ -3,7 +3,6 @@ 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/X11 b/options/license/X11
index 5994ddf732..da478eb05a 100644
--- a/options/license/X11
+++ b/options/license/X11
@@ -1,6 +1,4 @@
-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 1b51930b57..5ba31cc2f9 100644
--- a/options/license/XFree86-1.1
+++ b/options/license/XFree86-1.1
@@ -1,6 +1,4 @@
-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.
diff --git a/options/license/Xnet b/options/license/Xnet
index 082ccdf980..dba87b3f80 100644
--- a/options/license/Xnet
+++ b/options/license/Xnet
@@ -1,6 +1,5 @@
-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/ZPL-1.1 b/options/license/ZPL-1.1
index 6fb34ae160..43ae9e0109 100644
--- a/options/license/ZPL-1.1
+++ b/options/license/ZPL-1.1
@@ -1,7 +1,5 @@
-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:
diff --git a/options/license/ZPL-2.0 b/options/license/ZPL-2.0
index 45a4138cf7..516081c189 100644
--- a/options/license/ZPL-2.0
+++ b/options/license/ZPL-2.0
@@ -1,8 +1,7 @@
-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:
diff --git a/options/license/curl b/options/license/curl
index 9c674d8c0f..c891714b1b 100644
--- a/options/license/curl
+++ b/options/license/curl
@@ -1,6 +1,5 @@
-COPYRIGHT AND PERMISSION NOTICE
-
-Copyright (c) 1996 - 2015, Daniel Stenberg, .
+COPYRIGHT AND PERMISSION NOTICE Copyright (c) 1996 - 2015, Daniel Stenberg,
+.
All rights reserved.
diff --git a/options/license/psfrag b/options/license/psfrag
index 4d63df6bbd..a6f0926629 100644
--- a/options/license/psfrag
+++ b/options/license/psfrag
@@ -1,6 +1,4 @@
-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.
diff --git a/options/license/psutils b/options/license/psutils
index e698aecad9..ed031859ba 100644
--- a/options/license/psutils
+++ b/options/license/psutils
@@ -1,7 +1,5 @@
-PS Utilities Package
-
-The constituent files of this package listed below are copyright (C) 1991-1995
-Angus J. C. Duggan.
+PS Utilities Package The constituent files of this package listed below are
+copyright (C) 1991-1995 Angus J. C. Duggan.
LICENSE Makefile.msc Makefile.nt Makefile.os2
diff --git a/options/license/xinetd b/options/license/xinetd
index 1fc82bfca4..70c0bb8e7a 100644
--- a/options/license/xinetd
+++ b/options/license/xinetd
@@ -1,6 +1,4 @@
-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
diff --git a/options/license/xpp b/options/license/xpp
index c059c56234..c906815603 100644
--- a/options/license/xpp
+++ b/options/license/xpp
@@ -1,6 +1,5 @@
-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: