From e9e191aef8d49476204daf9bb37cff9697be004e Mon Sep 17 00:00:00 2001
From: jmc <jmc@openbsd.org>
Date: Tue, 15 Jul 2014 11:25:22 +0000
Subject: [PATCH] add -N to usage()/SYNOPSIS and tweak previous; rather than
 adding "net" to the -o list, claudio points out that -o net and -o noauto are
 really noops, so remove "noauto";

help/ok claudio
---
 sbin/mount/mount.8 | 17 +++++------------
 sbin/mount/mount.c |  4 ++--
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/sbin/mount/mount.8 b/sbin/mount/mount.8
index 4226f019d8a..b9a2c94a084 100644
--- a/sbin/mount/mount.8
+++ b/sbin/mount/mount.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mount.8,v 1.75 2014/07/13 12:01:30 claudio Exp $
+.\"	$OpenBSD: mount.8,v 1.76 2014/07/15 11:25:22 jmc Exp $
 .\"	$NetBSD: mount.8,v 1.11 1995/07/12 06:23:21 cgd Exp $
 .\"
 .\" Copyright (c) 1980, 1989, 1991, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)mount.8	8.7 (Berkeley) 3/27/94
 .\"
-.Dd $Mdocdate: July 13 2014 $
+.Dd $Mdocdate: July 15 2014 $
 .Dt MOUNT 8
 .Os
 .Sh NAME
@@ -38,7 +38,7 @@
 .Nd mount file systems
 .Sh SYNOPSIS
 .Nm mount
-.Op Fl Aadfruvw
+.Op Fl AadfNruvw
 .Op Fl t Ar type
 .Nm mount
 .Op Fl dfrsuvw
@@ -120,7 +120,7 @@ table except those for which the
 .Dq noauto
 or
 .Dq net
-option is specified.
+options are specified.
 .It Fl a
 Similar to the
 .Fl A
@@ -152,7 +152,7 @@ If used with either
 .Fl A
 or
 .Fl a ,
-.Xm
+.Nm
 will only look at file systems which have the
 .Dq net
 option specified.
@@ -202,13 +202,6 @@ Do not update atime on files in the system unless the mtime or ctime
 is being changed as well.
 This option is useful for laptops and news servers where one does
 not want the extra disk activity associated with updating the atime.
-.It noauto
-Do not mount the file system automatically
-(either at boot or with the
-.Fl A
-or
-.Fl a
-options).
 .It nodev
 Do not interpret character or block special devices on the file system.
 This option is useful for a server that has file systems containing
diff --git a/sbin/mount/mount.c b/sbin/mount/mount.c
index 4bd52989b89..52e31ed1b3b 100644
--- a/sbin/mount/mount.c
+++ b/sbin/mount/mount.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mount.c,v 1.56 2014/07/13 12:01:30 claudio Exp $	*/
+/*	$OpenBSD: mount.c,v 1.57 2014/07/15 11:25:22 jmc Exp $	*/
 /*	$NetBSD: mount.c,v 1.24 1995/11/18 03:34:29 cgd Exp $	*/
 
 /*
@@ -721,7 +721,7 @@ usage(void)
 {
 
 	(void)fprintf(stderr,
-	    "usage: mount [-Aadfruvw] [-t type]\n"
+	    "usage: mount [-AadfNruvw] [-t type]\n"
 	    "       mount [-dfrsuvw] special | node\n"
 	    "       mount [-dfruvw] [-o options] [-t type] special node\n");
 	exit(1);
-- 
2.20.1