From 25c730350a0f5b694b83043ff3dc40a65be0e06a Mon Sep 17 00:00:00 2001 From: wiz Date: Thu, 11 Jul 2019 09:48:22 +0000 Subject: [PATCH] Merge lines. Fixes display problem noted in PR 54361 by he@ --- libexec/getty/gettytab.5 | 59 ++++++++++++++-------------------------- 1 file changed, 20 insertions(+), 39 deletions(-) diff --git a/libexec/getty/gettytab.5 b/libexec/getty/gettytab.5 index f2e7bde3c88f..34bf46a000dd 100644 --- a/libexec/getty/gettytab.5 +++ b/libexec/getty/gettytab.5 @@ -1,4 +1,4 @@ -.\" $NetBSD: gettytab.5,v 1.36 2012/04/21 12:27:28 roy Exp $ +.\" $NetBSD: gettytab.5,v 1.37 2019/07/11 09:48:22 wiz Exp $ .\" .\" Copyright (c) 1983, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -100,37 +100,30 @@ table. .It "c2 num unused tty control flags to leave terminal as" .It "ce bool false use crt erase algorithm" .It "ck bool false use crt kill algorithm" -.It "cl str" Ta Dv NULL Ta -.No "screen clear sequence" +.It "cl str" Ta Dv NULL Ta No "screen clear sequence" .It "co bool false console - add" .Ql \er\en after login prompt .It "cs bool false clear screen based on terminal type in /etc/ttys" -.It "ds str" Ta So Li ^Y Sc Ta -.No "delayed suspend character" +.It "ds str" Ta So Li ^Y Sc Ta No "delayed suspend character" .It "dx bool false set" .Dv DECCTLQ .It "ec bool false leave echo" .Tn OFF .It "ep bool false terminal uses even parity" -.It "er str" Ta So Li ^? Sc Ta -.No "erase character" -.It "et str" Ta So Li ^D Sc Ta -.No "end of text" +.It "er str" Ta So Li ^? Sc Ta No "erase character" +.It "et str" Ta So Li ^D Sc Ta No "end of text" .Pq Dv EOF character -.It "ev str" Ta Dv NULL Ta -.No "initial environment" +.It "ev str" Ta Dv NULL Ta No "initial environment" .It "f0 num unused tty mode flags to write messages" .It "f1 num unused tty mode flags to read login name" .It "f2 num unused tty mode flags to leave terminal as" -.It "fl str" Ta So Li ^O Sc Ta -.No "output flush character" +.It "fl str" Ta So Li ^O Sc Ta No "output flush character" .It "hc bool false do" .Tn NOT hangup line on last close -.It "he str" Ta Dv NULL Ta -.No "hostname editing string" +.It "he str" Ta Dv NULL Ta No "hostname editing string" .It "hn str hostname hostname" .It "ht bool false terminal has real tabs" .It "i0 num unused tty input flags to write messages" @@ -138,22 +131,17 @@ hangup line on last close .It "i2 num unused tty input flags to leave terminal as" .It "if str NULL display named file before prompt, like /etc/issue" .It "ig bool false ignore garbage characters in login name" -.It "im str" Ta Dv NULL Ta -.No "initial (banner) message" -.It "in str" Ta So Li ^C Sc Ta -.No "interrupt character" +.It "im str" Ta Dv NULL Ta No "initial (banner) message" +.It "in str" Ta So Li ^C Sc Ta No "interrupt character" .It "is num unused input speed" -.It "kl str" Ta So Li ^U Sc Ta -.No "kill character" +.It "kl str" Ta So Li ^U Sc Ta No "kill character" .It "l0 num unused tty local flags to write messages" .It "l1 num unused tty local flags to read login name" .It "l2 num unused tty local flags to leave terminal as" .It "lc bool false terminal has lower case" .It "lm str login: login prompt" -.It "ln str" Ta So Li ^V Sc Ta -.No "``literal next'' character" -.It "lo str" Ta Pa /usr/bin/login Ta -.No "program to exec when name obtained" +.It "ln str" Ta So Li ^V Sc Ta No "``literal next'' character" +.It "lo str" Ta Pa /usr/bin/login Ta No "program to exec when name obtained" .It "mb bool false do flow control based on carrier" .It "nl bool false terminal has (or might have) a newline character" .It "nn bool false do not prompt for a login name" @@ -164,8 +152,7 @@ hangup line on last close .It "o2 num unused tty output flags to leave terminal as" .It "op bool false terminal uses odd parity" .It "os num unused output speed" -.It "pc str" Ta So Li \e0 Sc Ta -.No "pad character" +.It "pc str" Ta So Li \e0 Sc Ta No "pad character" .It "pe bool false use printer (hard copy) erase algorithm" .It "pf num 0 delay" between first prompt and following flush (seconds) @@ -173,25 +160,19 @@ between first prompt and following flush (seconds) .It "ps bool false line connected to a" .Tn MICOM port selector -.It "qu str" Ta So Li \&^\e Sc Ta -.No "quit character" -.It "rp str" Ta So Li ^R Sc Ta -.No "line retype character" +.It "qu str" Ta So Li \&^\e Sc Ta No "quit character" +.It "rp str" Ta So Li ^R Sc Ta No "line retype character" .It "rw bool false do" .Tn NOT use raw for input, use cbreak .It "sp num unused line speed (input and output)" -.It "st str" Ta So Li ^T Sc Ta -.No "status character" -.It "su str" Ta So Li ^Z Sc Ta -.No "suspend character" +.It "st str" Ta So Li ^T Sc Ta No "status character" +.It "su str" Ta So Li ^Z Sc Ta No "suspend character" .It "tc str none table continuation" .It "to num 0 timeout (seconds)" -.It "tt str" Ta Dv NULL Ta -.No "terminal type (for environment)" +.It "tt str" Ta Dv NULL Ta No "terminal type (for environment)" .It "ub bool false do unbuffered output (of prompts etc)" -.It "we str" Ta So Li ^W Sc Ta -.No "word erase character" +.It "we str" Ta So Li ^W Sc Ta No "word erase character" .It "xc bool false do" .Tn NOT echo control chars as