From owner-svn-src-all@FreeBSD.ORG  Wed Jun 19 18:01:38 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id EF9C6F06;
 Wed, 19 Jun 2013 18:01:37 +0000 (UTC) (envelope-from jh@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id DC31A15D2;
 Wed, 19 Jun 2013 18:01:37 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5JI1bUZ015547;
 Wed, 19 Jun 2013 18:01:37 GMT (envelope-from jh@svn.freebsd.org)
Received: (from jh@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5JI1bu8015546;
 Wed, 19 Jun 2013 18:01:37 GMT (envelope-from jh@svn.freebsd.org)
Message-Id: <201306191801.r5JI1bu8015546@svn.freebsd.org>
From: Jaakko Heinonen <jh@FreeBSD.org>
Date: Wed, 19 Jun 2013 18:01:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject: svn commit: r251999 - stable/8/sbin/mount
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 19 Jun 2013 18:01:38 -0000

Author: jh
Date: Wed Jun 19 18:01:37 2013
New Revision: 251999
URL: http://svnweb.freebsd.org/changeset/base/251999

Log:
  MFC r251485:
  
  Revert r238399.
  
  The "failok" option doesn't have any effect at all unless specified in
  fstab(5) and combined with the -a flag. The "failok" option is already
  documented in fstab(5).
  
  PR:		177630

Modified:
  stable/8/sbin/mount/mount.8
Directory Properties:
  stable/8/sbin/mount/   (props changed)

Modified: stable/8/sbin/mount/mount.8
==============================================================================
--- stable/8/sbin/mount/mount.8	Wed Jun 19 18:00:00 2013	(r251998)
+++ stable/8/sbin/mount/mount.8	Wed Jun 19 18:01:37 2013	(r251999)
@@ -28,7 +28,7 @@
 .\"     @(#)mount.8	8.8 (Berkeley) 6/16/94
 .\" $FreeBSD$
 .\"
-.Dd July 12, 2012
+.Dd June 6, 2011
 .Dt MOUNT 8
 .Os
 .Sh NAME
@@ -145,11 +145,6 @@ When used with the
 .Fl u
 flag, this is the same as specifying the options currently in effect for
 the mounted file system.
-.It Cm failok
-If this option is specified,
-.Nm
-will return 0 even if an error occurs
-during the mount of the filesystem.
 .It Cm force
 The same as
 .Fl f ;