From: sobrado <sobrado@openbsd.org>
Date: Mon, 8 Aug 2016 15:09:32 +0000 (+0000)
Subject: /tmp and /var/tmp are the same, consistently use the former in both
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=64b855fdc1151b993372f8a2ad4e60e63d5a2c2d;p=openbsd

/tmp and /var/tmp are the same, consistently use the former in both
build/recover and documentation.

ok millert@, tb@, martijn@ and schwarze@
---

diff --git a/usr.bin/vi/build/recover b/usr.bin/vi/build/recover
index 41439cae9d7..4873866f6d7 100644
--- a/usr.bin/vi/build/recover
+++ b/usr.bin/vi/build/recover
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-# $OpenBSD: recover,v 1.9 2001/11/06 23:31:08 millert Exp $
+# $OpenBSD: recover,v 1.10 2016/08/08 15:09:32 sobrado Exp $
 #
 # Script to (safely) recover nvi edit sessions.
 #
@@ -8,7 +8,7 @@
 use Fcntl;
 require 'sys/syscall.ph';
 
-$recoverdir = $ARGV[0] || "/var/tmp/vi.recover";
+$recoverdir = $ARGV[0] || "/tmp/vi.recover";
 $sendmail = "/usr/sbin/sendmail";
 
 die "Sorry, $0 must be run as root\n" if $>;
diff --git a/usr.bin/vi/docs/USD.doc/vi.man/vi.1 b/usr.bin/vi/docs/USD.doc/vi.man/vi.1
index 17e5aeca179..76dea54075a 100644
--- a/usr.bin/vi/docs/USD.doc/vi.man/vi.1
+++ b/usr.bin/vi/docs/USD.doc/vi.man/vi.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: vi.1,v 1.65 2016/08/01 18:27:35 bentley Exp $
+.\"	$OpenBSD: vi.1,v 1.66 2016/08/08 15:09:33 sobrado Exp $
 .\"
 .\" Copyright (c) 1994
 .\"     The Regents of the University of California.  All rights reserved.
@@ -14,7 +14,7 @@
 .\"
 .\"     @(#)vi.1	8.51 (Berkeley) 10/10/96
 .\"
-.Dd $Mdocdate: August 1 2016 $
+.Dd $Mdocdate: August 8 2016 $
 .Dt VI 1
 .Os
 .Sh NAME
@@ -2408,7 +2408,7 @@ only.
 Display a command prompt.
 .It Cm readonly , ro Bq off
 Mark the file and session as read-only.
-.It Cm recdir Bq /var/tmp/vi.recover
+.It Cm recdir Bq /tmp/vi.recover
 The directory where recovery files are stored.
 .It Cm redraw , re Bq off
 .Nm vi
@@ -2666,7 +2666,7 @@ for more information.
 .\" ignores these signals.
 .El
 .Sh FILES
-.Bl -tag -width "/var/tmp/vi.recover"
+.Bl -tag -width "/tmp/vi.recover"
 .It Pa /bin/sh
 The default user shell.
 .It Pa /etc/vi.exrc
@@ -2680,7 +2680,7 @@ Must be owned by root or the user,
 and writable only by the owner.
 .It Pa /tmp
 Temporary file directory.
-.It Pa /var/tmp/vi.recover
+.It Pa /tmp/vi.recover
 The default recovery file directory.
 .It Pa $HOME/.nexrc
 First choice for user's home directory startup file, read for
diff --git a/usr.bin/vi/docs/USD.doc/vi.ref/set.opt.roff b/usr.bin/vi/docs/USD.doc/vi.ref/set.opt.roff
index ca47594141e..6c51da59b77 100644
--- a/usr.bin/vi/docs/USD.doc/vi.ref/set.opt.roff
+++ b/usr.bin/vi/docs/USD.doc/vi.ref/set.opt.roff
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: set.opt.roff,v 1.11 2016/08/01 18:27:35 bentley Exp $
+.\"	$OpenBSD: set.opt.roff,v 1.12 2016/08/08 15:09:33 sobrado Exp $
 .\"
 .\" Copyright (c) 1994
 .\"     The Regents of the University of California.  All rights reserved.
@@ -779,7 +779,7 @@ In other words, the
 edit option will be set if the current file lacks write permissions,
 and will not be set if the user has write permissions for the file.
 .KY recdir
-.IP "recdir [/var/tmp/vi.recover]"
+.IP "recdir [/tmp/vi.recover]"
 The directory where recovery files are stored.
 .sp
 If you change the value of
diff --git a/usr.bin/vi/docs/USD.doc/vi.ref/vi.ref b/usr.bin/vi/docs/USD.doc/vi.ref/vi.ref
index 1ee13e86f29..f4adbcc51dc 100644
--- a/usr.bin/vi/docs/USD.doc/vi.ref/vi.ref
+++ b/usr.bin/vi/docs/USD.doc/vi.ref/vi.ref
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: vi.ref,v 1.13 2016/01/06 22:41:53 millert Exp $
+.\"	$OpenBSD: vi.ref,v 1.14 2016/08/08 15:09:33 sobrado Exp $
 .\"
 .\" Copyright (c) 1994
 .\"     The Regents of the University of California.  All rights reserved.
@@ -436,7 +436,7 @@ and the superuser may recover any edit session.
 Edit sessions are backed by files in the directory named by the
 .OP recdir
 option (the directory
-.LI /var/tmp/vi.recover
+.LI /tmp/vi.recover
 by default), and are named
 .QC vi.XXXXXXXXXX ,
 where
@@ -490,7 +490,7 @@ user to recover the edit session.
 In addition, it has all of the necessary email headers for
 .XR sendmail 8 .
 .\" When the system is rebooted, all of the files in
-.\" .LI /var/tmp/vi.recover
+.\" .LI /tmp/vi.recover
 .\" named
 .\" .QC recover.XXXXXXXXXX
 .\" should be sent to their owners, by email, using the
diff --git a/usr.bin/vi/docs/help b/usr.bin/vi/docs/help
index 55bea7b546c..97d477d267c 100644
--- a/usr.bin/vi/docs/help
+++ b/usr.bin/vi/docs/help
@@ -219,7 +219,7 @@ noextended      mesg            scroll=17       notildeop
 cdpath="/usr/src/local/nvi:/tmp"
 directory="/tmp"
 paragraphs="IPLPPPQPP LIpplpipbp"
-recdir="/var/tmp/vi.recover"
+recdir="/tmp/vi.recover"
 sections="NHSHH HUnhsh"
 shell="/bin/csh"
 shellmeta="~{[*?$`'"\"