[eros-cvs] cvs commit: eros/src/doc/www/legal assign.html assign.past.html

shap@eros.cs.jhu.edu shap@eros.cs.jhu.edu
Wed, 24 Jan 2001 14:52:38 -0500


shap        01/01/24 14:52:38

  Modified:    src/doc/www/legal assign.html assign.past.html
  Log:
  Revisions to assignment agreement per Charlie

Revision  Changes    Path
1.9       +40 -0     eros/src/doc/www/legal/assign.html

Index: assign.html
===================================================================
RCS file: /cvs/eros/src/doc/www/legal/assign.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- assign.html	2001/01/14 19:08:00	1.8
+++ assign.html	2001/01/24 19:52:38	1.9
@@ -149,11 +149,51 @@
 	      </li>
 	      <li>
 		<p>
+		  Contributor agrees that any transmission of a
+		  Contribution to The EROS Group while this agreement
+		  is in force shall be considered a Contribution under
+		  this agreement. Such transmissions include, but are
+		  not limited to (a) transmission by electronic mail,
+		  (b) publication of such code on an electronic
+		  mailing list maintained by The EROS Group for the
+		  purpose of EROS-related discussions and exchanges,
+		  and (c) addition or modification of The EROS System
+		  by committing changes into the source code
+		  repository for the EROS system using the
+		  then-current configuration management tools.
+		</p>
+	      </li>
+	      <li>
+		<p>
+		  It is not the purpose of this agreement to deprive a
+		  contributor of the ability to make other use of
+		  their own work. Therefore, The EROS Group grants an
+		  unrestricted license to Contributor to make any
+		  desired use whatsoever of their Contribution,
+		  including redistribution of the Contribution by the
+		  Contributor under any terms that the Contributor may
+		  choose. However, The EROS Group provides this
+		  license on a purely "as-is" basis. Contributor
+		  assumes all liability for the consequences of such
+		  use by Contributor.
+		</p>
+	      </li>
+	      <li>
+		<p>
 		  Contributor acknowledges that the incorporation
 		  of the Contribution into the EROS System inherently
 		  constitutes good and valuable consideration to
 		  Contributor.
 		</p>
+	      </li>
+	      <li>
+		<p>
+		  This agreement may be terminated by either
+		  Contributor or The EROS Group at any time by giving
+		  14 days notice in writing to the other party. If
+		  terminated, all of the terms of this agreement will
+		  remain in force for contributions made prior to the
+		  date of termination.
 	      </li>
 	    </ol>
 	    <table>



1.7       +36 -1     eros/src/doc/www/legal/assign.past.html

Index: assign.past.html
===================================================================
RCS file: /cvs/eros/src/doc/www/legal/assign.past.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- assign.past.html	2001/01/14 19:08:00	1.6
+++ assign.past.html	2001/01/24 19:52:38	1.7
@@ -144,7 +144,42 @@
 		  Contributor agrees that this assignment is in effect
 		  for all contributions of software source code and
 		  other related intellectual property made by
-		  Contributor, now or in the future.
+		  Contributor (now or in the future) while this
+		  agreement is in force, unless other provisions have
+		  been made between the Contributor and The EROS
+		  Group for a particular Contribution or category of
+		  Contribution. 
+		</p>
+	      </li>
+	      <li>
+		<p>
+		  Contributor agrees that any transmission of a
+		  Contribution to The EROS Group while this agreement
+		  is in force shall be considered a Contribution under
+		  this agreement. Such transmissions include, but are
+		  not limited to (a) transmission by electronic mail,
+		  (b) publication of such code on an electronic
+		  mailing list maintained by The EROS Group for the
+		  purpose of EROS-related discussions and exchanges,
+		  and (c) addition or modification of The EROS System
+		  by committing changes into the source code
+		  repository for the EROS system using the
+		  then-current configuration management tools.
+		</p>
+	      </li>
+	      <li>
+		<p>
+		  It is not the purpose of this agreement to deprive a
+		  contributor of the ability to make other use of
+		  their own work. Therefore, The EROS Group grants an
+		  unrestricted license to Contributor to make any
+		  desired use whatsoever of their Contribution,
+		  including redistribution of the Contribution by the
+		  Contributor under any terms that the Contributor may
+		  choose. However, The EROS Group provides this
+		  license on a purely "as-is" basis. Contributor
+		  assumes all liability for the consequences of such
+		  use by Contributor.
 		</p>
 	      </li>
 	      <li>