Fiddly things involving pruning .svn directories, not mentioning

CVS, line endings etc. which I had to fix just before release.

[originally from svn r5367]

diff --git a/README.txt b/README.txt
index e2ad2d9877a00cf6b5c5eccadefcfe1aa5763a43..5b8d1a5d5594f493f0c09bded61ffafc7204e193 100644 (file)
--- a/README.txt
+++ b/README.txt
@@ -1,34 +1,34 @@
-PuTTY README\r
-============\r
-\r
-This is the README file for the PuTTY installer distribution. If\r
-you're reading this, you've probably just run our installer and\r
-installed PuTTY on your system.\r
-\r
-What should I do next?\r
-----------------------\r
-\r
-If you want to use PuTTY to connect to other computers, or use PSFTP\r
-to transfer files, you should just be able to run them from the\r
-Start menu.\r
-\r
-If you want to use the command-line-only file transfer utility PSCP,\r
-you will probably want to put the PuTTY installation directory on\r
-your PATH. How you do this depends on your version of Windows. On\r
-Windows NT and 2000, you can set it using Control Panel > System; on\r
-Windows 95 you will need to edit AUTOEXEC.BAT. Consult your Windows\r
-manuals for details.\r
-\r
-What do I do if it doesn't work?\r
---------------------------------\r
-\r
-The PuTTY home web site is\r
-\r
-    http://www.chiark.greenend.org.uk/~sgtatham/putty/\r
-\r
-Here you will find our list of known bugs and pending feature\r
-requests. If your problem is not listed in there, or in the FAQ, or\r
-in the manuals, read the Feedback page to find out how to report\r
-bugs to us. PLEASE read the Feedback page carefully: it is there to\r
-save you time as well as us. Do not send us one-line bug reports\r
-telling us `it doesn't work'.\r
+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 eb0be3261bb4bad697602be44b978c742489211a..efcc4a71522e89797e565627d521bc031e0d81c8 100644 (file)
--- 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 e955d33c3f5478515f86d5a3240545e1a1b89baa..b205cdccb1c84526531b34a48671ac927ede075b 100755 (executable)
--- 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 a290795427ddb75035b89654cfebfdc108997ce7..fbc2caca5defd352258ad2d6ce03297e00b2858d 100755 (executable)
--- 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 \