X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/putty/blobdiff_plain/9448161f4c6a47c8db93cf935fb177da82320078..270bd74191d1d681facc421907a1d0a928f3151d:/doc/faq.but

diff --git a/doc/faq.but b/doc/faq.but
index e643ae2f..b3409b3c 100644
--- a/doc/faq.but
+++ b/doc/faq.but
@@ -1,4 +1,4 @@
-\versionid $Id: faq.but,v 1.65 2004/03/30 11:36:51 jacob Exp $
+\versionid $Id: faq.but,v 1.69 2004/04/28 17:26:15 jacob Exp $
 
 \A{faq} PuTTY FAQ
 
@@ -80,6 +80,12 @@ option to be enabled or disabled as you choose. The controls are in
 the Terminal panel, in the section marked \q{Line discipline
 options}.
 
+\S{faq-savedsettings}{Question} Does PuTTY support storing settings,
+so I don't have to change them every time?
+
+Yes, all of PuTTY's settings can be saved in named session profiles.
+See \k{config-saving} in the documentation for how to do this.
+
 \S{faq-disksettings}{Question} Does PuTTY support storing its
 settings in a disk file?
 
@@ -264,8 +270,8 @@ and certainly isn't yet useful.  PuTTY on portable devices would
 clearly be a useful thing, so in the long term I hope it can be
 brought up to release quality.
 
-There's a also third-party port at
-\W{http://pocketputty.aleq.cz/}\c{http://pocketputty.aleq.cz/}.
+There's also a third-party port at
+\W{http://pocketputty.duxy.net/}\c{http://pocketputty.duxy.net/}.
 
 \S{faq-win31}{Question} Is there a port to Windows 3.1?
 
@@ -1036,6 +1042,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