From 67a2f351c099f37b4d276f28da1f119ca1973674 Mon Sep 17 00:00:00 2001 From: Neil Schemenauer Date: Thu, 16 Mar 2006 19:48:55 -0700 Subject: [PATCH] Update README and LICENSE. --- ACKS => ACKS.txt | 0 CHANGES.txt | 19 +++++++++++++++++++ LICENSE.txt | 26 ++++++++++++++++++++++++++ README => README.txt | 35 ++++++++++++++--------------------- CHANGES => doc/CHANGES_24.txt | 0 LICENSE => doc/LICENSE_24.txt | 0 doc/Makefile | 2 +- 7 files changed, 60 insertions(+), 22 deletions(-) rename ACKS => ACKS.txt (100%) create mode 100644 CHANGES.txt create mode 100644 LICENSE.txt rename README => README.txt (57%) rename CHANGES => doc/CHANGES_24.txt (100%) rename LICENSE => doc/LICENSE_24.txt (100%) diff --git a/ACKS b/ACKS.txt similarity index 100% rename from ACKS rename to ACKS.txt diff --git a/CHANGES.txt b/CHANGES.txt new file mode 100644 index 0000000..4794e8d --- /dev/null +++ b/CHANGES.txt @@ -0,0 +1,19 @@ +Summary of changes +------------------ + +2.5 (released 2006-MM-DD): + + * Remove Subversion keywords. Update README. --Neil Schemenauer + + +Author index +------------ + + Neil Schemenauer + + +Older changes +------------- + + See doc/CHANGES_24.txt for changes up to version 2.4. + diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 0000000..2e41827 --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,26 @@ +This version of Quixote is derived from Quixote 2.4, released by CNRI. +See doc/LICENSE_24.txt for the licensing terms of that release. Changes +made since that release are summarized in the CHANGES.txt file along +with a list of authors. Those changes are made available under the +following terms (commonly known as the MIT/X license). + +Copyright (c) the Quixote developers + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be included +in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/README b/README.txt similarity index 57% rename from README rename to README.txt index 69b7769..9a17d41 100644 --- a/README +++ b/README.txt @@ -1,17 +1,18 @@ Quixote ======= -Quixote is a framework for developing Web applications in Python. -The target is web applications that are developed and maintained -by Python programmers. +Quixote is a framework for developing Web applications in Python. +The target is web applications that are developed and maintained by +Python programmers. See http://www.quixote.ca/users for a list of +applications using Quixote. Quixote requires Python 2.3 or greater to run. For installation instructions, see the doc/INSTALL.txt file. -Quixote includes PTL, the Python Template Language for producing -HTML with Python code. The use of PTL is not required in Quixote -applications, but we recommend it. Details about PTL are provided -in doc/PTL.txt. +Quixote includes PTL, the Python Template Language for producing +HTML with Python code. Note that the use of PTL is not required in +Quixote applications. Details about PTL are provided in +doc/PTL.txt. If you're switching to a newer version of Quixote from an older version, please refer to doc/upgrading.txt for explanations of any @@ -33,26 +34,18 @@ Look in the doc/ directory. Authors, copyright, and license =============================== -Quixote was originally written by Andrew Kuchling, Neil Schemenauer, and -Greg Ward. - -A list of contributors appears in the ACKS file. - -Copyright (c) 2000-2005 CNRI. - -Quixote is distributed under the CNRI Open Source License Agreement. -See LICENSE for details. +Quixote is copyrighted and made available under open source +licensing terms. See LICENSE.txt for the details. The ACKS.txt +file lists people who have assisted in the development of Quixote. +The CHANGES.txt file summarizes the changes made since version 2.4 +and lists the authors of those changes. Availability, home page, and mailing lists ========================================== The Quixote home page is: - http://www.mems-exchange.org/software/quixote/ + http://www.quixote.ca/ Discussion of Quixote occurs on the quixote-users mailing list: http://mail.mems-exchange.org/mailman/listinfo/quixote-users/ - -To follow development at the most detailed level by seeing every -checkin, join the quixote-checkins mailing list: - http://mail.mems-exchange.org/mailman/listinfo/quixote-checkins/ diff --git a/CHANGES b/doc/CHANGES_24.txt similarity index 100% rename from CHANGES rename to doc/CHANGES_24.txt diff --git a/LICENSE b/doc/LICENSE_24.txt similarity index 100% rename from LICENSE rename to doc/LICENSE_24.txt diff --git a/doc/Makefile b/doc/Makefile index 0b078f2..4dc79e6 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -3,7 +3,7 @@ # TXT_FILES = $(wildcard *.txt) -HTML_FILES = $(filter-out ZPL%,$(TXT_FILES:%.txt=%.html)) +HTML_FILES = $(filter-out LICENSE_24%,$(TXT_FILES:%.txt=%.html)) RST2HTML = /www/python/bin/rst2html RST2HTML_OPTS = -o us-ascii