From 35cffede3bf184026cc35c666063b6dd8e3c892e Mon Sep 17 00:00:00 2001 From: simon Date: Sat, 22 May 2004 11:09:31 +0000 Subject: [PATCH] Halibut now warns about code paragraph lines which are too long to fit in the text output format. If only to stop myself getting pestered with cron stderr messages every night, here are some changes that remove over-long code lines from the PuTTY manual. git-svn-id: svn://svn.tartarus.org/sgt/putty@4238 cda61777-01e9-0310-a592-d414129be87e --- doc/config.but | 8 ++++---- doc/faq.but | 6 +++--- doc/pageant.but | 6 +++--- doc/plink.but | 4 ++-- doc/pscp.but | 23 +++++++++++------------ 5 files changed, 23 insertions(+), 24 deletions(-) diff --git a/doc/config.but b/doc/config.but index a565c571..4026798e 100644 --- a/doc/config.but +++ b/doc/config.but @@ -1,4 +1,4 @@ -\versionid $Id: config.but,v 1.79 2004/05/22 11:04:35 simon Exp $ +\versionid $Id: config.but,v 1.80 2004/05/22 11:09:31 simon Exp $ \C{config} Configuring PuTTY @@ -2321,9 +2321,9 @@ line options, so it's all automatic. Here is what you need in \c regedit /s putty.reg \c regedit /s puttyrnd.reg \c start /w putty.exe -\c regedit /ea puttynew.reg HKEY_CURRENT_USER\Software\SimonTatham\PuTTY -\c copy puttynew.reg putty.reg -\c del puttynew.reg +\c regedit /ea new.reg HKEY_CURRENT_USER\Software\SimonTatham\PuTTY +\c copy new.reg putty.reg +\c del new.reg \c regedit /s puttydel.reg This batch file needs two auxiliary files: \c{PUTTYRND.REG} which diff --git a/doc/faq.but b/doc/faq.but index b3409b3c..4f832ef5 100644 --- a/doc/faq.but +++ b/doc/faq.but @@ -1,4 +1,4 @@ -\versionid $Id: faq.but,v 1.69 2004/04/28 17:26:15 jacob Exp $ +\versionid $Id: faq.but,v 1.70 2004/05/22 11:09:31 simon Exp $ \A{faq} PuTTY FAQ @@ -565,8 +565,8 @@ In order to use Plink on these systems, you will need to download the \W{http://www.microsoft.com/windows95/downloads/contents/wuadmintools/s_wunetworkingtools/w95sockets2/}{WinSock 2 upgrade}: -\c http://www.microsoft.com/windows95/downloads/contents/wuadmintools/ -\c s_wunetworkingtools/w95sockets2/ +\c http://www.microsoft.com/windows95/downloads/contents/ +\c wuadmintools/s_wunetworkingtools/w95sockets2/ \S{faq-outofmem}{Question} After trying to establish an SSH 2 connection, PuTTY says \q{Out of memory} and dies. diff --git a/doc/pageant.but b/doc/pageant.but index e062abe4..d08563e9 100644 --- a/doc/pageant.but +++ b/doc/pageant.but @@ -1,4 +1,4 @@ -\versionid $Id: pageant.but,v 1.10 2003/02/11 14:10:20 simon Exp $ +\versionid $Id: pageant.but,v 1.11 2004/05/22 11:09:31 simon Exp $ \C{pageant} Using Pageant for authentication @@ -62,8 +62,8 @@ The large list box in the Pageant main window lists the private keys that are currently loaded into Pageant. The list might look something like this: -\c ssh1 1024 22:c3:68:3b:09:41:36:c3:39:83:91:ae:71:b2:0f:04 key1 -\c ssh-rsa 1023 74:63:08:82:95:75:e1:7c:33:31:bb:cb:00:c0:89:8b key2 +\c ssh1 1024 22:c3:68:3b:09:41:36:c3:39:83:91:ae:71:b2:0f:04 k1 +\c ssh-rsa 1023 74:63:08:82:95:75:e1:7c:33:31:bb:cb:00:c0:89:8b k2 For each key, the list box will tell you: diff --git a/doc/plink.but b/doc/plink.but index 971ef7ce..76f2c96c 100644 --- a/doc/plink.but +++ b/doc/plink.but @@ -1,4 +1,4 @@ -\versionid $Id: plink.but,v 1.22 2004/04/24 12:25:08 jacob Exp $ +\versionid $Id: plink.but,v 1.23 2004/05/22 11:09:31 simon Exp $ \C{plink} Using the command-line connection tool Plink @@ -226,7 +226,7 @@ start a backup on a remote machine, you might use a command like: Or perhaps you want to fetch all system log lines relating to a particular web area: -\c plink mysession grep /~fjbloggs/ /var/log/httpd/access.log > fredlogs +\c plink mysession grep /~fred/ /var/log/httpd/access.log > fredlog Any non-interactive command you could usefully run on the server command line, you can run in a batch file using Plink in this way. diff --git a/doc/pscp.but b/doc/pscp.but index c69b0228..7c913ca4 100644 --- a/doc/pscp.but +++ b/doc/pscp.but @@ -1,4 +1,4 @@ -\versionid $Id: pscp.but,v 1.27 2004/04/25 22:18:19 jacob Exp $ +\versionid $Id: pscp.but,v 1.28 2004/05/22 11:09:31 simon Exp $ \#FIXME: Need examples @@ -81,11 +81,11 @@ To send (a) file(s) to a remote server: \c pscp [options] source [source...] [user@]host:target -So to copy the local file \c{c:\\documents\\csh-whynot.txt} to the -server \c{example.com} as user \c{fred} to the file -\c{/tmp/csh-whynot} you would type: +So to copy the local file \c{c:\\documents\\foo.txt} to the server +\c{example.com} as user \c{fred} to the file \c{/tmp/foo} you would +type: -\c pscp c:\documents\csh-whynot.txt fred@example.com:/tmp/csh-whynot +\c pscp c:\documents\foo.txt fred@example.com:/tmp/foo You can use wildcards to transfer multiple files in either direction, like this: @@ -94,12 +94,11 @@ direction, like this: \c pscp fred@example.com:source/*.c c:\source However, in the second case (using a wildcard for multiple remote -files) you may see a warning like this: - -\c warning: remote host tried to write to a file called 'terminal.c' -\c when we requested a file called '*.c'. -\c If this is a wildcard, consider upgrading to SSH 2 or using -\c the '-unsafe' option. Renaming of this file has been disallowed. +files) you may see a warning saying something like \q{warning: +remote host tried to write to a file called 'terminal.c' when we +requested a file called '*.c'. If this is a wildcard, consider +upgrading to SSH 2 or using the '-unsafe' option. Renaming of this +file has been disallowed}. This is due to a fundamental insecurity in the old-style SCP protocol: the client sends the wildcard string (\c{*.c}) to the @@ -196,7 +195,7 @@ timestamp on copied files. By default, PSCP displays a meter displaying the progress of the current transfer: -\c mibs.tar | 168 kB | 84.0 kB/s | ETA: 00:00:13 | 13% +\c mibs.tar | 168 kB | 84.0 kB/s | ETA: 00:00:13 | 13% The fields in this display are (from left to right), filename, size (in kilobytes) of file transferred so far, estimate of how fast the -- 2.11.0