]>
Commit | Line | Data |
---|---|---|
ef2adeff JB |
1 | --- screen-4.2.1/doc/screen.1.orig 2014-04-28 00:10:01.000000000 +0200 |
2 | +++ screen-4.2.1/doc/screen.1 2014-07-20 09:45:37.959175974 +0200 | |
3 | @@ -103,7 +103,7 @@ | |
4 | the invoking shell to the application (emacs in this case), because it is | |
5 | forked from the parent screen process, not from the invoking shell. | |
c13f8bf8 | 6 | .PP |
7 | -If \*Q/etc/utmp\*U is writable by | |
8 | +If \*Q/var/run/utmp\*U is writable by | |
9 | .IR screen , | |
10 | an appropriate record will be written to this file for each window, and | |
11 | removed when the window is terminated. | |
ef2adeff | 12 | @@ -232,7 +232,7 @@ |
c13f8bf8 | 13 | The use of this option is discouraged. |
14 | .TP 5 | |
15 | .BR \-l " and " \-ln | |
16 | -turns login mode on or off (for /etc/utmp updating). | |
17 | +turns login mode on or off (for /var/run/utmp updating). | |
18 | This can also be defined through the \*Qdeflogin\*U .screenrc command. | |
19 | .TP 5 | |
ef2adeff JB |
20 | .BR \-ls " [" \fImatch ] |
21 | @@ -625,7 +625,7 @@ | |
c13f8bf8 | 22 | |
23 | .SH CUSTOMIZATION | |
24 | The \*Qsocket directory\*U defaults either to $HOME/.screen or simply to | |
25 | -/tmp/screens or preferably to /usr/local/screens chosen at compile-time. If | |
26 | +/tmp/screens. If | |
27 | .I screen | |
28 | is installed setuid-root, then the administrator | |
29 | should compile | |
ef2adeff | 30 | @@ -638,7 +638,7 @@ |
c13f8bf8 | 31 | When |
32 | .I screen | |
33 | is invoked, it executes initialization commands from the files | |
34 | -\*Q/usr/local/etc/screenrc\*U and | |
35 | +\*Q/etc/screenrc\*U and | |
36 | \*Q.screenrc\*U in the user's home directory. These are the \*Qprogrammer's | |
37 | defaults\*U that can be overridden in the following ways: for the | |
38 | global screenrc file | |
ef2adeff | 39 | @@ -1845,7 +1845,7 @@ |
c13f8bf8 | 40 | The echo command may be used to annoy |
41 | .I screen | |
42 | users with a 'message of the | |
43 | -day'. Typically installed in a global /local/etc/screenrc. | |
ef2adeff JB |
44 | +day'. Typically installed in a global etc/screenrc. |
45 | The option \*Q\-n\*U may be used to suppress the line feed. | |
c13f8bf8 | 46 | See also \*Qsleep\*U. |
47 | Echo is also useful for online checking of environment variables. | |
ef2adeff | 48 | @@ -4857,20 +4857,18 @@ |
c13f8bf8 | 49 | .I screen |
50 | distribution package for private and global initialization files. | |
51 | .IP $SYSSCREENRC | |
52 | -.IP /usr/local/etc/screenrc | |
53 | +.IP /etc/screenrc | |
54 | .I screen | |
55 | initialization commands | |
56 | .IP $SCREENRC | |
57 | .IP $HOME/.screenrc | |
58 | -Read in after /usr/local/etc/screenrc | |
59 | +Read in after /etc/screenrc | |
ef2adeff JB |
60 | .IP $SCREENDIR/S\-<login> |
61 | -.IP /local/screens/S\-<login> | |
62 | +.IP /tmp/screens/S\-<login> | |
c13f8bf8 | 63 | Socket directories (default) |
ef2adeff | 64 | -.IP /usr/tmp/screens/S\-<login> |
c13f8bf8 | 65 | -Alternate socket directories. |
66 | .IP "<socket directory>/.termcap" | |
67 | Written by the "termcap" output function | |
ef2adeff JB |
68 | -.IP /usr/tmp/screens/screen\-exchange |
69 | +.IP /tmp/screens/screen\-exchange | |
c13f8bf8 | 70 | or |
ef2adeff | 71 | .IP /tmp/screen\-exchange |
c13f8bf8 | 72 | .I screen |
ef2adeff | 73 | @@ -4879,11 +4877,9 @@ |
c13f8bf8 | 74 | Screen images created by the hardcopy function |
75 | .IP screenlog.[0-9] | |
76 | Output log files created by the log function | |
77 | -.IP /usr/lib/terminfo/?/* | |
78 | +.IP /usr/share/terminfo/?/* | |
79 | or | |
80 | -.IP /etc/termcap | |
81 | -Terminal capability databases | |
82 | -.IP /etc/utmp | |
83 | +.IP /var/run/utmp | |
84 | Login records | |
85 | .IP $LOCKPRG | |
86 | Program that locks a terminal. | |
ef2adeff | 87 | @@ -5005,9 +5001,9 @@ |
c13f8bf8 | 88 | must be installed as set-uid with owner root on most systems in order |
89 | to be able to correctly change the owner of the tty device file for | |
90 | each window. | |
91 | -Special permission may also be required to write the file \*Q/etc/utmp\*U. | |
92 | +Special permission may also be required to write the file \*Q/var/run/utmp\*U. | |
93 | .IP \(bu | |
94 | -Entries in \*Q/etc/utmp\*U are not removed when | |
95 | +Entries in \*Q/var/run/utmp\*U are not removed when | |
96 | .I screen | |
97 | is killed with SIGKILL. | |
98 | This will cause some programs (like "w" or "rwho") |