Reformatting and one noun change to bcfg2

git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@1997 ce84e21b-d406-0410-9b95-82705330c041

1 files changed, 42 insertions, 43 deletions

diff --git a/LICENSE b/LICENSE
index 9fae86a17..3c2ea0cfc 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,22 +1,21 @@
 BCFG Public License
 
-Copyright (c) University of Chicago 1999.  
+Copyright (c) University of Chicago 2004-2006.  
 
-1. The "Software", below, refers to the MCS Systems Administration Toolkit
-   (in either source-code, or binary form) and a "work based on the
-   Software" means a work based on either the Software, on part of the
-   Software, or on any derivative work of the Software under copyright law:
-   that is, a work containing all or a portion of the Software either
-   verbatim or with modifications.  Each licensee is addressed as "you" or
-   "Licensee."
+1. The "Software", below, refers to Bcfg2 (in either source-code, or
+binary form) and a "work based on the Software" means a work based on
+either the Software, on part of the Software, or on any derivative
+work of the Software under copyright law: that is, a work containing
+all or a portion of the Software either verbatim or with
+modifications.  Each licensee is addressed as "you" or "Licensee."
 
-2. The University of Chicago as Operator of Argonne National Laboratory is
-   the copyright holder in the Software.  The copyright holder reserves all
-   rights except those expressly granted to the Licensee herein and
-   U.S. Government license rights.
+2. The University of Chicago as Operator of Argonne National
+Laboratory is the copyright holder in the Software.  The copyright
+holder reserves all rights except those expressly granted to the
+Licensee herein and U.S. Government license rights.
 
 3. A copy or copies of the Software may be given to others, if you meet the
-   following conditions:
+following conditions:
 
    a) Copies in source code must include the copyright notice and this 
       license.
@@ -25,24 +24,24 @@ Copyright (c) University of Chicago 1999.
       this license in the documentation and/or other materials provided 
       with the copy.
 
-4. All advertising materials, journal articles and documentation mentioning
-   features derived from or use of the Software must display the following
-   acknowledgment:
+4. All advertising materials, journal articles and documentation
+mentioning features derived from or use of the Software must display
+the following acknowledgment:
 
      "This product includes software developed by the MCS Systems Group
       at Argonne National Laboratory (http://www.mcs.anl.gov/systems/)."
 
-   In the event that the product being advertised includes an intact
-   distribution of the Software (with copyright and license included) then
-   this clause is waived.
+In the event that the product being advertised includes an intact
+distribution of the Software (with copyright and license included)
+then this clause is waived.
 
-5. You are encouraged to package modifications to the Software separately,
-   as patches to the Software.
+5. You are encouraged to package modifications to the Software
+separately, as patches to the Software.
 
-6. If you modify a copy or copies of the Software or any portion of it,
-   thus forming a work based on the Software, and give a copy or copies of
-   such work to others, either in source code or binary form, you must meet
-   the following conditions:
+6. If you modify a copy or copies of the Software or any portion of
+it, thus forming a work based on the Software, and give a copy or
+copies of such work to others, either in source code or binary form,
+you must meet the following conditions:
 
    a) The Software must carry prominent notices stating that you changed
       specified portions of the Software.
@@ -52,29 +51,29 @@ Copyright (c) University of Chicago 1999.
       National Laboratory to which the U.S. Government retains certain
       rights."
 
-7. LICENSEE AGREES THAT THE EXPORT OF GOODS AND/OR TECHNICAL DATA FROM THE
-   UNITED STATES MAY REQUIRE SOME FORM OF EXPORT CONTROL LICENSE FROM THE
-   U.S. GOVERNMENT AND THAT FAILURE TO OBTAIN SUCH EXPORT CONTROL LICENSE
-   MAY RESULT IN CRIMINAL LIABILITY UNDER U.S. LAWS.
+7. LICENSEE AGREES THAT THE EXPORT OF GOODS AND/OR TECHNICAL DATA FROM
+THE UNITED STATES MAY REQUIRE SOME FORM OF EXPORT CONTROL LICENSE FROM
+THE U.S. GOVERNMENT AND THAT FAILURE TO OBTAIN SUCH EXPORT CONTROL
+LICENSE MAY RESULT IN CRIMINAL LIABILITY UNDER U.S. LAWS.
 
 8. Portions of the Software resulted from work developed under a
-   U.S. Government contract and are subject to the following license: the
-   Government is granted for itself and others acting on its behalf a
-   paid-up, nonexclusive, irrevocable worldwide license in this computer
-   software to reproduce, prepare derivative works, and perform publicly
-   and display publicly.
+U.S. Government contract and are subject to the following license: the
+Government is granted for itself and others acting on its behalf a
+paid-up, nonexclusive, irrevocable worldwide license in this computer
+software to reproduce, prepare derivative works, and perform publicly
+and display publicly.
 
 9. The Software was prepared, in part, as an account of work sponsored by
-   an agency of the U.S. Government.  Neither the United States, nor the
-   University of Chicago, nor any of their employees, makes any warranty
-   express or implied, or assumes any legal liability or responsibility for
-   the accuracy, completeness, or usefulness of any information, apparatus,
-   product, or process disclosed, or represents that its use would not
-   infringe privately owned rights.
+an agency of the U.S. Government.  Neither the United States, nor the
+University of Chicago, nor any of their employees, makes any warranty
+express or implied, or assumes any legal liability or responsibility for
+the accuracy, completeness, or usefulness of any information, apparatus,
+product, or process disclosed, or represents that its use would not
+infringe privately owned rights.
 
 10. IN NO EVENT WILL THE UNITED STATES, OR THE UNIVERSITY OF CHICAGO BE
-   LIABLE FOR ANY DAMAGES, INCLUDING DIRECT, INCIDENTAL, SPECIAL, OR
-   CONSEQUENTIAL DAMAGES RESULTING FROM EXERCISE OF THIS LICENSE AGREEMENT
-   OR THE USE OF THE SOFTWARE.
+LIABLE FOR ANY DAMAGES, INCLUDING DIRECT, INCIDENTAL, SPECIAL, OR
+CONSEQUENTIAL DAMAGES RESULTING FROM EXERCISE OF THIS LICENSE AGREEMENT
+OR THE USE OF THE SOFTWARE.
 
 END OF LICENSE