Re: [AD] giftware license

[Elias Pschernig <allefant@xxxxxxxxxx>]

> I agree. Include it both in readme.txt and as a separate document
> in the manual under "Miscelaneous" to be easily visible. Whenever
> the dust settles and you agree on what exactly to say I will update
> the license page. Or Elias can do it if he wants to.
> 

Ok, I attached a patch with an updated FAQ (added that e.g. back, and
replaces the last question) and which also adds the second disclaimer
right to the giftware license and as a separate document (which also
contains the giftware text).

Index: docs/src/license._tx
===================================================================
RCS file: docs/src/license._tx
diff -N docs/src/license._tx
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ docs/src/license._tx	4 Oct 2004 19:54:24 -0000
@@ -0,0 +1,26 @@
+@document_title=Giftware license
+@external-css=allegro.css
+@heading
+The giftware license
+
+   Allegro is gift-ware. It was created by a number of people working in 
+   cooperation, and is given to you freely as a gift. You may use, modify, 
+   redistribute, and generally hack it about in any way you like, and you do 
+   not have to give us anything in return. However, if you like this product 
+   you are encouraged to thank us by making a return gift to the Allegro 
+   community. This could be by writing an add-on package, providing a useful 
+   bug report, making an improvement to the library, or perhaps just 
+   releasing the sources of your program so that other people can learn from 
+   them. If you redistribute parts of this code or make a game using it, it 
+   would be nice if you mentioned Allegro somewhere in the credits, but you 
+   are not required to do this. We trust you not to abuse our generosity.
+
+   Disclaimer:
+
+   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, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+   SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+   FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+   ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+   DEALINGS IN THE SOFTWARE.
Index: docs/src/readme._tx
===================================================================
RCS file: /cvsroot/alleg/allegro/docs/src/readme._tx,v
retrieving revision 1.30
diff -u -r1.30 readme._tx
--- docs/src/readme._tx	31 Aug 2004 07:29:28 -0000	1.30
+++ docs/src/readme._tx	4 Oct 2004 19:54:25 -0000
@@ -188,7 +188,15 @@
    would be nice if you mentioned Allegro somewhere in the credits, but you 
    are not required to do this. We trust you not to abuse our generosity.
 
+   Disclaimer:
 
+   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, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+   SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+   FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+   ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+   DEALINGS IN THE SOFTWARE.
 
 @heading
 Configuration
Index: docs/src/allegro._tx
===================================================================
RCS file: /cvsroot/alleg/allegro/docs/src/allegro._tx,v
retrieving revision 1.261
diff -u -r1.261 allegro._tx
--- docs/src/allegro._tx	3 Oct 2004 11:08:04 -0000	1.261
+++ docs/src/allegro._tx	4 Oct 2004 19:54:47 -0000
@@ -11464,6 +11464,7 @@
 @externalfile ahack The Allegro hacker's guide
 @externalfile const Allegro `const'-correctness
 @externalfile packfile Packfile format information
+@externalfile license License and Disclaimer
 @endchapter
 @headingnocontent
 Conclusion
Index: makefile.in
===================================================================
RCS file: /cvsroot/alleg/allegro/makefile.in,v
retrieving revision 1.66
diff -u -r1.66 makefile.in
--- makefile.in	5 Aug 2004 08:18:17 -0000	1.66
+++ makefile.in	4 Oct 2004 19:54:47 -0000
@@ -234,7 +234,8 @@
 
 # -------- documentation --------
 
-DOCBASEFILES = ahack changes faq help thanks allegro const abi api packfile readme
+DOCBASEFILES = ahack changes faq help thanks allegro const abi api packfile readme \
+               license
 DOCBUILDFILES = bcc32 beos darwin djgpp linux macosx mingw32 msvc qnx unix watcom
 DOCTXTBUILDFILES = $(addprefix docs/build/,$(addsuffix .txt,$(DOCBUILDFILES)))