summaryrefslogtreecommitdiff
path: root/COPYING
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2002-02-25 09:18:09 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2002-02-25 09:18:09 +0000
commitfb31afc5a23b33bd30bc63d2269bc7eebba2fe2c (patch)
tree205a9634ee094d5f5ad191f69da8c6722249f618 /COPYING
parent8f800a24525671fce407cefac9cff56a070f6a3b (diff)
* process.c (rb_syswait): thread kludge; should be fixed to
support native thread. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_6@2129 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'COPYING')
-rw-r--r--COPYING12
1 files changed, 6 insertions, 6 deletions
diff --git a/COPYING b/COPYING
index 776b142468..870a5f22d6 100644
--- a/COPYING
+++ b/COPYING
@@ -17,22 +17,22 @@ You can redistribute it and/or modify it under either the terms of the GPL
b) use the modified software only within your corporation or
organization.
- c) rename any non-standard executables so the names do not conflict
- with standard executables, which must also be provided.
+ c) give non-standard binaries non-standard names, with
+ instructions on where to get the original software distribution.
d) make other distribution arrangements with the author.
- 3. You may distribute the software in object code or executable
- form, provided that you do at least ONE of the following:
+ 3. You may distribute the software in object code or binary form,
+ provided that you do at least ONE of the following:
- a) distribute the executables and library files of the software,
+ a) distribute the binaries and library files of the software,
together with instructions (in the manual page or equivalent)
on where to get the original distribution.
b) accompany the distribution with the machine-readable source of
the software.
- c) give non-standard executables non-standard names, with
+ c) give non-standard binaries non-standard names, with
instructions on where to get the original software distribution.
d) make other distribution arrangements with the author.