summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordelphij <delphij@FreeBSD.org>2007-07-24 06:41:07 +0000
committerdelphij <delphij@FreeBSD.org>2007-07-24 06:41:07 +0000
commit90cc29c58cc4a61cd9c1f83244fff9144efdcff5 (patch)
treeee3179ea3909b973226d0d80a2a4937b923492ad
parentf01a448638ad65647e242aa1a41bc7de44034338 (diff)
downloadFreeBSD-src-90cc29c58cc4a61cd9c1f83244fff9144efdcff5.zip
FreeBSD-src-90cc29c58cc4a61cd9c1f83244fff9144efdcff5.tar.gz
Stop mentioning /usr/X11R6.
Approved by: re (hrs)
-rw-r--r--libexec/getty/ttys.52
-rw-r--r--share/man/man7/ports.74
-rw-r--r--share/man/man8/rc.86
-rw-r--r--usr.bin/su/su.14
-rw-r--r--usr.sbin/periodic/periodic.82
5 files changed, 7 insertions, 11 deletions
diff --git a/libexec/getty/ttys.5 b/libexec/getty/ttys.5
index d1aaff6..cf2423a 100644
--- a/libexec/getty/ttys.5
+++ b/libexec/getty/ttys.5
@@ -150,7 +150,7 @@ ttyh0 "/usr/libexec/getty std.9600" hp2621-nl on group=dialup # 457 Evans
# John's terminal: vt100
ttyh1 "/usr/libexec/getty std.9600" vt100 on group=dialup # 459 Evans
# terminal emulate/window system
-ttyv0 "/usr/X11R6/bin/xterm -display :0" xterm on window="/usr/X11R6/bin/X :0"
+ttyv0 "/usr/local/bin/xterm -display :0" xterm on window="/usr/local/bin/X :0"
# Network pseudo ttys -- don't enable getty
ttyp0 none network group=pty
ttyp1 none network off group=pty
diff --git a/share/man/man7/ports.7 b/share/man/man7/ports.7
index 10cc476..0e9dfbe 100644
--- a/share/man/man7/ports.7
+++ b/share/man/man7/ports.7
@@ -390,9 +390,7 @@ The full path to the package.
.It Va PREFIX
Where to install things in general
(usually
-.Pa /usr/local
-or
-.Pa /usr/X11R6 ) .
+.Pa /usr/local ) .
.It Va MASTER_SITES
Primary sites for distribution files if not found locally.
.It Va PATCH_SITES
diff --git a/share/man/man8/rc.8 b/share/man/man8/rc.8
index 7d3cfe5..aa607be 100644
--- a/share/man/man8/rc.8
+++ b/share/man/man8/rc.8
@@ -412,10 +412,8 @@ The
script can execute scripts from multiple
.Nm rc.d/
directories.
-The default locations are
-.Pa /usr/local/etc/rc.d/
-and
-.Pa /usr/X11R6/etc/rc.d/ ,
+The default location includes
+.Pa /usr/local/etc/rc.d/ ,
but these may be overridden with the
.Va local_startup
.Xr rc.conf 5
diff --git a/usr.bin/su/su.1 b/usr.bin/su/su.1
index dafe292..56d3f98 100644
--- a/usr.bin/su/su.1
+++ b/usr.bin/su/su.1
@@ -202,7 +202,7 @@ Runs the command
as user
.Li man .
You will be asked for man's password unless your real UID is 0.
-.It Li "su man -c 'catman /usr/share/man /usr/local/man /usr/X11R6/man'"
+.It Li "su man -c 'catman /usr/share/man /usr/local/man'"
Same as above, but the target command consists of more than a
single word and hence is quoted for use with the
.Fl c
@@ -210,7 +210,7 @@ option being passed to the shell.
(Most shells expect the argument to
.Fl c
to be a single word).
-.It Li "su -c staff man -c 'catman /usr/share/man /usr/local/man /usr/X11R6/man'"
+.It Li "su -c staff man -c 'catman /usr/share/man /usr/local/man'"
Same as above, but the target command is run with the resource limits of
the login class
.Dq staff .
diff --git a/usr.sbin/periodic/periodic.8 b/usr.sbin/periodic/periodic.8
index 569da04..ebe320c 100644
--- a/usr.sbin/periodic/periodic.8
+++ b/usr.sbin/periodic/periodic.8
@@ -203,7 +203,7 @@ system registry will typically have a
.Va local_periodic
variable reading:
.Pp
-.Dl local_periodic="/usr/local/etc/periodic /usr/X11R6/etc/periodic"
+.Dl local_periodic="/usr/local/etc/periodic"
.Pp
To log
.Nm
OpenPOWER on IntegriCloud