]>
Commit | Line | Data |
---|---|---|
a802a8f7 JB |
1 | --- screen-4.6.2/doc/screen.texinfo.orig 2017-10-23 14:18:26.000000000 +0200 |
2 | +++ screen-4.6.2/doc/screen.texinfo 2017-12-09 08:56:43.588104192 +0100 | |
7be0e00f | 3 | @@ -3,14 +3,14 @@ |
07589721 JB |
4 | @c vi:set wm=5 |
5 | @setfilename screen.info | |
6 | @settitle Screen User's Manual | |
7 | -@dircategory General Commands | |
d51ebebf | 8 | +@dircategory Shell utilities: |
07589721 JB |
9 | @finalout |
10 | @setchapternewpage odd | |
8ffc42de | 11 | @c %**end of header |
a802a8f7 | 12 | @set version 4.6.2 |
8ffc42de | 13 | |
8ffc42de | 14 | @direntry |
7810719a | 15 | -* Screen: (screen). Full-screen window manager. |
105191e3 | 16 | +* Screen: (screen). Full-screen window manager |
8ffc42de | 17 | @end direntry |
8ffc42de | 18 | |
19 | @c For examples, use a literal escape in info. | |
d51ebebf JB |
20 | @@ -184,7 +184,7 @@ |
21 | the invoking shell to the application (emacs in this case), because it is | |
22 | forked from the parent screen process, not from the invoking shell. | |
c122dd4c | 23 | |
24 | -If @file{/etc/utmp} is writable by @code{screen}, an appropriate record | |
25 | +If @file{/var/run/utmp} is writable by @code{screen}, an appropriate record | |
26 | will be written to this file for each window, and removed when the | |
27 | window is closed. This is useful for working with @code{talk}, | |
28 | @code{script}, @code{shutdown}, @code{rsend}, @code{sccs} and other | |
d51ebebf | 29 | @@ -496,7 +496,7 @@ |
c122dd4c | 30 | @cindex screenrc |
31 | When @code{screen} is invoked, it executes initialization commands from | |
32 | the files @file{.screenrc} in the user's home directory and | |
33 | -@file{/usr/local/etc/screenrc}. These defaults can be overridden in the | |
34 | +@file{/etc/screenrc}. These defaults can be overridden in the | |
35 | following ways: | |
36 | For the global screenrc file @code{screen} searches for the environment | |
37 | variable @code{$SYSSCREENRC} (this override feature may be disabled at | |
a802a8f7 | 38 | @@ -1035,7 +1035,7 @@ |
c122dd4c | 39 | Place, where to dump hardcopy files. @xref{Hardcopy}. |
1b4412ef | 40 | @item hardstatus [@var{state}] |
c122dd4c | 41 | Use the hardware status line. @xref{Hardware Status Line}. |
1b4412ef PG |
42 | -@item height [@var{lines} [@var{cols}]] |
43 | +@item ns_regheight [@var{lines} [@var{cols}]] | |
c122dd4c | 44 | Set display height. @xref{Window Size}. |
1b4412ef | 45 | @item help [-c @var{class}] |
c122dd4c | 46 | Display current key bindings. @xref{Help}. |
a802a8f7 | 47 | @@ -1088,7 +1088,7 @@ |
c122dd4c | 48 | @item logfile @var{filename} |
49 | Place where to collect logfiles. @xref{Log}. | |
1b4412ef | 50 | @item login [@var{state}] |
c122dd4c | 51 | -Log the window in @file{/etc/utmp}. @xref{Login}. |
52 | +Log the window in @file{/var/run/utmp}. @xref{Login}. | |
1b4412ef | 53 | @item logtstamp [@var{state}] |
c122dd4c | 54 | Configure logfile time-stamps. @xref{Log}. |
55 | @item mapdefault | |
a802a8f7 | 56 | @@ -1762,13 +1762,12 @@ |
c122dd4c | 57 | @kindex C-x |
58 | @deffn Command lockscreen | |
59 | (@kbd{C-a x}, @kbd{C-a C-x})@* | |
60 | -Call a screenlock program (@file{/local/bin/lck} or @file{/usr/bin/lock} | |
61 | -or a builtin, if no other is available). Screen does not accept any | |
62 | -command keys until this program terminates. Meanwhile processes in the | |
63 | -windows may continue, as the windows are in the detached state. | |
64 | -The screenlock program may be changed through the environment variable | |
65 | -@code{$LOCKPRG} (which must be set in the shell from which @code{screen} | |
66 | -is started) and is executed with the user's uid and gid. | |
67 | +Call a screenlock program (@file{/usr/bin/lck} or a builtin, if no other is | |
68 | +available). Screen does not accept any command keys until this program | |
69 | +terminates. Meanwhile processes in the windows may continue, as the windows | |
70 | +are in the detached state. The screenlock program may be changed through the | |
71 | +environment variable @code{$LOCKPRG} (which must be set in the shell from | |
72 | +which @code{screen} is started) and is executed with the user's uid and gid. | |
73 | ||
74 | Warning: When you leave other shells unlocked and have no password set | |
75 | on @code{screen}, the lock is void: One could easily re-attach from an | |
a802a8f7 | 76 | @@ -2404,7 +2403,7 @@ |
c122dd4c | 77 | * Naming Windows:: Control the name of the window |
78 | * Console:: See the host's console messages | |
79 | * Kill:: Destroy an unwanted window | |
80 | -* Login:: Control @file{/etc/utmp} logging | |
81 | +* Login:: Control @file{/var/run/utmp} logging | |
82 | * Mode:: Control the file mode of the pty | |
d51ebebf | 83 | * Monitor:: Watch for activity or inactivity in a window |
c122dd4c | 84 | * Windows:: List the active windows |
a802a8f7 | 85 | @@ -2613,7 +2612,7 @@ |
c122dd4c | 86 | @kindex L |
87 | @deffn Command login [state] | |
88 | (@kbd{C-a L})@* | |
89 | -Adds or removes the entry in @file{/etc/utmp} for the current window. | |
90 | +Adds or removes the entry in @file{/var/run/utmp} for the current window. | |
91 | This controls whether or not the window is @dfn{logged in}. In addition | |
92 | to this toggle, it is convenient to have ``log in'' and ``log out'' | |
93 | keys. For instance, @code{bind I login on} and @code{bind O | |
a802a8f7 | 94 | @@ -5802,22 +5801,19 @@ |
c122dd4c | 95 | global initialization files. |
96 | ||
97 | @item @code{$SYSSCREENRC} | |
98 | -@itemx /local/etc/screenrc | |
99 | +@itemx /etc/screenrc | |
100 | @code{screen} initialization commands | |
101 | ||
102 | @item @code{$SCREENRC} | |
103 | @itemx @code{$HOME}/.iscreenrc | |
104 | @itemx @code{$HOME}/.screenrc | |
105 | -Read in after /local/etc/screenrc | |
106 | +Read in after /etc/screenrc | |
107 | ||
108 | @item @code{$SCREENDIR}/S-@var{login} | |
109 | ||
110 | -@item /local/screens/S-@var{login} | |
111 | +@item /tmp/screens/S-@var{login} | |
112 | Socket directories (default) | |
113 | ||
114 | -@item /usr/tmp/screens/S-@var{login} | |
115 | -Alternate socket directories. | |
116 | - | |
117 | @item @var{socket directory}/.termcap | |
118 | Written by the @code{dumptermcap} command | |
119 | ||
a802a8f7 | 120 | @@ -5835,7 +5831,7 @@ |
c122dd4c | 121 | @itemx /etc/termcap |
122 | Terminal capability databases | |
123 | ||
124 | -@item /etc/utmp | |
125 | +@item /var/run/utmp | |
126 | Login records | |
127 | ||
128 | @item @code{$LOCKPRG} | |
a802a8f7 | 129 | @@ -5860,8 +5856,8 @@ |
d51ebebf JB |
130 | ============ |
131 | ||
9355e2a1 | 132 | @verbatim |
d51ebebf JB |
133 | - Thomas Renninger <treen@suse.com>, |
134 | - Axel Beckert <abe@deuxchevaux.org>, | |
135 | + Thomas Renninger <treen@@suse.com>, | |
136 | + Axel Beckert <abe@@deuxchevaux.org>, | |
137 | Ken Beal <kbeal@@amber.ssd.csd.harris.com>, | |
138 | Rudolf Koenig <rfkoenig@@informatik.uni-erlangen.de>, | |
139 | Toerless Eckert <eckert@@informatik.uni-erlangen.de>, | |
a802a8f7 | 140 | @@ -5945,10 +5941,10 @@ |
c122dd4c | 141 | in order to be able to |
142 | correctly change the owner of the tty device file for each window. | |
143 | Special permission may also be required to write the file | |
144 | -@file{/etc/utmp}. | |
145 | +@file{/var/run/utmp}. | |
146 | ||
147 | @item | |
148 | -Entries in @file{/etc/utmp} are not removed when @code{screen} is killed | |
149 | +Entries in @file{/var/run/utmp} are not removed when @code{screen} is killed | |
150 | with SIGKILL. This will cause some programs (like "w" or "rwho") to | |
151 | advertise that a user is logged on who really isn't. | |
152 | ||
a802a8f7 | 153 | @@ -6028,8 +6024,7 @@ |
c122dd4c | 154 | @cindex socket directory |
155 | ||
156 | The socket directory defaults either to @file{$HOME/.screen} or simply to | |
157 | -@file{/tmp/screens} or preferably to @file{/usr/local/screens} chosen at | |
158 | -compile-time. If @code{screen} is installed | |
8ffc42de | 159 | +@file{/tmp/screens} chosen at compile-time. If @code{screen} is installed |
c122dd4c | 160 | setuid root, then the administrator should compile screen with an |
161 | adequate (not NFS mounted) @code{SOCKDIR}. If @code{screen} is not | |
162 | running setuid-root, the user can specify any mode 700 directory in the |