You are viewing a plain text version of this content. The canonical link for it is here.
Posted to websh-cvs@tcl.apache.org by ro...@apache.org on 2005/11/16 14:39:26 UTC
svn commit: r345014 - in /tcl/websh/trunk: README src/license.terms
Author: ronnie
Date: Wed Nov 16 05:39:19 2005
New Revision: 345014
URL: http://svn.apache.org/viewcvs?rev=345014&view=rev
Log:
- fixed reference to Apache 2.0 license
Modified:
tcl/websh/trunk/README
tcl/websh/trunk/src/license.terms
Modified: tcl/websh/trunk/README
URL: http://svn.apache.org/viewcvs/tcl/websh/trunk/README?rev=345014&r1=345013&r2=345014&view=diff
==============================================================================
--- tcl/websh/trunk/README (original)
+++ tcl/websh/trunk/README Wed Nov 16 05:39:19 2005
@@ -8,7 +8,7 @@
All rights reserved.
This software is distributed under the terms of the Apache
- Software License, available as "license.terms".
+ Software License, available as "LICENSE".
Websh is available from
Modified: tcl/websh/trunk/src/license.terms
URL: http://svn.apache.org/viewcvs/tcl/websh/trunk/src/license.terms?rev=345014&r1=345013&r2=345014&view=diff
==============================================================================
--- tcl/websh/trunk/src/license.terms (original)
+++ tcl/websh/trunk/src/license.terms Wed Nov 16 05:39:19 2005
@@ -1,56 +1,3 @@
-/* ====================================================================
- * The Apache Software License, Version 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:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
- * "This product includes software developed by the
- * Apache Software Foundation (http://www.apache.org/)."
- * Alternately, this acknowledgment may appear in the software itself,
- * if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "Websh", "Webshell", "Apache" and "Apache Software
- * Foundation" must not be used to endorse or promote products
- * derived from this software without prior written permission. For
- * written permission, please contact apache@apache.org.
- *
- * 5. Products derived from this software may not be called "Websh",
- * "Webshell", nor may "Websh" or "Webshell" appear in their name,
- * without prior written permission of the Apache Software
- * Foundation.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 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.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation. For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- *
- * This software is based upon software originally written by
- * Netcetera AG, of Zurich, Switzerland. */
+Websh is licensed under the Apache License 2.0
+
+see ../LICENSE for the full text.
---------------------------------------------------------------------
To unsubscribe, e-mail: websh-cvs-unsubscribe@tcl.apache.org
For additional commands, e-mail: websh-cvs-help@tcl.apache.org