From 464e351c7bdf62f32e918d9c2fe5e47e6bf9b7a8 Mon Sep 17 00:00:00 2001 From: Jacob Nevins Date: Tue, 26 Mar 2019 00:27:04 +0000 Subject: [PATCH] Remove most traces of WinHelp support. Remove the 'winhelp-topic' IDs from the Halibut source, and from the code. Now we have one fewer name to think of every time we add a setting. I've left the HELPCTX system in place, with the vague notion that it might be a useful layer of indirection for some future help system on a platform like Mac OS X. (I've left the putty.hlp target in doc/Makefile, if nothing else because this is a convenient test case for Halibut's WinHelp support. But the resulting help file will no longer support context help.) --- doc/config.but | 296 --------------------------------------- doc/errors.but | 6 - doc/pageant.but | 8 -- doc/pgpkeys.but | 2 - doc/pubkey.but | 24 ---- doc/using.but | 2 - windows/winhelp.c | 5 +- windows/winhelp.h | 350 +++++++++++++++++++++++----------------------- 8 files changed, 174 insertions(+), 519 deletions(-) diff --git a/doc/config.but b/doc/config.but index 8aa27086..dd2e46e8 100644 --- a/doc/config.but +++ b/doc/config.but @@ -14,8 +14,6 @@ save your settings to be reloaded later. \S{config-hostname} The \i{host name} section -\cfg{winhelp-topic}{session.hostname} - The top box on the Session panel, labelled \q{Specify your connection by host name}, contains the details that need to be filled in before PuTTY can open a session at all. @@ -45,8 +43,6 @@ and \q{Speed}; see \k{config-serial} for more details of these. \S{config-saving} \ii{Loading and storing saved sessions} -\cfg{winhelp-topic}{session.saved} - The next part of the Session configuration panel allows you to save your preferred PuTTY options so they will appear automatically the next time you start PuTTY. It also allows you to create \e{saved @@ -113,8 +109,6 @@ described in \k{config-file}. \S{config-closeonexit} \q{\ii{Close Window} on Exit} -\cfg{winhelp-topic}{session.coe} - Finally in the Session panel, there is an option labelled \q{Close Window on Exit}. This controls whether the PuTTY \i{terminal window} disappears as soon as the session inside it terminates. If you are @@ -132,8 +126,6 @@ confusing message from the server will leave the window up. \H{config-logging} The Logging panel -\cfg{winhelp-topic}{logging.main} - The Logging configuration panel allows you to save \i{log file}s of your PuTTY sessions, for debugging, analysis or future reference. @@ -182,8 +174,6 @@ even if enabled via saved settings. \S{config-logfilename} \q{Log file name} -\cfg{winhelp-topic}{logging.filename} - In this edit box you enter the name of the file you want to log the session to. The \q{Browse} button will let you look around your file system to find the right place to put the file; or if you already @@ -219,8 +209,6 @@ like \S{config-logfileexists} \q{What to do if the log file already exists} -\cfg{winhelp-topic}{logging.exists} - This control allows you to specify what PuTTY should do if it tries to start writing to a log file and it finds the file already exists. You might want to automatically destroy the existing log file and @@ -232,8 +220,6 @@ comes up. \S{config-logflush} \I{log file, flushing}\q{Flush log file frequently} -\cfg{winhelp-topic}{logging.flush} - This option allows you to control how frequently logged data is flushed to disc. By default, PuTTY will flush data as soon as it is displayed, so that if you view the log file while a session is still @@ -248,8 +234,6 @@ at the end of a session). \S{config-logheader} \I{log file, header}\q{Include header} -\cfg{winhelp-topic}{logging.header} - This option allows you to choose whether to include a header line with the date and time when the log file is opened. It may be useful to disable this if the log file is being used as realtime input to other @@ -267,8 +251,6 @@ glean a lot of useful information from even these obfuscated logs \S2{config-logssh-omitpw} \q{Omit known password fields} -\cfg{winhelp-topic}{logging.ssh.omitpassword} - When checked, decrypted password fields are removed from the log of transmitted packets. (This includes any user responses to challenge-response authentication methods such as @@ -285,8 +267,6 @@ This option is enabled by default. \S2{config-logssh-omitdata} \q{Omit session data} -\cfg{winhelp-topic}{logging.ssh.omitdata} - When checked, all decrypted \q{session data} is omitted; this is defined as data in terminal sessions and in forwarded channels (TCP, X11, and authentication agent). This will usually substantially reduce @@ -301,8 +281,6 @@ of PuTTY's \i{terminal emulation}. \S{config-autowrap} \q{Auto wrap mode initially on} -\cfg{winhelp-topic}{terminal.autowrap} - \ii{Auto wrap mode} controls what happens when text printed in a PuTTY window reaches the right-hand edge of the window. @@ -325,8 +303,6 @@ immediately. \S{config-decom} \q{DEC Origin Mode initially on} -\cfg{winhelp-topic}{terminal.decom} - \i{DEC Origin Mode} is a minor option which controls how PuTTY interprets cursor-position \i{control sequence}s sent by the server. @@ -355,8 +331,6 @@ immediately. \S{config-crlf} \q{Implicit CR in every LF} -\cfg{winhelp-topic}{terminal.lfhascr} - Most servers send two control characters, \i{CR} and \i{LF}, to start a \i{new line} of the screen. The CR character makes the cursor return to the left-hand side of the screen. The LF character makes the cursor move @@ -380,8 +354,6 @@ option, and things might go back to normal: \S{config-lfcr} \q{Implicit LF in every CR} -\cfg{winhelp-topic}{terminal.crhaslf} - Most servers send two control characters, \i{CR} and \i{LF}, to start a \i{new line} of the screen. The CR character makes the cursor return to the left-hand side of the screen. The LF character makes the cursor move @@ -393,8 +365,6 @@ a line feed so that all lines are displayed. \S{config-erase} \q{Use \i{background colour} to erase screen} -\cfg{winhelp-topic}{terminal.bce} - Not all terminals agree on what colour to turn the screen when the server sends a \q{\i{clear screen}} sequence. Some terminals believe the screen should always be cleared to the \e{default} background @@ -417,8 +387,6 @@ immediately. \S{config-blink} \q{Enable \i{blinking text}} -\cfg{winhelp-topic}{terminal.blink} - The server can ask PuTTY to display text that blinks on and off. This is very distracting, so PuTTY allows you to turn blinking text off completely. @@ -436,8 +404,6 @@ immediately. \S{config-answerback} \q{\ii{Answerback} to ^E} -\cfg{winhelp-topic}{terminal.answerback} - This option controls what PuTTY will send back to the server if the server sends it the ^E \i{enquiry character}. Normally it just sends the string \q{PuTTY}. @@ -460,8 +426,6 @@ You can include control characters in the answerback string using \S{config-localecho} \q{\ii{Local echo}} -\cfg{winhelp-topic}{terminal.localecho} - With local echo disabled, characters you type into the PuTTY window are not echoed in the window \e{by PuTTY}. They are simply sent to the server. (The \e{server} might choose to \I{remote echo}echo them @@ -477,8 +441,6 @@ relying on the automatic detection. \S{config-localedit} \q{\ii{Local line editing}} -\cfg{winhelp-topic}{terminal.localedit} - Normally, every character you type into the PuTTY window is sent immediately to the server the moment you type it. @@ -505,8 +467,6 @@ instead of relying on the automatic detection. \S{config-printing} \ii{Remote-controlled printing} -\cfg{winhelp-topic}{terminal.printing} - A lot of VT100-compatible terminals support printing under control of the remote server (sometimes called \q{passthrough printing}). PuTTY supports this feature as well, but it is turned off by default. @@ -548,8 +508,6 @@ seems to help, you may find \k{faq-keyboard} to be useful. \S{config-backspace} Changing the action of the \ii{Backspace key} -\cfg{winhelp-topic}{keyboard.backspace} - Some terminals believe that the Backspace key should send the same thing to the server as \i{Control-H} (ASCII code 8). Other terminals believe that the Backspace key should send ASCII code 127 (usually @@ -576,8 +534,6 @@ isn't configured here as the default.) \S{config-homeend} Changing the action of the \i{Home and End keys} -\cfg{winhelp-topic}{keyboard.homeend} - The Unix terminal emulator \i\c{rxvt} disagrees with the rest of the world about what character sequences should be sent to the server by the Home and End keys. @@ -592,8 +548,6 @@ working, you could try switching this option to see if it helps. \S{config-funkeys} Changing the action of the \i{function keys} and \i{keypad} -\cfg{winhelp-topic}{keyboard.funkeys} - This option affects the function keys (F1 to F12) and the top row of the numeric keypad. @@ -628,8 +582,6 @@ fiddle with it. \S{config-appcursor} Controlling \i{Application Cursor Keys} mode -\cfg{winhelp-topic}{keyboard.appcursor} - Application Cursor Keys mode is a way for the server to change the control sequences sent by the arrow keys. In normal mode, the arrow keys send \c{ESC [A} through to \c{ESC [D}. In application mode, @@ -645,8 +597,6 @@ the \q{Features} configuration panel; see \S{config-appkeypad} Controlling \i{Application Keypad} mode -\cfg{winhelp-topic}{keyboard.appkeypad} - Application Keypad mode is a way for the server to change the behaviour of the numeric keypad. @@ -673,8 +623,6 @@ You can also disable application keypad mode completely, using the \S{config-nethack} Using \i{NetHack keypad mode} -\cfg{winhelp-topic}{keyboard.nethack} - PuTTY has a special mode for playing NetHack. You can enable it by selecting \q{NetHack} in the \q{Initial state of numeric keypad} control. @@ -694,8 +642,6 @@ on. We don't know why. \S{config-compose} Enabling a DEC-like \ii{Compose key} -\cfg{winhelp-topic}{keyboard.compose} - DEC terminals have a Compose key, which provides an easy-to-remember way of typing \i{accented characters}. You press Compose and then type two more characters. The two characters are \q{combined} to produce @@ -709,8 +655,6 @@ Compose key} option, the AltGr key will become a Compose key. \S{config-ctrlalt} \q{Control-Alt is different from \i{AltGr}} -\cfg{winhelp-topic}{keyboard.ctrlalt} - Some old keyboards do not have an AltGr key, which can make it difficult to type some characters. PuTTY can be configured to treat the key combination Ctrl + Left Alt the same way as the AltGr key. @@ -743,8 +687,6 @@ actions. \S{config-bellstyle} \q{Set the style of bell} -\cfg{winhelp-topic}{bell.style} - This control allows you to select various different actions to occur on a terminal bell: @@ -773,8 +715,6 @@ control \q{Custom sound file to play as a bell}. \S{config-belltaskbar} \q{\ii{Taskbar}/\I{window caption}caption indication on bell} -\cfg{winhelp-topic}{bell.taskbar} - This feature controls what happens to the PuTTY window's entry in the Windows Taskbar if a bell occurs while the window does not have the input focus. @@ -794,8 +734,6 @@ continuously flash on and off until you select the window. \S{config-bellovl} \q{Control the \i{bell overload} behaviour} -\cfg{winhelp-topic}{bell.overload} - A common user error in a terminal session is to accidentally run the Unix command \c{cat} (or equivalent) on an inappropriate file type, such as an executable, image file, or ZIP file. This produces a huge @@ -840,8 +778,6 @@ PuTTY's more advanced terminal features, in case they cause trouble. \S{config-features-application} Disabling application keypad and cursor keys -\cfg{winhelp-topic}{features.application} - \I{Application Keypad}Application keypad mode (see \k{config-appkeypad}) and \I{Application Cursor Keys}application cursor keys mode (see \k{config-appcursor}) alter the behaviour of @@ -852,8 +788,6 @@ tries to do. \S{config-features-mouse} Disabling \cw{xterm}-style \i{mouse reporting} -\cfg{winhelp-topic}{features.mouse} - PuTTY allows the server to send \i{control codes} that let it take over the mouse and use it for purposes other than \i{copy and paste}. Applications which use this feature include the text-mode web @@ -872,8 +806,6 @@ feature off (see \k{config-mouseshift}). \S{config-features-resize} Disabling remote \i{terminal resizing} -\cfg{winhelp-topic}{features.resize} - PuTTY has the ability to change the terminal's size and position in response to commands from the server. If you find PuTTY is doing this unexpectedly or inconveniently, you can tell PuTTY not to @@ -881,8 +813,6 @@ respond to those server commands. \S{config-features-altscreen} Disabling switching to the \i{alternate screen} -\cfg{winhelp-topic}{features.altscreen} - Many terminals, including PuTTY, support an \q{alternate screen}. This is the same size as the ordinary terminal screen, but separate. Typically a screen-based program such as a text editor might switch @@ -896,8 +826,6 @@ can disable the alternate screen feature completely. \S{config-features-retitle} Disabling remote \i{window title} changing -\cfg{winhelp-topic}{features.retitle} - PuTTY has the ability to change the window title in response to commands from the server. If you find PuTTY is doing this unexpectedly or inconveniently, you can tell PuTTY not to respond to @@ -905,8 +833,6 @@ those server commands. \S{config-features-qtitle} Response to remote \i{window title} querying -\cfg{winhelp-topic}{features.qtitle} - PuTTY can optionally provide the xterm service of allowing server applications to find out the local window title. This feature is disabled by default, but you can turn it on if you really want it. @@ -945,8 +871,6 @@ the reasons described above. \S{config-features-clearscroll} Disabling remote \i{scrollback clearing} -\cfg{winhelp-topic}{features.clearscroll} - PuTTY has the ability to clear the terminal's scrollback buffer in response to a command from the server. If you find PuTTY is doing this unexpectedly or inconveniently, you can tell PuTTY not to respond to @@ -954,8 +878,6 @@ that server command. \S{config-features-dbackspace} Disabling \i{destructive backspace} -\cfg{winhelp-topic}{features.dbackspace} - Normally, when PuTTY receives character 127 (^?) from the server, it will perform a \q{destructive backspace}: move the cursor one space left and delete the character under it. This can apparently cause @@ -966,8 +888,6 @@ deleting a character) instead. \S{config-features-charset} Disabling remote \i{character set} configuration -\cfg{winhelp-topic}{features.charset} - PuTTY has the ability to change its character set configuration in response to commands from the server. Some programs send these commands unexpectedly or inconveniently. In particular, \i{BitchX} (an @@ -980,8 +900,6 @@ disabling the remote character set configuration commands. \S{config-features-shaping} Disabling \i{Arabic text shaping} -\cfg{winhelp-topic}{features.arabicshaping} - PuTTY supports shaping of Arabic text, which means that if your server sends text written in the basic \i{Unicode} Arabic alphabet then it will convert it to the correct display forms before printing it @@ -1000,8 +918,6 @@ see \k{config-features-bidi}. \S{config-features-bidi} Disabling \i{bidirectional text} display -\cfg{winhelp-topic}{features.bidi} - PuTTY supports bidirectional text display, which means that if your server sends text written in a language which is usually displayed from right to left (such as \i{Arabic} or \i{Hebrew}) then PuTTY will @@ -1026,16 +942,12 @@ The Window configuration panel allows you to control aspects of the \S{config-winsize} Setting the \I{window size}size of the PuTTY window -\cfg{winhelp-topic}{window.size} - The \q{\ii{Columns}} and \q{\ii{Rows}} boxes let you set the PuTTY window to a precise size. Of course you can also \I{window resizing}drag the window to a new size while a session is running. \S{config-winsizelock} What to do when the window is resized -\cfg{winhelp-topic}{window.resize} - These options allow you to control what happens when the user tries to \I{window resizing}resize the PuTTY window using its window furniture. @@ -1058,8 +970,6 @@ resized at all. \S{config-scrollback} Controlling \i{scrollback} -\cfg{winhelp-topic}{window.scrollback} - These options let you configure the way PuTTY keeps text after it scrolls off the top of the screen (see \k{using-scrollback}). @@ -1079,8 +989,6 @@ scrollback on keypress}. \S{config-erasetoscrollback} \q{Push erased text into scrollback} -\cfg{winhelp-topic}{window.erased} - When this option is enabled, the contents of the terminal screen will be pushed into the scrollback when a server-side application clears the screen, so that your scrollback will contain a better @@ -1100,8 +1008,6 @@ the appearance of \I{PuTTY window}PuTTY's window. \S{config-cursor} Controlling the appearance of the \i{cursor} -\cfg{winhelp-topic}{appearance.cursor} - The \q{Cursor appearance} option lets you configure the cursor to be a block, an underline, or a vertical line. A block cursor becomes an empty box when the window loses focus; an underline or a vertical @@ -1112,8 +1018,6 @@ works in any of the cursor modes. \S{config-font} Controlling the \i{font} used in the terminal window -\cfg{winhelp-topic}{appearance.font} - This option allows you to choose what font, in what \I{font size}size, the PuTTY terminal window uses to display the text in the session. @@ -1127,8 +1031,6 @@ not look very good (but can work OK with some fonts). \S{config-mouseptr} \q{Hide \i{mouse pointer} when typing in window} -\cfg{winhelp-topic}{appearance.hidemouse} - If you enable this option, the mouse pointer will disappear if the PuTTY window is selected and you press a key. This way, it will not obscure any of the text in the window while you work in your @@ -1139,8 +1041,6 @@ visible at all times. \S{config-winborder} Controlling the \i{window border} -\cfg{winhelp-topic}{appearance.border} - PuTTY allows you to configure the appearance of the window border to some extent. @@ -1162,8 +1062,6 @@ the behaviour of \I{PuTTY window}PuTTY's window. \S{config-title} Controlling the \i{window title} -\cfg{winhelp-topic}{appearance.title} - The \q{Window title} edit box allows you to set the title of the PuTTY window. By default the window title will contain the \i{host name} followed by \q{PuTTY}, for example \c{server1.example.com - PuTTY}. @@ -1192,8 +1090,6 @@ icon title, none of this will happen.) \S{config-warnonclose} \q{Warn before \i{closing window}} -\cfg{winhelp-topic}{behaviour.closewarn} - If you press the \i{Close button} in a PuTTY window that contains a running session, PuTTY will put up a warning window asking if you really meant to close the window. A window whose session has already @@ -1204,8 +1100,6 @@ the \q{Warn before closing window} option. \S{config-altf4} \q{Window closes on \i{ALT-F4}} -\cfg{winhelp-topic}{behaviour.altf4} - By default, pressing ALT-F4 causes the \I{closing window}window to close (or a warning box to appear; see \k{config-warnonclose}). If you disable the \q{Window closes on ALT-F4} option, then pressing ALT-F4 @@ -1213,8 +1107,6 @@ will simply send a key sequence to the server. \S{config-altspace} \q{\ii{System menu} appears on \i{ALT-Space}} -\cfg{winhelp-topic}{behaviour.altspace} - If this option is enabled, then pressing ALT-Space will bring up the PuTTY window's menu, like clicking on the top left corner. If it is disabled, then pressing ALT-Space will just send \c{ESC SPACE} to @@ -1228,8 +1120,6 @@ the window. \S{config-altonly} \q{\ii{System menu} appears on \i{Alt} alone} -\cfg{winhelp-topic}{behaviour.altonly} - If this option is enabled, then pressing and releasing ALT will bring up the PuTTY window's menu, like clicking on the top left corner. If it is disabled, then pressing and releasing ALT will have @@ -1237,15 +1127,11 @@ no effect. \S{config-alwaysontop} \q{Ensure window is \i{always on top}} -\cfg{winhelp-topic}{behaviour.alwaysontop} - If this option is enabled, the PuTTY window will stay on top of all other windows. \S{config-fullscreen} \q{\ii{Full screen} on Alt-Enter} -\cfg{winhelp-topic}{behaviour.altenter} - If this option is enabled, then pressing Alt-Enter will cause the PuTTY window to become full-screen. Pressing Alt-Enter again will restore the previous window size. @@ -1262,8 +1148,6 @@ the character set understood by PuTTY. \S{config-charset} Controlling character set translation -\cfg{winhelp-topic}{translation.codepage} - During an interactive session, PuTTY receives a stream of 8-bit bytes from the server, and in order to display them on the screen it needs to know what character set to interpret them in. Similarly, @@ -1304,8 +1188,6 @@ installed, PuTTY will use it. \S{config-cjk-ambig-wide} \q{Treat \i{CJK} ambiguous characters as wide} -\cfg{winhelp-topic}{translation.cjkambigwide} - There are \I{East Asian Ambiguous characters}some Unicode characters whose \I{character width}width is not well-defined. In most contexts, such characters should be treated as single-width for the purposes of \I{wrapping, @@ -1322,8 +1204,6 @@ This option only has any effect in \i{UTF-8} mode (see \k{config-charset}). \S{config-cyr} \q{\i{Caps Lock} acts as \i{Cyrillic} switch} -\cfg{winhelp-topic}{translation.cyrillic} - This feature allows you to switch between a US/UK keyboard layout and a Cyrillic keyboard layout by using the Caps Lock key, if you need to type (for example) \i{Russian} and English side by side in the @@ -1334,8 +1214,6 @@ native keyboard layout is not US or UK. \S{config-linedraw} Controlling display of \i{line-drawing characters} -\cfg{winhelp-topic}{translation.linedraw} - VT100-series terminals allow the server to send \i{control sequence}s that shift temporarily into a separate character set for drawing simple lines and boxes. However, there are a variety of ways in which PuTTY @@ -1371,8 +1249,6 @@ miss out other characters from the main character set. \S{config-linedrawpaste} Controlling \i{copy and paste} of line drawing characters -\cfg{winhelp-topic}{selection.linedraw} - By default, when you copy and paste a piece of the PuTTY screen that contains VT100 line and box drawing characters, PuTTY will paste them in the form they appear on the screen: either \i{Unicode} line @@ -1392,8 +1268,6 @@ Unicode always. \S{config-utf8linedraw} Combining VT100 line-drawing with UTF-8 -\cfg{winhelp-topic}{translation.utf8linedraw} - If PuTTY is configured to treat data from the server as encoded in UTF-8, then by default it disables the older VT100-style system of control sequences that cause the lower-case letters to be temporarily @@ -1427,8 +1301,6 @@ work in the PuTTY window. \S{config-mouse} Changing the actions of the mouse buttons -\cfg{winhelp-topic}{selection.buttons} - PuTTY's copy and paste mechanism is by default modelled on the Unix \i\c{xterm} application. The X Window System uses a three-button mouse, and the convention in that system is that the \i{left button} @@ -1456,8 +1328,6 @@ convention.) \S{config-mouseshift} \q{Shift overrides application's use of mouse} -\cfg{winhelp-topic}{selection.shiftdrag} - PuTTY allows the server to send \i{control codes} that let it \I{mouse reporting}take over the mouse and use it for purposes other than \i{copy and paste}. @@ -1483,8 +1353,6 @@ all, you can do this using the Features control panel; see \S{config-rectselect} Default selection mode -\cfg{winhelp-topic}{selection.rect} - As described in \k{using-selection}, PuTTY has two modes of selecting text to be copied to the clipboard. In the default mode (\q{Normal}), dragging the mouse from point A to point B selects to @@ -1525,8 +1393,6 @@ is used by explicit Copy and Paste menu items or keypresses such as \S2{config-selection-autocopy} \q{Auto-copy selected text} -\cfg{winhelp-topic}{selection.autocopy} - The checkbox \q{Auto-copy selected text to system clipboard} controls whether or not selecting text in the PuTTY terminal window automatically has the side effect of copying it to the system @@ -1541,8 +1407,6 @@ same time. \S2{config-selection-clipactions} Choosing a clipboard for UI actions -\cfg{winhelp-topic}{selection.clipactions} - PuTTY has three user-interface actions which can be configured to paste into the terminal (not counting menu items). You can click whichever mouse button (if any) is configured to paste (see @@ -1578,8 +1442,6 @@ configured in that particular way. \S{config-paste-ctrl-char} \q{Permit control characters in pasted text} -\cfg{winhelp-topic}{selection.pastectrl} - It is possible for the clipboard to contain not just text (with newlines and tabs) but also control characters such as ESC which could have surprising effects if pasted into a terminal session, depending @@ -1602,8 +1464,6 @@ copying from the terminal window to the clipboard. \S{config-charclasses} Character classes -\cfg{winhelp-topic}{copy.charclasses} - PuTTY will \I{word-by-word selection}select a word at a time in the terminal window if you \i{double-click} to begin the drag. This section allows you to control precisely what is considered to be a word. @@ -1644,8 +1504,6 @@ immediately. \S{config-rtfcopy} Copying in \i{Rich Text Format} -\cfg{winhelp-topic}{copy.rtf} - If you enable \q{Copy to clipboard in RTF as well as plain text}, PuTTY will write formatting information to the clipboard as well as the actual text you copy. The effect of this is @@ -1662,8 +1520,6 @@ The Colours panel allows you to control PuTTY's use of \i{colour}. \S{config-ansicolour} \q{Allow terminal to specify \i{ANSI colours}} -\cfg{winhelp-topic}{colours.ansi} - This option is enabled by default. If it is disabled, PuTTY will ignore any \i{control sequence}s sent by the server to request coloured text. @@ -1674,8 +1530,6 @@ and background colours. \S{config-xtermcolour} \q{Allow terminal to use xterm \i{256-colour mode}} -\cfg{winhelp-topic}{colours.xterm256} - This option is enabled by default. If it is disabled, PuTTY will ignore any control sequences sent by the server which use the extended 256-colour mode supported by recent versions of \cw{xterm}. @@ -1696,8 +1550,6 @@ try \cq{xterm-256color}. \S{config-truecolour} \q{Allow terminal to use 24-bit colour} -\cfg{winhelp-topic}{colours.truecolour} - This option is enabled by default. If it is disabled, PuTTY will ignore any control sequences sent by the server which use the control sequences supported by modern terminals to specify arbitrary 24-bit @@ -1705,8 +1557,6 @@ RGB colour value. \S{config-boldcolour} \q{Indicate bolded text by changing...} -\cfg{winhelp-topic}{colours.bold} - When the server sends a \i{control sequence} indicating that some text should be displayed in \i{bold}, PuTTY can handle this in several ways. It can either change the \i{font} for a bold version, or use the @@ -1726,8 +1576,6 @@ become invisible. \S{config-logpalette} \q{Attempt to use \i{logical palettes}} -\cfg{winhelp-topic}{colours.logpal} - Logical palettes are a mechanism by which a Windows application running on an \i{8-bit colour} display can select precisely the colours it wants instead of going with the Windows standard defaults. @@ -1738,8 +1586,6 @@ worked very well. \S{config-syscolour} \q{Use \i{system colours}} -\cfg{winhelp-topic}{colours.system} - Enabling this option will cause PuTTY to ignore the configured colours for \I{default background}\I{default foreground}\q{Default Background/Foreground} and \I{cursor colour}\q{Cursor Colour/Text} (see @@ -1751,8 +1597,6 @@ by font changes (see \k{config-boldcolour}). \S{config-colourcfg} Adjusting the colours in the \i{terminal window} -\cfg{winhelp-topic}{colours.config} - The main colour control allows you to specify exactly what colours things should be displayed in. To modify one of the PuTTY colours, use the list box to select which colour you want to modify. The \i{RGB @@ -1781,8 +1625,6 @@ more than one type of \i{connection}. \S{config-keepalive} Using \i{keepalives} to prevent disconnection -\cfg{winhelp-topic}{connection.keepalive} - If you find your sessions are closing unexpectedly (most often with \q{Connection reset by peer}) after they have been idle for a while, you might want to try using this option. @@ -1836,8 +1678,6 @@ it unable to deal with SSH-1 ignore messages (see \S{config-nodelay} \q{Disable \i{Nagle's algorithm}} -\cfg{winhelp-topic}{connection.nodelay} - Nagle's algorithm is a detail of TCP/IP implementations that tries to minimise the number of small data packets sent down a network connection. With Nagle's algorithm enabled, PuTTY's \i{bandwidth} usage @@ -1849,8 +1689,6 @@ The Nagle algorithm is disabled by default for \i{interactive connections}. \S{config-tcp-keepalives} \q{Enable \i{TCP keepalives}} -\cfg{winhelp-topic}{connection.tcpkeepalive} - \e{NOTE:} TCP keepalives should not be confused with the application-level keepalives described in \k{config-keepalive}. If in doubt, you probably want application-level keepalives; TCP keepalives @@ -1877,8 +1715,6 @@ TCP keepalives are disabled by default. \S{config-address-family} \I{Internet protocol version}\q{Internet protocol} -\cfg{winhelp-topic}{connection.ipversion} - This option allows the user to select between the old and new Internet protocols and addressing schemes (\i{IPv4} and \i{IPv6}). The selected protocol will be used for most outgoing network @@ -1898,8 +1734,6 @@ explicitly set this to \q{IPv4} or \q{IPv6}. \S{config-loghost} \I{logical host name}\q{Logical name of remote host} -\cfg{winhelp-topic}{connection.loghost} - This allows you to tell PuTTY that the host it will really end up connecting to is different from where it thinks it is making a network connection. @@ -1957,8 +1791,6 @@ configuration panels. \S{config-username} \q{\ii{Auto-login username}} -\cfg{winhelp-topic}{connection.username} - All three of the SSH, Telnet and Rlogin protocols allow you to specify what user name you want to log in as, without having to type it explicitly every time. (Some Telnet servers don't support this.) @@ -1967,8 +1799,6 @@ In this box you can type that user name. \S{config-username-from-env} Use of system username -\cfg{winhelp-topic}{connection.usernamefromenv} - When the previous box (\k{config-username}) is left blank, by default, PuTTY will prompt for a username at the time you make a connection. @@ -1986,8 +1816,6 @@ is later used by a different user, that user's name will be used. \S{config-termtype} \q{\ii{Terminal-type} string} -\cfg{winhelp-topic}{connection.termtype} - Most servers you might connect to with PuTTY are designed to be connected to from lots of different types of terminal. In order to send the right \i{control sequence}s to each one, the server will need @@ -2011,8 +1839,6 @@ application or your server. \S{config-termspeed} \q{\ii{Terminal speed}s} -\cfg{winhelp-topic}{connection.termspeed} - The Telnet, Rlogin, and SSH protocols allow the client to specify terminal speeds to the server. @@ -2036,8 +1862,6 @@ This option has no effect on Raw connections. \S{config-environ} Setting \i{environment variables} on the server -\cfg{winhelp-topic}{telnet.environ} - The Telnet protocol provides a means for the client to pass environment variables to the server. Many Telnet servers have stopped supporting this feature due to security flaws, but PuTTY @@ -2060,8 +1884,6 @@ To remove one from the list, select it in the list box and press \H{config-proxy} The Proxy panel -\cfg{winhelp-topic}{proxy.main} - The \ii{Proxy} panel allows you to configure PuTTY to use various types of proxy in order to make its network connections. The settings in this panel affect the primary network connection forming your PuTTY @@ -2075,8 +1897,6 @@ it must always be explicitly configured. \S{config-proxy-type} Setting the proxy type -\cfg{winhelp-topic}{proxy.type} - The \q{Proxy type} radio buttons allow you to configure what type of proxy you want PuTTY to use for its network connections. The default setting is \q{None}; in this mode no proxy is used for any @@ -2117,8 +1937,6 @@ You can also enable this mode on the command line; see \S{config-proxy-exclude} Excluding parts of the network from proxying -\cfg{winhelp-topic}{proxy.exclude} - Typically you will only need to use a proxy to connect to non-local parts of your network; for example, your proxy might be required for connections outside your company's internal network. In the @@ -2159,8 +1977,6 @@ your list. \S{config-proxy-dns} \I{proxy DNS}\ii{Name resolution} when using a proxy -\cfg{winhelp-topic}{proxy.dns} - If you are using a proxy to access a private network, it can make a difference whether \i{DNS} name resolution is performed by PuTTY itself (on the client machine) or performed by the proxy. @@ -2189,8 +2005,6 @@ and your SOCKS 4 server cannot deal with it, this might be why. \S{config-proxy-auth} \I{proxy username}Username and \I{proxy password}password -\cfg{winhelp-topic}{proxy.auth} - If your proxy requires \I{proxy authentication}authentication, you can enter a username and a password in the \q{Username} and \q{Password} boxes. @@ -2223,8 +2037,6 @@ Telnet/Local proxy command (see \k{config-proxy-command}). \S{config-proxy-command} Specifying the Telnet or Local proxy command -\cfg{winhelp-topic}{proxy.command} - If you are using the \i{Telnet proxy} type, the usual command required by the firewall's Telnet server is \c{connect}, followed by a host name and a port number. If your proxy needs a different command, @@ -2260,8 +2072,6 @@ configuration fields will be ignored. \S{config-proxy-logging} Controlling \i{proxy logging} -\cfg{winhelp-topic}{proxy.logging} - Often the proxy interaction has its own diagnostic output; this is particularly the case for local proxy commands. @@ -2284,8 +2094,6 @@ Telnet sessions. \S{config-oldenviron} \q{Handling of OLD_ENVIRON ambiguity} -\cfg{winhelp-topic}{telnet.oldenviron} - The original Telnet mechanism for passing \i{environment variables} was badly specified. At the time the standard (RFC 1408) was written, BSD telnet implementations were already supporting the feature, and @@ -2308,8 +2116,6 @@ passing environment variables to quite an old server. \S{config-ptelnet} Passive and active \i{Telnet negotiation} modes -\cfg{winhelp-topic}{telnet.passive} - In a Telnet connection, there are two types of data passed between the client and the server: actual text, and \e{negotiations} about which Telnet extra features to use. @@ -2333,8 +2139,6 @@ passive mode to see if it helps. \S{config-telnetkey} \q{Keyboard sends \i{Telnet special commands}} -\cfg{winhelp-topic}{telnet.specialkeys} - If this box is checked, several key sequences will have their normal actions modified: @@ -2352,8 +2156,6 @@ unless you know what you're doing. \S{config-telnetnl} \q{Return key sends \i{Telnet New Line} instead of ^M} -\cfg{winhelp-topic}{telnet.newline} - Unlike most other remote login protocols, the Telnet protocol has a special \q{\i{new line}} code that is not the same as the usual line endings of Control-M or Control-J. By default, PuTTY sends the @@ -2373,8 +2175,6 @@ Rlogin sessions. \S{config-rlogin-localuser} \I{local username in Rlogin}\q{Local username} -\cfg{winhelp-topic}{rlogin.localuser} - Rlogin allows an automated (password-free) form of login by means of a file called \i\c{.rhosts} on the server. You put a line in your \c{.rhosts} file saying something like \c{jbloggs@pc1.example.com}, @@ -2411,8 +2211,6 @@ SSH sessions. \S{config-command} Executing a specific command on the server -\cfg{winhelp-topic}{ssh.command} - In SSH, you don't have to run a general shell session on the server. Instead, you can choose to run a single specific command (such as a mail user agent, for example). If you want to do this, enter the @@ -2424,8 +2222,6 @@ command. \S{config-ssh-noshell} \q{Don't start a \I{remote shell}shell or \I{remote command}command at all} -\cfg{winhelp-topic}{ssh.noshell} - If you tick this box, PuTTY will not attempt to run a shell or command after connecting to the remote server. You might want to use this option if you are only using the SSH connection for \i{port @@ -2445,8 +2241,6 @@ program. \S{config-ssh-comp} \q{Enable \i{compression}} -\cfg{winhelp-topic}{ssh.compress} - This enables data compression in the SSH connection: data sent by the server is compressed before sending, and decompressed at the client end. Likewise, data sent by PuTTY to the server is compressed @@ -2455,8 +2249,6 @@ make the most of a low-\i{bandwidth} connection. \S{config-ssh-prot} \q{\i{SSH protocol version}} -\cfg{winhelp-topic}{ssh.protocol} - This allows you to select whether to use \i{SSH protocol version 2} or the older \I{SSH-1}version 1. @@ -2478,8 +2270,6 @@ connection to SSH-1. \S{config-ssh-sharing} Sharing an SSH connection between PuTTY tools -\cfg{winhelp-topic}{ssh.sharing} - The controls in this box allow you to configure PuTTY to reuse an existing SSH connection, where possible. @@ -2566,8 +2356,6 @@ these settings affect SSH-1 at all. \S{config-ssh-kex-order} \ii{Key exchange algorithm} selection -\cfg{winhelp-topic}{ssh.kex.order} - PuTTY supports a variety of SSH-2 key exchange methods, and allows you to choose which one you prefer to use; configuration is similar to cipher selection (see \k{config-ssh-encryption}). @@ -2638,8 +2426,6 @@ at the same time as verifying your identity to it. \S{config-ssh-kex-rekey} \ii{Repeat key exchange} -\cfg{winhelp-topic}{ssh.kex.repeat} - If the session key negotiated at connection startup is used too much or for too long, it may become feasible to mount attacks against the SSH connection. Therefore, the SSH-2 protocol specifies that a new key @@ -2728,8 +2514,6 @@ these settings affect SSH-1 at all. \S{config-ssh-hostkey-order} \ii{Host key type} selection -\cfg{winhelp-topic}{ssh.hostkey.order} - PuTTY supports a variety of SSH-2 host key types, and allows you to choose which one you prefer to use to identify the server. Configuration is similar to cipher selection (see @@ -2762,8 +2546,6 @@ to that for cipher selection (see \k{config-ssh-encryption}). \S{config-ssh-kex-manual-hostkeys} \ii{Manually configuring host keys} -\cfg{winhelp-topic}{ssh.kex.manualhostkeys} - In some situations, if PuTTY's automated host key management is not doing what you need, you might need to manually configure PuTTY to accept a specific host key, or one of a specific set of host keys. @@ -2816,8 +2598,6 @@ key management will work as normal. \H{config-ssh-encryption} The Cipher panel -\cfg{winhelp-topic}{ssh.ciphers} - PuTTY supports a variety of different \i{encryption algorithm}s, and allows you to choose which one you prefer to use. You can do this by dragging the algorithms up and down in the list box (or moving them @@ -2875,8 +2655,6 @@ SSH sessions. \S{config-ssh-banner} \q{Display pre-authentication banner} -\cfg{winhelp-topic}{ssh.auth.banner} - SSH-2 servers can provide a message for clients to display to the prospective user before the user logs in; this is sometimes known as a pre-authentication \q{\i{banner}}. Typically this is used to provide @@ -2890,8 +2668,6 @@ entirely. \S{config-ssh-noauth} \q{Bypass authentication entirely} -\cfg{winhelp-topic}{ssh.auth.bypass} - In SSH-2, it is in principle possible to establish a connection without using SSH's mechanisms to identify or prove who you are to the server. An SSH server could prefer to handle authentication @@ -2918,8 +2694,6 @@ require an authentication step. \S{config-ssh-tryagent} \q{Attempt authentication using Pageant} -\cfg{winhelp-topic}{ssh.auth.pageant} - If this option is enabled, then PuTTY will look for Pageant (the SSH private-key storage agent) and attempt to authenticate with any suitable public keys Pageant currently holds. @@ -2937,8 +2711,6 @@ See \k{pageant} for more information about Pageant in general. \S{config-ssh-tis} \q{Attempt \I{TIS authentication}TIS or \i{CryptoCard authentication}} -\cfg{winhelp-topic}{ssh.auth.tis} - TIS and CryptoCard authentication are (despite their names) generic forms of simple \I{challenge/response authentication}challenge/response authentication available in SSH protocol version 1 only. You might use @@ -2957,8 +2729,6 @@ responses take. \S{config-ssh-ki} \q{Attempt \i{keyboard-interactive authentication}} -\cfg{winhelp-topic}{ssh.auth.ki} - The SSH-2 equivalent of TIS authentication is called \q{keyboard-interactive}. It is a flexible authentication method using an arbitrary sequence of requests and responses; so it is not @@ -2972,8 +2742,6 @@ to turn it off in case you should have trouble with it. \S{config-ssh-agentfwd} \q{Allow \i{agent forwarding}} -\cfg{winhelp-topic}{ssh.auth.agentfwd} - This option allows the SSH server to open forwarded connections back to your local copy of \i{Pageant}. If you are not running Pageant, this option will do nothing. @@ -2985,8 +2753,6 @@ there is a security risk involved with enabling this option; see \S{config-ssh-changeuser} \q{Allow attempted \i{changes of username} in SSH-2} -\cfg{winhelp-topic}{ssh.auth.changeuser} - In the SSH-1 protocol, it is impossible to change username after failing to authenticate. So if you mis-type your username at the PuTTY \q{login as:} prompt, you will not be able to change it except @@ -3007,8 +2773,6 @@ changes of username} option to modify PuTTY's behaviour. \S{config-ssh-privkey} \q{\ii{Private key} file for authentication} -\cfg{winhelp-topic}{ssh.auth.privkey} - This box is where you enter the name of your private key file if you are using \i{public key authentication}. See \k{pubkey} for information about public key authentication in SSH. @@ -3030,8 +2794,6 @@ PuTTY can't fall back to using this file itself. \H{config-ssh-auth-gssapi} The \i{GSSAPI} panel -\cfg{winhelp-topic}{ssh.auth.gssapi} - The \q{GSSAPI} subpanel of the \q{Auth} panel controls the use of GSSAPI authentication. This is a mechanism which delegates the authentication exchange to a library elsewhere on the client @@ -3065,8 +2827,6 @@ of GSSAPI at all, and the rest of this panel will be unused. \S{config-ssh-auth-gssapi-delegation} \q{Allow GSSAPI credential delegation} -\cfg{winhelp-topic}{ssh.auth.gssapi.delegation} - \i{GSSAPI credential delegation} is a mechanism for passing on your Kerberos (or other) identity to the session on the SSH server. If you enable this option, then not only will PuTTY be able to log in @@ -3095,8 +2855,6 @@ for the delegation to expire during your session. See \S{config-ssh-auth-gssapi-libraries} Preference order for GSSAPI libraries -\cfg{winhelp-topic}{ssh.auth.gssapi.libraries} - GSSAPI is a mechanism which allows more than one authentication method to be accessed through the same interface. Therefore, more than one authentication library may exist on your system which can @@ -3129,8 +2887,6 @@ The TTY panel lets you configure the remote pseudo-terminal. \S{config-ssh-pty} \I{pseudo-terminal allocation}\q{Don't allocate a pseudo-terminal} -\cfg{winhelp-topic}{ssh.nopty} - When connecting to a \i{Unix} system, most \I{interactive connections}interactive shell sessions are run in a \e{pseudo-terminal}, which allows the Unix system to pretend it's talking to a real physical @@ -3144,8 +2900,6 @@ the usual way of working. \S{config-ttymodes} Sending \i{terminal modes} -\cfg{winhelp-topic}{ssh.ttymodes} - The SSH protocol allows the client to send \q{terminal modes} for the remote pseudo-terminal. These usually control the server's expectation of the local terminal's behaviour. @@ -3241,8 +2995,6 @@ you may find you need to set it to not be sent at all. When set to \H{config-ssh-x11} The X11 panel -\cfg{winhelp-topic}{ssh.tunnels.x11} - The X11 panel allows you to configure \i{forwarding of X11} over an SSH connection. @@ -3261,8 +3013,6 @@ forwarding. \S{config-ssh-x11auth} Remote \i{X11 authentication} -\cfg{winhelp-topic}{ssh.tunnels.x11auth} - If you are using X11 forwarding, the virtual X server created on the SSH server machine will be protected by authorisation data. This data is invented, and checked, by PuTTY. @@ -3308,8 +3058,6 @@ should be sure you know what you're doing. \S{config-ssh-xauthority} X authority file for local display -\cfg{winhelp-topic}{ssh.tunnels.xauthority} - If you are using X11 forwarding, the local X server to which your forwarded connections are eventually directed may itself require authorisation. @@ -3329,8 +3077,6 @@ any authorisation for your local display. \H{config-ssh-portfwd} \I{port forwarding}The Tunnels panel -\cfg{winhelp-topic}{ssh.tunnels.portfwd} - The Tunnels panel allows you to configure tunnelling of arbitrary connection types through an SSH connection. @@ -3420,8 +3166,6 @@ details of this. \S{config-ssh-portfwd-localhost} Controlling the visibility of forwarded ports -\cfg{winhelp-topic}{ssh.tunnels.portfwd.localhost} - The source port for a forwarded connection usually does not accept connections from any machine except the \I{localhost}SSH client or server machine itself (for local and remote forwardings respectively). @@ -3441,8 +3185,6 @@ SSH-2 servers support it (\i{OpenSSH} 3.0 does not, for example). \S{config-ssh-portfwd-address-family} Selecting \i{Internet protocol version} for forwarded ports -\cfg{winhelp-topic}{ssh.tunnels.portfwd.ipversion} - This switch allows you to select a specific Internet protocol (\i{IPv4} or \i{IPv6}) for the local end of a forwarded port. By default, it is set on \q{Auto}, which means that: @@ -3494,8 +3236,6 @@ to try to guess whether or not the server has the bug. \S{config-ssh-bug-ignore1} \q{Chokes on SSH-1 \i{ignore message}s} -\cfg{winhelp-topic}{ssh.bugs.ignore1} - An ignore message (SSH_MSG_IGNORE) is a message in the SSH protocol which can be sent from the client to the server, or from the server to the client, at any time. Either side is required to ignore the @@ -3515,8 +3255,6 @@ vulnerable to eavesdroppers than it could be. \S{config-ssh-bug-plainpw1} \q{Refuses all SSH-1 \i{password camouflage}} -\cfg{winhelp-topic}{ssh.bugs.plainpw1} - When talking to an SSH-1 server which cannot deal with ignore messages (see \k{config-ssh-bug-ignore1}), PuTTY will attempt to disguise the length of the user's password by sending additional @@ -3540,8 +3278,6 @@ attack. \S{config-ssh-bug-rsa1} \q{Chokes on SSH-1 \i{RSA} authentication} -\cfg{winhelp-topic}{ssh.bugs.rsa1} - Some SSH-1 servers cannot deal with RSA authentication messages at all. If \i{Pageant} is running and contains any SSH-1 keys, PuTTY will normally automatically try RSA authentication before falling back to @@ -3556,8 +3292,6 @@ This is an SSH-1-specific bug. \S{config-ssh-bug-ignore2} \q{Chokes on SSH-2 \i{ignore message}s} -\cfg{winhelp-topic}{ssh.bugs.ignore2} - An ignore message (SSH_MSG_IGNORE) is a message in the SSH protocol which can be sent from the client to the server, or from the server to the client, at any time. Either side is required to ignore the @@ -3573,8 +3307,6 @@ the session might be less cryptographically secure than it could be. \S{config-ssh-bug-winadj} \q{Chokes on PuTTY's SSH-2 \cq{winadj} requests} -\cfg{winhelp-topic}{ssh.bugs.winadj} - PuTTY sometimes sends a special request to SSH servers in the middle of channel data, with the name \cw{winadj@putty.projects.tartarus.org} (see \k{sshnames-channel}). The purpose of this request is to measure @@ -3596,8 +3328,6 @@ without its timing data. \S{config-ssh-bug-hmac2} \q{Miscomputes SSH-2 HMAC keys} -\cfg{winhelp-topic}{ssh.bugs.hmac2} - Versions 2.3.0 and below of the SSH server software from \cw{ssh.com} compute the keys for their \i{HMAC} \i{message authentication code}s incorrectly. A typical symptom of this problem is that PuTTY @@ -3613,8 +3343,6 @@ This is an SSH-2-specific bug. \S{config-ssh-bug-derivekey2} \q{Miscomputes SSH-2 \i{encryption} keys} -\cfg{winhelp-topic}{ssh.bugs.derivekey2} - Versions below 2.0.11 of the SSH server software from \i\cw{ssh.com} compute the keys for the session encryption incorrectly. This problem can cause various error messages, such as \q{Incoming packet @@ -3629,8 +3357,6 @@ This is an SSH-2-specific bug. \S{config-ssh-bug-sig} \q{Requires padding on SSH-2 \i{RSA} \i{signatures}} -\cfg{winhelp-topic}{ssh.bugs.rsapad2} - Versions below 3.3 of \i{OpenSSH} require SSH-2 RSA signatures to be padded with zero bytes to the same length as the RSA key modulus. The SSH-2 specification says that an unpadded signature MUST be @@ -3648,8 +3374,6 @@ This is an SSH-2-specific bug. \S{config-ssh-bug-pksessid2} \q{Misuses the \i{session ID} in SSH-2 PK auth} -\cfg{winhelp-topic}{ssh.bugs.pksessid2} - Versions below 2.3 of \i{OpenSSH} require SSH-2 \i{public-key authentication} to be done slightly differently: the data to be signed by the client contains the session ID formatted in a different way. If public-key @@ -3666,8 +3390,6 @@ This is an SSH-2-specific bug. \S{config-ssh-bug-rekey} \q{Handles SSH-2 key re-exchange badly} -\cfg{winhelp-topic}{ssh.bugs.rekey2} - Some SSH servers cannot cope with \i{repeat key exchange} at all, and will ignore attempts by the client to start one. Since PuTTY pauses the session while performing a repeat key exchange, the @@ -3686,8 +3408,6 @@ This is an SSH-2-specific bug. \S{config-ssh-bug-maxpkt2} \q{Ignores SSH-2 \i{maximum packet size}} -\cfg{winhelp-topic}{ssh.bugs.maxpkt2} - When an SSH-2 channel is set up, each end announces the maximum size of data packet that it is willing to receive for that channel. Some servers ignore PuTTY's announcement and send packets larger than PuTTY @@ -3702,8 +3422,6 @@ performance will be less than it could be. \S{config-ssh-bug-chanreq} \q{Replies to requests on closed channels} -\cfg{winhelp-topic}{ssh.bugs.chanreq} - The SSH protocol as published in RFC 4254 has an ambiguity which arises if one side of a connection tries to close a channel, while the other side simultaneously sends a request within the channel and asks @@ -3727,8 +3445,6 @@ and terminate with an error along the lines of \q{Received \S{config-ssh-bug-oldgex2} \q{Only supports pre-RFC4419 SSH-2 DH GEX} -\cfg{winhelp-topic}{ssh.bugs.oldgex2} - The SSH key exchange method that uses Diffie-Hellman group exchange was redesigned after its original release, to use a slightly more sophisticated setup message. Almost all SSH implementations switched @@ -3749,8 +3465,6 @@ when PuTTY is connecting to a local \I{serial port}\i{serial line}. \S{config-serial-line} Selecting a serial line to connect to -\cfg{winhelp-topic}{serial.line} - The \q{Serial line to connect to} box allows you to choose which serial line you want PuTTY to talk to, if your computer has more than one serial port. @@ -3764,8 +3478,6 @@ the connection type is set to \q{Serial}. \S{config-serial-speed} Selecting the speed of your serial line -\cfg{winhelp-topic}{serial.speed} - The \q{Speed} box allows you to choose the speed (or \q{baud rate}) at which to talk to the serial line. Typical values might be 9600, 19200, 38400 or 57600. Which one you need will depend on the device @@ -3778,23 +3490,17 @@ connection type is set to \q{Serial}. \S{config-serial-databits} Selecting the number of data bits -\cfg{winhelp-topic}{serial.databits} - The \q{Data bits} box allows you to choose how many data bits are transmitted in each byte sent or received through the serial line. Typical values are 7 or 8. \S{config-serial-stopbits} Selecting the number of stop bits -\cfg{winhelp-topic}{serial.stopbits} - The \q{Stop bits} box allows you to choose how many stop bits are used in the serial line protocol. Typical values are 1, 1.5 or 2. \S{config-serial-parity} Selecting the serial parity checking scheme -\cfg{winhelp-topic}{serial.parity} - The \q{Parity} box allows you to choose what type of parity checking is used on the serial line. The settings are: @@ -3814,8 +3520,6 @@ always set to 0. \S{config-serial-flow} Selecting the serial flow control scheme -\cfg{winhelp-topic}{serial.flow} - The \q{Flow control} box allows you to choose what type of flow control checking is used on the serial line. The settings are: diff --git a/doc/errors.but b/doc/errors.but index 8e353fb9..0bac8384 100644 --- a/doc/errors.but +++ b/doc/errors.but @@ -13,8 +13,6 @@ bug (see \k{feedback}) and we will add documentation for it. \H{errors-hostkey-absent} \q{The server's host key is not cached in the registry} -\cfg{winhelp-topic}{errors.hostkey.absent} - This error message occurs when PuTTY connects to a new SSH server. Every server identifies itself by means of a host key; once PuTTY knows the host key for a server, it will be able to detect if a @@ -36,8 +34,6 @@ See \k{gs-hostkey} for more information on host keys. \H{errors-hostkey-wrong} \q{WARNING - POTENTIAL SECURITY BREACH!} -\cfg{winhelp-topic}{errors.hostkey.changed} - This message, followed by \q{The server's host key does not match the one PuTTY has cached in the registry}, means that PuTTY has connected to the SSH server before, knows what its host key @@ -144,8 +140,6 @@ from the error message box. \H{errors-cant-load-key} \q{Unable to use this private key file}, \q{Couldn't load private key}, \q{Key is of wrong type} -\cfg{winhelp-topic}{errors.cantloadkey} - Various forms of this error are printed in the PuTTY window, or written to the PuTTY Event Log (see \k{using-eventlog}) when trying public-key authentication, or given by Pageant when trying to load a diff --git a/doc/pageant.but b/doc/pageant.but index 186d62eb..aaa57aa8 100644 --- a/doc/pageant.but +++ b/doc/pageant.but @@ -1,7 +1,5 @@ \C{pageant} Using \i{Pageant} for authentication -\cfg{winhelp-topic}{pageant.general} - Pageant is an SSH \i{authentication agent}. It holds your \i{private key}s in memory, already decoded, so that you can use them often \I{passwordless login}without needing to type a \i{passphrase}. @@ -58,8 +56,6 @@ existing keys. \S{pageant-mainwin-keylist} The key list box -\cfg{winhelp-topic}{pageant.keylist} - 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: @@ -87,8 +83,6 @@ applied to your \c{authorized_keys} file. \S{pageant-mainwin-addkey} The \q{Add Key} button -\cfg{winhelp-topic}{pageant.addkey} - To add a key to Pageant by reading it out of a local disk file, press the \q{Add Key} button in the Pageant main window, or alternatively right-click on the Pageant icon in the system tray and @@ -109,8 +103,6 @@ also add one from a remote system by using agent forwarding; see \S{pageant-mainwin-remkey} The \q{Remove Key} button -\cfg{winhelp-topic}{pageant.remkey} - If you need to remove a key from Pageant, select that key in the list box, and press the \q{Remove Key} button. Pageant will remove the key from its memory. diff --git a/doc/pgpkeys.but b/doc/pgpkeys.but index 2206849a..8fab6153 100644 --- a/doc/pgpkeys.but +++ b/doc/pgpkeys.but @@ -1,7 +1,5 @@ \A{pgpkeys} PuTTY download keys and signatures -\cfg{winhelp-topic}{pgpfingerprints} - \I{verifying new versions}We create \i{GPG signatures} for all the PuTTY files distributed from our web site, so that users can be confident that the files have not been tampered with. Here we identify diff --git a/doc/pubkey.but b/doc/pubkey.but index f9f894f7..309f3f5e 100644 --- a/doc/pubkey.but +++ b/doc/pubkey.but @@ -61,8 +61,6 @@ The key types supported by PuTTY are described in \k{puttygen-keytype}. \H{pubkey-puttygen} Using \i{PuTTYgen}, the PuTTY key generator -\cfg{winhelp-topic}{puttygen.general} - PuTTYgen is a key generator. It \I{generating keys}generates pairs of public and private keys to be used with PuTTY, PSCP, and Plink, as well as the PuTTY authentication agent, Pageant (see \k{pageant}). PuTTYgen @@ -106,8 +104,6 @@ server to accept it. \S{puttygen-keytype} Selecting the type of key -\cfg{winhelp-topic}{puttygen.keytype} - Before generating a key pair using PuTTYgen, you need to select which type of key you need. PuTTYgen currently supports these types of key: @@ -133,8 +129,6 @@ supported by PuTTY are RSA, DSA, ECDSA, and Ed25519. \S{puttygen-strength} Selecting the size (strength) of the key -\cfg{winhelp-topic}{puttygen.bits} - The \q{Number of bits} input box allows you to choose the strength of the key PuTTYgen will generate. @@ -149,8 +143,6 @@ equivalent security to RSA with smaller key sizes.) \S{puttygen-generate} The \q{Generate} button -\cfg{winhelp-topic}{puttygen.generate} - Once you have chosen the type of key you want, and the strength of the key, press the \q{Generate} button and PuTTYgen will begin the process of actually generating the key. @@ -177,8 +169,6 @@ appear in the window to indicate this. \S{puttygen-fingerprint} The \q{\ii{Key fingerprint}} box -\cfg{winhelp-topic}{puttygen.fingerprint} - The \q{Key fingerprint} box shows you a fingerprint value for the generated key. This is derived cryptographically from the \e{public} key value, so it doesn't need to be kept secret; it is supposed to @@ -193,8 +183,6 @@ utility, will list key fingerprints rather than the whole public key. \S{puttygen-comment} Setting a comment for your key -\cfg{winhelp-topic}{puttygen.comment} - If you have more than one key and use them for different purposes, you don't need to memorise the key fingerprints in order to tell them apart. PuTTYgen allows you to enter a \e{comment} for your key, @@ -213,8 +201,6 @@ PuTTYgen, change the comment, and save it again. \S{puttygen-passphrase} Setting a \i{passphrase} for your key -\cfg{winhelp-topic}{puttygen.passphrase} - The \q{Key passphrase} and \q{Confirm passphrase} boxes allow you to choose a passphrase for your key. The passphrase will be used to \i{encrypt} the key on disk, so you will not be able to use the key @@ -258,8 +244,6 @@ a result. \S{puttygen-savepriv} Saving your private key to a disk file -\cfg{winhelp-topic}{puttygen.savepriv} - Once you have generated a key, set a comment field and set a passphrase, you are ready to save your private key to disk. @@ -274,8 +258,6 @@ will need to tell PuTTY to use for authentication (see \S{puttygen-savepub} Saving your public key to a disk file -\cfg{winhelp-topic}{puttygen.savepub} - RFC 4716 specifies a \I{SSH-2 public key format}standard format for storing SSH-2 public keys on disk. Some SSH servers (such as \i\cw{ssh.com}'s) require a public key in this format in order to accept @@ -300,8 +282,6 @@ public keys. \S{puttygen-pastekey} \q{Public key for pasting into \i{authorized_keys file}} -\cfg{winhelp-topic}{puttygen.pastekey} - All SSH-1 servers require your public key to be given to it in a one-line format before it will accept authentication with your private key. The \i{OpenSSH} server also requires this for SSH-2. @@ -317,8 +297,6 @@ public-key authentication once you have generated a key. \S{puttygen-load} Reloading a private key -\cfg{winhelp-topic}{puttygen.load} - PuTTYgen allows you to load an existing private key file into memory. If you do this, you can then change the passphrase and comment before saving it again; you can also make extra copies of @@ -337,8 +315,6 @@ for information about importing foreign key formats. \S{puttygen-conversions} Dealing with private keys in other formats -\cfg{winhelp-topic}{puttygen.conversions} - Most SSH-1 clients use a standard format for storing private keys on disk. PuTTY uses this format as well; so if you have generated an SSH-1 private key using OpenSSH or \cw{ssh.com}'s client, you can use diff --git a/doc/using.but b/doc/using.but index b920a414..e64c3c29 100644 --- a/doc/using.but +++ b/doc/using.but @@ -620,8 +620,6 @@ use the \c{-load} option (described in \k{using-cmdline-load}). \S{using-cleanup} \i\c{-cleanup} -\cfg{winhelp-topic}{options.cleanup} - If invoked with the \c{-cleanup} option, rather than running as normal, PuTTY will remove its \I{removing registry entries}registry entries and \i{random seed file} from the local machine (after diff --git a/windows/winhelp.c b/windows/winhelp.c index 0dca4513..df6ac37b 100644 --- a/windows/winhelp.c +++ b/windows/winhelp.c @@ -229,11 +229,8 @@ void launch_help(HWND hwnd, const char *topic) return; if (topic) { - int colonpos = strcspn(topic, ":"); - assert(topic[colonpos] != '\0'); - char *fname = dupprintf( - "%s::/%s.html>main", chm_path, topic + colonpos + 1); + "%s::/%s.html>main", chm_path, topic); p_HtmlHelpA(hwnd, fname, HH_DISPLAY_TOPIC, 0); sfree(fname); } else { diff --git a/windows/winhelp.h b/windows/winhelp.h index 948cf73e..823a2429 100644 --- a/windows/winhelp.h +++ b/windows/winhelp.h @@ -1,11 +1,7 @@ /* * winhelp.h - define Windows Help context names. - * Each definition has the form "winhelp-topic:halibut-topic", where: - * - "winhelp-topic" matches up with the \cfg{winhelp-topic} directives - * in the Halibut source, and was used for WinHelp (FIXME: this isn't - * used any more); - * - "halibut-topic" matches up with the Halibut keywords in the source, - * and is used for HTML Help. + * Each definition is simply a string which matches up with the + * section names in the Halibut source, and is used for HTML Help. */ /* Maximum length for WINHELP_CTX_foo strings */ @@ -17,173 +13,173 @@ #define WINHELP_CTX_no_help NULL -#define WINHELP_CTX_session_hostname "session.hostname:config-hostname" -#define WINHELP_CTX_session_saved "session.saved:config-saving" -#define WINHELP_CTX_session_coe "session.coe:config-closeonexit" -#define WINHELP_CTX_logging_main "logging.main:config-logging" -#define WINHELP_CTX_logging_filename "logging.filename:config-logfilename" -#define WINHELP_CTX_logging_exists "logging.exists:config-logfileexists" -#define WINHELP_CTX_logging_flush "logging.flush:config-logflush" -#define WINHELP_CTX_logging_header "logging.header:config-logheader" -#define WINHELP_CTX_logging_ssh_omit_password "logging.ssh.omitpassword:config-logssh" -#define WINHELP_CTX_logging_ssh_omit_data "logging.ssh.omitdata:config-logssh" -#define WINHELP_CTX_keyboard_backspace "keyboard.backspace:config-backspace" -#define WINHELP_CTX_keyboard_homeend "keyboard.homeend:config-homeend" -#define WINHELP_CTX_keyboard_funkeys "keyboard.funkeys:config-funkeys" -#define WINHELP_CTX_keyboard_appkeypad "keyboard.appkeypad:config-appkeypad" -#define WINHELP_CTX_keyboard_appcursor "keyboard.appcursor:config-appcursor" -#define WINHELP_CTX_keyboard_nethack "keyboard.nethack:config-nethack" -#define WINHELP_CTX_keyboard_compose "keyboard.compose:config-compose" -#define WINHELP_CTX_keyboard_ctrlalt "keyboard.ctrlalt:config-ctrlalt" -#define WINHELP_CTX_features_application "features.application:config-features-application" -#define WINHELP_CTX_features_mouse "features.mouse:config-features-mouse" -#define WINHELP_CTX_features_resize "features.resize:config-features-resize" -#define WINHELP_CTX_features_altscreen "features.altscreen:config-features-altscreen" -#define WINHELP_CTX_features_retitle "features.retitle:config-features-retitle" -#define WINHELP_CTX_features_qtitle "features.qtitle:config-features-qtitle" -#define WINHELP_CTX_features_dbackspace "features.dbackspace:config-features-dbackspace" -#define WINHELP_CTX_features_charset "features.charset:config-features-charset" -#define WINHELP_CTX_features_clearscroll "features.clearscroll:config-features-clearscroll" -#define WINHELP_CTX_features_arabicshaping "features.arabicshaping:config-features-shaping" -#define WINHELP_CTX_features_bidi "features.bidi:config-features-bidi" -#define WINHELP_CTX_terminal_autowrap "terminal.autowrap:config-autowrap" -#define WINHELP_CTX_terminal_decom "terminal.decom:config-decom" -#define WINHELP_CTX_terminal_lfhascr "terminal.lfhascr:config-crlf" -#define WINHELP_CTX_terminal_crhaslf "terminal.crhaslf:config-lfcr" -#define WINHELP_CTX_terminal_bce "terminal.bce:config-erase" -#define WINHELP_CTX_terminal_blink "terminal.blink:config-blink" -#define WINHELP_CTX_terminal_answerback "terminal.answerback:config-answerback" -#define WINHELP_CTX_terminal_localecho "terminal.localecho:config-localecho" -#define WINHELP_CTX_terminal_localedit "terminal.localedit:config-localedit" -#define WINHELP_CTX_terminal_printing "terminal.printing:config-printing" -#define WINHELP_CTX_bell_style "bell.style:config-bellstyle" -#define WINHELP_CTX_bell_taskbar "bell.taskbar:config-belltaskbar" -#define WINHELP_CTX_bell_overload "bell.overload:config-bellovl" -#define WINHELP_CTX_window_size "window.size:config-winsize" -#define WINHELP_CTX_window_resize "window.resize:config-winsizelock" -#define WINHELP_CTX_window_scrollback "window.scrollback:config-scrollback" -#define WINHELP_CTX_window_erased "window.erased:config-erasetoscrollback" -#define WINHELP_CTX_behaviour_closewarn "behaviour.closewarn:config-warnonclose" -#define WINHELP_CTX_behaviour_altf4 "behaviour.altf4:config-altf4" -#define WINHELP_CTX_behaviour_altspace "behaviour.altspace:config-altspace" -#define WINHELP_CTX_behaviour_altonly "behaviour.altonly:config-altonly" -#define WINHELP_CTX_behaviour_alwaysontop "behaviour.alwaysontop:config-alwaysontop" -#define WINHELP_CTX_behaviour_altenter "behaviour.altenter:config-fullscreen" -#define WINHELP_CTX_appearance_cursor "appearance.cursor:config-cursor" -#define WINHELP_CTX_appearance_font "appearance.font:config-font" -#define WINHELP_CTX_appearance_title "appearance.title:config-title" -#define WINHELP_CTX_appearance_hidemouse "appearance.hidemouse:config-mouseptr" -#define WINHELP_CTX_appearance_border "appearance.border:config-winborder" -#define WINHELP_CTX_connection_termtype "connection.termtype:config-termtype" -#define WINHELP_CTX_connection_termspeed "connection.termspeed:config-termspeed" -#define WINHELP_CTX_connection_username "connection.username:config-username" -#define WINHELP_CTX_connection_username_from_env "connection.usernamefromenv:config-username-from-env" -#define WINHELP_CTX_connection_keepalive "connection.keepalive:config-keepalive" -#define WINHELP_CTX_connection_nodelay "connection.nodelay:config-nodelay" -#define WINHELP_CTX_connection_ipversion "connection.ipversion:config-address-family" -#define WINHELP_CTX_connection_tcpkeepalive "connection.tcpkeepalive:config-tcp-keepalives" -#define WINHELP_CTX_connection_loghost "connection.loghost:config-loghost" -#define WINHELP_CTX_proxy_type "proxy.type:config-proxy-type" -#define WINHELP_CTX_proxy_main "proxy.main:config-proxy" -#define WINHELP_CTX_proxy_exclude "proxy.exclude:config-proxy-exclude" -#define WINHELP_CTX_proxy_dns "proxy.dns:config-proxy-dns" -#define WINHELP_CTX_proxy_auth "proxy.auth:config-proxy-auth" -#define WINHELP_CTX_proxy_command "proxy.command:config-proxy-command" -#define WINHELP_CTX_proxy_logging "proxy.logging:config-proxy-logging" -#define WINHELP_CTX_telnet_environ "telnet.environ:config-environ" -#define WINHELP_CTX_telnet_oldenviron "telnet.oldenviron:config-oldenviron" -#define WINHELP_CTX_telnet_passive "telnet.passive:config-ptelnet" -#define WINHELP_CTX_telnet_specialkeys "telnet.specialkeys:config-telnetkey" -#define WINHELP_CTX_telnet_newline "telnet.newline:config-telnetnl" -#define WINHELP_CTX_rlogin_localuser "rlogin.localuser:config-rlogin-localuser" -#define WINHELP_CTX_ssh_nopty "ssh.nopty:config-ssh-pty" -#define WINHELP_CTX_ssh_ttymodes "ssh.ttymodes:config-ttymodes" -#define WINHELP_CTX_ssh_noshell "ssh.noshell:config-ssh-noshell" -#define WINHELP_CTX_ssh_ciphers "ssh.ciphers:config-ssh-encryption" -#define WINHELP_CTX_ssh_protocol "ssh.protocol:config-ssh-prot" -#define WINHELP_CTX_ssh_command "ssh.command:config-command" -#define WINHELP_CTX_ssh_compress "ssh.compress:config-ssh-comp" -#define WINHELP_CTX_ssh_share "ssh.sharing:config-ssh-sharing" -#define WINHELP_CTX_ssh_kexlist "ssh.kex.order:config-ssh-kex-order" -#define WINHELP_CTX_ssh_hklist "ssh.hostkey.order:config-ssh-hostkey-order" -#define WINHELP_CTX_ssh_gssapi_kex_delegation "ssh.kex.gssapi.delegation:config-ssh-kex-gssapi-delegation" -#define WINHELP_CTX_ssh_kex_repeat "ssh.kex.repeat:config-ssh-kex-rekey" -#define WINHELP_CTX_ssh_kex_manual_hostkeys "ssh.kex.manualhostkeys:config-ssh-kex-manual-hostkeys" -#define WINHELP_CTX_ssh_auth_bypass "ssh.auth.bypass:config-ssh-noauth" -#define WINHELP_CTX_ssh_auth_banner "ssh.auth.banner:config-ssh-banner" -#define WINHELP_CTX_ssh_auth_privkey "ssh.auth.privkey:config-ssh-privkey" -#define WINHELP_CTX_ssh_auth_agentfwd "ssh.auth.agentfwd:config-ssh-agentfwd" -#define WINHELP_CTX_ssh_auth_changeuser "ssh.auth.changeuser:config-ssh-changeuser" -#define WINHELP_CTX_ssh_auth_pageant "ssh.auth.pageant:config-ssh-tryagent" -#define WINHELP_CTX_ssh_auth_tis "ssh.auth.tis:config-ssh-tis" -#define WINHELP_CTX_ssh_auth_ki "ssh.auth.ki:config-ssh-ki" -#define WINHELP_CTX_ssh_gssapi "ssh.auth.gssapi:config-ssh-auth-gssapi" -#define WINHELP_CTX_ssh_gssapi_delegation "ssh.auth.gssapi.delegation:config-ssh-auth-gssapi-delegation" -#define WINHELP_CTX_ssh_gssapi_libraries "ssh.auth.gssapi.libraries:config-ssh-auth-gssapi-libraries" -#define WINHELP_CTX_selection_buttons "selection.buttons:config-mouse" -#define WINHELP_CTX_selection_shiftdrag "selection.shiftdrag:config-mouseshift" -#define WINHELP_CTX_selection_rect "selection.rect:config-rectselect" -#define WINHELP_CTX_selection_linedraw "selection.linedraw:config-linedrawpaste" -#define WINHELP_CTX_selection_autocopy "selection.autocopy:config-selection-autocopy" -#define WINHELP_CTX_selection_clipactions "selection.clipactions:config-selection-clipactions" -#define WINHELP_CTX_selection_pastectrl "selection.pastectrl:config-paste-ctrl-char" -#define WINHELP_CTX_copy_charclasses "copy.charclasses:config-charclasses" -#define WINHELP_CTX_copy_rtf "copy.rtf:config-rtfcopy" -#define WINHELP_CTX_colours_ansi "colours.ansi:config-ansicolour" -#define WINHELP_CTX_colours_xterm256 "colours.xterm256:config-xtermcolour" -#define WINHELP_CTX_colours_truecolour "colours.truecolour:config-truecolour" -#define WINHELP_CTX_colours_bold "colours.bold:config-boldcolour" -#define WINHELP_CTX_colours_system "colours.system:config-syscolour" -#define WINHELP_CTX_colours_logpal "colours.logpal:config-logpalette" -#define WINHELP_CTX_colours_config "colours.config:config-colourcfg" -#define WINHELP_CTX_translation_codepage "translation.codepage:config-charset" -#define WINHELP_CTX_translation_cjk_ambig_wide "translation.cjkambigwide:config-cjk-ambig-wide" -#define WINHELP_CTX_translation_cyrillic "translation.cyrillic:config-cyr" -#define WINHELP_CTX_translation_linedraw "translation.linedraw:config-linedraw" -#define WINHELP_CTX_translation_utf8linedraw "translation.utf8linedraw:config-utf8linedraw" -#define WINHELP_CTX_ssh_tunnels_x11 "ssh.tunnels.x11:config-ssh-x11" -#define WINHELP_CTX_ssh_tunnels_x11auth "ssh.tunnels.x11auth:config-ssh-x11auth" -#define WINHELP_CTX_ssh_tunnels_xauthority "ssh.tunnels.xauthority:config-ssh-xauthority" -#define WINHELP_CTX_ssh_tunnels_portfwd "ssh.tunnels.portfwd:config-ssh-portfwd" -#define WINHELP_CTX_ssh_tunnels_portfwd_localhost "ssh.tunnels.portfwd.localhost:config-ssh-portfwd-localhost" -#define WINHELP_CTX_ssh_tunnels_portfwd_ipversion "ssh.tunnels.portfwd.ipversion:config-ssh-portfwd-address-family" -#define WINHELP_CTX_ssh_bugs_ignore1 "ssh.bugs.ignore1:config-ssh-bug-ignore1" -#define WINHELP_CTX_ssh_bugs_plainpw1 "ssh.bugs.plainpw1:config-ssh-bug-plainpw1" -#define WINHELP_CTX_ssh_bugs_rsa1 "ssh.bugs.rsa1:config-ssh-bug-rsa1" -#define WINHELP_CTX_ssh_bugs_ignore2 "ssh.bugs.ignore2:config-ssh-bug-ignore2" -#define WINHELP_CTX_ssh_bugs_hmac2 "ssh.bugs.hmac2:config-ssh-bug-hmac2" -#define WINHELP_CTX_ssh_bugs_derivekey2 "ssh.bugs.derivekey2:config-ssh-bug-derivekey2" -#define WINHELP_CTX_ssh_bugs_rsapad2 "ssh.bugs.rsapad2:config-ssh-bug-sig" -#define WINHELP_CTX_ssh_bugs_pksessid2 "ssh.bugs.pksessid2:config-ssh-bug-pksessid2" -#define WINHELP_CTX_ssh_bugs_rekey2 "ssh.bugs.rekey2:config-ssh-bug-rekey" -#define WINHELP_CTX_ssh_bugs_maxpkt2 "ssh.bugs.maxpkt2:config-ssh-bug-maxpkt2" -#define WINHELP_CTX_ssh_bugs_winadj "ssh.bugs.winadj:config-ssh-bug-winadj" -#define WINHELP_CTX_ssh_bugs_chanreq "ssh.bugs.winadj:config-ssh-bug-chanreq" -#define WINHELP_CTX_ssh_bugs_oldgex2 "ssh.bugs.oldgex2:config-ssh-bug-oldgex2" -#define WINHELP_CTX_serial_line "serial.line:config-serial-line" -#define WINHELP_CTX_serial_speed "serial.speed:config-serial-speed" -#define WINHELP_CTX_serial_databits "serial.databits:config-serial-databits" -#define WINHELP_CTX_serial_stopbits "serial.stopbits:config-serial-stopbits" -#define WINHELP_CTX_serial_parity "serial.parity:config-serial-parity" -#define WINHELP_CTX_serial_flow "serial.flow:config-serial-flow" +#define WINHELP_CTX_session_hostname "config-hostname" +#define WINHELP_CTX_session_saved "config-saving" +#define WINHELP_CTX_session_coe "config-closeonexit" +#define WINHELP_CTX_logging_main "config-logging" +#define WINHELP_CTX_logging_filename "config-logfilename" +#define WINHELP_CTX_logging_exists "config-logfileexists" +#define WINHELP_CTX_logging_flush "config-logflush" +#define WINHELP_CTX_logging_header "config-logheader" +#define WINHELP_CTX_logging_ssh_omit_password "config-logssh" +#define WINHELP_CTX_logging_ssh_omit_data "config-logssh" +#define WINHELP_CTX_keyboard_backspace "config-backspace" +#define WINHELP_CTX_keyboard_homeend "config-homeend" +#define WINHELP_CTX_keyboard_funkeys "config-funkeys" +#define WINHELP_CTX_keyboard_appkeypad "config-appkeypad" +#define WINHELP_CTX_keyboard_appcursor "config-appcursor" +#define WINHELP_CTX_keyboard_nethack "config-nethack" +#define WINHELP_CTX_keyboard_compose "config-compose" +#define WINHELP_CTX_keyboard_ctrlalt "config-ctrlalt" +#define WINHELP_CTX_features_application "config-features-application" +#define WINHELP_CTX_features_mouse "config-features-mouse" +#define WINHELP_CTX_features_resize "config-features-resize" +#define WINHELP_CTX_features_altscreen "config-features-altscreen" +#define WINHELP_CTX_features_retitle "config-features-retitle" +#define WINHELP_CTX_features_qtitle "config-features-qtitle" +#define WINHELP_CTX_features_dbackspace "config-features-dbackspace" +#define WINHELP_CTX_features_charset "config-features-charset" +#define WINHELP_CTX_features_clearscroll "config-features-clearscroll" +#define WINHELP_CTX_features_arabicshaping "config-features-shaping" +#define WINHELP_CTX_features_bidi "config-features-bidi" +#define WINHELP_CTX_terminal_autowrap "config-autowrap" +#define WINHELP_CTX_terminal_decom "config-decom" +#define WINHELP_CTX_terminal_lfhascr "config-crlf" +#define WINHELP_CTX_terminal_crhaslf "config-lfcr" +#define WINHELP_CTX_terminal_bce "config-erase" +#define WINHELP_CTX_terminal_blink "config-blink" +#define WINHELP_CTX_terminal_answerback "config-answerback" +#define WINHELP_CTX_terminal_localecho "config-localecho" +#define WINHELP_CTX_terminal_localedit "config-localedit" +#define WINHELP_CTX_terminal_printing "config-printing" +#define WINHELP_CTX_bell_style "config-bellstyle" +#define WINHELP_CTX_bell_taskbar "config-belltaskbar" +#define WINHELP_CTX_bell_overload "config-bellovl" +#define WINHELP_CTX_window_size "config-winsize" +#define WINHELP_CTX_window_resize "config-winsizelock" +#define WINHELP_CTX_window_scrollback "config-scrollback" +#define WINHELP_CTX_window_erased "config-erasetoscrollback" +#define WINHELP_CTX_behaviour_closewarn "config-warnonclose" +#define WINHELP_CTX_behaviour_altf4 "config-altf4" +#define WINHELP_CTX_behaviour_altspace "config-altspace" +#define WINHELP_CTX_behaviour_altonly "config-altonly" +#define WINHELP_CTX_behaviour_alwaysontop "config-alwaysontop" +#define WINHELP_CTX_behaviour_altenter "config-fullscreen" +#define WINHELP_CTX_appearance_cursor "config-cursor" +#define WINHELP_CTX_appearance_font "config-font" +#define WINHELP_CTX_appearance_title "config-title" +#define WINHELP_CTX_appearance_hidemouse "config-mouseptr" +#define WINHELP_CTX_appearance_border "config-winborder" +#define WINHELP_CTX_connection_termtype "config-termtype" +#define WINHELP_CTX_connection_termspeed "config-termspeed" +#define WINHELP_CTX_connection_username "config-username" +#define WINHELP_CTX_connection_username_from_env "config-username-from-env" +#define WINHELP_CTX_connection_keepalive "config-keepalive" +#define WINHELP_CTX_connection_nodelay "config-nodelay" +#define WINHELP_CTX_connection_ipversion "config-address-family" +#define WINHELP_CTX_connection_tcpkeepalive "config-tcp-keepalives" +#define WINHELP_CTX_connection_loghost "config-loghost" +#define WINHELP_CTX_proxy_type "config-proxy-type" +#define WINHELP_CTX_proxy_main "config-proxy" +#define WINHELP_CTX_proxy_exclude "config-proxy-exclude" +#define WINHELP_CTX_proxy_dns "config-proxy-dns" +#define WINHELP_CTX_proxy_auth "config-proxy-auth" +#define WINHELP_CTX_proxy_command "config-proxy-command" +#define WINHELP_CTX_proxy_logging "config-proxy-logging" +#define WINHELP_CTX_telnet_environ "config-environ" +#define WINHELP_CTX_telnet_oldenviron "config-oldenviron" +#define WINHELP_CTX_telnet_passive "config-ptelnet" +#define WINHELP_CTX_telnet_specialkeys "config-telnetkey" +#define WINHELP_CTX_telnet_newline "config-telnetnl" +#define WINHELP_CTX_rlogin_localuser "config-rlogin-localuser" +#define WINHELP_CTX_ssh_nopty "config-ssh-pty" +#define WINHELP_CTX_ssh_ttymodes "config-ttymodes" +#define WINHELP_CTX_ssh_noshell "config-ssh-noshell" +#define WINHELP_CTX_ssh_ciphers "config-ssh-encryption" +#define WINHELP_CTX_ssh_protocol "config-ssh-prot" +#define WINHELP_CTX_ssh_command "config-command" +#define WINHELP_CTX_ssh_compress "config-ssh-comp" +#define WINHELP_CTX_ssh_share "config-ssh-sharing" +#define WINHELP_CTX_ssh_kexlist "config-ssh-kex-order" +#define WINHELP_CTX_ssh_hklist "config-ssh-hostkey-order" +#define WINHELP_CTX_ssh_gssapi_kex_delegation "config-ssh-kex-gssapi-delegation" +#define WINHELP_CTX_ssh_kex_repeat "config-ssh-kex-rekey" +#define WINHELP_CTX_ssh_kex_manual_hostkeys "config-ssh-kex-manual-hostkeys" +#define WINHELP_CTX_ssh_auth_bypass "config-ssh-noauth" +#define WINHELP_CTX_ssh_auth_banner "config-ssh-banner" +#define WINHELP_CTX_ssh_auth_privkey "config-ssh-privkey" +#define WINHELP_CTX_ssh_auth_agentfwd "config-ssh-agentfwd" +#define WINHELP_CTX_ssh_auth_changeuser "config-ssh-changeuser" +#define WINHELP_CTX_ssh_auth_pageant "config-ssh-tryagent" +#define WINHELP_CTX_ssh_auth_tis "config-ssh-tis" +#define WINHELP_CTX_ssh_auth_ki "config-ssh-ki" +#define WINHELP_CTX_ssh_gssapi "config-ssh-auth-gssapi" +#define WINHELP_CTX_ssh_gssapi_delegation "config-ssh-auth-gssapi-delegation" +#define WINHELP_CTX_ssh_gssapi_libraries "config-ssh-auth-gssapi-libraries" +#define WINHELP_CTX_selection_buttons "config-mouse" +#define WINHELP_CTX_selection_shiftdrag "config-mouseshift" +#define WINHELP_CTX_selection_rect "config-rectselect" +#define WINHELP_CTX_selection_linedraw "config-linedrawpaste" +#define WINHELP_CTX_selection_autocopy "config-selection-autocopy" +#define WINHELP_CTX_selection_clipactions "config-selection-clipactions" +#define WINHELP_CTX_selection_pastectrl "config-paste-ctrl-char" +#define WINHELP_CTX_copy_charclasses "config-charclasses" +#define WINHELP_CTX_copy_rtf "config-rtfcopy" +#define WINHELP_CTX_colours_ansi "config-ansicolour" +#define WINHELP_CTX_colours_xterm256 "config-xtermcolour" +#define WINHELP_CTX_colours_truecolour "config-truecolour" +#define WINHELP_CTX_colours_bold "config-boldcolour" +#define WINHELP_CTX_colours_system "config-syscolour" +#define WINHELP_CTX_colours_logpal "config-logpalette" +#define WINHELP_CTX_colours_config "config-colourcfg" +#define WINHELP_CTX_translation_codepage "config-charset" +#define WINHELP_CTX_translation_cjk_ambig_wide "config-cjk-ambig-wide" +#define WINHELP_CTX_translation_cyrillic "config-cyr" +#define WINHELP_CTX_translation_linedraw "config-linedraw" +#define WINHELP_CTX_translation_utf8linedraw "config-utf8linedraw" +#define WINHELP_CTX_ssh_tunnels_x11 "config-ssh-x11" +#define WINHELP_CTX_ssh_tunnels_x11auth "config-ssh-x11auth" +#define WINHELP_CTX_ssh_tunnels_xauthority "config-ssh-xauthority" +#define WINHELP_CTX_ssh_tunnels_portfwd "config-ssh-portfwd" +#define WINHELP_CTX_ssh_tunnels_portfwd_localhost "config-ssh-portfwd-localhost" +#define WINHELP_CTX_ssh_tunnels_portfwd_ipversion "config-ssh-portfwd-address-family" +#define WINHELP_CTX_ssh_bugs_ignore1 "config-ssh-bug-ignore1" +#define WINHELP_CTX_ssh_bugs_plainpw1 "config-ssh-bug-plainpw1" +#define WINHELP_CTX_ssh_bugs_rsa1 "config-ssh-bug-rsa1" +#define WINHELP_CTX_ssh_bugs_ignore2 "config-ssh-bug-ignore2" +#define WINHELP_CTX_ssh_bugs_hmac2 "config-ssh-bug-hmac2" +#define WINHELP_CTX_ssh_bugs_derivekey2 "config-ssh-bug-derivekey2" +#define WINHELP_CTX_ssh_bugs_rsapad2 "config-ssh-bug-sig" +#define WINHELP_CTX_ssh_bugs_pksessid2 "config-ssh-bug-pksessid2" +#define WINHELP_CTX_ssh_bugs_rekey2 "config-ssh-bug-rekey" +#define WINHELP_CTX_ssh_bugs_maxpkt2 "config-ssh-bug-maxpkt2" +#define WINHELP_CTX_ssh_bugs_winadj "config-ssh-bug-winadj" +#define WINHELP_CTX_ssh_bugs_chanreq "config-ssh-bug-chanreq" +#define WINHELP_CTX_ssh_bugs_oldgex2 "config-ssh-bug-oldgex2" +#define WINHELP_CTX_serial_line "config-serial-line" +#define WINHELP_CTX_serial_speed "config-serial-speed" +#define WINHELP_CTX_serial_databits "config-serial-databits" +#define WINHELP_CTX_serial_stopbits "config-serial-stopbits" +#define WINHELP_CTX_serial_parity "config-serial-parity" +#define WINHELP_CTX_serial_flow "config-serial-flow" -#define WINHELP_CTX_pageant_general "pageant.general:pageant" -#define WINHELP_CTX_pageant_keylist "pageant.keylist:pageant-mainwin-keylist" -#define WINHELP_CTX_pageant_addkey "pageant.addkey:pageant-mainwin-addkey" -#define WINHELP_CTX_pageant_remkey "pageant.remkey:pageant-mainwin-remkey" -#define WINHELP_CTX_pgpfingerprints "pgpfingerprints:pgpkeys" -#define WINHELP_CTX_puttygen_general "puttygen.general:pubkey-puttygen" -#define WINHELP_CTX_puttygen_keytype "puttygen.keytype:puttygen-keytype" -#define WINHELP_CTX_puttygen_bits "puttygen.bits:puttygen-strength" -#define WINHELP_CTX_puttygen_generate "puttygen.generate:puttygen-generate" -#define WINHELP_CTX_puttygen_fingerprint "puttygen.fingerprint:puttygen-fingerprint" -#define WINHELP_CTX_puttygen_comment "puttygen.comment:puttygen-comment" -#define WINHELP_CTX_puttygen_passphrase "puttygen.passphrase:puttygen-passphrase" -#define WINHELP_CTX_puttygen_savepriv "puttygen.savepriv:puttygen-savepriv" -#define WINHELP_CTX_puttygen_savepub "puttygen.savepub:puttygen-savepub" -#define WINHELP_CTX_puttygen_pastekey "puttygen.pastekey:puttygen-pastekey" -#define WINHELP_CTX_puttygen_load "puttygen.load:puttygen-load" -#define WINHELP_CTX_puttygen_conversions "puttygen.conversions:puttygen-conversions" +#define WINHELP_CTX_pageant_general "pageant" +#define WINHELP_CTX_pageant_keylist "pageant-mainwin-keylist" +#define WINHELP_CTX_pageant_addkey "pageant-mainwin-addkey" +#define WINHELP_CTX_pageant_remkey "pageant-mainwin-remkey" +#define WINHELP_CTX_pgpfingerprints "pgpkeys" +#define WINHELP_CTX_puttygen_general "pubkey-puttygen" +#define WINHELP_CTX_puttygen_keytype "puttygen-keytype" +#define WINHELP_CTX_puttygen_bits "puttygen-strength" +#define WINHELP_CTX_puttygen_generate "puttygen-generate" +#define WINHELP_CTX_puttygen_fingerprint "puttygen-fingerprint" +#define WINHELP_CTX_puttygen_comment "puttygen-comment" +#define WINHELP_CTX_puttygen_passphrase "puttygen-passphrase" +#define WINHELP_CTX_puttygen_savepriv "puttygen-savepriv" +#define WINHELP_CTX_puttygen_savepub "puttygen-savepub" +#define WINHELP_CTX_puttygen_pastekey "puttygen-pastekey" +#define WINHELP_CTX_puttygen_load "puttygen-load" +#define WINHELP_CTX_puttygen_conversions "puttygen-conversions" /* These are used in Windows-specific bits of the frontend. * We (ab)use "help context identifiers" (dwContextId) to identify them. */ @@ -191,13 +187,13 @@ #define HELPCTXID(x) WINHELP_CTXID_ ## x #define WINHELP_CTXID_no_help 0 -#define WINHELP_CTX_errors_hostkey_absent "errors.hostkey.absent:errors-hostkey-absent" +#define WINHELP_CTX_errors_hostkey_absent "errors-hostkey-absent" #define WINHELP_CTXID_errors_hostkey_absent 1 -#define WINHELP_CTX_errors_hostkey_changed "errors.hostkey.changed:errors-hostkey-wrong" +#define WINHELP_CTX_errors_hostkey_changed "errors-hostkey-wrong" #define WINHELP_CTXID_errors_hostkey_changed 2 -#define WINHELP_CTX_errors_cantloadkey "errors.cantloadkey:errors-cant-load-key" +#define WINHELP_CTX_errors_cantloadkey "errors-cant-load-key" #define WINHELP_CTXID_errors_cantloadkey 3 -#define WINHELP_CTX_option_cleanup "options.cleanup:using-cleanup" +#define WINHELP_CTX_option_cleanup "using-cleanup" #define WINHELP_CTXID_option_cleanup 4 -#define WINHELP_CTX_pgp_fingerprints "pgpfingerprints:pgpkeys" +#define WINHELP_CTX_pgp_fingerprints "pgpkeys" #define WINHELP_CTXID_pgp_fingerprints 5