From 254ea454dff21569780f697158eb4e513dd18014 Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Sun, 20 Feb 2005 16:14:26 +0000
Subject: [PATCH] Fiddly things involving pruning .svn directories, not
 mentioning CVS, line endings etc. which I had to fix just before release.

[originally from svn r5367]
---
 README.txt  | 68 ++++++++++++++++++++++++++---------------------------
 doc/faq.but |  4 ++--
 mksrcarc.sh |  1 +
 mkunxarc.sh |  3 ++-
 4 files changed, 39 insertions(+), 37 deletions(-)

diff --git a/README.txt b/README.txt
index e2ad2d98..5b8d1a5d 100644
--- a/README.txt
+++ b/README.txt
@@ -1,34 +1,34 @@
-PuTTY README
-============
-
-This is the README file for the PuTTY installer distribution. If
-you're reading this, you've probably just run our installer and
-installed PuTTY on your system.
-
-What should I do next?
-----------------------
-
-If you want to use PuTTY to connect to other computers, or use PSFTP
-to transfer files, you should just be able to run them from the
-Start menu.
-
-If you want to use the command-line-only file transfer utility PSCP,
-you will probably want to put the PuTTY installation directory on
-your PATH. How you do this depends on your version of Windows. On
-Windows NT and 2000, you can set it using Control Panel > System; on
-Windows 95 you will need to edit AUTOEXEC.BAT. Consult your Windows
-manuals for details.
-
-What do I do if it doesn't work?
---------------------------------
-
-The PuTTY home web site is
-
-    http://www.chiark.greenend.org.uk/~sgtatham/putty/
-
-Here you will find our list of known bugs and pending feature
-requests. If your problem is not listed in there, or in the FAQ, or
-in the manuals, read the Feedback page to find out how to report
-bugs to us. PLEASE read the Feedback page carefully: it is there to
-save you time as well as us. Do not send us one-line bug reports
-telling us `it doesn't work'.
+PuTTY README
+============
+
+This is the README file for the PuTTY installer distribution. If
+you're reading this, you've probably just run our installer and
+installed PuTTY on your system.
+
+What should I do next?
+----------------------
+
+If you want to use PuTTY to connect to other computers, or use PSFTP
+to transfer files, you should just be able to run them from the
+Start menu.
+
+If you want to use the command-line-only file transfer utility PSCP,
+you will probably want to put the PuTTY installation directory on
+your PATH. How you do this depends on your version of Windows. On
+Windows NT and 2000, you can set it using Control Panel > System; on
+Windows 95 you will need to edit AUTOEXEC.BAT. Consult your Windows
+manuals for details.
+
+What do I do if it doesn't work?
+--------------------------------
+
+The PuTTY home web site is
+
+    http://www.chiark.greenend.org.uk/~sgtatham/putty/
+
+Here you will find our list of known bugs and pending feature
+requests. If your problem is not listed in there, or in the FAQ, or
+in the manuals, read the Feedback page to find out how to report
+bugs to us. PLEASE read the Feedback page carefully: it is there to
+save you time as well as us. Do not send us one-line bug reports
+telling us `it doesn't work'.
diff --git a/doc/faq.but b/doc/faq.but
index eb0be326..efcc4a71 100644
--- a/doc/faq.but
+++ b/doc/faq.but
@@ -1,4 +1,4 @@
-\versionid $Id: faq.but,v 1.82 2004/10/08 12:38:08 jacob Exp $
+\versionid $Id$
 
 \A{faq} PuTTY FAQ
 
@@ -158,7 +158,7 @@ completely is the wrong solution and we will not do it.
 
 If you have host keys available in the common \c{known_hosts} format,
 we have a script called 
-\W{http://cvs.tartarus.org/putty/contrib/kh2reg.py}\c{kh2reg.py}
+\W{http://www.tartarus.org/~simon-anonsvn/viewcvs.cgi/putty/contrib/kh2reg.py?view=markup}\c{kh2reg.py}
 to convert them to a Windows .REG file, which can be installed ahead of
 time by double-clicking or using \c{REGEDIT}.
 
diff --git a/mksrcarc.sh b/mksrcarc.sh
index e955d33c..b205cdcc 100755
--- a/mksrcarc.sh
+++ b/mksrcarc.sh
@@ -1,6 +1,7 @@
 #!/bin/sh
 perl mkfiles.pl
 text=`{ find . -name CVS -prune -o \
+               -name .svn -prune -o \
                -name .cvsignore -prune -o \
                -name LATEST.VER -prune -o \
                -name CHECKLST.txt -prune -o \
diff --git a/mkunxarc.sh b/mkunxarc.sh
index a2907954..fbc2caca 100755
--- a/mkunxarc.sh
+++ b/mkunxarc.sh
@@ -30,10 +30,11 @@ relver=`cat LATEST.VER`
 arcname="putty$arcsuffix"
 mkdir uxarc
 mkdir uxarc/$arcname
-find . -name uxarc -prune -o -name . -o \
+find . -name uxarc -prune -o -name .svn -prune -o -name . -o \
        -type d -exec mkdir uxarc/$arcname/{} \;
 find . -name uxarc -prune -o \
        -name CVS -prune -o \
+       -name .svn -prune -o \
        -name .cvsignore -prune -o \
        -name '*.zip' -prune -o \
        -name '*.tar.gz' -prune -o \
-- 
2.45.2