From: Eric S. Raymond Date: Sun, 17 Sep 2006 05:31:52 +0000 (+0000) Subject: Complete the change to BSD license. X-Git-Tag: 2.0~250 X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=2e32fd9828e1f7cc5a05c531e4ef8e5fb77d66b5;p=super-star-trek.git Complete the change to BSD license. --- diff --git a/COPYING b/COPYING index bd581cf..7a15550 100644 --- a/COPYING +++ b/COPYING @@ -28,3 +28,13 @@ 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. + +-------------------------------------------------------------------------- + +Note: Nothing in this license grants or purports to grant any rights +with respect to the trademarks, copyrights or other property of the +originators of Star Trek or their successors in interest. We +recognize and support their right under the Berne Convention to +recover damages for any uses of this program which compromise their +legitimate interest in protecting their copyrights and trademarks or +unjustly enrich others. diff --git a/doc/sst-doc.xml b/doc/sst-doc.xml index 30efc78..3e47dee 100644 --- a/doc/sst-doc.xml +++ b/doc/sst-doc.xml @@ -34,14 +34,14 @@ -Permission is hereby granted for the copying, distribution, -modification and use of this program and associated documentation -for recreational purposes, provided that all references to the -authors are retained. However, permission is not and will not be -granted for the sale or promotional use of this program or program -documentation, or for use in any situation in which profit may be -considered an objective, since it is the desire of the authors to -respect the copyrights of the originators of Star Trek. +Super Star Trek 2K is issued under the BSD license. Nothing in +this license grants or purports to grant any rights with respect to +the trademarks, copyrights or other property of the originators of +Star Trek or their successors in interest. We recognize and support +their right under the Berne Convention to recover damages for any uses +of this program which compromise their legitimate interest in +protecting their copyrights and trademarks or unjustly enrich +others.