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
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.
7 -If \*Q/etc/utmp\*U is writable by
8 +If \*Q/var/run/utmp\*U is writable by
10 an appropriate record will be written to this file for each window, and
11 removed when the window is terminated.
13 The use of this option is discouraged.
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.
20 .BR \-ls " [" \fImatch ]
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
28 is installed setuid-root, then the administrator
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
40 The echo command may be used to annoy
42 users with a 'message of the
43 -day'. Typically installed in a global /local/etc/screenrc.
44 +day'. Typically installed in a global etc/screenrc.
45 The option \*Q\-n\*U may be used to suppress the line feed.
47 Echo is also useful for online checking of environment variables.
48 @@ -4857,20 +4857,18 @@
50 distribution package for private and global initialization files.
52 -.IP /usr/local/etc/screenrc
55 initialization commands
58 -Read in after /usr/local/etc/screenrc
59 +Read in after /etc/screenrc
60 .IP $SCREENDIR/S\-<login>
61 -.IP /local/screens/S\-<login>
62 +.IP /tmp/screens/S\-<login>
63 Socket directories (default)
64 -.IP /usr/tmp/screens/S\-<login>
65 -Alternate socket directories.
66 .IP "<socket directory>/.termcap"
67 Written by the "termcap" output function
68 -.IP /usr/tmp/screens/screen\-exchange
69 +.IP /tmp/screens/screen\-exchange
71 .IP /tmp/screen\-exchange
73 @@ -4879,11 +4877,9 @@
74 Screen images created by the hardcopy function
76 Output log files created by the log function
77 -.IP /usr/lib/terminfo/?/*
78 +.IP /usr/share/terminfo/?/*
81 -Terminal capability databases
86 Program that locks a terminal.
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
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.
94 -Entries in \*Q/etc/utmp\*U are not removed when
95 +Entries in \*Q/var/run/utmp\*U are not removed when
97 is killed with SIGKILL.
98 This will cause some programs (like "w" or "rwho")