Explicitly add linking to our website to the "asking permission for things"

section.
Replace the FAQ text with a summary + link to feedback.but.

git-svn-id: svn://svn.tartarus.org/sgt/putty@6613 cda61777-01e9-0310-a592-d414129be87e

diff --git a/doc/faq.but b/doc/faq.but
index 9df4508..02a2be0 100644 (file)
--- a/doc/faq.but
+++ b/doc/faq.but
@@ -1210,18 +1210,10 @@ 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 (see
-\k{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.
+Yes. For most things, you need not bother asking us explicitly for
+permission; our licence already grants you permission.
+
+See \k{feedback-permission} for more details.
 
 \S{faq-indemnity}{Question} Can you sign an agreement indemnifying
 us against security problems in PuTTY?

diff --git a/doc/feedback.but b/doc/feedback.but
index 30b6444..0949fb2 100644 (file)
--- a/doc/feedback.but
+++ b/doc/feedback.but
@@ -356,17 +356,20 @@ 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.)
+your own organisation, then we recommend, but do not insist, that
+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
 need to bother. You already have permission.
 
+If you just want to link to our web site, just go ahead. (It's not
+clear that we \e{could} stop you doing this, even if we wanted to!)
+
 \H{feedback-mirrors} Mirroring the PuTTY web site
 
 \#{This paragraph also in putty-website/mirrors.html}