Correct the man pages, USD doc and online help to refer to /var/mail

instead of {usr|var}/spool/mail

6 files changed, 8 insertions, 8 deletions

diff --git a/usr.bin/mail/USD.doc/mail1.nr b/usr.bin/mail/USD.doc/mail1.nr
index bbb920d..50e7883 100644
--- a/usr.bin/mail/USD.doc/mail1.nr
+++ b/usr.bin/mail/USD.doc/mail1.nr
@@ -74,7 +74,7 @@ waiting in your system mailbox.  If you are a
 .i csh
 user, you will be notified when new mail arrives if you inform
 the shell of the location of your mailbox.  On version 7 systems,
-your system mailbox is located in the directory /usr/spool/mail
+your system mailbox is located in the directory /var/mail
 in a file with your login name.  If your login name is
 .q sam,
 then you can make
@@ -82,7 +82,7 @@ then you can make
 notify you of new mail by including the following line in your .cshrc
 file:
 .(l
-set mail=/usr/spool/mail/sam
+set mail=/var/mail/sam
 .)l
 When you read your mail using
 .i Mail ,
diff --git a/usr.bin/mail/USD.doc/mail5.nr b/usr.bin/mail/USD.doc/mail5.nr
index b70ce95..87f0acf 100644
--- a/usr.bin/mail/USD.doc/mail5.nr
+++ b/usr.bin/mail/USD.doc/mail5.nr
@@ -939,7 +939,7 @@ to truncate your system mailbox instead of deleting it when it
 is empty.  This is useful if you elect to protect your mailbox, which
 you would do with the shell command:
 .(l
-chmod 600 /usr/spool/mail/yourname
+chmod 600 /var/mail/yourname
 .)l
 where
 .i yourname
diff --git a/usr.bin/mail/USD.doc/mail6.nr b/usr.bin/mail/USD.doc/mail6.nr
index e016234..b62f8c5 100644
--- a/usr.bin/mail/USD.doc/mail6.nr
+++ b/usr.bin/mail/USD.doc/mail6.nr
@@ -74,7 +74,7 @@ mail instead of your own.  Unwitting others often neglect to protect
 their mailboxes, but discretion is advised. Essentially,
 .b "\-u user"
 is a shorthand way of doing
-.b "\-f /usr/spool/mail/user".
+.b "\-f /var/mail/user".
 .ip "\-v"
 Use the
 .b \-v
diff --git a/usr.bin/mail/USD.doc/mail8.nr b/usr.bin/mail/USD.doc/mail8.nr
index e8e056b..b09afbd 100644
--- a/usr.bin/mail/USD.doc/mail8.nr
+++ b/usr.bin/mail/USD.doc/mail8.nr
@@ -58,7 +58,7 @@ A collection of messages.  Often used in the phrase,
 .q "Have you read your mail?"
 .ip "\fImailbox\fP"
 The place where your mail is stored, typically in the directory
-/usr/spool/mail.
+/var/mail.
 .ip "\fImessage\fP"
 A single letter from someone, initially stored in your
 .i mailbox .
diff --git a/usr.bin/mail/mail.1 b/usr.bin/mail/mail.1
index 376af05..994388f 100644
--- a/usr.bin/mail/mail.1
+++ b/usr.bin/mail/mail.1
@@ -108,7 +108,7 @@ writes undeleted messages back to this file.
 .It Fl u
 Is equivalent to:
 .Pp
-.Dl mail -f /var/spool/mail/user
+.Dl mail -f /var/mail/user
 .El
 .Ss Sending mail
 To send a message to one or more people,
@@ -987,7 +987,7 @@ and
 environment variables.
 .Sh FILES
 .Bl -tag -width /usr/share/misc/Mail.help* -compact
-.It Pa /var/spool/mail/*
+.It Pa /var/mail/*
 Post office.
 .It ~/mbox
 User's old mail.
diff --git a/usr.bin/mail/misc/mail.help b/usr.bin/mail/misc/mail.help
index d5858c5..f5c5dd2 100644
--- a/usr.bin/mail/misc/mail.help
+++ b/usr.bin/mail/misc/mail.help
@@ -8,7 +8,7 @@ s <message list> file		append messages to file
 u <message list>		undelete messages
 R <message list>		reply to message senders
 r <message list>		reply to message senders and all recipients
-pre <message list>		make messages go back to /usr/spool/mail
+pre <message list>		make messages go back to /var/mail
 m <user list>			mail to specific users
 q				quit, saving unresolved messages in mbox
 x				quit, do not remove system mailbox