Add `can I put PuTTY on a coverdisk / bundle it / etc' to the FAQ in

case people are incapable of spotting it on the Feedback page. Also
add to both locations Owen's point about first-line support.

[originally from svn r4009]

diff --git a/doc/faq.but b/doc/faq.but
index 5f721216f4b79e8a028f1cedf5a9d6ae1b438e5d..dd5152856601006f7c140946c1a02e7cee0936c0 100644 (file)
--- a/doc/faq.but
+++ b/doc/faq.but
@@ -1,4 +1,4 @@
-\versionid $Id: faq.but,v 1.66 2004/03/31 09:00:39 jacob Exp $
+\versionid $Id: faq.but,v 1.67 2004/03/31 12:50:17 simon Exp $
 
 \A{faq} PuTTY FAQ
 
@@ -1036,6 +1036,22 @@ developers. If you want to be sure your donation is going towards
 something worthwhile, ask us first. If you don't like these terms,
 feel perfectly free not to donate. We don't mind.
 
+\S{faq-permission}{Question} Can I have permission to put PuTTY on a
+cover disk / distribute it with other software / etc?
+
+Yes. You need not bother asking us explicitly for permission. You
+already have permission. Redistribution of the unmodified PuTTY
+binary in this way is entirely permitted by our licence, and you are
+welcome to do it as much as you like.
+
+If you are distributing PuTTY within your own organisation, or for
+use with your own product, then we recommend (but do not insist)
+that you offer your own first-line technical support, to answer
+questions directly relating to the interaction of PuTTY with your
+particular environment. If your users mail us directly, we won't be
+able to give them very much help about things specific to your own
+setup.
+
 \H{faq-misc} Miscellaneous questions
 
 \S{faq-openssh}{Question} Is PuTTY a port of OpenSSH, or based on

diff --git a/doc/feedback.but b/doc/feedback.but
index eca35fac10b0d34e3ec347d4d2d74c9975d8312a..cc3a16fc487dbaca486f96cf3f20bb9c1c2833f9 100644 (file)
--- a/doc/feedback.but
+++ b/doc/feedback.but
@@ -1,4 +1,4 @@
-\versionid $Id: feedback.but,v 1.16 2004/02/22 16:52:27 jacob Exp $
+\versionid $Id: feedback.but,v 1.17 2004/03/31 12:50:17 simon Exp $
 
 \A{feedback} Feedback and bug reporting
 
@@ -338,6 +338,14 @@ or as part of a collection of useful software on a CD or a web site,
 then \e{permission is already granted}. You don't have to mail us
 and ask. Just go ahead and do it. We don't mind.
 
+(If you want to distribute PuTTY alongside your own application for
+use with that application, or if you want to distribute PuTTY within
+your own organisation, then we recommend you offer your own
+first-line technical support, to answer questions about the
+interaction of PuTTY with your environment. If your users mail us
+directly, we won't be able to tell them anything useful about your
+specific setup.)
+
 If you want to use parts of the PuTTY source code in another
 program, then it might be worth mailing us to talk about technical
 details, but if all you want is to ask permission then you don't